134 files changed, 240 insertions, 240 deletions
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index 8d4939d83..dbc2a7065 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_subdirectory( malloc )
 add_subdirectory( network )
-add_subdirectory( kconfig_compiler )
+add_subdirectory( tdeconfig_compiler )
 add_subdirectory( hwlibdata )
 add_subdirectory( hwlibdaemons )
 
@@ -53,7 +53,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/libltdl
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${LIBART_INCLUDE_DIRS}
   ${LIBIDN_INCLUDE_DIRS}
   ${GAMIN_INCLUDEDIR}
@@ -69,9 +69,9 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    kconfig.h kconfigskeleton.h kconfigdata.h ksimpleconfig.h
-    kconfigdialogmanager.h kconfigbase.h kdesktopfile.h
-    kurl.h ksock.h kaboutdata.h kcmdlineargs.h kconfigbackend.h
+    tdeconfig.h tdeconfigskeleton.h tdeconfigdata.h ksimpleconfig.h
+    tdeconfigdialogmanager.h tdeconfigbase.h kdesktopfile.h
+    kurl.h ksock.h kaboutdata.h kcmdlineargs.h tdeconfigbackend.h
     kapp.h kapplication.h kuniqueapp.h kuniqueapplication.h
     kcharsets.h tdeversion.h kpty.h kprocess.h kprocctrl.h
     klocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
@@ -110,7 +110,7 @@ install( FILES kdebug.areas kdebugrc language.codes
   DESTINATION ${CONFIG_INSTALL_DIR} )
 
 install( FILES kmdcodec_compat.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kio RENAME kmdcodec.h )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio RENAME kmdcodec.h )
 
 install( FILES eventsrc
   DESTINATION ${DATA_INSTALL_DIR}/knotify )
@@ -121,7 +121,7 @@ set( target tdecore )
 
 set( ${target}_SRCS
   libintl.cpp kapplication.cpp kdebug.cpp netwm.cpp
-  kconfigbase.cpp kconfig.cpp ksimpleconfig.cpp kconfigbackend.cpp
+  tdeconfigbase.cpp tdeconfig.cpp ksimpleconfig.cpp tdeconfigbackend.cpp
   kmanagerselection.cpp kdesktopfile.cpp kstandarddirs.cpp
   ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp klocale.cpp
   krfcdate.cpp kiconeffect.cpp kicontheme.cpp kiconloader.cpp
@@ -148,7 +148,7 @@ set( ${target}_SRCS
   kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp
   ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp
   kprotocolinfo_tdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp
-  kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp
+  kuser.cpp tdeconfigskeleton.cpp tdeconfigdialogmanager.cpp klockfile.cpp
   kqiodevicegzip_p.cpp ktimezones.cpp tdehardwaredevices.cpp tdenetworkconnections.cpp
   ksimpledirwatch.cpp
   ${TDENM_BACKEND_SOURCES}
diff --git a/tdecore/DESIGN.kconfig b/tdecore/DESIGN.tdeconfig
index c4c68b28e..a1fb48dbd 100644
--- a/tdecore/DESIGN.kconfig
+++ b/tdecore/DESIGN.tdeconfig
@@ -1,4 +1,4 @@
-kconfigdata.h contains definitions of the data formats used by kconfig.
+tdeconfigdata.h contains definitions of the data formats used by tdeconfig.
 
 Configuration entries are stored as "KEntry". They are indexed with "KEntryKey".
 The primary store is a "KEntryMap" which is defined as a QMap from "KEntryKey"
@@ -176,7 +176,7 @@ Class overview
  TDEConfigBackend  <-----> TDEConfig <------> TDEConfigSkeleton           /--< myapp.kcfg
        |                    |                    |                 /
        v                    v                    |*---------------<
-TDEConfigINIBackend      KSimpleConfig             |kconfig_compiler \
+TDEConfigINIBackend      KSimpleConfig             |tdeconfig_compiler \
                                                  |                  \--< myconfig.kcfg-codegen
                                                  v                                                    
                                              MyConfig <-----TDEConfigDialogManager----> MyConfigWidget *---< myconfigwidget.ui
diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS
index 995ab753a..6295c102d 100644
--- a/tdecore/MAINTAINERS
+++ b/tdecore/MAINTAINERS
@@ -20,9 +20,9 @@ kckey.cpp
 kcmdlineargs.cpp	Waldo Bastian <[email protected]>
 kcompletion.cpp		Carsten Pfeiffer <[email protected]>
 kcompletionbase.cpp
-kconfig.cpp		Waldo Bastian <[email protected]>
-kconfigbackend.cpp	Waldo Bastian <[email protected]>
-kconfigbase.cpp		Waldo Bastian <[email protected]>
+tdeconfig.cpp		Waldo Bastian <[email protected]>
+tdeconfigbackend.cpp	Waldo Bastian <[email protected]>
+tdeconfigbase.cpp		Waldo Bastian <[email protected]>
 kcrash.cpp		Waldo Bastian <[email protected]>
 kdcoppropertyproxy.cpp
 kdebug.cpp		Stephan Kulow <[email protected]>
@@ -94,8 +94,8 @@ kcalendarsystemhijri.cpp
 kcalendarsystemjalali.cpp	Arash Bijanzadeh  and FarsiKDE Project <www.farsikde.org> (copyright)
 kcheckaccelerators.cpp	Matthias Kalle Dalheimer ([email protected]) (copyright)
 kclipboard.cpp		Carsten Pfeiffer <[email protected]> (copyright)
-kconfigdialogmanager.cpp
-kconfigskeleton.cpp
+tdeconfigdialogmanager.cpp
+tdeconfigskeleton.cpp
 kdebugdcopiface.cpp	Andreas Beckermann ([email protected]) (copyright)
 tdeversion.cpp
 kglobalaccel_win.cpp	Ellis Whitehead <[email protected]> (copyright)
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index 75037eccf..2204ab749 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -27,7 +27,7 @@ SVGICONS=svgicons
 SVGICON_LIB=svgicons/libkdesvgicons.la
 endif
 
-SUBDIRS = malloc network $(SVGICONS) . kconfig_compiler tests
+SUBDIRS = malloc network $(SVGICONS) . tdeconfig_compiler tests
 
 # For the future: examine if condensing the tons of *_LDFLAGS variables
 # into $(all_libraries) isn't better
@@ -36,10 +36,10 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
 lib_LTLIBRARIES = libtdefakes.la libtdecore.la
 lib_LIBRARIES = libtdefakes_nonpic.a libtdefakes_pic.a
 
-include_HEADERS = kconfig.h kconfigskeleton.h \
-	kconfigdata.h ksimpleconfig.h kconfigdialogmanager.h \
-	kconfigbase.h kdesktopfile.h kurl.h ksock.h kaboutdata.h \
-	kcmdlineargs.h kconfigbackend.h kapp.h kapplication.h kuniqueapp.h \
+include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
+	tdeconfigdata.h ksimpleconfig.h tdeconfigdialogmanager.h \
+	tdeconfigbase.h kdesktopfile.h kurl.h ksock.h kaboutdata.h \
+	kcmdlineargs.h tdeconfigbackend.h kapp.h kapplication.h kuniqueapp.h \
 	kuniqueapplication.h kcharsets.h tdeversion.h kpty.h kprocess.h \
 	kprocctrl.h klocale.h kicontheme.h kiconloader.h kdebug.h \
 	twinmodule.h twin.h krootprop.h kshortcut.h kkeynative.h kaccel.h \
@@ -90,8 +90,8 @@ noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \
 	kprotocolinfofactory.h kqiodevicegzip_p.h kiconloader_p.h
 
 libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
-	kdebug.cpp netwm.cpp kconfigbase.cpp kconfig.cpp  ksimpleconfig.cpp \
-	kconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \
+	kdebug.cpp netwm.cpp tdeconfigbase.cpp tdeconfig.cpp  ksimpleconfig.cpp \
+	tdeconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \
 	kstandarddirs.cpp ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp \
 	klocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \
 	kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp \
@@ -118,7 +118,7 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
 	kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp \
 	ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp \
 	kprotocolinfo_tdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp \
-	kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
+	kuser.cpp tdeconfigskeleton.cpp tdeconfigdialogmanager.cpp klockfile.cpp \
 	kqiodevicegzip_p.cpp ktimezones.cpp
 
 libtdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
@@ -143,16 +143,16 @@ kckey_h : $(srcdir)/generate_keys.sh $(QNAMESPACE_H)
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(kde_locale)
 	$(INSTALL_DATA) $(srcdir)/all_languages.desktop $(DESTDIR)$(kde_locale)/all_languages
-	$(mkinstalldirs) $(DESTDIR)$(includedir)/kio
+	$(mkinstalldirs) $(DESTDIR)$(includedir)/tdeio
 	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/knotify
 	$(INSTALL_DATA) $(srcdir)/eventsrc $(DESTDIR)$(kde_datadir)/knotify/eventsrc
-	$(INSTALL_DATA) $(srcdir)/kmdcodec_compat.h $(DESTDIR)$(includedir)/kio/kmdcodec.h
+	$(INSTALL_DATA) $(srcdir)/kmdcodec_compat.h $(DESTDIR)$(includedir)/tdeio/kmdcodec.h
 	rm -f "$(DESTDIR)$(kde_confdir)/colors/40 Colors"
 	rm -f $(DESTDIR)$(kde_confdir)/colors/Web
 	rm -f $(DESTDIR)$(kde_confdir)/colors/Royal
 
 uninstall-local:
-	-rm -f $(DESTDIR)$(includedir)/kio/kmdcodec.h
+	-rm -f $(DESTDIR)$(includedir)/tdeio/kmdcodec.h
 
 # If you add a color palette file here, please change tdelibs/tdeui/kcolordialog.cpp too to allow to translate the name
 colors_DATA = 40.colors Web.colors Royal.colors Rainbow.colors
diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk
index 657a6a72b..b0d6cddfb 100644
--- a/tdecore/README.kiosk
+++ b/tdecore/README.kiosk
@@ -616,7 +616,7 @@ tde-display.desktop
 tde-proxy.desktop
 tde-screensaver.desktop
 
-See also kcmshell --list for a list of all the base names.
+See also tdecmshell --list for a list of all the base names.
 
 Expansion of environment variables in KDE config files.
 =======================================================
diff --git a/tdecore/README.kstartupinfo b/tdecore/README.kstartupinfo
index 051b1fae6..995b9883a 100644
--- a/tdecore/README.kstartupinfo
+++ b/tdecore/README.kstartupinfo
@@ -173,7 +173,7 @@ matter ).
  The ASN identification string must be a unique string for every ASN.
 In KStartupInfo class, it's created as 'hostname;tm.sec;tm.usec;pid',
 tm being the current time. If the identification string is set to "0",
-it means no ASN should be done ( e.g. for things like kio_uiserver,
+it means no ASN should be done ( e.g. for things like tdeio_uiserver,
 which shouldn't get ASN ). Empty identification string means the same
 like "0", except for the call to KStartupInfoId::initId(), where it means
 to create a new one.
diff --git a/tdecore/kaccelaction.cpp b/tdecore/kaccelaction.cpp
index e8696cc26..34448fe90 100644
--- a/tdecore/kaccelaction.cpp
+++ b/tdecore/kaccelaction.cpp
@@ -25,7 +25,7 @@
 
 #include <tqkeycode.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kckey.h"
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/tdecore/kaccelbase.cpp b/tdecore/kaccelbase.cpp
index 729de1c42..75810b2e3 100644
--- a/tdecore/kaccelbase.cpp
+++ b/tdecore/kaccelbase.cpp
@@ -26,7 +26,7 @@
 #include <tqlabel.h>
 #include <tqpopupmenu.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kckey.h"
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/tdecore/kappdcopiface.cpp b/tdecore/kappdcopiface.cpp
index 768a94fff..9f1148579 100644
--- a/tdecore/kappdcopiface.cpp
+++ b/tdecore/kappdcopiface.cpp
@@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 KAppDCOPInterface::KAppDCOPInterface(TDEApplication * theKApp)
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index 2950d6170..bd17e972a 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -68,7 +68,7 @@
 #include <kstyle.h>
 #include <kiconloader.h>
 #include <kclipboard.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
@@ -2970,7 +2970,7 @@ void TDEApplication::broadcastKeyCode(unsigned int keyCode)
 TQCString
 TDEApplication::launcher()
 {
-   return "klauncher";
+   return "tdelauncher";
 }
 
 static int
diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp
index 4c8a405cb..17617bf9e 100644
--- a/tdecore/kcharsets.cpp
+++ b/tdecore/kcharsets.cpp
@@ -24,7 +24,7 @@
 #include <kapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqfontinfo.h>
 #include <tqstrlist.h>
diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp
index 69cd06dee..1051cd362 100644
--- a/tdecore/kcheckaccelerators.cpp
+++ b/tdecore/kcheckaccelerators.cpp
@@ -39,7 +39,7 @@
 #include <tqmetaobject.h>
 #include <tqcheckbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kshortcut.h>
diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp
index f7812a713..53865a2c2 100644
--- a/tdecore/kclipboard.cpp
+++ b/tdecore/kclipboard.cpp
@@ -17,7 +17,7 @@
 */
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "kclipboard.h"
diff --git a/tdecore/kconfig_compiler/Makefile.am b/tdecore/kconfig_compiler/Makefile.am
deleted file mode 100644
index d4f287381..000000000
--- a/tdecore/kconfig_compiler/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBDIRS = example tests
-
-AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
-
-bin_PROGRAMS = kconfig_compiler
-
-kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kconfig_compiler_LDADD = $(LIB_TDECORE)
-kconfig_compiler_SOURCES = kconfig_compiler.cpp
-
-TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test_dpointer.kcfg
-
-check-local:
-	for i in $(TESTFILES); \
-	  do xmllint --noout --schema $(srcdir)/kcfg.xsd $(srcdir)/tests/$$i; \
-	  perl $(top_srcdir)/tdecore/kconfig_compiler/checkkcfg.pl \
-          $(top_srcdir)/tdecore/kconfig_compiler/tests/$$i; done
-	  
diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp
index ae767ffb2..420ff177c 100644
--- a/tdecore/kcrash.cpp
+++ b/tdecore/kcrash.cpp
@@ -51,7 +51,7 @@
 #include <kapplication.h>
 #include <dcopclient.h>
 
-#include <../kinit/klauncher_cmds.h>
+#include <../kinit/tdelauncher_cmds.h>
 
 #if defined Q_WS_X11
 #include <X11/Xlib.h>
@@ -262,7 +262,7 @@ void KCrash::startDrKonqi( const char* argv[], int argc )
     startDirectly( argv, argc );
     return;
   }
-  klauncher_header header;
+  tdelauncher_header header;
   header.cmd = LAUNCHER_EXEC_NEW;
   const int BUFSIZE = 8192; // make sure this is big enough
   char buffer[ BUFSIZE + 10 ];
diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas
index f2da61c43..d714c6535 100644
--- a/tdecore/kdebug.areas
+++ b/tdecore/kdebug.areas
@@ -29,7 +29,7 @@
 220        tdeui (KToolBar)
 230        tdeui (KCommand)
 240        tdeui (tdelibs)
-250        kfile (tdelibs)
+250        tdefile (tdelibs)
 264        tdecore (KIconLoader)
 265        tdecore (KIconEffect)
 270        tdeui (KRootPixmap)
@@ -58,7 +58,7 @@
 713        tdeutils (TDECModuleContainer)
 750        tdespell (tdelibs)
 760        tdemdi
-780        kcmshell (tdelibs)
+780        tdecmshell (tdelibs)
 790        tdeimproxy (tdelibs)
 800        kabapi (tdelibs)
 900        tdesu (tdelibs)
@@ -87,8 +87,8 @@
 1216        twin (client errors)
 1217        khotkeys
 1218        ksmserver
-1219        media kioslave
-1220        remote kioslave
+1219        media tdeioslave
+1220        remote tdeioslave
 
 1400        khelpcenter (tdebase)
 1401        kcmhelpcenter
@@ -220,7 +220,7 @@
 6201        tdehtml (caret table)
 6210        tdehtml (editor)
 
-# libkio
+# libtdeio
 7000        kio
 7001        kio (KDirWatch)
 7002        kio (Slave)
@@ -239,9 +239,9 @@
 7016        kio (KLauncher)
 7017        kio (KIOConnection)
 7018        kio (KMimeMagic)
-7019        kio (kioslave)
+7019        kio (tdeioslave)
 7020        kded
-7021        kbuildsycoca
+7021        tdebuildsycoca
 7022        kurifilter
 7023        kurifilter (plugins)
 7024        kio (UIServer)
@@ -260,7 +260,7 @@
 7042        KAr
 7043        kio (bookmarks)
 
-# 71xx      are for kioslaves
+# 71xx      are for tdeioslaves
 7101        kio_file
 7102        kio_ftp
 7103        kio_http
@@ -427,8 +427,8 @@
 20011        KDB (Connection)
 20012        KDB (plugin)
 
-#kfilereplace
-23000 	     KFileReplace (kfilereplacepart)
+#tdefilereplace
+23000 	     KFileReplace (tdefilereplacepart)
 
 #klinkstatus
 23100        KLinkStatus
diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp
index e484a3711..27dcf1418 100644
--- a/tdecore/kdebug.cpp
+++ b/tdecore/kdebug.cpp
@@ -55,7 +55,7 @@
 #include <syslog.h>
 #include <errno.h>
 #include <string.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kstaticdeleter.h"
 #include <config.h>
 
diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp
index 1b9a49890..a30b2046b 100644
--- a/tdecore/kdesktopfile.cpp
+++ b/tdecore/kdesktopfile.cpp
@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 #include "kurl.h"
-#include "kconfigbackend.h"
+#include "tdeconfigbackend.h"
 #include "kapplication.h"
 #include "kstandarddirs.h"
 #include "kmountpoint.h"
diff --git a/tdecore/kdesktopfile.h b/tdecore/kdesktopfile.h
index 28db47842..60e9fc096 100644
--- a/tdecore/kdesktopfile.h
+++ b/tdecore/kdesktopfile.h
@@ -19,7 +19,7 @@
 #ifndef _KDESKTOPFILE_H
 #define _KDESKTOPFILE_H
 
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "tdelibs_export.h"
 
 class KDesktopFilePrivate;
diff --git a/tdecore/kdetcompmgr.cpp b/tdecore/kdetcompmgr.cpp
index 2047a7707..e34554073 100644
--- a/tdecore/kdetcompmgr.cpp
+++ b/tdecore/kdetcompmgr.cpp
@@ -26,7 +26,7 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <pwd.h>
 #include <signal.h>
diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp
index 9759edbcf..d26bbb678 100644
--- a/tdecore/kglobal.cpp
+++ b/tdecore/kglobal.cpp
@@ -30,7 +30,7 @@
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kcharsets.h>
 #include <kiconloader.h>
diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp
index 8e617b06a..dbd751eea 100644
--- a/tdecore/kglobalsettings.cpp
+++ b/tdecore/kglobalsettings.cpp
@@ -23,7 +23,7 @@
 #include <tqfontdatabase.h>
 #include <tqcursor.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kapplication.h>
 
diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp
index 4fd16a49a..ae33d744d 100644
--- a/tdecore/kiconeffect.cpp
+++ b/tdecore/kiconeffect.cpp
@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <kicontheme.h>
 #include "kiconeffect.h"
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index 127f8eaba..e63f09d0f 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kinstance.h>
 
diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp
index 853c0ab78..abced574e 100644
--- a/tdecore/kicontheme.cpp
+++ b/tdecore/kicontheme.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kinstance.h>
 
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index 9b4b7c2c7..cef932fa1 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "klocale.h"
 #include "kcharsets.h"
 #include "kiconloader.h"
diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp
index e7673debb..69acd0d5e 100644
--- a/tdecore/kkeyserver_x11.cpp
+++ b/tdecore/kkeyserver_x11.cpp
@@ -31,7 +31,7 @@
 #include "kkeynative.h"
 #include "kshortcut.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp
index 4c60bed43..f7a3cf77a 100644
--- a/tdecore/klocale.cpp
+++ b/tdecore/klocale.cpp
@@ -37,7 +37,7 @@
 #include "kstandarddirs.h"
 #include "ksimpleconfig.h"
 #include "kinstance.h"
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "kdebug.h"
 #include "kcalendarsystem.h"
 #include "kcalendarsystemfactory.h"
@@ -672,7 +672,7 @@ void KLocale::updateCatalogues( )
   }
 
   // now iterate over all languages and all wanted catalog names and append or create them in the right order
-  // the sequence must be e.g. nds/appname nds/tdelibs nds/kio de/appname de/tdelibs de/kio etc.
+  // the sequence must be e.g. nds/appname nds/tdelibs nds/tdeio de/appname de/tdelibs de/tdeio etc.
   // and not nds/appname de/appname nds/tdelibs de/tdelibs etc. Otherwise we would be in trouble with a language
   // sequende nds,en_US, de. In this case en_US must hide everything below in the language list.
   for ( TQStringList::ConstIterator itLangs =  d->languageList.begin();
diff --git a/tdecore/kmdcodec_compat.h b/tdecore/kmdcodec_compat.h
index f2ed3b580..80da5356b 100644
--- a/tdecore/kmdcodec_compat.h
+++ b/tdecore/kmdcodec_compat.h
@@ -1,4 +1,4 @@
 #ifdef __GNUC__
-#warning #include <kio/kmdcodec.h> is deprecated, use #include <kmdcodec.h> instead. 
+#warning #include <tdeio/kmdcodec.h> is deprecated, use #include <kmdcodec.h> instead. 
 #endif
 #include "../kmdcodec.h"
diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp
index e5d088dcb..309be40f0 100644
--- a/tdecore/knotifyclient.cpp
+++ b/tdecore/knotifyclient.cpp
@@ -26,7 +26,7 @@
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp
index de16f0128..02976616e 100644
--- a/tdecore/kprotocolinfo_tdecore.cpp
+++ b/tdecore/kprotocolinfo_tdecore.cpp
@@ -30,7 +30,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <ksimpleconfig.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstringhandler.h>
 
 class KProtocolInfo::KProtocolInfoPrivate
@@ -555,7 +555,7 @@ TQDataStream& operator<<( TQDataStream& s, const KProtocolInfo::ExtraField& fiel
   return s;
 }
 
-// KURL based static functions are implemented in ../kio/kio/kprotocolinfo.cpp
+// KURL based static functions are implemented in ../tdeio/tdeio/kprotocolinfo.cpp
 
 void KProtocolInfo::virtual_hook( int id, void* data )
 { KSycocaEntry::virtual_hook( id, data ); }
diff --git a/tdecore/kprotocolinfofactory.h b/tdecore/kprotocolinfofactory.h
index 04883bde0..89ba330a9 100644
--- a/tdecore/kprotocolinfofactory.h
+++ b/tdecore/kprotocolinfofactory.h
@@ -20,7 +20,7 @@
 #ifndef __kprotocolinfofactory_h__
 #define __kprotocolinfofactory_h__
 
-#include "../kio/kio/kprotocolinfo.h"
+#include "../tdeio/tdeio/kprotocolinfo.h"
 
 #include <tqmap.h>
 #include <tqstring.h>
diff --git a/tdecore/kshortcutlist.cpp b/tdecore/kshortcutlist.cpp
index fcfc48b48..dd171062e 100644
--- a/tdecore/kshortcutlist.cpp
+++ b/tdecore/kshortcutlist.cpp
@@ -3,7 +3,7 @@
 
 #include <kaccel.h>
 #include "kaccelaction.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalaccel.h>
diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp
index 5c0203a9f..55cf7485b 100644
--- a/tdecore/ksimpleconfig.cpp
+++ b/tdecore/ksimpleconfig.cpp
@@ -33,7 +33,7 @@
 
 #include "kglobal.h"
 #include "kstandarddirs.h"
-#include "kconfigbackend.h"
+#include "tdeconfigbackend.h"
 
 #include "ksimpleconfig.h"
 
diff --git a/tdecore/ksimpleconfig.h b/tdecore/ksimpleconfig.h
index 326fc8094..541117500 100644
--- a/tdecore/ksimpleconfig.h
+++ b/tdecore/ksimpleconfig.h
@@ -21,7 +21,7 @@
 #ifndef _KSIMPLECONFIG_H
 #define _KSIMPLECONFIG_H
 
-#include "kconfig.h"
+#include "tdeconfig.h"
 
 class KSimpleConfigPrivate;
 
diff --git a/tdecore/ksimpledirwatch.cpp b/tdecore/ksimpledirwatch.cpp
index 08d686beb..d961d4657 100644
--- a/tdecore/ksimpledirwatch.cpp
+++ b/tdecore/ksimpledirwatch.cpp
@@ -45,7 +45,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kstaticdeleter.h>
 #include <kde_file.h>
@@ -184,7 +184,7 @@ void KSimpleDirWatchPrivate::dnotify_sigio_handler(int sig, siginfo_t *si, void
  * are supported:
  * - Polling: All files to be watched are polled regularly
  *   using stat (more precise: TQFileInfo.lastModified()).
- *   The polling frequency is determined from global kconfig
+ *   The polling frequency is determined from global tdeconfig
  *   settings, defaulting to 500 ms for local directories
  *   and 5000 ms for remote mounts
  * - FAM (File Alternation Monitor): first used on IRIX, SGI
diff --git a/tdecore/ksocks.cpp b/tdecore/ksocks.cpp
index eb00b1cec..cc0cde8ca 100644
--- a/tdecore/ksocks.cpp
+++ b/tdecore/ksocks.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include "klibloader.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include <sys/types.h>
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp
index c902cd6f1..c44f60458 100644
--- a/tdecore/kstandarddirs.cpp
+++ b/tdecore/kstandarddirs.cpp
@@ -47,7 +47,7 @@
 #include <tqstringlist.h>
 
 #include "kstandarddirs.h"
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "kinstance.h"
 #include "kshell.h"
 #include "ksimpleconfig.h"
diff --git a/tdecore/kstdaccel.cpp b/tdecore/kstdaccel.cpp
index 5bda8ebf5..afc49aac4 100644
--- a/tdecore/kstdaccel.cpp
+++ b/tdecore/kstdaccel.cpp
@@ -23,7 +23,7 @@
 
 #include "kaccelaction.h"
 #include "kaccelbase.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp
index d8b69eade..422b39a1b 100644
--- a/tdecore/kuniqueapplication.cpp
+++ b/tdecore/kuniqueapplication.cpp
@@ -43,7 +43,7 @@
 #include <kstartupinfo.h> 
 #endif
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kdebug.h"
 #include "kuniqueapplication.h"
 
diff --git a/tdecore/networkbackends/network-manager/network-manager.cpp b/tdecore/networkbackends/network-manager/network-manager.cpp
index 206e75737..d747b61ae 100644
--- a/tdecore/networkbackends/network-manager/network-manager.cpp
+++ b/tdecore/networkbackends/network-manager/network-manager.cpp
@@ -20,7 +20,7 @@
 
 #include <tqdbusmessage.h>
 
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "tdehardwaredevices.h"
 
 #include "network-manager.h"
@@ -4828,10 +4828,10 @@ TDENetworkVPNTypeList TDENetworkConnectionManager_BackendNM::availableVPNTypes()
 		// read in all available Services
 		for (TQStringList::Iterator i = services.begin (); i != services.end (); ++i) {
 			TQString service = NM_PLUGIN_SERVICE_DIR + TQString ("/") + *i;
-			TDEConfig* kconfig = new TDEConfig (service, true, true, "config");
-			kconfig->setGroup ("VPN Connection");
+			TDEConfig* tdeconfig = new TDEConfig (service, true, true, "config");
+			tdeconfig->setGroup ("VPN Connection");
 
-			TQString serviceName = kconfig->readEntry("name", TQString());
+			TQString serviceName = tdeconfig->readEntry("name", TQString());
 			serviceName = serviceName.lower();
 
 			if (serviceName == "openvpn") {
@@ -4847,7 +4847,7 @@ TDENetworkVPNTypeList TDENetworkConnectionManager_BackendNM::availableVPNTypes()
 				ret.append(TDENetworkVPNType::VPNC);
 			}
 
-			delete kconfig;
+			delete tdeconfig;
 		}
 	}
 
diff --git a/tdecore/kconfig.cpp b/tdecore/tdeconfig.cpp
index 26459cdde..62464b81f 100644
--- a/tdecore/kconfig.cpp
+++ b/tdecore/tdeconfig.cpp
@@ -33,9 +33,9 @@
 #include <tqfileinfo.h>
 
 #include <kapplication.h>
-#include "kconfigbackend.h"
+#include "tdeconfigbackend.h"
 
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "kglobal.h"
 #include "kstandarddirs.h"
 #include "kstaticdeleter.h"
@@ -294,7 +294,7 @@ void TDEConfig::checkUpdate(const TQString &id, const TQString &updateFile)
   {
      TQStringList args;
      args << "--check" << updateFile;
-     TDEApplication::tdeinitExecWait("kconf_update", args);
+     TDEApplication::tdeinitExecWait("tdeconf_update", args);
      reparseConfiguration();
   }
   setGroup(oldGroup);
@@ -364,4 +364,4 @@ KSharedConfig::~KSharedConfig()
     s_list->remove(this);
 }
 
-#include "kconfig.moc"
+#include "tdeconfig.moc"
diff --git a/tdecore/kconfig.h b/tdecore/tdeconfig.h
index c5084c109..77a009efa 100644
--- a/tdecore/kconfig.h
+++ b/tdecore/tdeconfig.h
@@ -26,7 +26,7 @@ class TQTimer;
 
 #include <tqvaluelist.h>
 
-#include "kconfigbase.h"
+#include "tdeconfigbase.h"
 #include "klockfile.h"
 
 class TDEConfigPrivate;
@@ -137,7 +137,7 @@ public:
 
   /**
    * Checks whether the config file contains the update @p id
-   * as contained in @p updateFile. If not, it runs kconf_update
+   * as contained in @p updateFile. If not, it runs tdeconf_update
    * to update the config file.
    *
    * If you install config update files with critical fixes
diff --git a/tdecore/kconfig_compiler/CMakeLists.txt b/tdecore/tdeconfig_compiler/CMakeLists.txt
index 4acc09f51..a4f24c43e 100644
--- a/tdecore/kconfig_compiler/CMakeLists.txt
+++ b/tdecore/tdeconfig_compiler/CMakeLists.txt
@@ -20,10 +20,10 @@ link_directories(
 )
 
 
-##### kconfig_compiler ##########################
+##### tdeconfig_compiler ##########################
 
-tde_add_executable( kconfig_compiler
-  SOURCES kconfig_compiler.cpp
+tde_add_executable( tdeconfig_compiler
+  SOURCES tdeconfig_compiler.cpp
   LINK tdecore-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/tdecore/tdeconfig_compiler/Makefile.am b/tdecore/tdeconfig_compiler/Makefile.am
new file mode 100644
index 000000000..d5141f102
--- /dev/null
+++ b/tdecore/tdeconfig_compiler/Makefile.am
@@ -0,0 +1,18 @@
+SUBDIRS = example tests
+
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
+
+bin_PROGRAMS = tdeconfig_compiler
+
+tdeconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeconfig_compiler_LDADD = $(LIB_TDECORE)
+tdeconfig_compiler_SOURCES = tdeconfig_compiler.cpp
+
+TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test_dpointer.kcfg
+
+check-local:
+	for i in $(TESTFILES); \
+	  do xmllint --noout --schema $(srcdir)/kcfg.xsd $(srcdir)/tests/$$i; \
+	  perl $(top_srcdir)/tdecore/tdeconfig_compiler/checkkcfg.pl \
+          $(top_srcdir)/tdecore/tdeconfig_compiler/tests/$$i; done
+	  
diff --git a/tdecore/kconfig_compiler/README.dox b/tdecore/tdeconfig_compiler/README.dox
index 76dbc04c2..1b4926e96 100644
--- a/tdecore/kconfig_compiler/README.dox
+++ b/tdecore/tdeconfig_compiler/README.dox
@@ -1,7 +1,7 @@
 /**
-\page kconfig_compiler The KDE Configuration Compiler
+\page tdeconfig_compiler The KDE Configuration Compiler
 
-kconfig_compiler generates C++ source code from an XML file containing 
+tdeconfig_compiler generates C++ source code from an XML file containing 
 information about configuration options (.kcfg) and a file that provides 
 the code generation options (.kcfgc) The generated class is based on 
 TDEConfigSkeleton and provides an API for the application to access its
diff --git a/tdecore/kconfig_compiler/TODO b/tdecore/tdeconfig_compiler/TODO
index e69de29bb..e69de29bb 100644
--- a/tdecore/kconfig_compiler/TODO
+++ b/tdecore/tdeconfig_compiler/TODO
diff --git a/tdecore/kconfig_compiler/checkkcfg.pl b/tdecore/tdeconfig_compiler/checkkcfg.pl
index 2eddbeee6..26b12bad2 100755
--- a/tdecore/kconfig_compiler/checkkcfg.pl
+++ b/tdecore/tdeconfig_compiler/checkkcfg.pl
@@ -15,21 +15,21 @@ $file_cpp = "$filebase.cpp";
 
 $kcfgc = $file . "c";
 
-$cmd = "./kconfig_compiler $file $kcfgc";
+$cmd = "./tdeconfig_compiler $file $kcfgc";
 
 #print "CMD $cmd\n";
 
 if ( system( $cmd ) != 0 ) {
-  print STDERR "Unable to run kconfig_compiler\n";
+  print STDERR "Unable to run tdeconfig_compiler\n";
   exit 1;
 }
 
-checkfile( $file_h );
-checkfile( $file_cpp );
+chectdefile( $file_h );
+chectdefile( $file_cpp );
 
 exit 0;
 
-sub checkfile()
+sub chectdefile()
 {
   my $file = shift;
 
diff --git a/tdecore/kconfig_compiler/example/Makefile.am b/tdecore/tdeconfig_compiler/example/Makefile.am
index 4e7a59fec..612788f6b 100644
--- a/tdecore/kconfig_compiler/example/Makefile.am
+++ b/tdecore/tdeconfig_compiler/example/Makefile.am
@@ -15,8 +15,8 @@ autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
 example.o exampleprefs_base.o: exampleprefs_base.h
 # avoid running the below command in parallel
 exampleprefs_base.cpp: exampleprefs_base.h
-exampleprefs_base.cpp exampleprefs_base.h: $(srcdir)/example.kcfg ../kconfig_compiler $(srcdir)/exampleprefs_base.kcfgc
-	../kconfig_compiler $(srcdir)/example.kcfg $(srcdir)/exampleprefs_base.kcfgc
+exampleprefs_base.cpp exampleprefs_base.h: $(srcdir)/example.kcfg ../tdeconfig_compiler $(srcdir)/exampleprefs_base.kcfgc
+	../tdeconfig_compiler $(srcdir)/example.kcfg $(srcdir)/exampleprefs_base.kcfgc
 
 METASOURCES = AUTO
 
diff --git a/tdecore/kconfig_compiler/example/autoexample.cpp b/tdecore/tdeconfig_compiler/example/autoexample.cpp
index 53e02f68d..6ed89d75f 100644
--- a/tdecore/kconfig_compiler/example/autoexample.cpp
+++ b/tdecore/tdeconfig_compiler/example/autoexample.cpp
@@ -30,9 +30,9 @@
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include <tqlabel.h>
 
diff --git a/tdecore/kconfig_compiler/example/example.cpp b/tdecore/tdeconfig_compiler/example/example.cpp
index cf808c9b2..6788d1ee0 100644
--- a/tdecore/kconfig_compiler/example/example.cpp
+++ b/tdecore/tdeconfig_compiler/example/example.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 int main( int argc, char **argv )
diff --git a/tdecore/kconfig_compiler/example/example.kcfg b/tdecore/tdeconfig_compiler/example/example.kcfg
index 076bfb644..076bfb644 100644
--- a/tdecore/kconfig_compiler/example/example.kcfg
+++ b/tdecore/tdeconfig_compiler/example/example.kcfg
diff --git a/tdecore/kconfig_compiler/example/exampleprefs_base.kcfgc b/tdecore/tdeconfig_compiler/example/exampleprefs_base.kcfgc
index a9ac98dc7..9b72fdb07 100644
--- a/tdecore/kconfig_compiler/example/exampleprefs_base.kcfgc
+++ b/tdecore/tdeconfig_compiler/example/exampleprefs_base.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 ClassName=ExamplePrefsBase
 #
 # Singleton=false
diff --git a/tdecore/kconfig_compiler/example/general_base.ui b/tdecore/tdeconfig_compiler/example/general_base.ui
index 9b41370c7..9b41370c7 100644
--- a/tdecore/kconfig_compiler/example/general_base.ui
+++ b/tdecore/tdeconfig_compiler/example/general_base.ui
diff --git a/tdecore/kconfig_compiler/example/myoptions_base.ui b/tdecore/tdeconfig_compiler/example/myoptions_base.ui
index 3c0c2e6cb..3c0c2e6cb 100644
--- a/tdecore/kconfig_compiler/example/myoptions_base.ui
+++ b/tdecore/tdeconfig_compiler/example/myoptions_base.ui
diff --git a/tdecore/kconfig_compiler/kcfg.xsd b/tdecore/tdeconfig_compiler/kcfg.xsd
index 9eb18a068..9eb18a068 100644
--- a/tdecore/kconfig_compiler/kcfg.xsd
+++ b/tdecore/tdeconfig_compiler/kcfg.xsd
diff --git a/tdecore/kconfig_compiler/kconfig_compiler.cpp b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
index b8839f677..c7f2fd7bd 100644
--- a/tdecore/kconfig_compiler/kconfig_compiler.cpp
+++ b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 
@@ -627,7 +627,7 @@ TQString param( const TQString &type )
     else if ( type == "PathList" )    return "const TQStringList &";
     else if ( type == "Password" )    return "const TQString &";
     else {
-        kdError() <<"kconfig_compiler does not support type \""<< type <<"\""<<endl;
+        kdError() <<"tdeconfig_compiler does not support type \""<< type <<"\""<<endl;
         return TQSTRING_OBJECT_NAME_STRING; //For now, but an assert would be better
     }
 }
@@ -657,7 +657,7 @@ TQString cppType( const TQString &type )
     else if ( type == "PathList" )    return TQSTRINGLIST_OBJECT_NAME_STRING;
     else if ( type == "Password" )    return TQSTRING_OBJECT_NAME_STRING;
     else {
-        kdError()<<"kconfig_compiler does not support type \""<< type <<"\""<<endl;
+        kdError()<<"tdeconfig_compiler does not support type \""<< type <<"\""<<endl;
         return TQSTRING_OBJECT_NAME_STRING; //For now, but an assert would be better
     }
 }
@@ -684,7 +684,7 @@ TQString defaultValue( const TQString &type )
     else if ( type == "PathList" )    return "TQStringList()";
     else if ( type == "Password" )    return "\"\""; // Use empty string, not null string!
     else {
-        kdWarning()<<"Error, kconfig_compiler doesn't support the \""<< type <<"\" type!"<<endl;
+        kdWarning()<<"Error, tdeconfig_compiler doesn't support the \""<< type <<"\" type!"<<endl;
         return TQSTRING_OBJECT_NAME_STRING; //For now, but an assert would be better
     }
 }
@@ -952,7 +952,7 @@ TQString indent(TQString text, int spaces)
 
 int main( int argc, char **argv )
 {
-  TDEAboutData aboutData( "kconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3",
+  TDEAboutData aboutData( "tdeconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3",
     I18N_NOOP("TDEConfig Compiler") , TDEAboutData::License_LGPL );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "[email protected]" );
   aboutData.addAuthor( "Waldo Bastian", 0, "[email protected]" );
@@ -1134,7 +1134,7 @@ int main( int argc, char **argv )
 
   TQTextStream h( &header );
 
-  h << "// This file is generated by kconfig_compiler from " << args->url(0).fileName() << "." << endl;
+  h << "// This file is generated by tdeconfig_compiler from " << args->url(0).fileName() << "." << endl;
   h << "// All changes you do to this file will be lost." << endl;
 
   h << "#ifndef " << ( !nameSpace.isEmpty() ? nameSpace.upper() + "_" : "" )
@@ -1153,7 +1153,7 @@ int main( int argc, char **argv )
   if ( !singleton && cfgFileNameArg && parameters.isEmpty() )
     h << "#include <kglobal.h>" << endl;
 
-  h << "#include <kconfigskeleton.h>" << endl;
+  h << "#include <tdeconfigskeleton.h>" << endl;
   h << "#include <kdebug.h>" << endl << endl;
 
   // Includes
@@ -1416,7 +1416,7 @@ int main( int argc, char **argv )
   TQTextStream cpp( &implementation );
 
 
-  cpp << "// This file is generated by kconfig_compiler from " << args->url(0).fileName() << "." << endl;
+  cpp << "// This file is generated by tdeconfig_compiler from " << args->url(0).fileName() << "." << endl;
   cpp << "// All changes you do to this file will be lost." << endl << endl;
 
   cpp << "#include \"" << headerFileName << "\"" << endl << endl;
diff --git a/tdecore/kconfig_compiler/tests/Makefile.am b/tdecore/tdeconfig_compiler/tests/Makefile.am
index 953d1c6b4..fa88f0b4b 100644
--- a/tdecore/kconfig_compiler/tests/Makefile.am
+++ b/tdecore/tdeconfig_compiler/tests/Makefile.am
@@ -54,77 +54,77 @@ test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDE
 test_dpointer_LDADD = $(LIB_TDECORE)
 test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp
 
-check_LTLIBRARIES = tdeunittest_kconfigcompiler_test.la
+check_LTLIBRARIES = tdeunittest_tdeconfigcompiler_test.la
 
-tdeunittest_kconfigcompiler_test_la_SOURCES = kconfigcompiler_test.cpp
-tdeunittest_kconfigcompiler_test_la_LIBADD = \
+tdeunittest_tdeconfigcompiler_test_la_SOURCES = tdeconfigcompiler_test.cpp
+tdeunittest_tdeconfigcompiler_test_la_LIBADD = \
 	$(top_builddir)/tdeunittest/libtdeunittest.la
-tdeunittest_kconfigcompiler_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) \
+tdeunittest_tdeconfigcompiler_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) \
 	$(all_libraries)
 
 
 test1main.o test1.o: test1.h
 # avoid running the below command in parallel
 test1.cpp: test1.h
-test1.cpp test1.h: $(srcdir)/test1.kcfg ../kconfig_compiler $(srcdir)/test1.kcfgc
-	../kconfig_compiler $(srcdir)/test1.kcfg $(srcdir)/test1.kcfgc
+test1.cpp test1.h: $(srcdir)/test1.kcfg ../tdeconfig_compiler $(srcdir)/test1.kcfgc
+	../tdeconfig_compiler $(srcdir)/test1.kcfg $(srcdir)/test1.kcfgc
 
 test2main.o test2.o: test2.h
 # avoid running the below command in parallel
 test2.cpp: test2.h
-test2.cpp test2.h: $(srcdir)/test2.kcfg ../kconfig_compiler $(srcdir)/test2.kcfgc
-	../kconfig_compiler $(srcdir)/test2.kcfg $(srcdir)/test2.kcfgc
+test2.cpp test2.h: $(srcdir)/test2.kcfg ../tdeconfig_compiler $(srcdir)/test2.kcfgc
+	../tdeconfig_compiler $(srcdir)/test2.kcfg $(srcdir)/test2.kcfgc
 
 test3main.o test3.o: test3.h
 # avoid running the below command in parallel
 test3.cpp: test3.h
-test3.cpp test3.h: $(srcdir)/test3.kcfg ../kconfig_compiler $(srcdir)/test3.kcfgc
-	../kconfig_compiler $(srcdir)/test3.kcfg $(srcdir)/test3.kcfgc
+test3.cpp test3.h: $(srcdir)/test3.kcfg ../tdeconfig_compiler $(srcdir)/test3.kcfgc
+	../tdeconfig_compiler $(srcdir)/test3.kcfg $(srcdir)/test3.kcfgc
 
 test4main.o test4.o: test4.h
 # avoid running the below command in parallel
 test4.cpp: test4.h
-test4.cpp test4.h: $(srcdir)/test4.kcfg ../kconfig_compiler $(srcdir)/test4.kcfgc
-	../kconfig_compiler $(srcdir)/test4.kcfg $(srcdir)/test4.kcfgc
+test4.cpp test4.h: $(srcdir)/test4.kcfg ../tdeconfig_compiler $(srcdir)/test4.kcfgc
+	../tdeconfig_compiler $(srcdir)/test4.kcfg $(srcdir)/test4.kcfgc
 
 test5main.o test5.o: test5.h
 # avoid running the below command in parallel
 test5.cpp: test5.h
-test5.cpp test5.h: $(srcdir)/test5.kcfg ../kconfig_compiler $(srcdir)/test5.kcfgc
-	../kconfig_compiler $(srcdir)/test5.kcfg $(srcdir)/test5.kcfgc
+test5.cpp test5.h: $(srcdir)/test5.kcfg ../tdeconfig_compiler $(srcdir)/test5.kcfgc
+	../tdeconfig_compiler $(srcdir)/test5.kcfg $(srcdir)/test5.kcfgc
 
 test6main.o test6.o: test6.h
 # avoid running the below command in parallel
 test6.cpp: test6.h
-test6.cpp test6.h: $(srcdir)/test6.kcfg ../kconfig_compiler $(srcdir)/test6.kcfgc
-	../kconfig_compiler $(srcdir)/test6.kcfg $(srcdir)/test6.kcfgc
+test6.cpp test6.h: $(srcdir)/test6.kcfg ../tdeconfig_compiler $(srcdir)/test6.kcfgc
+	../tdeconfig_compiler $(srcdir)/test6.kcfg $(srcdir)/test6.kcfgc
 
 test7main.o test7.o: test7.h
 # avoid running the below command in parallel
 test7.cpp: test7.h
-test7.cpp test7.h: $(srcdir)/test7.kcfg ../kconfig_compiler $(srcdir)/test7.kcfgc
-	../kconfig_compiler $(srcdir)/test7.kcfg $(srcdir)/test7.kcfgc
+test7.cpp test7.h: $(srcdir)/test7.kcfg ../tdeconfig_compiler $(srcdir)/test7.kcfgc
+	../tdeconfig_compiler $(srcdir)/test7.kcfg $(srcdir)/test7.kcfgc
 
 test8main.o test8a.o test8b.o: test8a.h test8b.h
 # avoid running the below command in parallel
 test8a.cpp: test8a.h
-test8a.cpp test8a.h: $(srcdir)/test8a.kcfg ../kconfig_compiler $(srcdir)/test8a.kcfgc
-	../kconfig_compiler $(srcdir)/test8a.kcfg $(srcdir)/test8a.kcfgc
+test8a.cpp test8a.h: $(srcdir)/test8a.kcfg ../tdeconfig_compiler $(srcdir)/test8a.kcfgc
+	../tdeconfig_compiler $(srcdir)/test8a.kcfg $(srcdir)/test8a.kcfgc
 test8b.cpp: test8b.h
-test8b.cpp test8b.h: $(srcdir)/test8b.kcfg ../kconfig_compiler $(srcdir)/test8b.kcfgc
-	../kconfig_compiler $(srcdir)/test8b.kcfg $(srcdir)/test8b.kcfgc
+test8b.cpp test8b.h: $(srcdir)/test8b.kcfg ../tdeconfig_compiler $(srcdir)/test8b.kcfgc
+	../tdeconfig_compiler $(srcdir)/test8b.kcfg $(srcdir)/test8b.kcfgc
 
 test9main.o test9.o: test9.h
 # avoid running the below command in parallel
 test9.cpp: test9.h
-test9.cpp test9.h: $(srcdir)/test9.kcfg ../kconfig_compiler $(srcdir)/test9.kcfgc
-	../kconfig_compiler $(srcdir)/test9.kcfg $(srcdir)/test9.kcfgc
+test9.cpp test9.h: $(srcdir)/test9.kcfg ../tdeconfig_compiler $(srcdir)/test9.kcfgc
+	../tdeconfig_compiler $(srcdir)/test9.kcfg $(srcdir)/test9.kcfgc
 
 test_dpointer_main.o test_dpointer.o: test_dpointer.h
 # avoid running the below command in parallel
 test_dpointer.cpp: test_dpointer.h
-test_dpointer.cpp test_dpointer.h: $(srcdir)/test_dpointer.kcfg ../kconfig_compiler $(srcdir)/test_dpointer.kcfgc
-	../kconfig_compiler $(srcdir)/test_dpointer.kcfg $(srcdir)/test_dpointer.kcfgc
+test_dpointer.cpp test_dpointer.h: $(srcdir)/test_dpointer.kcfg ../tdeconfig_compiler $(srcdir)/test_dpointer.kcfgc
+	../tdeconfig_compiler $(srcdir)/test_dpointer.kcfg $(srcdir)/test_dpointer.kcfgc
 
 md5sums:
 	$(MD5SUM) $(srcdir)/test*.ref | sed -e "s,$(srcdir)/,,; s,\.ref$$,," > md5sums
diff --git a/tdecore/kconfig_compiler/tests/myprefs.h b/tdecore/tdeconfig_compiler/tests/myprefs.h
index 020dc6bfa..99ea62ec1 100644
--- a/tdecore/kconfig_compiler/tests/myprefs.h
+++ b/tdecore/tdeconfig_compiler/tests/myprefs.h
@@ -1,4 +1,4 @@
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 
 class MyPrefs : public TDEConfigSkeleton
 {
diff --git a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp b/tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.cpp
index c9f2f8471..e5bb3dcea 100644
--- a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
+++ b/tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.cpp
@@ -17,11 +17,11 @@
 #include <tqstring.h>
 #include <kdebug.h>
 #include <tdeunittest/module.h>
-#include "kconfigcompiler_test.h"
+#include "tdeconfigcompiler_test.h"
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( tdeunittest_kconfigcompiler_test, "TDEConfigXT")
+KUNITTEST_MODULE( tdeunittest_tdeconfigcompiler_test, "TDEConfigXT")
 KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigCompiler_Test )
 
 typedef const char * CompilerTestSet[];
diff --git a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h b/tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.h
index df3f4cf37..df3f4cf37 100644
--- a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h
+++ b/tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.h
diff --git a/tdecore/kconfig_compiler/tests/test1.cpp.ref b/tdecore/tdeconfig_compiler/tests/test1.cpp.ref
index d0b6b76f1..50f084874 100644
--- a/tdecore/kconfig_compiler/tests/test1.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test1.cpp.ref
@@ -1,4 +1,4 @@
-// This file is generated by kconfig_compiler from test1.kcfg.
+// This file is generated by tdeconfig_compiler from test1.kcfg.
 // All changes you do to this file will be lost.
 
 #include "test1.h"
diff --git a/tdecore/kconfig_compiler/tests/test1.h.ref b/tdecore/tdeconfig_compiler/tests/test1.h.ref
index 584dcb7ff..bb74038a5 100644
--- a/tdecore/kconfig_compiler/tests/test1.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test1.h.ref
@@ -1,9 +1,9 @@
-// This file is generated by kconfig_compiler from test1.kcfg.
+// This file is generated by tdeconfig_compiler from test1.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST1_H
 #define TEST1_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 #include <tqdir.h>
diff --git a/tdecore/kconfig_compiler/tests/test1.kcfg b/tdecore/tdeconfig_compiler/tests/test1.kcfg
index ce42aebfb..ce42aebfb 100644
--- a/tdecore/kconfig_compiler/tests/test1.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test1.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test1.kcfgc b/tdecore/tdeconfig_compiler/tests/test1.kcfgc
index ecab7b851..dd086cdda 100644
--- a/tdecore/kconfig_compiler/tests/test1.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test1.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 ClassName=Test1
 #
 # Singleton=false
diff --git a/tdecore/kconfig_compiler/tests/test1main.cpp b/tdecore/tdeconfig_compiler/tests/test1main.cpp
index 79546639f..79546639f 100644
--- a/tdecore/kconfig_compiler/tests/test1main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test1main.cpp
diff --git a/tdecore/kconfig_compiler/tests/test2.cpp.ref b/tdecore/tdeconfig_compiler/tests/test2.cpp.ref
index fe7b8af80..cc3f67b5e 100644
--- a/tdecore/kconfig_compiler/tests/test2.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test2.cpp.ref
@@ -1,4 +1,4 @@
-// This file is generated by kconfig_compiler from test2.kcfg.
+// This file is generated by tdeconfig_compiler from test2.kcfg.
 // All changes you do to this file will be lost.
 
 #include "test2.h"
diff --git a/tdecore/kconfig_compiler/tests/test2.h.ref b/tdecore/tdeconfig_compiler/tests/test2.h.ref
index 6c0a74d66..47895ccaf 100644
--- a/tdecore/kconfig_compiler/tests/test2.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test2.h.ref
@@ -1,11 +1,11 @@
-// This file is generated by kconfig_compiler from test2.kcfg.
+// This file is generated by tdeconfig_compiler from test2.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST2_H
 #define TEST2_H
 
 #include <myprefs.h>
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 class Test2 : public MyPrefs
diff --git a/tdecore/kconfig_compiler/tests/test2.kcfg b/tdecore/tdeconfig_compiler/tests/test2.kcfg
index 3b19e270e..3b19e270e 100644
--- a/tdecore/kconfig_compiler/tests/test2.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test2.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test2.kcfgc b/tdecore/tdeconfig_compiler/tests/test2.kcfgc
index 56620d2f4..e29040686 100644
--- a/tdecore/kconfig_compiler/tests/test2.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test2.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=test2.kcfg
 ClassName=Test2
 Singleton=false
diff --git a/tdecore/kconfig_compiler/tests/test2main.cpp b/tdecore/tdeconfig_compiler/tests/test2main.cpp
index 5970bf03d..5970bf03d 100644
--- a/tdecore/kconfig_compiler/tests/test2main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test2main.cpp
diff --git a/tdecore/kconfig_compiler/tests/test3.cpp.ref b/tdecore/tdeconfig_compiler/tests/test3.cpp.ref
index 3bd0eb8c9..be3e5c6c1 100644
--- a/tdecore/kconfig_compiler/tests/test3.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test3.cpp.ref
@@ -1,4 +1,4 @@
-// This file is generated by kconfig_compiler from test3.kcfg.
+// This file is generated by tdeconfig_compiler from test3.kcfg.
 // All changes you do to this file will be lost.
 
 #include "test3.h"
diff --git a/tdecore/kconfig_compiler/tests/test3.h.ref b/tdecore/tdeconfig_compiler/tests/test3.h.ref
index 4c35a138a..596e154e4 100644
--- a/tdecore/kconfig_compiler/tests/test3.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test3.h.ref
@@ -1,9 +1,9 @@
-// This file is generated by kconfig_compiler from test3.kcfg.
+// This file is generated by tdeconfig_compiler from test3.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TESTNAMESPACE_TEST3_H
 #define TESTNAMESPACE_TEST3_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 namespace TestNameSpace {
diff --git a/tdecore/kconfig_compiler/tests/test3.kcfg b/tdecore/tdeconfig_compiler/tests/test3.kcfg
index 77916da40..77916da40 100644
--- a/tdecore/kconfig_compiler/tests/test3.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test3.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test3.kcfgc b/tdecore/tdeconfig_compiler/tests/test3.kcfgc
index ca2c22057..d699810d0 100644
--- a/tdecore/kconfig_compiler/tests/test3.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test3.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=test3.kcfg
 NameSpace=TestNameSpace
 ClassName=Test3
diff --git a/tdecore/kconfig_compiler/tests/test3main.cpp b/tdecore/tdeconfig_compiler/tests/test3main.cpp
index f73ae38e3..f73ae38e3 100644
--- a/tdecore/kconfig_compiler/tests/test3main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test3main.cpp
diff --git a/tdecore/kconfig_compiler/tests/test4.cpp.ref b/tdecore/tdeconfig_compiler/tests/test4.cpp.ref
index c6b29bec2..c68437969 100644
--- a/tdecore/kconfig_compiler/tests/test4.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test4.cpp.ref
@@ -1,4 +1,4 @@
-// This file is generated by kconfig_compiler from test4.kcfg.
+// This file is generated by tdeconfig_compiler from test4.kcfg.
 // All changes you do to this file will be lost.
 
 #include "test4.h"
diff --git a/tdecore/kconfig_compiler/tests/test4.h.ref b/tdecore/tdeconfig_compiler/tests/test4.h.ref
index 9457413a1..9901a4208 100644
--- a/tdecore/kconfig_compiler/tests/test4.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test4.h.ref
@@ -1,9 +1,9 @@
-// This file is generated by kconfig_compiler from test4.kcfg.
+// This file is generated by tdeconfig_compiler from test4.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST4_H
 #define TEST4_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 class Test4 : public TDEConfigSkeleton
diff --git a/tdecore/kconfig_compiler/tests/test4.kcfg b/tdecore/tdeconfig_compiler/tests/test4.kcfg
index d8ef2bfae..d8ef2bfae 100644
--- a/tdecore/kconfig_compiler/tests/test4.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test4.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test4.kcfgc b/tdecore/tdeconfig_compiler/tests/test4.kcfgc
index 754706dff..a81655b6c 100644
--- a/tdecore/kconfig_compiler/tests/test4.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test4.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=test4.kcfg
 ClassName=Test4
 Singleton=true
diff --git a/tdecore/kconfig_compiler/tests/test4main.cpp b/tdecore/tdeconfig_compiler/tests/test4main.cpp
index 5229d8a87..5229d8a87 100644
--- a/tdecore/kconfig_compiler/tests/test4main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test4main.cpp
diff --git a/tdecore/kconfig_compiler/tests/test5.cpp.ref b/tdecore/tdeconfig_compiler/tests/test5.cpp.ref
index 9e295bc0e..17965999b 100644
--- a/tdecore/kconfig_compiler/tests/test5.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test5.cpp.ref
@@ -1,4 +1,4 @@
-// This file is generated by kconfig_compiler from test5.kcfg.
+// This file is generated by tdeconfig_compiler from test5.kcfg.
 // All changes you do to this file will be lost.
 
 #include "test5.h"
diff --git a/tdecore/kconfig_compiler/tests/test5.h.ref b/tdecore/tdeconfig_compiler/tests/test5.h.ref
index 274da4761..e2f1f8118 100644
--- a/tdecore/kconfig_compiler/tests/test5.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test5.h.ref
@@ -1,9 +1,9 @@
-// This file is generated by kconfig_compiler from test5.kcfg.
+// This file is generated by tdeconfig_compiler from test5.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST5_H
 #define TEST5_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 class Test5 : public TDEConfigSkeleton
diff --git a/tdecore/kconfig_compiler/tests/test5.kcfg b/tdecore/tdeconfig_compiler/tests/test5.kcfg
index d8ef2bfae..d8ef2bfae 100644
--- a/tdecore/kconfig_compiler/tests/test5.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test5.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test5.kcfgc b/tdecore/tdeconfig_compiler/tests/test5.kcfgc
index 663005e5e..dbc5603a0 100644
--- a/tdecore/kconfig_compiler/tests/test5.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test5.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=test5.kcfg
 ClassName=Test5
 Singleton=true
diff --git a/tdecore/kconfig_compiler/tests/test5main.cpp b/tdecore/tdeconfig_compiler/tests/test5main.cpp
index 89f28587f..89f28587f 100644
--- a/tdecore/kconfig_compiler/tests/test5main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test5main.cpp
diff --git a/tdecore/kconfig_compiler/tests/test6.cpp.ref b/tdecore/tdeconfig_compiler/tests/test6.cpp.ref
index fc19613a9..36717a7c8 100644
--- a/tdecore/kconfig_compiler/tests/test6.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test6.cpp.ref
@@ -1,4 +1,4 @@
-// This file is generated by kconfig_compiler from test6.kcfg.
+// This file is generated by tdeconfig_compiler from test6.kcfg.
 // All changes you do to this file will be lost.
 
 #include "test6.h"
diff --git a/tdecore/kconfig_compiler/tests/test6.h.ref b/tdecore/tdeconfig_compiler/tests/test6.h.ref
index eee776b5a..da83c90c4 100644
--- a/tdecore/kconfig_compiler/tests/test6.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test6.h.ref
@@ -1,9 +1,9 @@
-// This file is generated by kconfig_compiler from test6.kcfg.
+// This file is generated by tdeconfig_compiler from test6.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST6_H
 #define TEST6_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 class Test6 : public TDEConfigSkeleton
diff --git a/tdecore/kconfig_compiler/tests/test6.kcfg b/tdecore/tdeconfig_compiler/tests/test6.kcfg
index e59fa88f3..e59fa88f3 100644
--- a/tdecore/kconfig_compiler/tests/test6.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test6.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test6.kcfgc b/tdecore/tdeconfig_compiler/tests/test6.kcfgc
index b69dc152d..4c395ac08 100644
--- a/tdecore/kconfig_compiler/tests/test6.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test6.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=test6.kcfg
 ClassName=Test6
 Singleton=false
diff --git a/tdecore/kconfig_compiler/tests/test6main.cpp b/tdecore/tdeconfig_compiler/tests/test6main.cpp
index 9b1b7503e..9b1b7503e 100644
--- a/tdecore/kconfig_compiler/tests/test6main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test6main.cpp
diff --git a/tdecore/kconfig_compiler/tests/test7.cpp.ref b/tdecore/tdeconfig_compiler/tests/test7.cpp.ref
index 81f7de10e..e4b5f08f9 100644
--- a/tdecore/kconfig_compiler/tests/test7.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test7.cpp.ref
@@ -1,4 +1,4 @@
-// This file is generated by kconfig_compiler from test7.kcfg.
+// This file is generated by tdeconfig_compiler from test7.kcfg.
 // All changes you do to this file will be lost.
 
 #include "test7.h"
diff --git a/tdecore/kconfig_compiler/tests/test7.h.ref b/tdecore/tdeconfig_compiler/tests/test7.h.ref
index fb6dd6c77..8bd22ae97 100644
--- a/tdecore/kconfig_compiler/tests/test7.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test7.h.ref
@@ -1,9 +1,9 @@
-// This file is generated by kconfig_compiler from test7.kcfg.
+// This file is generated by tdeconfig_compiler from test7.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST7_H
 #define TEST7_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 class Test7 : public TDEConfigSkeleton
diff --git a/tdecore/kconfig_compiler/tests/test7.kcfg b/tdecore/tdeconfig_compiler/tests/test7.kcfg
index 0a7fd3272..0a7fd3272 100644
--- a/tdecore/kconfig_compiler/tests/test7.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test7.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test7.kcfgc b/tdecore/tdeconfig_compiler/tests/test7.kcfgc
index 9a6c40954..c50aac7e3 100644
--- a/tdecore/kconfig_compiler/tests/test7.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test7.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=test7.kcfg
 ClassName=Test7
 Singleton=false
diff --git a/tdecore/kconfig_compiler/tests/test7main.cpp b/tdecore/tdeconfig_compiler/tests/test7main.cpp
index 81cca0184..81cca0184 100644
--- a/tdecore/kconfig_compiler/tests/test7main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test7main.cpp
diff --git a/tdecore/kconfig_compiler/tests/test8a.cpp.ref b/tdecore/tdeconfig_compiler/tests/test8a.cpp.ref
index c0267452d..c0a9ddda5 100644
--- a/tdecore/kconfig_compiler/tests/test8a.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test8a.cpp.ref
@@ -1,4 +1,4 @@
-// This file is generated by kconfig_compiler from test8a.kcfg.
+// This file is generated by tdeconfig_compiler from test8a.kcfg.
 // All changes you do to this file will be lost.
 
 #include "test8a.h"
diff --git a/tdecore/kconfig_compiler/tests/test8a.h.ref b/tdecore/tdeconfig_compiler/tests/test8a.h.ref
index 747c6dd58..9913cfc49 100644
--- a/tdecore/kconfig_compiler/tests/test8a.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test8a.h.ref
@@ -1,10 +1,10 @@
-// This file is generated by kconfig_compiler from test8a.kcfg.
+// This file is generated by tdeconfig_compiler from test8a.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST8A_H
 #define TEST8A_H
 
 #include <kglobal.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 class Test8a : public TDEConfigSkeleton
diff --git a/tdecore/kconfig_compiler/tests/test8a.kcfg b/tdecore/tdeconfig_compiler/tests/test8a.kcfg
index 53448b624..53448b624 100644
--- a/tdecore/kconfig_compiler/tests/test8a.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test8a.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test8a.kcfgc b/tdecore/tdeconfig_compiler/tests/test8a.kcfgc
index 5f63c31c2..5f63c31c2 100644
--- a/tdecore/kconfig_compiler/tests/test8a.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test8a.kcfgc
diff --git a/tdecore/kconfig_compiler/tests/test8b.cpp.ref b/tdecore/tdeconfig_compiler/tests/test8b.cpp.ref
index 6a0a16b48..288faeb12 100644
--- a/tdecore/kconfig_compiler/tests/test8b.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test8b.cpp.ref
@@ -1,4 +1,4 @@
-// This file is generated by kconfig_compiler from test8b.kcfg.
+// This file is generated by tdeconfig_compiler from test8b.kcfg.
 // All changes you do to this file will be lost.
 
 #include "test8b.h"
diff --git a/tdecore/kconfig_compiler/tests/test8b.h.ref b/tdecore/tdeconfig_compiler/tests/test8b.h.ref
index 052746bfb..82ab5d92b 100644
--- a/tdecore/kconfig_compiler/tests/test8b.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test8b.h.ref
@@ -1,11 +1,11 @@
-// This file is generated by kconfig_compiler from test8b.kcfg.
+// This file is generated by tdeconfig_compiler from test8b.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST8B_H
 #define TEST8B_H
 
 #include <test8a.h>
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 class Test8b : public Test8a
diff --git a/tdecore/kconfig_compiler/tests/test8b.kcfg b/tdecore/tdeconfig_compiler/tests/test8b.kcfg
index 3e203a155..3e203a155 100644
--- a/tdecore/kconfig_compiler/tests/test8b.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test8b.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test8b.kcfgc b/tdecore/tdeconfig_compiler/tests/test8b.kcfgc
index 7be055203..7be055203 100644
--- a/tdecore/kconfig_compiler/tests/test8b.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test8b.kcfgc
diff --git a/tdecore/kconfig_compiler/tests/test8main.cpp b/tdecore/tdeconfig_compiler/tests/test8main.cpp
index 04864a95c..04864a95c 100644
--- a/tdecore/kconfig_compiler/tests/test8main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test8main.cpp
diff --git a/tdecore/kconfig_compiler/tests/test9.cpp.ref b/tdecore/tdeconfig_compiler/tests/test9.cpp.ref
index f6765fb42..a5ee144aa 100644
--- a/tdecore/kconfig_compiler/tests/test9.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test9.cpp.ref
@@ -1,4 +1,4 @@
-// This file is generated by kconfig_compiler from test9.kcfg.
+// This file is generated by tdeconfig_compiler from test9.kcfg.
 // All changes you do to this file will be lost.
 
 #include "test9.h"
diff --git a/tdecore/kconfig_compiler/tests/test9.h.ref b/tdecore/tdeconfig_compiler/tests/test9.h.ref
index 99d94c957..23755f411 100644
--- a/tdecore/kconfig_compiler/tests/test9.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test9.h.ref
@@ -1,9 +1,9 @@
-// This file is generated by kconfig_compiler from test9.kcfg.
+// This file is generated by tdeconfig_compiler from test9.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST9_H
 #define TEST9_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 #include <tqdir.h>
diff --git a/tdecore/kconfig_compiler/tests/test9.kcfg b/tdecore/tdeconfig_compiler/tests/test9.kcfg
index b7495e2b6..b7495e2b6 100644
--- a/tdecore/kconfig_compiler/tests/test9.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test9.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test9.kcfgc b/tdecore/tdeconfig_compiler/tests/test9.kcfgc
index 0a88064b6..47f5e5f43 100644
--- a/tdecore/kconfig_compiler/tests/test9.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test9.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 ClassName=Test9
 #
 # Singleton=false
diff --git a/tdecore/kconfig_compiler/tests/test9main.cpp b/tdecore/tdeconfig_compiler/tests/test9main.cpp
index 8668d8d8c..8668d8d8c 100644
--- a/tdecore/kconfig_compiler/tests/test9main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test9main.cpp
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref b/tdecore/tdeconfig_compiler/tests/test_dpointer.cpp.ref
index 3aad5b689..5aad12fe8 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test_dpointer.cpp.ref
@@ -1,4 +1,4 @@
-// This file is generated by kconfig_compiler from test_dpointer.kcfg.
+// This file is generated by tdeconfig_compiler from test_dpointer.kcfg.
 // All changes you do to this file will be lost.
 
 #include "test_dpointer.h"
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer.h.ref b/tdecore/tdeconfig_compiler/tests/test_dpointer.h.ref
index d9b7b94c1..0bd7e771e 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test_dpointer.h.ref
@@ -1,9 +1,9 @@
-// This file is generated by kconfig_compiler from test_dpointer.kcfg.
+// This file is generated by tdeconfig_compiler from test_dpointer.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TESTDPOINTER_H
 #define TESTDPOINTER_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 class TestDPointerPrivate;
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer.kcfg b/tdecore/tdeconfig_compiler/tests/test_dpointer.kcfg
index 3b19e270e..3b19e270e 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test_dpointer.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer.kcfgc b/tdecore/tdeconfig_compiler/tests/test_dpointer.kcfgc
index 48baa376e..83f4bce3b 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test_dpointer.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=test_dpointer.kcfg
 ClassName=TestDPointer
 Singleton=true
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer_main.cpp b/tdecore/tdeconfig_compiler/tests/test_dpointer_main.cpp
index b62ee17af..b62ee17af 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer_main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test_dpointer_main.cpp
diff --git a/tdecore/kconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp
index 178198509..5074f8d22 100644
--- a/tdecore/kconfigbackend.cpp
+++ b/tdecore/tdeconfigbackend.cpp
@@ -39,8 +39,8 @@
 #include <tqtextcodec.h>
 #include <tqtextstream.h>
 
-#include "kconfigbackend.h"
-#include "kconfigbase.h"
+#include "tdeconfigbackend.h"
+#include "tdeconfigbase.h"
 #include <kapplication.h>
 #include <kglobal.h>
 #include <kprocess.h>
diff --git a/tdecore/kconfigbackend.h b/tdecore/tdeconfigbackend.h
index 87ddfa3bb..c1092364c 100644
--- a/tdecore/kconfigbackend.h
+++ b/tdecore/tdeconfigbackend.h
@@ -22,8 +22,8 @@
 #ifndef _KCONFIGBACKEND_H
 #define _KCONFIGBACKEND_H
 
-#include "kconfigdata.h"
-#include <kconfigbase.h>
+#include "tdeconfigdata.h"
+#include <tdeconfigbase.h>
 #include <klockfile.h>
 #include <klocale.h>
 #include "tdelibs_export.h"
diff --git a/tdecore/kconfigbase.cpp b/tdecore/tdeconfigbase.cpp
index e65338c50..b00430f27 100644
--- a/tdecore/kconfigbase.cpp
+++ b/tdecore/tdeconfigbase.cpp
@@ -32,8 +32,8 @@
 #include <klocale.h>
 #include <kcharsets.h>
 
-#include "kconfigbase.h"
-#include "kconfigbackend.h"
+#include "tdeconfigbase.h"
+#include "tdeconfigbackend.h"
 #include "kdebug.h"
 #include "kstandarddirs.h"
 #include "kstringhandler.h"
@@ -1934,4 +1934,4 @@ bool TDEConfigBase::checkConfigFilesWritable(bool warnUser)
     return false;
 }
 
-#include "kconfigbase.moc"
+#include "tdeconfigbase.moc"
diff --git a/tdecore/kconfigbase.h b/tdecore/tdeconfigbase.h
index ff02babdd..b9522dcb6 100644
--- a/tdecore/kconfigbase.h
+++ b/tdecore/tdeconfigbase.h
@@ -32,7 +32,7 @@
 #include <tqvariant.h>
 #include <tqmap.h>
 
-#include "kconfigdata.h"
+#include "tdeconfigdata.h"
 #include "tdelibs_export.h"
 
 class TDEConfigBackEnd;
diff --git a/tdecore/kconfigdata.h b/tdecore/tdeconfigdata.h
index f99f72c08..f99f72c08 100644
--- a/tdecore/kconfigdata.h
+++ b/tdecore/tdeconfigdata.h
diff --git a/tdecore/kconfigdialogmanager.cpp b/tdecore/tdeconfigdialogmanager.cpp
index dfb81853b..c488e43cb 100644
--- a/tdecore/kconfigdialogmanager.cpp
+++ b/tdecore/tdeconfigdialogmanager.cpp
@@ -19,7 +19,7 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include "kconfigdialogmanager.h"
+#include "tdeconfigdialogmanager.h"
 
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>
@@ -31,7 +31,7 @@
 #include <tqwhatsthis.h>
 
 #include <kapplication.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 #include <kglobal.h>
 
@@ -394,5 +394,5 @@ bool TDEConfigDialogManager::isDefault()
   return result;
 }
 
-#include "kconfigdialogmanager.moc"
+#include "tdeconfigdialogmanager.moc"
 
diff --git a/tdecore/kconfigdialogmanager.h b/tdecore/tdeconfigdialogmanager.h
index 1b82e9eda..1b82e9eda 100644
--- a/tdecore/kconfigdialogmanager.h
+++ b/tdecore/tdeconfigdialogmanager.h
diff --git a/tdecore/kconfigskeleton.cpp b/tdecore/tdeconfigskeleton.cpp
index afc45bb87..0990949d0 100644
--- a/tdecore/kconfigskeleton.cpp
+++ b/tdecore/tdeconfigskeleton.cpp
@@ -22,7 +22,7 @@
 #include <tqcolor.h>
 #include <tqvariant.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
@@ -30,7 +30,7 @@
 
 #include "kstringhandler.h"
 
-#include "kconfigskeleton.h"
+#include "tdeconfigskeleton.h"
 
 void TDEConfigSkeletonItem::readImmutability( TDEConfig *config )
 {
diff --git a/tdecore/kconfigskeleton.h b/tdecore/tdeconfigskeleton.h
index 30dc98841..d9424e9df 100644
--- a/tdecore/kconfigskeleton.h
+++ b/tdecore/tdeconfigskeleton.h
@@ -33,7 +33,7 @@
 #include <tqsize.h>
 #include <tqstringlist.h>
 #include <tqvariant.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 
   /**
@@ -359,7 +359,7 @@ template < typename T > class TDEConfigSkeletonGenericItem:public TDEConfigSkele
    * for your own types and call the generic @ref addItem() to register them.
    *
    * In many cases you don't have to write the specific TDEConfigSkeleton
-   * subclasses yourself, but you can use \ref kconfig_compiler to automatically
+   * subclasses yourself, but you can use \ref tdeconfig_compiler to automatically
    * generate the C++ code from an XML description of the configuration options.
    */
 class TDECORE_EXPORT TDEConfigSkeleton
diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp
index d012c64aa..5044aab8e 100644
--- a/tdecore/tdehardwaredevices.cpp
+++ b/tdecore/tdehardwaredevices.cpp
@@ -25,7 +25,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktempfile.h>
 #include <ksimpledirwatch.h>
 #include <kstandarddirs.h>
diff --git a/tdecore/tdesycoca.cpp b/tdecore/tdesycoca.cpp
index f433510d6..31da8b741 100644
--- a/tdecore/tdesycoca.cpp
+++ b/tdecore/tdesycoca.cpp
@@ -450,7 +450,7 @@ void KSycoca::flagError()
          return;
       _self->d->readError = true;
       if (_self->d->autoRebuild)
-         if(system("kbuildsycoca") < 0) // Rebuild the damned thing.
+         if(system("tdebuildsycoca") < 0) // Rebuild the damned thing.
 	   tqWarning("ERROR: Running KSycoca failed.");
    }
 }
diff --git a/tdecore/tdesycoca.h b/tdecore/tdesycoca.h
index 1b3355de3..bf41da415 100644
--- a/tdecore/tdesycoca.h
+++ b/tdecore/tdesycoca.h
@@ -124,7 +124,7 @@ public:
    virtual bool isBuilding() { return false; }
 
    /**
-    * @internal - disables launching of kbuildsycoca
+    * @internal - disables launching of tdebuildsycoca
     */
    void disableAutoRebuild();
 
@@ -152,7 +152,7 @@ public:
 
 k_dcop:
    /**
-    * internal function for receiving kded/kbuildsycoca's signal, when the sycoca file changes
+    * internal function for receiving kded/tdebuildsycoca's signal, when the sycoca file changes
     */
    void notifyDatabaseChanged(const TQStringList &);
 
diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am
index 9d2c5259c..90ba46051 100644
--- a/tdecore/tests/Makefile.am
+++ b/tdecore/tests/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES = -I$(top_srcdir)/tdecore $(all_includes)
 
 AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
 
-check_PROGRAMS = kconfigtestgui klocaletest kprocesstest ksimpleconfigtest \
+check_PROGRAMS = tdeconfigtestgui klocaletest kprocesstest ksimpleconfigtest \
 	kstddirstest kurltest kuniqueapptest ktempfiletest krandomsequencetest \
 	kdebugtest ksocktest kstringhandlertest kcmdlineargstest kapptest \
 	kmemtest kidlservertest kidlclienttest dcopkonqtest kipctest \
@@ -38,7 +38,7 @@ noinst_HEADERS = klocaletest.h kprocesstest.h KIDLTest.h \
 METASOURCES = AUTO
 
 LDADD = ../libtdecore.la
-kconfigtestgui_SOURCES = kconfigtestgui.cpp
+tdeconfigtestgui_SOURCES = tdeconfigtestgui.cpp
 kdebugtest_SOURCES = kdebugtest.cpp
 klocaletest_SOURCES = klocaletest.cpp
 #klocaletest2_SOURCES = klocaletest2.cpp klocale.cpp libintl.cpp kcatalogue.cpp
@@ -79,8 +79,8 @@ kstdacceltest_SOURCES = kstdacceltest.cpp
 kglobaltest_SOURCES = kglobaltest.cpp
 ktimezonestest_SOURCES = ktimezonestest.cpp
 
-check_LTLIBRARIES = tdeunittest_kconfig.la
+check_LTLIBRARIES = tdeunittest_tdeconfig.la
 
-tdeunittest_kconfig_la_SOURCES = kconfigtest.cpp
-tdeunittest_kconfig_la_LIBADD = $(LIB_KUNITTEST)
-tdeunittest_kconfig_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
+tdeunittest_tdeconfig_la_SOURCES = tdeconfigtest.cpp
+tdeunittest_tdeconfig_la_LIBADD = $(LIB_KUNITTEST)
+tdeunittest_tdeconfig_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
diff --git a/tdecore/tests/ksimpleconfigtest.cpp b/tdecore/tests/ksimpleconfigtest.cpp
index f9fbffa65..85193f40b 100644
--- a/tdecore/tests/ksimpleconfigtest.cpp
+++ b/tdecore/tests/ksimpleconfigtest.cpp
@@ -20,7 +20,7 @@
 
 int main( int argc, char **argv )
 {
-  TDEApplication  a( argc, argv, "kconfigtest" );
+  TDEApplication  a( argc, argv, "tdeconfigtest" );
 
   KSimpleConfig aConfig( _PATH_TMP"/simpleconfig.cfg" );
 
diff --git a/tdecore/tests/kstddirstest.cpp b/tdecore/tests/kstddirstest.cpp
index fa7191cce..399282f14 100644
--- a/tdecore/tests/kstddirstest.cpp
+++ b/tdecore/tests/kstddirstest.cpp
@@ -2,7 +2,7 @@
 #include <kdebug.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 int main(int argc, char **argv)
 {
diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp
index f1284d394..178aec6d5 100644
--- a/tdecore/tests/kurltest.cpp
+++ b/tdecore/tests/kurltest.cpp
@@ -125,8 +125,8 @@ int main(int argc, char *argv[])
   baseURL = "http://www.foo.bar/top//test2/file2.html";
   check( "KURL::url()", baseURL.url(), "http://www.foo.bar/top//test2/file2.html" );
 
-  baseURL = "file:/usr/local/src/kde2/////tdelibs/kio";
-  check( "KURL::url()", baseURL.url(), "file:///usr/local/src/kde2/////tdelibs/kio" );
+  baseURL = "file:/usr/local/src/kde2/////tdelibs/tdeio";
+  check( "KURL::url()", baseURL.url(), "file:///usr/local/src/kde2/////tdelibs/tdeio" );
 
   baseURL = "http://www.foo.bar";
   KURL rel_url2( baseURL, "mailto:[email protected]" );
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
   baseURL = "mailto:[email protected]?subject=hello";
   check( "KURL::url()", baseURL.url(), "mailto:[email protected]?subject=hello" );
 
-  baseURL = "file:/usr/local/src/kde2/tdelibs/kio/";
+  baseURL = "file:/usr/local/src/kde2/tdelibs/tdeio/";
   KURL url2( baseURL, "../../////tdebase/konqueror" );
   check( "KURL::url()", url2.url(), "file:///usr/local/src/kde2/////tdebase/konqueror" );
 
@@ -318,8 +318,8 @@ int main(int argc, char *argv[])
           "http://www.google.com/foo%20%20%20%20%20%20 bar/");
 
   KURL carsten;
-  carsten.setPath("/home/gis/src/kde/tdelibs/kfile/.#kfiledetailview.cpp.1.18");
-  check("KURL::path()", carsten.path(), "/home/gis/src/kde/tdelibs/kfile/.#kfiledetailview.cpp.1.18");
+  carsten.setPath("/home/gis/src/kde/tdelibs/tdefile/.#tdefiledetailview.cpp.1.18");
+  check("KURL::path()", carsten.path(), "/home/gis/src/kde/tdelibs/tdefile/.#tdefiledetailview.cpp.1.18");
 
   KURL charles;
   charles.setPath( "/home/charles/foo%20moo" );
diff --git a/tdecore/tests/kconfigtest.cpp b/tdecore/tests/tdeconfigtest.cpp
index d3421a3d8..d9c89d6d4 100644
--- a/tdecore/tests/kconfigtest.cpp
+++ b/tdecore/tests/tdeconfigtest.cpp
@@ -20,7 +20,7 @@
 #include <tdeunittest/tester.h>
 #include <tdeunittest/module.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class TDEConfigTest : public KUnitTest::Tester
 {
@@ -31,7 +31,7 @@ private:
     void revertEntries();
 };
 
-KUNITTEST_MODULE( tdeunittest_kconfig, "TDEConfigTest" )
+KUNITTEST_MODULE( tdeunittest_tdeconfig, "TDEConfigTest" )
 KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigTest )
 
 // test data
@@ -52,7 +52,7 @@ KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigTest )
 
 void TDEConfigTest::writeConfigFile()
 {
-  TDEConfig sc( "kconfigtest" );
+  TDEConfig sc( "tdeconfigtest" );
 
   sc.setGroup("AAA");
   sc.writeEntry("stringEntry1", STRINGENTRY1, true, true);
@@ -89,7 +89,7 @@ void TDEConfigTest::writeConfigFile()
 void TDEConfigTest::revertEntries()
 {
   tqWarning("Reverting entries");
-  TDEConfig sc( "kconfigtest" );
+  TDEConfig sc( "tdeconfigtest" );
 
   sc.setGroup("Hello");
   sc.revertToDefault( "boolEntry1");
@@ -109,7 +109,7 @@ void TDEConfigTest::allTests()
 {
   writeConfigFile();
 
-  TDEConfig sc2( "kconfigtest" );
+  TDEConfig sc2( "tdeconfigtest" );
 
   TDEConfigGroup sc3( &sc2, "AAA");
   bool bImmutable = sc3.entryIsImmutable("stringEntry1");
diff --git a/tdecore/tests/kconfigtestgui.cpp b/tdecore/tests/tdeconfigtestgui.cpp
index 776082bfb..5ae85d26d 100644
--- a/tdecore/tests/kconfigtestgui.cpp
+++ b/tdecore/tests/tdeconfigtestgui.cpp
@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kconfigtestgui.h"
-#include "kconfigtestgui.moc"
+#include "tdeconfigtestgui.h"
+#include "tdeconfigtestgui.moc"
 
 //
 // configtest.cpp: libKDEcore example
@@ -45,7 +45,7 @@
 #include <tqpushbutton.h>
 
 // KDE includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #ifdef HAVE_PATHS_H
 #include <paths.h>
diff --git a/tdecore/tests/kconfigtestgui.h b/tdecore/tests/tdeconfigtestgui.h
index f5bbfd659..347a9c81d 100644
--- a/tdecore/tests/kconfigtestgui.h
+++ b/tdecore/tests/tdeconfigtestgui.h
@@ -33,7 +33,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 //
 // TDEConfigTestView contains lots of Qt widgets.