1214 files changed, 2349 insertions, 2349 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a1f952dd..3a9f23a4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,7 @@ OPTION( WITH_AVAHI "Enable AVAHI support" ${WITH_ALL_OPTIONS} )
 OPTION( WITH_ELFICON "Enable ELF embedded icon support" ${WITH_ALL_OPTIONS} )
 OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON )
 OPTION( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_INOTIFY "Enable inotify support for kio" ON )
+OPTION( WITH_INOTIFY "Enable inotify support for tdeio" ON )
 OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} )
 option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )
 OPTION( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF )
@@ -745,7 +745,7 @@ endif( )
 # before altering the LIBR_VERSION check,
 # please ensure that nothing changed in the
 # duplicated data definitions present in
-# kio/kio/kfileitem.cpp
+# tdeio/tdeio/tdefileitem.cpp
 
 if( WITH_ELFICON )
   pkg_search_module( LIBR libr )
@@ -886,7 +886,7 @@ configure_file( config.h.cmake config.h )
 configure_file( dcop/dcop-path.h.cmake dcop/dcop-path.h )
 configure_file( tdecore/kdemacros.h.cmake tdecore/kdemacros.h )
 configure_file( kjs/global.h.in kjs/global.h )
-configure_file( kio/kssl/ksslconfig.h.cmake kio/kssl/ksslconfig.h )
+configure_file( tdeio/kssl/ksslconfig.h.cmake tdeio/kssl/ksslconfig.h )
 configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
 
 
@@ -895,7 +895,7 @@ configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
 set( KDE3_DCOPIDL_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl/dcopidl )
 set( KDE3_DCOPIDL2CPP_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl2cpp/dcopidl2cpp )
 set( KDE3_MEINPROC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdoctools/meinproc )
-set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/tdecore/kconfig_compiler/kconfig_compiler )
+set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/tdecore/tdeconfig_compiler/tdeconfig_compiler )
 
 
 ##### global compiler settings ##################
@@ -937,7 +937,7 @@ add_subdirectory( tdeui )
 add_subdirectory( tdesu )
 add_subdirectory( kjs )
 add_subdirectory( tdewallet )
-add_subdirectory( kio )
+add_subdirectory( tdeio )
 add_subdirectory( kded )
 
 # FIXME this directory/target doesn't exists
@@ -962,11 +962,11 @@ if( XRANDR_FOUND )
   add_subdirectory( tderandr )
 endif( XRANDR_FOUND )
 add_subdirectory( tdehtml )
-add_subdirectory( kcmshell )
-add_subdirectory( kconf_update )
+add_subdirectory( tdecmshell )
+add_subdirectory( tdeconf_update )
 add_subdirectory( kdewidgets )
 add_subdirectory( kimgio )
-add_subdirectory( kioslave )
+add_subdirectory( tdeioslave )
 add_subdirectory( kstyles )
 add_subdirectory( libtdemid )
 add_subdirectory( libtdescreensaver )
@@ -977,7 +977,7 @@ add_subdirectory( licenses )
 add_subdirectory( dnssd )
 add_subdirectory( pics )
 add_subdirectory( mimetypes )
-add_subdirectory( kfile-plugins )
+add_subdirectory( tdefile-plugins )
 
 
 ##### install import cmake modules ###############
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index c373e83f5..131c74577 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -205,7 +205,7 @@ must have created a TDEApplication object before the methods can be used.<P>
   <TD COLSPAN="2">
     <PRE>
       #include &lt;kglobal.h&gt;
-      #include &lt;kconfig.h&gt;      // Needed to use TDEConfig
+      #include &lt;tdeconfig.h&gt;      // Needed to use TDEConfig
       #include &lt;klocale.h&gt;      // Needed to use KLocale
       #include &lt;kiconloader.h&gt;  // Needed to use KIconLoader
     </PRE>
@@ -501,20 +501,20 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
 <H3><A NAME="libkfm">libkfm has disappeared</A></H3>
 
   Lots of other functionalities have been taken out of kfm, some being
-  now in libkio, some in libkonq.<P>
+  now in libtdeio, some in libkonq.<P>
  <STRONG> Replacement table :</STRONG><P>
 <TABLE BORDER="1">
 
-<TR><TD>KFM::download         </TD><TD>-&gt; TDEIO::NetAccess::download (tdelibs/kio/netaccess.h)</TD></TR>
+<TR><TD>KFM::download         </TD><TD>-&gt; TDEIO::NetAccess::download (tdelibs/tdeio/netaccess.h)</TD></TR>
 <TR><TD>KFM::removeTempFile   </TD><TD>-&gt; TDEIO::NetAccess::removeTempFile</TD></TR>
 <TR><TD COLSPAN="2" ROWSPAN="0">refreshDesktop, sortDesktop, selectRootIcons : removed; kdesktop handles it</TD></TR>
 <TR><TD>KFM::configure        </TD><TD>-&gt; see konqueror DCOP interface</TD></TR>
-<TR><TD>KFM::openURL          </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/kio/krun.h)</TD></TR>
+<TR><TD>KFM::openURL          </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/tdeio/krun.h)</TD></TR>
 <TR><TD>KFM::refreshDirectory </TD><TD>-&gt; not needed anymore since konqy/kdesktop use KDirWatch</TD></TR>
-<TR><TD>KFM::openProperties   </TD><TD>-&gt; "(void) new KPropertiesDialog (url)" (tdelibs/kfile/kpropsdlg.h)</TD></TR>
-<TR><TD>KFM::exec             </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/kio/krun.h)</TD></TR>
-<TR><TD>KFM::copy, KFM::move  </TD><TD>-&gt; TDEIO::Job (async, see kio/job.h)<BR>
-                            or TDEIO::NetAccess (sync, see kio/netaccess.h)</TD></TR>
+<TR><TD>KFM::openProperties   </TD><TD>-&gt; "(void) new KPropertiesDialog (url)" (tdelibs/tdefile/kpropsdlg.h)</TD></TR>
+<TR><TD>KFM::exec             </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/tdeio/krun.h)</TD></TR>
+<TR><TD>KFM::copy, KFM::move  </TD><TD>-&gt; TDEIO::Job (async, see tdeio/job.h)<BR>
+                            or TDEIO::NetAccess (sync, see tdeio/netaccess.h)</TD></TR>
 <TR><TD>DlgLocation           </TD><TD>-&gt; Use KLineEditDlg (tdeui/klineeditdlg.h) instead</TD></TR>
 </TABLE>
 
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index 645bd7612..7d6130ac4 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -23,7 +23,7 @@ or <a href="http://doc.trolltech.com/3.0/porting.html">this page online</a>.<P>
 <LI><A HREF="#tdeparts">Changes in tdeparts</A></LI>
 <LI><A HREF="#tdespell">Changes in tdespell</A></LI>
 <LI><A HREF="#tdehtmlpart">API-cleanup in KHTML</A></LI>
-<LI><A HREF="#kfile">Changes in kfile</A></LI>
+<LI><A HREF="#tdefile">Changes in tdefile</A></LI>
 <LI><A HREF="#kcontrol">TDE Control Center</A></LI>
 <LI><A HREF="#kicker">Panel Applets and Extensions</A></LI>
 </UL>
@@ -214,7 +214,7 @@ The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
 <H4>KIconLoader, KIconTheme</H4>
 Methods now use KIcon::Group and KIcon::Context instead of int as types for group and context arguments.
 The change should affect only code using hardcoded numeric values instead of using the proper enum constants.
-This applies to classes KIconLoader, KIconTheme and (in kio and kfile) KMimeType, KService, KIconDialog, KIconButton,
+This applies to classes KIconLoader, KIconTheme and (in kio and tdefile) KMimeType, KService, KIconDialog, KIconButton,
 KURLBar and KURLBarItem.
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -416,7 +416,7 @@ TQString&) is not a slot anymore.
 
 <H4>KOpenWithHandler / KFileOpenWithHandler</H4>
 Those two classes are deprecated, no need to create a KFileOpenWithHandler anymore.
-The merging of libkio, libtdesycoca, libkfile and libkssl into a single libkio has
+The merging of libtdeio, libtdesycoca, libtdefile and libkssl into a single libtdeio has
 allowed to fix this dependency problem: KRun can now use the OpenWith dialog directly.
 
 <H4>KMimeType, KService</H4>
@@ -520,14 +520,14 @@ disable this use a #define KDE_NO_COMPAT.
 </ul>
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="kfile">Changes in kfile</A></H3>
-The kfile-library, as used by the KFileDialog provides classes for directory browsing widgets.
+<H3><A NAME="tdefile">Changes in tdefile</A></H3>
+The tdefile-library, as used by the KFileDialog provides classes for directory browsing widgets.
 Those classes gained some new features, some parts were merged with other existing classes
-and in some cases the API was cleaned up/fixed. The library is now built as part of libkio
-library (there's no need to modify Makefiles which use $LIB_KFILE instead of hardcoding -lkfile).
+and in some cases the API was cleaned up/fixed. The library is now built as part of libtdeio
+library (there's no need to modify Makefiles which use $LIB_KFILE instead of hardcoding -ltdefile).
 <p>
 Even if the list of changes is long, the affected code base should be relatively small, as most
-parts are rarely used outside of kfile.
+parts are rarely used outside of tdefile.
 <p>
 The changes are:
 <H4>KFileItem</H4>
diff --git a/Mainpage.dox b/Mainpage.dox
index ef5745224..15904678c 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -20,8 +20,8 @@
 	* - <a target="_top" href="kjs/html/index.html"><b>kjs</b></a>
         *   (<a target="_top" href="kjs/html/classes.html">classes</a>)\n
 	*   <i>Javascript (aka. ECMAScript and JScript) support.</i>
-	* - <a target="_top" href="kio/html/index.html"><b>kio</b></a>
-        *   (<a target="_top" href="kio/kio/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tdeio/html/index.html"><b>kio</b></a>
+        *   (<a target="_top" href="tdeio/tdeio/html/classes.html">classes</a>)\n
 	*   <i>Low level access to network files. Also provides access to facilities
 	*   such as KDirWatcher which monitors directories for changes.</i>
 	* - <a target="_top" href="tdeparts/html/index.html"><b>tdeparts</b></a>
diff --git a/Makefile.am.in b/Makefile.am.in
index 10e9219dd..83d0901fa 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -27,7 +27,7 @@ COMPILE_BEFORE_kabc = kab tderesources
 COMPILE_BEFORE_kate = interfaces tdeutils
 COMPILE_BEFORE_tdemdi = tdeutils
 COMPILE_BEFORE_tdespell2 = tdeutils
-COMPILE_BEFORE_kcmshell = tdeutils
+COMPILE_BEFORE_tdecmshell = tdeutils
 COMPILE_BEFORE_kdewidgets = kabc tdehtml
 COMPILE_BEFORE_interfaces = arts kabc
 
diff --git a/README b/README
index 1392e27c5..c96978eb9 100644
--- a/README
+++ b/README
@@ -42,7 +42,7 @@ Here is an alphabetical list:
 * tdecert
     Personal certification manager.
 
-* kconf_update
+* tdeconf_update
     Auto-Updater for config files.
 
 * tdecore
@@ -89,7 +89,7 @@ Here is an alphabetical list:
     contains "tdesycoca", the system configure cache containing services,
     applications, servicetypes and mimetypes.
 
-* kioslave
+* tdeioslave
     I/O subprocesses to handle files, ftp, http, gzip and bzip2 streams.
 
 * kjs
diff --git a/TODO b/TODO
index dcbfec292..75f989156 100644
--- a/TODO
+++ b/TODO
@@ -180,9 +180,9 @@ that we would like to make for the next binary incompatible release.
 
 - KWallet::Wallet::* functions - remove the default = 0 argument for mainwindow for the dialog
 
-- Make libtdewalletclient part of libkio and get rid of libtdewalletclient.
+- Make libtdewalletclient part of libtdeio and get rid of libtdewalletclient.
 
-- Get rid of libtdesu dependency in libkio, get rid of SessionData::AuthData*,
+- Get rid of libtdesu dependency in libtdeio, get rid of SessionData::AuthData*,
   get rid of SlaveInterface::authorizationKey and SlaveInterface::delAuthorization
 
 - Make functions in KHelpMenu virtual so they can be overridden (ex: to provide
@@ -215,7 +215,7 @@ an alternative help->contents action)
 - Move TDEIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint,
   to merge that code.
 
-- Refactor the kio/bookmarks code so we don't need to use the static d-pointer trick anymore.
+- Refactor the tdeio/bookmarks code so we don't need to use the static d-pointer trick anymore.
 
 - Rename the parameters to KDEDesktopMimeType::pixmap so that they use meaningful names rather than
   just a, b, c, and d. Probably not something that has to wait for KDE 4, but seems like a good idea
diff --git a/arts/kde/CMakeLists.txt b/arts/kde/CMakeLists.txt
index 3877ddb9d..3b585256d 100644
--- a/arts/kde/CMakeLists.txt
+++ b/arts/kde/CMakeLists.txt
@@ -18,8 +18,8 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -65,6 +65,6 @@ add_custom_command(
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.2.0
-  LINK kio-shared mcop artsflow_idl kmedia2_idl soundserver_idl artsflow qtmcop
+  LINK tdeio-shared mcop artsflow_idl kmedia2_idl soundserver_idl artsflow qtmcop
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp
index 4ff509980..bf6b3654a 100644
--- a/arts/kde/kioinputstream_impl.cpp
+++ b/arts/kde/kioinputstream_impl.cpp
@@ -31,9 +31,9 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kio/job.h>
-#include <kio/kmimetype.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/kmimetype.h>
+#include <tdeio/jobclasses.h>
 #include <tqtimer.h>
 #include <tqdatastream.h>
 #include "artsversion.h"
diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h
index d0a872881..1d18f6421 100644
--- a/arts/kde/kioinputstream_impl.h
+++ b/arts/kde/kioinputstream_impl.h
@@ -24,7 +24,7 @@
 
 #include <tqobject.h>
 #include <tqcstring.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <kurl.h>
 #include "artskde.h"
 #include "stdsynthmodule.h" 
diff --git a/arts/kde/kplayobjectcreator.cc b/arts/kde/kplayobjectcreator.cc
index 2e8187e67..039c8a3bc 100644
--- a/arts/kde/kplayobjectcreator.cc
+++ b/arts/kde/kplayobjectcreator.cc
@@ -19,7 +19,7 @@
 
 	*/
 
-#include <kio/kmimetype.h>
+#include <tdeio/kmimetype.h>
 #include "artskde.h"
 #include "kplayobjectcreator.h"
 #include "kplayobjectcreator.moc"
diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc
index db4110792..fa9e2c5a1 100644
--- a/arts/kde/kplayobjectfactory.cc
+++ b/arts/kde/kplayobjectfactory.cc
@@ -19,7 +19,7 @@
 
 	*/
 
-#include <kio/kmimetype.h>
+#include <tdeio/kmimetype.h>
 #include "kplayobject.h"
 #include "artskde.h"
 #include "kplayobjectfactory.h"
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include "kaudiomanagerplay.h"
 #include <flowsystem.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 using namespace std;
 
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index b8c1642f9..71006c1a7 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -50,7 +50,7 @@
 #include <kartsserver.h>
 #endif
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/configure.in.in b/configure.in.in
index c899ee519..00870d24c 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -252,9 +252,9 @@ AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la')
 AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la')
 AC_SUBST(LIB_TDECORE, '$(top_builddir)/tdecore/libtdecore.la')
 AC_SUBST(LIB_TDEUI, '$(top_builddir)/tdeui/libtdeui.la')
-AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la')
-AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la')
-AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la')
+AC_SUBST(LIB_KIO, '$(top_builddir)/tdeio/libtdeio.la')
+AC_SUBST(LIB_KFILE, '$(top_builddir)/tdeio/libtdeio.la')
+AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/tdeio/libtdeio.la')
 AC_SUBST(LIB_KHTML, '$(top_builddir)/tdehtml/libtdehtml.la')
 AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
 AC_SUBST(LIB_KPARTS, '$(top_builddir)/tdeparts/libtdeparts.la')
@@ -308,7 +308,7 @@ AC_SUBST(DCOPIDL, '$(top_builddir)/dcop/dcopidl/dcopidl')
 AC_SUBST(DCOPIDLNG, '$(top_srcdir)/dcop/dcopidlng/dcopidlng')
 AC_SUBST(DCOPIDL2CPP, '$(top_builddir)/dcop/dcopidl2cpp/dcopidl2cpp')
 AC_SUBST(MAKEKDEWIDGETS, '$(top_builddir)/kdewidgets/makekdewidgets')
-AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/tdecore/kconfig_compiler/kconfig_compiler')
+AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/tdecore/tdeconfig_compiler/tdeconfig_compiler')
 
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $X_LDFLAGS -lICE"
diff --git a/configure.in.mid b/configure.in.mid
index 669f0d13c..bf0c8d021 100644
--- a/configure.in.mid
+++ b/configure.in.mid
@@ -1,7 +1,7 @@
 dnl put here things which have to be done after all usual autoconf macros
 dnl have been run, but before the Makefiles are created
 
-all_includes='-I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl -I$(top_srcdir)/tdefx -I$(top_builddir)/tdecore -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdecore/network -I$(top_srcdir)/tdeui -I$(top_srcdir)/kio -I$(top_srcdir)/kio/kio -I$(top_srcdir)/kio/kfile -I$(top_srcdir) $(QT_INCLUDES) $(X_INCLUDES) $(KDE_INCLUDES) $(USER_INCLUDES)'
+all_includes='-I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl -I$(top_srcdir)/tdefx -I$(top_builddir)/tdecore -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdecore/network -I$(top_srcdir)/tdeui -I$(top_srcdir)/tdeio -I$(top_srcdir)/tdeio/tdeio -I$(top_srcdir)/tdeio/tdefile -I$(top_srcdir) $(QT_INCLUDES) $(X_INCLUDES) $(KDE_INCLUDES) $(USER_INCLUDES)'
 AC_SUBST(all_includes)
 
 CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
diff --git a/dcop/client/dcopfind.cpp b/dcop/client/dcopfind.cpp
index a4bcb67bb..940d62fd6 100644
--- a/dcop/client/dcopfind.cpp
+++ b/dcop/client/dcopfind.cpp
@@ -166,16 +166,16 @@ bool launchApp(TQString app)
     TQDataStream arg(data, IO_WriteOnly);
     arg << app << URLs;
 
-    if ( !dcop->call( "klauncher", "klauncher", "start_service_by_desktop_name(TQString,TQStringList)",
+    if ( !dcop->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)",
                       data, replyType, replyData) ) {
-	tqWarning( "call to klauncher failed.");
+	tqWarning( "call to tdelauncher failed.");
         return false;
     }
     TQDataStream reply(replyData, IO_ReadOnly);
 
     if ( replyType != "serviceResult" )
     {
-        tqWarning( "unexpected result '%s' from klauncher.", replyType.data());
+        tqWarning( "unexpected result '%s' from tdelauncher.", replyType.data());
         return false;
     }
     int result;
diff --git a/dcop/client/dcopstart.cpp b/dcop/client/dcopstart.cpp
index 737184385..a3ea04726 100644
--- a/dcop/client/dcopstart.cpp
+++ b/dcop/client/dcopstart.cpp
@@ -49,7 +49,7 @@ void startApp(const char *_app, int argc, const char **args)
     TQDataStream arg(data, IO_WriteOnly);
     arg << app << URLs;
 
-    if ( !dcop->call( "klauncher", "klauncher", function,  data, replyType, replyData) ) {
+    if ( !dcop->call( "tdelauncher", "tdelauncher", function,  data, replyType, replyData) ) {
 	tqWarning( "call failed");
         exit(1);
     } else {
diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus
index 41f49333d..ec16d8fa8 100644
--- a/dcop/dcopidlng/kalyptus
+++ b/dcop/dcopidlng/kalyptus
@@ -1514,7 +1514,7 @@ sub makeParamList($$$)
 		}
 
 		if (defined $defaultparam && $isEnum) {
-			# Remove any casts in enum values, for example this in kfileitem.h:
+			# Remove any casts in enum values, for example this in tdefileitem.h:
 			#  'enum { Unknown = (mode_t) - 1 };'
 			$defaultparam =~ s/\([^\)]+\)(.*[0-9].*)/$1/;
 		}
diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt
index 09d96161d..01be9831c 100644
--- a/dnssd/CMakeLists.txt
+++ b/dnssd/CMakeLists.txt
@@ -45,6 +45,6 @@ tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
   LINK tdecore-shared
-  DEPENDENCIES kconfig_compiler
+  DEPENDENCIES tdeconfig_compiler
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/doc/api/kfiledialog.png b/doc/api/tdefiledialog.png
index fa54aa3b2..fa54aa3b2 100644
--- a/doc/api/kfiledialog.png
+++ b/doc/api/tdefiledialog.png
diff --git a/doc/tdelibs/man-kbuildsycoca.8.docbook b/doc/tdelibs/man-tdebuildsycoca.8.docbook
index 670c000c0..243e0f9a5 100644
--- a/doc/tdelibs/man-kbuildsycoca.8.docbook
+++ b/doc/tdelibs/man-tdebuildsycoca.8.docbook
@@ -34,7 +34,7 @@
 <title>Synopsis</title>
 
 <cmdsynopsis>
-<command>kbuildsycoca</command>
+<command>tdebuildsycoca</command>
 
 <group>
 <arg choice="opt">--nosignal</arg>
diff --git a/interfaces/kio/CMakeLists.txt b/interfaces/kio/CMakeLists.txt
index efcecf65e..a8d8a2189 100644
--- a/interfaces/kio/CMakeLists.txt
+++ b/interfaces/kio/CMakeLists.txt
@@ -13,5 +13,5 @@
 
 install( FILES
     http.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
 
diff --git a/interfaces/kio/Makefile.am b/interfaces/kio/Makefile.am
index 8fad24200..daa98db05 100644
--- a/interfaces/kio/Makefile.am
+++ b/interfaces/kio/Makefile.am
@@ -1,3 +1,3 @@
-kioincludedir = $(includedir)/kio
+kioincludedir = $(includedir)/tdeio
 kioinclude_HEADERS = http.h
 
diff --git a/interfaces/kregexpeditor/Makefile.am b/interfaces/kregexpeditor/Makefile.am
index 2007129da..4e8f5af2a 100644
--- a/interfaces/kregexpeditor/Makefile.am
+++ b/interfaces/kregexpeditor/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) $(all_includes)
 
 include_HEADERS = kregexpeditorinterface.h
 
diff --git a/interfaces/tdeimproxy/library/CMakeLists.txt b/interfaces/tdeimproxy/library/CMakeLists.txt
index 9aa1f60ee..40974d722 100644
--- a/interfaces/tdeimproxy/library/CMakeLists.txt
+++ b/interfaces/tdeimproxy/library/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -45,7 +45,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
   DEPENDENCIES dcopidl
 )
diff --git a/interfaces/tdemediaplayer/CMakeLists.txt b/interfaces/tdemediaplayer/CMakeLists.txt
index 00ab7f3d9..0c9355560 100644
--- a/interfaces/tdemediaplayer/CMakeLists.txt
+++ b/interfaces/tdemediaplayer/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 if( ARTS_FOUND )
-  add_subdirectory( kfileaudiopreview )
+  add_subdirectory( tdefileaudiopreview )
 endif( ARTS_FOUND )
 
 include_directories(
diff --git a/interfaces/tdemediaplayer/Makefile.am b/interfaces/tdemediaplayer/Makefile.am
index 0b7aded07..91ed342bd 100644
--- a/interfaces/tdemediaplayer/Makefile.am
+++ b/interfaces/tdemediaplayer/Makefile.am
@@ -1,8 +1,8 @@
 if include_ARTS
-kfileaudiopreview_subdir = kfileaudiopreview
+tdefileaudiopreview_subdir = tdefileaudiopreview
 endif
 
-SUBDIRS = . $(kfileaudiopreview_subdir)
+SUBDIRS = . $(tdefileaudiopreview_subdir)
 INCLUDES = -I$(srcdir)/.. $(all_includes)
 
 lib_LTLIBRARIES = libtdemediaplayer.la
diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am
deleted file mode 100644
index 4f88a0c87..000000000
--- a/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-INCLUDES = -I$(top_srcdir)/interfaces/ -I$(top_srcdir)/arts/kde -I$(includedir)/arts $(all_includes)
-METASOURCES = AUTO
-
-kde_module_LTLIBRARIES = kfileaudiopreview.la
-
-kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp
-kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
-kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
-
-noinst_HEADERS = kfileaudiopreview.h
-
-messages:
-	$(XGETTEXT) $(kfileaudiopreview_la_SOURCES) -o $(podir)/kfileaudiopreview.pot
diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt b/interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt
index 17485b65a..8e561e1f3 100644
--- a/interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt
@@ -19,9 +19,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/interfaces
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${CMAKE_SOURCE_DIR}/arts/kde
 )
 
@@ -31,12 +31,12 @@ link_directories(
 )
 
 
-##### kfileaudiopreview #########################
+##### tdefileaudiopreview #########################
 
-set( target kfileaudiopreview )
+set( target tdefileaudiopreview )
 
 set( ${target}_SRCS
-  kfileaudiopreview.cpp
+  tdefileaudiopreview.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
new file mode 100644
index 000000000..d73cf545f
--- /dev/null
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
@@ -0,0 +1,13 @@
+INCLUDES = -I$(top_srcdir)/interfaces/ -I$(top_srcdir)/arts/kde -I$(includedir)/arts $(all_includes)
+METASOURCES = AUTO
+
+kde_module_LTLIBRARIES = tdefileaudiopreview.la
+
+tdefileaudiopreview_la_SOURCES = tdefileaudiopreview.cpp
+tdefileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
+tdefileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
+
+noinst_HEADERS = tdefileaudiopreview.h
+
+messages:
+	$(XGETTEXT) $(tdefileaudiopreview_la_SOURCES) -o $(podir)/tdefileaudiopreview.pot
diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
index 1d83fc590..7dd746c4f 100644
--- a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
@@ -1,4 +1,4 @@
-#include "kfileaudiopreview.h"
+#include "tdefileaudiopreview.h"
 
 #include <tqcheckbox.h>
 #include <tqhbox.h>
@@ -6,7 +6,7 @@
 #include <tqvgroupbox.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
 #include <klocale.h>
 #include <tdemediaplayer/player.h>
@@ -15,7 +15,7 @@
 
 #include <kplayobjectfactory.h>
 
-#include <config-kfile.h>
+#include <config-tdefile.h>
 
 class KFileAudioPreviewFactory : public KLibFactory
 {
@@ -29,7 +29,7 @@ protected:
     }
 };
 
-K_EXPORT_COMPONENT_FACTORY( kfileaudiopreview, KFileAudioPreviewFactory )
+K_EXPORT_COMPONENT_FACTORY( tdefileaudiopreview, KFileAudioPreviewFactory )
 
 
 ///////////////////////////////////////////////////////////////////
@@ -56,7 +56,7 @@ public:
 KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
     : KPreviewWidgetBase( parent, name )
 {
-    TDEGlobal::locale()->insertCatalogue("kfileaudiopreview");    
+    TDEGlobal::locale()->insertCatalogue("tdefileaudiopreview");    
 
     TQStringList formats = KDE::PlayObjectFactory::mimeTypes();
     // ###
@@ -143,4 +143,4 @@ void KFileAudioPreview::toggleAuto( bool on )
 void KFileAudioPreview::virtual_hook( int, void* )
 {}
 
-#include "kfileaudiopreview.moc"
+#include "tdefileaudiopreview.moc"
diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
index de48e4712..de48e4712 100644
--- a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
diff --git a/interfaces/tdescript/CMakeLists.txt b/interfaces/tdescript/CMakeLists.txt
index bcddb1068..6b57cdeb9 100644
--- a/interfaces/tdescript/CMakeLists.txt
+++ b/interfaces/tdescript/CMakeLists.txt
@@ -19,8 +19,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -51,6 +51,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/interfaces/tdescript/Makefile.am b/interfaces/tdescript/Makefile.am
index 55d4cac35..03c7efc87 100644
--- a/interfaces/tdescript/Makefile.am
+++ b/interfaces/tdescript/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = . sample
 
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes)
 
 #lib_LTLIBRARIES = libtdescriptloader.la libtdescript.la
 lib_LTLIBRARIES = libtdescript.la
diff --git a/interfaces/tdescript/sample/Makefile.am b/interfaces/tdescript/sample/Makefile.am
index 77d39b28c..e20854c70 100644
--- a/interfaces/tdescript/sample/Makefile.am
+++ b/interfaces/tdescript/sample/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/tdescript $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/tdescript $(all_includes)
 
 kde_module_LTLIBRARIES = libshellscript.la
 
diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index 79fa2055a..1ff34f98a 100644
--- a/interfaces/tdescript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -23,7 +23,7 @@
 #include <tdeparts/componentfactory.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdesktopfile.h>
 #include <kstandarsdirs.h>
 #include <kstdaccel.h>
diff --git a/interfaces/tdetexteditor/CMakeLists.txt b/interfaces/tdetexteditor/CMakeLists.txt
index a9d39edbb..0808a84f3 100644
--- a/interfaces/tdetexteditor/CMakeLists.txt
+++ b/interfaces/tdetexteditor/CMakeLists.txt
@@ -20,8 +20,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/kabc
   ${CMAKE_SOURCE_DIR}/interfaces
 )
diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am
index 5663bb761..fce0ec563 100644
--- a/interfaces/tdetexteditor/Makefile.am
+++ b/interfaces/tdetexteditor/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces  -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces  -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
 
 lib_LTLIBRARIES = libtdetexteditor.la
 
diff --git a/interfaces/tdetexteditor/configinterface.h b/interfaces/tdetexteditor/configinterface.h
index ed6a80d81..10a6173a0 100644
--- a/interfaces/tdetexteditor/configinterface.h
+++ b/interfaces/tdetexteditor/configinterface.h
@@ -57,7 +57,7 @@ class KTEXTEDITOR_EXPORT ConfigInterface
     virtual void writeConfig () = 0;           
                                                                          
     /**
-      Read/Write the config of the part to a given kconfig object
+      Read/Write the config of the part to a given tdeconfig object
       to store the settings in a different place than the standard
     */
     virtual void readConfig (TDEConfig *) = 0;
diff --git a/interfaces/tdetexteditor/editorchooser.cpp b/interfaces/tdetexteditor/editorchooser.cpp
index 807d342d0..ce493018d 100644
--- a/interfaces/tdetexteditor/editorchooser.cpp
+++ b/interfaces/tdetexteditor/editorchooser.cpp
@@ -3,7 +3,7 @@
 
 #include <tqcombobox.h>
 #include <ktrader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqstringlist.h>
 #include <kservice.h>
 #include <klocale.h>
diff --git a/kabc/CMakeLists.txt b/kabc/CMakeLists.txt
index 5f2619cf9..57c4741fe 100644
--- a/kabc/CMakeLists.txt
+++ b/kabc/CMakeLists.txt
@@ -29,8 +29,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/kab
 )
 
@@ -58,7 +58,7 @@ install( FILES
 
 ##### other data ################################
 
-install( FILES kab2kabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
+install( FILES tdeab2tdeabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
 install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources )
 install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/kabc )
 
@@ -102,18 +102,18 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.2.0
-  LINK vcards-static vcard-shared kio-shared tderesources-shared
+  LINK vcards-static vcard-shared tdeio-shared tderesources-shared
   DEPENDENCIES addressee.h dcopidl
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
 
-##### kab2kabc ##################################
+##### tdeab2tdeabc ##################################
 
-set( target kab2kabc )
+set( target tdeab2tdeabc )
 
 set( ${target}_SRCS
-  kab2kabc.cpp
+  tdeab2tdeabc.cpp
 )
 
 tde_add_executable( ${target}
diff --git a/kabc/Makefile.am b/kabc/Makefile.am
index ef989662f..57e72aec2 100644
--- a/kabc/Makefile.am
+++ b/kabc/Makefile.am
@@ -50,13 +50,13 @@ kabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \
 
 METASOURCES = AUTO
 
-bin_PROGRAMS = kab2kabc
+bin_PROGRAMS = tdeab2tdeabc
 
-kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kab2kabc_LDADD = libkabc.la ../kab/libkab.la
-kab2kabc_SOURCES = kab2kabc.cpp
+tdeab2tdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeab2tdeabc_LDADD = libkabc.la ../kab/libkab.la
+tdeab2tdeabc_SOURCES = tdeab2tdeabc.cpp
 
-autostart_DATA = kab2kabc.desktop
+autostart_DATA = tdeab2tdeabc.desktop
 autostartdir = $(datadir)/autostart
 
 manager_DATA = kabc_manager.desktop
diff --git a/kabc/addresseehelper.cpp b/kabc/addresseehelper.cpp
index 908795869..5b8998852 100644
--- a/kabc/addresseehelper.cpp
+++ b/kabc/addresseehelper.cpp
@@ -19,7 +19,7 @@
 
 #include <tqapplication.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include "addresseehelper.h"
diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp
index 76d99f634..efb0738aa 100644
--- a/kabc/addresslineedit.cpp
+++ b/kabc/addresslineedit.cpp
@@ -33,7 +33,7 @@
 #include <tqdragobject.h>
 
 #include <kcompletionbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
diff --git a/kabc/formatfactory.h b/kabc/formatfactory.h
index 76a3704d5..ff9da5504 100644
--- a/kabc/formatfactory.h
+++ b/kabc/formatfactory.h
@@ -24,7 +24,7 @@
 #include <tqdict.h>
 #include <tqstring.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
 
 #include "formatplugin.h"
diff --git a/kabc/formats/CMakeLists.txt b/kabc/formats/CMakeLists.txt
index 327cb1ea6..60ea1c3fd 100644
--- a/kabc/formats/CMakeLists.txt
+++ b/kabc/formats/CMakeLists.txt
@@ -18,8 +18,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
diff --git a/kabc/ldapclient.cpp b/kabc/ldapclient.cpp
index 568408ba2..f696ae915 100644
--- a/kabc/ldapclient.cpp
+++ b/kabc/ldapclient.cpp
@@ -30,7 +30,7 @@
 #include <tqurl.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kprotocolinfo.h>
diff --git a/kabc/ldapclient.h b/kabc/ldapclient.h
index 5f8513599..f43a644ce 100644
--- a/kabc/ldapclient.h
+++ b/kabc/ldapclient.h
@@ -31,7 +31,7 @@
 #include <tqguardedptr.h>
 #include <tqtimer.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 namespace KABC {
 
diff --git a/kabc/ldapconfigwidget.h b/kabc/ldapconfigwidget.h
index 0fd0dd7e5..01074292e 100644
--- a/kabc/ldapconfigwidget.h
+++ b/kabc/ldapconfigwidget.h
@@ -27,7 +27,7 @@
 
 #include <kabc/ldapurl.h>
 #include <kabc/ldif.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class TQGridLayout;
 class TQSpinBox;
diff --git a/kabc/plugins/dir/CMakeLists.txt b/kabc/plugins/dir/CMakeLists.txt
index 47f81a355..737d1144e 100644
--- a/kabc/plugins/dir/CMakeLists.txt
+++ b/kabc/plugins/dir/CMakeLists.txt
@@ -20,9 +20,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 link_directories(
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index 0dfd0352a..6b1759f1d 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -29,7 +29,7 @@
 #include <tqwidget.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kglobal.h>
diff --git a/kabc/plugins/dir/resourcedir.h b/kabc/plugins/dir/resourcedir.h
index a7b041643..f62ee91ba 100644
--- a/kabc/plugins/dir/resourcedir.h
+++ b/kabc/plugins/dir/resourcedir.h
@@ -21,7 +21,7 @@
 #ifndef KABC_RESOURCEDIR_H
 #define KABC_RESOURCEDIR_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdirwatch.h>
 
 #include <sys/types.h>
diff --git a/kabc/plugins/file/CMakeLists.txt b/kabc/plugins/file/CMakeLists.txt
index 3dbcd639f..f8847d7e9 100644
--- a/kabc/plugins/file/CMakeLists.txt
+++ b/kabc/plugins/file/CMakeLists.txt
@@ -20,9 +20,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 link_directories(
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 3e5b1fa8f..2d2008c0d 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -30,9 +30,9 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 #include <klocale.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
diff --git a/kabc/plugins/file/resourcefile.h b/kabc/plugins/file/resourcefile.h
index 494c43ea6..3d2efe85f 100644
--- a/kabc/plugins/file/resourcefile.h
+++ b/kabc/plugins/file/resourcefile.h
@@ -21,7 +21,7 @@
 #ifndef KABC_RESOURCEFILE_H
 #define KABC_RESOURCEFILE_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdirwatch.h>
 
 #include <sys/types.h>
diff --git a/kabc/plugins/ldapkio/CMakeLists.txt b/kabc/plugins/ldapkio/CMakeLists.txt
index 150377bd9..0869c54e1 100644
--- a/kabc/plugins/ldapkio/CMakeLists.txt
+++ b/kabc/plugins/ldapkio/CMakeLists.txt
@@ -20,9 +20,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfiles
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefiles
 )
 
 link_directories(
@@ -68,6 +68,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kabc_ldapkio-shared
+  LINK kabc_ldaptdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldapkio/resourceldapkio.cpp
index cdf21fb82..034fb0ef8 100644
--- a/kabc/plugins/ldapkio/resourceldapkio.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkio.cpp
@@ -29,12 +29,12 @@
 #include <kstandarddirs.h>
 #include <klineedit.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstringhandler.h>
 #include <ktempfile.h>
 
 #include <stdlib.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kabc/ldif.h>
 #include <kabc/ldapurl.h>
 
diff --git a/kabc/plugins/ldapkio/resourceldapkio.h b/kabc/plugins/ldapkio/resourceldapkio.h
index 6f40b12f8..5c9282b9c 100644
--- a/kabc/plugins/ldapkio/resourceldapkio.h
+++ b/kabc/plugins/ldapkio/resourceldapkio.h
@@ -24,7 +24,7 @@
 
 #include <kabc/resource.h>
 #include <kabc/ldif.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class TDEConfig;
 
diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
index 53c72aa2b..b517cffa5 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
@@ -36,7 +36,7 @@
 #include <klocale.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "resourceldapkio.h"
 
diff --git a/kabc/plugins/net/CMakeLists.txt b/kabc/plugins/net/CMakeLists.txt
index 365922d6c..e92fbfc32 100644
--- a/kabc/plugins/net/CMakeLists.txt
+++ b/kabc/plugins/net/CMakeLists.txt
@@ -20,9 +20,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 link_directories(
diff --git a/kabc/plugins/net/resourcenet.cpp b/kabc/plugins/net/resourcenet.cpp
index 78fb16256..9ef909904 100644
--- a/kabc/plugins/net/resourcenet.cpp
+++ b/kabc/plugins/net/resourcenet.cpp
@@ -21,8 +21,8 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kio/netaccess.h>
-#include <kio/scheduler.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/scheduler.h>
 #include <klocale.h>
 #include <ksavefile.h>
 #include <ktempfile.h>
diff --git a/kabc/plugins/net/resourcenet.h b/kabc/plugins/net/resourcenet.h
index a13bfa175..940627ecb 100644
--- a/kabc/plugins/net/resourcenet.h
+++ b/kabc/plugins/net/resourcenet.h
@@ -21,7 +21,7 @@
 #ifndef KABC_RESOURCENET_H
 #define KABC_RESOURCENET_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <sys/types.h>
 
diff --git a/kabc/plugins/sql/resourcesql.h b/kabc/plugins/sql/resourcesql.h
index 9f1201844..770e5b73b 100644
--- a/kabc/plugins/sql/resourcesql.h
+++ b/kabc/plugins/sql/resourcesql.h
@@ -21,7 +21,7 @@
 #ifndef KABC_RESOURCESQL_H
 #define KABC_RESOURCESQL_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "addressbook.h"
 #include "resource.h"
diff --git a/kabc/scripts/field.src.cpp b/kabc/scripts/field.src.cpp
index 6362d223c..2c80810b7 100644
--- a/kabc/scripts/field.src.cpp
+++ b/kabc/scripts/field.src.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "field.h"
diff --git a/kabc/kab2kabc.cpp b/kabc/tdeab2tdeabc.cpp
index 11b80639a..afb688078 100644
--- a/kabc/kab2kabc.cpp
+++ b/kabc/tdeab2tdeabc.cpp
@@ -25,7 +25,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
@@ -330,7 +330,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
       } else if ( (*customIt).startsWith( "KMail:1.0\n" ) ) {
         readKAddressBookEntries( *customIt, a );
       } else {
-        a.insertCustom( "kab2kabc", TQString::number( count++ ), *customIt );
+        a.insertCustom( "tdeab2tdeabc", TQString::number( count++ ), *customIt );
       }
     }
     if ( idFound ) {
@@ -432,7 +432,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
 
 int main( int argc, char **argv )
 {
-  TDEAboutData aboutData( "kab2kabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" );
+  TDEAboutData aboutData( "tdeab2tdeabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/kabc/kab2kabc.desktop b/kabc/tdeab2tdeabc.desktop
index 3015b3935..945f044d4 100644
--- a/kabc/kab2kabc.desktop
+++ b/kabc/tdeab2tdeabc.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=kab2kabc
+Name=tdeab2tdeabc
 Name[af]=kab-na-kabc
 Name[csb]=Kònwersëjô adresowi knéżczi
 Name[eo]=Konvertilo de "kab" al "kabc"
@@ -13,8 +13,8 @@ Name[pt_BR]=Conversão de  kab para kabc
 Name[ro]=Kab2kabc
 Name[sv]=Kab2kabc
 Name[te]=కెఎబి2కెఎబిసి
-Name[zu]=i-kab2kabc
-Exec=kab2kabc --disable-autostart --quiet
+Name[zu]=i-tdeab2tdeabc
+Exec=tdeab2tdeabc --disable-autostart --quiet
 Icon=misc
 Type=Application
 Comment=libkab to libkabc conversion tool.
@@ -101,5 +101,5 @@ Comment[zh_TW]=libkab 至 libkabc 轉�工具
 Comment[zu]=Ithuluzi lokuguqula le-libkab kuyaku-libkabc
 Terminal=false
 NoDisplay=true
-X-TDE-autostart-condition=kab2kabcrc:Startup:EnableAutostart:true
+X-TDE-autostart-condition=tdeab2tdeabcrc:Startup:EnableAutostart:true
 OnlyShowIn=TDE;
diff --git a/kate/data/bash.xml b/kate/data/bash.xml
index 84c91596d..e3bc4abdd 100644
--- a/kate/data/bash.xml
+++ b/kate/data/bash.xml
@@ -439,7 +439,7 @@
       <!-- others -->
       <item> dcop </item>
       <item> kdialog </item>
-      <item> kfile </item>
+      <item> tdefile </item>
       <item> xhost </item>
       <item> xmodmap </item>
       <item> xset </item>
diff --git a/kate/data/tcsh.xml b/kate/data/tcsh.xml
index f9dffa2e4..19c94beaa 100644
--- a/kate/data/tcsh.xml
+++ b/kate/data/tcsh.xml
@@ -431,7 +431,7 @@
       <!-- others -->
       <item> dcop </item>
       <item> kdialog </item>
-      <item> kfile </item>
+      <item> tdefile </item>
       <item> xhost </item>
       <item> xmodmap </item>
       <item> xset </item>
diff --git a/kate/data/zsh.xml b/kate/data/zsh.xml
index 5d0575ab9..e69c15354 100644
--- a/kate/data/zsh.xml
+++ b/kate/data/zsh.xml
@@ -497,7 +497,7 @@
       <!-- others -->
       <item> dcop </item>
       <item> kdialog </item>
-      <item> kfile </item>
+      <item> tdefile </item>
       <item> xhost </item>
       <item> xmodmap </item>
       <item> xset </item>
diff --git a/kate/interfaces/katecmd.cpp b/kate/interfaces/katecmd.cpp
index 69263b57c..2104ef157 100644
--- a/kate/interfaces/katecmd.cpp
+++ b/kate/interfaces/katecmd.cpp
@@ -118,7 +118,7 @@ const TQString KateCmd::fromHistory( uint index ) const
 //BEGIN KateCmdShellCompletion
 /*
    A lot of the code in the below class is copied from
-   tdelibs/kio/kio/kshellcompletion.cpp
+   tdelibs/tdeio/tdeio/kshellcompletion.cpp
    Copyright (C) 2000 David Smith <dsmith@algonet.se>
    Copyright (C) 2004 Anders Lund <anders@alweb.dk>
 */
diff --git a/kate/part/CMakeLists.txt b/kate/part/CMakeLists.txt
index 72ac36f8a..dcbc0eecd 100644
--- a/kate/part/CMakeLists.txt
+++ b/kate/part/CMakeLists.txt
@@ -21,9 +21,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${CMAKE_SOURCE_DIR}/kjs
   ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/tdeprint
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index 81b001c3c..d1c9fd1ee 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -28,7 +28,7 @@
 #include <math.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <kcharsets.h>
 #include <klocale.h>
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index 43f5977d8..5006ddd6c 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -38,9 +38,9 @@
 #include <tdetexteditor/configinterfaceextension.h>
 #include <tdetexteditor/plugin.h>
 
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
 
 #include <kaccel.h>
 #include <kapplication.h>
@@ -50,7 +50,7 @@
 #include <kcolorcombo.h>
 #include <kcolordialog.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kfontdialog.h>
 #include <kglobal.h>
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 03c8ac638..74e5c3225 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -42,9 +42,9 @@
 #include "katetemplatehandler.h"
 #include <tdetexteditor/plugin.h>
 
-#include <kio/job.h>
-#include <kio/netaccess.h>
-#include <kio/kfileitem.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/tdefileitem.h>
 
 
 #include <tdeparts/event.h>
@@ -53,8 +53,8 @@
 #include <kglobal.h>
 #include <kapplication.h>
 #include <kpopupmenu.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
@@ -1924,13 +1924,13 @@ void KateDocument::writeConfig()
   config->sync();
 }
 
-void KateDocument::readSessionConfig(TDEConfig *kconfig)
+void KateDocument::readSessionConfig(TDEConfig *tdeconfig)
 {
   // restore the url
-  KURL url (kconfig->readEntry("URL"));
+  KURL url (tdeconfig->readEntry("URL"));
 
   // get the encoding
-  TQString tmpenc=kconfig->readEntry("Encoding");
+  TQString tmpenc=tdeconfig->readEntry("Encoding");
   if (!tmpenc.isEmpty() && (tmpenc != encoding()))
     setEncoding(tmpenc);
 
@@ -1939,34 +1939,34 @@ void KateDocument::readSessionConfig(TDEConfig *kconfig)
     openURL (url);
 
   // restore the hl stuff
-  m_buffer->setHighlight(KateHlManager::self()->nameFind(kconfig->readEntry("Highlighting")));
+  m_buffer->setHighlight(KateHlManager::self()->nameFind(tdeconfig->readEntry("Highlighting")));
 
   if (hlMode() > 0)
     hlSetByUser = true;
 
   // indent mode
-  config()->setIndentationMode( (uint)kconfig->readNumEntry("Indentation Mode", config()->indentationMode() ) );
+  config()->setIndentationMode( (uint)tdeconfig->readNumEntry("Indentation Mode", config()->indentationMode() ) );
 
   // Restore Bookmarks
-  TQValueList<int> marks = kconfig->readIntListEntry("Bookmarks");
+  TQValueList<int> marks = tdeconfig->readIntListEntry("Bookmarks");
   for( uint i = 0; i < marks.count(); i++ )
     addMark( marks[i], KateDocument::markType01 );
 }
 
-void KateDocument::writeSessionConfig(TDEConfig *kconfig)
+void KateDocument::writeSessionConfig(TDEConfig *tdeconfig)
 {
   if ( m_url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/"))
        return;
   // save url
-  kconfig->writeEntry("URL", m_url.prettyURL() );
+  tdeconfig->writeEntry("URL", m_url.prettyURL() );
 
   // save encoding
-  kconfig->writeEntry("Encoding",encoding());
+  tdeconfig->writeEntry("Encoding",encoding());
 
   // save hl
-  kconfig->writeEntry("Highlighting", highlight()->name());
+  tdeconfig->writeEntry("Highlighting", highlight()->name());
 
-  kconfig->writeEntry("Indentation Mode", config()->indentationMode() );
+  tdeconfig->writeEntry("Indentation Mode", config()->indentationMode() );
 
   // Save Bookmarks
   TQValueList<int> marks;
@@ -1975,7 +1975,7 @@ void KateDocument::writeSessionConfig(TDEConfig *kconfig)
        ++it )
      marks << it.current()->line;
 
-  kconfig->writeEntry( "Bookmarks", marks );
+  tdeconfig->writeEntry( "Bookmarks", marks );
 }
 
 void KateDocument::configDialog()
diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp
index a00d39bfb..15dd7c9f6 100644
--- a/kate/part/katefiletype.cpp
+++ b/kate/part/katefiletype.cpp
@@ -25,7 +25,7 @@
 #include "kateview.h"
 #include "katefactory.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmimemagic.h>
 #include <kmimetype.h>
 #include <kmimetypechooser.h>
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index 08da7e97f..f06518649 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -32,7 +32,7 @@
 #include "kateschema.h"
 #include "kateconfig.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kinstance.h>
 #include <kmimetype.h>
diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h
index 1b71e454a..8ff5e31b2 100644
--- a/kate/part/katehighlight.h
+++ b/kate/part/katehighlight.h
@@ -26,7 +26,7 @@
 
 #include "../interfaces/document.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqptrlist.h>
 #include <tqvaluelist.h>
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index 28b22c74e..f3a5cd548 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -37,7 +37,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kjs/function_object.h>
 #include <kjs/interpreter.h>
@@ -688,7 +688,7 @@ void KateJScriptManager::collectScripts (bool force)
         TDEConfig df (desktopFile, true, false);
         df.setDesktopGroup ();
 
-        // get cmdname, fallback to baseName, if it is empty, therefor not use the kconfig fallback
+        // get cmdname, fallback to baseName, if it is empty, therefor not use the tdeconfig fallback
         TQString cmdname = df.readEntry ("X-Kate-Command");
         if (cmdname.isEmpty())
         {
diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp
index c06f3864e..46cf531a7 100644
--- a/kate/part/kateluaindentscript.cpp
+++ b/kate/part/kateluaindentscript.cpp
@@ -31,7 +31,7 @@
 #include <tqfileinfo.h>
 #include <kstandarddirs.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 
diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h
index f6eb8ef60..2e92812de 100644
--- a/kate/part/kateschema.h
+++ b/kate/part/kateschema.h
@@ -29,7 +29,7 @@
 #include <tqlistview.h>
 #include <tqfont.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 
 class KateView;
@@ -53,7 +53,7 @@ class KateSchemaManager
     void update (bool readfromfile = true);
 
     /**
-     * return kconfig with right group set or set to Normal if not there
+     * return tdeconfig with right group set or set to Normal if not there
      */
     TDEConfig *schema (uint number);
 
diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp
index 4093f8722..d90f5de73 100644
--- a/kate/part/katesyntaxdocument.cpp
+++ b/kate/part/katesyntaxdocument.cpp
@@ -27,7 +27,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqfile.h>
 
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index 193f411fd..22a4799d6 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -50,9 +50,9 @@
 
 #include <tdeparts/event.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurldrag.h>
 #include <kdebug.h>
 #include <kapplication.h>
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index 4f2ef26a5..1463c8bcd 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -42,7 +42,7 @@
 #include <kaction.h>
 #include <kcmdlineargs.h>
 #include "katefactory.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmainwindow.h>
 #include <ksimpleconfig.h>
 #include <kglobalsettings.h>
diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp
index ceb76eedd..cf3190c4e 100644
--- a/kate/plugins/autobookmarker/autobookmarker.cpp
+++ b/kate/plugins/autobookmarker/autobookmarker.cpp
@@ -30,7 +30,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
 #include <klistview.h>
diff --git a/kate/plugins/insertfile/CMakeLists.txt b/kate/plugins/insertfile/CMakeLists.txt
index 0c80a1e0c..56bdfd9cd 100644
--- a/kate/plugins/insertfile/CMakeLists.txt
+++ b/kate/plugins/insertfile/CMakeLists.txt
@@ -16,9 +16,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${CMAKE_SOURCE_DIR}/interfaces
 )
 
diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp
index ee46a7cff..aa9f998b6 100644
--- a/kate/plugins/insertfile/insertfileplugin.cpp
+++ b/kate/plugins/insertfile/insertfileplugin.cpp
@@ -24,9 +24,9 @@
 #include <tdetexteditor/editinterface.h>
 
 #include <assert.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp
index 26c49576d..de1c1c376 100644
--- a/kate/plugins/isearch/ISearchPlugin.cpp
+++ b/kate/plugins/isearch/ISearchPlugin.cpp
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kaction.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "ISearchPlugin.h"
diff --git a/kate/plugins/kdatatool/CMakeLists.txt b/kate/plugins/kdatatool/CMakeLists.txt
index 1adced175..7ceccc10d 100644
--- a/kate/plugins/kdatatool/CMakeLists.txt
+++ b/kate/plugins/kdatatool/CMakeLists.txt
@@ -17,8 +17,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/interfaces
 )
 
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index a468edd13..fbd5a4db7 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -34,7 +34,7 @@
 #include <tdetexteditor/variableinterface.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index 903126ca8..ee693fb4a 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -18,8 +18,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -51,16 +51,16 @@ set( ${target}_SRCS
 # modules need this library
 tde_add_tdeinit_executable( ${target} AUTOMOC EXPORT
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
 )
 
 
-#### kbuildsycoca ###############################
+#### tdebuildsycoca ###############################
 
-set( target kbuildsycoca )
+set( target tdebuildsycoca )
 
 set( ${target}_SRCS
-  kbuildsycoca.cpp kbuildservicetypefactory.cpp
+  tdebuildsycoca.cpp kbuildservicetypefactory.cpp
   kbuildservicefactory.cpp kbuildservicegroupfactory.cpp
   kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp
   kctimefactory.cpp vfolder_menu.cpp
@@ -68,7 +68,7 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
 )
 
 
@@ -87,31 +87,31 @@ tde_add_executable( ${target}
 )
 
 
-#### kde-menu ###################################
+#### tde-menu ###################################
 
-set( target kde-menu )
+set( target tde-menu )
 
 set( ${target}_SRCS
-  kde-menu.cpp
+  tde-menu.cpp
 )
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 
-#### kmimelist ##################################
+#### tdemimelist ##################################
 
-set( target kmimelist )
+set( target tdemimelist )
 
 set( ${target}_SRCS
-  kmimelist.cpp
+  tdemimelist.cpp
 )
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kded/DESIGN b/kded/DESIGN
index e6653807b..0fffb0456 100644
--- a/kded/DESIGN
+++ b/kded/DESIGN
@@ -6,9 +6,9 @@ cache of servicetypes, mimetypes and services, for a particular user.
 
 It uses KDirWatch to monitor the directories contain the .desktop files.
 When a file is added/removed, it waits 5 seconds (in case of series of
-updates), and then launches kbuildsycoca.
+updates), and then launches tdebuildsycoca.
 
-kbuildsycoca recreates the sycoca file by:
+tdebuildsycoca recreates the sycoca file by:
 * parsing all .desktop files, replacing global ones by local ones (at any
   level of the hierarchy)
 * creating all objects in memory
diff --git a/kded/Makefile.am b/kded/Makefile.am
index 1baf30e4f..093b5db0e 100644
--- a/kded/Makefile.am
+++ b/kded/Makefile.am
@@ -20,15 +20,15 @@
 INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(all_includes)
 
 lib_LTLIBRARIES =
-tdeinit_LTLIBRARIES = kded.la kbuildsycoca.la
+tdeinit_LTLIBRARIES = kded.la tdebuildsycoca.la
 
 kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
 kded_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 kded_la_SOURCES = kded.cpp kdedmodule.cpp
 
-kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kbuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
-kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
+tdebuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
+tdebuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
+tdebuildsycoca_la_SOURCES = tdebuildsycoca.cpp kbuildservicetypefactory.cpp \
 				kbuildservicefactory.cpp \
 				kbuildservicegroupfactory.cpp \
 				kbuildimageiofactory.cpp \
@@ -36,25 +36,25 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
 				kctimefactory.cpp \
 				vfolder_menu.cpp
 
-bin_PROGRAMS = kdontchangethehostname kde-menu kmimelist
+bin_PROGRAMS = kdontchangethehostname tde-menu tdemimelist
 
 kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kdontchangethehostname_LDADD = $(LIB_TDECORE)
 kdontchangethehostname_SOURCES = khostname.cpp
 
-kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kmimelist_LDADD = ../kio/libkio.la
-kmimelist_SOURCES = kmimelist.cpp
+tdemimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdemimelist_LDADD = ../tdeio/libtdeio.la
+tdemimelist_SOURCES = tdemimelist.cpp
 
 kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kde_menu_LDADD = $(LIB_KIO)
-kde_menu_SOURCES = kde-menu.cpp
+kde_menu_SOURCES = tde-menu.cpp
 
 METASOURCES = AUTO
 
 include_HEADERS = kdedmodule.h
 
-noinst_HEADERS = kbuildsycoca.h kbuildservicetypefactory.h \
+noinst_HEADERS = tdebuildsycoca.h kbuildservicetypefactory.h \
 		kbuildservicefactory.h kbuildservicegroupfactory.h \
 		kbuildimageiofactory.h kresourcelist.h \
 		kbuildprotocolinfofactory.h
@@ -65,7 +65,7 @@ servicetypedir = $(kde_servicetypesdir)
 xdg_menu_DATA = applications.menu applications.menu-no-kde
 
 update_DATA = kded.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 include $(top_srcdir)/admin/Doxyfile.am
 
diff --git a/kded/README.kded b/kded/README.kded
index 1cf382279..7265a1084 100644
--- a/kded/README.kded
+++ b/kded/README.kded
@@ -7,19 +7,19 @@ Some of these tasks are built in, others are started on demand.
 Built in tasks
 ==============
 *) Checking for newly installed software and updating tdesycoca when new
-software is detected. Updating of tdesycoca is done by the program kbuildsycoca
+software is detected. Updating of tdesycoca is done by the program tdebuildsycoca
 which gets started by kded. When kded is first started it always runs
-kbuildsycoca to ensure that tdesycoca is up to date.
+tdebuildsycoca to ensure that tdesycoca is up to date.
 
 *) Checking for newly installed update files. Applications can install
 *.upd update files. These *.upd files are used to update configuration files 
 of users, primarily when new versions of applications are installed with
 (slightly) different configuration file formats. Updating of configuration
-files is done by kconf_update. kded starts kconf_update when it detects a 
-new update file. When kded is first started it always runs kconf_update to
-ensure that it has not missed any update files. kconf_update keeps track
+files is done by tdeconf_update. kded starts tdeconf_update when it detects a 
+new update file. When kded is first started it always runs tdeconf_update to
+ensure that it has not missed any update files. tdeconf_update keeps track
 of which update files have been processed already in the config-file
-kconf_updaterc. It only performs a certain update once.
+tdeconf_updaterc. It only performs a certain update once.
 
 *) Checking for hostname changes. It is a really bad idea to change the 
 hostname of a running system and it usually only happens with incorrectly
@@ -42,12 +42,12 @@ and has a default of 5000 (5 seconds).
 CheckSycoca: This option can be used to disable checking for new software.
 tdesycoca will still be built when kded starts up and when applications
 explicitly request a rebuild of the tdesycoca database. The user can 
-also manually rebuild tdesycoca by running the kbuildsycoca program.
+also manually rebuild tdesycoca by running the tdebuildsycoca program.
 The default value of this option is "true". Checking can be disabled by 
 setting this option to "false".
 
 CheckUpdates: This option can be used to disable checking for update files.
-kconf_update will still be run when kded starts up.
+tdeconf_update will still be run when kded starts up.
 The default value of this option is "true". Checking can be disabled by 
 setting this option to "false".
 
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 11c46e064..b769fa508 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -45,7 +45,7 @@
 #include <kdirwatch.h>
 #include <kstandarddirs.h>
 #include <kdatastream.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kservicetype.h>
 
 #ifdef Q_WS_X11
@@ -65,27 +65,27 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0)
    if(checkStamps)
       args.append("--checkstamps");
    if(delayedCheck)
-      args.append("--nocheckfiles");
+      args.append("--nochectdefiles");
    else
       checkStamps = false; // useful only during kded startup
    if (callBackObj)
    {
       TQByteArray data;
       TQDataStream dataStream( data, IO_WriteOnly );
-      dataStream << TQString("kbuildsycoca") << args;
+      dataStream << TQString("tdebuildsycoca") << args;
       TQCString _launcher = TDEApplication::launcher();
 
       kapp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot);
    }
    else
    {
-      TDEApplication::tdeinitExecWait( "kbuildsycoca", args );
+      TDEApplication::tdeinitExecWait( "tdebuildsycoca", args );
    }
 }
 
 static void runKonfUpdate()
 {
-   TDEApplication::tdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ );
+   TDEApplication::tdeinitExecWait( "tdeconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ );
 }
 
 static void runDontChangeHostname(const TQCString &oldName, const TQCString &newName)
@@ -97,7 +97,7 @@ static void runDontChangeHostname(const TQCString &oldName, const TQCString &new
 }
 
 Kded::Kded(bool checkUpdates, bool new_startup)
-  : DCOPObject("kbuildsycoca"), DCOPObjectProxy(),
+  : DCOPObject("tdebuildsycoca"), DCOPObjectProxy(),
     b_checkUpdates(checkUpdates),
     m_needDelayedCheck(false),
     m_newStartup( new_startup )
@@ -665,7 +665,7 @@ KUpdateD::KUpdateD()
     TQObject::connect( m_pDirWatch, TQT_SIGNAL(dirty(const TQString&)),
            this, TQT_SLOT(slotNewUpdateFile()));
 
-    TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kconf_update");
+    TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdeconf_update");
     for( TQStringList::ConstIterator it = dirs.begin();
          it != dirs.end();
          ++it )
@@ -957,7 +957,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
      // During startup kdesktop waits for KDED to finish.
      // Send a notifyDatabaseChanged signal even if the database hasn't
      // changed.
-     // If the database changed, kbuildsycoca's signal didn't go anywhere
+     // If the database changed, tdebuildsycoca's signal didn't go anywhere
      // anyway, because it was too early, so let's send this signal
      // unconditionnally (David)
      TQByteArray data;
diff --git a/kded/kded.h b/kded/kded.h
index 93aac0ab6..a4968624a 100644
--- a/kded/kded.h
+++ b/kded/kded.h
@@ -37,7 +37,7 @@
 class KDirWatch;
 class KService;
 
-// No need for this in libkio - apps only get readonly access
+// No need for this in libtdeio - apps only get readonly access
 class Kded : public TQObject, public DCOPObject, public DCOPObjectProxy
 {
   Q_OBJECT
diff --git a/kded/kdedmodule.cpp b/kded/kdedmodule.cpp
index ca28a5c62..6371b2534 100644
--- a/kded/kdedmodule.cpp
+++ b/kded/kdedmodule.cpp
@@ -24,7 +24,7 @@
 
 #include "kded.h"
 #include "kdedmodule.h"
-#include "kconfigdata.h"
+#include "tdeconfigdata.h"
 
 typedef TQMap<KEntryKey, KSharedPtr<KShared> > KDEDObjectMap;
 
diff --git a/kded/kde-menu.cpp b/kded/tde-menu.cpp
index 5c1a38b4d..6a8721915 100644
--- a/kded/kde-menu.cpp
+++ b/kded/tde-menu.cpp
@@ -42,7 +42,7 @@ static KCmdLineOptions options[] = {
    KCmdLineLastOption
 };
 
-static const char appName[] = "kde-menu";
+static const char appName[] = "tde-menu";
 static const char appVersion[] = "1.0";
 static bool utf8;
 
@@ -60,7 +60,7 @@ static void result(const TQString &txt)
 
 static void error(int exitCode, const TQString &txt)
 {
-   tqWarning("kde-menu: %s", txt.local8Bit().data());
+   tqWarning("tde-menu: %s", txt.local8Bit().data());
    exit(exitCode);
 }
 
@@ -113,7 +113,7 @@ int main(int argc, char **argv)
    "The --highlight option can be used to visually indicate to the user where\n"
    "in the TDE menu a specific application is located.");
    
-   TDEAboutData d(appName, I18N_NOOP("kde-menu"), appVersion,
+   TDEAboutData d(appName, I18N_NOOP("tde-menu"), appVersion,
                 description,
                 TDEAboutData::License_GPL, "(c) 2003 Waldo Bastian");
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
@@ -146,11 +146,11 @@ int main(int argc, char **argv)
       TQStringList args;
       args.append("--incremental");
       args.append("--checkstamps");
-      TQString command = "kbuildsycoca";
+      TQString command = "tdebuildsycoca";
       TQCString _launcher = TDEApplication::launcher();
       if (!DCOPRef(_launcher, _launcher).call("tdeinit_exec_wait", command, args).isValid())
       {
-         tqWarning("Can't talk to klauncher!");
+         tqWarning("Can't talk to tdelauncher!");
          command = TDEGlobal::dirs()->findExe(command);
          command += " " + args.join(" ");
          system(command.local8Bit());
diff --git a/kded/kbuildsycoca.cpp b/kded/tdebuildsycoca.cpp
index 13a645395..47b7a9bf4 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/tdebuildsycoca.cpp
@@ -21,7 +21,7 @@
 #include <tqeventloop.h>
 #include <config.h>
 
-#include "kbuildsycoca.h"
+#include "tdebuildsycoca.h"
 #include "kresourcelist.h"
 #include "vfolder_menu.h"
 
@@ -53,7 +53,7 @@
 #include <kcrash.h>
 
 #ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build 
-                        // GUI version of kbuildsycoca, so-called "kbuildsycocaw".
+                        // GUI version of tdebuildsycoca, so-called "tdebuildsycocaw".
 # include <tqlabel.h>
 # include <kmessagebox.h>
   bool silent;
@@ -463,7 +463,7 @@ bool KBuildSycoca::recreate()
 {
   TQString path(sycocaPath());
 #ifdef Q_WS_WIN
-  printf("kbuildsycoca: path='%s'\n", (const char*)path);
+  printf("tdebuildsycoca: path='%s'\n", (const char*)path);
 #endif
 
   // KSaveFile first writes to a temp file.
@@ -476,9 +476,9 @@ bool KBuildSycoca::recreate()
   }
   if (database->status() != 0)
   {
-    fprintf(stderr, "[kbuildsycoca] ERROR creating database '%s'! %s\n", path.local8Bit().data(),strerror(database->status()));
+    fprintf(stderr, "[tdebuildsycoca] ERROR creating database '%s'! %s\n", path.local8Bit().data(),strerror(database->status()));
 #ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build 
-                        // GUI version of kbuildsycoca, so-called "kbuildsycocaw".
+                        // GUI version of tdebuildsycoca, so-called "tdebuildsycocaw".
     if (!silent)
       KMessageBox::error(0, i18n("Error creating database '%1'.\nCheck that the permissions are correct on the directory and the disk is not full.\n").arg(path.local8Bit().data()), i18n("KBuildSycoca"));
 #endif
@@ -505,11 +505,11 @@ bool KBuildSycoca::recreate()
     m_str = 0L;
     if (!database->close())
     {
-      fprintf(stderr, "[kbuildsycoca] ERROR writing database '%s'!\n", database->name().local8Bit().data());
-      fprintf(stderr, "[kbuildsycoca] Disk full?\n");
+      fprintf(stderr, "[tdebuildsycoca] ERROR writing database '%s'!\n", database->name().local8Bit().data());
+      fprintf(stderr, "[tdebuildsycoca] Disk full?\n");
 #ifdef KBUILDSYCOCA_GUI
       if (!silent)
-        KMessageBox::error(0, i18n("[kbuildsycoca] Error writing database '%1'.\nCheck that the permissions are correct on the directory and the disk is not full.\n").arg(path.local8Bit().data()), i18n("KBuildSycoca"));
+        KMessageBox::error(0, i18n("[tdebuildsycoca] Error writing database '%1'.\nCheck that the permissions are correct on the directory and the disk is not full.\n").arg(path.local8Bit().data()), i18n("KBuildSycoca"));
 #endif
       return false;
     }
@@ -695,7 +695,7 @@ static KCmdLineOptions options[] = {
    { "nosignal", I18N_NOOP("Do not signal applications to update"), 0 },
    { "noincremental", I18N_NOOP("Disable incremental update, re-read everything"), 0 },
    { "checkstamps", I18N_NOOP("Check file timestamps"), 0 },
-   { "nocheckfiles", I18N_NOOP("Disable checking files (dangerous)"), 0 },
+   { "nochectdefiles", I18N_NOOP("Disable checking files (dangerous)"), 0 },
    { "global", I18N_NOOP("Create global database"), 0 },
    { "menutest", I18N_NOOP("Perform menu generation test run only"), 0 },
    { "track <menu-id>", I18N_NOOP("Track menu id for debug purposes"), 0 },
@@ -706,7 +706,7 @@ static KCmdLineOptions options[] = {
    KCmdLineLastOption
 };
 
-static const char appName[] = "kbuildsycoca";
+static const char appName[] = "tdebuildsycoca";
 static const char appVersion[] = "1.1";
 
 class WaitForSignal : public QObject
@@ -777,14 +777,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
      TQCString registeredName = dcopClient->registerAs(appName, false);
      if (registeredName.isEmpty())
      {
-       fprintf(stderr, "[kbuildsycoca] Warning: %s is unable to register with DCOP.\n", appName);
+       fprintf(stderr, "[tdebuildsycoca] Warning: %s is unable to register with DCOP.\n", appName);
        break;
      }
      else if (registeredName == appName)
      {
        break; // Go
      }
-     fprintf(stderr, "[kbuildsycoca] Waiting for already running %s to finish.\n", appName);
+     fprintf(stderr, "[tdebuildsycoca] Waiting for already running %s to finish.\n", appName);
 
      dcopClient->setNotifications( true );
      while (dcopClient->isApplicationRegistered(appName))
@@ -796,12 +796,12 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
      }
      dcopClient->setNotifications( false );
    }
-   fprintf(stderr, "[kbuildsycoca] %s running...\n", appName);
+   fprintf(stderr, "[tdebuildsycoca] %s running...\n", appName);
 
-   bool checkfiles = bGlobalDatabase || args->isSet("checkfiles");
+   bool chectdefiles = bGlobalDatabase || args->isSet("chectdefiles");
 
-   bool incremental = !bGlobalDatabase && args->isSet("incremental") && checkfiles;
-   if (incremental || !checkfiles)
+   bool incremental = !bGlobalDatabase && args->isSet("incremental") && chectdefiles;
+   if (incremental || !chectdefiles)
    {
      KSycoca::self()->disableAutoRebuild(); // Prevent deadlock
      TQString current_language = TDEGlobal::locale()->language();
@@ -814,14 +814,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
          (KSycoca::self()->timeStamp() == 0))
      {
         incremental = false;
-        checkfiles = true;
+        chectdefiles = true;
         delete KSycoca::self();
      }
    }
 
    g_changeList = new TQStringList;
 
-   bool checkstamps = incremental && args->isSet("checkstamps") && checkfiles;
+   bool checkstamps = incremental && args->isSet("checkstamps") && chectdefiles;
    TQ_UINT32 filestamp = 0;
    TQStringList oldresourcedirs;
    if( checkstamps && incremental )
@@ -861,7 +861,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 
    newTimestamp = (TQ_UINT32) time(0);
 
-   if( checkfiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs )))
+   if( chectdefiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs )))
    {
       TQCString qSycocaPath = TQFile::encodeName(sycocaPath());
       cSycocaPath = qSycocaPath.data();
@@ -870,7 +870,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
       g_ctimeDict = 0;
       if (incremental)
       {
-         tqWarning("[kbuildsycoca] Reusing existing tdesycoca.");
+         tqWarning("[tdebuildsycoca] Reusing existing tdesycoca.");
          KSycoca *oldSycoca = KSycoca::self();
          KSycocaFactoryList *factories = new KSycocaFactoryList;
          g_allEntries = new KSycocaEntryListList;
@@ -950,10 +950,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 #ifdef KBUILDSYCOCA_GUI
    if (!silent) {
      progress.close();
-     KMessageBox::information(0, i18n("[kbuildsycoca] Configuration information reloaded successfully."), capt);
+     KMessageBox::information(0, i18n("[tdebuildsycoca] Configuration information reloaded successfully."), capt);
    }
 #endif
    return 0;
 }
 
-#include "kbuildsycoca.moc"
+#include "tdebuildsycoca.moc"
diff --git a/kded/kbuildsycoca.h b/kded/tdebuildsycoca.h
index 443f5b120..51e7af337 100644
--- a/kded/kbuildsycoca.h
+++ b/kded/tdebuildsycoca.h
@@ -15,8 +15,8 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  **/
-#ifndef __kbuildsycoca_h__
-#define __kbuildsycoca_h__ 
+#ifndef __tdebuildsycoca_h__
+#define __tdebuildsycoca_h__ 
 
 #include <sys/stat.h>
 
@@ -34,7 +34,7 @@
 
 class TQDataStream;
 
-// No need for this in libkio - apps only get readonly access
+// No need for this in libtdeio - apps only get readonly access
 class KBuildSycoca : public KSycoca
 {
    Q_OBJECT
diff --git a/kded/kmimelist.cpp b/kded/tdemimelist.cpp
index c82f6d9f7..c82f6d9f7 100644
--- a/kded/kmimelist.cpp
+++ b/kded/tdemimelist.cpp
diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt
index d68fbd3d6..a0a6f29df 100644
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
@@ -23,8 +23,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 link_directories(
diff --git a/kdewidgets/Makefile.am b/kdewidgets/Makefile.am
index dc30a767a..3afb3947b 100644
--- a/kdewidgets/Makefile.am
+++ b/kdewidgets/Makefile.am
@@ -21,7 +21,7 @@
 SUBDIRS=. pics tests
 AM_CXXFLAGS = -DQT_PLUGIN
 
-INCLUDES = -I$(top_srcdir)/kfile $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdefile $(all_includes)
 
 bin_PROGRAMS = makekdewidgets
 makekdewidgets_SOURCES = makekdewidgets.cpp
diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp
index 8e2856c53..ea84c61b7 100644
--- a/kdewidgets/makekdewidgets.cpp
+++ b/kdewidgets/makekdewidgets.cpp
@@ -2,7 +2,7 @@
 #include <kaboutdata.h>
 #include <kinstance.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmacroexpander.h>
 #include <kdebug.h>
 
diff --git a/kdoctools/CMakeLists.txt b/kdoctools/CMakeLists.txt
index 9d97712c6..09b04a8ea 100644
--- a/kdoctools/CMakeLists.txt
+++ b/kdoctools/CMakeLists.txt
@@ -18,9 +18,9 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kioslave
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeioslave
   ${LIBXML2_INCLUDE_DIRS}
   ${LIBXSLT_INCLUDE_DIRS}
 )
@@ -54,7 +54,7 @@ install( FILES man-template.docbook template.docbook DESTINATION ${DATA_INSTALL_
 ##### kbzipfilter_dummy ##############################
 
 tde_add_library( kbzipfilter_dummy STATIC_PIC
-  SOURCES ${CMAKE_SOURCE_DIR}/kioslave/bzip2/kbzip2filter.cpp
+  SOURCES ${CMAKE_SOURCE_DIR}/tdeioslave/bzip2/kbzip2filter.cpp
 )
 
 
@@ -68,7 +68,7 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} SHARED
   SOURCES ${${target}_SRCS}
-  LINK kbzipfilter_dummy-static kio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
+  LINK kbzipfilter_dummy-static tdeio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -83,7 +83,7 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} SHARED
   SOURCES ${${target}_SRCS}
-  LINK kbzipfilter_dummy-static kio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
+  LINK kbzipfilter_dummy-static tdeio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -102,6 +102,6 @@ set_source_files_properties( xslt_pure.cpp PROPERTIES COMPILE_FLAGS -DSIMPLE_XSL
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kbzipfilter_dummy-static kio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
+  LINK kbzipfilter_dummy-static tdeio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdoctools/Makefile.am b/kdoctools/Makefile.am
index f5aab5ebe..05c3487cd 100644
--- a/kdoctools/Makefile.am
+++ b/kdoctools/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kioslave -I$(top_srcdir)/kioslave/bzip2 $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeioslave -I$(top_srcdir)/tdeioslave/bzip2 $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
 AM_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries)
 
 noinst_LTLIBRARIES = libkbzipfilter_dummy.la
@@ -38,10 +38,10 @@ METASOURCES = AUTO
 
 update_DATA = kio_help.upd
 update_SCRIPTS = move_kio_help_cache.sh
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_help.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_help.pot
 
 install-data-local:
 	@(for subdir in customization docbook; do \
@@ -59,7 +59,7 @@ uninstall-local:
 	-rm -rf $(DESTDIR)$(kde_datadir)/ksgmltools2/docbook
 
 kbzip2filter.cpp:
-	-$(LN_S) $(srcdir)/../kioslave/bzip2/kbzip2filter.cpp .
+	-$(LN_S) $(srcdir)/../tdeioslave/bzip2/kbzip2filter.cpp .
 
 CLEANFILES = kbzip2filter.cpp xslt_pure.o xslt_pure.cpp checkXML
 
diff --git a/kdoctools/docbook/README.kde b/kdoctools/docbook/README.kde
index df33a8cba..ae080b287 100644
--- a/kdoctools/docbook/README.kde
+++ b/kdoctools/docbook/README.kde
@@ -1,4 +1,4 @@
-README file for tdebase/kioslave/help/docbook
+README file for tdebase/tdeioslave/help/docbook
 =============================================
 
 This are copies of
diff --git a/kdoctools/kio_help.h b/kdoctools/kio_help.h
index 957a0e2e5..df002df15 100644
--- a/kdoctools/kio_help.h
+++ b/kdoctools/kio_help.h
@@ -15,8 +15,8 @@
 #include <tqvaluelist.h>
 
 
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 class HelpProtocol : public TDEIO::SlaveBase
 {
diff --git a/kdoctools/kio_help.upd b/kdoctools/kio_help.upd
index 2f067b148..cca96f64b 100644
--- a/kdoctools/kio_help.upd
+++ b/kdoctools/kio_help.upd
@@ -1,3 +1,3 @@
-# Move kio_help cache from $TDEHOME/share/apps/kio_help/cache to $TDEHOME/cache-$HOST/kio_help
+# Move kio_help cache from $TDEHOME/share/apps/tdeio_help/cache to $TDEHOME/cache-$HOST/tdeio_help
 Id=trinity_2
 Script=move_kio_help_cache.sh,sh
diff --git a/kdoctools/move_kio_help_cache.sh b/kdoctools/move_kio_help_cache.sh
index c31331c9e..f1342c5b4 100644
--- a/kdoctools/move_kio_help_cache.sh
+++ b/kdoctools/move_kio_help_cache.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-bas=`tde-config --localprefix`share/apps/kio_help
+bas=`tde-config --localprefix`share/apps/tdeio_help
 mv "$bas/cache" "`tde-config --path cache`kio_help"
 rmdir "$bas"
 exit 0
diff --git a/kimgio/Makefile.am b/kimgio/Makefile.am
index ad833c292..41ca9a892 100644
--- a/kimgio/Makefile.am
+++ b/kimgio/Makefile.am
@@ -81,7 +81,7 @@ kimg_hdr_la_LIBADD = $(LIB_QT)
 
 noinst_HEADERS= xview.h eps.h tiffr.h g3r.h ico.h jp2.h pcx.h tga.h rgb.h xcf.h gimp.h exr.h dds.h psd.h hdr.h
 
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl $(all_includes) -Drestrict= $(EXR_FLAGS)
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl $(all_includes) -Drestrict= $(EXR_FLAGS)
 
 servicedir = $(kde_servicesdir)
 service_DATA = png.kimgio xpm.kimgio bmp.kimgio pbm.kimgio pgm.kimgio \
diff --git a/kimgio/README b/kimgio/README
index 6c9cec844..142823e6c 100644
--- a/kimgio/README
+++ b/kimgio/README
@@ -22,7 +22,7 @@ XCF	<read>
 
 To use these formats, you only need to:
 
-1. link the application with the libkio library
+1. link the application with the libtdeio library
 2. Include the <kimageio.h> header
 3. call KImageIO::registerFormats() once, somewhere in your code
    before you load an image.
diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt
index 834242bf1..88be32621 100644
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
@@ -19,8 +19,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${FREETYPE_INCLUDE_DIRS}
 )
 
@@ -94,34 +94,34 @@ tde_add_executable( ${target}
 )
 
 
-#### kioslave ###################################
+#### tdeioslave ###################################
 
-set( target kioslave )
+set( target tdeioslave )
 
 tde_add_executable( ${target} AUTOMOC
-  SOURCES kioslave.cpp
-  LINK ltdlc-static kio-shared
+  SOURCES tdeioslave.cpp
+  LINK ltdlc-static tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 
-#### kstartupconfig #############################
+#### tdestartupconfig #############################
 
-set( target kstartupconfig )
+set( target tdestartupconfig )
 
 tde_add_executable( ${target} AUTOMOC
-  SOURCES kstartupconfig.cpp
+  SOURCES tdestartupconfig.cpp
   LINK tdefakes-shared ${TQT_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 
-#### kdostartupconfig ###########################
+#### tdedostartupconfig ###########################
 
-set( target kdostartupconfig )
+set( target tdedostartupconfig )
 
 tde_add_executable( ${target} AUTOMOC
-  SOURCES kdostartupconfig.cpp
+  SOURCES tdedostartupconfig.cpp
   LINK tdecore-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
@@ -153,15 +153,15 @@ tde_add_executable( ${target}
 )
 
 
-#### klauncher ##################################
+#### tdelauncher ##################################
 
-set( target klauncher )
+set( target tdelauncher )
 
 set( ${target}_SRCS
-  klauncher.cpp klauncher_main.cpp autostart.cpp
+  tdelauncher.cpp tdelauncher_main.cpp autostart.cpp
 )
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
 )
diff --git a/kinit/Makefile.am b/kinit/Makefile.am
index ef329980a..3090d041e 100644
--- a/kinit/Makefile.am
+++ b/kinit/Makefile.am
@@ -19,11 +19,11 @@ INCLUDES = -I$(srcdir)/../libltdl/ $(all_includes) $(TDEINIT_XFT_INCLUDES)
 
 SUBDIRS = . tests
 
-bin_PROGRAMS = tdeinit tdeinit_wrapper kshell tdeinit_shutdown lnusertemp kwrapper kioslave \
-               kstartupconfig kdostartupconfig start_tdeinit start_tdeinit_wrapper
+bin_PROGRAMS = tdeinit tdeinit_wrapper kshell tdeinit_shutdown lnusertemp kwrapper tdeioslave \
+               tdestartupconfig tdedostartupconfig start_tdeinit start_tdeinit_wrapper
 
 lib_LTLIBRARIES = 
-tdeinit_LTLIBRARIES = klauncher.la
+tdeinit_LTLIBRARIES = tdelauncher.la
 tdeinit_SOURCES = kinit.cpp setproctitle.cpp
 
 # NOTE: We link against all common libraries even if we don't need them ourselves.
@@ -35,10 +35,10 @@ tdeinit_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
                   $(KDE_RPATH)
 tdeinit_LDADD = $(LIB_KPARTS) -lXft $(LIB_QT)
 
-kioslave_SOURCES = kioslave.cpp
-kioslave_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
+tdeioslave_SOURCES = tdeioslave.cpp
+tdeioslave_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
                   $(KDE_RPATH)
-kioslave_LDADD = $(LIB_KIO) 
+tdeioslave_LDADD = $(LIB_KIO) 
 
 tdeinit_wrapper_SOURCES = wrapper.c
 tdeinit_wrapper_LDADD = $(LIBSOCKET)
@@ -55,16 +55,16 @@ lnusertemp_LDFLAGS = $(KDE_RPATH)
 kwrapper_SOURCES = kwrapper.c
 kwrapper_LDADD = $(LIBSOCKET)
 
-klauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version
-klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
-klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp
+tdelauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version
+tdelauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+tdelauncher_la_SOURCES = tdelauncher.cpp tdelauncher_main.cpp autostart.cpp
 
-kstartupconfig_SOURCES  = kstartupconfig.cpp
-kstartupconfig_LDADD  = $(top_builddir)/tdecore/libtdefakes.la $(LIB_QT)
-kdostartupconfig_SOURCES = kdostartupconfig.cpp
-kdostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
+tdestartupconfig_SOURCES  = tdestartupconfig.cpp
+tdestartupconfig_LDADD  = $(top_builddir)/tdecore/libtdefakes.la $(LIB_QT)
+tdedostartupconfig_SOURCES = tdedostartupconfig.cpp
+tdedostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
                            $(KDE_RPATH)
-kdostartupconfig_LDADD  = $(LIB_TDECORE)
+tdedostartupconfig_LDADD  = $(LIB_TDECORE)
 
 start_tdeinit_SOURCES = start_tdeinit.c
 tdeinitpath = $(bindir)/tdeinit
@@ -75,7 +75,7 @@ start_tdeinit_wrapper_SOURCES = start_tdeinit_wrapper.c
 
 METASOURCES = AUTO
 
-noinst_HEADERS = klauncher.h autostart.h klauncher_cmds.h setproctitle.h
+noinst_HEADERS = tdelauncher.h autostart.h tdelauncher_cmds.h setproctitle.h
 
 kwrapper.o: wrapper.c
 
diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
index 3fe0825a4..4e4ad1f56 100644
--- a/kinit/autostart.cpp
+++ b/kinit/autostart.cpp
@@ -22,7 +22,7 @@
 
 #include "autostart.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdesktopfile.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index 6cf9293d6..63e6ab832 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -55,7 +55,7 @@
 #include <kinstance.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
 #include <kapplication.h>
 #include <klocale.h>
@@ -74,7 +74,7 @@
 #include <tdeversion.h>
 
 #include "ltdl.h"
-#include "klauncher_cmds.h"
+#include "tdelauncher_cmds.h"
 
 //#if defined Q_WS_X11 && ! defined K_WS_QTONLY
 #ifdef Q_WS_X11
@@ -169,9 +169,9 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err );
 /* These are to link libtdeparts even if 'smart' linker is used */
 #include <tdeparts/plugin.h>
 extern "C" KParts::Plugin* _kinit_init_tdeparts() { return new KParts::Plugin(); }
-/* These are to link libkio even if 'smart' linker is used */
-#include <kio/authinfo.h>
-extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); }
+/* These are to link libtdeio even if 'smart' linker is used */
+#include <tdeio/authinfo.h>
+extern "C" TDEIO::AuthInfo* _tdeioslave_init_kio() { return new TDEIO::AuthInfo(); }
 
 /*
  * Close fd's which are only useful for the parent process.
@@ -429,8 +429,8 @@ static pid_t launch(int argc, const char *_name, const char *args,
   TQCString name;
   TQCString exec;
 
-  if (strcmp(_name, "klauncher") == 0) {
-     /* klauncher is launched in a special way:
+  if (strcmp(_name, "tdelauncher") == 0) {
+     /* tdelauncher is launched in a special way:
       * It has a communication socket on LAUNCHER_FD
       */
      if (0 > socketpair(AF_UNIX, SOCK_STREAM, 0, d.launcher))
@@ -891,7 +891,7 @@ static void init_tdeinit_socket()
      if(connect(s, (struct sockaddr *)&server, socklen) == 0)
      {
         fprintf(stderr, "[tdeinit] Shutting down running client.\n");
-        klauncher_header request_header;
+        tdelauncher_header request_header;
         request_header.cmd = LAUNCHER_TERMINATE_TDEINIT;
         request_header.arg_length = 0;
         write(s, &request_header, sizeof(request_header));
@@ -1090,7 +1090,7 @@ static void launcher_died()
    close(d.launcher[0]);
    d.launcher[0] = -1;
 
-   pid_t pid = launch( 1, "klauncher", 0 );
+   pid_t pid = launch( 1, "tdelauncher", 0 );
 #ifndef NDEBUG
    fprintf(stderr, "[tdeinit] Relaunching KLauncher, pid = %ld result = %d\n", (long) pid, d.result);
 #endif
@@ -1105,7 +1105,7 @@ static void handle_launcher_request(int sock = -1)
        launcher = true;
    }
 
-   klauncher_header request_header;
+   tdelauncher_header request_header;
    char *request_data = 0L;
    int result = read_socket(sock, (char *) &request_header, sizeof(request_header));
    if (result != 0)
@@ -1141,7 +1141,7 @@ static void handle_launcher_request(int sock = -1)
        (request_header.cmd == LAUNCHER_EXEC_NEW)))
    {
       pid_t pid;
-      klauncher_header response_header;
+      tdelauncher_header response_header;
       long response_data;
       long l;
       memcpy( &l, request_data, sizeof( long ));
@@ -1273,7 +1273,7 @@ static void handle_launcher_request(int sock = -1)
 
 #ifndef NDEBUG
       if (launcher)
-         fprintf(stderr, "[tdeinit] Got SETENV '%s=%s' from klauncher.\n", env_name, env_value);
+         fprintf(stderr, "[tdeinit] Got SETENV '%s=%s' from tdelauncher.\n", env_name, env_value);
       else
          fprintf(stderr, "[tdeinit] Got SETENV '%s=%s' from socket.\n", env_name, env_value);
 #endif
@@ -1301,7 +1301,7 @@ static void handle_launcher_request(int sock = -1)
    else if (request_header.cmd == LAUNCHER_TERMINATE_TDEINIT)
    {
 #ifndef NDEBUG
-       fprintf(stderr,"[tdeinit] Killing tdeinit/klauncher.\n");
+       fprintf(stderr,"[tdeinit] Killing tdeinit/tdelauncher.\n");
 #endif
        if (d.launcher_pid)
           kill(d.launcher_pid, SIGTERM);
@@ -1359,7 +1359,7 @@ static void handle_requests(pid_t waitForPid)
            if (d.launcher_pid)
            {
            // TODO send process died message
-              klauncher_header request_header;
+              tdelauncher_header request_header;
               long request_data[2];
               request_header.cmd = LAUNCHER_DIED;
               request_header.arg_length = sizeof(long) * 2;
@@ -1686,7 +1686,7 @@ int main(int argc, char **argv, char **envp)
    int i;
    pid_t pid;
    int launch_dcop = 1;
-   int launch_klauncher = 1;
+   int launch_tdelauncher = 1;
    int launch_kded = 1;
    int keep_running = 1;
    int new_startup = 0;
@@ -1699,8 +1699,8 @@ int main(int argc, char **argv, char **envp)
       safe_argv[i] = strcpy((char*)malloc(strlen(argv[i])+1), argv[i]);
       if (strcmp(safe_argv[i], "--no-dcop") == 0)
          launch_dcop = 0;
-      if (strcmp(safe_argv[i], "--no-klauncher") == 0)
-         launch_klauncher = 0;
+      if (strcmp(safe_argv[i], "--no-tdelauncher") == 0)
+         launch_tdelauncher = 0;
       if (strcmp(safe_argv[i], "--no-kded") == 0)
          launch_kded = 0;
       if (strcmp(safe_argv[i], "--suicide") == 0)
@@ -1717,7 +1717,7 @@ int main(int argc, char **argv, char **envp)
       {
         printf("Usage: tdeinit [options]\n");
      // printf("    --no-dcop         Do not start dcopserver\n");
-     // printf("    --no-klauncher    Do not start klauncher\n");
+     // printf("    --no-tdelauncher    Do not start tdelauncher\n");
         printf("    --no-kded         Do not start kded\n");
         printf("    --suicide         Terminate when no TDE applications are left running\n");
      // printf("    --exit            Terminate when kded has run\n");
@@ -1729,7 +1729,7 @@ int main(int argc, char **argv, char **envp)
 
    // Fork here and let parent process exit.
    // Parent process may only exit after all required services have been
-   // launched. (dcopserver/klauncher and services which start with '+')
+   // launched. (dcopserver/tdelauncher and services which start with '+')
    signal( SIGCHLD, secondary_child_handler);
    if (fork() > 0) // Go into background
    {
@@ -1812,16 +1812,16 @@ int main(int argc, char **argv, char **envp)
 	  (void) lt_dlopen(TQFile::encodeName(konq).data());
    }
 #endif 
-   if (launch_klauncher)
+   if (launch_tdelauncher)
    {
       if( new_startup )
-         pid = launch( 2, "klauncher", "--new-startup" );
+         pid = launch( 2, "tdelauncher", "--new-startup" );
       else
-         pid = launch( 1, "klauncher", 0 );
+         pid = launch( 1, "tdelauncher", 0 );
 #ifndef NDEBUG
       fprintf(stderr, "[tdeinit] Launched KLauncher, pid = %ld result = %d\n", (long) pid, d.result);
 #endif
-      handle_requests(pid); // Wait for klauncher to be ready
+      handle_requests(pid); // Wait for tdelauncher to be ready
    }
    
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
diff --git a/kinit/kdostartupconfig.cpp b/kinit/tdedostartupconfig.cpp
index b74417c3f..d964a900b 100644
--- a/kinit/kdostartupconfig.cpp
+++ b/kinit/tdedostartupconfig.cpp
@@ -24,13 +24,13 @@ DEALINGS IN THE SOFTWARE.
 
 #undef QT_NO_CAST_ASCII
 
-// See description in kstartupconfig.cpp .
+// See description in tdestartupconfig.cpp .
 
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 TQString get_entry( TQString* ll )
@@ -62,8 +62,8 @@ TQString get_entry( TQString* ll )
 
 int main()
     {
-    TDEInstance inst( "kdostartupconfig" );
-    kdDebug() << "Running kdostartupconfig." << endl;
+    TDEInstance inst( "tdedostartupconfig" );
+    kdDebug() << "Running tdedostartupconfig." << endl;
     TQString keysname = locateLocal( "config", "startupconfigkeys" );
     TQFile keys( keysname );
     if( !keys.open( IO_ReadOnly ))
diff --git a/kinit/kioslave.cpp b/kinit/tdeioslave.cpp
index 0cb77db02..1690ca2f7 100644
--- a/kinit/kioslave.cpp
+++ b/kinit/tdeioslave.cpp
@@ -47,15 +47,15 @@
 # endif
 #endif
 
-/* These are to link libkio even if 'smart' linker is used */
-#include <kio/authinfo.h>
-extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); }
+/* These are to link libtdeio even if 'smart' linker is used */
+#include <tdeio/authinfo.h>
+extern "C" TDEIO::AuthInfo* _tdeioslave_init_kio() { return new TDEIO::AuthInfo(); }
 
 int main(int argc, char **argv)
 {
      if (argc < 5)
      {
-        fprintf(stderr, "Usage: kioslave <slave-lib> <protocol> <klauncher-socket> <app-socket>\n\nThis program is part of TDE.\n");
+        fprintf(stderr, "Usage: tdeioslave <slave-lib> <protocol> <tdelauncher-socket> <app-socket>\n\nThis program is part of TDE.\n");
         exit(1);
      }
      TQCString libpath = argv[1];     
diff --git a/kinit/klauncher.cpp b/kinit/tdelauncher.cpp
index 8c66789e7..306903a55 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/tdelauncher.cpp
@@ -29,7 +29,7 @@
 
 #include <tqfile.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klibloader.h>
 #include <klocale.h>
@@ -45,12 +45,12 @@
 #endif
 
 
-#include "kio/global.h"
-#include "kio/connection.h"
-#include "kio/slaveinterface.h"
+#include "tdeio/global.h"
+#include "tdeio/connection.h"
+#include "tdeio/slaveinterface.h"
 
-#include "klauncher.h"
-#include "klauncher_cmds.h"
+#include "tdelauncher.h"
+#include "tdelauncher_cmds.h"
 
 //#if defined Q_WS_X11 && ! defined K_WS_QTONLY
 #ifdef Q_WS_X11
@@ -165,7 +165,7 @@ IdleSlave::age(time_t now)
 KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
 //  : TDEApplication( false, false ), // No Styles, No GUI
   : TDEApplication( false, true ),	// TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used
-    DCOPObject("klauncher"),
+    DCOPObject("tdelauncher"),
     tdeinitSocket(_tdeinitSocket), mAutoStart( new_startup ),
     dontBlockReading(false), newStartup( new_startup )
 {
@@ -181,7 +181,7 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
    dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateKDE()",
                                     objId(), "terminateKDE()", false );
 
-   TQString prefix = locateLocal("socket", "klauncher");
+   TQString prefix = locateLocal("socket", "tdelauncher");
    KTempFile domainname(prefix, TQString::fromLatin1(".slave-socket"));
    if (domainname.status() != 0)
    {
@@ -218,7 +218,7 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
       mSlaveValgrindSkin = getenv("TDE_SLAVE_VALGRIND_SKIN");
       tqWarning("Klauncher running slaves through valgrind for slaves of protocol '%s'", mSlaveValgrind.data());
    }
-   klauncher_header request_header;
+   tdelauncher_header request_header;
    request_header.cmd = LAUNCHER_OK;
    request_header.arg_length = 0;
    write(tdeinitSocket, &request_header, sizeof(request_header));
@@ -410,7 +410,7 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
       ::signal( SIGHUP, SIG_IGN);
       ::signal( SIGTERM, SIG_IGN);
       kdDebug() << "KLauncher::process ---> terminateKDE" << endl;
-      klauncher_header request_header;
+      tdelauncher_header request_header;
       request_header.cmd = LAUNCHER_TERMINATE_KDE;
       request_header.arg_length = 0;
       write(tdeinitSocket, &request_header, sizeof(request_header));
@@ -485,7 +485,7 @@ void KLauncher::setLaunchEnv(const TQCString &name, const TQCString &_value)
    TQCString value(_value);
    if (value.isNull())
       value = "";
-   klauncher_header request_header;
+   tdelauncher_header request_header;
    TQByteArray requestData(name.length()+value.length()+2);
    memcpy(requestData.data(), name.data(), name.length()+1);
    memcpy(requestData.data()+name.length()+1, value.data(), value.length()+1);
@@ -524,7 +524,7 @@ read_socket(int sock, char *buffer, int len)
 void
 KLauncher::slotKDEInitData(int)
 {
-   klauncher_header request_header;
+   tdelauncher_header request_header;
    TQByteArray requestData;
    if( dontBlockReading )
    {
@@ -792,7 +792,7 @@ KLauncher::requestStart(KLaunchRequest *request)
 {
    requestList.append( request );
    // Send request to tdeinit.
-   klauncher_header request_header;
+   tdelauncher_header request_header;
    TQByteArray requestData;
    int length = 0;
    length += sizeof(long); // Nr of. Args
@@ -1162,7 +1162,7 @@ KLauncher::tdeinit_exec(const TQString &app, const TQStringList &args,
    request->startup_id = startup_id;
 #endif
    request->envs = envs;
-   if( app != "kbuildsycoca" ) // avoid stupid loop
+   if( app != "tdebuildsycoca" ) // avoid stupid loop
    {
        // Find service, if any - strip path if needed
        KService::Ptr service = KService::serviceByDesktopName( app.mid( app.findRev( '/' ) + 1 ));
@@ -1295,7 +1295,7 @@ KLauncher::requestSlave(const TQString &protocol,
 //    kdDebug(7016) << "KLauncher: launching new slave " << _name << " with protocol=" << protocol << endl;
     if (mSlaveDebug == arg1)
     {
-       klauncher_header request_header;
+       tdelauncher_header request_header;
        request_header.cmd = LAUNCHER_DEBUG_WAIT;
        request_header.arg_length = 0;
        write(tdeinitSocket, &request_header, sizeof(request_header));
@@ -1303,7 +1303,7 @@ KLauncher::requestSlave(const TQString &protocol,
     if (mSlaveValgrind == arg1)
     {
        arg_list.prepend(TQFile::encodeName(KLibLoader::findLibrary(name)));
-       arg_list.prepend(TQFile::encodeName(locate("exe", "kioslave")));
+       arg_list.prepend(TQFile::encodeName(locate("exe", "tdeioslave")));
        name = "valgrind";
        if (!mSlaveValgrindSkin.isEmpty()) {
            arg_list.prepend(TQCString("--tool=") + mSlaveValgrindSkin);
@@ -1418,4 +1418,4 @@ KLauncher::idleTimeout()
     }
 }
 
-#include "klauncher.moc"
+#include "tdelauncher.moc"
diff --git a/kinit/klauncher.h b/kinit/tdelauncher.h
index 37b10f059..27c49ef7f 100644
--- a/kinit/klauncher.h
+++ b/kinit/tdelauncher.h
@@ -30,7 +30,7 @@
 #include <tqtimer.h>
 
 #include <dcopclient.h>
-#include <kio/connection.h>
+#include <tdeio/connection.h>
 #include <ksock.h>
 #include <kurl.h>
 #include <kuniqueapplication.h>
diff --git a/kinit/klauncher_cmds.h b/kinit/tdelauncher_cmds.h
index 54b13f45a..5763e5a38 100644
--- a/kinit/klauncher_cmds.h
+++ b/kinit/tdelauncher_cmds.h
@@ -24,7 +24,7 @@ typedef struct
 {
    long cmd;
    long arg_length;
-} klauncher_header;
+} tdelauncher_header;
 
 /* Launcher commands: */
 
diff --git a/kinit/klauncher_main.cpp b/kinit/tdelauncher_main.cpp
index f22da9386..54ab94d54 100644
--- a/kinit/klauncher_main.cpp
+++ b/kinit/tdelauncher_main.cpp
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 
 #include "kapplication.h"
-#include "klauncher.h"
+#include "tdelauncher.h"
 #include "kcmdlineargs.h"
 #include "kcrash.h"
 #include "kdebug.h"
@@ -33,14 +33,14 @@
 #include <tqcstring.h>
 #include <klocale.h>
 
-#include "klauncher_cmds.h"
+#include "tdelauncher_cmds.h"
 
 static void sig_handler(int sig_num)
 {
    // No recursion
    signal( SIGHUP, SIG_IGN);
    signal( SIGTERM, SIG_IGN);
-   fprintf(stderr, "[klauncher] Exiting on signal %d\n", sig_num);
+   fprintf(stderr, "[tdelauncher] Exiting on signal %d\n", sig_num);
    KLauncher::destruct(255);
 }
 
@@ -55,8 +55,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
    // Started via tdeinit.
    if (fcntl(LAUNCHER_FD, F_GETFD) == -1)
    {
-      fprintf(stderr, "%s", i18n("[klauncher] This program is not supposed to be started manually.\n"
-                                 "[klauncher] It is started automatically by tdeinit.\n").local8Bit().data());
+      fprintf(stderr, "%s", i18n("[tdelauncher] This program is not supposed to be started manually.\n"
+                                 "[tdelauncher] It is started automatically by tdeinit.\n").local8Bit().data());
       return 1;
    }
 
@@ -82,7 +82,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
       TQCString dcopName = TDEApplication::dcopClient()->registerAs(name, false);
       if (dcopName.isEmpty())
       {
-         kdWarning() << "[klauncher] DCOP communication problem!" << endl;
+         kdWarning() << "[tdelauncher] DCOP communication problem!" << endl;
          return 1;
       }
       if (dcopName == cname)
@@ -90,12 +90,12 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
 
       if (--maxTry == 0)
       {
-         kdWarning() << "[klauncher] Another instance of klauncher is already running!" << endl;
+         kdWarning() << "[tdelauncher] Another instance of tdelauncher is already running!" << endl;
          return 1;
       }
       
       // Wait a bit...
-      kdWarning() << "[klauncher] Waiting for already running klauncher to exit." << endl;
+      kdWarning() << "[tdelauncher] Waiting for already running tdelauncher to exit." << endl;
       sleep(1);
 
       // Try again...
diff --git a/kinit/kstartupconfig.cpp b/kinit/tdestartupconfig.cpp
index 3204d6f7d..373ac6787 100644
--- a/kinit/kstartupconfig.cpp
+++ b/kinit/tdestartupconfig.cpp
@@ -42,10 +42,10 @@ It is not possible to specify default values, but since the configuration option
 are processed in the order they are specified this can be solved by first
 specifying a group and then all the entries that need default values.
 
-When a kconf_update script is used to update such option, kstartupconfig is run
-before kconf_update and therefore cannot see the change in time. To avoid this
-problem, together with the kconf_update script also the matching global config
-file should be updated (any change, kstartupconfig will see the timestamp change).
+When a tdeconf_update script is used to update such option, tdestartupconfig is run
+before tdeconf_update and therefore cannot see the change in time. To avoid this
+problem, together with the tdeconf_update script also the matching global config
+file should be updated (any change, tdestartupconfig will see the timestamp change).
 
 Note that the kdeglobals config file is not used as a depedendency for other config
 files.
@@ -58,7 +58,7 @@ followed by paths of all files that are relevant to the option. Non-existent fil
 have '!' prepended (for the case they'll be later created), the list of files is
 terminated by line containing '*'. If the timestamps of all relevant files are older
 than the timestamp of the startupconfigfile file, there's no need to update anything.
-Otherwise kdostartupconfig is launched to create or update all the necessary files
+Otherwise tdedostartupconfig is launched to create or update all the necessary files
 (which already requires loading KDE libraries, but this case should be rare).
 
 */
@@ -90,7 +90,7 @@ int main()
     strlcat( filename, "/share/config/startupconfig", 1024 );
     if( access( filename, R_OK ) != 0 )
         {
-        int ret = system( "kdostartupconfig" );
+        int ret = system( "tdedostartupconfig" );
         return WEXITSTATUS( ret );
         }
     strlcpy( filename, tdehome, 1024 );
@@ -98,14 +98,14 @@ int main()
     struct stat st;
     if( stat( filename, &st ) != 0 )
         {
-        int ret = system( "kdostartupconfig" );
+        int ret = system( "tdedostartupconfig" );
         return WEXITSTATUS( ret );
         }
     time_t config_time = st.st_mtime;
     FILE* config = fopen( filename, "r" );
     if( config == NULL )
         {
-        int ret = system( "kdostartupconfig" );
+        int ret = system( "tdedostartupconfig" );
         return WEXITSTATUS( ret );
         }
     strlcpy( filename, tdehome, 1024 );
@@ -169,7 +169,7 @@ int main()
     fclose( config );
     if( need_update )
         {
-        int ret = system( "kdostartupconfig" );
+        int ret = system( "tdedostartupconfig" );
         return WEXITSTATUS( ret );
         }
     return 0;
diff --git a/kinit/tests/Makefile.am b/kinit/tests/Makefile.am
index 909e7c14b..e1157bf72 100644
--- a/kinit/tests/Makefile.am
+++ b/kinit/tests/Makefile.am
@@ -3,8 +3,8 @@
 INCLUDES=	-I$(srcdir)/../.. $(all_includes) 
 ####### Files
 
-check_PROGRAMS = klaunchertest
+check_PROGRAMS = tdelaunchertest
 
-klaunchertest_SOURCES = klaunchertest.cpp 
-klaunchertest_LDADD   = $(LIB_KIO)
+tdelaunchertest_SOURCES = tdelaunchertest.cpp 
+tdelaunchertest_LDADD   = $(LIB_KIO)
 
diff --git a/kinit/tests/klaunchertest.cpp b/kinit/tests/tdelaunchertest.cpp
index 3293c07be..a8989870b 100644
--- a/kinit/tests/klaunchertest.cpp
+++ b/kinit/tests/tdelaunchertest.cpp
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 {
    TDEApplication::tdeinitExec("konsole");
 
-   TDEApplication k(argc, argv, "klaunchertest");
+   TDEApplication k(argc, argv, "tdelaunchertest");
  
    kapp->dcopClient()->registerAs( kapp->name()) ;
 
diff --git a/kinit/wrapper.c b/kinit/wrapper.c
index 36a75d46b..565c9a152 100644
--- a/kinit/wrapper.c
+++ b/kinit/wrapper.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include "klauncher_cmds.h"
+#include "tdelauncher_cmds.h"
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -310,7 +310,7 @@ int main(int argc, char **argv)
    int kwrapper = 0;
    long arg_count;
    long env_count;
-   klauncher_header header;
+   tdelauncher_header header;
    char *start, *p, *buffer;
    char cwd[8192];
    const char *tty = NULL;
diff --git a/kio/data.protocol b/kio/data.protocol
deleted file mode 100644
index 85b0e8b66..000000000
--- a/kio/data.protocol
+++ /dev/null
@@ -1,71 +0,0 @@
-[Protocol]
-protocol=data
-input=stream
-output=none
-reading=true
-Icon=www
-Class=:internet
-Description=A kioslave for data URIs (rfc2397)
-Description[af]= ´n kioslave vir data URIs (rfc2397)
-Description[be]=Модуль kioslave дл� URI з данн�мі (rfc2397)
-Description[br]=Ur kioslave evit an URIoù roadoù (rfc2397)
-Description[bs]=Kioslave za data URIs (rfc2397)
-Description[ca]=Un kioslave per a URIs de dades (rfc2397)
-Description[cs]=Kioslave pro datová URI (rfc2397)
-Description[csb]=Plugins protokółu pòdôwków URI (rfc2397)
-Description[da]=En kioslave for data-URI'er (rfc2397)
-Description[de]=Ein-/Ausgabemodul für Daten-URIs (rfc2397)
-Description[el]=Ένα kioslave για URI δεδομένων (rfc2397)
-Description[es]=Un kioslave para datos URIs (rfc2397)
-Description[et]=Andme-URI-de I/O-moodul (rfc2397)
-Description[eu]=Datuen URLen (rfc2397) kioslave-a
-Description[fa]=یک kioslave برای URIهای داده )rfc2397(
-Description[fi]=kioslave data URI:lle (rfc2397)
-Description[fr]=Un module d'entrée / sortie pour les URI de données (rfc2397)
-Description[fy]=In kioslave foar data-URI-adresse (rfc2397)
-Description[gl]=Un kioslave para URIs de dados (rfc2397)
-Description[hi]=डाटा यूआरआई (आर�फसी2397) के लि� �क के-आई-ओ-स�लेव
-Description[hr]=kioslave za podatkovne URI-ije (rfc2397)
-Description[hu]=KDE-protokoll adat-URI-k használataához (RFC 2397)
-Description[id]=Kioslave for URI data (rfc2397)
-Description[is]=kioslave fyrir gagnaslóðir (rfc2397)
-Description[it]=Un kioslave per il protocollo di URI di dati (rfc2397)
-Description[ja]=データ URIs (rfc2397) � kioslave
-Description[ka]=URI მ�ნ�ცემთ� (rfc2397) დ�მმუშ�ვებელი
-Description[kk]=URI деректерді өңдеу kioslave модулі (rfc2397)
-Description[km]=kioslave មួយ​សម្រាប់​ទិន្នន�យ URIs (rfc2397)
-Description[lb]=E kioslave fir Donnéen-URIs (rfc2397)
-Description[lt]=Antrinė KDE programa duomenų URI (rfc2397)
-Description[mk]=kio-�лужител за податочни URI (rfc2397)
-Description[ms]=Kioslave untuk URI data (rfc2397)
-Description[nb]=kioslave for data URI-er (rfc2397)
-Description[nds]=In-/Utgaavmoduul för Daten-URIs (rfc2397)
-Description[ne]=डेटा URIs का लागि किओस�लेभ (rfc2397)
-Description[nl]=Een kioslave voor data-URI-adressen (rfc2397)
-Description[nn]=A kioslave for data URI-ar (rfc2397)
-Description[pa]= ਡਾਟਾ URI ਲਈ kioslave(rfc2397)
-Description[pl]=Wtyczka protokołu URI danych (rfc2397)
-Description[pt]=Um 'kioslave' para URIs data (rfc2397)
-Description[pt_BR]=Uma implementação para o protocolo de URIs de dados (rfc2397)
-Description[ro]=Un dispozitiv de I/E pentru URI-urile de date (rfc2397)
-Description[ru]=Обработчик URI данных (rfc2397)
-Description[rw]=Kioslave y'ibyatanzwe URI (rfc2397)
-Description[se]=kiošláva dáhta-URI:aid várás (rfc2397)
-Description[sk]=IO klient pre dátové URI (rfc2397)
-Description[sl]=kioslave za podatkovne URI-je (rfc2397)
-Description[sr]=kioslave за URI-ије података (rfc2397)
-Description[sr@Latn]=kioslave za URI-ije podataka (rfc2397)
-Description[sv]=En I/O-slav för datawebbadresser (RFC 2397)
-Description[ta]=தரவ� வலைமனைகள�க�கான ஒர� kioslave (rfc2397)
-Description[te]=దత�తాంశం య�ఆరైల కొరక� కె�ఓబానిస (rfc2397)
-Description[tg]=kioslave барои URIs (rfc2397)
-Description[th]=kioslave สำหรับข้อมูล URIs (rfc2397)
-Description[tr]= Veri adresleri için bir kioslave (rfc2397)
-Description[tt]=Biremle URI öçen kioslave (rfc2397)
-Description[uk]=Підлеглий В/В дл� адре� (URI) даних (rfc2397)
-Description[vi]=Một kioslave cho các địa điểm URI kiểu dữ liệu (rfc2397).
-Description[zh_CN]=data URI(rfc2397) çš„ kioslave
-DocPath=kioslave/data.html
-URIMode=rawuri
-defaultMimetype=application/octet-stream
-determineMimetypeFromExtension=false
diff --git a/kio/kioexec/Makefile.am b/kio/kioexec/Makefile.am
deleted file mode 100644
index 5325ce875..000000000
--- a/kio/kioexec/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-AM_CPPFLAGS = $(all_includes)
-
-bin_PROGRAMS = kioexec
-
-kioexec_SOURCES = main.cpp
-kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kioexec_LDADD   = $(LIB_KIO)
-
-noinst_HEADERS = main.h
-METASOURCES = AUTO
-
-messages:
-	$(XGETTEXT) $(kioexec_SOURCES) -o $(podir)/kioexec.pot
-
-install-exec-local:
-	@rm -f $(DESTDIR)$(bindir)/kfmexec
-	@$(LN_S) kioexec $(DESTDIR)$(bindir)/kfmexec
-
-include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kio/misc/kfile/Makefile.am b/kio/misc/kfile/Makefile.am
deleted file mode 100644
index 605fef7d3..000000000
--- a/kio/misc/kfile/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-METASOURCES = AUTO
-
-noinst_HEADERS = fileprops.h
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio/kio $(all_includes)
-
-bin_PROGRAMS = kfile
-kfile_SOURCES = fileprops.cpp
-kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kfile_LDADD = $(LIB_KIO)
-
diff --git a/kio/pics/Makefile.am b/kio/pics/Makefile.am
deleted file mode 100644
index db5ddb1cc..000000000
--- a/kio/pics/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-kiouiservericonsdir = $(kde_datadir)/kio_uiserver/icons
-kiouiservericons_ICON = AUTO
-
diff --git a/knewstuff/CMakeLists.txt b/knewstuff/CMakeLists.txt
index 50350f29f..4493ee385 100644
--- a/knewstuff/CMakeLists.txt
+++ b/knewstuff/CMakeLists.txt
@@ -16,9 +16,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 link_directories(
@@ -38,7 +38,7 @@ install( FILES
 ##### other data ################################
 
 install( FILES types DESTINATION ${DATA_INSTALL_DIR}/knewstuff )
-install( FILES khotnewstuffrc DESTINATION ${CONFIG_INSTALL_DIR} )
+install( FILES tdehotnewstuffrc DESTINATION ${CONFIG_INSTALL_DIR} )
 tde_install_icons( )
 
 
@@ -55,17 +55,17 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
 
-##### khotnewstuff ##############################
+##### tdehotnewstuff ##############################
 
-set( target khotnewstuff )
+set( target tdehotnewstuff )
 
 set( ${target}_SRCS
-  khotnewstuff.cpp
+  tdehotnewstuff.cpp
 )
 
 tde_add_executable( ${target} AUTOMOC
diff --git a/knewstuff/Makefile.am b/knewstuff/Makefile.am
index 0f0bc9676..c15716c8e 100644
--- a/knewstuff/Makefile.am
+++ b/knewstuff/Makefile.am
@@ -10,11 +10,11 @@ libknewstuff_la_SOURCES = engine.cpp entry.cpp downloaddialog.cpp \
   uploaddialog.cpp providerdialog.cpp provider.cpp knewstuff.cpp \
   knewstuffgeneric.cpp knewstuffbutton.cpp knewstuffsecure.cpp security.cpp
 
-bin_PROGRAMS = khotnewstuff
+bin_PROGRAMS = tdehotnewstuff
 
-khotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-khotnewstuff_LDADD = libknewstuff.la
-khotnewstuff_SOURCES = khotnewstuff.cpp
+tdehotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdehotnewstuff_LDADD = libknewstuff.la
+tdehotnewstuff_SOURCES = tdehotnewstuff.cpp
 
 EXTRA_PROGRAMS = testnewstuff ghns
 
@@ -29,7 +29,7 @@ ghns_SOURCES = ghns.cpp
 knewstuffdir = $(kde_datadir)/knewstuff
 knewstuff_DATA = types
 
-kde_conf_DATA = khotnewstuffrc
+kde_conf_DATA = tdehotnewstuffrc
 
 knsdir = $(includedir)/knewstuff
 kns_HEADERS = downloaddialog.h engine.h entry.h knewstuffgeneric.h knewstuff.h providerdialog.h provider.h uploaddialog.h knewstuffbutton.h knewstuffsecure.h
diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp
index f8e03295c..3cc476254 100644
--- a/knewstuff/downloaddialog.cpp
+++ b/knewstuff/downloaddialog.cpp
@@ -24,11 +24,11 @@
 #include <klocale.h>
 #include <klistview.h>
 #include <kdebug.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kiconloader.h>
 
diff --git a/knewstuff/engine.cpp b/knewstuff/engine.cpp
index 7152a0ccd..063c2c7b9 100644
--- a/knewstuff/engine.cpp
+++ b/knewstuff/engine.cpp
@@ -24,7 +24,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/knewstuff/knewstuffgeneric.cpp b/knewstuff/knewstuffgeneric.cpp
index 1e4e6ecc3..be1d404b2 100644
--- a/knewstuff/knewstuffgeneric.cpp
+++ b/knewstuff/knewstuffgeneric.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <ktar.h>
diff --git a/knewstuff/knewstuffsecure.cpp b/knewstuff/knewstuffsecure.cpp
index f467530c8..b61924243 100644
--- a/knewstuff/knewstuffsecure.cpp
+++ b/knewstuff/knewstuffsecure.cpp
@@ -16,10 +16,10 @@
 #include <tqfileinfo.h>
 
 //kde includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp
index a29183532..d5da6bdde 100644
--- a/knewstuff/provider.cpp
+++ b/knewstuff/provider.cpp
@@ -18,9 +18,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/knewstuff/khotnewstuff.cpp b/knewstuff/tdehotnewstuff.cpp
index 67c6c70b2..7b8ceae9c 100644
--- a/knewstuff/khotnewstuff.cpp
+++ b/knewstuff/tdehotnewstuff.cpp
@@ -35,7 +35,7 @@ static const KCmdLineOptions op[] =
 
 int main(int argc, char **argv)
 {
-	TDEAboutData about("khotnewstuff", "KHotNewStuff", "0.2");
+	TDEAboutData about("tdehotnewstuff", "KHotNewStuff", "0.2");
 	TDECmdLineArgs *args;
 
 	TDECmdLineArgs::init(argc, argv, &about);
diff --git a/knewstuff/khotnewstuffrc b/knewstuff/tdehotnewstuffrc
index 737ad61c2..737ad61c2 100644
--- a/knewstuff/khotnewstuffrc
+++ b/knewstuff/tdehotnewstuffrc
diff --git a/knewstuff/uploaddialog.cpp b/knewstuff/uploaddialog.cpp
index f82e466ff..69c823fd0 100644
--- a/knewstuff/uploaddialog.cpp
+++ b/knewstuff/uploaddialog.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kurlrequester.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kuser.h>
 
diff --git a/kstyles/plastik/config/CMakeLists.txt b/kstyles/plastik/config/CMakeLists.txt
index b8534cea7..8de92d14a 100644
--- a/kstyles/plastik/config/CMakeLists.txt
+++ b/kstyles/plastik/config/CMakeLists.txt
@@ -27,7 +27,7 @@ link_directories(
 set( target kstyle_plastik_config )
 
 set( ${target}_SRCS
-  plastikconf.cpp
+  plastitdeconf.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/kstyles/plastik/config/Makefile.am b/kstyles/plastik/config/Makefile.am
index 887c7ea89..d97df31bb 100644
--- a/kstyles/plastik/config/Makefile.am
+++ b/kstyles/plastik/config/Makefile.am
@@ -1,10 +1,10 @@
 INCLUDES = $(all_includes)
 
-noinst_HEADERS = plastikconf.h
+noinst_HEADERS = plastitdeconf.h
 kde_module_LTLIBRARIES = kstyle_plastik_config.la
 kstyle_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 kstyle_plastik_config_la_LIBADD  = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
-kstyle_plastik_config_la_SOURCES = plastikconf.cpp
+kstyle_plastik_config_la_SOURCES = plastitdeconf.cpp
 kstyle_plastik_config_la_METASOURCES = AUTO
 
 
diff --git a/kstyles/plastik/config/plastikconf.cpp b/kstyles/plastik/config/plastitdeconf.cpp
index 338cdcd1e..8d3e4acfd 100644
--- a/kstyles/plastik/config/plastikconf.cpp
+++ b/kstyles/plastik/config/plastitdeconf.cpp
@@ -35,7 +35,7 @@ DEALINGS IN THE SOFTWARE.
 #include <kcolorbutton.h>
 #include <kdemacros.h>
 
-#include "plastikconf.h"
+#include "plastitdeconf.h"
 
 extern "C"
 {
@@ -220,4 +220,4 @@ void PlastikStyleConfig::updateChanged()
 		emit changed(true);
 }
 
-#include "plastikconf.moc"
+#include "plastitdeconf.moc"
diff --git a/kstyles/plastik/config/plastikconf.h b/kstyles/plastik/config/plastitdeconf.h
index 512ad6f2e..512ad6f2e 100644
--- a/kstyles/plastik/config/plastikconf.h
+++ b/kstyles/plastik/config/plastitdeconf.h
diff --git a/libtdemid/deviceman.cc b/libtdemid/deviceman.cc
index c7649f5a5..b8210af6d 100644
--- a/libtdemid/deviceman.cc
+++ b/libtdemid/deviceman.cc
@@ -68,7 +68,7 @@
 #if 1
 #include <kinstance.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #endif
 
 //#define DEVICEMANDEBUG
diff --git a/tdecert/CMakeLists.txt b/tdecert/CMakeLists.txt
index 045d77720..2a9c391e3 100644
--- a/tdecert/CMakeLists.txt
+++ b/tdecert/CMakeLists.txt
@@ -14,14 +14,14 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_BINARY_DIR}/kio/kssl
+  ${CMAKE_BINARY_DIR}/tdeio/kssl
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
-  ${CMAKE_SOURCE_DIR}/kio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
 )
 
 link_directories(
@@ -45,6 +45,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared tdeparts-shared
+  LINK tdeio-shared tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdecert/Makefile.am b/tdecert/Makefile.am
index d43ce0f5b..a6f605f4a 100644
--- a/tdecert/Makefile.am
+++ b/tdecert/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= -I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl -I$(top_srcdir) $(SSL_INCLUDES) $(all_includes)
+INCLUDES= -I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl -I$(top_srcdir) $(SSL_INCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES = libtdecertpart.la
 
diff --git a/tdecert/tdecertpart.cc b/tdecert/tdecertpart.cc
index ebb6e77ad..08e3ec5e0 100644
--- a/tdecert/tdecertpart.cc
+++ b/tdecert/tdecertpart.cc
@@ -36,18 +36,18 @@
 #include <ksslall.h>
 #include <kopenssl.h>
 #include <ksslpemcallback.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprocess.h>
 #include <tqtabwidget.h>
 #include <kseparator.h>
 #include <klistview.h>
-#include <kio/kmimemagic.h>
+#include <tdeio/kmimemagic.h>
 #include <tqmultilineedit.h>
 #include <tqregexp.h>
 #include <kcombobox.h>
 #include <tdeparts/browserextension.h>
 #include <tdeparts/browserinterface.h>
-#include <kio/kservicetypefactory.h>
+#include <tdeio/kservicetypefactory.h>
 
 K_EXPORT_COMPONENT_FACTORY( libtdecertpart, KParts::GenericFactory<KCertPart> )
 
@@ -774,7 +774,7 @@ void KCertPart::slotDone() {
 
 void KCertPart::slotLaunch() {
 KShellProcess p;
-p << "kcmshell" << "crypto";
+p << "tdecmshell" << "crypto";
 p.start(TDEProcess::DontCare);
 }
 
diff --git a/kcmshell/CMakeLists.txt b/tdecmshell/CMakeLists.txt
index 92c2205d0..2b07bbdcc 100644
--- a/kcmshell/CMakeLists.txt
+++ b/tdecmshell/CMakeLists.txt
@@ -16,8 +16,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
@@ -26,9 +26,9 @@ link_directories(
 )
 
 
-##### kcmshell ##################################
+##### tdecmshell ##################################
 
-set( target kcmshell )
+set( target tdecmshell )
 
 set( ${target}_SRCS
   main.cpp main.skel
diff --git a/kcmshell/Makefile.am b/tdecmshell/Makefile.am
index 9c755d8bb..a6e1d2d74 100644
--- a/kcmshell/Makefile.am
+++ b/tdecmshell/Makefile.am
@@ -23,16 +23,16 @@ METASOURCES = AUTO
 
 lib_LTLIBRARIES = 
 bin_PROGRAMS = 
-tdeinit_LTLIBRARIES = kcmshell.la
+tdeinit_LTLIBRARIES = tdecmshell.la
 
-kcmshell_la_SOURCES = main.cpp main.skel
-kcmshell_la_LIBADD = ../tdeutils/libtdeutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE)
-kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
+tdecmshell_la_SOURCES = main.cpp main.skel
+tdecmshell_la_LIBADD = ../tdeutils/libtdeutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE)
+tdecmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 noinst_HEADERS = main.h
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kcmshell.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdecmshell.pot
 
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kcmshell/main.cpp b/tdecmshell/main.cpp
index 29aba0501..358b00ccb 100644
--- a/kcmshell/main.cpp
+++ b/tdecmshell/main.cpp
@@ -120,7 +120,7 @@ bool KCMShell::isRunning()
     if( dcopClient()->appId() == m_dcopName )
         return false; // We are the one and only.
 
-    kdDebug(780) << "kcmshell with modules '" << 
+    kdDebug(780) << "tdecmshell with modules '" << 
         m_dcopName << "' is already running." << endl;
 
     dcopClient()->attach(); // Reregister as anonymous
@@ -157,7 +157,7 @@ void KCMShellMultiDialog::activate( TQCString asn_id )
 
 void KCMShell::setDCOPName(const TQCString &dcopName, bool rootMode )
 {
-    m_dcopName = "kcmshell_";
+    m_dcopName = "tdecmshell_";
     if( rootMode )
         m_dcopName += "rootMode_";
 
@@ -198,7 +198,7 @@ static void setIcon(TQWidget *w, const TQString &iconName)
 
 extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
 {
-    TDEAboutData aboutData( "kcmshell", I18N_NOOP("TDE Control Module"),
+    TDEAboutData aboutData( "tdecmshell", I18N_NOOP("TDE Control Module"),
                           0,
                           I18N_NOOP("A tool to start single TDE control modules"),
                           TDEAboutData::License_GPL,
@@ -211,7 +211,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
     aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
     aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org");
     
-    TDEGlobal::locale()->setMainCatalogue("kcmshell");
+    TDEGlobal::locale()->setMainCatalogue("tdecmshell");
 
     TDECmdLineArgs::init(_argc, _argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
@@ -283,7 +283,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
     }
 
     //KDialogBase::DialogType dtype = KDialogBase::Plain;      // FIXME
-    KDialogBase::DialogType dtype = KDialogBase::IconList;     // Work around a bug whereby several kcontrol modules (such as displayconfig) use an incorrect size when loaded with kcmshell in the Plain mode
+    KDialogBase::DialogType dtype = KDialogBase::IconList;     // Work around a bug whereby several kcontrol modules (such as displayconfig) use an incorrect size when loaded with tdecmshell in the Plain mode
                                                                // This bug is possibly related to kcmultidialog.cpp:266 [( new TQHBoxLayout( page ) )->setAutoAdd( true );]
                                                                // In fact, this method of display may be preferable to the Plain mode from a UX perspective,
                                                                // as the icon shows the user what the active kcontrol module is called.
diff --git a/kcmshell/main.h b/tdecmshell/main.h
index f43cf98cb..f135c2a33 100644
--- a/kcmshell/main.h
+++ b/tdecmshell/main.h
@@ -19,8 +19,8 @@
 
 */
 
-#ifndef __kcmshell_h__
-#define __kcmshell_h__
+#ifndef __tdecmshell_h__
+#define __tdecmshell_h__
 
 #include <dcopobject.h>
 
@@ -28,7 +28,7 @@
 #include <kcmultidialog.h>
 
 /**
- * The TDEApplication instance for kcmshell.
+ * The TDEApplication instance for tdecmshell.
  */
 class KCMShell : public TDEApplication
 {
@@ -41,12 +41,12 @@ public:
      * and then registers with DCOP.
      *
      * @param dcopName name to set the DCOP name to
-     * @param rootMode true if the kcmshell is embedding
+     * @param rootMode true if the tdecmshell is embedding
      */
     void setDCOPName(const TQCString &dcopName, bool rootMode );
 
     /**
-     * Waits until the last instance of kcmshell with the same
+     * Waits until the last instance of tdecmshell with the same
      * module as this one exits, and then exits.
      */
     void waitForExit();
@@ -66,7 +66,7 @@ private:
 
     /**
      * The DCOP name which actually is registered.
-     * For example "kcmshell_mouse".
+     * For example "tdecmshell_mouse".
      */
     TQCString m_dcopName;
 
@@ -101,4 +101,4 @@ k_dcop:
 
 
 // vim: sw=4 et sts=4
-#endif //__kcmshell_h__
+#endif //__tdecmshell_h__
diff --git a/kconf_update/CMakeLists.txt b/tdeconf_update/CMakeLists.txt
index 2e25811a7..fffb66e80 100644
--- a/kconf_update/CMakeLists.txt
+++ b/tdeconf_update/CMakeLists.txt
@@ -20,12 +20,12 @@ link_directories(
 )
 
 
-##### kconf_update ##############################
+##### tdeconf_update ##############################
 
-set( target kconf_update )
+set( target tdeconf_update )
 
 set( ${target}_SRCS
-  kconf_update.cpp
+  tdeconf_update.cpp
 )
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
diff --git a/kconf_update/Mainpage.dox b/tdeconf_update/Mainpage.dox
index 9db5adb3b..2557fe1c0 100644
--- a/kconf_update/Mainpage.dox
+++ b/tdeconf_update/Mainpage.dox
@@ -1,6 +1,6 @@
-/** @mainpage ./kconf_update
+/** @mainpage ./tdeconf_update
 
-kconf_update is a tool designed to update config files. Over time applications
+tdeconf_update is a tool designed to update config files. Over time applications
 sometimes need to rearrange the way configuration options are stored. Since
 such an update shouldn't influence the configuration options that the user
 has selected, the application must take care that the options stored in the
@@ -13,7 +13,7 @@ several drawbacks:
   needed, resulting in a slower startup.
 - The application becomes bigger with code that will only be used once.
 
-kconf_update addresses these problems by offering a framework to update 
+tdeconf_update addresses these problems by offering a framework to update 
 configuration files without adding code to the application itself.
 
 See the README file for more information.
diff --git a/kconf_update/Makefile.am b/tdeconf_update/Makefile.am
index afe3864d9..9041aad8a 100644
--- a/kconf_update/Makefile.am
+++ b/tdeconf_update/Makefile.am
@@ -20,14 +20,14 @@ INCLUDES= -I../kded $(all_includes)
 
 bin_PROGRAMS = 
 lib_LTLIBRARIES =
-tdeinit_LTLIBRARIES = kconf_update.la
+tdeinit_LTLIBRARIES = tdeconf_update.la
 
-kconf_update_la_SOURCES = kconf_update.cpp
-kconf_update_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
-kconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version
+tdeconf_update_la_SOURCES = tdeconf_update.cpp
+tdeconf_update_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+tdeconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 METASOURCES = AUTO
 
 # Internal
-# noinst_HEADERS = kconf_update.h
+# noinst_HEADERS = tdeconf_update.h
 
diff --git a/kconf_update/README.kconf_update b/tdeconf_update/README.tdeconf_update
index c8229c735..340f71eaa 100644
--- a/kconf_update/README.kconf_update
+++ b/tdeconf_update/README.tdeconf_update
@@ -1,4 +1,4 @@
-README kconf_update
+README tdeconf_update
 
 Version: 1.1
 Author: Waldo Bastian <bastian@kde.org>, <bastian@suse.com>
@@ -6,7 +6,7 @@ Author: Waldo Bastian <bastian@kde.org>, <bastian@suse.com>
 What it does
 ============
 
-kconf_update is a tool designed to update config files. Over time applications
+tdeconf_update is a tool designed to update config files. Over time applications
 sometimes need to rearrange the way configuration options are stored. Since 
 such an update shouldn't influence the configuration options that the user
 has selected, the application must take care that the options stored in the
@@ -19,7 +19,7 @@ several drawbacks:
 needed, resulting in a slower startup.
 * The application becomes bigger with code that will only be used once.
 
-kconf_update addresses these problems by offering a framework to update 
+tdeconf_update addresses these problems by offering a framework to update 
 configuration files without adding code to the application itself.
 
 
@@ -27,7 +27,7 @@ How it works
 ============
 
 Applications can install so called "update files" under 
-$TDEDIR/share/apps/kconf_update. An update file has ".upd" as extension and
+$TDEDIR/share/apps/tdeconf_update. An update file has ".upd" as extension and
 contains instructions for transferring/converting configuration information 
 from one place to another.
 
@@ -36,7 +36,7 @@ or when kded detects a new update file in the above mentioned location.
 
 Update files are separated into sections. Each section has an Id. When a 
 section describing a configuration change has been applied, the Id will be 
-stored in the file "kconf_updaterc". This information is used to make sure
+stored in the file "tdeconf_updaterc". This information is used to make sure
 that a configuration update is only performed once.
 
 If you overwrite an existing update file with a new version that contains a 
@@ -76,18 +76,18 @@ is used as new entries for <newfile>. Existing entries can be deleted by
 adding lines with "# DELETE [group]key" in the output of the script.
 To delete a whole group use "# DELETEGROUP [group]".
 
-<script> should be installed into $(kde_datadir)/kconf_update, or
-kconf_update will not be able to find it. It is not portable to install
+<script> should be installed into $(kde_datadir)/tdeconf_update, or
+tdeconf_update will not be able to find it. It is not portable to install
 binary applications in $kde_datadir, so you have to stick with interpreted
 scripts like sh or perl scripts. From KDE 3.2 onwards it's also possible
-to install kconf_update applications in $(kde_bindir)/kconf_update_bin,
-which opens the door to kconf_update applications that are written in C++
+to install tdeconf_update applications in $(kde_bindir)/tdeconf_update_bin,
+which opens the door to tdeconf_update applications that are written in C++
 and use Qt's powerful string API instead.
 
 A workaround for KDE 3.1.x and older is to install a .sh script in
 $(kde_datadir) that contains a simple exec:
 
-    exec "`tde-config --prefix`/bin/kconf_update_bin/my_update_app"
+    exec "`tde-config --prefix`/bin/tdeconf_update_bin/my_update_app"
 
 This is equivalent to what KDE 3.2 can do directly, but of course the .upd
 file now points to the .sh script instead of the binary application.
@@ -167,7 +167,7 @@ Example update file
 
 # This is comment
 Id=kde2.2
-File=kioslaverc,kio_httprc
+File=tdeioslaverc,kio_httprc
 Group=Proxy Settings
 Key=NoProxyFor
 Key=UseProxy
@@ -181,69 +181,69 @@ RemoveGroup=KDE
 # End of file
 
 
-The above update file extracts config information from the file "kioslaverc" 
+The above update file extracts config information from the file "tdeioslaverc" 
 and stores it into the file "kio_httprc". 
 
 It reads the keys "NoProxyFor", "UseProxy" and "httpProxy" from the group 
-"Proxy Settings" in the "kioslaverc" file. If any of these options are present
+"Proxy Settings" in the "tdeioslaverc" file. If any of these options are present
 they are written to the keys "NoProxyFor", "UseProxy" and "Proxy" (!) in
 the group "Proxy Settings" in the "kio_httprc" file.
 
 It also reads the keys "MaxCacheSize" and "UseCache" from the group 
-"Cache Settings" in the "kioslaverc" file and writes this information to the
+"Cache Settings" in the "tdeioslaverc" file and writes this information to the
 keys "MaxCacheSize" and "UseCache" in the group "Cache" (!) in the 
 "kio_httprc" file.
 
-Then it takes all keys in the "UserAgent" group of the file "kioslaverc" 
+Then it takes all keys in the "UserAgent" group of the file "tdeioslaverc" 
 and moves then to the "UserAgent" group in the "kio_httprc" file.
 
-Finally it removes the entire "KDE" group in the kioslaverc file.
+Finally it removes the entire "KDE" group in the tdeioslaverc file.
 
 
 Debugging and testing
 =====================
 
-If you are developing a kconf_update script and want to test or debug it you
-need to make sure kconf_update runs again after each of your changes. There
+If you are developing a tdeconf_update script and want to test or debug it you
+need to make sure tdeconf_update runs again after each of your changes. There
 are a number of ways to achieve this.
 
-The easiest is to not install the kconf_update script in the first place, but
+The easiest is to not install the tdeconf_update script in the first place, but
 manually call it through a pipe. If you want to test the update script for
 your application KHello's config file khellorc, you can test by using
 
     cat ~/.trinity/share/config/khellorc | khello_conf_update.sh
 
-(assuming khello_conf_update.sh is the kconf_update script and ~/.trinity is your
+(assuming khello_conf_update.sh is the tdeconf_update script and ~/.trinity is your
 $TDEHOME). This is easier than making install every time, but has the obvious
 downside that you need to 'parse' your script's output yourself instead of
-letting kconf_update do it and check the resulting output file.
+letting tdeconf_update do it and check the resulting output file.
 
-After 'make install' the kconf_update script is run by kded, but it does so
+After 'make install' the tdeconf_update script is run by kded, but it does so
 only once. This is of course the idea behind it, but while developing it can
 be a problem. You can increase the revision number for each subsequent run
-of 'make install' to force a new kconf_update run, but there's a better
+of 'make install' to force a new tdeconf_update run, but there's a better
 approach that doesn't skyrocket the version number for a mediocre debug
 session.
 
 kded doesn't really ignore scripts that it has already run right away.
 Instead it checks the affected config file every time a .upd file is added
 or changed. The reason it still doesn't run again on your config file lies
-in the traces kconf_update leaves behind: it adds a special config group
-'[$Version]' with a key 'update_info'. This key lists all kconf_update
+in the traces tdeconf_update leaves behind: it adds a special config group
+'[$Version]' with a key 'update_info'. This key lists all tdeconf_update
 scripts that have already been run on this config file. Just remove your
-file's entry, 'make install', and kconf_update will happily run your script
+file's entry, 'make install', and tdeconf_update will happily run your script
 again, without you having to increase the version number.
 
-If you want to know what kconf_update has been up to lately, have a look
-at $TDEHOME/share/apps/kconf_update/update.log
+If you want to know what tdeconf_update has been up to lately, have a look
+at $TDEHOME/share/apps/tdeconf_update/update.log
 
 
 Common Problems
 ===============
 
-* kconf_update refuses to update an entry
+* tdeconf_update refuses to update an entry
 If you change the value of an entry without changing the key or file,
-make sure to tell kconf_update that it should overwrite the old entry
+make sure to tell tdeconf_update that it should overwrite the old entry
 by adding "Options=overwrite". 
 
 
diff --git a/kconf_update/kconf_update.cpp b/tdeconf_update/tdeconf_update.cpp
index daf66ca9b..206711274 100644
--- a/kconf_update/kconf_update.cpp
+++ b/tdeconf_update/tdeconf_update.cpp
@@ -28,7 +28,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
@@ -113,7 +113,7 @@ KonfUpdate::KonfUpdate()
    oldConfig2 = 0;
    newConfig = 0;
 
-   config = new TDEConfig("kconf_updaterc");
+   config = new TDEConfig("tdeconf_updaterc");
 
    TQStringList updateFiles;
    TDECmdLineArgs *args=TDECmdLineArgs::parsedArgs();
@@ -124,7 +124,7 @@ KonfUpdate::KonfUpdate()
    if (args->isSet("check"))
    {
       m_bUseConfigInfo = true;
-      TQString file = locate("data", "kconf_update/"+TQFile::decodeName(args->getOption("check")));
+      TQString file = locate("data", "tdeconf_update/"+TQFile::decodeName(args->getOption("check")));
       if (file.isEmpty())
       {
          tqWarning("File '%s' not found.", args->getOption("check").data());
@@ -188,7 +188,7 @@ KonfUpdate::log()
 {
    if (!m_textStream)
    {
-      TQString file = locateLocal("data", "kconf_update/log/update.log");
+      TQString file = locateLocal("data", "tdeconf_update/log/update.log");
       m_file = new TQFile(file);
       if (m_file->open(IO_WriteOnly | IO_Append))
       {
@@ -209,7 +209,7 @@ KonfUpdate::log()
 TQStringList KonfUpdate::findUpdateFiles(bool dirtyOnly)
 {
    TQStringList result;
-   TQStringList list = TDEGlobal::dirs()->findAllResources("data", "kconf_update/*.upd", false, true);
+   TQStringList list = TDEGlobal::dirs()->findAllResources("data", "tdeconf_update/*.upd", false, true);
    for(TQStringList::ConstIterator it = list.begin();
        it != list.end();
        ++it)
@@ -745,11 +745,11 @@ void KonfUpdate::gotScript(const TQString &_script)
 
 
 
-   TQString path = locate("data","kconf_update/"+script);
+   TQString path = locate("data","tdeconf_update/"+script);
    if (path.isEmpty())
    {
       if (interpreter.isEmpty())
-         path = locate("lib", "kconf_update_bin/"+script);
+         path = locate("lib", "tdeconf_update_bin/"+script);
 
       if (path.isEmpty())
       {
@@ -940,7 +940,7 @@ void KonfUpdate::resetOptions()
 
 extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 {
-   TDEAboutData aboutData("kconf_update", I18N_NOOP("KConf Update"),
+   TDEAboutData aboutData("tdeconf_update", I18N_NOOP("KConf Update"),
                         "1.0.2",
                         I18N_NOOP("TDE Tool for updating user configuration files"),
                         TDEAboutData::License_GPL,
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 <bastian@kde.org>
 kcompletion.cpp		Carsten Pfeiffer <pfeiffer@kde.org>
 kcompletionbase.cpp
-kconfig.cpp		Waldo Bastian <bastian@kde.org>
-kconfigbackend.cpp	Waldo Bastian <bastian@kde.org>
-kconfigbase.cpp		Waldo Bastian <bastian@kde.org>
+tdeconfig.cpp		Waldo Bastian <bastian@kde.org>
+tdeconfigbackend.cpp	Waldo Bastian <bastian@kde.org>
+tdeconfigbase.cpp		Waldo Bastian <bastian@kde.org>
 kcrash.cpp		Waldo Bastian <bastian@kde.org>
 kdcoppropertyproxy.cpp
 kdebug.cpp		Stephan Kulow <coolo@kde.org>
@@ -94,8 +94,8 @@ kcalendarsystemhijri.cpp
 kcalendarsystemjalali.cpp	Arash Bijanzadeh  and FarsiKDE Project <www.farsikde.org> (copyright)
 kcheckaccelerators.cpp	Matthias Kalle Dalheimer (kalle@kde.org) (copyright)
 kclipboard.cpp		Carsten Pfeiffer <pfeiffer@kde.org> (copyright)
-kconfigdialogmanager.cpp
-kconfigskeleton.cpp
+tdeconfigdialogmanager.cpp
+tdeconfigskeleton.cpp
 kdebugdcopiface.cpp	Andreas Beckermann (b_mann@gmx.de) (copyright)
 tdeversion.cpp
 kglobalaccel_win.cpp	Ellis Whitehead <ellis@kde.org> (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, "schumacher@kde.org" );
   aboutData.addAuthor( "Waldo Bastian", 0, "bastian@kde.org" );
@@ -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:bastian@kde.org" );
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
   baseURL = "mailto:bastian@kde.org?subject=hello";
   check( "KURL::url()", baseURL.url(), "mailto:bastian@kde.org?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.
diff --git a/kfile-plugins/CMakeLists.txt b/tdefile-plugins/CMakeLists.txt
index 61e9dd6a3..61e9dd6a3 100644
--- a/kfile-plugins/CMakeLists.txt
+++ b/tdefile-plugins/CMakeLists.txt
diff --git a/kfile-plugins/elf/CMakeLists.txt b/tdefile-plugins/elf/CMakeLists.txt
index 91e9d5e32..04bec18fe 100644
--- a/kfile-plugins/elf/CMakeLists.txt
+++ b/tdefile-plugins/elf/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_BINARY_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${LIBR_INCLUDEDIR}
 )
 
@@ -29,14 +29,14 @@ link_directories(
 
 #### other data #################################
 
-install( FILES kfile_elf.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_elf.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kfile_elf (module) #########################
+#### tdefile_elf (module) #########################
 
-tde_add_kpart( kfile_elf AUTOMOC
-  SOURCES kfile_elf.cpp
+tde_add_kpart( tdefile_elf AUTOMOC
+  SOURCES tdefile_elf.cpp
   EMBED tdelficon-static
-  LINK kio-shared ${LIBR_LIBRARIES}
+  LINK tdeio-shared ${LIBR_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kfile-plugins/elf/kfile_elf.cpp b/tdefile-plugins/elf/tdefile_elf.cpp
index 2357f0617..cad269713 100644
--- a/kfile-plugins/elf/kfile_elf.cpp
+++ b/tdefile-plugins/elf/tdefile_elf.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <config.h>
-#include "kfile_elf.h"
+#include "tdefile_elf.h"
 
 #include <kprocess.h>
 #include <klocale.h>
@@ -43,7 +43,7 @@ typedef unsigned short uint16_t;
 
 typedef KGenericFactory<KElfPlugin> ElfFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_elf, ElfFactory( "kfile_elf" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_elf, ElfFactory( "tdefile_elf" ))
 
 KElfPlugin::KElfPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -130,4 +130,4 @@ bool KElfPlugin::readInfo( KFileMetaInfo& info, uint what)
 	return true;
 }
 
-#include "kfile_elf.moc"
+#include "tdefile_elf.moc"
diff --git a/kfile-plugins/elf/kfile_elf.desktop b/tdefile-plugins/elf/tdefile_elf.desktop
index cc993d36a..d51d3c312 100644
--- a/kfile-plugins/elf/kfile_elf.desktop
+++ b/tdefile-plugins/elf/tdefile_elf.desktop
@@ -60,7 +60,7 @@ Name[zh_HK]=ELF 資訊
 Name[zh_TW]=ELF 資訊
 Name[zu]=Ulwazi lwe-ELF
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_elf
+X-TDE-Library=tdefile_elf
 MimeType=application/x-executable
 PreferredItems=Name,Description,License,Copyright,Authors,Product,Organization,Version,DateTime,Notes"
 SupportsThumbnail=false
\ No newline at end of file
diff --git a/kfile-plugins/elf/kfile_elf.h b/tdefile-plugins/elf/tdefile_elf.h
index 1e6247a46..f53d36e0a 100644
--- a/kfile-plugins/elf/kfile_elf.h
+++ b/tdefile-plugins/elf/tdefile_elf.h
@@ -20,7 +20,7 @@
 #ifndef __KFILE_BMP_H__
 #define __KFILE_BMP_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 // Elven things
 extern "C" {
diff --git a/tdehtml/CMakeLists.txt b/tdehtml/CMakeLists.txt
index bab7d78e2..de151a6e3 100644
--- a/tdehtml/CMakeLists.txt
+++ b/tdehtml/CMakeLists.txt
@@ -27,7 +27,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/kjs
-  ${CMAKE_BINARY_DIR}/kio/kssl
+  ${CMAKE_BINARY_DIR}/tdeio/kssl
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}
@@ -35,10 +35,10 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
-  ${CMAKE_SOURCE_DIR}/kio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
   ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/tdewallet/client
   ${CMAKE_SOURCE_DIR}/tdeprint
diff --git a/tdehtml/Makefile.am b/tdehtml/Makefile.am
index 3c9cb05c5..924b3db27 100644
--- a/tdehtml/Makefile.am
+++ b/tdehtml/Makefile.am
@@ -83,7 +83,7 @@ INCLUDES = -I$(top_srcdir)/kjs -I$(top_builddir)/kjs -I$(top_srcdir)/kimgio \
 	-I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \
 	-I$(srcdir)/dom -I$(srcdir)/xml -I$(srcdir)/html -I$(srcdir)/css \
 	-I$(top_srcdir)/libltdl \
-	-I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl \
+	-I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl \
 	-I$(top_srcdir)/tdeprint \
 	-I$(top_srcdir)/interfaces \
 	-I$(top_srcdir)/interfaces/kregexpeditor \
diff --git a/tdehtml/css/CMakeLists.txt b/tdehtml/css/CMakeLists.txt
index 4d0b52df1..37a5fccf3 100644
--- a/tdehtml/css/CMakeLists.txt
+++ b/tdehtml/css/CMakeLists.txt
@@ -19,8 +19,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/tdewallet/client
   ${CMAKE_SOURCE_DIR}/tdeutils
 )
diff --git a/tdehtml/css/Makefile.am b/tdehtml/css/Makefile.am
index 6c43675ed..fadf66961 100644
--- a/tdehtml/css/Makefile.am
+++ b/tdehtml/css/Makefile.am
@@ -36,7 +36,7 @@ noinst_HEADERS = \
 	cssstyleselector.h csshelper.h parser.h   \
 	css_renderstyledeclarationimpl.h
 
-INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
+INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/tdeio -I$(top_srcdir)/dcop \
  -I$(top_srcdir)/tdehtml -I$(top_srcdir)/libltdl -I$(top_srcdir) \
  -I$(top_srcdir)/tdewallet/client -I$(top_srcdir)/tdeutils \
  $(all_includes)
diff --git a/tdehtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp
index f2c5703c1..04b66e40a 100644
--- a/tdehtml/css/cssstyleselector.cpp
+++ b/tdehtml/css/cssstyleselector.cpp
@@ -58,7 +58,7 @@ using namespace DOM;
 #include <kstandarddirs.h>
 #include <kcharsets.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqfile.h>
 #include <tqvaluelist.h>
 #include <tqstring.h>
diff --git a/tdehtml/dom/CMakeLists.txt b/tdehtml/dom/CMakeLists.txt
index dd637f7bd..e781a62a8 100644
--- a/tdehtml/dom/CMakeLists.txt
+++ b/tdehtml/dom/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
 )
 
 
diff --git a/tdehtml/dom/Makefile.am b/tdehtml/dom/Makefile.am
index 6a33de62d..0b9f587f1 100644
--- a/tdehtml/dom/Makefile.am
+++ b/tdehtml/dom/Makefile.am
@@ -46,7 +46,7 @@ myinclude_HEADERS = \
 	dom2_views.h
 #	css_extensions.h
 
-INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
+INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/tdeio -I$(top_srcdir)/dcop \
  -I$(top_srcdir)/tdehtml -I$(top_srcdir) $(all_includes)
 
 SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
diff --git a/tdehtml/ecma/CMakeLists.txt b/tdehtml/ecma/CMakeLists.txt
index eddd99f1e..2d7366e28 100644
--- a/tdehtml/ecma/CMakeLists.txt
+++ b/tdehtml/ecma/CMakeLists.txt
@@ -21,9 +21,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/bookmarks
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/bookmarks
   ${CMAKE_SOURCE_DIR}/kjs
   ${CMAKE_SOURCE_DIR}/tdewallet/client
   ${CMAKE_SOURCE_DIR}/tdeutils
diff --git a/tdehtml/ecma/Makefile.am b/tdehtml/ecma/Makefile.am
index d69ff807b..ee3334668 100644
--- a/tdehtml/ecma/Makefile.am
+++ b/tdehtml/ecma/Makefile.am
@@ -16,7 +16,7 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kio/bookmarks -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdehtml/java -I$(top_srcdir)/tdewallet/client -I$(top_srcdir)/tdeutils -I$(top_builddir)/kjs $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tdeio -I$(top_srcdir)/tdeio/bookmarks -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdehtml/java -I$(top_srcdir)/tdewallet/client -I$(top_srcdir)/tdeutils -I$(top_builddir)/kjs $(all_includes)
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index 4830c1108..47921fb2a 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -53,8 +53,8 @@
 #include <kactioncollection.h>
 #include <kglobalsettings.h>
 #include <kshortcut.h>
-#include <kconfig.h>
-#include <kconfigbase.h>
+#include <tdeconfig.h>
+#include <tdeconfigbase.h>
 #include <kapplication.h>
 #include <dcop/dcopclient.h>
 #include <kstringhandler.h> 
diff --git a/tdehtml/ecma/kjs_navigator.cpp b/tdehtml/ecma/kjs_navigator.cpp
index 222ef7902..22d5f9cb7 100644
--- a/tdehtml/ecma/kjs_navigator.cpp
+++ b/tdehtml/ecma/kjs_navigator.cpp
@@ -24,13 +24,13 @@
 #include <klocale.h>
 
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
-#include <kio/kprotocolmanager.h>
-#include <kio/kmimetype.h>
-#include <kio/kservice.h>
-#include <kio/ktrader.h>
+#include <tdeio/kprotocolmanager.h>
+#include <tdeio/kmimetype.h>
+#include <tdeio/kservice.h>
+#include <tdeio/ktrader.h>
 #include "kjs_navigator.h"
 #include "kjs/lookup.h"
 #include "kjs_binding.h"
diff --git a/tdehtml/ecma/xmlhttprequest.cpp b/tdehtml/ecma/xmlhttprequest.cpp
index f3aec5492..bfaa91231 100644
--- a/tdehtml/ecma/xmlhttprequest.cpp
+++ b/tdehtml/ecma/xmlhttprequest.cpp
@@ -33,15 +33,15 @@
 #include "tdehtml_part.h"
 #include "tdehtmlview.h"
 
-#include <kio/scheduler.h>
-#include <kio/job.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/job.h>
 #include <tqobject.h>
 #include <kdebug.h>
 
 #ifdef APPLE_CHANGES
 #include "KWQLoader.h"
 #else
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 using TDEIO::NetAccess;
 #endif
 
diff --git a/tdehtml/ecma/xmlhttprequest.h b/tdehtml/ecma/xmlhttprequest.h
index 2dc89e227..95a7c9cc2 100644
--- a/tdehtml/ecma/xmlhttprequest.h
+++ b/tdehtml/ecma/xmlhttprequest.h
@@ -24,7 +24,7 @@
 #include "ecma/kjs_binding.h"
 #include "ecma/kjs_dom.h"
 #include "misc/decoder.h"
-#include "kio/jobclasses.h"
+#include "tdeio/jobclasses.h"
 
 namespace KJS {
 
diff --git a/tdehtml/ecma/xmlserializer.h b/tdehtml/ecma/xmlserializer.h
index 629d09afe..a86df3ed4 100644
--- a/tdehtml/ecma/xmlserializer.h
+++ b/tdehtml/ecma/xmlserializer.h
@@ -24,7 +24,7 @@
 #include "ecma/kjs_binding.h"
 #include "ecma/kjs_dom.h"
 #include "misc/decoder.h"
-#include "kio/jobclasses.h"
+#include "tdeio/jobclasses.h"
 
 namespace KJS {
 
diff --git a/tdehtml/html/CMakeLists.txt b/tdehtml/html/CMakeLists.txt
index a7a3bf466..a108b11f6 100644
--- a/tdehtml/html/CMakeLists.txt
+++ b/tdehtml/html/CMakeLists.txt
@@ -19,10 +19,10 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
-  ${CMAKE_SOURCE_DIR}/kio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
   ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/tdewallet/client
 )
diff --git a/tdehtml/html/Makefile.am b/tdehtml/html/Makefile.am
index 0a3286243..ed6ca0114 100644
--- a/tdehtml/html/Makefile.am
+++ b/tdehtml/html/Makefile.am
@@ -40,7 +40,7 @@ noinst_HEADERS = \
 	html_formimpl.h      html_objectimpl.h
 
 INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/dcop \
- -I$(top_srcdir)/kio/kssl \
+ -I$(top_srcdir)/tdeio/kssl \
  -I$(top_srcdir)/kjs -I$(top_srcdir)/tdehtml -I$(top_srcdir) \
  -I$(top_srcdir)/tdewallet/client -I$(top_srcdir)/tdeutils \
  $(all_includes)
diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp
index f8c566511..7e2776ad5 100644
--- a/tdehtml/html/html_formimpl.cpp
+++ b/tdehtml/html/html_formimpl.cpp
@@ -57,7 +57,7 @@
 #include <tdewallet.h>
 #endif
 #include <netaccess.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqtextcodec.h>
diff --git a/tdehtml/java/CMakeLists.txt b/tdehtml/java/CMakeLists.txt
index 994763c09..e1958d320 100644
--- a/tdehtml/java/CMakeLists.txt
+++ b/tdehtml/java/CMakeLists.txt
@@ -16,14 +16,14 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_BINARY_DIR}/kio/kssl
+  ${CMAKE_BINARY_DIR}/tdeio/kssl
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
 )
 
 link_directories(
diff --git a/tdehtml/java/Makefile.am b/tdehtml/java/Makefile.am
index a5e46a0d5..00eeca230 100644
--- a/tdehtml/java/Makefile.am
+++ b/tdehtml/java/Makefile.am
@@ -15,7 +15,7 @@ libkjava_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
 libkjava_la_LIBADD = $(LIB_KPARTS)
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tdehtml \
-	-I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl \
+	-I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl \
 	$(all_includes) 
 
 kjavadata_DATA = kjava.jar kjava.policy pluginsinfo
diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index b125bcc1a..7ad046b9a 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -26,14 +26,14 @@
 #include "kjavadownloader.h"
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <tdeparts/browserextension.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
 
-#include <kio/job.h>
-#include <kio/kprotocolmanager.h>
+#include <tdeio/job.h>
+#include <tdeio/kprotocolmanager.h>
 #include <ksslcertificate.h>
 #include <ksslcertchain.h>
 #include <kssl.h>
diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index fce5195ff..194a6324a 100644
--- a/tdehtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -37,8 +37,8 @@
 #include <kiconloader.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
-#include <kio/authinfo.h>
+#include <tdeconfig.h>
+#include <tdeio/authinfo.h>
 #include <dcopclient.h>
 
 #include "kjavaappletwidget.h"
diff --git a/tdehtml/java/kjavadownloader.cpp b/tdehtml/java/kjavadownloader.cpp
index a0a8abdd2..5b1c55324 100644
--- a/tdehtml/java/kjavadownloader.cpp
+++ b/tdehtml/java/kjavadownloader.cpp
@@ -23,8 +23,8 @@
 #include "kjavaappletserver.h"
 
 #include <kurl.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kdebug.h>
 #include <tqfile.h>
 
diff --git a/tdehtml/java/kjavaprocess.cpp b/tdehtml/java/kjavaprocess.cpp
index dbe80305e..1ff68dd74 100644
--- a/tdehtml/java/kjavaprocess.cpp
+++ b/tdehtml/java/kjavaprocess.cpp
@@ -22,7 +22,7 @@
 #include "kjavaprocess.h"
 
 #include <kdebug.h>
-#include <kio/kprotocolmanager.h>
+#include <tdeio/kprotocolmanager.h>
 
 #include <tqtextstream.h>
 #include <tqmap.h>
diff --git a/tdehtml/misc/CMakeLists.txt b/tdehtml/misc/CMakeLists.txt
index da1f0dfd3..0babd6567 100644
--- a/tdehtml/misc/CMakeLists.txt
+++ b/tdehtml/misc/CMakeLists.txt
@@ -19,10 +19,10 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/tdeutils
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 
diff --git a/tdehtml/misc/Makefile.am b/tdehtml/misc/Makefile.am
index 670fd5a1f..a26247035 100644
--- a/tdehtml/misc/Makefile.am
+++ b/tdehtml/misc/Makefile.am
@@ -31,7 +31,7 @@ noinst_HEADERS = \
 	decoder.h tdehtmllayout.h loader_jpeg.h loader.h guess_ja.h\
 	stringit.h htmlhashes.h helper.h shared.h arena.h knsplugininstaller.h
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dcop -I$(top_srcdir)/kio -I$(top_srcdir)/libltdl \
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dcop -I$(top_srcdir)/tdeio -I$(top_srcdir)/libltdl \
            -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeutils $(all_includes)
 
 SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
diff --git a/tdehtml/misc/helper.cpp b/tdehtml/misc/helper.cpp
index f759a9957..047a278fa 100644
--- a/tdehtml/misc/helper.cpp
+++ b/tdehtml/misc/helper.cpp
@@ -30,7 +30,7 @@
 #include <tqptrlist.h>
 #include <kstaticdeleter.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtooltip.h>
 
 using namespace DOM;
diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp
index 60a75f856..5cd18f29b 100644
--- a/tdehtml/misc/loader.cpp
+++ b/tdehtml/misc/loader.cpp
@@ -57,8 +57,8 @@
 #include <tqwidget.h>
 
 #include <kapplication.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kglobal.h>
 #include <kimageio.h>
 #include <kcharsets.h>
@@ -70,7 +70,7 @@
 
 #ifdef IMAGE_TITLES
 #include <tqfile.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <ktempfile.h>
 #endif
 
diff --git a/tdehtml/misc/loader.h b/tdehtml/misc/loader.h
index 97e637120..fa00b4ffb 100644
--- a/tdehtml/misc/loader.h
+++ b/tdehtml/misc/loader.h
@@ -49,7 +49,7 @@
 #include <tqtimer.h>
 
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <tdehtml_settings.h>
 #include <dom/dom_string.h>
diff --git a/tdehtml/rendering/CMakeLists.txt b/tdehtml/rendering/CMakeLists.txt
index 757e9a72a..b8346501f 100644
--- a/tdehtml/rendering/CMakeLists.txt
+++ b/tdehtml/rendering/CMakeLists.txt
@@ -19,9 +19,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
diff --git a/tdehtml/rendering/Makefile.am b/tdehtml/rendering/Makefile.am
index 605788764..16d30da53 100644
--- a/tdehtml/rendering/Makefile.am
+++ b/tdehtml/rendering/Makefile.am
@@ -41,8 +41,8 @@ noinst_HEADERS = \
 	render_br.h render_applet.h font.h table_layout.h render_line.h \
 	render_generated.h enumerate.h
 
-INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
- -I$(top_srcdir)/kfile -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeutils -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/tdeio -I$(top_srcdir)/dcop \
+ -I$(top_srcdir)/tdefile -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeutils -I$(top_srcdir) $(all_includes)
 
 SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
 
diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index 7fe009a7f..2872a0e6c 100644
--- a/tdehtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -26,7 +26,7 @@
 #include <kcompletionbox.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kfind.h>
 #include <kfinddialog.h>
 #include <kiconloader.h>
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 62a5293c1..4127e7762 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -45,8 +45,8 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
 #include <kprocess.h>
 #include <ktoolbarbutton.h>
 #include <ktoolbar.h>
diff --git a/tdehtml/tdehtml_ext.h b/tdehtml/tdehtml_ext.h
index 5e2eafa9e..5a8f00e70 100644
--- a/tdehtml/tdehtml_ext.h
+++ b/tdehtml/tdehtml_ext.h
@@ -32,7 +32,7 @@
 #include <tqguardedptr.h>
 
 #include <kaction.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 /**
  * This is the BrowserExtension for a KHTMLPart document. Please see the KParts documentation for
diff --git a/tdehtml/tdehtml_iface.cc b/tdehtml/tdehtml_iface.cc
index e42562c51..1ceb6b5d4 100644
--- a/tdehtml/tdehtml_iface.cc
+++ b/tdehtml/tdehtml_iface.cc
@@ -22,7 +22,7 @@
 #include "tdehtml_part.h"
 #include "tdehtmlview.h"
 #include "tdehtml_ext.h"
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <tqapplication.h>
 #include <tqvariant.h>
 
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 185ded02d..2ebd55df8 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -75,9 +75,9 @@ using namespace DOM;
 #include <dcopref.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
-#include <kio/job.h>
-#include <kio/global.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/netaccess.h>
 #include <kprotocolmanager.h>
 #include <kdebug.h>
 #include <kiconloader.h>
@@ -85,7 +85,7 @@ using namespace DOM;
 #include <kcharsets.h>
 #include <kmessagebox.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktrader.h>
 #include <kdatastream.h>
 #include <ktempfile.h>
@@ -102,7 +102,7 @@ using namespace DOM;
 #include <ksslcertchain.h>
 #include <ksslinfodlg.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kurifilter.h>
 #include <kstatusbar.h>
 #include <kurllabel.h>
@@ -1136,7 +1136,7 @@ void KHTMLPart::launchJSErrorDialog() {
 void KHTMLPart::launchJSConfigDialog() {
   TQStringList args;
   args << "tdehtml_java_js";
-  TDEApplication::tdeinitExec( "kcmshell", args );
+  TDEApplication::tdeinitExec( "tdecmshell", args );
 }
 
 TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const DOM::Node& n, const TQString& script)
diff --git a/tdehtml/tdehtml_run.cpp b/tdehtml/tdehtml_run.cpp
index e1c34915a..6ae958d67 100644
--- a/tdehtml/tdehtml_run.cpp
+++ b/tdehtml/tdehtml_run.cpp
@@ -22,7 +22,7 @@
  */
 #include "tdehtmlpart_p.h"
 #include "tdehtml_run.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include "tdehtml_ext.h"
diff --git a/tdehtml/tdehtml_settings.cc b/tdehtml/tdehtml_settings.cc
index 4d65aa99b..5675b2105 100644
--- a/tdehtml/tdehtml_settings.cc
+++ b/tdehtml/tdehtml_settings.cc
@@ -22,7 +22,7 @@
 #include "tdehtml_settings.h"
 #include "tdehtmldefaults.h"
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/tdehtml/tdehtmlimage.cpp b/tdehtml/tdehtmlimage.cpp
index cc244ed80..a2b73db5c 100644
--- a/tdehtml/tdehtmlimage.cpp
+++ b/tdehtml/tdehtmlimage.cpp
@@ -29,7 +29,7 @@
 #include <tqvbox.h>
 #include <tqtimer.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kinstance.h>
 #include <kmimetype.h>
 #include <klocale.h>
diff --git a/tdehtml/tdemultipart/CMakeLists.txt b/tdehtml/tdemultipart/CMakeLists.txt
index f0d03953e..6ae8c8d0e 100644
--- a/tdehtml/tdemultipart/CMakeLists.txt
+++ b/tdehtml/tdemultipart/CMakeLists.txt
@@ -18,8 +18,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
diff --git a/tdehtml/tdemultipart/Makefile.am b/tdehtml/tdemultipart/Makefile.am
index f02b5931e..f2e119c3f 100644
--- a/tdehtml/tdemultipart/Makefile.am
+++ b/tdehtml/tdemultipart/Makefile.am
@@ -1,11 +1,11 @@
-INCLUDES = -I$(top_srcdir)/tdehtml -I$(top_srcdir)/kio/httpfilter -I$(top_srcdir)/tdeutils $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeio/httpfilter -I$(top_srcdir)/tdeutils $(all_includes)
 
 # These are not really libraries, but modules dynamically opened.
 # So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/trinity
 kde_module_LTLIBRARIES = libtdemultipart.la
 
 libtdemultipart_la_SOURCES = tdemultipart.cpp
-libtdemultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIBZ)
+libtdemultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIBZ)
 libtdemultipart_la_DEPENDENCIES = $(LIB_KPARTS)
 libtdemultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
diff --git a/tdehtml/tdemultipart/tdemultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp
index d5195186d..82e94a4c0 100644
--- a/tdehtml/tdemultipart/tdemultipart.cpp
+++ b/tdehtml/tdemultipart/tdemultipart.cpp
@@ -23,7 +23,7 @@
 #include <kinstance.h>
 #include <kmimetype.h>
 #include <klocale.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqfile.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 233ac8402..497126d8c 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -62,7 +62,7 @@
 #include <kaction.h>
 #include <kcmdlineargs.h>
 #include "tdehtml_factory.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmainwindow.h>
 #include <ksimpleconfig.h>
 #include <kglobalsettings.h>
diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp
index 84ace61fe..1da21be1f 100644
--- a/tdehtml/testtdehtml.cpp
+++ b/tdehtml/testtdehtml.cpp
@@ -30,7 +30,7 @@
 #include <kcmdlineargs.h>
 #include <kaction.h>
 #include "domtreeview.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 static KCmdLineOptions options[] = { { "+file", "url to open", 0 } , KCmdLineLastOption };
 
diff --git a/tdehtml/xml/CMakeLists.txt b/tdehtml/xml/CMakeLists.txt
index 904d8ba09..c32e139dc 100644
--- a/tdehtml/xml/CMakeLists.txt
+++ b/tdehtml/xml/CMakeLists.txt
@@ -20,8 +20,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/tdewallet/client
   ${CMAKE_SOURCE_DIR}/tdeutils
 )
diff --git a/tdehtml/xml/Makefile.am b/tdehtml/xml/Makefile.am
index 257f63813..febb3ef71 100644
--- a/tdehtml/xml/Makefile.am
+++ b/tdehtml/xml/Makefile.am
@@ -35,7 +35,7 @@ noinst_HEADERS = \
 	dom2_traversalimpl.h xml_tokenizer.h  dom_xmlimpl.h \
 	dom2_eventsimpl.h  dom2_viewsimpl.h dom_restyler.h
 
-INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
+INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/tdeio -I$(top_srcdir)/dcop \
  -I$(top_srcdir)/tdehtml -I$(top_srcdir) -I$(top_srcdir)/tdewallet/client \
  -I$(top_srcdir)/tdeutils -I$(top_builddir)/kjs $(all_includes)
 
diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp
index 3ab639867..5614dbf2e 100644
--- a/tdehtml/xml/dom_docimpl.cpp
+++ b/tdehtml/xml/dom_docimpl.cpp
@@ -78,7 +78,7 @@
 #include "html/html_objectimpl.h"
 
 #include <kapplication.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <stdlib.h>
 #include "dom_docimpl.h"
diff --git a/kio/CMakeLists.txt b/tdeio/CMakeLists.txt
index cd2dfd80e..826fbf743 100644
--- a/kio/CMakeLists.txt
+++ b/tdeio/CMakeLists.txt
@@ -14,11 +14,11 @@ add_definitions(
 )
 
 add_subdirectory( kssl )
-add_subdirectory( kio )
+add_subdirectory( tdeio )
 add_subdirectory( bookmarks )
-add_subdirectory( kfile )
+add_subdirectory( tdefile )
 add_subdirectory( pics )
-add_subdirectory( kioexec )
+add_subdirectory( tdeioexec )
 add_subdirectory( httpfilter )
 add_subdirectory( misc )
 add_subdirectory( kpasswdserver )
@@ -41,10 +41,10 @@ install( FILES magic DESTINATION ${MIME_INSTALL_DIR} )
 install( FILES
     application.desktop kurifilterplugin.desktop
     kcomprfilter.desktop kscan.desktop kdatatool.desktop
-    kfileplugin.desktop tdecmodule.desktop
+    tdefileplugin.desktop tdecmodule.desktop
   DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
-install( FILES kioslave.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+install( FILES tdeioslave.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 install( PROGRAMS useragent.pl proxytype.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 install( FILES renamedlgplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 install( FILES kpasswdserver.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
@@ -56,16 +56,16 @@ if( HAVE_ELFICON )
 endif( HAVE_ELFICON )
 
 
-##### libkio ####################################
+##### libtdeio ####################################
 
-set( target kio )
+set( target tdeio )
 
 configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY )
 
 tde_add_library( ${target} SHARED
   SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
   VERSION 4.2.0
-  EMBED kssl-static kiocore-static tdesycoca-static kbookmarks-static kfile-static ${ELFICON_STATIC_LIB}
+  EMBED kssl-static tdeiocore-static tdesycoca-static kbookmarks-static tdefile-static ${ELFICON_STATIC_LIB}
   LINK ltdlc-static tdeui-shared tdesu-shared tdewalletclient-shared ${LIBR_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kio/DESIGN b/tdeio/DESIGN
index 08617bbda..22307c5c0 100644
--- a/kio/DESIGN
+++ b/tdeio/DESIGN
@@ -1,8 +1,8 @@
 DESIGN:
 =======
 
-libkio uses kioslaves (separate processes) that handle a given protocol.
-Launching those slaves is taken care of by the tdeinit/klauncher tandem,
+libtdeio uses tdeioslaves (separate processes) that handle a given protocol.
+Launching those slaves is taken care of by the tdeinit/tdelauncher tandem,
 which are notified by DCOP.
 
 Connection is the most low-level class, the one that encapsulates the pipe.
@@ -164,7 +164,7 @@ GUI daemon which could be provided in several implementations - examples
 are popup dialogs (most are annoyed by them, like me :) or a kicker applet
 or something completely different. This would also remove the dependency on
 libtdeui (I hope).
-Conclusion: kio_uiserver is this single GUI daemon, but the dependency on
+Conclusion: tdeio_uiserver is this single GUI daemon, but the dependency on
 libtdeui couldn't be removed (for many reasons, including Job::showErrorDialog())
 
 A. progress handling
diff --git a/kio/DESIGN.krun b/tdeio/DESIGN.krun
index 948ef79a3..9ac31f433 100644
--- a/kio/DESIGN.krun
+++ b/tdeio/DESIGN.krun
@@ -14,9 +14,9 @@ existing slave will be re-used and the request resumed.
 
 * When the client is an external process, the on-hold-slave should be 
 removed from the job-scheduler and should connect itself with
-klauncher. This is hard because it must ensure that the external 
+tdelauncher. This is hard because it must ensure that the external 
 program does not request the slave before it has been transfered to
-klauncher. (Status: to be done)
+tdelauncher. (Status: to be done)
 
 * When a slave is on hold but not used for a certain period of time, 
 or, when another slave is put on hold, the slave should be killed.
diff --git a/kio/DESIGN.metadata b/tdeio/DESIGN.metadata
index 783d7f52a..783d7f52a 100644
--- a/kio/DESIGN.metadata
+++ b/tdeio/DESIGN.metadata
diff --git a/kio/DESIGN.mimetypes b/tdeio/DESIGN.mimetypes
index 7f1d81b11..7f1d81b11 100644
--- a/kio/DESIGN.mimetypes
+++ b/tdeio/DESIGN.mimetypes
diff --git a/kio/DESKTOP_ENTRY_STANDARD b/tdeio/DESKTOP_ENTRY_STANDARD
index e19cc24c8..e19cc24c8 100644
--- a/kio/DESKTOP_ENTRY_STANDARD
+++ b/tdeio/DESKTOP_ENTRY_STANDARD
diff --git a/kio/Mainpage.dox b/tdeio/Mainpage.dox
index 7545c29ef..7545c29ef 100644
--- a/kio/Mainpage.dox
+++ b/tdeio/Mainpage.dox
diff --git a/kio/Makefile.am b/tdeio/Makefile.am
index fbe0d75dc..aa23fcb5a 100644
--- a/kio/Makefile.am
+++ b/tdeio/Makefile.am
@@ -20,16 +20,16 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
 
 INCLUDES=  -I$(srcdir)/.. $(all_includes) $(SSL_INCLUDES)
 
-SUBDIRS = kssl kio bookmarks kfile . pics tests kioexec httpfilter misc kpasswdserver
+SUBDIRS = kssl tdeio bookmarks tdefile . pics tests tdeioexec httpfilter misc kpasswdserver
 
-lib_LTLIBRARIES = libkio.la
+lib_LTLIBRARIES = libtdeio.la
 
-libkio_la_SOURCES = dummy.cpp
+libtdeio_la_SOURCES = dummy.cpp
 
-libkio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) \
+libtdeio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) \
 	$(KDE_MT_LDFLAGS)
-libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \
-	kio/libtdesycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \
+libtdeio_la_LIBADD = kssl/libkssl.la tdeio/libtdeiocore.la \
+	tdeio/libtdesycoca.la bookmarks/libkbookmarks.la tdefile/libtdefile.la \
 	../tdeui/libtdeui.la ../tdesu/libtdesu.la \
 	../tdewallet/client/libtdewalletclient.la \
 	$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
@@ -37,13 +37,13 @@ libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \
 kde_mime_DATA = magic
 kde_servicetypes_DATA = application.desktop kurifilterplugin.desktop \
                         kcomprfilter.desktop kscan.desktop kdatatool.desktop \
-                        kfileplugin.desktop tdecmodule.desktop
+                        tdefileplugin.desktop tdecmodule.desktop
 
 EXTRA_DIST = $(kde_mime_DATA)
 
-update_DATA = kioslave.upd
+update_DATA = tdeioslave.upd
 update_SCRIPTS = useragent.pl proxytype.pl
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 servicetype_DATA = renamedlgplugin.desktop
 servicetypedir = $(kde_servicetypesdir)
@@ -58,10 +58,10 @@ dummy.cpp:
 	echo >dummy.cpp
 
 messages:
-	$(EXTRACTRC) `find . ../kioslave -name "*.rc" -o -name "*.ui"` > rc.cpp
-	$(XGETTEXT) `find . ../kioslave -name "*.cpp" -o -name "*.cc" -o -name "*.h"` -o $(podir)/kio.pot
+	$(EXTRACTRC) `find . ../tdeioslave -name "*.rc" -o -name "*.ui"` > rc.cpp
+	$(XGETTEXT) `find . ../tdeioslave -name "*.cpp" -o -name "*.cc" -o -name "*.h"` -o $(podir)/tdeio.pot
 	rm -f rc.cpp
 
-DOXYGEN_REFERENCES = tdecore tdefx kjs dcop tdeui kio/kio kio/kfile
+DOXYGEN_REFERENCES = tdecore tdefx kjs dcop tdeui tdeio/tdeio tdeio/tdefile
 DOXYGEN_EXCLUDE = kssl/kssl
 include ../admin/Doxyfile.am
diff --git a/kio/application.desktop b/tdeio/application.desktop
index d9e9fc3c2..d9e9fc3c2 100644
--- a/kio/application.desktop
+++ b/tdeio/application.desktop
diff --git a/kio/bookmarks/CMakeLists.txt b/tdeio/bookmarks/CMakeLists.txt
index 7c2fd72c6..93121cbac 100644
--- a/kio/bookmarks/CMakeLists.txt
+++ b/tdeio/bookmarks/CMakeLists.txt
@@ -18,9 +18,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 
diff --git a/kio/bookmarks/Makefile.am b/tdeio/bookmarks/Makefile.am
index 63b535e13..e1ec3a8df 100644
--- a/kio/bookmarks/Makefile.am
+++ b/tdeio/bookmarks/Makefile.am
@@ -17,7 +17,7 @@
 #    Boston, MA 02110-1301, USA.
 
 
-INCLUDES= -I$(srcdir)/../libltdl/ -I$(top_srcdir) -I$(top_srcdir)/tdefx -I$(top_builddir)/kio/kio $(all_includes)
+INCLUDES= -I$(srcdir)/../libltdl/ -I$(top_srcdir) -I$(top_srcdir)/tdefx -I$(top_builddir)/tdeio/tdeio $(all_includes)
 
 noinst_LTLIBRARIES  = libkbookmarks.la
 
diff --git a/kio/bookmarks/dptrtemplate.h b/tdeio/bookmarks/dptrtemplate.h
index dbc059e7e..dbc059e7e 100644
--- a/kio/bookmarks/dptrtemplate.h
+++ b/tdeio/bookmarks/dptrtemplate.h
diff --git a/kio/bookmarks/kbookmark.cc b/tdeio/bookmarks/kbookmark.cc
index ab1cc398a..ab1cc398a 100644
--- a/kio/bookmarks/kbookmark.cc
+++ b/tdeio/bookmarks/kbookmark.cc
diff --git a/kio/bookmarks/kbookmark.h b/tdeio/bookmarks/kbookmark.h
index 4e5dc9149..4e5dc9149 100644
--- a/kio/bookmarks/kbookmark.h
+++ b/tdeio/bookmarks/kbookmark.h
diff --git a/kio/bookmarks/kbookmarkbar.cc b/tdeio/bookmarks/kbookmarkbar.cc
index dc2ad0cde..e73801808 100644
--- a/kio/bookmarks/kbookmarkbar.cc
+++ b/tdeio/bookmarks/kbookmarkbar.cc
@@ -31,7 +31,7 @@
 #include <ktoolbar.h>
 #include <ktoolbarbutton.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpopupmenu.h>
 
 #include "kbookmarkdrag.h"
diff --git a/kio/bookmarks/kbookmarkbar.h b/tdeio/bookmarks/kbookmarkbar.h
index 1f100d183..1f100d183 100644
--- a/kio/bookmarks/kbookmarkbar.h
+++ b/tdeio/bookmarks/kbookmarkbar.h
diff --git a/kio/bookmarks/kbookmarkdombuilder.cc b/tdeio/bookmarks/kbookmarkdombuilder.cc
index 5c0882d05..5c0882d05 100644
--- a/kio/bookmarks/kbookmarkdombuilder.cc
+++ b/tdeio/bookmarks/kbookmarkdombuilder.cc
diff --git a/kio/bookmarks/kbookmarkdombuilder.h b/tdeio/bookmarks/kbookmarkdombuilder.h
index 44fe7b170..44fe7b170 100644
--- a/kio/bookmarks/kbookmarkdombuilder.h
+++ b/tdeio/bookmarks/kbookmarkdombuilder.h
diff --git a/kio/bookmarks/kbookmarkdrag.cc b/tdeio/bookmarks/kbookmarkdrag.cc
index d13893eed..d13893eed 100644
--- a/kio/bookmarks/kbookmarkdrag.cc
+++ b/tdeio/bookmarks/kbookmarkdrag.cc
diff --git a/kio/bookmarks/kbookmarkdrag.h b/tdeio/bookmarks/kbookmarkdrag.h
index 016bd6849..016bd6849 100644
--- a/kio/bookmarks/kbookmarkdrag.h
+++ b/tdeio/bookmarks/kbookmarkdrag.h
diff --git a/kio/bookmarks/kbookmarkexporter.cc b/tdeio/bookmarks/kbookmarkexporter.cc
index 30c52bdb8..30c52bdb8 100644
--- a/kio/bookmarks/kbookmarkexporter.cc
+++ b/tdeio/bookmarks/kbookmarkexporter.cc
diff --git a/kio/bookmarks/kbookmarkexporter.h b/tdeio/bookmarks/kbookmarkexporter.h
index 68e8f475a..68e8f475a 100644
--- a/kio/bookmarks/kbookmarkexporter.h
+++ b/tdeio/bookmarks/kbookmarkexporter.h
diff --git a/kio/bookmarks/kbookmarkimporter.cc b/tdeio/bookmarks/kbookmarkimporter.cc
index 8a31fa3d2..366802905 100644
--- a/kio/bookmarks/kbookmarkimporter.cc
+++ b/tdeio/bookmarks/kbookmarkimporter.cc
@@ -18,7 +18,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kio/bookmarks/kbookmarkimporter.h b/tdeio/bookmarks/kbookmarkimporter.h
index cc87b2004..cc87b2004 100644
--- a/kio/bookmarks/kbookmarkimporter.h
+++ b/tdeio/bookmarks/kbookmarkimporter.h
diff --git a/kio/bookmarks/kbookmarkimporter_crash.cc b/tdeio/bookmarks/kbookmarkimporter_crash.cc
index 988e1f673..b2871eecd 100644
--- a/kio/bookmarks/kbookmarkimporter_crash.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.cc
@@ -20,7 +20,7 @@
 
 #include "kbookmarkimporter_crash.h"
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kio/bookmarks/kbookmarkimporter_crash.h b/tdeio/bookmarks/kbookmarkimporter_crash.h
index f4fc9af32..f4fc9af32 100644
--- a/kio/bookmarks/kbookmarkimporter_crash.h
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.h
diff --git a/kio/bookmarks/kbookmarkimporter_ie.cc b/tdeio/bookmarks/kbookmarkimporter_ie.cc
index 8d1372194..092ebe596 100644
--- a/kio/bookmarks/kbookmarkimporter_ie.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_ie.cc
@@ -18,7 +18,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kio/bookmarks/kbookmarkimporter_ie.h b/tdeio/bookmarks/kbookmarkimporter_ie.h
index b1b7c651c..b1b7c651c 100644
--- a/kio/bookmarks/kbookmarkimporter_ie.h
+++ b/tdeio/bookmarks/kbookmarkimporter_ie.h
diff --git a/kio/bookmarks/kbookmarkimporter_kde1.cc b/tdeio/bookmarks/kbookmarkimporter_kde1.cc
index ac0d29b97..6aca22b84 100644
--- a/kio/bookmarks/kbookmarkimporter_kde1.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_kde1.cc
@@ -19,7 +19,7 @@
 */
 
 #include "kbookmarkimporter_kde1.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kio/bookmarks/kbookmarkimporter_kde1.h b/tdeio/bookmarks/kbookmarkimporter_kde1.h
index 5af4f04e9..5af4f04e9 100644
--- a/kio/bookmarks/kbookmarkimporter_kde1.h
+++ b/tdeio/bookmarks/kbookmarkimporter_kde1.h
diff --git a/kio/bookmarks/kbookmarkimporter_ns.cc b/tdeio/bookmarks/kbookmarkimporter_ns.cc
index 5521bee7e..8ce06a79b 100644
--- a/kio/bookmarks/kbookmarkimporter_ns.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_ns.cc
@@ -23,7 +23,7 @@
 #include "kbookmarkimporter.h"
 #include "kbookmarkexporter.h"
 #include "kbookmarkmanager.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kio/bookmarks/kbookmarkimporter_ns.h b/tdeio/bookmarks/kbookmarkimporter_ns.h
index 10844fc63..10844fc63 100644
--- a/kio/bookmarks/kbookmarkimporter_ns.h
+++ b/tdeio/bookmarks/kbookmarkimporter_ns.h
diff --git a/kio/bookmarks/kbookmarkimporter_opera.cc b/tdeio/bookmarks/kbookmarkimporter_opera.cc
index 45ac1a7ca..57b5d6208 100644
--- a/kio/bookmarks/kbookmarkimporter_opera.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_opera.cc
@@ -18,7 +18,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kio/bookmarks/kbookmarkimporter_opera.h b/tdeio/bookmarks/kbookmarkimporter_opera.h
index f6f1028b1..f6f1028b1 100644
--- a/kio/bookmarks/kbookmarkimporter_opera.h
+++ b/tdeio/bookmarks/kbookmarkimporter_opera.h
diff --git a/kio/bookmarks/kbookmarkmanager.cc b/tdeio/bookmarks/kbookmarkmanager.cc
index a87e0f20e..a87e0f20e 100644
--- a/kio/bookmarks/kbookmarkmanager.cc
+++ b/tdeio/bookmarks/kbookmarkmanager.cc
diff --git a/kio/bookmarks/kbookmarkmanager.h b/tdeio/bookmarks/kbookmarkmanager.h
index 4a129704a..4a129704a 100644
--- a/kio/bookmarks/kbookmarkmanager.h
+++ b/tdeio/bookmarks/kbookmarkmanager.h
diff --git a/kio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cc
index 5e85bc1f6..a4d88ae57 100644
--- a/kio/bookmarks/kbookmarkmenu.cc
+++ b/tdeio/bookmarks/kbookmarkmenu.cc
@@ -27,7 +27,7 @@
 #include "kbookmarkdrag.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
diff --git a/kio/bookmarks/kbookmarkmenu.h b/tdeio/bookmarks/kbookmarkmenu.h
index 35e6191e3..35e6191e3 100644
--- a/kio/bookmarks/kbookmarkmenu.h
+++ b/tdeio/bookmarks/kbookmarkmenu.h
diff --git a/kio/bookmarks/kbookmarkmenu_p.h b/tdeio/bookmarks/kbookmarkmenu_p.h
index cb88607fe..cb88607fe 100644
--- a/kio/bookmarks/kbookmarkmenu_p.h
+++ b/tdeio/bookmarks/kbookmarkmenu_p.h
diff --git a/kio/bookmarks/kbookmarknotifier.h b/tdeio/bookmarks/kbookmarknotifier.h
index f99e570bc..f99e570bc 100644
--- a/kio/bookmarks/kbookmarknotifier.h
+++ b/tdeio/bookmarks/kbookmarknotifier.h
diff --git a/tdeio/data.protocol b/tdeio/data.protocol
new file mode 100644
index 000000000..1982efe80
--- /dev/null
+++ b/tdeio/data.protocol
@@ -0,0 +1,71 @@
+[Protocol]
+protocol=data
+input=stream
+output=none
+reading=true
+Icon=www
+Class=:internet
+Description=A tdeioslave for data URIs (rfc2397)
+Description[af]= ´n tdeioslave vir data URIs (rfc2397)
+Description[be]=Модуль tdeioslave дл� URI з данн�мі (rfc2397)
+Description[br]=Ur tdeioslave evit an URIoù roadoù (rfc2397)
+Description[bs]=Kioslave za data URIs (rfc2397)
+Description[ca]=Un tdeioslave per a URIs de dades (rfc2397)
+Description[cs]=Kioslave pro datová URI (rfc2397)
+Description[csb]=Plugins protokółu pòdôwków URI (rfc2397)
+Description[da]=En tdeioslave for data-URI'er (rfc2397)
+Description[de]=Ein-/Ausgabemodul für Daten-URIs (rfc2397)
+Description[el]=Ένα tdeioslave για URI δεδομένων (rfc2397)
+Description[es]=Un tdeioslave para datos URIs (rfc2397)
+Description[et]=Andme-URI-de I/O-moodul (rfc2397)
+Description[eu]=Datuen URLen (rfc2397) tdeioslave-a
+Description[fa]=یک tdeioslave برای URIهای داده )rfc2397(
+Description[fi]=tdeioslave data URI:lle (rfc2397)
+Description[fr]=Un module d'entrée / sortie pour les URI de données (rfc2397)
+Description[fy]=In tdeioslave foar data-URI-adresse (rfc2397)
+Description[gl]=Un tdeioslave para URIs de dados (rfc2397)
+Description[hi]=डाटा यूआरआई (आर�फसी2397) के लि� �क के-आई-ओ-स�लेव
+Description[hr]=tdeioslave za podatkovne URI-ije (rfc2397)
+Description[hu]=KDE-protokoll adat-URI-k használataához (RFC 2397)
+Description[id]=Kioslave for URI data (rfc2397)
+Description[is]=tdeioslave fyrir gagnaslóðir (rfc2397)
+Description[it]=Un tdeioslave per il protocollo di URI di dati (rfc2397)
+Description[ja]=データ URIs (rfc2397) � tdeioslave
+Description[ka]=URI მ�ნ�ცემთ� (rfc2397) დ�მმუშ�ვებელი
+Description[kk]=URI деректерді өңдеу tdeioslave модулі (rfc2397)
+Description[km]=tdeioslave មួយ​សម្រាប់​ទិន្នន�យ URIs (rfc2397)
+Description[lb]=E tdeioslave fir Donnéen-URIs (rfc2397)
+Description[lt]=Antrinė KDE programa duomenų URI (rfc2397)
+Description[mk]=kio-�лужител за податочни URI (rfc2397)
+Description[ms]=Kioslave untuk URI data (rfc2397)
+Description[nb]=tdeioslave for data URI-er (rfc2397)
+Description[nds]=In-/Utgaavmoduul för Daten-URIs (rfc2397)
+Description[ne]=डेटा URIs का लागि किओस�लेभ (rfc2397)
+Description[nl]=Een tdeioslave voor data-URI-adressen (rfc2397)
+Description[nn]=A tdeioslave for data URI-ar (rfc2397)
+Description[pa]= ਡਾਟਾ URI ਲਈ tdeioslave(rfc2397)
+Description[pl]=Wtyczka protokołu URI danych (rfc2397)
+Description[pt]=Um 'tdeioslave' para URIs data (rfc2397)
+Description[pt_BR]=Uma implementação para o protocolo de URIs de dados (rfc2397)
+Description[ro]=Un dispozitiv de I/E pentru URI-urile de date (rfc2397)
+Description[ru]=Обработчик URI данных (rfc2397)
+Description[rw]=Kioslave y'ibyatanzwe URI (rfc2397)
+Description[se]=kiošláva dáhta-URI:aid várás (rfc2397)
+Description[sk]=IO klient pre dátové URI (rfc2397)
+Description[sl]=tdeioslave za podatkovne URI-je (rfc2397)
+Description[sr]=tdeioslave за URI-ије података (rfc2397)
+Description[sr@Latn]=tdeioslave za URI-ije podataka (rfc2397)
+Description[sv]=En I/O-slav för datawebbadresser (RFC 2397)
+Description[ta]=தரவ� வலைமனைகள�க�கான ஒர� tdeioslave (rfc2397)
+Description[te]=దత�తాంశం య�ఆరైల కొరక� కె�ఓబానిస (rfc2397)
+Description[tg]=tdeioslave барои URIs (rfc2397)
+Description[th]=tdeioslave สำหรับข้อมูล URIs (rfc2397)
+Description[tr]= Veri adresleri için bir tdeioslave (rfc2397)
+Description[tt]=Biremle URI öçen tdeioslave (rfc2397)
+Description[uk]=Підлеглий В/В дл� адре� (URI) даних (rfc2397)
+Description[vi]=Một tdeioslave cho các địa điểm URI kiểu dữ liệu (rfc2397).
+Description[zh_CN]=data URI(rfc2397) çš„ tdeioslave
+DocPath=tdeioslave/data.html
+URIMode=rawuri
+defaultMimetype=application/octet-stream
+determineMimetypeFromExtension=false
diff --git a/kio/httpfilter/CMakeLists.txt b/tdeio/httpfilter/CMakeLists.txt
index eec4e78a7..b40f10fdc 100644
--- a/kio/httpfilter/CMakeLists.txt
+++ b/tdeio/httpfilter/CMakeLists.txt
@@ -15,7 +15,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
 )
 
 
diff --git a/kio/httpfilter/Makefile.am b/tdeio/httpfilter/Makefile.am
index 2da25d1b6..2da25d1b6 100644
--- a/kio/httpfilter/Makefile.am
+++ b/tdeio/httpfilter/Makefile.am
diff --git a/kio/httpfilter/httpfilter.cc b/tdeio/httpfilter/httpfilter.cc
index 0f2adf20a..21086d613 100644
--- a/kio/httpfilter/httpfilter.cc
+++ b/tdeio/httpfilter/httpfilter.cc
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <klocale.h>
 
diff --git a/kio/httpfilter/httpfilter.h b/tdeio/httpfilter/httpfilter.h
index 520a1c627..520a1c627 100644
--- a/kio/httpfilter/httpfilter.h
+++ b/tdeio/httpfilter/httpfilter.h
diff --git a/kio/kcomprfilter.desktop b/tdeio/kcomprfilter.desktop
index 017bf987d..017bf987d 100644
--- a/kio/kcomprfilter.desktop
+++ b/tdeio/kcomprfilter.desktop
diff --git a/kio/kdatatool.desktop b/tdeio/kdatatool.desktop
index a58357d41..a58357d41 100644
--- a/kio/kdatatool.desktop
+++ b/tdeio/kdatatool.desktop
diff --git a/kio/kpasswdserver.desktop b/tdeio/kpasswdserver.desktop
index db43d621c..db43d621c 100644
--- a/kio/kpasswdserver.desktop
+++ b/tdeio/kpasswdserver.desktop
diff --git a/kio/kpasswdserver/CMakeLists.txt b/tdeio/kpasswdserver/CMakeLists.txt
index 5209e53c9..1d54ddc95 100644
--- a/kio/kpasswdserver/CMakeLists.txt
+++ b/tdeio/kpasswdserver/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_SOURCE_DIR}/tdewallet/client
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
 )
 
 link_directories(
diff --git a/kio/kpasswdserver/DESIGN b/tdeio/kpasswdserver/DESIGN
index 6a128f9df..6a128f9df 100644
--- a/kio/kpasswdserver/DESIGN
+++ b/tdeio/kpasswdserver/DESIGN
diff --git a/kio/kpasswdserver/Makefile.am b/tdeio/kpasswdserver/Makefile.am
index 9ba393ef3..d1a58059b 100644
--- a/kio/kpasswdserver/Makefile.am
+++ b/tdeio/kpasswdserver/Makefile.am
@@ -1,5 +1,5 @@
 # $Id$
-# Makefile.am of tdebase/kioslave/http
+# Makefile.am of tdebase/tdeioslave/http
 
 INCLUDES= -I$(top_srcdir)/tdewallet/client $(all_includes)
 
diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/tdeio/kpasswdserver/kpasswdserver.cpp
index b6a9aa696..ff7295181 100644
--- a/kio/kpasswdserver/kpasswdserver.cpp
+++ b/tdeio/kpasswdserver/kpasswdserver.cpp
@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kio/passdlg.h>
+#include <tdeio/passdlg.h>
 #include <tdewallet.h>
 
 #include "config.h"
diff --git a/kio/kpasswdserver/kpasswdserver.h b/tdeio/kpasswdserver/kpasswdserver.h
index 46e7191db..ce6d0386e 100644
--- a/kio/kpasswdserver/kpasswdserver.h
+++ b/tdeio/kpasswdserver/kpasswdserver.h
@@ -29,7 +29,7 @@
 #include <tqintdict.h>
 
 #include <dcopclient.h>
-#include <kio/authinfo.h>
+#include <tdeio/authinfo.h>
 #include <kded/kdedmodule.h>
 
 namespace KWallet {
diff --git a/kio/kscan.desktop b/tdeio/kscan.desktop
index 8d3a026fb..8d3a026fb 100644
--- a/kio/kscan.desktop
+++ b/tdeio/kscan.desktop
diff --git a/kio/kssl/CMakeLists.txt b/tdeio/kssl/CMakeLists.txt
index a2c9f00d6..a2c9f00d6 100644
--- a/kio/kssl/CMakeLists.txt
+++ b/tdeio/kssl/CMakeLists.txt
diff --git a/kio/kssl/KPMG-CA-16389.0.DC80502.pdf b/tdeio/kssl/KPMG-CA-16389.0.DC80502.pdf
index 63a7633ee..63a7633ee 100644
--- a/kio/kssl/KPMG-CA-16389.0.DC80502.pdf
+++ b/tdeio/kssl/KPMG-CA-16389.0.DC80502.pdf
diff --git a/kio/kssl/Makefile.am b/tdeio/kssl/Makefile.am
index 5d57ab7ab..5d57ab7ab 100644
--- a/kio/kssl/Makefile.am
+++ b/tdeio/kssl/Makefile.am
diff --git a/kio/kssl/README b/tdeio/kssl/README
index b5f404fc7..b5f404fc7 100644
--- a/kio/kssl/README
+++ b/tdeio/kssl/README
diff --git a/kio/kssl/SECURITY-HOLES b/tdeio/kssl/SECURITY-HOLES
index 62b8e9ca7..62b8e9ca7 100644
--- a/kio/kssl/SECURITY-HOLES
+++ b/tdeio/kssl/SECURITY-HOLES
diff --git a/kio/kssl/TODO b/tdeio/kssl/TODO
index 7e2270575..7e2270575 100644
--- a/kio/kssl/TODO
+++ b/tdeio/kssl/TODO
diff --git a/kio/kssl/configure.in.in b/tdeio/kssl/configure.in.in
index fa256cbdb..7e3848d78 100644
--- a/kio/kssl/configure.in.in
+++ b/tdeio/kssl/configure.in.in
@@ -4,4 +4,4 @@ if test "$have_ssl" = yes; then
 	AC_DEFINE(KSSL_HAVE_SSL, 1, [Define if we shall use KSSL])
 fi
 
-AM_CONFIG_HEADER([kio/kssl/ksslconfig.h])
+AM_CONFIG_HEADER([tdeio/kssl/ksslconfig.h])
diff --git a/kio/kssl/keygenwizard.ui b/tdeio/kssl/keygenwizard.ui
index 4cb5fe1df..4cb5fe1df 100644
--- a/kio/kssl/keygenwizard.ui
+++ b/tdeio/kssl/keygenwizard.ui
diff --git a/kio/kssl/keygenwizard2.ui b/tdeio/kssl/keygenwizard2.ui
index 90fef8fef..90fef8fef 100644
--- a/kio/kssl/keygenwizard2.ui
+++ b/tdeio/kssl/keygenwizard2.ui
diff --git a/kio/kssl/kopenssl.cc b/tdeio/kssl/kopenssl.cc
index 9983edceb..986609570 100644
--- a/kio/kssl/kopenssl.cc
+++ b/tdeio/kssl/kopenssl.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstaticdeleter.h>
 #include <tqregexp.h>
 #include <tqdir.h>
diff --git a/kio/kssl/kopenssl.h b/tdeio/kssl/kopenssl.h
index 59cf7b560..59cf7b560 100644
--- a/kio/kssl/kopenssl.h
+++ b/tdeio/kssl/kopenssl.h
diff --git a/kio/kssl/ksmimecrypto.cc b/tdeio/kssl/ksmimecrypto.cc
index 1a9e37e60..1a9e37e60 100644
--- a/kio/kssl/ksmimecrypto.cc
+++ b/tdeio/kssl/ksmimecrypto.cc
diff --git a/kio/kssl/ksmimecrypto.h b/tdeio/kssl/ksmimecrypto.h
index 5f8e1da73..5f8e1da73 100644
--- a/kio/kssl/ksmimecrypto.h
+++ b/tdeio/kssl/ksmimecrypto.h
diff --git a/kio/kssl/kssl.cc b/tdeio/kssl/kssl.cc
index 66cc503d5..66cc503d5 100644
--- a/kio/kssl/kssl.cc
+++ b/tdeio/kssl/kssl.cc
diff --git a/kio/kssl/kssl.h b/tdeio/kssl/kssl.h
index e10b10eaf..e10b10eaf 100644
--- a/kio/kssl/kssl.h
+++ b/tdeio/kssl/kssl.h
diff --git a/kio/kssl/kssl/CMakeLists.txt b/tdeio/kssl/kssl/CMakeLists.txt
index eeed10125..eeed10125 100644
--- a/kio/kssl/kssl/CMakeLists.txt
+++ b/tdeio/kssl/kssl/CMakeLists.txt
diff --git a/kio/kssl/kssl/DigiCertAssuredIDRootCA.pem b/tdeio/kssl/kssl/DigiCertAssuredIDRootCA.pem
index 2731638b6..2731638b6 100644
--- a/kio/kssl/kssl/DigiCertAssuredIDRootCA.pem
+++ b/tdeio/kssl/kssl/DigiCertAssuredIDRootCA.pem
diff --git a/kio/kssl/kssl/DigiCertGlobalRootCA.pem b/tdeio/kssl/kssl/DigiCertGlobalRootCA.pem
index fd4341df2..fd4341df2 100644
--- a/kio/kssl/kssl/DigiCertGlobalRootCA.pem
+++ b/tdeio/kssl/kssl/DigiCertGlobalRootCA.pem
diff --git a/kio/kssl/kssl/DigiCertHighAssuranceEVRootCA.pem b/tdeio/kssl/kssl/DigiCertHighAssuranceEVRootCA.pem
index 9e6810ab7..9e6810ab7 100644
--- a/kio/kssl/kssl/DigiCertHighAssuranceEVRootCA.pem
+++ b/tdeio/kssl/kssl/DigiCertHighAssuranceEVRootCA.pem
diff --git a/kio/kssl/kssl/GeoTrust_Universal_CA.pem b/tdeio/kssl/kssl/GeoTrust_Universal_CA.pem
index 31d9e7aa7..31d9e7aa7 100644
--- a/kio/kssl/kssl/GeoTrust_Universal_CA.pem
+++ b/tdeio/kssl/kssl/GeoTrust_Universal_CA.pem
diff --git a/kio/kssl/kssl/GeoTrust_Universal_CA2.pem b/tdeio/kssl/kssl/GeoTrust_Universal_CA2.pem
index b61946475..b61946475 100644
--- a/kio/kssl/kssl/GeoTrust_Universal_CA2.pem
+++ b/tdeio/kssl/kssl/GeoTrust_Universal_CA2.pem
diff --git a/kio/kssl/kssl/HOWTO b/tdeio/kssl/kssl/HOWTO
index 9a74e418b..762535b14 100644
--- a/kio/kssl/kssl/HOWTO
+++ b/tdeio/kssl/kssl/HOWTO
@@ -24,7 +24,7 @@ maintainer (currently bradh@kde.org) with full details.
 
 
 To add local files:
-1) Create the .pem file and check it into cvs in tdelibs/kio/kssl/kssl.
+1) Create the .pem file and check it into cvs in tdelibs/tdeio/kssl/kssl.
 2) List the pem file name as a single line in 'localcerts'.
 
 
diff --git a/kio/kssl/kssl/Makefile.am b/tdeio/kssl/kssl/Makefile.am
index a7ad33e95..a7ad33e95 100644
--- a/kio/kssl/kssl/Makefile.am
+++ b/tdeio/kssl/kssl/Makefile.am
diff --git a/kio/kssl/kssl/StartCom.pem b/tdeio/kssl/kssl/StartCom.pem
index a7c9b39a0..a7c9b39a0 100644
--- a/kio/kssl/kssl/StartCom.pem
+++ b/tdeio/kssl/kssl/StartCom.pem
diff --git a/kio/kssl/kssl/SwissSign-Gold-G2.pem b/tdeio/kssl/kssl/SwissSign-Gold-G2.pem
index d72118781..d72118781 100644
--- a/kio/kssl/kssl/SwissSign-Gold-G2.pem
+++ b/tdeio/kssl/kssl/SwissSign-Gold-G2.pem
diff --git a/kio/kssl/kssl/SwissSign-Platinum-G2.pem b/tdeio/kssl/kssl/SwissSign-Platinum-G2.pem
index 0aa3e3577..0aa3e3577 100644
--- a/kio/kssl/kssl/SwissSign-Platinum-G2.pem
+++ b/tdeio/kssl/kssl/SwissSign-Platinum-G2.pem
diff --git a/kio/kssl/kssl/SwissSign-Silver-G2.pem b/tdeio/kssl/kssl/SwissSign-Silver-G2.pem
index 67a172cb6..67a172cb6 100644
--- a/kio/kssl/kssl/SwissSign-Silver-G2.pem
+++ b/tdeio/kssl/kssl/SwissSign-Silver-G2.pem
diff --git a/kio/kssl/kssl/WiseKey.pem b/tdeio/kssl/kssl/WiseKey.pem
index a695c21bb..a695c21bb 100644
--- a/kio/kssl/kssl/WiseKey.pem
+++ b/tdeio/kssl/kssl/WiseKey.pem
diff --git a/kio/kssl/kssl/ac_offline_raiz_certicamara.pem b/tdeio/kssl/kssl/ac_offline_raiz_certicamara.pem
index c60cce890..c60cce890 100644
--- a/kio/kssl/kssl/ac_offline_raiz_certicamara.pem
+++ b/tdeio/kssl/kssl/ac_offline_raiz_certicamara.pem
diff --git a/kio/kssl/kssl/argedaten-root-ca-cert.pem b/tdeio/kssl/kssl/argedaten-root-ca-cert.pem
index 621e30e20..621e30e20 100644
--- a/kio/kssl/kssl/argedaten-root-ca-cert.pem
+++ b/tdeio/kssl/kssl/argedaten-root-ca-cert.pem
diff --git a/kio/kssl/kssl/belgacom.pem b/tdeio/kssl/kssl/belgacom.pem
index 0b581a774..0b581a774 100644
--- a/kio/kssl/kssl/belgacom.pem
+++ b/tdeio/kssl/kssl/belgacom.pem
diff --git a/kio/kssl/kssl/caroot/CMakeLists.txt b/tdeio/kssl/kssl/caroot/CMakeLists.txt
index 05e2381a9..05e2381a9 100644
--- a/kio/kssl/kssl/caroot/CMakeLists.txt
+++ b/tdeio/kssl/kssl/caroot/CMakeLists.txt
diff --git a/kio/kssl/kssl/caroot/Makefile.am b/tdeio/kssl/kssl/caroot/Makefile.am
index cd049a036..cd049a036 100644
--- a/kio/kssl/kssl/caroot/Makefile.am
+++ b/tdeio/kssl/kssl/caroot/Makefile.am
diff --git a/kio/kssl/kssl/caroot/ca-bundle.crt b/tdeio/kssl/kssl/caroot/ca-bundle.crt
index 31409b62f..31409b62f 100644
--- a/kio/kssl/kssl/caroot/ca-bundle.crt
+++ b/tdeio/kssl/kssl/caroot/ca-bundle.crt
diff --git a/kio/kssl/kssl/cert_bundle b/tdeio/kssl/kssl/cert_bundle
index 331a64286..331a64286 100755
--- a/kio/kssl/kssl/cert_bundle
+++ b/tdeio/kssl/kssl/cert_bundle
diff --git a/kio/kssl/kssl/cert_extract.c b/tdeio/kssl/kssl/cert_extract.c
index 095f810f4..095f810f4 100644
--- a/kio/kssl/kssl/cert_extract.c
+++ b/tdeio/kssl/kssl/cert_extract.c
diff --git a/kio/kssl/kssl/certbundle_Makefile b/tdeio/kssl/kssl/certbundle_Makefile
index 5a288f3b6..5a288f3b6 100644
--- a/kio/kssl/kssl/certbundle_Makefile
+++ b/tdeio/kssl/kssl/certbundle_Makefile
diff --git a/kio/kssl/kssl/certkde b/tdeio/kssl/kssl/certkde
index 37c924f83..37c924f83 100755
--- a/kio/kssl/kssl/certkde
+++ b/tdeio/kssl/kssl/certkde
diff --git a/kio/kssl/kssl/certum.pem b/tdeio/kssl/kssl/certum.pem
index b133fcb49..b133fcb49 100644
--- a/kio/kssl/kssl/certum.pem
+++ b/tdeio/kssl/kssl/certum.pem
diff --git a/kio/kssl/kssl/certum1.pem b/tdeio/kssl/kssl/certum1.pem
index aaf9cbc9a..aaf9cbc9a 100644
--- a/kio/kssl/kssl/certum1.pem
+++ b/tdeio/kssl/kssl/certum1.pem
diff --git a/kio/kssl/kssl/certum2.pem b/tdeio/kssl/kssl/certum2.pem
index a90ca2a91..a90ca2a91 100644
--- a/kio/kssl/kssl/certum2.pem
+++ b/tdeio/kssl/kssl/certum2.pem
diff --git a/kio/kssl/kssl/certum3.pem b/tdeio/kssl/kssl/certum3.pem
index d6233c43c..d6233c43c 100644
--- a/kio/kssl/kssl/certum3.pem
+++ b/tdeio/kssl/kssl/certum3.pem
diff --git a/kio/kssl/kssl/certum4.pem b/tdeio/kssl/kssl/certum4.pem
index decbac005..decbac005 100644
--- a/kio/kssl/kssl/certum4.pem
+++ b/tdeio/kssl/kssl/certum4.pem
diff --git a/kio/kssl/kssl/comodo1.pem b/tdeio/kssl/kssl/comodo1.pem
index 536b087db..536b087db 100644
--- a/kio/kssl/kssl/comodo1.pem
+++ b/tdeio/kssl/kssl/comodo1.pem
diff --git a/kio/kssl/kssl/comodo2.pem b/tdeio/kssl/kssl/comodo2.pem
index fef46d9c7..fef46d9c7 100644
--- a/kio/kssl/kssl/comodo2.pem
+++ b/tdeio/kssl/kssl/comodo2.pem
diff --git a/kio/kssl/kssl/comodo3.pem b/tdeio/kssl/kssl/comodo3.pem
index 40c137095..40c137095 100644
--- a/kio/kssl/kssl/comodo3.pem
+++ b/tdeio/kssl/kssl/comodo3.pem
diff --git a/kio/kssl/kssl/comodo4.pem b/tdeio/kssl/kssl/comodo4.pem
index 7490b02be..7490b02be 100644
--- a/kio/kssl/kssl/comodo4.pem
+++ b/tdeio/kssl/kssl/comodo4.pem
diff --git a/kio/kssl/kssl/comodo5.pem b/tdeio/kssl/kssl/comodo5.pem
index 824d542c1..824d542c1 100644
--- a/kio/kssl/kssl/comodo5.pem
+++ b/tdeio/kssl/kssl/comodo5.pem
diff --git a/kio/kssl/kssl/comodo6.pem b/tdeio/kssl/kssl/comodo6.pem
index 4b9f74824..4b9f74824 100644
--- a/kio/kssl/kssl/comodo6.pem
+++ b/tdeio/kssl/kssl/comodo6.pem
diff --git a/kio/kssl/kssl/comodo7.pem b/tdeio/kssl/kssl/comodo7.pem
index 58b02ea94..58b02ea94 100644
--- a/kio/kssl/kssl/comodo7.pem
+++ b/tdeio/kssl/kssl/comodo7.pem
diff --git a/kio/kssl/kssl/dfn-root-ca-cert.pem b/tdeio/kssl/kssl/dfn-root-ca-cert.pem
index eb8a054ac..eb8a054ac 100644
--- a/kio/kssl/kssl/dfn-root-ca-cert.pem
+++ b/tdeio/kssl/kssl/dfn-root-ca-cert.pem
diff --git a/kio/kssl/kssl/gd-class2-root.pem b/tdeio/kssl/kssl/gd-class2-root.pem
index 42e8d1eef..42e8d1eef 100644
--- a/kio/kssl/kssl/gd-class2-root.pem
+++ b/tdeio/kssl/kssl/gd-class2-root.pem
diff --git a/kio/kssl/kssl/geotrust-global-1.pem b/tdeio/kssl/kssl/geotrust-global-1.pem
index b69f0029b..b69f0029b 100644
--- a/kio/kssl/kssl/geotrust-global-1.pem
+++ b/tdeio/kssl/kssl/geotrust-global-1.pem
diff --git a/kio/kssl/kssl/geotrust-global-2.pem b/tdeio/kssl/kssl/geotrust-global-2.pem
index d2ea26636..d2ea26636 100644
--- a/kio/kssl/kssl/geotrust-global-2.pem
+++ b/tdeio/kssl/kssl/geotrust-global-2.pem
diff --git a/kio/kssl/kssl/globalsign-root-r1.pem b/tdeio/kssl/kssl/globalsign-root-r1.pem
index f4ce4ca43..f4ce4ca43 100644
--- a/kio/kssl/kssl/globalsign-root-r1.pem
+++ b/tdeio/kssl/kssl/globalsign-root-r1.pem
diff --git a/kio/kssl/kssl/globalsign-root-r2.pem b/tdeio/kssl/kssl/globalsign-root-r2.pem
index 6f0f8db0d..6f0f8db0d 100644
--- a/kio/kssl/kssl/globalsign-root-r2.pem
+++ b/tdeio/kssl/kssl/globalsign-root-r2.pem
diff --git a/kio/kssl/kssl/icpbrasil.pem b/tdeio/kssl/kssl/icpbrasil.pem
index 53fa58c51..53fa58c51 100644
--- a/kio/kssl/kssl/icpbrasil.pem
+++ b/tdeio/kssl/kssl/icpbrasil.pem
diff --git a/kio/kssl/kssl/ipsservidores.pem b/tdeio/kssl/kssl/ipsservidores.pem
index e5963e72f..e5963e72f 100644
--- a/kio/kssl/kssl/ipsservidores.pem
+++ b/tdeio/kssl/kssl/ipsservidores.pem
diff --git a/kio/kssl/kssl/ksslcalist b/tdeio/kssl/kssl/ksslcalist
index a0761cf4a..a0761cf4a 100644
--- a/kio/kssl/kssl/ksslcalist
+++ b/tdeio/kssl/kssl/ksslcalist
diff --git a/kio/kssl/kssl/localcerts b/tdeio/kssl/kssl/localcerts
index 150763522..150763522 100644
--- a/kio/kssl/kssl/localcerts
+++ b/tdeio/kssl/kssl/localcerts
diff --git a/kio/kssl/kssl/mergelocal b/tdeio/kssl/kssl/mergelocal
index 4fc0f0ff3..4fc0f0ff3 100755
--- a/kio/kssl/kssl/mergelocal
+++ b/tdeio/kssl/kssl/mergelocal
diff --git a/kio/kssl/kssl/netlock1.pem b/tdeio/kssl/kssl/netlock1.pem
index 5f7c1ce43..5f7c1ce43 100644
--- a/kio/kssl/kssl/netlock1.pem
+++ b/tdeio/kssl/kssl/netlock1.pem
diff --git a/kio/kssl/kssl/netlock2.pem b/tdeio/kssl/kssl/netlock2.pem
index c4e610816..c4e610816 100644
--- a/kio/kssl/kssl/netlock2.pem
+++ b/tdeio/kssl/kssl/netlock2.pem
diff --git a/kio/kssl/kssl/netlock3.pem b/tdeio/kssl/kssl/netlock3.pem
index dd373608e..dd373608e 100644
--- a/kio/kssl/kssl/netlock3.pem
+++ b/tdeio/kssl/kssl/netlock3.pem
diff --git a/kio/kssl/kssl/netlock4.pem b/tdeio/kssl/kssl/netlock4.pem
index 3565fef78..3565fef78 100644
--- a/kio/kssl/kssl/netlock4.pem
+++ b/tdeio/kssl/kssl/netlock4.pem
diff --git a/kio/kssl/kssl/oces.pem b/tdeio/kssl/kssl/oces.pem
index 32e08236c..32e08236c 100644
--- a/kio/kssl/kssl/oces.pem
+++ b/tdeio/kssl/kssl/oces.pem
diff --git a/kio/kssl/kssl/quovadis.pem b/tdeio/kssl/kssl/quovadis.pem
index ea68f8876..ea68f8876 100644
--- a/kio/kssl/kssl/quovadis.pem
+++ b/tdeio/kssl/kssl/quovadis.pem
diff --git a/kio/kssl/kssl/qvrca2.pem b/tdeio/kssl/kssl/qvrca2.pem
index 35cc4eb56..35cc4eb56 100644
--- a/kio/kssl/kssl/qvrca2.pem
+++ b/tdeio/kssl/kssl/qvrca2.pem
diff --git a/kio/kssl/kssl/qvrca3.pem b/tdeio/kssl/kssl/qvrca3.pem
index bda7b1aa5..bda7b1aa5 100644
--- a/kio/kssl/kssl/qvrca3.pem
+++ b/tdeio/kssl/kssl/qvrca3.pem
diff --git a/kio/kssl/kssl/sf-class2-root.pem b/tdeio/kssl/kssl/sf-class2-root.pem
index d552e65dd..d552e65dd 100644
--- a/kio/kssl/kssl/sf-class2-root.pem
+++ b/tdeio/kssl/kssl/sf-class2-root.pem
diff --git a/kio/kssl/kssl/sonera1.pem b/tdeio/kssl/kssl/sonera1.pem
index c5dad57ac..c5dad57ac 100644
--- a/kio/kssl/kssl/sonera1.pem
+++ b/tdeio/kssl/kssl/sonera1.pem
diff --git a/kio/kssl/kssl/sonera2.pem b/tdeio/kssl/kssl/sonera2.pem
index 36a998d22..36a998d22 100644
--- a/kio/kssl/kssl/sonera2.pem
+++ b/tdeio/kssl/kssl/sonera2.pem
diff --git a/kio/kssl/kssl/staatdernederlandenrotca.pem b/tdeio/kssl/kssl/staatdernederlandenrotca.pem
index c4eb117fa..c4eb117fa 100644
--- a/kio/kssl/kssl/staatdernederlandenrotca.pem
+++ b/tdeio/kssl/kssl/staatdernederlandenrotca.pem
diff --git a/kio/kssl/kssl/startcom.pem b/tdeio/kssl/kssl/startcom.pem
index 957842c98..957842c98 100644
--- a/kio/kssl/kssl/startcom.pem
+++ b/tdeio/kssl/kssl/startcom.pem
diff --git a/kio/kssl/kssl/startssl.pem b/tdeio/kssl/kssl/startssl.pem
index 960f2657b..960f2657b 100644
--- a/kio/kssl/kssl/startssl.pem
+++ b/tdeio/kssl/kssl/startssl.pem
diff --git a/kio/kssl/kssl/tcclass2-2011.pem b/tdeio/kssl/kssl/tcclass2-2011.pem
index 0c9d89e77..0c9d89e77 100644
--- a/kio/kssl/kssl/tcclass2-2011.pem
+++ b/tdeio/kssl/kssl/tcclass2-2011.pem
diff --git a/kio/kssl/kssl/tcclass3-2011.pem b/tdeio/kssl/kssl/tcclass3-2011.pem
index 14f81c830..14f81c830 100644
--- a/kio/kssl/kssl/tcclass3-2011.pem
+++ b/tdeio/kssl/kssl/tcclass3-2011.pem
diff --git a/kio/kssl/kssl/utn-network.pem b/tdeio/kssl/kssl/utn-network.pem
index 72b576a59..72b576a59 100644
--- a/kio/kssl/kssl/utn-network.pem
+++ b/tdeio/kssl/kssl/utn-network.pem
diff --git a/kio/kssl/kssl/utn-sgc.pem b/tdeio/kssl/kssl/utn-sgc.pem
index 1c747eb57..1c747eb57 100644
--- a/kio/kssl/kssl/utn-sgc.pem
+++ b/tdeio/kssl/kssl/utn-sgc.pem
diff --git a/kio/kssl/kssl/xgca.pem b/tdeio/kssl/kssl/xgca.pem
index f21e6d8b7..f21e6d8b7 100644
--- a/kio/kssl/kssl/xgca.pem
+++ b/tdeio/kssl/kssl/xgca.pem
diff --git a/kio/kssl/ksslall.h b/tdeio/kssl/ksslall.h
index 0e34837bb..0e34837bb 100644
--- a/kio/kssl/ksslall.h
+++ b/tdeio/kssl/ksslall.h
diff --git a/kio/kssl/ksslcallback.c b/tdeio/kssl/ksslcallback.c
index 59f342584..59f342584 100644
--- a/kio/kssl/ksslcallback.c
+++ b/tdeio/kssl/ksslcallback.c
diff --git a/kio/kssl/ksslcertchain.cc b/tdeio/kssl/ksslcertchain.cc
index a401aec3d..a401aec3d 100644
--- a/kio/kssl/ksslcertchain.cc
+++ b/tdeio/kssl/ksslcertchain.cc
diff --git a/kio/kssl/ksslcertchain.h b/tdeio/kssl/ksslcertchain.h
index eb6c27d44..eb6c27d44 100644
--- a/kio/kssl/ksslcertchain.h
+++ b/tdeio/kssl/ksslcertchain.h
diff --git a/kio/kssl/ksslcertdlg.cc b/tdeio/kssl/ksslcertdlg.cc
index 3d51c1e85..3d51c1e85 100644
--- a/kio/kssl/ksslcertdlg.cc
+++ b/tdeio/kssl/ksslcertdlg.cc
diff --git a/kio/kssl/ksslcertdlg.h b/tdeio/kssl/ksslcertdlg.h
index 8d6f3d777..8d6f3d777 100644
--- a/kio/kssl/ksslcertdlg.h
+++ b/tdeio/kssl/ksslcertdlg.h
diff --git a/kio/kssl/ksslcertificate.cc b/tdeio/kssl/ksslcertificate.cc
index 8e2192f7d..8e2192f7d 100644
--- a/kio/kssl/ksslcertificate.cc
+++ b/tdeio/kssl/ksslcertificate.cc
diff --git a/kio/kssl/ksslcertificate.h b/tdeio/kssl/ksslcertificate.h
index 0c5f87323..0c5f87323 100644
--- a/kio/kssl/ksslcertificate.h
+++ b/tdeio/kssl/ksslcertificate.h
diff --git a/kio/kssl/ksslcertificatecache.cc b/tdeio/kssl/ksslcertificatecache.cc
index 2eecd66d6..2eecd66d6 100644
--- a/kio/kssl/ksslcertificatecache.cc
+++ b/tdeio/kssl/ksslcertificatecache.cc
diff --git a/kio/kssl/ksslcertificatecache.h b/tdeio/kssl/ksslcertificatecache.h
index 924cb0f54..924cb0f54 100644
--- a/kio/kssl/ksslcertificatecache.h
+++ b/tdeio/kssl/ksslcertificatecache.h
diff --git a/kio/kssl/ksslcertificatefactory.cc b/tdeio/kssl/ksslcertificatefactory.cc
index 66e272ced..66e272ced 100644
--- a/kio/kssl/ksslcertificatefactory.cc
+++ b/tdeio/kssl/ksslcertificatefactory.cc
diff --git a/kio/kssl/ksslcertificatefactory.h b/tdeio/kssl/ksslcertificatefactory.h
index 503c591a7..503c591a7 100644
--- a/kio/kssl/ksslcertificatefactory.h
+++ b/tdeio/kssl/ksslcertificatefactory.h
diff --git a/kio/kssl/ksslcertificatehome.cc b/tdeio/kssl/ksslcertificatehome.cc
index 39470c5ab..39470c5ab 100644
--- a/kio/kssl/ksslcertificatehome.cc
+++ b/tdeio/kssl/ksslcertificatehome.cc
diff --git a/kio/kssl/ksslcertificatehome.h b/tdeio/kssl/ksslcertificatehome.h
index f8a18a423..f8a18a423 100644
--- a/kio/kssl/ksslcertificatehome.h
+++ b/tdeio/kssl/ksslcertificatehome.h
diff --git a/kio/kssl/ksslconfig.h.cmake b/tdeio/kssl/ksslconfig.h.cmake
index 1be6bbba4..1be6bbba4 100644
--- a/kio/kssl/ksslconfig.h.cmake
+++ b/tdeio/kssl/ksslconfig.h.cmake
diff --git a/kio/kssl/ksslconfig.h.in b/tdeio/kssl/ksslconfig.h.in
index c078298ec..c078298ec 100644
--- a/kio/kssl/ksslconfig.h.in
+++ b/tdeio/kssl/ksslconfig.h.in
diff --git a/kio/kssl/ksslconfig_win.h b/tdeio/kssl/ksslconfig_win.h
index c078298ec..c078298ec 100644
--- a/kio/kssl/ksslconfig_win.h
+++ b/tdeio/kssl/ksslconfig_win.h
diff --git a/kio/kssl/ksslconnectioninfo.cc b/tdeio/kssl/ksslconnectioninfo.cc
index ccc7fc780..ccc7fc780 100644
--- a/kio/kssl/ksslconnectioninfo.cc
+++ b/tdeio/kssl/ksslconnectioninfo.cc
diff --git a/kio/kssl/ksslconnectioninfo.h b/tdeio/kssl/ksslconnectioninfo.h
index 09fd5cdae..09fd5cdae 100644
--- a/kio/kssl/ksslconnectioninfo.h
+++ b/tdeio/kssl/ksslconnectioninfo.h
diff --git a/kio/kssl/ksslcsessioncache.cc b/tdeio/kssl/ksslcsessioncache.cc
index d39638717..d39638717 100644
--- a/kio/kssl/ksslcsessioncache.cc
+++ b/tdeio/kssl/ksslcsessioncache.cc
diff --git a/kio/kssl/ksslcsessioncache.h b/tdeio/kssl/ksslcsessioncache.h
index 9badfe279..9badfe279 100644
--- a/kio/kssl/ksslcsessioncache.h
+++ b/tdeio/kssl/ksslcsessioncache.h
diff --git a/kio/kssl/kssldefs.h b/tdeio/kssl/kssldefs.h
index c33664b14..c33664b14 100644
--- a/kio/kssl/kssldefs.h
+++ b/tdeio/kssl/kssldefs.h
diff --git a/kio/kssl/ksslinfodlg.cc b/tdeio/kssl/ksslinfodlg.cc
index c6f76a190..289c3a8d2 100644
--- a/kio/kssl/ksslinfodlg.cc
+++ b/tdeio/kssl/ksslinfodlg.cc
@@ -128,7 +128,7 @@ KSSLInfoDlg::~KSSLInfoDlg() {
 
 void KSSLInfoDlg::launchConfig() {
     TDEProcess p;
-    p << "kcmshell" << "crypto";
+    p << "tdecmshell" << "crypto";
     p.start(TDEProcess::DontCare);
 }
 
diff --git a/kio/kssl/ksslinfodlg.h b/tdeio/kssl/ksslinfodlg.h
index c73afbba1..c73afbba1 100644
--- a/kio/kssl/ksslinfodlg.h
+++ b/tdeio/kssl/ksslinfodlg.h
diff --git a/kio/kssl/ksslkeygen.cc b/tdeio/kssl/ksslkeygen.cc
index 403632b3a..541c63f02 100644
--- a/kio/kssl/ksslkeygen.cc
+++ b/tdeio/kssl/ksslkeygen.cc
@@ -191,7 +191,7 @@ int KSSLKeyGen::generateCSR(const TQString& name, const TQString& pass, int bits
 			kossl->EVP_bf_cbc(), pass.local8Bit().data(),
 			pass.length(), 0L, 0L);
 
-	// FIXME Write kconfig entry to store the filenames under the md5 hash
+	// FIXME Write tdeconfig entry to store the filenames under the md5 hash
 
 	kossl->X509_REQ_free(req);
 	kossl->EVP_PKEY_free(pkey);
diff --git a/kio/kssl/ksslkeygen.h b/tdeio/kssl/ksslkeygen.h
index 5bb99a593..5bb99a593 100644
--- a/kio/kssl/ksslkeygen.h
+++ b/tdeio/kssl/ksslkeygen.h
diff --git a/kio/kssl/ksslpeerinfo.cc b/tdeio/kssl/ksslpeerinfo.cc
index d1c2d00fc..d1c2d00fc 100644
--- a/kio/kssl/ksslpeerinfo.cc
+++ b/tdeio/kssl/ksslpeerinfo.cc
diff --git a/kio/kssl/ksslpeerinfo.h b/tdeio/kssl/ksslpeerinfo.h
index a5cd017c9..a5cd017c9 100644
--- a/kio/kssl/ksslpeerinfo.h
+++ b/tdeio/kssl/ksslpeerinfo.h
diff --git a/kio/kssl/ksslpemcallback.cc b/tdeio/kssl/ksslpemcallback.cc
index 2dfbb9146..2dfbb9146 100644
--- a/kio/kssl/ksslpemcallback.cc
+++ b/tdeio/kssl/ksslpemcallback.cc
diff --git a/kio/kssl/ksslpemcallback.h b/tdeio/kssl/ksslpemcallback.h
index 265edd099..265edd099 100644
--- a/kio/kssl/ksslpemcallback.h
+++ b/tdeio/kssl/ksslpemcallback.h
diff --git a/kio/kssl/ksslpkcs12.cc b/tdeio/kssl/ksslpkcs12.cc
index b8b23cf1c..b8b23cf1c 100644
--- a/kio/kssl/ksslpkcs12.cc
+++ b/tdeio/kssl/ksslpkcs12.cc
diff --git a/kio/kssl/ksslpkcs12.h b/tdeio/kssl/ksslpkcs12.h
index c9dff0d82..c9dff0d82 100644
--- a/kio/kssl/ksslpkcs12.h
+++ b/tdeio/kssl/ksslpkcs12.h
diff --git a/kio/kssl/ksslpkcs7.cc b/tdeio/kssl/ksslpkcs7.cc
index 8db0000f0..8db0000f0 100644
--- a/kio/kssl/ksslpkcs7.cc
+++ b/tdeio/kssl/ksslpkcs7.cc
diff --git a/kio/kssl/ksslpkcs7.h b/tdeio/kssl/ksslpkcs7.h
index c94b7bc7a..c94b7bc7a 100644
--- a/kio/kssl/ksslpkcs7.h
+++ b/tdeio/kssl/ksslpkcs7.h
diff --git a/kio/kssl/ksslsession.cc b/tdeio/kssl/ksslsession.cc
index 3c80233f1..3c80233f1 100644
--- a/kio/kssl/ksslsession.cc
+++ b/tdeio/kssl/ksslsession.cc
diff --git a/kio/kssl/ksslsession.h b/tdeio/kssl/ksslsession.h
index 394a4b91a..394a4b91a 100644
--- a/kio/kssl/ksslsession.h
+++ b/tdeio/kssl/ksslsession.h
diff --git a/kio/kssl/ksslsettings.cc b/tdeio/kssl/ksslsettings.cc
index eb91ea9cb..eb91ea9cb 100644
--- a/kio/kssl/ksslsettings.cc
+++ b/tdeio/kssl/ksslsettings.cc
diff --git a/kio/kssl/ksslsettings.h b/tdeio/kssl/ksslsettings.h
index 18dd31249..18b55331f 100644
--- a/kio/kssl/ksslsettings.h
+++ b/tdeio/kssl/ksslsettings.h
@@ -23,7 +23,7 @@
 
 #include <tqstring.h>
 #include <tqvaluelist.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class KSSLSettingsPrivate;
 
diff --git a/kio/kssl/ksslsigners.cc b/tdeio/kssl/ksslsigners.cc
index 028ddf555..028ddf555 100644
--- a/kio/kssl/ksslsigners.cc
+++ b/tdeio/kssl/ksslsigners.cc
diff --git a/kio/kssl/ksslsigners.h b/tdeio/kssl/ksslsigners.h
index 3149e852a..3149e852a 100644
--- a/kio/kssl/ksslsigners.h
+++ b/tdeio/kssl/ksslsigners.h
diff --git a/kio/kssl/ksslutils.cc b/tdeio/kssl/ksslutils.cc
index 80651757f..80651757f 100644
--- a/kio/kssl/ksslutils.cc
+++ b/tdeio/kssl/ksslutils.cc
diff --git a/kio/kssl/ksslutils.h b/tdeio/kssl/ksslutils.h
index 4c087374f..4c087374f 100644
--- a/kio/kssl/ksslutils.h
+++ b/tdeio/kssl/ksslutils.h
diff --git a/kio/kssl/ksslx509map.cc b/tdeio/kssl/ksslx509map.cc
index 7896fdfcf..7896fdfcf 100644
--- a/kio/kssl/ksslx509map.cc
+++ b/tdeio/kssl/ksslx509map.cc
diff --git a/kio/kssl/ksslx509map.h b/tdeio/kssl/ksslx509map.h
index f76413100..f76413100 100644
--- a/kio/kssl/ksslx509map.h
+++ b/tdeio/kssl/ksslx509map.h
diff --git a/kio/kssl/ksslx509v3.cc b/tdeio/kssl/ksslx509v3.cc
index a3310b9db..a3310b9db 100644
--- a/kio/kssl/ksslx509v3.cc
+++ b/tdeio/kssl/ksslx509v3.cc
diff --git a/kio/kssl/ksslx509v3.h b/tdeio/kssl/ksslx509v3.h
index c521f3e25..c521f3e25 100644
--- a/kio/kssl/ksslx509v3.h
+++ b/tdeio/kssl/ksslx509v3.h
diff --git a/kio/kurifilterplugin.desktop b/tdeio/kurifilterplugin.desktop
index 5882b35ca..5882b35ca 100644
--- a/kio/kurifilterplugin.desktop
+++ b/tdeio/kurifilterplugin.desktop
diff --git a/kio/magic b/tdeio/magic
index c12cec4ba..c12cec4ba 100644
--- a/kio/magic
+++ b/tdeio/magic
diff --git a/kio/misc/CMakeLists.txt b/tdeio/misc/CMakeLists.txt
index 5212444a2..3bfdb0980 100644
--- a/kio/misc/CMakeLists.txt
+++ b/tdeio/misc/CMakeLists.txt
@@ -9,11 +9,11 @@
 #
 #################################################
 
-add_subdirectory( ksendbugmail )
+add_subdirectory( tdesendbugmail )
 add_subdirectory( kpac )
 add_subdirectory( tdesasl )
 add_subdirectory( kssld )
-add_subdirectory( kfile )
+add_subdirectory( tdefile )
 add_subdirectory( tdewalletd )
 add_subdirectory( tdentlm )
 
@@ -25,17 +25,17 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_BINARY_DIR}/kio
-  ${CMAKE_BINARY_DIR}/kio/kio
-  ${CMAKE_BINARY_DIR}/kio/kssl
+  ${CMAKE_BINARY_DIR}/tdeio
+  ${CMAKE_BINARY_DIR}/tdeio/tdeio
+  ${CMAKE_BINARY_DIR}/tdeio/kssl
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
 )
 
 link_directories(
@@ -45,13 +45,13 @@ link_directories(
 
 ##### headers ###################################
 
-install( FILES uiserver.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+install( FILES uiserver.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
 
 
 ##### other data ################################
 
 install(FILES
-    kio_uiserver.desktop kmailservice.protocol
+    tdeio_uiserver.desktop tdemailservice.protocol
     telnet.protocol rlogin.protocol rtsp.protocol
     ssh.protocol mms.protocol mmst.protocol mmsu.protocol
     pnm.protocol rtspt.protocol rtspu.protocol
@@ -61,9 +61,9 @@ install( FILES fileshareset DESTINATION ${BIN_INSTALL_DIR}
   PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE SETUID )
 
 
-#### kio_uiserver ###############################
+#### tdeio_uiserver ###############################
 
-set( target kio_uiserver )
+set( target tdeio_uiserver )
 
 set( ${target}_SRCS
   uiserver.cpp uiserver.skel
@@ -71,14 +71,14 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DEPENDENCIES dcopidl
 )
 
 
-##### kmailservice ##############################
+##### tdemailservice ##############################
 
-set( target kmailservice )
+set( target tdemailservice )
 
 tde_add_executable( ${target}
   SOURCES ${target}.cpp
@@ -87,9 +87,9 @@ tde_add_executable( ${target}
 )
 
 
-##### ktelnetservice ############################
+##### tdetelnetservice ############################
 
-set( target ktelnetservice )
+set( target tdetelnetservice )
 
 tde_add_executable( ${target}
   SOURCES ${target}.cpp
diff --git a/kio/misc/Makefile.am b/tdeio/misc/Makefile.am
index 0bafce0f5..6a250cf8a 100644
--- a/kio/misc/Makefile.am
+++ b/tdeio/misc/Makefile.am
@@ -20,35 +20,35 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
 
 INCLUDES=  -I$(srcdir)/.. -I$(top_srcdir) -I$(srcdir)/../kssl -I../kssl $(all_includes) $(SSL_INCLUDES)
 
-SUBDIRS = . ksendbugmail kpac tdesasl kssld kfile tdewalletd tdentlm
+SUBDIRS = . tdesendbugmail kpac tdesasl kssld tdefile tdewalletd tdentlm
 
 lib_LTLIBRARIES =
-tdeinit_LTLIBRARIES = kio_uiserver.la
-bin_PROGRAMS = kmailservice ktelnetservice
+tdeinit_LTLIBRARIES = tdeio_uiserver.la
+bin_PROGRAMS = tdemailservice tdetelnetservice
 
-observer_DIR = $(top_srcdir)/kio/kio
+observer_DIR = $(top_srcdir)/tdeio/tdeio
 
-kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub
-kio_uiserver_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
-kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
+tdeio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub
+tdeio_uiserver_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
+tdeio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 METASOURCES = AUTO
 
-kde_services_DATA = kio_uiserver.desktop
+kde_services_DATA = tdeio_uiserver.desktop
 
-kmailservice_SOURCES = kmailservice.cpp
-kmailservice_LDADD = $(LIB_TDECORE)
-kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdemailservice_SOURCES = tdemailservice.cpp
+tdemailservice_LDADD = $(LIB_TDECORE)
+tdemailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
-ktelnetservice_SOURCES = ktelnetservice.cpp
-ktelnetservice_LDADD = $(LIB_TDEUI)
-ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdetelnetservice_SOURCES = tdetelnetservice.cpp
+tdetelnetservice_LDADD = $(LIB_TDEUI)
+tdetelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
-protocol_DATA = kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \
+protocol_DATA = tdemailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \
 		mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol
 protocoldir = $(kde_servicesdir)
 
-kiomiscdir = $(includedir)/kio
+kiomiscdir = $(includedir)/tdeio
 kiomisc_HEADERS = uiserver.h
 
 
diff --git a/kio/misc/fileshareset b/tdeio/misc/fileshareset
index 4c921ba38..4c921ba38 100755
--- a/kio/misc/fileshareset
+++ b/tdeio/misc/fileshareset
diff --git a/kio/misc/kpac/CMakeLists.txt b/tdeio/misc/kpac/CMakeLists.txt
index 00ce2d357..14af52de1 100644
--- a/kio/misc/kpac/CMakeLists.txt
+++ b/tdeio/misc/kpac/CMakeLists.txt
@@ -19,8 +19,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore/network
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/kded
 )
 
diff --git a/kio/misc/kpac/Makefile.am b/tdeio/misc/kpac/Makefile.am
index beb6a4b86..beb6a4b86 100644
--- a/kio/misc/kpac/Makefile.am
+++ b/tdeio/misc/kpac/Makefile.am
diff --git a/kio/misc/kpac/README b/tdeio/misc/kpac/README
index d211ae07b..d211ae07b 100644
--- a/kio/misc/kpac/README
+++ b/tdeio/misc/kpac/README
diff --git a/kio/misc/kpac/README.wpad b/tdeio/misc/kpac/README.wpad
index f63d25764..f63d25764 100644
--- a/kio/misc/kpac/README.wpad
+++ b/tdeio/misc/kpac/README.wpad
diff --git a/kio/misc/kpac/TODO b/tdeio/misc/kpac/TODO
index ce5cd6a11..ce5cd6a11 100644
--- a/kio/misc/kpac/TODO
+++ b/tdeio/misc/kpac/TODO
diff --git a/kio/misc/kpac/configure.in.in b/tdeio/misc/kpac/configure.in.in
index a65b9a1c8..a65b9a1c8 100644
--- a/kio/misc/kpac/configure.in.in
+++ b/tdeio/misc/kpac/configure.in.in
diff --git a/kio/misc/kpac/dhcp.h b/tdeio/misc/kpac/dhcp.h
index 41643ae3a..41643ae3a 100644
--- a/kio/misc/kpac/dhcp.h
+++ b/tdeio/misc/kpac/dhcp.h
diff --git a/kio/misc/kpac/discovery.cpp b/tdeio/misc/kpac/discovery.cpp
index 4f33d1389..4f33d1389 100644
--- a/kio/misc/kpac/discovery.cpp
+++ b/tdeio/misc/kpac/discovery.cpp
diff --git a/kio/misc/kpac/discovery.h b/tdeio/misc/kpac/discovery.h
index a1443ad8c..a1443ad8c 100644
--- a/kio/misc/kpac/discovery.h
+++ b/tdeio/misc/kpac/discovery.h
diff --git a/kio/misc/kpac/downloader.cpp b/tdeio/misc/kpac/downloader.cpp
index c150a732c..c94cc9b72 100644
--- a/kio/misc/kpac/downloader.cpp
+++ b/tdeio/misc/kpac/downloader.cpp
@@ -26,7 +26,7 @@
 #include <kcharsets.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "downloader.moc"
 
diff --git a/kio/misc/kpac/downloader.h b/tdeio/misc/kpac/downloader.h
index 808e09378..808e09378 100644
--- a/kio/misc/kpac/downloader.h
+++ b/tdeio/misc/kpac/downloader.h
diff --git a/kio/misc/kpac/eventsrc b/tdeio/misc/kpac/eventsrc
index c44443a03..c44443a03 100644
--- a/kio/misc/kpac/eventsrc
+++ b/tdeio/misc/kpac/eventsrc
diff --git a/kio/misc/kpac/kpac_dhcp_helper.c b/tdeio/misc/kpac/kpac_dhcp_helper.c
index 906e89dfa..906e89dfa 100644
--- a/kio/misc/kpac/kpac_dhcp_helper.c
+++ b/tdeio/misc/kpac/kpac_dhcp_helper.c
diff --git a/kio/misc/kpac/kpactest.pac b/tdeio/misc/kpac/kpactest.pac
index 69e5aaad7..69e5aaad7 100644
--- a/kio/misc/kpac/kpactest.pac
+++ b/tdeio/misc/kpac/kpactest.pac
diff --git a/kio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp
index b651e2313..b651e2313 100644
--- a/kio/misc/kpac/proxyscout.cpp
+++ b/tdeio/misc/kpac/proxyscout.cpp
diff --git a/kio/misc/kpac/proxyscout.desktop b/tdeio/misc/kpac/proxyscout.desktop
index 02e402b50..02e402b50 100644
--- a/kio/misc/kpac/proxyscout.desktop
+++ b/tdeio/misc/kpac/proxyscout.desktop
diff --git a/kio/misc/kpac/proxyscout.h b/tdeio/misc/kpac/proxyscout.h
index 78c8fc237..78c8fc237 100644
--- a/kio/misc/kpac/proxyscout.h
+++ b/tdeio/misc/kpac/proxyscout.h
diff --git a/kio/misc/kpac/script.cpp b/tdeio/misc/kpac/script.cpp
index 55faef8a1..55faef8a1 100644
--- a/kio/misc/kpac/script.cpp
+++ b/tdeio/misc/kpac/script.cpp
diff --git a/kio/misc/kpac/script.h b/tdeio/misc/kpac/script.h
index 49ba0b6a3..49ba0b6a3 100644
--- a/kio/misc/kpac/script.h
+++ b/tdeio/misc/kpac/script.h
diff --git a/kio/misc/kssld/CMakeLists.txt b/tdeio/misc/kssld/CMakeLists.txt
index 14d2de1ac..813ce44f0 100644
--- a/kio/misc/kssld/CMakeLists.txt
+++ b/tdeio/misc/kssld/CMakeLists.txt
@@ -13,12 +13,12 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/kio/kssl
+  ${CMAKE_BINARY_DIR}/tdeio/kssl
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
 )
 
 link_directories(
diff --git a/kio/misc/kssld/Makefile.am b/tdeio/misc/kssld/Makefile.am
index 18193018e..09ddfe440 100644
--- a/kio/misc/kssld/Makefile.am
+++ b/tdeio/misc/kssld/Makefile.am
@@ -16,7 +16,7 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(SSL_INCLUDES) -I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl $(all_includes)
+INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(SSL_INCLUDES) -I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl $(all_includes)
 
 kde_module_LTLIBRARIES = kded_kssld.la
 
diff --git a/kio/misc/kssld/kssld.cpp b/tdeio/misc/kssld/kssld.cpp
index 22bf6ab84..aa561cc8b 100644
--- a/kio/misc/kssld/kssld.cpp
+++ b/tdeio/misc/kssld/kssld.cpp
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 
 #include "kssld.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <ksslcertchain.h>
 #include <ksslcertificate.h>
@@ -166,7 +166,7 @@ KSSLCNode *node;
 		if (node->permanent ||
 			node->expires > TQDateTime::currentDateTime()) {
 			// First convert to a binary format and then write the
-			// kconfig entry write the (CN, policy, cert) to
+			// tdeconfig entry write the (CN, policy, cert) to
 			// KSimpleConfig
 			cfg->setGroup(node->cert->getMD5Digest());
 			cfg->writeEntry("Certificate", node->cert->toString());
diff --git a/kio/misc/kssld/kssld.desktop b/tdeio/misc/kssld/kssld.desktop
index 7054f8bad..7054f8bad 100644
--- a/kio/misc/kssld/kssld.desktop
+++ b/tdeio/misc/kssld/kssld.desktop
diff --git a/kio/misc/kssld/kssld.h b/tdeio/misc/kssld/kssld.h
index 028a30809..028a30809 100644
--- a/kio/misc/kssld/kssld.h
+++ b/tdeio/misc/kssld/kssld.h
diff --git a/kio/misc/mms.protocol b/tdeio/misc/mms.protocol
index 8fde7c000..8fde7c000 100644
--- a/kio/misc/mms.protocol
+++ b/tdeio/misc/mms.protocol
diff --git a/kio/misc/mmst.protocol b/tdeio/misc/mmst.protocol
index 1f0f7636b..1f0f7636b 100644
--- a/kio/misc/mmst.protocol
+++ b/tdeio/misc/mmst.protocol
diff --git a/kio/misc/mmsu.protocol b/tdeio/misc/mmsu.protocol
index deda935fc..deda935fc 100644
--- a/kio/misc/mmsu.protocol
+++ b/tdeio/misc/mmsu.protocol
diff --git a/kio/misc/pnm.protocol b/tdeio/misc/pnm.protocol
index 3ca3a7d23..3ca3a7d23 100644
--- a/kio/misc/pnm.protocol
+++ b/tdeio/misc/pnm.protocol
diff --git a/kio/misc/rlogin.protocol b/tdeio/misc/rlogin.protocol
index 0757e88ab..3b103a905 100644
--- a/kio/misc/rlogin.protocol
+++ b/tdeio/misc/rlogin.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=ktelnetservice %u
+exec=tdetelnetservice %u
 protocol=rlogin
 input=none
 output=none
@@ -9,5 +9,5 @@ reading=false
 writing=false
 makedir=false
 deleting=false
-DocPath=kioslave/rlogin.html
+DocPath=tdeioslave/rlogin.html
 Icon=konsole
diff --git a/kio/misc/rtsp.protocol b/tdeio/misc/rtsp.protocol
index 301312260..301312260 100644
--- a/kio/misc/rtsp.protocol
+++ b/tdeio/misc/rtsp.protocol
diff --git a/kio/misc/rtspt.protocol b/tdeio/misc/rtspt.protocol
index 9e4fe9626..9e4fe9626 100644
--- a/kio/misc/rtspt.protocol
+++ b/tdeio/misc/rtspt.protocol
diff --git a/kio/misc/rtspu.protocol b/tdeio/misc/rtspu.protocol
index 9cc9299f6..9cc9299f6 100644
--- a/kio/misc/rtspu.protocol
+++ b/tdeio/misc/rtspu.protocol
diff --git a/kio/misc/ssh.protocol b/tdeio/misc/ssh.protocol
index f31a6f4a2..b0c098f8f 100644
--- a/kio/misc/ssh.protocol
+++ b/tdeio/misc/ssh.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=ktelnetservice %u
+exec=tdetelnetservice %u
 protocol=ssh
 input=none
 output=none
diff --git a/kio/misc/kfile/CMakeLists.txt b/tdeio/misc/tdefile/CMakeLists.txt
index 07c2725b2..9e90b956c 100644
--- a/kio/misc/kfile/CMakeLists.txt
+++ b/tdeio/misc/tdefile/CMakeLists.txt
@@ -14,9 +14,9 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 link_directories(
@@ -24,9 +24,9 @@ link_directories(
 )
 
 
-##### kfile #####################################
+##### tdefile #####################################
 
-set( target kfile )
+set( target tdefile )
 
 set( ${target}_SRCS
   fileprops.cpp
@@ -34,6 +34,6 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
\ No newline at end of file
diff --git a/tdeio/misc/tdefile/Makefile.am b/tdeio/misc/tdefile/Makefile.am
new file mode 100644
index 000000000..21cdb0627
--- /dev/null
+++ b/tdeio/misc/tdefile/Makefile.am
@@ -0,0 +1,10 @@
+METASOURCES = AUTO
+
+noinst_HEADERS = fileprops.h
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeio/tdeio $(all_includes)
+
+bin_PROGRAMS = tdefile
+tdefile_SOURCES = fileprops.cpp
+tdefile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdefile_LDADD = $(LIB_KIO)
+
diff --git a/kio/misc/kfile/README b/tdeio/misc/tdefile/README
index d063b6d58..d063b6d58 100644
--- a/kio/misc/kfile/README
+++ b/tdeio/misc/tdefile/README
diff --git a/kio/misc/kfile/fileprops.cpp b/tdeio/misc/tdefile/fileprops.cpp
index bbd34a2a4..bb209fbc0 100644
--- a/kio/misc/kfile/fileprops.cpp
+++ b/tdeio/misc/tdefile/fileprops.cpp
@@ -24,7 +24,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <klocale.h>
 #include <kpropertiesdialog.h>
 
@@ -192,7 +192,7 @@ TQStringList FileProps::createKeyValueList( const KFileMetaInfoGroup& g,
 
 
 
-// kfile --mimetype --listsupported --listavailable --listpreferred --listwritable --getValue "key" --setValue "key=value" --allValues --preferredValues --dialog --quiet file [file...]
+// tdefile --mimetype --listsupported --listavailable --listpreferred --listwritable --getValue "key" --setValue "key=value" --allValues --preferredValues --dialog --quiet file [file...]
 // "key" may be a list of keys, separated by commas
 static KCmdLineOptions options[] =
 {
@@ -320,7 +320,7 @@ static void printList( const TQStringList& list )
 static void processMetaDataOptions( const TQPtrList<FileProps> propList,
                                     TDECmdLineArgs *args )
 {
-// kfile --mimetype --supportedMimetypes --listsupported --listavailable --listpreferred --listwritable --getValue "key" --setValue "key=value" --allValues --preferredValues --dialog --quiet file [file...]
+// tdefile --mimetype --supportedMimetypes --listsupported --listavailable --listpreferred --listwritable --getValue "key" --setValue "key=value" --allValues --preferredValues --dialog --quiet file [file...]
 // "key" may be a list of keys, separated by commas
 
     TQString line("-- -------------------------------------------------------");
@@ -407,7 +407,7 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList,
 int main( int argc, char **argv )
 {
     TDEAboutData about(
-	  "kfile", I18N_NOOP( "kfile" ), KFILEVERSION,
+	  "tdefile", I18N_NOOP( "tdefile" ), KFILEVERSION,
 	  I18N_NOOP("A commandline tool to read and modify metadata of files." ),
 	  TDEAboutData::License_LGPL, "(c) 2002, Carsten Pfeiffer",
 	  0 /*text*/, "http://devel-home.kde.org/~pfeiffer/",
diff --git a/kio/misc/kfile/fileprops.h b/tdeio/misc/tdefile/fileprops.h
index 41d4f7c86..45a79239d 100644
--- a/kio/misc/kfile/fileprops.h
+++ b/tdeio/misc/tdefile/fileprops.h
@@ -21,7 +21,7 @@
 
 #include <tqstring.h>
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class FileProps
 {
diff --git a/kio/misc/kio_uiserver.desktop b/tdeio/misc/tdeio_uiserver.desktop
index fd37cd2bd..bba0a7c7c 100644
--- a/kio/misc/kio_uiserver.desktop
+++ b/tdeio/misc/tdeio_uiserver.desktop
@@ -1,18 +1,18 @@
 [Desktop Entry]
 Type=Service
-Name=kio_uiserver
+Name=tdeio_uiserver
 Name[de]=Server der graphischen Oberfläche
 Name[fy]=Kio_uiserver
 Name[ja]=kio_uiサー�
 Name[mn]=График гадаргуугийн �ервер
-Name[nds]=kio_uiserver, Server för de graafsche Böversiet
+Name[nds]=tdeio_uiserver, Server för de graafsche Böversiet
 Name[nl]=Kio_uiserver
 Name[nso]=kio_uiseabi
 Name[ro]=Kio_uiserver
 Name[sv]=Kio-gränssnittsserver
 Name[ta]=kio_uiசேவையகம�
 Name[te]=కే�ఓ_య��సెర�వర�
-Exec=kio_uiserver
+Exec=tdeio_uiserver
 Comment=TDE's Progress Info UI server
 Comment[af]=TDE se vordering inligting UI bediener
 Comment[ar]=خادم معلومات تقدم واجهة كيدي
diff --git a/kio/misc/kmailservice.cpp b/tdeio/misc/tdemailservice.cpp
index 3b2eb8cf7..3f9b04feb 100644
--- a/kio/misc/kmailservice.cpp
+++ b/tdeio/misc/tdemailservice.cpp
@@ -29,7 +29,7 @@ static const KCmdLineOptions options[] =
 int main( int argc, char **argv )
 {
     KLocale::setMainCatalogue("tdelibs");
-    TDECmdLineArgs::init( argc, argv, "kmailservice", I18N_NOOP("KMailService"), I18N_NOOP("Mail service"), "unknown" );
+    TDECmdLineArgs::init( argc, argv, "tdemailservice", I18N_NOOP("KMailService"), I18N_NOOP("Mail service"), "unknown" );
     TDECmdLineArgs::addCmdLineOptions( options );
 
     TDEApplication a( false, false );
diff --git a/kio/misc/kmailservice.protocol b/tdeio/misc/tdemailservice.protocol
index 46a3054a6..240c76aca 100644
--- a/kio/misc/kmailservice.protocol
+++ b/tdeio/misc/tdemailservice.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kmailservice %u
+exec=tdemailservice %u
 protocol=mailto
 input=none
 output=none
@@ -9,7 +9,7 @@ reading=false
 writing=false
 makedir=false
 deleting=false
-DocPath=kioslave/mailto.html
+DocPath=tdeioslave/mailto.html
 Icon=mail_new
 Class=:internet
 URIMode=mailto
diff --git a/kio/misc/tdentlm/CMakeLists.txt b/tdeio/misc/tdentlm/CMakeLists.txt
index a846d1dcc..dc26da9a1 100644
--- a/kio/misc/tdentlm/CMakeLists.txt
+++ b/tdeio/misc/tdentlm/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 
 ##### headers ###################################
 
-install(FILES tdentlm.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+install(FILES tdentlm.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
 
 
 ##### tdentlm ###################################
diff --git a/kio/misc/tdentlm/Makefile.am b/tdeio/misc/tdentlm/Makefile.am
index 689d0921d..16164dbe3 100644
--- a/kio/misc/tdentlm/Makefile.am
+++ b/tdeio/misc/tdentlm/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES=$(all_includes)
 lib_LTLIBRARIES = libtdentlm.la
 METASOURCES     = AUTO
 
-tdentlmincludedir = $(includedir)/kio
+tdentlmincludedir = $(includedir)/tdeio
 tdentlminclude_HEADERS = tdentlm.h
 
 libtdentlm_la_SOURCES = tdentlm.cpp des.cpp
diff --git a/kio/misc/tdentlm/des.cpp b/tdeio/misc/tdentlm/des.cpp
index bb4fab88b..bb4fab88b 100644
--- a/kio/misc/tdentlm/des.cpp
+++ b/tdeio/misc/tdentlm/des.cpp
diff --git a/kio/misc/tdentlm/des.h b/tdeio/misc/tdentlm/des.h
index 0f6f59dc9..0f6f59dc9 100644
--- a/kio/misc/tdentlm/des.h
+++ b/tdeio/misc/tdentlm/des.h
diff --git a/kio/misc/tdentlm/kswap.h b/tdeio/misc/tdentlm/kswap.h
index 9eca243de..9eca243de 100644
--- a/kio/misc/tdentlm/kswap.h
+++ b/tdeio/misc/tdentlm/kswap.h
diff --git a/kio/misc/tdentlm/tdentlm.cpp b/tdeio/misc/tdentlm/tdentlm.cpp
index 2ef5d1cb6..2ef5d1cb6 100644
--- a/kio/misc/tdentlm/tdentlm.cpp
+++ b/tdeio/misc/tdentlm/tdentlm.cpp
diff --git a/kio/misc/tdentlm/tdentlm.h b/tdeio/misc/tdentlm/tdentlm.h
index 06b8febab..06b8febab 100644
--- a/kio/misc/tdentlm/tdentlm.h
+++ b/tdeio/misc/tdentlm/tdentlm.h
diff --git a/kio/misc/tdesasl/CMakeLists.txt b/tdeio/misc/tdesasl/CMakeLists.txt
index 27cacfbb9..d48322d93 100644
--- a/kio/misc/tdesasl/CMakeLists.txt
+++ b/tdeio/misc/tdesasl/CMakeLists.txt
@@ -23,7 +23,7 @@ link_directories(
 
 ##### headers ###################################
 
-install(FILES tdesasl.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+install(FILES tdesasl.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
 
 
 ##### tdesasl ###################################
diff --git a/kio/misc/tdesasl/Makefile.am b/tdeio/misc/tdesasl/Makefile.am
index 4dd36a6d7..4ebde7e8d 100644
--- a/kio/misc/tdesasl/Makefile.am
+++ b/tdeio/misc/tdesasl/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES=$(all_includes)
 lib_LTLIBRARIES = libtdesasl.la
 METASOURCES     = AUTO
 
-tdesaslincludedir = $(includedir)/kio
+tdesaslincludedir = $(includedir)/tdeio
 tdesaslinclude_HEADERS = tdesasl.h
 
 libtdesasl_la_SOURCES = tdesasl.cpp
diff --git a/kio/misc/tdesasl/tdesasl.cpp b/tdeio/misc/tdesasl/tdesasl.cpp
index ef0768f98..ef0768f98 100644
--- a/kio/misc/tdesasl/tdesasl.cpp
+++ b/tdeio/misc/tdesasl/tdesasl.cpp
diff --git a/kio/misc/tdesasl/tdesasl.h b/tdeio/misc/tdesasl/tdesasl.h
index 0c57096a8..0c57096a8 100644
--- a/kio/misc/tdesasl/tdesasl.h
+++ b/tdeio/misc/tdesasl/tdesasl.h
diff --git a/kio/misc/ksendbugmail/CMakeLists.txt b/tdeio/misc/tdesendbugmail/CMakeLists.txt
index f0e1b99b0..3dffadb22 100644
--- a/kio/misc/ksendbugmail/CMakeLists.txt
+++ b/tdeio/misc/tdesendbugmail/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -22,9 +22,9 @@ link_directories(
 )
 
 
-##### ksendbugmail ##############################
+##### tdesendbugmail ##############################
 
-set( target ksendbugmail )
+set( target tdesendbugmail )
 
 set( ${target}_SRCS
   main.cpp smtp.cpp
@@ -32,6 +32,6 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kio/misc/ksendbugmail/Makefile.am b/tdeio/misc/tdesendbugmail/Makefile.am
index b24e36a26..f9087a4fe 100644
--- a/kio/misc/ksendbugmail/Makefile.am
+++ b/tdeio/misc/tdesendbugmail/Makefile.am
@@ -16,11 +16,11 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-bin_PROGRAMS = ksendbugmail
+bin_PROGRAMS = tdesendbugmail
 INCLUDES= -I$(srcdir)/.. $(all_includes)
 
-ksendbugmail_SOURCES = main.cpp smtp.cpp
-ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-ksendbugmail_LDADD = ../../libkio.la
+tdesendbugmail_SOURCES = main.cpp smtp.cpp
+tdesendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdesendbugmail_LDADD = ../../libtdeio.la
 
 METASOURCES = AUTO
diff --git a/kio/misc/ksendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp
index be1eb8b96..162e6ad5c 100644
--- a/kio/misc/ksendbugmail/main.cpp
+++ b/tdeio/misc/tdesendbugmail/main.cpp
@@ -14,7 +14,7 @@
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "smtp.h"
 
@@ -59,7 +59,7 @@ void BugMailer::slotSend() {
 int main(int argc, char **argv) {
 
     KLocale::setMainCatalogue("tdelibs");
-    TDEAboutData d("ksendbugmail", I18N_NOOP("KSendBugMail"), "1.0",
+    TDEAboutData d("tdesendbugmail", I18N_NOOP("KSendBugMail"), "1.0",
                  I18N_NOOP("Sends a short bug report to submit@bugs.kde.org"),
                  TDEAboutData::License_GPL, "(c) 2000 Stephan Kulow");
     d.addAuthor("Stephan Kulow", I18N_NOOP("Author"), "coolo@kde.org");
diff --git a/kio/misc/ksendbugmail/main.h b/tdeio/misc/tdesendbugmail/main.h
index 39d424bef..39d424bef 100644
--- a/kio/misc/ksendbugmail/main.h
+++ b/tdeio/misc/tdesendbugmail/main.h
diff --git a/kio/misc/ksendbugmail/smtp.cpp b/tdeio/misc/tdesendbugmail/smtp.cpp
index d282782fc..d282782fc 100644
--- a/kio/misc/ksendbugmail/smtp.cpp
+++ b/tdeio/misc/tdesendbugmail/smtp.cpp
diff --git a/kio/misc/ksendbugmail/smtp.h b/tdeio/misc/tdesendbugmail/smtp.h
index acdb4a3c3..acdb4a3c3 100644
--- a/kio/misc/ksendbugmail/smtp.h
+++ b/tdeio/misc/tdesendbugmail/smtp.h
diff --git a/kio/misc/ktelnetservice.cpp b/tdeio/misc/tdetelnetservice.cpp
index cf1b5694c..655a5b32a 100644
--- a/kio/misc/ktelnetservice.cpp
+++ b/tdeio/misc/tdetelnetservice.cpp
@@ -1,6 +1,6 @@
 /*
    Copyright (c) 2001 Malte Starostik <malte@kde.org>
-   based on kmailservice.cpp,
+   based on tdemailservice.cpp,
    Copyright (c) 2000 Simon Hausmann <hausmann@kde.org>
 
    This program is free software; you can redistribute it and/or
@@ -38,7 +38,7 @@ static const KCmdLineOptions options[] =
 int main(int argc, char **argv)
 {
 	KLocale::setMainCatalogue("tdelibs");
-	TDECmdLineArgs::init(argc, argv, "ktelnetservice", I18N_NOOP("telnet service"),
+	TDECmdLineArgs::init(argc, argv, "tdetelnetservice", I18N_NOOP("telnet service"),
 			   I18N_NOOP("telnet protocol handler"), "unknown");
 	TDECmdLineArgs::addCmdLineOptions(options);
 
diff --git a/kio/misc/tdewalletd/CMakeLists.txt b/tdeio/misc/tdewalletd/CMakeLists.txt
index 4aaa332aa..2d0d2ef28 100644
--- a/kio/misc/tdewalletd/CMakeLists.txt
+++ b/tdeio/misc/tdewalletd/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_SOURCE_DIR}/tdewallet/client
   ${CMAKE_SOURCE_DIR}/tdewallet/backend
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
diff --git a/kio/misc/tdewalletd/Makefile.am b/tdeio/misc/tdewalletd/Makefile.am
index 5d52fa810..5d52fa810 100644
--- a/kio/misc/tdewalletd/Makefile.am
+++ b/tdeio/misc/tdewalletd/Makefile.am
diff --git a/kio/misc/tdewalletd/kbetterthankdialogbase.ui b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui
index a02d5def7..a02d5def7 100644
--- a/kio/misc/tdewalletd/kbetterthankdialogbase.ui
+++ b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui
diff --git a/kio/misc/tdewalletd/kbetterthankdialogbase.ui.h b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui.h
index 2b3e16b0d..2b3e16b0d 100644
--- a/kio/misc/tdewalletd/kbetterthankdialogbase.ui.h
+++ b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui.h
diff --git a/kio/misc/tdewalletd/ktimeout.cpp b/tdeio/misc/tdewalletd/ktimeout.cpp
index c431ecf69..c431ecf69 100644
--- a/kio/misc/tdewalletd/ktimeout.cpp
+++ b/tdeio/misc/tdewalletd/ktimeout.cpp
diff --git a/kio/misc/tdewalletd/ktimeout.h b/tdeio/misc/tdewalletd/ktimeout.h
index 441e4ed77..441e4ed77 100644
--- a/kio/misc/tdewalletd/ktimeout.h
+++ b/tdeio/misc/tdewalletd/ktimeout.h
diff --git a/kio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp
index 3f59f4e91..a8b3ade1a 100644
--- a/kio/misc/tdewalletd/tdewalletd.cpp
+++ b/tdeio/misc/tdewalletd/tdewalletd.cpp
@@ -29,7 +29,7 @@
 #include <dcopref.h>
 #include <kactivelabel.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <kglobal.h>
diff --git a/kio/misc/tdewalletd/tdewalletd.desktop b/tdeio/misc/tdewalletd/tdewalletd.desktop
index 1e65fe0df..1e65fe0df 100644
--- a/kio/misc/tdewalletd/tdewalletd.desktop
+++ b/tdeio/misc/tdewalletd/tdewalletd.desktop
diff --git a/kio/misc/tdewalletd/tdewalletd.h b/tdeio/misc/tdewalletd/tdewalletd.h
index b3a315413..b3a315413 100644
--- a/kio/misc/tdewalletd/tdewalletd.h
+++ b/tdeio/misc/tdewalletd/tdewalletd.h
diff --git a/kio/misc/tdewalletd/tdewalletwizard.ui b/tdeio/misc/tdewalletd/tdewalletwizard.ui
index aa3a1c09d..aa3a1c09d 100644
--- a/kio/misc/tdewalletd/tdewalletwizard.ui
+++ b/tdeio/misc/tdewalletd/tdewalletwizard.ui
diff --git a/kio/misc/tdewalletd/tdewalletwizard.ui.h b/tdeio/misc/tdewalletd/tdewalletwizard.ui.h
index a42635e9b..a42635e9b 100644
--- a/kio/misc/tdewalletd/tdewalletwizard.ui.h
+++ b/tdeio/misc/tdewalletd/tdewalletwizard.ui.h
diff --git a/kio/misc/telnet.protocol b/tdeio/misc/telnet.protocol
index 810011594..062fb1d4f 100644
--- a/kio/misc/telnet.protocol
+++ b/tdeio/misc/telnet.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=ktelnetservice %u
+exec=tdetelnetservice %u
 protocol=telnet
 input=none
 output=none
@@ -9,5 +9,5 @@ reading=false
 writing=false
 makedir=false
 deleting=false
-DocPath=kioslave/telnet.html
+DocPath=tdeioslave/telnet.html
 Icon=konsole
diff --git a/kio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index e898e5a50..6ba92a6a2 100644
--- a/kio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -26,7 +26,7 @@
 #include <tqevent.h>
 
 #include <ksqueezedtextlabel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kuniqueapplication.h>
 #include <kaboutdata.h>
@@ -52,12 +52,12 @@
 
 #include "observer_stub.h"
 #include "observer.h" // for static methods only
-#include "kio/defaultprogress.h"
-#include "kio/jobclasses.h"
+#include "tdeio/defaultprogress.h"
+#include "tdeio/jobclasses.h"
 #include "uiserver.h"
 #include "passdlg.h"
-#include "kio/renamedlg.h"
-#include "kio/skipdlg.h"
+#include "tdeio/renamedlg.h"
+#include "tdeio/skipdlg.h"
 #include "slavebase.h" // for QuestionYesNo etc.
 #include <ksslinfodlg.h>
 #include <ksslcertdlg.h>
@@ -1144,7 +1144,7 @@ void UIServer::slotSelection() {
 }
 
 // This code is deprecated, slaves go to Observer::openPassDlg now,
-// but this is kept for compat (DCOP calls to kio_uiserver).
+// but this is kept for compat (DCOP calls to tdeio_uiserver).
 TQByteArray UIServer::openPassDlg( const TDEIO::AuthInfo &info )
 {
     kdDebug(7024) << "UIServer::openPassDlg: User= " << info.username
@@ -1380,7 +1380,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
     KLocale::setMainCatalogue("tdelibs");
     //  GS 5/2001 - I changed the name to "TDE" to make it look better
     //              in the titles of dialogs which are displayed.
-    TDEAboutData aboutdata("kio_uiserver", I18N_NOOP("TDE"),
+    TDEAboutData aboutdata("tdeio_uiserver", I18N_NOOP("TDE"),
                          "0.8", I18N_NOOP("TDE Progress Information UI Server"),
                          TDEAboutData::License_GPL, "(C) 2000, David Faure & Matt Koss");
     // Who's the maintainer ? :)
@@ -1393,7 +1393,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 
     if (!KUniqueApplication::start())
     {
-      kdDebug(7024) << "kio_uiserver is already running!" << endl;
+      kdDebug(7024) << "tdeio_uiserver is already running!" << endl;
       return (0);
     }
 
diff --git a/kio/misc/uiserver.h b/tdeio/misc/uiserver.h
index abe935ad5..baf495dfe 100644
--- a/kio/misc/uiserver.h
+++ b/tdeio/misc/uiserver.h
@@ -16,16 +16,16 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef __kio_uiserver_h__
-#define __kio_uiserver_h__
+#ifndef __tdeio_uiserver_h__
+#define __tdeio_uiserver_h__
 
 #include <tqintdict.h>
 #include <tqdatetime.h>
 #include <tqtimer.h>
 
 #include <dcopobject.h>
-#include <kio/global.h>
-#include <kio/authinfo.h>
+#include <tdeio/global.h>
+#include <tdeio/authinfo.h>
 #include <kurl.h>
 #include <kmainwindow.h>
 #include <kdatastream.h>
@@ -232,7 +232,7 @@ k_dcop:
    * @param appId the DCOP application id of the job's parent application
    * @see TDEIO::Observer::newJob
    * @param showProgress whether to popup the progress for the job.
-   *   Usually true, but may be false when we use kio_uiserver for
+   *   Usually true, but may be false when we use tdeio_uiserver for
    *   other things, like SSL dialogs.
    * @return the job id
    */
diff --git a/kio/pics/CMakeLists.txt b/tdeio/pics/CMakeLists.txt
index 1830674b4..b04b9c7d4 100644
--- a/kio/pics/CMakeLists.txt
+++ b/tdeio/pics/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 ##### other data ################################
 
-tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kio_uiserver/icons )
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/tdeio_uiserver/icons )
diff --git a/tdeio/pics/Makefile.am b/tdeio/pics/Makefile.am
new file mode 100644
index 000000000..ce10461b5
--- /dev/null
+++ b/tdeio/pics/Makefile.am
@@ -0,0 +1,3 @@
+kiouiservericonsdir = $(kde_datadir)/tdeio_uiserver/icons
+kiouiservericons_ICON = AUTO
+
diff --git a/kio/pics/cr16-app-kio_uiserver.png b/tdeio/pics/cr16-app-tdeio_uiserver.png
index 41b3f4367..41b3f4367 100644
--- a/kio/pics/cr16-app-kio_uiserver.png
+++ b/tdeio/pics/cr16-app-tdeio_uiserver.png
diff --git a/kio/proxytype.pl b/tdeio/proxytype.pl
index 553db53f7..553db53f7 100755
--- a/kio/proxytype.pl
+++ b/tdeio/proxytype.pl
diff --git a/kio/renamedlgplugin.desktop b/tdeio/renamedlgplugin.desktop
index d6a9f8f1f..d6a9f8f1f 100644
--- a/kio/renamedlgplugin.desktop
+++ b/tdeio/renamedlgplugin.desktop
diff --git a/kio/tdecmodule.desktop b/tdeio/tdecmodule.desktop
index 5cbe9b786..5cbe9b786 100644
--- a/kio/tdecmodule.desktop
+++ b/tdeio/tdecmodule.desktop
diff --git a/kio/kfile/CMakeLists.txt b/tdeio/tdefile/CMakeLists.txt
index 3444fa0da..4fa7b3e82 100644
--- a/kio/kfile/CMakeLists.txt
+++ b/tdeio/tdefile/CMakeLists.txt
@@ -20,9 +20,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/bookmarks
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/bookmarks
   ${LIBART_INCLUDE_DIRS}
 )
 
@@ -30,14 +30,14 @@ include_directories(
 ##### headers ###################################
 
 install( FILES
-    kfiledialog.h kencodingfiledialog.h
-    kdiroperator.h kfileview.h kfilefiltercombo.h
-    kfiledetailview.h kcombiview.h kdiskfreesp.h
-    kfileiconview.h krecentdocument.h
-    kurlrequester.h kfilepreview.h kfile.h
+    tdefiledialog.h kencodingfiledialog.h
+    kdiroperator.h tdefileview.h tdefilefiltercombo.h
+    tdefiledetailview.h kcombiview.h kdiskfreesp.h
+    tdefileiconview.h krecentdocument.h
+    kurlrequester.h tdefilepreview.h tdefile.h
     kurlcombobox.h kurlrequesterdlg.h kopenwith.h kpropsdlg.h
-    kicondialog.h kdirsize.h kpreviewwidgetbase.h kimagefilepreview.h kfilesharedlg.h
-    kfiletreeview.h kfiletreeviewitem.h kfiletreebranch.h
+    kicondialog.h kdirsize.h kpreviewwidgetbase.h kimagefilepreview.h tdefilesharedlg.h
+    tdefiletreeview.h tdefiletreeviewitem.h tdefiletreebranch.h
     kdirselectdialog.h kurlbar.h kpropertiesdialog.h knotifydialog.h
     kcustommenueditor.h ${CMAKE_CURRENT_BINARY_DIR}/knotifywidgetbase.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
@@ -50,22 +50,22 @@ install( FILES
  DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-##### kfile #####################################
+##### tdefile #####################################
 
-set( target kfile )
+set( target tdefile )
 
 set( ${target}_SRCS
-  kfilefiltercombo.cpp kfileview.cpp kfileiconview.cpp
-  krecentdocument.cpp kfiledialog.cpp kdiroperator.cpp
-  kfiledetailview.cpp kcombiview.cpp kurlrequester.cpp
-  kfilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp
+  tdefilefiltercombo.cpp tdefileview.cpp tdefileiconview.cpp
+  krecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp
+  tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp
+  tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp
   kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp
   kdirsize.cpp krecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp
-  kfilesharedlg.cpp kurlbar.cpp kmetaprops.cpp kpreviewprops.cpp
-  kfiletreeview.cpp kfiletreeviewitem.cpp kfiletreebranch.cpp
-  kdirselectdialog.cpp kfilebookmarkhandler.cpp kfilemetainfowidget.cpp
+  tdefilesharedlg.cpp kurlbar.cpp kmetaprops.cpp kpreviewprops.cpp
+  tdefiletreeview.cpp tdefiletreeviewitem.cpp tdefiletreebranch.cpp
+  kdirselectdialog.cpp tdefilebookmarkhandler.cpp tdefilemetainfowidget.cpp
   kcustommenueditor.cpp knotifywidgetbase.ui knotifydialog.cpp
-  kfilespeedbar.cpp kpreviewwidgetbase.cpp kfilemetapreview.cpp
+  tdefilespeedbar.cpp kpreviewwidgetbase.cpp tdefilemetapreview.cpp
   kpropertiesdesktopbase.ui kpropertiesdesktopadvbase.ui
   kpropertiesmimetypebase.ui kencodingfiledialog.cpp
   kacleditwidget.cpp
diff --git a/kio/kfile/ChangeLog b/tdeio/tdefile/ChangeLog
index 2c9651390..79ac59808 100644
--- a/kio/kfile/ChangeLog
+++ b/tdeio/tdefile/ChangeLog
@@ -4,10 +4,10 @@ Sat Feb 26 00:26:55 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	lottsa changes, e.g. action handling more clear now.
 	fixed completed item not clearning the previous selection
 
-	* kfileviewitem.cpp:
+	* tdefileviewitem.cpp:
 	fixed unreadable pixmap not shown, when files were deleted
 
-	* kfiledialog.cpp (selectedURLs): 
+	* tdefiledialog.cpp (selectedURLs): 
 	re-enabled the hack to support multi-selection, until we have something
 	better
 
@@ -17,32 +17,32 @@ Sat Feb 26 00:26:55 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Sun Feb 20 01:50:44 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.*, kfiledialog.* (saveConfig): 
+	* kdiroperator.*, tdefiledialog.* (saveConfig): 
 	implemented loading, saving and applying configuration
 
-	* kfiledialog.cpp (setURL): 
+	* tdefiledialog.cpp (setURL): 
 	KDirComboBox is now a combo for recent directories as well as the
 	root-dir, home-dir and Desktop-dir.
 	Recent dirs will be saved in kdeglobals.
 
 Fri Feb 18 23:35:04 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfilefilter.cpp (eventFilter): 
+	* tdefilefilter.cpp (eventFilter): 
 	intercept Key_Return and Key_Enter in the filter-combo and emit
 	filterChanged instead of letting the dialog close
 
 Thu Feb 17 19:09:54 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfiledialog.{cpp,h} (KDirComboBox): 
+	* tdefiledialog.{cpp,h} (KDirComboBox): 
 	Added KDirComboBox and replaced the directory combobox with it. It
 	even does something now :) Items need to be indented tho.
 
-	* kfilereader.cpp, kdiroperator.{cpp,h}: 
+	* tdefilereader.cpp, kdiroperator.{cpp,h}: 
 	fixed showHidden default
 
 Tue Feb 15 14:21:41 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfile.h (class KFile): 
+	* tdefile.h (class KFile): 
 	added a small class that contains all the enums now.
 	cleaned up the enums (hope not too many apps will be broken)
 	added flags for "Existing files only" and "local files only"
@@ -52,10 +52,10 @@ Tue Feb 15 14:21:41 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	it more suitable and more consistent with Qt.
 	added selectionChanged() method (necessary for multiselection)
 
-	* kfileview.*:
+	* tdefileview.*:
 	added invertSelection()
 
-	* kfiledialog.cpp:
+	* tdefiledialog.cpp:
 	made it work with multiselection
 	added static methods for multiselection
 	added getOpenURL(), getOpenURLs and getSaveURL()
@@ -66,22 +66,22 @@ Tue Feb 15 14:21:41 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Sun Feb 13 00:45:12 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfiledialog.cpp (completion): 
+	* tdefiledialog.cpp (completion): 
 	small fix: completion and auto-directory following works also
 	without protocol-part in the location.
 
 Sat Feb 12 15:30:40 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfileview.h:
+	* tdefileview.h:
 	made setSorting() and sortReversed() virtual so that subclasses
 	can intercept that to show sorting order
 	
-	* kfiledetailview.cpp,h (setSortIndicator): 
+	* tdefiledetailview.cpp,h (setSortIndicator): 
 	enable header-clicking again to set the sorting
 
 Fri Feb 11 12:17:59 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfiledialog.cpp (KFileDialog): 
+	* tdefiledialog.cpp (KFileDialog): 
 	fixed filefilter not being applied in constructor
 
 Thu Feb 10 17:06:36 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
@@ -98,7 +98,7 @@ Thu Feb 10 17:06:36 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	
 	- renamed fileList to fileView (that was an old relic of KDE 1)
 
-	* kfiledialog.*:
+	* tdefiledialog.*:
 	- make use of the new Actions and fill the toolbar again (up, back, 
 	  forward, reload, home).
 
@@ -111,19 +111,19 @@ Thu Feb 10 12:59:29 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	aahhh, finally fixed that infinite loop in KFileView::mergeLists
 	clear the view before calling view->addItemList( currentContents );
 
-	* kfilereader.cpp (setURL): 
+	* tdefilereader.cpp (setURL): 
 	don't disable dirWatch update (setAutoUpdate) when setting a remote URL
 
 Fri Feb  4 12:42:37 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfiledetailview.cpp (insertItem): 
+	* tdefiledetailview.cpp (insertItem): 
 	- don't let QListView sort the items
 	  I disabled clicking at the headers for now, will fix that later
 	- don't flicker on mimetype-pixmap update
 
 Thu Feb  3 12:15:16 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfileview.h + all views where necessary
+	* tdefileview.h + all views where necessary
 	added selectAll()
 	added isSelected( const KFileViewItem * )
 	added const KFileViewItemList * selectedItems()
@@ -133,15 +133,15 @@ Thu Feb  3 12:15:16 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Sun Jan 30 22:20:14 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfileviewitem.cpp (pixmap): 
+	* tdefileviewitem.cpp (pixmap): 
 	fixed some issues for different pixmap sizes
 
-	* kfileiconview.{h,cpp} (setPixmapSize):
+	* tdefileiconview.{h,cpp} (setPixmapSize):
 	added configurability for different pixmap sizes
 
 Sun Jan 30 16:49:12 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfileview.h + all views:
+	* tdefileview.h + all views:
 	A view can now have a name (setViewName() and viewName())
 	This is useful to differentiate views and to display the names in a
 	popupmenu for switching between views.
@@ -150,7 +150,7 @@ Sun Jan 30 12:41:04 2000  Werner Trobin  <wtrobin@carinthia.com>
 	The preview mode works again. It's very similar to the Qt-2.1 QFD
 	preview mode - but it's not totally the same. There are some rough
 	edges which have to be ironed out, but it works :)
-	For further information, see kfilepreview.*
+	For further information, see tdefilepreview.*
 	Note: kpreview and so on are obsolete (IMHO)
 	
 Sat Jan 29 15:33:37 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
@@ -158,7 +158,7 @@ Sat Jan 29 15:33:37 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	Time to add some changelogs again, all the recent hard work of the 
 	restructuring is only in CVS-log...
 
-	* kfileview.cpp (compareItems): 
+	* tdefileview.cpp (compareItems): 
 	- added support to disable sorting directories first (QDir::DirsFirst)
 	- added support to sort by date and to sort reversed
 	- removed unused findCompletion method
@@ -170,7 +170,7 @@ Sat Jan 29 15:33:37 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	  sortReversed(). The enum Switching will be removed, soon.
 	- made setSortMode public
 
-	* kfileviewitem.cpp:
+	* tdefileviewitem.cpp:
 	- added time_t mTime() to enable sorting by modification time
 	
 	* kdiroperator.cpp:
@@ -181,17 +181,17 @@ Sat Jan 29 15:33:37 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	  the detail-view would be covered).
 	- Added LGPL copyright header
 	
-	* kfilewidget.cpp (connectSignals):
+	* tdefilewidget.cpp (connectSignals):
 	- connect to all signals of KDirOperator
 	- directly connect SIGNAL to SIGNAL -> removed slotFileHighlighted etc.
 	- fixed some sorting/merging bugs
 
-	* {kfiledialog,kdiroperator}.{cpp,h};
+	* {tdefiledialog,kdiroperator}.{cpp,h};
 	- support for disabling chdir (some apps may not want KFileDialog /
 	  KFileReader change the working directory under their feet)
 	- Added LGPL header in cpp-file
 
-	* kfilereader.cpp (stat):
+	* tdefilereader.cpp (stat):
 	- fixed: some special files were recognized as directories
 
 	* kfstest.cpp:
@@ -200,7 +200,7 @@ Sat Jan 29 15:33:37 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	
 Sun Oct 31 00:56:23 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfileinfo.cpp (readUserInfo): Don't call getpwnam() and getgrgid()
+	* tdefileinfo.cpp (readUserInfo): Don't call getpwnam() and getgrgid()
 	all the time over and over again! This opens and parses /etc/passwd
 	or /etc/group with every call!
 	Now we load /etc/passwd and /etc/group once and store the interesting 
@@ -211,31 +211,31 @@ Sun Oct 31 00:56:23 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Sat Oct 23 01:55:00 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfiledetaillist.cpp (key): hopefully implemented correct mapping
+	* tdefiledetaillist.cpp (key): hopefully implemented correct mapping
 	from KFileInfo to QListViewItem and back. I had a hard time convincing
 	QListView that KFileInfoContents knows best where to insert an item
 	Now the detaillist is even usable :)
 	Fixed a problem with selection and highlighting
 	Disable clicking on listview headers that can't be used for sorting
 
-	* kfileinfocontents.cpp (setSorting): call insertItem() with a correct
+	* tdefileinfocontents.cpp (setSorting): call insertItem() with a correct
 	(is it?) index, instead of -1
 
 Thu Oct 21 23:18:54 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfiledialog.cpp (init): removed "[development only] from tooltip
+	* tdefiledialog.cpp (init): removed "[development only] from tooltip
 	(sorry to break the translations, but this HAD to go)
 
 	* don't update anything when leaving the configure-dialog with Cancel
 
 Wed Oct 20 15:07:16 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfileinfo.cpp,h: implemented KFileInfo::filePath() and fixed 
+	* tdefileinfo.cpp,h: implemented KFileInfo::filePath() and fixed 
 	KFileInfo::absURL() not being set in some cases
 	
 	* kdir.cpp: fixed a buglet in the path (double slashes)
 
-	* kfiledetaillist.cpp (KFileDetailList): improved selecting files
+	* tdefiledetaillist.cpp (KFileDetailList): improved selecting files
 	(single click, double click, Return-key)
 	but the mapping from QListViewItem to KFileInfo is still quite broken
 	
@@ -244,37 +244,37 @@ Wed Oct 20 15:07:16 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 	* kdir.cpp: used QString::local8Bit() instead of QString::ascii() 
 	for file names and directory names.
 
-	* kfiledialog.cpp: used QStringList instead of QStrIList. 
+	* tdefiledialog.cpp: used QStringList instead of QStrIList. 
 
 1999-01-14  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: fixed some GUI problems and moved all default
-	configurations into config-kfile.h. 
+	* tdefiledialog.cpp: fixed some GUI problems and moved all default
+	configurations into config-tdefile.h. 
 	Changed some default values, so that users that never looked into
 	the config dialog gets a nice suprise with 1.1 ;-)
 
-	* kfiledialog.cpp: changed selectedFile to return decoded path instead
+	* tdefiledialog.cpp: changed selectedFile to return decoded path instead
 	of encoded one
 
 Thu Jan  7 23:14:39 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfilesimpleview.cpp (keyPressEvent): fixed segfault on keypress,
+	* tdefilesimpleview.cpp (keyPressEvent): fixed segfault on keypress,
 	when there were no files at all in the list
 
 1998-12-19  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: fixing an ugly bug when "." is used as argument
+	* tdefiledialog.cpp: fixing an ugly bug when "." is used as argument
 
 Mon Dec 14 23:00:41 1998  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfilebookmark.cpp: renamed class KBookmark to KFileBookmark to 
+	* tdefilebookmark.cpp: renamed class KBookmark to KFileBookmark to 
 	avoid problems with KFM's KBookmark class. Renamed bookmark.* to
-	kfilebookmark.*, too and changed all occurrences of bookmark.* to
-	kfilebookmark.* (especially all the .po-files)
+	tdefilebookmark.*, too and changed all occurrences of bookmark.* to
+	tdefilebookmark.* (especially all the .po-files)
 
 Wed Dec  2 15:59:13 1998  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfilesimpleview.cpp: Fixed some more keyboard navigation bugs.
+	* tdefilesimpleview.cpp: Fixed some more keyboard navigation bugs.
 	Added method isColCompletelyVisible( int col ), now you can scroll
 	perfectly to make items completely visible.
 	Moreover, in resizeEvent() the number of columns was not calculated 
@@ -284,77 +284,77 @@ Wed Dec  2 15:59:13 1998  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 1998-10-12  Jochen Küpper  <jochen@uni-duesseldorf.de>
 
-	* kfiledialog.cpp (okPressed): Changed okPressed to store the correct
+	* tdefiledialog.cpp (okPressed): Changed okPressed to store the correct
 	filename before leaving the dialog.
 
 1998-06-07  Stephan Kulow  <coolo@kde.org>
 
-	* kfilesimpleview.cpp: added some checks to prevent division with
+	* tdefilesimpleview.cpp: added some checks to prevent division with
 	zero using the latest qt snapshots
 
-	* kfilesimpleview.cpp: added a repaint call after a resize
+	* tdefilesimpleview.cpp: added a repaint call after a resize
 
-	* kfiledialog.cpp: new experimental button order
+	* tdefiledialog.cpp: new experimental button order
 
-	* kfiledialog.cpp: added lastDirectory to remember the last visited
+	* tdefiledialog.cpp: added lastDirectory to remember the last visited
 	directory for next open
 
 1998-05-24  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: use setSelection also for the initial filename
+	* tdefiledialog.cpp: use setSelection also for the initial filename
 	given
 
-	* kfiledialog.cpp: introduced KFileFilter to make an abstraction
+	* tdefiledialog.cpp: introduced KFileFilter to make an abstraction
 	for the used filter widget. Currently only QComboBox is supported,
 	but this may change in the future
 	
 1998-05-20  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: changed the accelerator for completion 
+	* tdefiledialog.cpp: changed the accelerator for completion 
 	to CTRL-T
 
-	* kfiledialog.cpp: fixed the setSelection() feature
+	* tdefiledialog.cpp: fixed the setSelection() feature
 
 1998-05-19  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.h: added setSelection
+	* tdefiledialog.h: added setSelection
 
 1998-05-18  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: bugfixes
+	* tdefiledialog.cpp: bugfixes
 
 1998-05-15  Stephan Kulow  <coolo@kde.org>
 
-	* kfileinfocontents.cpp: some more changes and speed ups 
+	* tdefileinfocontents.cpp: some more changes and speed ups 
 	(caching and some other little things)
 
 1998-05-14  Stephan Kulow  <coolo@kde.org>
 
-	* kfileinfocontents.cpp: added addItemList 
+	* tdefileinfocontents.cpp: added addItemList 
 
-	* kfileinfocontents.h: introduced KFileInfoContentsSignaler
+	* tdefileinfocontents.h: introduced KFileInfoContentsSignaler
 
-	* kfileinfocontents.cpp: some more speed improvment
+	* tdefileinfocontents.cpp: some more speed improvment
 
 1998-05-10  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: tried to speed up the refresh
+	* tdefiledialog.cpp: tried to speed up the refresh
 
 1998-04-17  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledetaillist.cpp: implemented the date field
+	* tdefiledetaillist.cpp: implemented the date field
 	
-	* kfiledetaillist.cpp: made the columns wider
+	* tdefiledetaillist.cpp: made the columns wider
 
-	* kfileinfocontents.cpp: use the new icons by Mark
+	* tdefileinfocontents.cpp: use the new icons by Mark
 
 Thu Apr 16 10:51:24 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 
-	* kfiledialog.*: some small fixes concerning preview
+	* tdefiledialog.*: some small fixes concerning preview
         
-        * kfileinfocontents.cpp: fixed sorting bug in preview
+        * tdefileinfocontents.cpp: fixed sorting bug in preview
         
-        * kfilepreview.*: small bug fixes
+        * tdefilepreview.*: small bug fixes
         
         * kpreview.*: small bug fixes
         
@@ -362,31 +362,31 @@ Thu Apr 16 10:51:24 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 
 1998-04-15  Stephan Kulow  <coolo@kde.org>
 
-	* kfilepreview.cpp: use a list box instead of simple view
+	* tdefilepreview.cpp: use a list box instead of simple view
 
-	* kfiledialog.cpp: fixed an ugly bug
+	* tdefiledialog.cpp: fixed an ugly bug
 
 1998-04-14  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialogconf.cpp: removed the width/height sliders
+	* tdefiledialogconf.cpp: removed the width/height sliders
 	
-	* kfiledialog.cpp: save the width and height on exit
+	* tdefiledialog.cpp: save the width and height on exit
 
-	* kfiledialogconf.cpp: added more guys to the about box
+	* tdefiledialogconf.cpp: added more guys to the about box
 
-	* kfiledialog.h: removed init*Children. They were useless
+	* tdefiledialog.h: removed init*Children. They were useless
 
-	* kfiledialog.cpp: set the default size to a useful value
+	* tdefiledialog.cpp: set the default size to a useful value
 
 Mon Apr  6 17:30:18 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 
-	* kfilepreview.*: restructured previewing, one can now easily
+	* tdefilepreview.*: restructured previewing, one can now easily
         use custom previewers, dynamically
         
         * kpreview.*: changes for allowing custom previewers, two previewers
         are hardcoded so far
 
-	* kfiledialog.*: changes changes for allowing custom previewers
+	* tdefiledialog.*: changes changes for allowing custom previewers
         
         * kfstest.cpp: changes to preview mode
         
@@ -402,7 +402,7 @@ Thu Apr  2 19:39:37 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 	* kpreview.*: widget which for now shows some info about a 
         file/folder along with the first 20-30 lines of it
         
-        * kfilepreview.*: added a new view which has a preview of any text
+        * tdefilepreview.*: added a new view which has a preview of any text
         file in the right part
         
         * kfstest.cpp: added the new mode "preview" which shows the above 
@@ -410,11 +410,11 @@ Thu Apr  2 19:39:37 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 
 1998-03-30  Stephan Kulow  <coolo@kde.org>
 
-	* kfilesimpleview.cpp: fixed highlightning
+	* tdefilesimpleview.cpp: fixed highlightning
 
-	* kfiledialog.cpp: some fixes for the dir selection
+	* tdefiledialog.cpp: some fixes for the dir selection
 
-	* kfiledialog.h: Moved KFileDialog into KFileBaseDialog and made
+	* tdefiledialog.h: Moved KFileDialog into KFileBaseDialog and made
 	KFileDialog and KDirDialog a derived class of KFileBaseDialog to
 	make this virtual functions work
 
@@ -423,91 +423,91 @@ Mon Mar 30 17:53:20 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
         * kcombiview.cpp: bug fixes for completion & corresponding
         highlighting
 
-        * kfiledialog.cpp: small bug fix, too much copying into location
+        * tdefiledialog.cpp: small bug fix, too much copying into location
 
-        * kfileinfocontents.cpp: completion slightly remodeled, should
+        * tdefileinfocontents.cpp: completion slightly remodeled, should
         work in all views now
 
-        * kfileinfocontents.h: changed nameList to case insensitive
+        * tdefileinfocontents.h: changed nameList to case insensitive
         list
                     
 1998-03-28  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: changed the filter separator to \n. 
+	* tdefiledialog.cpp: changed the filter separator to \n. 
 	This looks nicer in the source code of the call
 
 Sat Mar 28 14:49:00 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: changed the meaning of the dirName argument
+	* tdefiledialog.cpp: changed the meaning of the dirName argument
 
-	* kfiledialog.h: added getShowFilter
+	* tdefiledialog.h: added getShowFilter
 
 Thu Mar 26 12:47:42 1998  Stephan Kulow  <coolo@kde.org>
 	
-	* kfilesimpleview.cpp: improved scrolling in simple view
+	* tdefilesimpleview.cpp: improved scrolling in simple view
 
-	* kfileinfocontents.cpp: add a / after a found dir
+	* tdefileinfocontents.cpp: add a / after a found dir
 
-	* kfiledialog.cpp: fixed bug for !showFilter
+	* tdefiledialog.cpp: fixed bug for !showFilter
 
 Wed Mar 25 18:39:09 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 
-	* kfileinfocontents.cpp: completion now working
+	* tdefileinfocontents.cpp: completion now working
         
         * kcombiview.cpp: changed behavior for completion, it
         now highlights completed directory and file                
         
 Tue Mar 24 16:08:46 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 
-	* kfileinfocontents.cpp: sorting now fully working
+	* tdefileinfocontents.cpp: sorting now fully working
         
-        * kfiledialog.cpp: modifications for sorting in the on the
+        * tdefiledialog.cpp: modifications for sorting in the on the
         fly reconfiguration
         
-        * kfileinfocontents.*: modification to the constructor 
+        * tdefileinfocontents.*: modification to the constructor 
         to pass along the sorting
         
-        * kfiledetaillist.*: modification to the constructor 
+        * tdefiledetaillist.*: modification to the constructor 
         to pass along the sorting
         
         * kcombiview.*: modification to the constructor 
         to pass along the sorting
 
-        * kfilesimpleview.*: modification to the constructor 
+        * tdefilesimpleview.*: modification to the constructor 
         to pass along the sorting
 
 Tue Mar 24 10:45:15 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 
-	* kfileinfocontents.cpp: sorting fixed, the feature of keeping 
+	* tdefileinfocontents.cpp: sorting fixed, the feature of keeping 
         directories grouped is still missing though
 
 Mon Mar 23 22:59:18 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledetaillist.h: added acceptsFiles() and acceptsDirs() to
+	* tdefiledetaillist.h: added acceptsFiles() and acceptsDirs() to
 	make dirs-only views useful
 	
-	* kfileinfocontents.cpp: OK, completion is back again, but 
+	* tdefileinfocontents.cpp: OK, completion is back again, but 
 	currently not working, because the code is missing ;-)
 
 Mon Mar 23 00:08:02 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: moved all GM related things into initGUI() to
+	* tdefiledialog.cpp: moved all GM related things into initGUI() to
 	make recreation possible
 
 Sun Mar 22 00:22:46 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: use KShellProcess now
+	* tdefiledialog.cpp: use KShellProcess now
 
-	* kfiledialog.h: added virtual function initFileList to made 
+	* tdefiledialog.h: added virtual function initFileList to made 
 	KFileDialog customable
 
-	* kfiledialog.cpp: show a combo box, in case more filters are given
+	* tdefiledialog.cpp: show a combo box, in case more filters are given
 
-	* kfiledialog.cpp: some bug fixes. I can't get the sorting to work
+	* tdefiledialog.cpp: some bug fixes. I can't get the sorting to work
 
 	* Makefile.am: install some toolbar pixmaps
 
-	* kfiledetailview.cpp: added pixmaps to the detail view
+	* tdefiledetailview.cpp: added pixmaps to the detail view
 
 	* Kfiledialog.cpp: made KComboView customable through virtual 
 	functions
@@ -522,66 +522,66 @@ Sun Mar 22 00:22:46 1998  Stephan Kulow  <coolo@kde.org>
 
 	* kdirlistbox.cpp: KDirListBox is now a KFileInfoContents too
 
-	* kfiledialog.cpp: another change in the API. It uses now QSignal.
+	* tdefiledialog.cpp: another change in the API. It uses now QSignal.
 	I didn't liked the old way
 
 1998-03-21  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: implemented mixDirsAndFiles. Need some work and currently 
+	* tdefiledialog.cpp: implemented mixDirsAndFiles. Need some work and currently 
 	only supported by the simple view
 
 Sat Mar 21 01:00:48 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfilesimpleview.cpp: added pixmaps to indicate access on the file
+	* tdefilesimpleview.cpp: added pixmaps to indicate access on the file
 
-	* kfilesimpleview.cpp: improved keyboard navigation
+	* tdefilesimpleview.cpp: improved keyboard navigation
 
-	* kfilesimpleview.cpp: first almost working simple view
+	* tdefilesimpleview.cpp: first almost working simple view
 
-	* kfilesimpleview.cpp: started implementing a simple view. Needs
+	* tdefilesimpleview.cpp: started implementing a simple view. Needs
 	still some work
 	
 
 Fri Mar 20 22:42:31 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfileinfocontents.h: bugfixes
+	* tdefileinfocontents.h: bugfixes
 
-	* kfileinfo.cpp: KFileInfo is no longer a derived class of
+	* tdefileinfo.cpp: KFileInfo is no longer a derived class of
 	QFileInfo. This should reduce memory use too
 
-	* kfileinfocontents.h: moved the actual sorting in
+	* tdefileinfocontents.h: moved the actual sorting in
 	KFileInfoContents. Derived classes are for viewing only
 
-	* kfiledialog.h: fixed some header files locations
+	* tdefiledialog.h: fixed some header files locations
 
 1998-03-20  Stephan Kulow  <coolo@kde.org>
 
-	* kfileinfo.cpp: show lockedfolder.xpm for folders, that are not
+	* tdefileinfo.cpp: show lockedfolder.xpm for folders, that are not
 	allowed to enter or read
 
-	* kfiledialog.cpp: bug fixes
+	* tdefiledialog.cpp: bug fixes
 
 Fri Mar 20 13:10:11 1998 Daniel Grana <grana@ie.iwi.unibe.ch>
 	* kfilgdialog.*, remodeled the configuration dialog to reflect the 
         current possible settings
-        * kfiledetailList.cpp: added the PageUp PageDown navigation 
+        * tdefiledetailList.cpp: added the PageUp PageDown navigation 
 
 1998-03-19  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: fixed the forward/back back reported by 
+	* tdefiledialog.cpp: fixed the forward/back back reported by 
 	Stefan Tafener
 
 1998-03-18  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: set the initial focus to the line edit
+	* tdefiledialog.cpp: set the initial focus to the line edit
 
-	* kfiledialog.cpp: use kapp->invokeHTMLHelp now
+	* tdefiledialog.cpp: use kapp->invokeHTMLHelp now
 	
-	* kfiledialog.h: removed treeList, since it's not implemented
+	* tdefiledialog.h: removed treeList, since it's not implemented
 
 Wed Mar 18 02:56:32 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledetaillist.cpp: fixed sorting again
+	* tdefiledetaillist.cpp: fixed sorting again
 
 1998-03-17  Stephan Kulow  <coolo@kde.org>
 
@@ -591,30 +591,30 @@ Wed Mar 18 02:56:32 1998  Stephan Kulow  <coolo@kde.org>
 
 1998-03-16  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: don't accept the first entry of the combo 
+	* tdefiledialog.cpp: don't accept the first entry of the combo 
 	box as a file name
 
-	* kfiledialog.cpp: added an accelerator for completion, since 
+	* tdefiledialog.cpp: added an accelerator for completion, since 
 	KCombo no longer emits such a thing (currently CTRL-A)
 	
 	* kdir.cpp: disable parent button in /
 
-	* kfiledialog.cpp: fixed layout of mkdir dialog
+	* tdefiledialog.cpp: fixed layout of mkdir dialog
 
 	* kdir.cpp: use currentDir instead of homeDir as default
 
-	* kfiledialog.cpp: added member acceptOnlyExisting and set it 
+	* tdefiledialog.cpp: added member acceptOnlyExisting and set it 
 	for now to always false. I guess, we need an extra parameter for this
 	
-	* kfiledialog.cpp: changed dirList and fileList to fix the 
+	* tdefiledialog.cpp: changed dirList and fileList to fix the 
 	focus handling
 	
-	* kfileinfolistwidget.cpp: added focus handling
+	* tdefileinfolistwidget.cpp: added focus handling
 
-	* kfileinfolistwidget.cpp: added keyevent handling to handle 
+	* tdefileinfolistwidget.cpp: added keyevent handling to handle 
 	cursor and enter 
 
-	* kfiledialog.cpp: changed the filter edit to a QLineEdit, since 
+	* tdefiledialog.cpp: changed the filter edit to a QLineEdit, since 
 	we don't need the completion, but the tabing for focus changes
 	
 Mon Mar 16 11:36:07 1998 Daniel Grana <grana@ie.iwi.unibe.ch>
@@ -636,8 +636,8 @@ Thu Mar 12 09:32:06 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 
 Thu Mar 12 00:36:05 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: made a library out of the file selector
-	* kfiledialog.cpp: added an extra parameter acceptURLs to seperate
+	* tdefiledialog.cpp: made a library out of the file selector
+	* tdefiledialog.cpp: added an extra parameter acceptURLs to seperate
 	between getOpenFileName and getOpenFileURL
 
 Sun Feb 15 23:13:47 1998 Richard Moore <rich@kde.org>
@@ -650,28 +650,28 @@ Sun Feb 15 23:13:47 1998 Richard Moore <rich@kde.org>
 
 Thu Feb 12 17:27:51 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfileinfo.cpp: added determination of group and other things to 
-	be display the correct values in the kfileinfolistwidget
+	* tdefileinfo.cpp: added determination of group and other things to 
+	be display the correct values in the tdefileinfolistwidget
 
 Thu Feb 12 16:01:44 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: removed the #ifdef code. Now the combo box for
+	* tdefiledialog.cpp: removed the #ifdef code. Now the combo box for
 	the path is the only option
 
 Tue Feb 10 01:09:16 1998  Richard Moore <rich@kde.org>
 
 	* Added details widget - this is currently selected by a config
 	file entry, but it there should be a toolbar button. Many changes
-	to kfiledialog to allow the switch (need an abstract fileview class).
+	to tdefiledialog to allow the switch (need an abstract fileview class).
 
 Fri Feb  6 18:08:14 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: replaced the location lineedit with an combo
+	* tdefiledialog.cpp: replaced the location lineedit with an combo
 	box. Currently configurable with a compiler define. 
 
 Fri Feb  6 17:07:26 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: fixed the en- and decoding of URLs. Now it's
+	* tdefiledialog.cpp: fixed the en- and decoding of URLs. Now it's
 	possible to move into directories called "sdasd#sdsd" for example
 
 Sat Jan 24 17:18:10 1998  Mario Weilguni  <mweilguni@sime.com>
@@ -682,37 +682,37 @@ Sat Jan 24 17:18:10 1998  Mario Weilguni  <mweilguni@sime.com>
 
 Tue Jan 20 00:51:55 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: some fixes to make kfm support more robust
+	* tdefiledialog.cpp: some fixes to make kfm support more robust
 
 Mon Jan 19 01:10:11 1998  Stephan Kulow  <coolo@kde.org>
 
 	* kdir.cpp: re-added ftp support 
 
-	* kfiledialog.cpp: take care of the case, when the user enters a
+	* tdefiledialog.cpp: take care of the case, when the user enters a
 	complete filename
 
 	* kdir.cpp: added isReadable() to indicate, that the dir is not
 	correct
 	
-	* kfiledialog.cpp: played a little bit with the geometry management
+	* tdefiledialog.cpp: played a little bit with the geometry management
 
 
 Sun Jan 18 15:00:06 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: - back/forward work now as expected
+	* tdefiledialog.cpp: - back/forward work now as expected
 	  - show the correct filter
 	  - the combo box works now as expected
 
 	* kdir.cpp: check if the directory is correct (for local
 	files). If not, go back to the old value
 
-	* kfiledialog.cpp: - disable parent button, when in root
+	* tdefiledialog.cpp: - disable parent button, when in root
 	  - treat the case, that the URL ends with "/"
 	  - strip white spaces out of the location text
 
-	* kfileinfo.cpp: don't insert broken links
+	* tdefileinfo.cpp: don't insert broken links
 
-	* kfiledialog.cpp: just set the dir, if it's different
+	* tdefiledialog.cpp: just set the dir, if it's different
 	from the already set one
 
 Sun Jan 18 11:53:32 1998  Mario Weilguni  <mweilguni@sime.com>
diff --git a/kio/kfile/Makefile.am b/tdeio/tdefile/Makefile.am
index 1951f30c0..ab8561e7c 100644
--- a/kio/kfile/Makefile.am
+++ b/tdeio/tdefile/Makefile.am
@@ -18,47 +18,47 @@
 
 
 INCLUDES= -I$(srcdir)/../libltdl/ -I$(top_srcdir) -I$(top_srcdir)/tdefx \
-    -I$(top_builddir)/kio/kio -I$(top_srcdir)/kio/bookmarks $(all_includes) $(LIBART_CFLAGS)
+    -I$(top_builddir)/tdeio/tdeio -I$(top_srcdir)/tdeio/bookmarks $(all_includes) $(LIBART_CFLAGS)
 
-noinst_LTLIBRARIES  = libkfile.la
+noinst_LTLIBRARIES  = libtdefile.la
 
 METASOURCES = AUTO
 
 #SUBDIRS = . acl_prop_page
 
-include_HEADERS = kfiledialog.h kencodingfiledialog.h\
-	kdiroperator.h kfileview.h kfilefiltercombo.h \
-	kfiledetailview.h kcombiview.h kdiskfreesp.h \
-	kfileiconview.h krecentdocument.h \
-	kurlrequester.h kfilepreview.h kfile.h \
+include_HEADERS = tdefiledialog.h kencodingfiledialog.h\
+	kdiroperator.h tdefileview.h tdefilefiltercombo.h \
+	tdefiledetailview.h kcombiview.h kdiskfreesp.h \
+	tdefileiconview.h krecentdocument.h \
+	kurlrequester.h tdefilepreview.h tdefile.h \
 	kurlcombobox.h kurlrequesterdlg.h kopenwith.h kpropsdlg.h \
-	kicondialog.h kdirsize.h kpreviewwidgetbase.h kimagefilepreview.h kfilesharedlg.h \
-	kfiletreeview.h kfiletreeviewitem.h kfiletreebranch.h \
+	kicondialog.h kdirsize.h kpreviewwidgetbase.h kimagefilepreview.h tdefilesharedlg.h \
+	tdefiletreeview.h tdefiletreeviewitem.h tdefiletreebranch.h \
 	kdirselectdialog.h kurlbar.h kpropertiesdialog.h knotifydialog.h \
 	kcustommenueditor.h knotifywidgetbase.h
 
-noinst_HEADERS = config-kfile.h krecentdirs.h kmetaprops.h \
-	kfilebookmarkhandler.h kfilemetainfowidget.h kopenwith_p.h \
-	kfilespeedbar.h kpreviewprops.h kacleditwidget.h kacleditwidget_p.h images.h
+noinst_HEADERS = config-tdefile.h krecentdirs.h kmetaprops.h \
+	tdefilebookmarkhandler.h tdefilemetainfowidget.h kopenwith_p.h \
+	tdefilespeedbar.h kpreviewprops.h kacleditwidget.h kacleditwidget_p.h images.h
 
-libkfile_la_SOURCES = \
-	kfilefiltercombo.cpp \
-	kfileview.cpp kfileiconview.cpp \
-	krecentdocument.cpp kfiledialog.cpp kdiroperator.cpp \
-	kfiledetailview.cpp kcombiview.cpp kurlrequester.cpp \
-	kfilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp \
+libtdefile_la_SOURCES = \
+	tdefilefiltercombo.cpp \
+	tdefileview.cpp tdefileiconview.cpp \
+	krecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp \
+	tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp \
+	tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp \
 	kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp kdirsize.cpp \
-	krecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp kfilesharedlg.cpp \
+	krecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp tdefilesharedlg.cpp \
 	kurlbar.cpp kmetaprops.cpp kpreviewprops.cpp \
-	kfiletreeview.cpp kfiletreeviewitem.cpp kfiletreebranch.cpp \
-	kdirselectdialog.cpp kfilebookmarkhandler.cpp \
-	kfilemetainfowidget.cpp kcustommenueditor.cpp knotifywidgetbase.ui \
-	knotifydialog.cpp kfilespeedbar.cpp kpreviewwidgetbase.cpp \
-	kfilemetapreview.cpp kpropertiesdesktopbase.ui \
+	tdefiletreeview.cpp tdefiletreeviewitem.cpp tdefiletreebranch.cpp \
+	kdirselectdialog.cpp tdefilebookmarkhandler.cpp \
+	tdefilemetainfowidget.cpp kcustommenueditor.cpp knotifywidgetbase.ui \
+	knotifydialog.cpp tdefilespeedbar.cpp kpreviewwidgetbase.cpp \
+	tdefilemetapreview.cpp kpropertiesdesktopbase.ui \
 	kpropertiesdesktopadvbase.ui kpropertiesmimetypebase.ui \
 	kencodingfiledialog.cpp kacleditwidget.cpp
 
-libkfile_la_COMPILE_FIRST = $(srcdir)/../kio/kdirnotify_stub.h
+libtdefile_la_COMPILE_FIRST = $(srcdir)/../tdeio/kdirnotify_stub.h
 
 EXTRA_DIST = NOTES
 
@@ -69,10 +69,10 @@ servicetypedir = $(kde_servicetypesdir)
 
 
 #Can't be a module, we need to link to it for readConfig
-#kde_module_LTLIBRARIES = libkfileshare.la
-#libkfileshare_la_SOURCES = kfileshare.cpp
-#libkfileshare_la_LIBADD = libkfile.la
-#libkfileshare_la_LDFLAGS = -module $(KDE_PLUGIN)
-#kde_services_DATA = kfilesharepropsplugin.desktop
+#kde_module_LTLIBRARIES = libtdefileshare.la
+#libtdefileshare_la_SOURCES = tdefileshare.cpp
+#libtdefileshare_la_LIBADD = libtdefile.la
+#libtdefileshare_la_LDFLAGS = -module $(KDE_PLUGIN)
+#kde_services_DATA = tdefilesharepropsplugin.desktop
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kio/kfile/NOTES b/tdeio/tdefile/NOTES
index c3fb6fbcb..ad99065be 100644
--- a/kio/kfile/NOTES
+++ b/tdeio/tdefile/NOTES
@@ -1,9 +1,9 @@
 Rewrite
 =======
 
-Here is the result of a long discussion between the kfile developers
+Here is the result of a long discussion between the tdefile developers
 (Carsten) and the konqueror developers (Simon and David), about the plans
-for more integration between kfile and konqueror. 16/08/2000.
+for more integration between tdefile and konqueror. 16/08/2000.
 
 
 
@@ -31,12 +31,12 @@ for more integration between kfile and konqueror. 16/08/2000.
     given KFileItem. This will help for e.g. deleteItems and refreshItems.
 (5) KFileListView holds a QPtrDict to find the QListViewItem for a
     KFileItem.  It implements different modes if we want the tree view in
-    kfile ?
+    tdefile ?
 
 
     KFileChooserWidget
 
-This (base) class is the container widget that can contain any kfileview and
+This (base) class is the container widget that can contain any tdefileview and
 switch between them. It is embeddable into an application that wants a widget
 for choosing a file or directory. Features listing, selecting, popupmenu for
 switching modes, and a virtual createView( viewmode ) method, which
@@ -69,7 +69,7 @@ KFileIconView, and the line-up-icons algorithm, etc.
   KonqFileListView
 
 Inherits KFileListView to add more stuff if needed. The mc-like text view
-could be implemented here as well, unless we want it in kfile. Same for the
+could be implemented here as well, unless we want it in tdefile. Same for the
 tree view.
 
   KonqFileManagerWidget
diff --git a/kio/kfile/TODO b/tdeio/tdefile/TODO
index b7bf74ea5..b7bf74ea5 100644
--- a/kio/kfile/TODO
+++ b/tdeio/tdefile/TODO
diff --git a/kio/kfile/config-kfile.h b/tdeio/tdefile/config-tdefile.h
index 8715ed273..26a9ddb55 100644
--- a/kio/kfile/config-kfile.h
+++ b/tdeio/tdefile/config-tdefile.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG_KFILE_H
 #define CONFIG_KFILE_H
 
-const int kfile_area = 250;
+const int tdefile_area = 250;
 
 #define DefaultViewStyle TQString::fromLatin1("SimpleView")
 #define DefaultPannerPosition 40
diff --git a/kio/kfile/images.h b/tdeio/tdefile/images.h
index f544e2f0a..f544e2f0a 100644
--- a/kio/kfile/images.h
+++ b/tdeio/tdefile/images.h
diff --git a/kio/kfile/kacleditwidget.cpp b/tdeio/tdefile/kacleditwidget.cpp
index 7f253f8c5..94ee0d4c4 100644
--- a/kio/kfile/kacleditwidget.cpp
+++ b/tdeio/tdefile/kacleditwidget.cpp
@@ -39,7 +39,7 @@
 #include <tqheader.h>
 
 #include <klocale.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kdialogbase.h>
diff --git a/kio/kfile/kacleditwidget.h b/tdeio/tdefile/kacleditwidget.h
index d0f30f60a..c51cb94fc 100644
--- a/kio/kfile/kacleditwidget.h
+++ b/tdeio/tdefile/kacleditwidget.h
@@ -32,7 +32,7 @@
 
 #include <klistview.h>
 #include <kacl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 class KACLListViewItem;
 class KACLListView;
diff --git a/kio/kfile/kacleditwidget_p.h b/tdeio/tdefile/kacleditwidget_p.h
index 166725638..dc7e4c811 100644
--- a/kio/kfile/kacleditwidget_p.h
+++ b/tdeio/tdefile/kacleditwidget_p.h
@@ -32,7 +32,7 @@
 #include <klistview.h>
 #include <sys/acl.h>
 #include <kacl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdialogbase.h>
 #include <tqpixmap.h>
 #include <tqcombobox.h>
diff --git a/kio/kfile/kcombiview.cpp b/tdeio/tdefile/kcombiview.cpp
index 3f199fb92..bc3d43384 100644
--- a/kio/kfile/kcombiview.cpp
+++ b/tdeio/tdefile/kcombiview.cpp
@@ -22,18 +22,18 @@
 
 #include <assert.h>
 
-#include "kfileitem.h"
+#include "tdefileitem.h"
 #include "kcombiview.h"
-#include "kfileiconview.h"
-#include "kfiledetailview.h"
-#include "config-kfile.h"
+#include "tdefileiconview.h"
+#include "tdefiledetailview.h"
+#include "config-tdefile.h"
 
 #include <tqevent.h>
 
 #include <tqdir.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 
diff --git a/kio/kfile/kcombiview.h b/tdeio/tdefile/kcombiview.h
index 5d56b8257..8da3da3fb 100644
--- a/kio/kfile/kcombiview.h
+++ b/tdeio/tdefile/kcombiview.h
@@ -25,8 +25,8 @@
 #include <tqsplitter.h>
 #include <klocale.h>
 
-#include <kfile.h>
-#include <kfileview.h>
+#include <tdefile.h>
+#include <tdefileview.h>
 
 class KFileIconView;
 class TQEvent;
diff --git a/kio/kfile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp
index 2049860d1..48c911e30 100644
--- a/kio/kfile/kcustommenueditor.cpp
+++ b/tdeio/tdefile/kcustommenueditor.cpp
@@ -30,7 +30,7 @@
 #include <klistview.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kopenwith.h>
 
 #include "kcustommenueditor.h"
diff --git a/kio/kfile/kcustommenueditor.h b/tdeio/tdefile/kcustommenueditor.h
index 108e9c477..108e9c477 100644
--- a/kio/kfile/kcustommenueditor.h
+++ b/tdeio/tdefile/kcustommenueditor.h
diff --git a/kio/kfile/kdiroperator.cpp b/tdeio/tdefile/kdiroperator.cpp
index 1b7e11356..ea3183f78 100644
--- a/kio/kfile/kdiroperator.cpp
+++ b/tdeio/tdefile/kdiroperator.cpp
@@ -43,25 +43,25 @@
 #include <kpopupmenu.h>
 #include <kprogress.h>
 #include <kstdaction.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
-#include <kio/previewjob.h>
-#include <kio/renamedlg.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/previewjob.h>
+#include <tdeio/renamedlg.h>
 #include <kpropertiesdialog.h>
 #include <kservicetypefactory.h>
 #include <kstdaccel.h>
 #include <kde_file.h>
 
-#include "config-kfile.h"
+#include "config-tdefile.h"
 #include "kcombiview.h"
 #include "kdiroperator.h"
-#include "kfiledetailview.h"
-#include "kfileiconview.h"
-#include "kfilepreview.h"
-#include "kfileview.h"
-#include "kfileitem.h"
-#include "kfilemetapreview.h"
+#include "tdefiledetailview.h"
+#include "tdefileiconview.h"
+#include "tdefilepreview.h"
+#include "tdefileview.h"
+#include "tdefileitem.h"
+#include "tdefilemetapreview.h"
 
 
 template class TQPtrStack<KURL>;
@@ -630,7 +630,7 @@ void KDirOperator::checkPath(const TQString &, bool /*takeFiles*/) // SLOT
         accept();
     }
 #endif
-    kdDebug(kfile_area) << "TODO KDirOperator::checkPath()" << endl;
+    kdDebug(tdefile_area) << "TODO KDirOperator::checkPath()" << endl;
 }
 
 void KDirOperator::setURL(const KURL& _newurl, bool clearforward)
@@ -1122,7 +1122,7 @@ void KDirOperator::setDirLister( KDirLister *lister )
 
     TQWidget* mainWidget = topLevelWidget();
     dir->setMainWindow (mainWidget);
-    kdDebug (kfile_area) << "mainWidget=" << mainWidget << endl;
+    kdDebug (tdefile_area) << "mainWidget=" << mainWidget << endl;
 
     connect( dir, TQT_SIGNAL( percent( int )),
              TQT_SLOT( slotProgress( int ) ));
diff --git a/kio/kfile/kdiroperator.h b/tdeio/tdefile/kdiroperator.h
index 3dbd42759..418bb20c8 100644
--- a/kio/kfile/kdiroperator.h
+++ b/tdeio/tdefile/kdiroperator.h
@@ -27,9 +27,9 @@
 #include <kaction.h>
 #include <kcompletion.h>
 #include <kdirlister.h>
-#include <kfileview.h>
-#include <kfileitem.h>
-#include <kfile.h>
+#include <tdefileview.h>
+#include <tdefileitem.h>
+#include <tdefile.h>
 
 class TQPopupMenu;
 class TQTimer;
diff --git a/kio/kfile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp
index 48dd3a2e4..6a13920fd 100644
--- a/kio/kfile/kdirselectdialog.cpp
+++ b/tdeio/tdefile/kdirselectdialog.cpp
@@ -26,9 +26,9 @@
 #include <kactionclasses.h>
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
-#include <kfilespeedbar.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
+#include <tdefilespeedbar.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klocale.h>
@@ -39,11 +39,11 @@
 #include <kurlcompletion.h>
 #include <kurlpixmapprovider.h>
 #include <kinputdialog.h>
-#include <kio/netaccess.h>
-#include <kio/renamedlg.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/renamedlg.h>
 #include <kmessagebox.h>
 
-#include "kfiletreeview.h"
+#include "tdefiletreeview.h"
 #include "kdirselectdialog.h"
 
 // ### add mutator for treeview!
diff --git a/kio/kfile/kdirselectdialog.h b/tdeio/tdefile/kdirselectdialog.h
index 746064c68..746064c68 100644
--- a/kio/kfile/kdirselectdialog.h
+++ b/tdeio/tdefile/kdirselectdialog.h
diff --git a/kio/kfile/kdirsize.cpp b/tdeio/tdefile/kdirsize.cpp
index 14936679a..c2ea4079a 100644
--- a/kio/kfile/kdirsize.cpp
+++ b/tdeio/tdefile/kdirsize.cpp
@@ -22,7 +22,7 @@
 #include <kglobal.h>
 #include <tqapplication.h>
 #include <tqtimer.h>
-#include <config-kfile.h>
+#include <config-tdefile.h>
 
 using namespace TDEIO;
 
@@ -48,7 +48,7 @@ void KDirSize::processList()
 	{
             if ( item->isDir() )
             {
-                kdDebug(kfile_area) << "KDirSize::processList dir -> listing" << endl;
+                kdDebug(tdefile_area) << "KDirSize::processList dir -> listing" << endl;
                 KURL url = item->url();
                 startNextJob( url );
                 return; // we'll come back later, when this one's finished
@@ -57,11 +57,11 @@ void KDirSize::processList()
             {
                 m_totalSize += item->size();
 // no long long with kdDebug()
-//            kdDebug(kfile_area) << "KDirSize::processList file -> " << m_totalSize << endl;
+//            kdDebug(tdefile_area) << "KDirSize::processList file -> " << m_totalSize << endl;
             }
 	}
     }
-    kdDebug(kfile_area) << "KDirSize::processList finished" << endl;
+    kdDebug(tdefile_area) << "KDirSize::processList finished" << endl;
     if ( !m_bAsync )
         tqApp->exit_loop();
     emitResult();
@@ -117,7 +117,7 @@ void KDirSize::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList & list )
               m_totalFiles++;
             else
               m_totalSubdirs++;
-            //kdDebug(kfile_area) << name << ":" << size << endl;
+            //kdDebug(tdefile_area) << name << ":" << size << endl;
         }
     }
 }
@@ -146,7 +146,7 @@ TDEIO::filesize_t KDirSize::dirSize( const KURL & directory )
 
 void KDirSize::slotResult( TDEIO::Job * job )
 {
-    kdDebug(kfile_area) << " KDirSize::slotResult( TDEIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl;
+    kdDebug(tdefile_area) << " KDirSize::slotResult( TDEIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl;
     if ( !m_lstItems.isEmpty() )
     {
         subjobs.remove(job); // Remove job, but don't kill this job.
diff --git a/kio/kfile/kdirsize.h b/tdeio/tdefile/kdirsize.h
index b0f2c8fc2..210080950 100644
--- a/kio/kfile/kdirsize.h
+++ b/tdeio/tdefile/kdirsize.h
@@ -20,8 +20,8 @@
 #ifndef __KDIRSIZE_H
 #define __KDIRSIZE_H
 
-#include <kio/job.h>
-#include <kfileitem.h>
+#include <tdeio/job.h>
+#include <tdefileitem.h>
 
 /**
  * Computes a directory size (similar to "du", but doesn't give the same results
diff --git a/kio/kfile/kdiskfreesp.cpp b/tdeio/tdefile/kdiskfreesp.cpp
index 18245bdcd..9a6959fdd 100644
--- a/kio/kfile/kdiskfreesp.cpp
+++ b/tdeio/tdefile/kdiskfreesp.cpp
@@ -28,8 +28,8 @@
 
 #include <kdebug.h>
 #include <kprocess.h>
-#include <kio/global.h>
-#include <config-kfile.h>
+#include <tdeio/global.h>
+#include <config-tdefile.h>
 
 #include "kdiskfreesp.moc"
 
@@ -107,21 +107,21 @@ void KDiskFreeSp::dfDone()
     s=t.readLine();
     s=s.simplifyWhiteSpace();
     if ( !s.isEmpty() ) {
-      //kdDebug(kfile_area) << "GOT: [" << s << "]" << endl;
+      //kdDebug(tdefile_area) << "GOT: [" << s << "]" << endl;
 
       if (s.find(BLANK)<0)      // devicename was too long, rest in next line
 	if ( !t.eof() ) {       // just appends the next line
             v=t.readLine();
             s=s.append(v);
             s=s.simplifyWhiteSpace();
-            //kdDebug(kfile_area) << "SPECIAL GOT: [" << s << "]" << endl;
+            //kdDebug(tdefile_area) << "SPECIAL GOT: [" << s << "]" << endl;
 	 }//if silly linefeed
 
-      //kdDebug(kfile_area) << "[" << s << "]" << endl;
+      //kdDebug(tdefile_area) << "[" << s << "]" << endl;
 
       //TQString deviceName = s.left(s.find(BLANK));
       s=s.remove(0,s.find(BLANK)+1 );
-      //kdDebug(kfile_area) << "    DeviceName:    [" << deviceName << "]" << endl;
+      //kdDebug(tdefile_area) << "    DeviceName:    [" << deviceName << "]" << endl;
 
       if (!NO_FS_TYPE)
           s=s.remove(0,s.find(BLANK)+1 ); // eat fs type
@@ -129,26 +129,26 @@ void KDiskFreeSp::dfDone()
       u=s.left(s.find(BLANK));
       unsigned long kBSize = u.toULong();
       s=s.remove(0,s.find(BLANK)+1 );
-      //kdDebug(kfile_area) << "    Size:       [" << kBSize << "]" << endl;
+      //kdDebug(tdefile_area) << "    Size:       [" << kBSize << "]" << endl;
 
       u=s.left(s.find(BLANK));
       unsigned long kBUsed = u.toULong();
       s=s.remove(0,s.find(BLANK)+1 );
-      //kdDebug(kfile_area) << "    Used:       [" << kBUsed << "]" << endl;
+      //kdDebug(tdefile_area) << "    Used:       [" << kBUsed << "]" << endl;
 
       u=s.left(s.find(BLANK));
       unsigned long kBAvail = u.toULong();
       s=s.remove(0,s.find(BLANK)+1 );
-      //kdDebug(kfile_area) << "    Avail:       [" << kBAvail << "]" << endl;
+      //kdDebug(tdefile_area) << "    Avail:       [" << kBAvail << "]" << endl;
 
 
       s=s.remove(0,s.find(BLANK)+1 );  // delete the capacity 94%
       TQString mountPoint = s.stripWhiteSpace();
-      //kdDebug(kfile_area) << "    MountPoint:       [" << mountPoint << "]" << endl;
+      //kdDebug(tdefile_area) << "    MountPoint:       [" << mountPoint << "]" << endl;
 
       if ( mountPoint == m_mountPoint )
       {
-        //kdDebug(kfile_area) << "Found mount point. Emitting" << endl;
+        //kdDebug(tdefile_area) << "Found mount point. Emitting" << endl;
         emit foundMountPoint( mountPoint, kBSize, kBUsed, kBAvail );
         emit foundMountPoint( kBSize, kBUsed, kBAvail, mountPoint ); // sic!
       }
diff --git a/kio/kfile/kdiskfreesp.h b/tdeio/tdefile/kdiskfreesp.h
index 5ffa47d9a..5ffa47d9a 100644
--- a/kio/kfile/kdiskfreesp.h
+++ b/tdeio/tdefile/kdiskfreesp.h
diff --git a/kio/kfile/kencodingfiledialog.cpp b/tdeio/tdefile/kencodingfiledialog.cpp
index 183023cf5..b8c90f6ff 100644
--- a/kio/kfile/kencodingfiledialog.cpp
+++ b/tdeio/tdefile/kencodingfiledialog.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "config-kfile.h"
+#include "config-tdefile.h"
 
 #include "kencodingfiledialog.h"
 #include <kcombobox.h>
diff --git a/kio/kfile/kencodingfiledialog.h b/tdeio/tdefile/kencodingfiledialog.h
index 95daca6ce..8659122fb 100644
--- a/kio/kfile/kencodingfiledialog.h
+++ b/tdeio/tdefile/kencodingfiledialog.h
@@ -22,7 +22,7 @@
 #ifndef __KENCODINGFILEDIALOG_H__
 #define __KENCODINGFILEDIALOG_H__
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 struct KEncodingFileDialogPrivate;
 
diff --git a/kio/kfile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp
index dfbf47d0d..da8745507 100644
--- a/kio/kfile/kicondialog.cpp
+++ b/tdeio/tdefile/kicondialog.cpp
@@ -1,6 +1,6 @@
 /* vi: ts=8 sts=4 sw=4
  *
- * This file is part of the KDE project, module kfile.
+ * This file is part of the KDE project, module tdefile.
  * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
  *           (C) 2000 Kurt Granroth <granroth@kde.org>
  *           (C) 1997 Christoph Neerfeld <chris@kde.org>
@@ -26,7 +26,7 @@
 #include <kiconloader.h>
 #include <kprogress.h>
 #include <kiconview.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kimagefilepreview.h>
 
 #include <tqlayout.h>
diff --git a/kio/kfile/kicondialog.h b/tdeio/tdefile/kicondialog.h
index 30d9f1579..d7cb48f1c 100644
--- a/kio/kfile/kicondialog.h
+++ b/tdeio/tdefile/kicondialog.h
@@ -1,6 +1,6 @@
 /* vi: ts=8 sts=4 sw=4
  *
- * This file is part of the KDE project, module kfile.
+ * This file is part of the KDE project, module tdefile.
  * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
  *           (C) 2000 Kurt Granroth <granroth@kde.org>
  *           (C) 1997 Christoph Neerfeld <chris@kde.org>
diff --git a/kio/kfile/kimagefilepreview.cpp b/tdeio/tdefile/kimagefilepreview.cpp
index 0cc0ef2a7..f499f4580 100644
--- a/kio/kfile/kimagefilepreview.cpp
+++ b/tdeio/tdefile/kimagefilepreview.cpp
@@ -15,19 +15,19 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kfiledialog.h>
-#include <kfileitem.h>
-#include <kio/previewjob.h>
+#include <tdefiledialog.h>
+#include <tdefileitem.h>
+#include <tdeio/previewjob.h>
 
 #include "kimagefilepreview.h"
-#include "config-kfile.h"
+#include "config-tdefile.h"
 
 /**** KImageFilePreview ****/
 
diff --git a/kio/kfile/kimagefilepreview.h b/tdeio/tdefile/kimagefilepreview.h
index 0604e08f0..0604e08f0 100644
--- a/kio/kfile/kimagefilepreview.h
+++ b/tdeio/tdefile/kimagefilepreview.h
diff --git a/kio/kfile/kmetaprops.cpp b/tdeio/tdefile/kmetaprops.cpp
index c349693e5..ce6201177 100644
--- a/kio/kfile/kmetaprops.cpp
+++ b/tdeio/tdefile/kmetaprops.cpp
@@ -21,8 +21,8 @@
 #include "kmetaprops.h"
 
 #include <kdebug.h>
-#include <kfilemetainfowidget.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfowidget.h>
+#include <tdefilemetainfo.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
diff --git a/kio/kfile/kmetaprops.h b/tdeio/tdefile/kmetaprops.h
index c842499dd..c842499dd 100644
--- a/kio/kfile/kmetaprops.h
+++ b/tdeio/tdefile/kmetaprops.h
diff --git a/kio/kfile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index 088f9be54..a9639ae3d 100644
--- a/kio/kfile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -22,10 +22,10 @@
 #include <kapplication.h>
 #include <kaudioplayer.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
 #include <klineedit.h>
@@ -35,7 +35,7 @@
 #include <knotifydialog.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
diff --git a/kio/kfile/knotifydialog.h b/tdeio/tdefile/knotifydialog.h
index 9bb3210ea..9bb3210ea 100644
--- a/kio/kfile/knotifydialog.h
+++ b/tdeio/tdefile/knotifydialog.h
diff --git a/kio/kfile/knotifywidgetbase.ui b/tdeio/tdefile/knotifywidgetbase.ui
index d3c3103ff..d3c3103ff 100644
--- a/kio/kfile/knotifywidgetbase.ui
+++ b/tdeio/tdefile/knotifywidgetbase.ui
diff --git a/kio/kfile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp
index 691487730..691487730 100644
--- a/kio/kfile/kopenwith.cpp
+++ b/tdeio/tdefile/kopenwith.cpp
diff --git a/kio/kfile/kopenwith.h b/tdeio/tdefile/kopenwith.h
index 90c43ceb1..90c43ceb1 100644
--- a/kio/kfile/kopenwith.h
+++ b/tdeio/tdefile/kopenwith.h
diff --git a/kio/kfile/kopenwith_p.h b/tdeio/tdefile/kopenwith_p.h
index 8231da27d..8231da27d 100644
--- a/kio/kfile/kopenwith_p.h
+++ b/tdeio/tdefile/kopenwith_p.h
diff --git a/kio/kfile/kpreviewprops.cpp b/tdeio/tdefile/kpreviewprops.cpp
index 3672f4387..a053d5627 100644
--- a/kio/kfile/kpreviewprops.cpp
+++ b/tdeio/tdefile/kpreviewprops.cpp
@@ -21,7 +21,7 @@
 
 #include <tqlayout.h>
 
-#include <kfilemetapreview.h>
+#include <tdefilemetapreview.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 
diff --git a/kio/kfile/kpreviewprops.h b/tdeio/tdefile/kpreviewprops.h
index d934af22a..d934af22a 100644
--- a/kio/kfile/kpreviewprops.h
+++ b/tdeio/tdefile/kpreviewprops.h
diff --git a/kio/kfile/kpreviewwidgetbase.cpp b/tdeio/tdefile/kpreviewwidgetbase.cpp
index 979da919e..979da919e 100644
--- a/kio/kfile/kpreviewwidgetbase.cpp
+++ b/tdeio/tdefile/kpreviewwidgetbase.cpp
diff --git a/kio/kfile/kpreviewwidgetbase.h b/tdeio/tdefile/kpreviewwidgetbase.h
index 3597070ee..3597070ee 100644
--- a/kio/kfile/kpreviewwidgetbase.h
+++ b/tdeio/tdefile/kpreviewwidgetbase.h
diff --git a/kio/kfile/kpropertiesdesktopadvbase.ui b/tdeio/tdefile/kpropertiesdesktopadvbase.ui
index fd8e39781..fd8e39781 100644
--- a/kio/kfile/kpropertiesdesktopadvbase.ui
+++ b/tdeio/tdefile/kpropertiesdesktopadvbase.ui
diff --git a/kio/kfile/kpropertiesdesktopbase.ui b/tdeio/tdefile/kpropertiesdesktopbase.ui
index a0894dc70..a0894dc70 100644
--- a/kio/kfile/kpropertiesdesktopbase.ui
+++ b/tdeio/tdefile/kpropertiesdesktopbase.ui
diff --git a/kio/kfile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index 0b1f6c05b..a76fdc336 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -30,7 +30,7 @@
  *  Henner Zeller <zeller@think.de>
  * some layout management by
  *  Bertrand Leconte <B.Leconte@mail.dotcom.fr>
- * the rest of the layout management, bug fixes, adaptation to libkio,
+ * the rest of the layout management, bug fixes, adaptation to libtdeio,
  * template feature by
  *  David Faure <faure@kde.org>
  * More layout, cleanups, and fixes by
@@ -100,12 +100,12 @@ extern "C" {
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kstandarddirs.h>
-#include <kio/job.h>
-#include <kio/chmodjob.h>
-#include <kio/renamedlg.h>
-#include <kio/netaccess.h>
-#include <kio/kservicetypefactory.h>
-#include <kfiledialog.h>
+#include <tdeio/job.h>
+#include <tdeio/chmodjob.h>
+#include <tdeio/renamedlg.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/kservicetypefactory.h>
+#include <tdefiledialog.h>
 #include <kmimetype.h>
 #include <kmountpoint.h>
 #include <kiconloader.h>
@@ -124,7 +124,7 @@ extern "C" {
 #include <krun.h>
 #include <klistview.h>
 #include <kacl.h>
-#include "kfilesharedlg.h"
+#include "tdefilesharedlg.h"
 
 #include "kpropertiesdesktopbase.h"
 #include "kpropertiesdesktopadvbase.h"
diff --git a/kio/kfile/kpropertiesdialog.h b/tdeio/tdefile/kpropertiesdialog.h
index 3f6d48c6a..db89487a8 100644
--- a/kio/kfile/kpropertiesdialog.h
+++ b/tdeio/tdefile/kpropertiesdialog.h
@@ -33,7 +33,7 @@
 
 #include <kdemacros.h>
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdialogbase.h>
 
 class TQLineEdit;
diff --git a/kio/kfile/kpropertiesmimetypebase.ui b/tdeio/tdefile/kpropertiesmimetypebase.ui
index df7c796da..df7c796da 100644
--- a/kio/kfile/kpropertiesmimetypebase.ui
+++ b/tdeio/tdefile/kpropertiesmimetypebase.ui
diff --git a/kio/kfile/kpropsdlg.h b/tdeio/tdefile/kpropsdlg.h
index 502a346e9..502a346e9 100644
--- a/kio/kfile/kpropsdlg.h
+++ b/tdeio/tdefile/kpropsdlg.h
diff --git a/kio/kfile/kpropsdlgplugin.desktop b/tdeio/tdefile/kpropsdlgplugin.desktop
index f74e3895e..f74e3895e 100644
--- a/kio/kfile/kpropsdlgplugin.desktop
+++ b/tdeio/tdefile/kpropsdlgplugin.desktop
diff --git a/kio/kfile/krecentdirs.cpp b/tdeio/tdefile/krecentdirs.cpp
index 6f4a01f3b..6f4a01f3b 100644
--- a/kio/kfile/krecentdirs.cpp
+++ b/tdeio/tdefile/krecentdirs.cpp
diff --git a/kio/kfile/krecentdirs.h b/tdeio/tdefile/krecentdirs.h
index 774655e51..774655e51 100644
--- a/kio/kfile/krecentdirs.h
+++ b/tdeio/tdefile/krecentdirs.h
diff --git a/kio/kfile/krecentdocument.cpp b/tdeio/tdefile/krecentdocument.cpp
index 1ec4a98c8..1ec4a98c8 100644
--- a/kio/kfile/krecentdocument.cpp
+++ b/tdeio/tdefile/krecentdocument.cpp
diff --git a/kio/kfile/krecentdocument.h b/tdeio/tdefile/krecentdocument.h
index 968559968..968559968 100644
--- a/kio/kfile/krecentdocument.h
+++ b/tdeio/tdefile/krecentdocument.h
diff --git a/kio/kfile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp
index 95f30ee24..e142845e1 100644
--- a/kio/kfile/kurlbar.cpp
+++ b/tdeio/tdefile/kurlbar.cpp
@@ -31,7 +31,7 @@
 #include <tqwhatsthis.h>
 
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kicondialog.h>
@@ -44,8 +44,8 @@
 #include <kstringhandler.h>
 #include <kurldrag.h>
 #include <kurlrequester.h>
-#include <kio/global.h>
-#include <kio/netaccess.h>
+#include <tdeio/global.h>
+#include <tdeio/netaccess.h>
 
 #include "kurlbar.h"
 
diff --git a/kio/kfile/kurlbar.h b/tdeio/tdefile/kurlbar.h
index 32c05ec58..32c05ec58 100644
--- a/kio/kfile/kurlbar.h
+++ b/tdeio/tdefile/kurlbar.h
diff --git a/kio/kfile/kurlcombobox.cpp b/tdeio/tdefile/kurlcombobox.cpp
index e01be4548..e01be4548 100644
--- a/kio/kfile/kurlcombobox.cpp
+++ b/tdeio/tdefile/kurlcombobox.cpp
diff --git a/kio/kfile/kurlcombobox.h b/tdeio/tdefile/kurlcombobox.h
index a1fd9182d..a1fd9182d 100644
--- a/kio/kfile/kurlcombobox.h
+++ b/tdeio/tdefile/kurlcombobox.h
diff --git a/kio/kfile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp
index 99e6e96f0..cca8c0529 100644
--- a/kio/kfile/kurlrequester.cpp
+++ b/tdeio/tdefile/kurlrequester.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kdirselectdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
@@ -205,7 +205,7 @@ void KURLRequester::init()
     if ( !d->combo && !d->edit )
 	d->edit = new KLineEdit( this, "line edit" );
 
-    myButton = new KURLDragPushButton( this, "kfile button");
+    myButton = new KURLDragPushButton( this, "tdefile button");
     TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen"));
     TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
     myButton->setIconSet( iconSet );
diff --git a/kio/kfile/kurlrequester.h b/tdeio/tdefile/kurlrequester.h
index aa2f6894b..55bc0fd83 100644
--- a/kio/kfile/kurlrequester.h
+++ b/tdeio/tdefile/kurlrequester.h
@@ -23,7 +23,7 @@
 #include <tqhbox.h>
 
 #include <keditlistbox.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kpushbutton.h>
 #include <kurl.h>
 
diff --git a/kio/kfile/kurlrequesterdlg.cpp b/tdeio/tdefile/kurlrequesterdlg.cpp
index 19409afdc..7524ea149 100644
--- a/kio/kfile/kurlrequesterdlg.cpp
+++ b/tdeio/tdefile/kurlrequesterdlg.cpp
@@ -27,7 +27,7 @@
 #include <tqtoolbutton.h>
 
 #include <kaccel.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
diff --git a/kio/kfile/kurlrequesterdlg.h b/tdeio/tdefile/kurlrequesterdlg.h
index 07b70d745..07b70d745 100644
--- a/kio/kfile/kurlrequesterdlg.h
+++ b/tdeio/tdefile/kurlrequesterdlg.h
diff --git a/kio/kfile/kfile.h b/tdeio/tdefile/tdefile.h
index 7209a1d25..d4616b642 100644
--- a/kio/kfile/kfile.h
+++ b/tdeio/tdefile/tdefile.h
@@ -24,7 +24,7 @@
 
 /**
  * KFile is a class which provides a namespace for some enumerated
- * values associated with the kfile library.  You will never need to
+ * values associated with the tdefile library.  You will never need to
  * construct a KFile object itself.
  */
 
diff --git a/kio/kfile/kfilebookmarkhandler.cpp b/tdeio/tdefile/tdefilebookmarkhandler.cpp
index f78fe2547..d05a94541 100644
--- a/kio/kfile/kfilebookmarkhandler.cpp
+++ b/tdeio/tdefile/tdefilebookmarkhandler.cpp
@@ -24,8 +24,8 @@
 #include <kpopupmenu.h>
 #include <kstandarddirs.h>
 
-#include "kfiledialog.h"
-#include "kfilebookmarkhandler.h"
+#include "tdefiledialog.h"
+#include "tdefilebookmarkhandler.h"
 
 KFileBookmarkHandler::KFileBookmarkHandler( KFileDialog *dialog )
     : TQObject( dialog, "KFileBookmarkHandler" ),
@@ -34,15 +34,15 @@ KFileBookmarkHandler::KFileBookmarkHandler( KFileDialog *dialog )
 {
     m_menu = new KPopupMenu( dialog, "bookmark menu" );
 
-    TQString file = locate( "data", "kfile/bookmarks.xml" );
+    TQString file = locate( "data", "tdefile/bookmarks.xml" );
     if ( file.isEmpty() )
-        file = locateLocal( "data", "kfile/bookmarks.xml" );
+        file = locateLocal( "data", "tdefile/bookmarks.xml" );
 
     KBookmarkManager *manager = KBookmarkManager::managerForFile( file, false);
 
     // import old bookmarks
     if ( !KStandardDirs::exists( file ) ) {
-        TQString oldFile = locate( "data", "kfile/bookmarks.html" );
+        TQString oldFile = locate( "data", "tdefile/bookmarks.html" );
         if ( !oldFile.isEmpty() )
             importOldBookmarks( oldFile, manager );
     }
@@ -78,4 +78,4 @@ void KFileBookmarkHandler::importOldBookmarks( const TQString& path,
 void KFileBookmarkHandler::virtual_hook( int id, void* data )
 { KBookmarkOwner::virtual_hook( id, data ); }
 
-#include "kfilebookmarkhandler.moc"
+#include "tdefilebookmarkhandler.moc"
diff --git a/kio/kfile/kfilebookmarkhandler.h b/tdeio/tdefile/tdefilebookmarkhandler.h
index 9b615c87e..9b615c87e 100644
--- a/kio/kfile/kfilebookmarkhandler.h
+++ b/tdeio/tdefile/tdefilebookmarkhandler.h
diff --git a/kio/kfile/kfiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp
index da61d0a9f..b989104e8 100644
--- a/kio/kfile/kfiledetailview.cpp
+++ b/tdeio/tdefile/tdefiledetailview.cpp
@@ -26,7 +26,7 @@
 #include <tqpixmap.h>
 
 #include <kapplication.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
@@ -35,8 +35,8 @@
 #include <kdebug.h>
 #include <kurldrag.h>
 
-#include "kfiledetailview.h"
-#include "config-kfile.h"
+#include "tdefiledetailview.h"
+#include "config-tdefile.h"
 
 #define COL_NAME 0
 #define COL_SIZE 1
@@ -683,4 +683,4 @@ void KFileDetailView::virtual_hook( int id, void* data )
 { KListView::virtual_hook( id, data );
   KFileView::virtual_hook( id, data ); }
 
-#include "kfiledetailview.moc"
+#include "tdefiledetailview.moc"
diff --git a/kio/kfile/kfiledetailview.h b/tdeio/tdefile/tdefiledetailview.h
index 37e71720f..114b10dec 100644
--- a/kio/kfile/kfiledetailview.h
+++ b/tdeio/tdefile/tdefiledetailview.h
@@ -28,7 +28,7 @@ class TQKeyEvent;
 #include <klistview.h>
 #include <kmimetyperesolver.h>
 
-#include "kfileview.h"
+#include "tdefileview.h"
 
 /**
  * An item for the listiew, that has a reference to its corresponding
diff --git a/kio/kfile/kfiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index 1538d5dbc..4fb399716 100644
--- a/kio/kfile/kfiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -22,7 +22,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kfiledialog.h"
+#include "tdefiledialog.h"
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -48,16 +48,16 @@
 #include <kcharsets.h>
 #include <kcmdlineargs.h>
 #include <kcompletionbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kimageio.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
-#include <kio/scheduler.h>
-#include <kio/kservicetypefactory.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/kservicetypefactory.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
@@ -76,18 +76,18 @@
 #include <kurlcompletion.h>
 #include <kuser.h>
 
-#include "config-kfile.h"
+#include "config-tdefile.h"
 #include "kpreviewwidgetbase.h"
 
 #include <kdirselectdialog.h>
-#include <kfileview.h>
+#include <tdefileview.h>
 #include <krecentdocument.h>
-#include <kfilefiltercombo.h>
+#include <tdefilefiltercombo.h>
 #include <kdiroperator.h>
 #include <kimagefilepreview.h>
 
-#include <kfilespeedbar.h>
-#include <kfilebookmarkhandler.h>
+#include <tdefilespeedbar.h>
+#include <tdefilebookmarkhandler.h>
 
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
@@ -332,7 +332,7 @@ KURL KFileDialog::getCompleteURL(const TQString &_url)
 // FIXME: check for "existing" flag here?
 void KFileDialog::slotOk()
 {
-    kdDebug(kfile_area) << "slotOK\n";
+    kdDebug(tdefile_area) << "slotOK\n";
 
     // a list of all selected files/directories (if any)
     // can only be used if the user didn't type any filenames/urls himself
@@ -377,7 +377,7 @@ void KFileDialog::slotOk()
 
     bool dirOnly = ops->dirOnlyMode();
 
-    // we can use our kfileitems, no need to parse anything
+    // we can use our tdefileitems, no need to parse anything
     if ( items && !locationEdit->lineEdit()->edited() &&
          !(items->isEmpty() && !dirOnly) ) {
 
@@ -460,7 +460,7 @@ void KFileDialog::slotOk()
     // d->url is a correct URL now
 
     if ( (mode() & KFile::Directory) == KFile::Directory ) {
-        kdDebug(kfile_area) << "Directory" << endl;
+        kdDebug(tdefile_area) << "Directory" << endl;
         bool done = true;
         if ( d->url.isLocalFile() ) {
             if ( locationEdit->currentText().stripWhiteSpace().isEmpty() ) {
@@ -539,7 +539,7 @@ void KFileDialog::slotOk()
 
     if ( (mode() & KFile::Files) == KFile::Files &&
          !locationEdit->currentText().contains( '/' )) {
-        kdDebug(kfile_area) << "Files\n";
+        kdDebug(tdefile_area) << "Files\n";
         KURL::List list = parseSelectedURLs();
         for ( KURL::List::ConstIterator it = list.begin();
               it != list.end(); ++it )
@@ -594,7 +594,7 @@ static bool isDirectory (const TDEIO::UDSEntry &t)
 // don't call accept)
 void KFileDialog::slotStatResult(TDEIO::Job* job)
 {
-    kdDebug(kfile_area) << "slotStatResult" << endl;
+    kdDebug(tdefile_area) << "slotStatResult" << endl;
     TDEIO::StatJob *sJob = static_cast<TDEIO::StatJob *>( job );
 
     if ( !d->statJobs.removeRef( sJob ) ) {
@@ -636,7 +636,7 @@ void KFileDialog::slotStatResult(TDEIO::Job* job)
         return; // ### error message?
     }
 
-    kdDebug(kfile_area) << "filename " << sJob->url().url() << endl;
+    kdDebug(tdefile_area) << "filename " << sJob->url().url() << endl;
 
     if ( count == 0 )
         accept();
@@ -1220,7 +1220,7 @@ void KFileDialog::toolbarCallback(int) // SLOT
 
 void KFileDialog::setSelection(const TQString& url)
 {
-    kdDebug(kfile_area) << "setSelection " << url << endl;
+    kdDebug(tdefile_area) << "setSelection " << url << endl;
 
     if (url.isEmpty()) {
         d->selection = TQString::null;
@@ -1264,7 +1264,7 @@ void KFileDialog::setSelection(const TQString& url)
             // filename must be decoded, or "name with space" would become
             // "name%20with%20space", so we use KURL::fileName()
             filename = u.fileName();
-            kdDebug(kfile_area) << "filename " << filename << endl;
+            kdDebug(tdefile_area) << "filename " << filename << endl;
             d->selection = filename;
             setLocationText( filename );
 
@@ -1856,7 +1856,7 @@ KFileDialog::OperationMode KFileDialog::operationMode() const
 
 void KFileDialog::slotAutoSelectExtClicked()
 {
-    kdDebug (kfile_area) << "slotAutoSelectExtClicked(): "
+    kdDebug (tdefile_area) << "slotAutoSelectExtClicked(): "
                          << d->autoSelectExtCheckBox->isChecked () << endl;
 
     // whether the _user_ wants it on/off
@@ -1869,14 +1869,14 @@ void KFileDialog::slotAutoSelectExtClicked()
 static TQString getExtensionFromPatternList (const TQStringList &patternList)
 {
     TQString ret;
-    kdDebug (kfile_area) << "\tgetExtension " << patternList << endl;
+    kdDebug (tdefile_area) << "\tgetExtension " << patternList << endl;
 
     TQStringList::ConstIterator patternListEnd = patternList.end ();
     for (TQStringList::ConstIterator it = patternList.begin ();
          it != patternListEnd;
          it++)
     {
-        kdDebug (kfile_area) << "\t\ttry: \'" << (*it) << "\'" << endl;
+        kdDebug (tdefile_area) << "\t\ttry: \'" << (*it) << "\'" << endl;
 
         // is this pattern like "*.BMP" rather than useless things like:
         //
@@ -1924,7 +1924,7 @@ void KFileDialog::updateAutoSelectExtension (void)
     // COPYING.txt ...)
     //
 
-    kdDebug (kfile_area) << "Figure out an extension: " << endl;
+    kdDebug (tdefile_area) << "Figure out an extension: " << endl;
     TQString lastExtension = d->extension;
     d->extension = TQString::null;
 
@@ -1942,7 +1942,7 @@ void KFileDialog::updateAutoSelectExtension (void)
             if (filter.find ('/') < 0)
             {
                 d->extension = getExtensionFromPatternList (TQStringList::split (" ", filter)).lower ();
-                kdDebug (kfile_area) << "\tsetFilter-style: pattern ext=\'"
+                kdDebug (tdefile_area) << "\tsetFilter-style: pattern ext=\'"
                                     << d->extension << "\'" << endl;
             }
             // e.g. "text/html"
@@ -1955,7 +1955,7 @@ void KFileDialog::updateAutoSelectExtension (void)
                 if (nativeExtension.at (0) == '.')
                 {
                     d->extension = nativeExtension.lower ();
-                    kdDebug (kfile_area) << "\tsetMimeFilter-style: native ext=\'"
+                    kdDebug (tdefile_area) << "\tsetMimeFilter-style: native ext=\'"
                                          << d->extension << "\'" << endl;
                 }
 
@@ -1963,7 +1963,7 @@ void KFileDialog::updateAutoSelectExtension (void)
                 if (d->extension.isEmpty ())
                 {
                     d->extension = getExtensionFromPatternList (mime->patterns ()).lower ();
-                    kdDebug (kfile_area) << "\tsetMimeFilter-style: pattern ext=\'"
+                    kdDebug (tdefile_area) << "\tsetMimeFilter-style: pattern ext=\'"
                                          << d->extension << "\'" << endl;
                 }
             }
@@ -2056,7 +2056,7 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension)
         return;
 
     KURL url = getCompleteURL (urlStr);
-    kdDebug (kfile_area) << "updateLocationEditExtension (" << url << ")" << endl;
+    kdDebug (tdefile_area) << "updateLocationEditExtension (" << url << ")" << endl;
 
     const int fileNameOffset = urlStr.findRev ('/') + 1;
     TQString fileName = urlStr.mid (fileNameOffset);
@@ -2072,11 +2072,11 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension)
         TDEIO::UDSEntry t;
         if (TDEIO::NetAccess::stat (url, t, topLevelWidget()))
         {
-            kdDebug (kfile_area) << "\tfile exists" << endl;
+            kdDebug (tdefile_area) << "\tfile exists" << endl;
 
             if (isDirectory (t))
             {
-                kdDebug (kfile_area) << "\tisDir - won't alter extension" << endl;
+                kdDebug (tdefile_area) << "\tisDir - won't alter extension" << endl;
                 return;
             }
 
@@ -2134,7 +2134,7 @@ void KFileDialog::appendExtension (KURL &url)
     if (fileName.isEmpty ())
         return;
 
-    kdDebug (kfile_area) << "appendExtension(" << url << ")" << endl;
+    kdDebug (tdefile_area) << "appendExtension(" << url << ")" << endl;
 
     const int len = fileName.length ();
     const int dot = fileName.findRev ('.');
@@ -2150,7 +2150,7 @@ void KFileDialog::appendExtension (KURL &url)
     TDEIO::UDSEntry t;
     if (TDEIO::NetAccess::stat (url, t, topLevelWidget()))
     {
-        kdDebug (kfile_area) << "\tfile exists - won't append extension" << endl;
+        kdDebug (tdefile_area) << "\tfile exists - won't append extension" << endl;
         return;
     }
 
@@ -2167,15 +2167,15 @@ void KFileDialog::appendExtension (KURL &url)
         // and the trailing dot will be removed (or just stop being lazy and
         // turn off this feature so that you can type "README.")
         //
-        kdDebug (kfile_area) << "\tstrip trailing dot" << endl;
+        kdDebug (tdefile_area) << "\tstrip trailing dot" << endl;
         url.setFileName (fileName.left (len - 1));
     }
     // evilmatically append extension :) if the user hasn't specified one
     else if (unspecifiedExtension)
     {
-        kdDebug (kfile_area) << "\tappending extension \'" << d->extension << "\'..." << endl;
+        kdDebug (tdefile_area) << "\tappending extension \'" << d->extension << "\'..." << endl;
         url.setFileName (fileName + d->extension);
-        kdDebug (kfile_area) << "\tsaving as \'" << url << "\'" << endl;
+        kdDebug (tdefile_area) << "\tsaving as \'" << url << "\'" << endl;
     }
 }
 
@@ -2377,4 +2377,4 @@ void KFileDialog::virtual_hook( int id, void* data )
 { KDialogBase::virtual_hook( id, data ); }
 
 
-#include "kfiledialog.moc"
+#include "tdefiledialog.moc"
diff --git a/kio/kfile/kfiledialog.h b/tdeio/tdefile/tdefiledialog.h
index 2f986d351..28b04aff6 100644
--- a/kio/kfile/kfiledialog.h
+++ b/tdeio/tdefile/tdefiledialog.h
@@ -28,10 +28,10 @@
 #include <tqstring.h>
 
 #include <kdialogbase.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kurl.h>
 #include <kmimetype.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 class TQCheckBox;
 class TQHBoxLayout;
@@ -68,7 +68,7 @@ struct KFileDialogPrivate;
  * by subclassing. It uses geometry management to ensure that subclasses
  * can easily add children that will be incorporated into the layout.
  *
- * \image html kfiledialog.png "KDE File Dialog"
+ * \image html tdefiledialog.png "KDE File Dialog"
  *
  * @short A file selection dialog.
  *
@@ -265,11 +265,11 @@ public:
      * shown. Examples:
      *
      * \code
-     * kfile->setFilter("*.cpp|C++ Source Files\n*.h|Header files");
-     * kfile->setFilter("*.cpp");
-     * kfile->setFilter("*.cpp|Sources (*.cpp)");
-     * kfile->setFilter("*.cpp|" + i18n("Sources (*.cpp)"));
-     * kfile->setFilter("*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header files");
+     * tdefile->setFilter("*.cpp|C++ Source Files\n*.h|Header files");
+     * tdefile->setFilter("*.cpp");
+     * tdefile->setFilter("*.cpp|Sources (*.cpp)");
+     * tdefile->setFilter("*.cpp|" + i18n("Sources (*.cpp)"));
+     * tdefile->setFilter("*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header files");
      * \endcode
      *
      * Note: The text to display is not parsed in any way. So, if you
@@ -282,8 +282,8 @@ public:
      * space):
      *
      * \code
-     * kfile->setFilter( "image/png text/html text/plain" );
-     * kfile->setFilter( "*.cue|CUE\\/BIN Files (*.cue)" );
+     * tdefile->setFilter( "image/png text/html text/plain" );
+     * tdefile->setFilter( "*.cue|CUE\\/BIN Files (*.cue)" );
      * \endcode
      *
      * @see filterChanged
@@ -672,7 +672,7 @@ public:
     /**
      * Sets the mode of the dialog.
      *
-     * The mode is defined as (in kfile.h):
+     * The mode is defined as (in tdefile.h):
      * \code
      *    enum Mode {
      *         File         = 1,
@@ -716,7 +716,7 @@ public:
      *      yourAction = new KAction( i18n("Your Action"), 0,
      *                                this, TQT_SLOT( yourSlot() ),
      *                                this, "action name" );
-     *      yourAction->plug( kfileDialog->toolBar() );
+     *      yourAction->plug( tdefileDialog->toolBar() );
      * \endcode
      */
     KToolBar *toolBar() const { return toolbar; }
diff --git a/kio/kfile/kfilefiltercombo.cpp b/tdeio/tdefile/tdefilefiltercombo.cpp
index 12a51db8e..cd7bd54d3 100644
--- a/kio/kfile/kfilefiltercombo.cpp
+++ b/tdeio/tdefile/tdefilefiltercombo.cpp
@@ -20,9 +20,9 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
-#include <config-kfile.h>
+#include <config-tdefile.h>
 
-#include "kfilefiltercombo.h"
+#include "tdefilefiltercombo.h"
 
 class KFileFilterCombo::KFileFilterComboPrivate
 {
@@ -143,7 +143,7 @@ void KFileFilterCombo::setMimeFilter( const TQStringList& types,
             allTypes += ' ';
         }
 
-	kdDebug(kfile_area) << *it << endl;
+	kdDebug(tdefile_area) << *it << endl;
         KMimeType::Ptr type = KMimeType::mimeType( *it );
         filters.append( type->name() );
         if ( m_allTypes )
@@ -200,4 +200,4 @@ TQString KFileFilterCombo::defaultFilter() const
 void KFileFilterCombo::virtual_hook( int id, void* data )
 { KComboBox::virtual_hook( id, data ); }
 
-#include "kfilefiltercombo.moc"
+#include "tdefilefiltercombo.moc"
diff --git a/kio/kfile/kfilefiltercombo.h b/tdeio/tdefile/tdefilefiltercombo.h
index 589376d0c..589376d0c 100644
--- a/kio/kfile/kfilefiltercombo.h
+++ b/tdeio/tdefile/tdefilefiltercombo.h
diff --git a/kio/kfile/kfileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp
index f0ef11bfe..474364042 100644
--- a/kio/kfile/kfileiconview.cpp
+++ b/tdeio/tdefile/tdefileiconview.cpp
@@ -32,14 +32,14 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <klocale.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kiconeffect.h>
 #include <kglobalsettings.h>
 #include <kurldrag.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 
-#include "kfileiconview.h"
-#include "config-kfile.h"
+#include "tdefileiconview.h"
+#include "config-tdefile.h"
 
 #define DEFAULT_PREVIEW_SIZE 60
 #define DEFAULT_SHOW_PREVIEWS false
@@ -940,4 +940,4 @@ void KFileIconView::virtual_hook( int id, void* data )
 { KIconView::virtual_hook( id, data );
   KFileView::virtual_hook( id, data ); }
 
-#include "kfileiconview.moc"
+#include "tdefileiconview.moc"
diff --git a/kio/kfile/kfileiconview.h b/tdeio/tdefile/tdefileiconview.h
index 98afc0a6e..0b7c7877e 100644
--- a/kio/kfile/kfileiconview.h
+++ b/tdeio/tdefile/tdefileiconview.h
@@ -25,9 +25,9 @@
 
 #include <kiconview.h>
 #include <kiconloader.h>
-#include <kfileview.h>
+#include <tdefileview.h>
 #include <kmimetyperesolver.h>
-#include <kfile.h>
+#include <tdefile.h>
 
 class KFileItem;
 class TQWidget;
diff --git a/kio/kfile/kfilemetainfowidget.cpp b/tdeio/tdefile/tdefilemetainfowidget.cpp
index c4df4a15d..dea9ea353 100644
--- a/kio/kfile/kfilemetainfowidget.cpp
+++ b/tdeio/tdefile/tdefilemetainfowidget.cpp
@@ -18,7 +18,7 @@
     $Id$
  */
 
-#include "kfilemetainfowidget.h"
+#include "tdefilemetainfowidget.h"
 
 #include <keditcl.h>
 #include <klocale.h>
@@ -372,4 +372,4 @@ void KFileMetaInfoWidget::slotDateTimeChanged(const TQDateTime& value)
     m_dirty = true;
 }
 
-#include "kfilemetainfowidget.moc"
+#include "tdefilemetainfowidget.moc"
diff --git a/kio/kfile/kfilemetainfowidget.h b/tdeio/tdefile/tdefilemetainfowidget.h
index a42846bea..8f1d2b5b7 100644
--- a/kio/kfile/kfilemetainfowidget.h
+++ b/tdeio/tdefile/tdefilemetainfowidget.h
@@ -22,7 +22,7 @@
 
 #include <tqwidget.h>
 #include <tqvariant.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 /*!
  * A widget to display file meta infos (like id3 for mp3)
diff --git a/kio/kfile/kfilemetapreview.cpp b/tdeio/tdefile/tdefilemetapreview.cpp
index 155e1194c..d587511e4 100644
--- a/kio/kfile/kfilemetapreview.cpp
+++ b/tdeio/tdefile/tdefilemetapreview.cpp
@@ -6,11 +6,11 @@
  * License. See the file "COPYING" for the exact licensing terms.
  */
 
-#include "kfilemetapreview.h"
+#include "tdefilemetapreview.h"
 
 #include <tqlayout.h>
 
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 #include <klibloader.h>
 #include <kimagefilepreview.h>
 #include <kmimetype.h>
@@ -181,16 +181,16 @@ void KFileMetaPreview::clearPreviewProviders()
 // static
 KPreviewWidgetBase * KFileMetaPreview::createAudioPreview( TQWidget *parent )
 {
-    KLibFactory *factory = KLibLoader::self()->factory( "kfileaudiopreview" );
+    KLibFactory *factory = KLibLoader::self()->factory( "tdefileaudiopreview" );
     if ( !factory )
     {
         s_tryAudioPreview = false;
         return 0L;
     }
 
-    return dynamic_cast<KPreviewWidgetBase*>( factory->create( TQT_TQOBJECT(parent), "kfileaudiopreview" ));
+    return dynamic_cast<KPreviewWidgetBase*>( factory->create( TQT_TQOBJECT(parent), "tdefileaudiopreview" ));
 }
 
 void KFileMetaPreview::virtual_hook( int, void* ) {}
 
-#include "kfilemetapreview.moc"
+#include "tdefilemetapreview.moc"
diff --git a/kio/kfile/kfilemetapreview.h b/tdeio/tdefile/tdefilemetapreview.h
index f26cd29b5..f26cd29b5 100644
--- a/kio/kfile/kfilemetapreview.h
+++ b/tdeio/tdefile/tdefilemetapreview.h
diff --git a/kio/kfile/kfilepreview.cpp b/tdeio/tdefile/tdefilepreview.cpp
index 04124570b..4e9365361 100644
--- a/kio/kfile/kfilepreview.cpp
+++ b/tdeio/tdefile/tdefilepreview.cpp
@@ -20,13 +20,13 @@
 */
 
 #include <kaction.h>
-#include <kfilepreview.h>
-#include <kfilepreview.moc>
+#include <tdefilepreview.h>
+#include <tdefilepreview.moc>
 #include <klocale.h>
 
 #include <tqlabel.h>
 
-#include "config-kfile.h"
+#include "config-tdefile.h"
 
 KFilePreview::KFilePreview(KFileView *view, TQWidget *parent, const char *name)
     : TQSplitter(parent, name), KFileView()
diff --git a/kio/kfile/kfilepreview.h b/tdeio/tdefile/tdefilepreview.h
index af6fe13d2..38db862ac 100644
--- a/kio/kfile/kfilepreview.h
+++ b/tdeio/tdefile/tdefilepreview.h
@@ -28,10 +28,10 @@
 #include <tqstring.h>
 
 #include <kurl.h>
-#include <kfileitem.h>
-#include <kfileiconview.h>
-#include <kfiledetailview.h>
-#include <kfile.h>
+#include <tdefileitem.h>
+#include <tdefileiconview.h>
+#include <tdefiledetailview.h>
+#include <tdefile.h>
 
 /*!
  * This KFileView is an empbedded preview for some file types.
diff --git a/kio/kfile/kfilesharedlg.cpp b/tdeio/tdefile/tdefilesharedlg.cpp
index e9b4c2673..8e6f9e650 100644
--- a/kio/kfile/kfilesharedlg.cpp
+++ b/tdeio/tdefile/tdefilesharedlg.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kfilesharedlg.h"
+#include "tdefilesharedlg.h"
 #include <tqvbox.h>
 #include <tqlabel.h>
 #include <tqdir.h>
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <kio/kfileshare.h>
+#include <tdeio/tdefileshare.h>
 #include <kseparator.h>
 #include <tqpushbutton.h>
 #include <kapplication.h>
@@ -237,7 +237,7 @@ void KFileSharePropsPlugin::slotConfigureFileSharing()
     if (d->m_configProc) return;
 
     d->m_configProc = new TDEProcess(this);
-    (*d->m_configProc) << KStandardDirs::findExe("tdesu") << locate("exe", "kcmshell") << "fileshare";
+    (*d->m_configProc) << KStandardDirs::findExe("tdesu") << locate("exe", "tdecmshell") << "fileshare";
     if (!d->m_configProc->start( TDEProcess::NotifyOnExit ))
     {
        delete d->m_configProc;
@@ -317,7 +317,7 @@ TQWidget* KFileSharePropsPlugin::page() const
     return d->m_vBox;
 }
 
-#include "kfilesharedlg.moc"
+#include "tdefilesharedlg.moc"
 
 //TODO: do we need to monitor /etc/security/fileshare.conf ?
 // if the user is added to the 'fileshare' group, we wouldn't be notified
diff --git a/kio/kfile/kfilesharedlg.h b/tdeio/tdefile/tdefilesharedlg.h
index e7998ad66..aa818db64 100644
--- a/kio/kfile/kfilesharedlg.h
+++ b/tdeio/tdefile/tdefilesharedlg.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef kfilesharedlg_h
-#define kfilesharedlg_h
+#ifndef tdefilesharedlg_h
+#define tdefilesharedlg_h
 
 #include <kpropertiesdialog.h>
 class TQVBoxLayout;
diff --git a/kio/kfile/kfilespeedbar.cpp b/tdeio/tdefile/tdefilespeedbar.cpp
index 567d929eb..ca7e19003 100644
--- a/kio/kfile/kfilespeedbar.cpp
+++ b/tdeio/tdefile/tdefilespeedbar.cpp
@@ -16,15 +16,15 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kfilespeedbar.h"
-#include "config-kfile.h"
+#include "tdefilespeedbar.h"
+#include "config-tdefile.h"
 
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqtextcodec.h>
 #include <tqtextstream.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
@@ -144,4 +144,4 @@ TQSize KFileSpeedBar::sizeHint() const
     return sizeHint;
 }
 
-#include "kfilespeedbar.moc"
+#include "tdefilespeedbar.moc"
diff --git a/kio/kfile/kfilespeedbar.h b/tdeio/tdefile/tdefilespeedbar.h
index d1c2a689e..d1c2a689e 100644
--- a/kio/kfile/kfilespeedbar.h
+++ b/tdeio/tdefile/tdefilespeedbar.h
diff --git a/kio/kfile/kfiletreebranch.cpp b/tdeio/tdefile/tdefiletreebranch.cpp
index 352bd875e..f95cb4d47 100644
--- a/kio/kfile/kfiletreebranch.cpp
+++ b/tdeio/tdefile/tdefiletreebranch.cpp
@@ -20,7 +20,7 @@
 
 #include <tqfile.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdebug.h>
 #include <kde_file.h>
 
@@ -28,8 +28,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "kfiletreeviewitem.h"
-#include "kfiletreebranch.h"
+#include "tdefiletreeviewitem.h"
+#include "tdefiletreebranch.h"
 
 
 /* --- KFileTreeViewToplevelItem --- */
@@ -309,7 +309,7 @@ void KFileTreeBranch::slotDeleteItem( KFileItem *it )
     }
     else
     {
-        kdDebug(250) << "Error: kfiletreeviewitem: "<< kfti << endl;
+        kdDebug(250) << "Error: tdefiletreeviewitem: "<< kfti << endl;
     }
 }
 
@@ -524,5 +524,5 @@ bool KFileTreeBranch::populate( const KURL& url,  KFileTreeViewItem *currItem )
 void KFileTreeBranch::virtual_hook( int id, void* data )
 { KDirLister::virtual_hook( id, data ); }
 
-#include "kfiletreebranch.moc"
+#include "tdefiletreebranch.moc"
 
diff --git a/kio/kfile/kfiletreebranch.h b/tdeio/tdefile/tdefiletreebranch.h
index 31e6dcfc0..a8548b10c 100644
--- a/kio/kfile/kfiletreebranch.h
+++ b/tdeio/tdefile/tdefiletreebranch.h
@@ -19,17 +19,17 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef kfile_tree_branch_h
-#define kfile_tree_branch_h
+#ifndef tdefile_tree_branch_h
+#define tdefile_tree_branch_h
 
 #include <tqdict.h>
 #include <tqlistview.h>
 
-#include <kfileitem.h>
-#include <kio/global.h>
+#include <tdefileitem.h>
+#include <tdeio/global.h>
 #include <kdirlister.h>
-#include <kio/job.h>
-#include <kfiletreeviewitem.h>
+#include <tdeio/job.h>
+#include <tdefiletreeviewitem.h>
 
 class KURL;
 class KFileTreeView;
diff --git a/kio/kfile/kfiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp
index 0b8504fd6..480c58ec3 100644
--- a/kio/kfile/kfiletreeview.cpp
+++ b/tdeio/tdefile/tdefiletreeview.cpp
@@ -23,21 +23,21 @@
 #include <kdebug.h>
 #include <kdirnotify_stub.h>
 #include <kglobalsettings.h>
-#include <kfileitem.h>
-#include <kfileview.h>
+#include <tdefileitem.h>
+#include <tdefileview.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <kio/job.h>
-#include <kio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
 
 
-#include "kfiletreeview.h"
-#include "kfiletreebranch.h"
-#include "kfiletreeviewitem.h"
+#include "tdefiletreeview.h"
+#include "tdefiletreebranch.h"
+#include "tdefiletreeviewitem.h"
 
 KFileTreeView::KFileTreeView( TQWidget *parent, const char *name )
     : KListView( parent, name ),
@@ -674,4 +674,4 @@ void KFileTreeViewToolTip::maybeTip( const TQPoint & )
 void KFileTreeView::virtual_hook( int id, void* data )
 { KListView::virtual_hook( id, data ); }
 
-#include "kfiletreeview.moc"
+#include "tdefiletreeview.moc"
diff --git a/kio/kfile/kfiletreeview.h b/tdeio/tdefile/tdefiletreeview.h
index f28f0f01e..11d695288 100644
--- a/kio/kfile/kfiletreeview.h
+++ b/tdeio/tdefile/tdefiletreeview.h
@@ -18,8 +18,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef kfile_tree_view_h
-#define kfile_tree_view_h
+#ifndef tdefile_tree_view_h
+#define tdefile_tree_view_h
 
 #include <tqmap.h>
 #include <tqpoint.h>
@@ -29,9 +29,9 @@
 
 #include <klistview.h>
 #include <kdirnotify.h>
-#include <kio/job.h>
-#include <kfiletreeviewitem.h>
-#include <kfiletreebranch.h>
+#include <tdeio/job.h>
+#include <tdefiletreeviewitem.h>
+#include <tdefiletreebranch.h>
 
 class TQTimer;
 
diff --git a/kio/kfile/kfiletreeviewitem.cpp b/tdeio/tdefile/tdefiletreeviewitem.cpp
index 17e2d9abe..4df2daaa1 100644
--- a/kio/kfile/kfiletreeviewitem.cpp
+++ b/tdeio/tdefile/tdefiletreeviewitem.cpp
@@ -18,10 +18,10 @@
 */
 
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kicontheme.h>
 
-#include "kfiletreeviewitem.h"
+#include "tdefiletreeviewitem.h"
 
 /* --- KFileTreeViewItem --- */
 /*
@@ -30,7 +30,7 @@ KFileTreeViewItem::KFileTreeViewItem( KFileTreeViewItem *parent,
 				      KFileItem* item,
 				      KFileTreeBranch *brnch )
    : KListViewItem( parent ),
-     m_kfileitem( item ),
+     m_tdefileitem( item ),
      m_branch( brnch ),
      m_wasListed(false)
 {
@@ -43,7 +43,7 @@ KFileTreeViewItem::KFileTreeViewItem( KFileTreeView* parent,
 				      KFileItem* item,
 				      KFileTreeBranch *brnch )
    :KListViewItem( (TQListView*)parent ),
-    m_kfileitem(item ),
+    m_tdefileitem(item ),
     m_branch( brnch ),
     m_wasListed(false)
 {
@@ -53,8 +53,8 @@ KFileTreeViewItem::KFileTreeViewItem( KFileTreeView* parent,
 
 KFileTreeViewItem::~KFileTreeViewItem()
 {
-    if ( m_kfileitem )
-        m_kfileitem->removeExtraData( m_branch );
+    if ( m_tdefileitem )
+        m_tdefileitem->removeExtraData( m_branch );
 }
 
 bool KFileTreeViewItem::alreadyListed() const
@@ -69,15 +69,15 @@ void KFileTreeViewItem::setListed( bool wasListed )
 
 KURL KFileTreeViewItem::url() const
 {
-    return m_kfileitem ? m_kfileitem->url() : KURL();
+    return m_tdefileitem ? m_tdefileitem->url() : KURL();
 }
 
 TQString KFileTreeViewItem::path()  const
 {
-    return m_kfileitem ? m_kfileitem->url().path() : TQString::null;
+    return m_tdefileitem ? m_tdefileitem->url().path() : TQString::null;
 }
 
 bool KFileTreeViewItem::isDir() const
 {
-    return m_kfileitem ? m_kfileitem->isDir() : false;
+    return m_tdefileitem ? m_tdefileitem->isDir() : false;
 }
diff --git a/kio/kfile/kfiletreeviewitem.h b/tdeio/tdefile/tdefiletreeviewitem.h
index 0fefc5dc1..8fdb2789c 100644
--- a/kio/kfile/kfiletreeviewitem.h
+++ b/tdeio/tdefile/tdefiletreeviewitem.h
@@ -17,16 +17,16 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef kfile_tree_view_item_h
-#define kfile_tree_view_item_h
+#ifndef tdefile_tree_view_item_h
+#define tdefile_tree_view_item_h
 
 #include <tqptrlist.h>
 #include <klistview.h>
 
-#include <kfileitem.h>
-#include <kio/global.h>
+#include <tdefileitem.h>
+#include <tdeio/global.h>
 #include <kdirlister.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class KURL;
 class KFileTreeView;
@@ -52,7 +52,7 @@ public:
    /**
     * @return the KFileItem the viewitem is representing.
     */
-   KFileItem *fileItem() const         { return m_kfileitem; }
+   KFileItem *fileItem() const         { return m_tdefileitem; }
 
    /**
     * @return the path of the item.
@@ -83,7 +83,7 @@ protected:
 
 private:
 
-   KFileItem *m_kfileitem;
+   KFileItem *m_tdefileitem;
    KFileTreeBranch *m_branch;
    bool  m_wasListed;
    class KFileTreeViewItemPrivate;
diff --git a/kio/kfile/kfileview.cpp b/tdeio/tdefile/tdefileview.cpp
index a62b8aa50..558053cc8 100644
--- a/kio/kfile/kfileview.cpp
+++ b/tdeio/tdefile/tdefileview.cpp
@@ -29,8 +29,8 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 
-#include "config-kfile.h"
-#include "kfileview.h"
+#include "config-tdefile.h"
+#include "tdefileview.h"
 
 #ifdef Unsorted // the "I hate X.h" modus
 #undef Unsorted
@@ -277,7 +277,7 @@ void KFileView::setCurrentItem(const TQString &filename )
         }
     }
 
-    kdDebug(kfile_area) << "setCurrentItem: no match found: " << filename << endl;
+    kdDebug(tdefile_area) << "setCurrentItem: no match found: " << filename << endl;
 }
 
 const KFileItemList * KFileView::items() const
@@ -426,4 +426,4 @@ void KFileView::virtual_hook( int id, void* data)
     }
 }
 
-#include "kfileview.moc"
+#include "tdefileview.moc"
diff --git a/kio/kfile/kfileview.h b/tdeio/tdefile/tdefileview.h
index 7e88fc9d8..8f4918030 100644
--- a/kio/kfile/kfileview.h
+++ b/tdeio/tdefile/tdefileview.h
@@ -27,8 +27,8 @@ class KActionCollection;
 
 #include <tqwidget.h>
 
-#include "kfileitem.h"
-#include "kfile.h"
+#include "tdefileitem.h"
+#include "tdefile.h"
 
 /**
  * internal class to make easier to use signals possible
diff --git a/kio/kfile/tests/Makefile.am b/tdeio/tdefile/tests/Makefile.am
index 9689f7a27..d869f11f5 100644
--- a/kio/kfile/tests/Makefile.am
+++ b/tdeio/tdefile/tests/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES = $(all_includes)
 
 AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
 
-check_PROGRAMS = kfstest kurlrequestertest kfiletreeviewtest \
+check_PROGRAMS = kfstest kurlrequestertest tdefiletreeviewtest \
                  kopenwithtest kdirselectdialogtest kicondialogtest \
                  knotifytest kcustommenueditortest
 
@@ -33,7 +33,7 @@ LDADD = $(LIB_KIO)
 kcustommenueditortest_SOURCES = kcustommenueditortest.cpp
 kurlrequestertest_SOURCES = kurlrequestertest.cpp
 kfstest_SOURCES = kfstest.cpp kfdtest.cpp
-kfiletreeviewtest_SOURCES = kfiletreeviewtest.cpp
+tdefiletreeviewtest_SOURCES = tdefiletreeviewtest.cpp
 kopenwithtest_SOURCES = kopenwithtest.cpp
 kdirselectdialogtest_SOURCES = kdirselectdialogtest.cpp
 kicondialogtest_SOURCES = kicondialogtest.cpp
diff --git a/kio/kfile/tests/kcustommenueditortest.cpp b/tdeio/tdefile/tests/kcustommenueditortest.cpp
index 1fc6da496..df2c692f6 100644
--- a/kio/kfile/tests/kcustommenueditortest.cpp
+++ b/tdeio/tdefile/tests/kcustommenueditortest.cpp
@@ -1,7 +1,7 @@
 #include "kcustommenueditor.h"
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 int main(int argc, char** argv)
 {
diff --git a/kio/kfile/tests/kdirselectdialogtest.cpp b/tdeio/tdefile/tests/kdirselectdialogtest.cpp
index 3d15c47d0..3d15c47d0 100644
--- a/kio/kfile/tests/kdirselectdialogtest.cpp
+++ b/tdeio/tdefile/tests/kdirselectdialogtest.cpp
diff --git a/kio/kfile/tests/kfdtest.cpp b/tdeio/tdefile/tests/kfdtest.cpp
index 867b9b4a8..60c8b6d70 100644
--- a/kio/kfile/tests/kfdtest.cpp
+++ b/tdeio/tdefile/tests/kfdtest.cpp
@@ -1,7 +1,7 @@
 #include "kfdtest.h"
 
 #include <tqstringlist.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <tqtimer.h>
diff --git a/kio/kfile/tests/kfdtest.h b/tdeio/tdefile/tests/kfdtest.h
index 6c59550b8..6c59550b8 100644
--- a/kio/kfile/tests/kfdtest.h
+++ b/tdeio/tdefile/tests/kfdtest.h
diff --git a/kio/kfile/tests/kfstest.cpp b/tdeio/tdefile/tests/kfstest.cpp
index b0ecabcc6..f6ee69687 100644
--- a/kio/kfile/tests/kfstest.cpp
+++ b/tdeio/tdefile/tests/kfstest.cpp
@@ -28,15 +28,15 @@
 #include <tqstringlist.h>
 #include <tqwidget.h>
 
-#include <kfiledialog.h>
-#include <kfileiconview.h>
+#include <tdefiledialog.h>
+#include <tdefileiconview.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kurl.h>
 #include <kurlbar.h>
 #include <kdiroperator.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kdebug.h>
 #include <kicondialog.h>
 
diff --git a/kio/kfile/tests/kicondialogtest.cpp b/tdeio/tdefile/tests/kicondialogtest.cpp
index b2c56e159..b2c56e159 100644
--- a/kio/kfile/tests/kicondialogtest.cpp
+++ b/tdeio/tdefile/tests/kicondialogtest.cpp
diff --git a/kio/kfile/tests/knotifytest.cpp b/tdeio/tdefile/tests/knotifytest.cpp
index 0493b59b4..0493b59b4 100644
--- a/kio/kfile/tests/knotifytest.cpp
+++ b/tdeio/tdefile/tests/knotifytest.cpp
diff --git a/kio/kfile/tests/kopenwithtest.cpp b/tdeio/tdefile/tests/kopenwithtest.cpp
index f78b1830b..f78b1830b 100644
--- a/kio/kfile/tests/kopenwithtest.cpp
+++ b/tdeio/tdefile/tests/kopenwithtest.cpp
diff --git a/kio/kfile/tests/kurlrequestertest.cpp b/tdeio/tdefile/tests/kurlrequestertest.cpp
index 0e4851cfb..0e4851cfb 100644
--- a/kio/kfile/tests/kurlrequestertest.cpp
+++ b/tdeio/tdefile/tests/kurlrequestertest.cpp
diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
index cf28557f8..b74468fda 100644
--- a/kio/kfile/tests/kfiletreeviewtest.cpp
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
@@ -27,11 +27,11 @@
 #include <kdebug.h>
 #include <kstatusbar.h>
 
-#include <kfiletreeview.h>
-#include "kfiletreeviewtest.h"
+#include <tdefiletreeview.h>
+#include "tdefiletreeviewtest.h"
 
 
-#include "kfiletreeviewtest.moc"
+#include "tdefiletreeviewtest.moc"
 
 testFrame::testFrame():KMainWindow(0,"Test FileTreeView"),
 		       dirOnlyMode(false)
@@ -134,7 +134,7 @@ void testFrame::slotSetChildCount( KFileTreeViewItem *item, int c )
 
 int main(int argc, char **argv)
 {
-    TDEApplication a(argc, argv, "kfiletreeviewtest");
+    TDEApplication a(argc, argv, "tdefiletreeviewtest");
     TQString name1;
     TQStringList names;
 
diff --git a/kio/kfile/tests/kfiletreeviewtest.h b/tdeio/tdefile/tests/tdefiletreeviewtest.h
index 4ae791ce5..4ae791ce5 100644
--- a/kio/kfile/tests/kfiletreeviewtest.h
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.h
diff --git a/kio/kfileplugin.desktop b/tdeio/tdefileplugin.desktop
index 6609551a6..6609551a6 100644
--- a/kio/kfileplugin.desktop
+++ b/tdeio/tdefileplugin.desktop
diff --git a/kio/kio/CMakeLists.txt b/tdeio/tdeio/CMakeLists.txt
index 1a2c3a263..8aaf395b6 100644
--- a/kio/kio/CMakeLists.txt
+++ b/tdeio/tdeio/CMakeLists.txt
@@ -12,7 +12,7 @@
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/kio/kssl
+  ${CMAKE_BINARY_DIR}/tdeio/kssl
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
@@ -21,8 +21,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore/network
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
   ${CMAKE_SOURCE_DIR}/interfaces
   ${LIBR_INCLUDEDIR}
   ${GAMIN_INCLUDEDIR}
@@ -38,12 +38,12 @@ install( FILES
     kservicetype.h kmimetype.h kmimemagic.h kservice.h
     krun.h kdirwatch.h kautomount.h kuserprofile.h
     kshred.h kar.h ktar.h kzip.h ktrader.h kurifilter.h
-    kurlcompletion.h kshellcompletion.h kfileitem.h
-    kfileshare.h ksambashare.h knfsshare.h kdirlister.h
+    kurlcompletion.h kshellcompletion.h tdefileitem.h
+    tdefileshare.h ksambashare.h knfsshare.h kdirlister.h
     kservicegroup.h kimageio.h kdirnotify.h kdirnotify_stub.h
     kurlpixmapprovider.h kprotocolinfo.h kprotocolmanager.h
     kfilterbase.h kfilterdev.h kemailsettings.h kscan.h
-    kdatatool.h karchive.h kfilefilter.h kfilemetainfo.h
+    kdatatool.h karchive.h tdefilefilter.h tdefilemetainfo.h
     renamedlgplugin.h kmimetyperesolver.h kdcopservicestarter.h
     kremoteencoding.h kmimetypechooser.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
@@ -63,12 +63,12 @@ install( FILES
     http_slave_defaults.h previewjob.h thumbcreator.h
     metainfojob.h davjob.h renamedlg.h skipdlg.h
     ${CMAKE_CURRENT_BINARY_DIR}/uiserver_stub.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
 
 
-##### kiocore ###################################
+##### tdeiocore ###################################
 
-set( target kiocore )
+set( target tdeiocore )
 
 set( ${target}_SRCS
   authinfo.cpp kshred.cpp kprotocolmanager.cpp slave.cpp
@@ -95,18 +95,18 @@ tde_add_library( ${target} STATIC_PIC AUTOMOC
 set( target tdesycoca )
 
 set( ${target}_SRCS
-  kdirwatch.cpp kfileshare.cpp ksambashare.cpp
+  kdirwatch.cpp tdefileshare.cpp ksambashare.cpp
   knfsshare.cpp ktrader.cpp ktraderparse.cpp
   ktraderparsetree.cpp kservicetypefactory.cpp
   kservicetype.cpp kmimetype.cpp kservicegroup.cpp
   kservice.cpp kservicefactory.cpp kuserprofile.cpp
   kservicegroupfactory.cpp kurifilter.cpp kfilterbase.cpp
   kfilterdev.cpp kshellcompletion.cpp kurlcompletion.cpp
-  kautomount.cpp krun.cpp kfileitem.cpp kdirlister.cpp
+  kautomount.cpp krun.cpp tdefileitem.cpp kdirlister.cpp
   kimageio.cpp yacc.c lex.c chmodjob.cpp kscan.cpp
   kar.cpp ktar.cpp kzip.cpp previewjob.cpp metainfojob.cpp
-  davjob.cpp kdatatool.cpp karchive.cpp kfilefilter.cpp
-  kfilemetainfo.cpp kdcopservicestarter.cpp dataslave.cpp
+  davjob.cpp kdatatool.cpp karchive.cpp tdefilefilter.cpp
+  tdefilemetainfo.cpp kdcopservicestarter.cpp dataslave.cpp
   dataprotocol.cpp
 )
 
diff --git a/kio/kio/KFILEMETAINFO_ISSUES b/tdeio/tdeio/KFILEMETAINFO_ISSUES
index a4486f85f..a4486f85f 100644
--- a/kio/kio/KFILEMETAINFO_ISSUES
+++ b/tdeio/tdeio/KFILEMETAINFO_ISSUES
diff --git a/kio/kio/Makefile.am b/tdeio/tdeio/Makefile.am
index 63d5fc5d8..f0766f5c8 100644
--- a/kio/kio/Makefile.am
+++ b/tdeio/tdeio/Makefile.am
@@ -20,13 +20,13 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
 
 INCLUDES=  -I$(top_srcdir) -I$(srcdir)/.. -I$(top_srcdir)/tdecore/network -I$(srcdir)/../kssl -I../kssl -I$(srcdir)/../../interfaces  $(all_includes) $(SSL_INCLUDES)
 
-noinst_LTLIBRARIES = libkiocore.la libtdesycoca.la
+noinst_LTLIBRARIES = libtdeiocore.la libtdesycoca.la
 
 # convenience lib - no LDFLAGS or LIBADD !
 
 libtdesycoca_la_SOURCES = \
 	kdirwatch.cpp \
-	kfileshare.cpp ksambashare.cpp knfsshare.cpp \
+	tdefileshare.cpp ksambashare.cpp knfsshare.cpp \
 	ktrader.cpp ktraderparse.cpp ktraderparsetree.cpp \
         kservicetypefactory.cpp kservicetype.cpp \
 	kmimetype.cpp kservicegroup.cpp \
@@ -36,11 +36,11 @@ libtdesycoca_la_SOURCES = \
 	kfilterbase.cpp kfilterdev.cpp \
 	kshellcompletion.cpp kurlcompletion.cpp \
 	kautomount.cpp krun.cpp \
-	kfileitem.cpp kdirlister.cpp kimageio.cpp \
+	tdefileitem.cpp kdirlister.cpp kimageio.cpp \
 	yacc.c lex.c  \
 	chmodjob.cpp kscan.cpp kar.cpp ktar.cpp kzip.cpp previewjob.cpp metainfojob.cpp davjob.cpp \
-	kdatatool.cpp karchive.cpp kfilefilter.cpp \
-	kfilemetainfo.cpp kdcopservicestarter.cpp \
+	kdatatool.cpp karchive.cpp tdefilefilter.cpp \
+	tdefilemetainfo.cpp kdcopservicestarter.cpp \
 	dataslave.cpp dataprotocol.cpp 
 #if USE_POSIX_ACL
   libtdesycoca_la_SOURCES += kacl.cpp posixacladdons.cpp
@@ -50,22 +50,22 @@ include_HEADERS = \
 	kservicetype.h kmimetype.h kmimemagic.h kservice.h \
 	krun.h kdirwatch.h kautomount.h kuserprofile.h \
 	kshred.h kar.h ktar.h kzip.h ktrader.h kurifilter.h kurlcompletion.h \
-	kshellcompletion.h kfileitem.h kfileshare.h ksambashare.h knfsshare.h \
+	kshellcompletion.h tdefileitem.h tdefileshare.h ksambashare.h knfsshare.h \
     kdirlister.h kservicegroup.h \
 	kimageio.h kdirnotify.h kdirnotify_stub.h \
 	kurlpixmapprovider.h kprotocolinfo.h kprotocolmanager.h \
 	kfilterbase.h kfilterdev.h kemailsettings.h kscan.h kdatatool.h \
-	karchive.h kfilefilter.h kfilemetainfo.h renamedlgplugin.h \
+	karchive.h tdefilefilter.h tdefilemetainfo.h renamedlgplugin.h \
 	kmimetyperesolver.h kdcopservicestarter.h kremoteencoding.h \
 	kmimetypechooser.h 
 #if USE_POSIX_ACL
 include_HEADERS += kacl.h
 #endif
 
-#libkiocore_la_LDFLAGS = $(all_libraries)
-#libkiocore_la_LIBADD = ../../tdeui/libtdeui.la ../../tdesu/libtdesu.la $(LIBZ) $(LIBFAM) $(LIBVOLMGT)
+#libtdeiocore_la_LDFLAGS = $(all_libraries)
+#libtdeiocore_la_LIBADD = ../../tdeui/libtdeui.la ../../tdesu/libtdesu.la $(LIBZ) $(LIBFAM) $(LIBVOLMGT)
 
-libkiocore_la_SOURCES = authinfo.cpp \
+libtdeiocore_la_SOURCES = authinfo.cpp \
 	kshred.cpp \
 	kprotocolmanager.cpp \
 	slave.cpp slaveinterface.cpp observer.stub \
@@ -86,12 +86,12 @@ libkiocore_la_SOURCES = authinfo.cpp \
 	renamedlg.cpp skipdlg.cpp kremoteencoding.cpp \
 	kmimetypechooser.cpp
 
-uiserver_DIR = $(top_srcdir)/kio/misc
+uiserver_DIR = $(top_srcdir)/tdeio/misc
 
 METASOURCES = AUTO
 
-kioincludedir = $(includedir)/kio
-kioinclude_HEADERS = connection.h \
+tdeioincludedir = $(includedir)/tdeio
+tdeioinclude_HEADERS = connection.h \
         slaveinterface.h slave.h slaveconfig.h \
         sessiondata.h global.h passdlg.h \
 	netaccess.h job.h scheduler.h \
diff --git a/kio/kio/authinfo.cpp b/tdeio/tdeio/authinfo.cpp
index 483bc682f..b95a40585 100644
--- a/kio/kio/authinfo.cpp
+++ b/tdeio/tdeio/authinfo.cpp
@@ -35,7 +35,7 @@
 #include <kstaticdeleter.h>
 #include <kde_file.h>
 
-#include "kio/authinfo.h"
+#include "tdeio/authinfo.h"
 
 #define NETRC_READ_BUF_SIZE 4096
 
diff --git a/kio/kio/authinfo.h b/tdeio/tdeio/authinfo.h
index 019311ef8..019311ef8 100644
--- a/kio/kio/authinfo.h
+++ b/tdeio/tdeio/authinfo.h
diff --git a/kio/kio/chmodjob.cpp b/tdeio/tdeio/chmodjob.cpp
index f589da957..434466d77 100644
--- a/kio/kio/chmodjob.cpp
+++ b/tdeio/tdeio/chmodjob.cpp
@@ -33,8 +33,8 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 
-#include "kio/job.h"
-#include "kio/chmodjob.h"
+#include "tdeio/job.h"
+#include "tdeio/chmodjob.h"
 
 #include <kdirnotify_stub.h>
 
diff --git a/kio/kio/chmodjob.h b/tdeio/tdeio/chmodjob.h
index 81b614562..105df0e4d 100644
--- a/kio/kio/chmodjob.h
+++ b/tdeio/tdeio/chmodjob.h
@@ -24,9 +24,9 @@
 #include <kurl.h>
 #include <tqstring.h>
 
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kfileitem.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdefileitem.h>
 
 namespace TDEIO {
 
diff --git a/kio/kio/configure.in.in b/tdeio/tdeio/configure.in.in
index 8683dfec1..8683dfec1 100644
--- a/kio/kio/configure.in.in
+++ b/tdeio/tdeio/configure.in.in
diff --git a/kio/kio/connection.cpp b/tdeio/tdeio/connection.cpp
index d85f4921c..cbe737693 100644
--- a/kio/kio/connection.cpp
+++ b/tdeio/tdeio/connection.cpp
@@ -38,7 +38,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "kio/connection.h"
+#include "tdeio/connection.h"
 
 #include <kdebug.h>
 #include <tqsocketnotifier.h>
diff --git a/kio/kio/connection.h b/tdeio/tdeio/connection.h
index fb0b50e15..fb0b50e15 100644
--- a/kio/kio/connection.h
+++ b/tdeio/tdeio/connection.h
diff --git a/kio/kio/dataprotocol.cpp b/tdeio/tdeio/dataprotocol.cpp
index 1e3db04d7..acc7b28e9 100644
--- a/kio/kio/dataprotocol.cpp
+++ b/tdeio/tdeio/dataprotocol.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <tqcstring.h>
 #include <tqstring.h>
diff --git a/kio/kio/dataprotocol.h b/tdeio/tdeio/dataprotocol.h
index 472b42886..ed9bfc325 100644
--- a/kio/kio/dataprotocol.h
+++ b/tdeio/tdeio/dataprotocol.h
@@ -21,10 +21,10 @@
 
 // dataprotocol.* interprets the following defines
 // DATAKIOSLAVE: define if you want to compile this into a stand-alone
-//		kioslave
+//		tdeioslave
 // TESTKIO: define for test-driving
 // Both defines are mutually exclusive. Defining none of them compiles
-// DataProtocol for internal usage within libkiocore.
+// DataProtocol for internal usage within libtdeiocore.
 
 class TQString;
 class TQCString;
@@ -32,14 +32,14 @@ class TQCString;
 class KURL;
 
 #if defined(DATAKIOSLAVE)
-#  include <kio/slavebase.h>
+#  include <tdeio/slavebase.h>
 #elif !defined(TESTKIO)
-#  include "kio/dataslave.h"
+#  include "tdeio/dataslave.h"
 #endif
 
 namespace TDEIO {
 
-/** This kioslave provides support of data urls as specified by rfc 2397
+/** This tdeioslave provides support of data urls as specified by rfc 2397
  * @see http://www.ietf.org/rfc/rfc2397.txt
  * @author Leo Savernik
  */
diff --git a/kio/kio/dataslave.cpp b/tdeio/tdeio/dataslave.cpp
index 528368ba5..528368ba5 100644
--- a/kio/kio/dataslave.cpp
+++ b/tdeio/tdeio/dataslave.cpp
diff --git a/kio/kio/dataslave.h b/tdeio/tdeio/dataslave.h
index 3567f3faf..40cfef126 100644
--- a/kio/kio/dataslave.h
+++ b/tdeio/tdeio/dataslave.h
@@ -22,8 +22,8 @@
 #ifndef __KIO_DATASLAVE_H__
 #define __KIO_DATASLAVE_H__
 
-#include <kio/global.h>
-#include <kio/slave.h>
+#include <tdeio/global.h>
+#include <tdeio/slave.h>
 
 class TQTimer;
 
diff --git a/kio/kio/davjob.cpp b/tdeio/tdeio/davjob.cpp
index f1ba2d2d4..986e76342 100644
--- a/kio/kio/davjob.cpp
+++ b/tdeio/tdeio/davjob.cpp
@@ -31,12 +31,12 @@
 #include <sys/stat.h>
 
 #include <kdebug.h>
-#include <kio/jobclasses.h>
-#include <kio/global.h>
-#include <kio/http.h>
-#include <kio/davjob.h>
-#include <kio/job.h>
-#include <kio/slaveinterface.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/http.h>
+#include <tdeio/davjob.h>
+#include <tdeio/job.h>
+#include <tdeio/slaveinterface.h>
 
 #define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
 
diff --git a/kio/kio/davjob.h b/tdeio/tdeio/davjob.h
index 02eaa6a78..1bbb722d0 100644
--- a/kio/kio/davjob.h
+++ b/tdeio/tdeio/davjob.h
@@ -33,8 +33,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <kio/jobclasses.h>
-#include <kio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/global.h>
 
 class Observer;
 class TQTimer;
diff --git a/kio/kio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp
index 72bec0cfc..a4de9c31b 100644
--- a/kio/kio/defaultprogress.cpp
+++ b/tdeio/tdeio/defaultprogress.cpp
@@ -176,7 +176,7 @@ void DefaultProgress::init()
 
   d->keepOpenChecked = false;
   d->noCaptionYet = true;
-  setCaption(i18n("Progress Dialog")); // show something better than kio_uiserver
+  setCaption(i18n("Progress Dialog")); // show something better than tdeio_uiserver
 }
 
 DefaultProgress::~DefaultProgress()
diff --git a/kio/kio/defaultprogress.h b/tdeio/tdeio/defaultprogress.h
index 44ffff6c4..de0dfd093 100644
--- a/kio/kio/defaultprogress.h
+++ b/tdeio/tdeio/defaultprogress.h
@@ -20,7 +20,7 @@
 
 #include <tqlabel.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <kprogress.h>
 
diff --git a/kio/kio/forwardingslavebase.cpp b/tdeio/tdeio/forwardingslavebase.cpp
index 53121986d..a55f68249 100644
--- a/kio/kio/forwardingslavebase.cpp
+++ b/tdeio/tdeio/forwardingslavebase.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmimetype.h>
 #include <kprotocolinfo.h>
 
diff --git a/kio/kio/forwardingslavebase.h b/tdeio/tdeio/forwardingslavebase.h
index f765e38a6..4d84089bf 100644
--- a/kio/kio/forwardingslavebase.h
+++ b/tdeio/tdeio/forwardingslavebase.h
@@ -20,8 +20,8 @@
 #ifndef _FORWARDING_SLAVE_BASE_H_
 #define _FORWARDING_SLAVE_BASE_H_
 
-#include <kio/slavebase.h>
-#include <kio/jobclasses.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/jobclasses.h>
 
 #include <tqobject.h>
 
diff --git a/kio/kio/global.cpp b/tdeio/tdeio/global.cpp
index 3a7cadb8f..e4bfec5f6 100644
--- a/kio/kio/global.cpp
+++ b/tdeio/tdeio/global.cpp
@@ -29,8 +29,8 @@
 #include <unistd.h>
 #include <stdio.h>
 
-#include "kio/global.h"
-#include "kio/job.h"
+#include "tdeio/global.h"
+#include "tdeio/job.h"
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -672,7 +672,7 @@ TDEIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &er
         << i18n( "The versions of the %1 protocol supported by this computer and "
         "the server may be incompatible." ).arg( protocol );
       solutions << i18n( "You may perform a search on the Internet for a TDE "
-        "program (called a kioslave or ioslave) which supports this protocol. "
+        "program (called a tdeioslave or ioslave) which supports this protocol. "
         "Places to search include <a href=\"http://kde-apps.org/\">"
         "http://kde-apps.org/</a> and <a href=\"http://freshmeat.net/\">"
         "http://freshmeat.net/</a>." )
diff --git a/kio/kio/global.h b/tdeio/tdeio/global.h
index 44b9df616..44b9df616 100644
--- a/kio/kio/global.h
+++ b/tdeio/tdeio/global.h
diff --git a/kio/kio/http_slave_defaults.h b/tdeio/tdeio/http_slave_defaults.h
index e3247e39b..e3247e39b 100644
--- a/kio/kio/http_slave_defaults.h
+++ b/tdeio/tdeio/http_slave_defaults.h
diff --git a/kio/kio/ioslave_defaults.h b/tdeio/tdeio/ioslave_defaults.h
index ddf5b6af5..ddf5b6af5 100644
--- a/kio/kio/ioslave_defaults.h
+++ b/tdeio/tdeio/ioslave_defaults.h
diff --git a/kio/kio/job.cpp b/tdeio/tdeio/job.cpp
index d72eae574..7bea676c5 100644
--- a/kio/kio/job.cpp
+++ b/tdeio/tdeio/job.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kio/job.h"
+#include "tdeio/job.h"
 
 #include <config.h>
 
@@ -62,7 +62,7 @@ extern "C" {
 #include "kprotocolinfo.h"
 #include "kprotocolmanager.h"
 
-#include "kio/observer.h"
+#include "tdeio/observer.h"
 
 #include "kssl/ksslcsessioncache.h"
 
@@ -2611,7 +2611,7 @@ void CopyJob::slotEntries(TDEIO::Job* job, const UDSEntryList& list)
                     for ( int n = 0; n < numberOfSlashes + 1; ++n ) {
                         pos = path.findRev( '/', pos - 1 );
                         if ( pos == -1 ) { // error
-                            kdWarning(7007) << "kioslave bug: not enough slashes in UDS_URL " << path << " - looking for " << numberOfSlashes << " slashes" << endl;
+                            kdWarning(7007) << "tdeioslave bug: not enough slashes in UDS_URL " << path << " - looking for " << numberOfSlashes << " slashes" << endl;
                             break;
                         }
                     }
diff --git a/kio/kio/job.h b/tdeio/tdeio/job.h
index f5254df39..d4d7dd41d 100644
--- a/kio/kio/job.h
+++ b/tdeio/tdeio/job.h
@@ -22,7 +22,7 @@
 #ifndef __kio_job_h__
 #define __kio_job_h__
 
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 namespace TDEIO {
 
@@ -162,7 +162,7 @@ namespace TDEIO {
      * @param url the URL of the file
      * @param sideIsSource is true when stating a source file (we will do a get on it if
      * the stat works) and false when stating a destination file (target of a copy).
-     * The reason for this parameter is that in some cases the kioslave might not
+     * The reason for this parameter is that in some cases the tdeioslave might not
      * be able to determine a file's existence (e.g. HTTP doesn't allow it, FTP
      * has issues with case-sensitivity on some systems).
      * When the slave can't reliably determine the existence of a file, it will:
diff --git a/kio/kio/jobclasses.h b/tdeio/tdeio/jobclasses.h
index 3438406fa..7f5ec1f85 100644
--- a/kio/kio/jobclasses.h
+++ b/tdeio/tdeio/jobclasses.h
@@ -32,7 +32,7 @@
 #include <sys/stat.h>
 
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class Observer;
 class TQTimer;
@@ -79,7 +79,7 @@ namespace TDEIO {
          * This kills all subjobs and deletes the job.
 	 *
          * @param quietly if false, Job will emit signal result
-         * and ask kio_uiserver to close the progress window.
+         * and ask tdeio_uiserver to close the progress window.
          * @p quietly is set to true for subjobs. Whether applications
          * should call with true or false depends on whether they rely
          * on result being emitted or not.
@@ -553,7 +553,7 @@ namespace TDEIO {
          * This kills all subjobs and deletes the job.
          * @param quietly if true, Job will emit signal result
          * Should only be set to false when the user kills the job
-         * (from kio_uiserver), not when you want to abort a job.
+         * (from tdeio_uiserver), not when you want to abort a job.
          */
         virtual void kill( bool quietly = true );
 
@@ -702,7 +702,7 @@ namespace TDEIO {
         /**
 	 * A stat() can have two meanings. Either we want to read from this URL,
          * or to check if we can write to it. First case is "source", second is "dest".
-         * It is necessary to know what the StatJob is for, to tune the kioslave's behavior
+         * It is necessary to know what the StatJob is for, to tune the tdeioslave's behavior
          * (e.g. with FTP).
 	 * @param source true for "source" mode, false for "dest" mode
          */
diff --git a/kio/kio/kacl.cpp b/tdeio/tdeio/kacl.cpp
index 432a50d31..432a50d31 100644
--- a/kio/kio/kacl.cpp
+++ b/tdeio/tdeio/kacl.cpp
diff --git a/kio/kio/kacl.h b/tdeio/tdeio/kacl.h
index 1f60fde60..f581f7a8e 100644
--- a/kio/kio/kacl.h
+++ b/tdeio/tdeio/kacl.h
@@ -21,7 +21,7 @@
 #define __kacl_h__
 
 #include <sys/types.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 typedef QPair<TQString, unsigned short> ACLUserPermissions;
 typedef TQValueList<ACLUserPermissions> ACLUserPermissionsList;
diff --git a/kio/kio/kar.cpp b/tdeio/tdeio/kar.cpp
index 07072d0c6..07072d0c6 100644
--- a/kio/kio/kar.cpp
+++ b/tdeio/tdeio/kar.cpp
diff --git a/kio/kio/kar.h b/tdeio/tdeio/kar.h
index 83d94e75c..83d94e75c 100644
--- a/kio/kio/kar.h
+++ b/tdeio/tdeio/kar.h
diff --git a/kio/kio/karchive.cpp b/tdeio/tdeio/karchive.cpp
index 0e8d6789d..0e8d6789d 100644
--- a/kio/kio/karchive.cpp
+++ b/tdeio/tdeio/karchive.cpp
diff --git a/kio/kio/karchive.h b/tdeio/tdeio/karchive.h
index 840c560b7..840c560b7 100644
--- a/kio/kio/karchive.h
+++ b/tdeio/tdeio/karchive.h
diff --git a/kio/kio/kautomount.cpp b/tdeio/tdeio/kautomount.cpp
index e8b1d2af0..f167a6ccb 100644
--- a/kio/kio/kautomount.cpp
+++ b/tdeio/tdeio/kautomount.cpp
@@ -19,7 +19,7 @@
 #include "kautomount.h"
 #include "krun.h"
 #include "kdirwatch.h"
-#include "kio/job.h"
+#include "tdeio/job.h"
 #include <kdirnotify_stub.h>
 #include <kdebug.h>
 
diff --git a/kio/kio/kautomount.h b/tdeio/tdeio/kautomount.h
index 203c037d9..203c037d9 100644
--- a/kio/kio/kautomount.h
+++ b/tdeio/tdeio/kautomount.h
diff --git a/kio/kio/kdatatool.cpp b/tdeio/tdeio/kdatatool.cpp
index 08630d110..08630d110 100644
--- a/kio/kio/kdatatool.cpp
+++ b/tdeio/tdeio/kdatatool.cpp
diff --git a/kio/kio/kdatatool.h b/tdeio/tdeio/kdatatool.h
index 1258767fc..1258767fc 100644
--- a/kio/kio/kdatatool.h
+++ b/tdeio/tdeio/kdatatool.h
diff --git a/kio/kio/kdcopservicestarter.cpp b/tdeio/tdeio/kdcopservicestarter.cpp
index 3c9b55501..3c9b55501 100644
--- a/kio/kio/kdcopservicestarter.cpp
+++ b/tdeio/tdeio/kdcopservicestarter.cpp
diff --git a/kio/kio/kdcopservicestarter.h b/tdeio/tdeio/kdcopservicestarter.h
index f70f0173e..f70f0173e 100644
--- a/kio/kio/kdcopservicestarter.h
+++ b/tdeio/tdeio/kdcopservicestarter.h
diff --git a/kio/kio/kdirlister.cpp b/tdeio/tdeio/kdirlister.cpp
index 90cfca041..0d3498aa7 100644
--- a/kio/kio/kdirlister.cpp
+++ b/tdeio/tdeio/kdirlister.cpp
@@ -29,7 +29,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/kio/kio/kdirlister.h b/tdeio/tdeio/kdirlister.h
index 2688fcd9c..188f9ea7a 100644
--- a/kio/kio/kdirlister.h
+++ b/tdeio/tdeio/kdirlister.h
@@ -21,7 +21,7 @@
 #ifndef kdirlister_h
 #define kdirlister_h
 
-#include "kfileitem.h"
+#include "tdefileitem.h"
 #include "kdirnotify.h"
 
 #include <tqstring.h>
diff --git a/kio/kio/kdirlister_p.h b/tdeio/tdeio/kdirlister_p.h
index 47bd4d452..d6dff7bcf 100644
--- a/kio/kio/kdirlister_p.h
+++ b/tdeio/tdeio/kdirlister_p.h
@@ -20,7 +20,7 @@
 #ifndef kdirlister_p_h
 #define kdirlister_p_h
 
-#include "kfileitem.h"
+#include "tdefileitem.h"
 
 #include <tqmap.h>
 #include <tqdict.h>
@@ -28,7 +28,7 @@
 #include <tqwidget.h>
 
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kdirwatch.h>
 #include <dcopclient.h>
 
diff --git a/kio/kio/kdirnotify.cpp b/tdeio/tdeio/kdirnotify.cpp
index fb98196f5..fb98196f5 100644
--- a/kio/kio/kdirnotify.cpp
+++ b/tdeio/tdeio/kdirnotify.cpp
diff --git a/kio/kio/kdirnotify.h b/tdeio/tdeio/kdirnotify.h
index 14d864609..14d864609 100644
--- a/kio/kio/kdirnotify.h
+++ b/tdeio/tdeio/kdirnotify.h
diff --git a/kio/kio/kdirnotify_stub.cpp b/tdeio/tdeio/kdirnotify_stub.cpp
index 66988d6c9..66988d6c9 100644
--- a/kio/kio/kdirnotify_stub.cpp
+++ b/tdeio/tdeio/kdirnotify_stub.cpp
diff --git a/kio/kio/kdirnotify_stub.h b/tdeio/tdeio/kdirnotify_stub.h
index 56ab168c4..56ab168c4 100644
--- a/kio/kio/kdirnotify_stub.h
+++ b/tdeio/tdeio/kdirnotify_stub.h
diff --git a/kio/kio/kdirwatch.cpp b/tdeio/tdeio/kdirwatch.cpp
index 1ea5805f3..c4057264b 100644
--- a/kio/kio/kdirwatch.cpp
+++ b/tdeio/tdeio/kdirwatch.cpp
@@ -56,7 +56,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kstaticdeleter.h>
 #include <kde_file.h>
@@ -196,7 +196,7 @@ void KDirWatchPrivate::dnotify_sigio_handler(int sig, siginfo_t *si, void *p)
  * 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/kio/kio/kdirwatch.h b/tdeio/tdeio/kdirwatch.h
index 4abaa302e..4abaa302e 100644
--- a/kio/kio/kdirwatch.h
+++ b/tdeio/tdeio/kdirwatch.h
diff --git a/kio/kio/kdirwatch_p.h b/tdeio/tdeio/kdirwatch_p.h
index 8777f56b2..8777f56b2 100644
--- a/kio/kio/kdirwatch_p.h
+++ b/tdeio/tdeio/kdirwatch_p.h
diff --git a/kio/kio/kemailsettings.cpp b/tdeio/tdeio/kemailsettings.cpp
index f8ad9f7dd..296455253 100644
--- a/kio/kio/kemailsettings.cpp
+++ b/tdeio/tdeio/kemailsettings.cpp
@@ -28,7 +28,7 @@
 
 #include "kemailsettings.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/kio/kio/kemailsettings.h b/tdeio/tdeio/kemailsettings.h
index 0ade4520e..0ade4520e 100644
--- a/kio/kio/kemailsettings.h
+++ b/tdeio/tdeio/kemailsettings.h
diff --git a/kio/kio/kfilterbase.cpp b/tdeio/tdeio/kfilterbase.cpp
index f9250cfe9..f9250cfe9 100644
--- a/kio/kio/kfilterbase.cpp
+++ b/tdeio/tdeio/kfilterbase.cpp
diff --git a/kio/kio/kfilterbase.h b/tdeio/tdeio/kfilterbase.h
index 25613c101..25613c101 100644
--- a/kio/kio/kfilterbase.h
+++ b/tdeio/tdeio/kfilterbase.h
diff --git a/kio/kio/kfilterdev.cpp b/tdeio/tdeio/kfilterdev.cpp
index 87d54f5e3..87d54f5e3 100644
--- a/kio/kio/kfilterdev.cpp
+++ b/tdeio/tdeio/kfilterdev.cpp
diff --git a/kio/kio/kfilterdev.h b/tdeio/tdeio/kfilterdev.h
index 8dd0999a9..8dd0999a9 100644
--- a/kio/kio/kfilterdev.h
+++ b/tdeio/tdeio/kfilterdev.h
diff --git a/kio/kio/kimageio.cpp b/tdeio/tdeio/kimageio.cpp
index e983cb945..e983cb945 100644
--- a/kio/kio/kimageio.cpp
+++ b/tdeio/tdeio/kimageio.cpp
diff --git a/kio/kio/kimageio.h b/tdeio/tdeio/kimageio.h
index 671fb5f61..671fb5f61 100644
--- a/kio/kio/kimageio.h
+++ b/tdeio/tdeio/kimageio.h
diff --git a/kio/kio/kimageiofactory.h b/tdeio/tdeio/kimageiofactory.h
index 6d2d15940..6d2d15940 100644
--- a/kio/kio/kimageiofactory.h
+++ b/tdeio/tdeio/kimageiofactory.h
diff --git a/kio/kio/klimitediodevice.h b/tdeio/tdeio/klimitediodevice.h
index 602ba45a0..602ba45a0 100644
--- a/kio/kio/klimitediodevice.h
+++ b/tdeio/tdeio/klimitediodevice.h
diff --git a/kio/kio/kmdbase.h b/tdeio/tdeio/kmdbase.h
index b0c8f8b7d..b0c8f8b7d 100644
--- a/kio/kio/kmdbase.h
+++ b/tdeio/tdeio/kmdbase.h
diff --git a/kio/kio/kmessageboxwrapper.h b/tdeio/tdeio/kmessageboxwrapper.h
index 3590b5e89..3590b5e89 100644
--- a/kio/kio/kmessageboxwrapper.h
+++ b/tdeio/tdeio/kmessageboxwrapper.h
diff --git a/kio/kio/kmimemagic.cpp b/tdeio/tdeio/kmimemagic.cpp
index f639a7049..f639a7049 100644
--- a/kio/kio/kmimemagic.cpp
+++ b/tdeio/tdeio/kmimemagic.cpp
diff --git a/kio/kio/kmimemagic.h b/tdeio/tdeio/kmimemagic.h
index f5430a219..f5430a219 100644
--- a/kio/kio/kmimemagic.h
+++ b/tdeio/tdeio/kmimemagic.h
diff --git a/kio/kio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp
index c6f879a73..344be793a 100644
--- a/kio/kio/kmimetype.cpp
+++ b/tdeio/tdeio/kmimetype.cpp
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 
 #include <kprotocolinfo.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include "kmimetype.h"
 #include "kservicetypefactory.h"
 #include "kmimemagic.h"
diff --git a/kio/kio/kmimetype.h b/tdeio/tdeio/kmimetype.h
index 19a846b46..19a846b46 100644
--- a/kio/kio/kmimetype.h
+++ b/tdeio/tdeio/kmimetype.h
diff --git a/kio/kio/kmimetypechooser.cpp b/tdeio/tdeio/kmimetypechooser.cpp
index 8ab3a69ee..51db75fe1 100644
--- a/kio/kio/kmimetypechooser.cpp
+++ b/tdeio/tdeio/kmimetypechooser.cpp
@@ -18,7 +18,7 @@
 
 #include "kmimetypechooser.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klistview.h>
 #include <klocale.h>
diff --git a/kio/kio/kmimetypechooser.h b/tdeio/tdeio/kmimetypechooser.h
index 16ec052f5..16ec052f5 100644
--- a/kio/kio/kmimetypechooser.h
+++ b/tdeio/tdeio/kmimetypechooser.h
diff --git a/kio/kio/kmimetyperesolver.h b/tdeio/tdeio/kmimetyperesolver.h
index c8828a0da..c8828a0da 100644
--- a/kio/kio/kmimetyperesolver.h
+++ b/tdeio/tdeio/kmimetyperesolver.h
diff --git a/kio/kio/knfsshare.cpp b/tdeio/tdeio/knfsshare.cpp
index 394120009..b4a3d903a 100644
--- a/kio/kio/knfsshare.cpp
+++ b/tdeio/tdeio/knfsshare.cpp
@@ -23,7 +23,7 @@
 #include <kdirwatch.h>
 #include <kstaticdeleter.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "knfsshare.h"
 
@@ -47,7 +47,7 @@ KNFSSharePrivate::KNFSSharePrivate()
 
 /**
  * Try to find the nfs config file path
- * First tries the kconfig, then checks
+ * First tries the tdeconfig, then checks
  * several well-known paths
  * @return wether an 'exports' file was found.
  **/
diff --git a/kio/kio/knfsshare.h b/tdeio/tdeio/knfsshare.h
index 64cd28dcf..64cd28dcf 100644
--- a/kio/kio/knfsshare.h
+++ b/tdeio/tdeio/knfsshare.h
diff --git a/kio/kio/kprotocolinfo.cpp b/tdeio/tdeio/kprotocolinfo.cpp
index 9523b70cb..9523b70cb 100644
--- a/kio/kio/kprotocolinfo.cpp
+++ b/tdeio/tdeio/kprotocolinfo.cpp
diff --git a/kio/kio/kprotocolinfo.h b/tdeio/tdeio/kprotocolinfo.h
index 10addc610..65ed8c7cb 100644
--- a/kio/kio/kprotocolinfo.h
+++ b/tdeio/tdeio/kprotocolinfo.h
@@ -34,7 +34,7 @@
  * KDE supports. In addition you can find out lots of information
  * about a certain protocol. A KProtocolInfo instance represents a
  * single protocol. Most of the functionality is provided by the static
- * methods that scan the *.protocol files of all installed kioslaves to get
+ * methods that scan the *.protocol files of all installed tdeioslaves to get
  * this information.
  *
  * *.protocol files are installed in the "services" resource.
@@ -555,7 +555,7 @@ public:
   static KURL::URIMode uriParseMode( const TQString& protocol );
 
   /**
-   * Returns the list of capabilities provided by the kioslave implementing
+   * Returns the list of capabilities provided by the tdeioslave implementing
    * this protocol.
    *
    * This corresponds to the "Capabilities=" field in the protocol description file.
@@ -565,7 +565,7 @@ public:
    * special command for mounting, one would add the string "Mount" to the
    * capabilities list, and applications could check for that string
    * before sending a special() command that would otherwise do nothing
-   * on older kioslave implementations.
+   * on older tdeioslave implementations.
    *
    * @param protocol the protocol to check
    * @return the list of capabilities.
diff --git a/kio/kio/kprotocolmanager.cpp b/tdeio/tdeio/kprotocolmanager.cpp
index a4f8169f5..450b9d107 100644
--- a/kio/kio/kprotocolmanager.cpp
+++ b/tdeio/tdeio/kprotocolmanager.cpp
@@ -25,14 +25,14 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klibloader.h>
 #include <kstringhandler.h>
 #include <kstaticdeleter.h>
-#include <kio/slaveconfig.h>
-#include <kio/ioslave_defaults.h>
-#include <kio/http_slave_defaults.h>
+#include <tdeio/slaveconfig.h>
+#include <tdeio/ioslave_defaults.h>
+#include <tdeio/http_slave_defaults.h>
 
 #include "kprotocolmanager.h"
 
@@ -90,7 +90,7 @@ TDEConfig *KProtocolManager::config()
 
   if (!d->config)
   {
-     d->config = new TDEConfig("kioslaverc", true, false);
+     d->config = new TDEConfig("tdeioslaverc", true, false);
   }
   return d->config;
 }
diff --git a/kio/kio/kprotocolmanager.h b/tdeio/tdeio/kprotocolmanager.h
index f7e27164b..ce504a83f 100644
--- a/kio/kio/kprotocolmanager.h
+++ b/tdeio/tdeio/kprotocolmanager.h
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 
 #include <kapplication.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 /** @deprecated Use KProtocolManager::defaultUserAgent() instead. */
 #define DEFAULT_USERAGENT_STRING ""
@@ -362,7 +362,7 @@ public:
 
   /**
    * Force a reload of the general config file of
-   * io-slaves ( kioslaverc).
+   * io-slaves ( tdeioslaverc).
    */
   static void reparseConfiguration();
 
diff --git a/kio/kio/kremoteencoding.cpp b/tdeio/tdeio/kremoteencoding.cpp
index 632eeb8b2..632eeb8b2 100644
--- a/kio/kio/kremoteencoding.cpp
+++ b/tdeio/tdeio/kremoteencoding.cpp
diff --git a/kio/kio/kremoteencoding.h b/tdeio/tdeio/kremoteencoding.h
index 18dfe1fdb..18dfe1fdb 100644
--- a/kio/kio/kremoteencoding.h
+++ b/tdeio/tdeio/kremoteencoding.h
diff --git a/kio/kio/krun.cpp b/tdeio/tdeio/krun.cpp
index f99f636db..5810bdda4 100644
--- a/kio/kio/krun.cpp
+++ b/tdeio/tdeio/krun.cpp
@@ -32,12 +32,12 @@
 #include "kuserprofile.h"
 #include "kmimetype.h"
 #include "kmimemagic.h"
-#include "kio/job.h"
-#include "kio/global.h"
-#include "kio/scheduler.h"
-#include "kio/netaccess.h"
-#include "kfile/kopenwith.h"
-#include "kfile/krecentdocument.h"
+#include "tdeio/job.h"
+#include "tdeio/global.h"
+#include "tdeio/scheduler.h"
+#include "tdeio/netaccess.h"
+#include "tdefile/kopenwith.h"
+#include "tdefile/krecentdocument.h"
 
 #include <kdatastream.h>
 #include <kmessageboxwrapper.h>
@@ -403,24 +403,24 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List
   if( !mx1.expandMacrosShellQuote( exec ) )
     goto synerr; // error in shell syntax
 
-  // FIXME: the current way of invoking kioexec disables term and su use
+  // FIXME: the current way of invoking tdeioexec disables term and su use
 
-  // Check if we need "tempexec" (kioexec in fact)
+  // Check if we need "tempexec" (tdeioexec in fact)
   appHasTempFileOption = tempFiles && _service.property("X-TDE-HasTempFileOption").toBool();
   if( tempFiles && !appHasTempFileOption && _urls.size() ) {
-    result << "kioexec" << "--tempfiles" << exec;
+    result << "tdeioexec" << "--tempfiles" << exec;
     result += _urls.toStringList();
     if (has_shell)
       result = KShell::joinArgs( result );
     return result;
   }
 
-  // Check if we need kioexec
+  // Check if we need tdeioexec
   if( !mx1.hasUrls ) {
     for( KURL::List::ConstIterator it = _urls.begin(); it != _urls.end(); ++it )
       if ( !(*it).isLocalFile() && !KProtocolInfo::isHelperProtocol(*it) ) {
-        // We need to run the app through kioexec
-        result << "kioexec";
+        // We need to run the app through tdeioexec
+        result << "tdeioexec";
         if ( tempFiles )
             result << "--tempfiles";
         if ( !suggestedFileName.isEmpty() ) {
@@ -606,7 +606,7 @@ static pid_t runCommandInternal( TDEProcess* proc, const KService* service, cons
 #endif
 }
 
-// This code is also used in klauncher.
+// This code is also used in tdelauncher.
 bool KRun::checkStartupNotify( const TQString& /*binName*/, const KService* service, bool* silent_arg, TQCString* wmclass_arg )
 {
   bool silent = false;
@@ -693,7 +693,7 @@ static pid_t runTempService( const KService& _service, const KURL::List& _urls,
                              _service.name(), _service.icon(), window, asn );
 }
 
-// WARNING: don't call this from processDesktopExec, since klauncher uses that too...
+// WARNING: don't call this from processDesktopExec, since tdelauncher uses that too...
 static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service )
 {
   // Check which protocols the application supports.
@@ -1280,7 +1280,7 @@ void KRun::slotStatResult( TDEIO::Job * job )
 void KRun::slotScanMimeType( TDEIO::Job *, const TQString &mimetype )
 {
   if ( mimetype.isEmpty() )
-    kdWarning(7010) << "KRun::slotScanFinished : MimetypeJob didn't find a mimetype! Probably a kioslave bug." << endl;
+    kdWarning(7010) << "KRun::slotScanFinished : MimetypeJob didn't find a mimetype! Probably a tdeioslave bug." << endl;
   foundMimeType( mimetype );
   m_job = 0;
 }
diff --git a/kio/kio/krun.h b/tdeio/tdeio/krun.h
index 03186af85..03186af85 100644
--- a/kio/kio/krun.h
+++ b/tdeio/tdeio/krun.h
diff --git a/kio/kio/ksambashare.cpp b/tdeio/tdeio/ksambashare.cpp
index ff5b9c104..608594ee5 100644
--- a/kio/kio/ksambashare.cpp
+++ b/tdeio/tdeio/ksambashare.cpp
@@ -57,7 +57,7 @@ bool KSambaSharePrivate::load() {
 
 /**
  * Try to find the samba config file path
- * First tries the kconfig, then checks
+ * First tries the tdeconfig, then checks
  * several well-known paths
  * @return wether a smb.conf was found.
  **/
diff --git a/kio/kio/ksambashare.h b/tdeio/tdeio/ksambashare.h
index ffd298588..ffd298588 100644
--- a/kio/kio/ksambashare.h
+++ b/tdeio/tdeio/ksambashare.h
diff --git a/kio/kio/kscan.cpp b/tdeio/tdeio/kscan.cpp
index 49ae7c5ab..49ae7c5ab 100644
--- a/kio/kio/kscan.cpp
+++ b/tdeio/tdeio/kscan.cpp
diff --git a/kio/kio/kscan.h b/tdeio/tdeio/kscan.h
index 940b8ceaa..940b8ceaa 100644
--- a/kio/kio/kscan.h
+++ b/tdeio/tdeio/kscan.h
diff --git a/kio/kio/kservice.cpp b/tdeio/tdeio/kservice.cpp
index 547df4651..2a24743ab 100644
--- a/kio/kio/kservice.cpp
+++ b/tdeio/tdeio/kservice.cpp
@@ -43,7 +43,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 
@@ -886,7 +886,7 @@ void KService::rebuildKSycoca(TQWidget *parent)
   TQByteArray data;
   DCOPClient *client = kapp->dcopClient();
 
-  int result = client->callAsync("kded", "kbuildsycoca", "recreate()",
+  int result = client->callAsync("kded", "tdebuildsycoca", "recreate()",
                data, TQT_TQOBJECT(&dlg), TQT_SLOT(slotFinished()));
 
   if (result)
diff --git a/kio/kio/kservice.h b/tdeio/tdeio/kservice.h
index 4db478ba6..4db478ba6 100644
--- a/kio/kio/kservice.h
+++ b/tdeio/tdeio/kservice.h
diff --git a/kio/kio/kservice_p.h b/tdeio/tdeio/kservice_p.h
index 180ab8fc3..180ab8fc3 100644
--- a/kio/kio/kservice_p.h
+++ b/tdeio/tdeio/kservice_p.h
diff --git a/kio/kio/kservicefactory.cpp b/tdeio/tdeio/kservicefactory.cpp
index f4646fa75..f4646fa75 100644
--- a/kio/kio/kservicefactory.cpp
+++ b/tdeio/tdeio/kservicefactory.cpp
diff --git a/kio/kio/kservicefactory.h b/tdeio/tdeio/kservicefactory.h
index 4e6df6534..4e6df6534 100644
--- a/kio/kio/kservicefactory.h
+++ b/tdeio/tdeio/kservicefactory.h
diff --git a/kio/kio/kservicegroup.cpp b/tdeio/tdeio/kservicegroup.cpp
index 2e27c99b0..2e27c99b0 100644
--- a/kio/kio/kservicegroup.cpp
+++ b/tdeio/tdeio/kservicegroup.cpp
diff --git a/kio/kio/kservicegroup.h b/tdeio/tdeio/kservicegroup.h
index f2cd5a09f..f2cd5a09f 100644
--- a/kio/kio/kservicegroup.h
+++ b/tdeio/tdeio/kservicegroup.h
diff --git a/kio/kio/kservicegroupfactory.cpp b/tdeio/tdeio/kservicegroupfactory.cpp
index 56ec0c07f..56ec0c07f 100644
--- a/kio/kio/kservicegroupfactory.cpp
+++ b/tdeio/tdeio/kservicegroupfactory.cpp
diff --git a/kio/kio/kservicegroupfactory.h b/tdeio/tdeio/kservicegroupfactory.h
index 77bc7c042..77bc7c042 100644
--- a/kio/kio/kservicegroupfactory.h
+++ b/tdeio/tdeio/kservicegroupfactory.h
diff --git a/kio/kio/kservicetype.cpp b/tdeio/tdeio/kservicetype.cpp
index 8565029ee..8565029ee 100644
--- a/kio/kio/kservicetype.cpp
+++ b/tdeio/tdeio/kservicetype.cpp
diff --git a/kio/kio/kservicetype.h b/tdeio/tdeio/kservicetype.h
index b1cad7284..b1cad7284 100644
--- a/kio/kio/kservicetype.h
+++ b/tdeio/tdeio/kservicetype.h
diff --git a/kio/kio/kservicetypefactory.cpp b/tdeio/tdeio/kservicetypefactory.cpp
index ecf527384..ecf527384 100644
--- a/kio/kio/kservicetypefactory.cpp
+++ b/tdeio/tdeio/kservicetypefactory.cpp
diff --git a/kio/kio/kservicetypefactory.h b/tdeio/tdeio/kservicetypefactory.h
index e18630b2c..e18630b2c 100644
--- a/kio/kio/kservicetypefactory.h
+++ b/tdeio/tdeio/kservicetypefactory.h
diff --git a/kio/kio/kshellcompletion.cpp b/tdeio/tdeio/kshellcompletion.cpp
index 2fb67a31f..2fb67a31f 100644
--- a/kio/kio/kshellcompletion.cpp
+++ b/tdeio/tdeio/kshellcompletion.cpp
diff --git a/kio/kio/kshellcompletion.h b/tdeio/tdeio/kshellcompletion.h
index fa90c509e..fa90c509e 100644
--- a/kio/kio/kshellcompletion.h
+++ b/tdeio/tdeio/kshellcompletion.h
diff --git a/kio/kio/kshred.cpp b/tdeio/tdeio/kshred.cpp
index f3997bf58..f3997bf58 100644
--- a/kio/kio/kshred.cpp
+++ b/tdeio/tdeio/kshred.cpp
diff --git a/kio/kio/kshred.h b/tdeio/tdeio/kshred.h
index 7f817c1ea..5fabcaa5b 100644
--- a/kio/kio/kshred.h
+++ b/tdeio/tdeio/kshred.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqfile.h>
 #include <tqobject.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 /**
  * @deprecated
diff --git a/kio/kio/ktar.cpp b/tdeio/tdeio/ktar.cpp
index 9bde2873a..9bde2873a 100644
--- a/kio/kio/ktar.cpp
+++ b/tdeio/tdeio/ktar.cpp
diff --git a/kio/kio/ktar.h b/tdeio/tdeio/ktar.h
index fc238073c..fc238073c 100644
--- a/kio/kio/ktar.h
+++ b/tdeio/tdeio/ktar.h
diff --git a/kio/kio/ktrader.cpp b/tdeio/tdeio/ktrader.cpp
index 585c6a499..585c6a499 100644
--- a/kio/kio/ktrader.cpp
+++ b/tdeio/tdeio/ktrader.cpp
diff --git a/kio/kio/ktrader.h b/tdeio/tdeio/ktrader.h
index 98891b48d..c96a64a21 100644
--- a/kio/kio/ktrader.h
+++ b/tdeio/tdeio/ktrader.h
@@ -124,7 +124,7 @@ public:
      *                    a number
      *
      * @return A list of services that satisfy the query
-     * @see http://developer.kde.org/documentation/library/3.5-api/tdelibs-apidocs/kio/kio/html/tradersyntax.html
+     * @see http://developer.kde.org/documentation/library/3.5-api/tdelibs-apidocs/tdeio/tdeio/html/tradersyntax.html
      */
     virtual OfferList query( const TQString& servicetype,
 			     const TQString& constraint = TQString::null,
diff --git a/kio/kio/ktraderparse.cpp b/tdeio/tdeio/ktraderparse.cpp
index 627791c00..627791c00 100644
--- a/kio/kio/ktraderparse.cpp
+++ b/tdeio/tdeio/ktraderparse.cpp
diff --git a/kio/kio/ktraderparse.h b/tdeio/tdeio/ktraderparse.h
index bfeb15fe0..bfeb15fe0 100644
--- a/kio/kio/ktraderparse.h
+++ b/tdeio/tdeio/ktraderparse.h
diff --git a/kio/kio/ktraderparsetree.cpp b/tdeio/tdeio/ktraderparsetree.cpp
index 0a04b7918..0a04b7918 100644
--- a/kio/kio/ktraderparsetree.cpp
+++ b/tdeio/tdeio/ktraderparsetree.cpp
diff --git a/kio/kio/ktraderparsetree.h b/tdeio/tdeio/ktraderparsetree.h
index a08b61a5a..a08b61a5a 100644
--- a/kio/kio/ktraderparsetree.h
+++ b/tdeio/tdeio/ktraderparsetree.h
diff --git a/kio/kio/kurifilter.cpp b/tdeio/tdeio/kurifilter.cpp
index 5c50f4fa9..5c50f4fa9 100644
--- a/kio/kio/kurifilter.cpp
+++ b/tdeio/tdeio/kurifilter.cpp
diff --git a/kio/kio/kurifilter.h b/tdeio/tdeio/kurifilter.h
index fd7cb9b3c..fd7cb9b3c 100644
--- a/kio/kio/kurifilter.h
+++ b/tdeio/tdeio/kurifilter.h
diff --git a/kio/kio/kurlcompletion.cpp b/tdeio/tdeio/kurlcompletion.cpp
index 2dc4185cc..22bbe147a 100644
--- a/kio/kio/kurlcompletion.cpp
+++ b/tdeio/tdeio/kurlcompletion.cpp
@@ -43,10 +43,10 @@
 #include <kdebug.h>
 #include <kcompletion.h>
 #include <kurl.h>
-#include <kio/jobclasses.h>
-#include <kio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/job.h>
 #include <kprotocolinfo.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kde_file.h>
diff --git a/kio/kio/kurlcompletion.h b/tdeio/tdeio/kurlcompletion.h
index f785696b4..30a825d3d 100644
--- a/kio/kio/kurlcompletion.h
+++ b/tdeio/tdeio/kurlcompletion.h
@@ -24,7 +24,7 @@
 #define KURLCOMPLETION_H
 
 #include <kcompletion.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 
diff --git a/kio/kio/kurlpixmapprovider.cpp b/tdeio/tdeio/kurlpixmapprovider.cpp
index caeedf066..caeedf066 100644
--- a/kio/kio/kurlpixmapprovider.cpp
+++ b/tdeio/tdeio/kurlpixmapprovider.cpp
diff --git a/kio/kio/kurlpixmapprovider.h b/tdeio/tdeio/kurlpixmapprovider.h
index 82be4bd1b..82be4bd1b 100644
--- a/kio/kio/kurlpixmapprovider.h
+++ b/tdeio/tdeio/kurlpixmapprovider.h
diff --git a/kio/kio/kuserprofile.cpp b/tdeio/tdeio/kuserprofile.cpp
index b413b3cd5..ebd8b8deb 100644
--- a/kio/kio/kuserprofile.cpp
+++ b/tdeio/tdeio/kuserprofile.cpp
@@ -21,7 +21,7 @@
 #include "kservicetype.h"
 #include "kservicetypefactory.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kglobal.h>
 #include <kdebug.h>
diff --git a/kio/kio/kuserprofile.h b/tdeio/tdeio/kuserprofile.h
index 45b58fe6a..45b58fe6a 100644
--- a/kio/kio/kuserprofile.h
+++ b/tdeio/tdeio/kuserprofile.h
diff --git a/kio/kio/kzip.cpp b/tdeio/tdeio/kzip.cpp
index 6241cc1ca..85dcb76d1 100644
--- a/kio/kio/kzip.cpp
+++ b/tdeio/tdeio/kzip.cpp
@@ -18,7 +18,7 @@
 */
 
 /*
-	This class implements a kioslave to access ZIP files from KDE.
+	This class implements a tdeioslave to access ZIP files from KDE.
     you can use it in IO_ReadOnly or in IO_WriteOnly mode, and it
     behaves just as expected (i hope ;-) ).
     It can also be used in IO_ReadWrite mode, in this case one can
diff --git a/kio/kio/kzip.h b/tdeio/tdeio/kzip.h
index 9e4d24eeb..333736e21 100644
--- a/kio/kio/kzip.h
+++ b/tdeio/tdeio/kzip.h
@@ -30,7 +30,7 @@
 
 class KZipFileEntry;
 /**
- *   This class implements a kioslave to access zip files from KDE.
+ *   This class implements a tdeioslave to access zip files from KDE.
  *   You can use it in IO_ReadOnly or in IO_WriteOnly mode, and it
  *   behaves just as expected.
  *   It can also be used in IO_ReadWrite mode, in this case one can
diff --git a/kio/kio/lex.c b/tdeio/tdeio/lex.c
index 99848a2f3..99848a2f3 100644
--- a/kio/kio/lex.c
+++ b/tdeio/tdeio/lex.c
diff --git a/kio/kio/lex.l b/tdeio/tdeio/lex.l
index 073a34965..073a34965 100644
--- a/kio/kio/lex.l
+++ b/tdeio/tdeio/lex.l
diff --git a/kio/kio/metainfojob.cpp b/tdeio/tdeio/metainfojob.cpp
index d28914f20..d9a31ab0e 100644
--- a/kio/kio/metainfojob.cpp
+++ b/tdeio/tdeio/metainfojob.cpp
@@ -21,10 +21,10 @@
 */
 
 #include <kdatastream.h> // Do not remove, needed for correct bool serialization
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdebug.h>
-#include <kfilemetainfo.h>
-#include <kio/kservice.h>
+#include <tdefilemetainfo.h>
+#include <tdeio/kservice.h>
 #include <tdeparts/componentfactory.h>
 
 #include <tqtimer.h>
diff --git a/kio/kio/metainfojob.h b/tdeio/tdeio/metainfojob.h
index e2152bded..3a9fab67e 100644
--- a/kio/kio/metainfojob.h
+++ b/tdeio/tdeio/metainfojob.h
@@ -22,8 +22,8 @@
 #ifndef __kio_metainfojob_h__
 #define __kio_metainfojob_h__
 
-#include <kio/job.h>
-#include <kfileitem.h>
+#include <tdeio/job.h>
+#include <tdefileitem.h>
 
 namespace TDEIO {
     /**
diff --git a/kio/kio/netaccess.cpp b/tdeio/tdeio/netaccess.cpp
index 11c20be49..89830d88b 100644
--- a/kio/kio/netaccess.cpp
+++ b/tdeio/tdeio/netaccess.cpp
@@ -38,10 +38,10 @@
 #include <ktempfile.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/job.h>
-#include <kio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/scheduler.h>
 
-#include "kio/netaccess.h"
+#include "tdeio/netaccess.h"
 
 using namespace TDEIO;
 
diff --git a/kio/kio/netaccess.h b/tdeio/tdeio/netaccess.h
index 54dd02974..356a91738 100644
--- a/kio/kio/netaccess.h
+++ b/tdeio/tdeio/netaccess.h
@@ -25,7 +25,7 @@
 
 #include <tqobject.h>
 #include <tqstring.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class TQStringList;
 class TQWidget;
diff --git a/kio/kio/observer.cpp b/tdeio/tdeio/observer.cpp
index 347db9df9..5e4e7aa87 100644
--- a/kio/kio/observer.cpp
+++ b/tdeio/tdeio/observer.cpp
@@ -57,25 +57,25 @@ Observer::Observer() : DCOPObject("TDEIO::Observer")
         kapp->dcopClient()->attach();
     }
 
-    if ( !kapp->dcopClient()->isApplicationRegistered( "kio_uiserver" ) )
+    if ( !kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
     {
-        kdDebug(KDEBUG_OBSERVER) << "Starting kio_uiserver" << endl;
+        kdDebug(KDEBUG_OBSERVER) << "Starting tdeio_uiserver" << endl;
         TQString error;
-        int ret = TDEApplication::startServiceByDesktopPath( "kio_uiserver.desktop",
+        int ret = TDEApplication::startServiceByDesktopPath( "tdeio_uiserver.desktop",
                                                              TQStringList(), &error );
         if ( ret > 0 )
         {
-            kdError() << "Couldn't start kio_uiserver from kio_uiserver.desktop: " << error << endl;
+            kdError() << "Couldn't start tdeio_uiserver from tdeio_uiserver.desktop: " << error << endl;
         } else
             kdDebug(KDEBUG_OBSERVER) << "startServiceByDesktopPath returned " << ret << endl;
 
     }
-    if ( !kapp->dcopClient()->isApplicationRegistered( "kio_uiserver" ) )
-        kdDebug(KDEBUG_OBSERVER) << "The application kio_uiserver is STILL NOT REGISTERED" << endl;
+    if ( !kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
+        kdDebug(KDEBUG_OBSERVER) << "The application tdeio_uiserver is STILL NOT REGISTERED" << endl;
     else
-        kdDebug(KDEBUG_OBSERVER) << "kio_uiserver registered" << endl;
+        kdDebug(KDEBUG_OBSERVER) << "tdeio_uiserver registered" << endl;
 
-    m_uiserver = new UIServer_stub( "kio_uiserver", "UIServer" );
+    m_uiserver = new UIServer_stub( "tdeio_uiserver", "UIServer" );
 }
 
 int Observer::newJob( TDEIO::Job * job, bool showProgress )
@@ -264,7 +264,7 @@ int Observer::messageBox( int progressId, int type, const TQString &text,
 {
     kdDebug() << "Observer::messageBox " << type << " " << text << " - " << caption << endl;
     int result = -1;
-    TDEConfig *config = new TDEConfig("kioslaverc");
+    TDEConfig *config = new TDEConfig("tdeioslaverc");
     KMessageBox::setDontShowAskAgainConfig(config);
 
     switch (type) {
@@ -353,7 +353,7 @@ int Observer::messageBox( int progressId, int type, const TQString &text,
     arg << caption;
     arg << buttonYes;
     arg << buttonNo;
-    if ( kapp->dcopClient()->call( "kio_uiserver", "UIServer", "messageBox(int,int,TQString,TQString,TQString,TQString)", data, replyType, replyData, true )
+    if ( kapp->dcopClient()->call( "tdeio_uiserver", "UIServer", "messageBox(int,int,TQString,TQString,TQString,TQString)", data, replyType, replyData, true )
         && replyType == "int" )
     {
         int result;
diff --git a/kio/kio/observer.h b/tdeio/tdeio/observer.h
index 1869e5638..f018bb399 100644
--- a/kio/kio/observer.h
+++ b/tdeio/tdeio/observer.h
@@ -23,11 +23,11 @@
 #include <dcopobject.h>
 #include <tqintdict.h>
 
-#include <kio/global.h>
-#include <kio/authinfo.h>
-#include "kio/job.h"
-#include "kio/skipdlg.h"
-#include "kio/renamedlg.h"
+#include <tdeio/global.h>
+#include <tdeio/authinfo.h>
+#include "tdeio/job.h"
+#include "tdeio/skipdlg.h"
+#include "tdeio/renamedlg.h"
 
 class UIServer_stub;
 class KURL;
@@ -122,7 +122,7 @@ public:
    * @param buttonYes the text of the "Yes" button
    * @param buttonNo the text of the "No button
    * @param dontAskAgainName A checkbox is added with which further confirmation can be turned off.
-   *        The string is used to lookup and store the setting in kioslaverc.
+   *        The string is used to lookup and store the setting in tdeioslaverc.
    * @since 3.3
    */
   static int messageBox( int progressId, int type, const TQString &text, const TQString &caption,
diff --git a/kio/kio/passdlg.cpp b/tdeio/tdeio/passdlg.cpp
index 1b5679028..54bcec3b2 100644
--- a/kio/kio/passdlg.cpp
+++ b/tdeio/tdeio/passdlg.cpp
@@ -27,7 +27,7 @@
 #include <tqstylesheet.h>
 
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/kio/kio/passdlg.h b/tdeio/tdeio/passdlg.h
index 864023398..864023398 100644
--- a/kio/kio/passdlg.h
+++ b/tdeio/tdeio/passdlg.h
diff --git a/kio/kio/paste.cpp b/tdeio/tdeio/paste.cpp
index 472f4e313..fd24f9a0d 100644
--- a/kio/kio/paste.cpp
+++ b/tdeio/tdeio/paste.cpp
@@ -19,12 +19,12 @@
 #include "paste.h"
 #include "pastedialog.h"
 
-#include "kio/job.h"
-#include "kio/global.h"
-#include "kio/netaccess.h"
-#include "kio/observer.h"
-#include "kio/renamedlg.h"
-#include "kio/kprotocolmanager.h"
+#include "tdeio/job.h"
+#include "tdeio/global.h"
+#include "tdeio/netaccess.h"
+#include "tdeio/observer.h"
+#include "tdeio/renamedlg.h"
+#include "tdeio/kprotocolmanager.h"
 
 #include <kurl.h>
 #include <kurldrag.h>
diff --git a/kio/kio/paste.h b/tdeio/tdeio/paste.h
index 66579831a..66579831a 100644
--- a/kio/kio/paste.h
+++ b/tdeio/tdeio/paste.h
diff --git a/kio/kio/pastedialog.cpp b/tdeio/tdeio/pastedialog.cpp
index 0252baff1..0252baff1 100644
--- a/kio/kio/pastedialog.cpp
+++ b/tdeio/tdeio/pastedialog.cpp
diff --git a/kio/kio/pastedialog.h b/tdeio/tdeio/pastedialog.h
index 2e7bdfda1..2e7bdfda1 100644
--- a/kio/kio/pastedialog.h
+++ b/tdeio/tdeio/pastedialog.h
diff --git a/kio/kio/posixacladdons.cpp b/tdeio/tdeio/posixacladdons.cpp
index bae51592b..bae51592b 100644
--- a/kio/kio/posixacladdons.cpp
+++ b/tdeio/tdeio/posixacladdons.cpp
diff --git a/kio/kio/posixacladdons.h b/tdeio/tdeio/posixacladdons.h
index 45c4af245..45c4af245 100644
--- a/kio/kio/posixacladdons.h
+++ b/tdeio/tdeio/posixacladdons.h
diff --git a/kio/kio/previewjob.cpp b/tdeio/tdeio/previewjob.cpp
index de4800ab1..539d88bea 100644
--- a/kio/kio/previewjob.cpp
+++ b/tdeio/tdeio/previewjob.cpp
@@ -41,7 +41,7 @@
 #include <tqregexp.h>
 
 #include <kdatastream.h> // Do not remove, needed for correct bool serialization
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kapplication.h>
 #include <ktempfile.h>
 #include <ktrader.h>
@@ -49,7 +49,7 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 
-#include <kio/kservice.h>
+#include <tdeio/kservice.h>
 
 #include "previewjob.moc"
 
diff --git a/kio/kio/previewjob.h b/tdeio/tdeio/previewjob.h
index fe8e16c0f..9c62859c9 100644
--- a/kio/kio/previewjob.h
+++ b/tdeio/tdeio/previewjob.h
@@ -24,8 +24,8 @@
 #ifndef __kio_previewjob_h__
 #define __kio_previewjob_h__
 
-#include <kfileitem.h>
-#include <kio/job.h>
+#include <tdefileitem.h>
+#include <tdeio/job.h>
 
 class TQPixmap;
 
diff --git a/kio/kio/progressbase.cpp b/tdeio/tdeio/progressbase.cpp
index 146f4182e..146f4182e 100644
--- a/kio/kio/progressbase.cpp
+++ b/tdeio/tdeio/progressbase.cpp
diff --git a/kio/kio/progressbase.h b/tdeio/tdeio/progressbase.h
index 2be545621..655edeee5 100644
--- a/kio/kio/progressbase.h
+++ b/tdeio/tdeio/progressbase.h
@@ -21,7 +21,7 @@
 
 #include <tqwidget.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class KURL;
 namespace TDEIO {
diff --git a/kio/kio/renamedlg.cpp b/tdeio/tdeio/renamedlg.cpp
index 7bba95460..d66130993 100644
--- a/kio/kio/renamedlg.cpp
+++ b/tdeio/tdeio/renamedlg.cpp
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kio/renamedlg.h"
-#include "kio/renamedlgplugin.h"
+#include "tdeio/renamedlg.h"
+#include "tdeio/renamedlgplugin.h"
 #include <stdio.h>
 #include <assert.h>
 
@@ -33,7 +33,7 @@
 #include <kmessagebox.h>
 #include <kpushbutton.h>
 #include <kapplication.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <ktrader.h>
 #include <klibloader.h>
 #include <kdialog.h>
@@ -96,7 +96,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
     d = new RenameDlgPrivate( );
     d->modal = _modal;
 #if 0
-    // Set "StaysOnTop", because this dialog is typically used in kio_uiserver,
+    // Set "StaysOnTop", because this dialog is typically used in tdeio_uiserver,
     // i.e. in a separate process.
     // ####### This isn't the case anymore - remove?
 #if !defined(Q_WS_QWS) && !defined(Q_WS_WIN) //FIXME(E): Implement for QT Embedded & win32
diff --git a/kio/kio/renamedlg.h b/tdeio/tdeio/renamedlg.h
index 38dcac925..81f16df94 100644
--- a/kio/kio/renamedlg.h
+++ b/tdeio/tdeio/renamedlg.h
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <sys/types.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 namespace TDEIO {
 
diff --git a/kio/kio/renamedlgplugin.h b/tdeio/tdeio/renamedlgplugin.h
index b3604b084..18daab017 100644
--- a/kio/kio/renamedlgplugin.h
+++ b/tdeio/tdeio/renamedlgplugin.h
@@ -20,7 +20,7 @@
 #ifndef renamedlgplugin_h
 #define renamedlgplugin_h
 
-#include <kio/renamedlg.h>
+#include <tdeio/renamedlg.h>
 #include <tqdialog.h>
 #include <sys/types.h>
 #include <tqstring.h>
diff --git a/kio/kio/scheduler.cpp b/tdeio/tdeio/scheduler.cpp
index 09560cb8b..c0aad7d38 100644
--- a/kio/kio/scheduler.cpp
+++ b/tdeio/tdeio/scheduler.cpp
@@ -17,11 +17,11 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kio/sessiondata.h"
-#include "kio/slaveconfig.h"
-#include "kio/scheduler.h"
-#include "kio/authinfo.h"
-#include "kio/slave.h"
+#include "tdeio/sessiondata.h"
+#include "tdeio/slaveconfig.h"
+#include "tdeio/scheduler.h"
+#include "tdeio/authinfo.h"
+#include "tdeio/slave.h"
 #include <tqptrlist.h>
 #include <tqdict.h>
 
diff --git a/kio/kio/scheduler.h b/tdeio/tdeio/scheduler.h
index ac0764dc4..e55b2293c 100644
--- a/kio/kio/scheduler.h
+++ b/tdeio/tdeio/scheduler.h
@@ -22,8 +22,8 @@
 #ifndef _kio_scheduler_h
 #define _kio_scheduler_h
 
-#include "kio/job.h"
-#include "kio/jobclasses.h"
+#include "tdeio/job.h"
+#include "tdeio/jobclasses.h"
 #include <tqtimer.h>
 #include <tqptrdict.h>
 #include <tqmap.h>
diff --git a/kio/kio/sessiondata.cpp b/tdeio/tdeio/sessiondata.cpp
index e2517cc73..99c6a26f3 100644
--- a/kio/kio/sessiondata.cpp
+++ b/tdeio/tdeio/sessiondata.cpp
@@ -22,7 +22,7 @@
 #include <tqtextcodec.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kcharsets.h>
@@ -31,8 +31,8 @@
 #include <kstandarddirs.h>
 
 #include <tdesu/client.h>
-#include <kio/slaveconfig.h>
-#include <kio/http_slave_defaults.h>
+#include <tdeio/slaveconfig.h>
+#include <tdeio/http_slave_defaults.h>
 
 #include "sessiondata.h"
 #include "sessiondata.moc"
diff --git a/kio/kio/sessiondata.h b/tdeio/tdeio/sessiondata.h
index 4fef02161..a87e63dba 100644
--- a/kio/kio/sessiondata.h
+++ b/tdeio/tdeio/sessiondata.h
@@ -22,7 +22,7 @@
 #define __KIO_SESSIONDATA_H
 
 #include <tqobject.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 namespace TDEIO  {
 
diff --git a/kio/kio/skipdlg.cpp b/tdeio/tdeio/skipdlg.cpp
index f4a14a229..eab245dfc 100644
--- a/kio/kio/skipdlg.cpp
+++ b/tdeio/tdeio/skipdlg.cpp
@@ -16,7 +16,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kio/skipdlg.h"
+#include "tdeio/skipdlg.h"
 
 #include <stdio.h>
 #include <assert.h>
@@ -44,7 +44,7 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo
   // TODO : port to KDialogBase
   modal = _modal;
 
-  // Set "StaysOnTop", because this dialog is typically used in kio_uiserver,
+  // Set "StaysOnTop", because this dialog is typically used in tdeio_uiserver,
   // i.e. in a separate process.
 #ifdef Q_WS_X11 //FIXME(E): Implement for QT Embedded, mac & win32
   if (modal)
diff --git a/kio/kio/skipdlg.h b/tdeio/tdeio/skipdlg.h
index 56252dace..56252dace 100644
--- a/kio/kio/skipdlg.h
+++ b/tdeio/tdeio/skipdlg.h
diff --git a/kio/kio/slave.cpp b/tdeio/tdeio/slave.cpp
index 6e834f5fa..dfd6d6bb3 100644
--- a/kio/kio/slave.cpp
+++ b/tdeio/tdeio/slave.cpp
@@ -44,10 +44,10 @@
 #include <kprocess.h>
 #include <klibloader.h>
 
-#include "kio/dataprotocol.h"
-#include "kio/slave.h"
-#include "kio/kservice.h"
-#include <kio/global.h>
+#include "tdeio/dataprotocol.h"
+#include "tdeio/slave.h"
+#include "tdeio/kservice.h"
+#include <tdeio/global.h>
 #include <kprotocolmanager.h>
 #include <kprotocolinfo.h>
 
@@ -385,7 +385,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
 #endif
 
     // WABA: if the dcopserver is running under another uid we don't ask
-    // klauncher for a slave, because the slave might have that other uid
+    // tdelauncher for a slave, because the slave might have that other uid
     // as well, which might either be a) undesired or b) make it impossible
     // for the slave to connect to the application.
     // In such case we start the slave via TDEProcess.
@@ -413,8 +413,8 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
 
        TDEProcess proc;
 
-       proc << locate("exe", "kioslave") << lib_path << protocol << "" << socketfile.name();
-       kdDebug(7002) << "kioslave" << ", " << lib_path << ", " << protocol << ", " << TQString::null << ", " << socketfile.name() << endl;
+       proc << locate("exe", "tdeioslave") << lib_path << protocol << "" << socketfile.name();
+       kdDebug(7002) << "tdeioslave" << ", " << lib_path << ", " << protocol << ", " << TQString::null << ", " << socketfile.name() << endl;
 
        proc.start(TDEProcess::DontCare);
 
@@ -434,7 +434,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
     TQCString launcher = TDEApplication::launcher();
     if (!client->call(launcher, launcher, "requestSlave(TQString,TQString,TQString)",
 	    params, replyType, reply)) {
-	error_text = i18n("Cannot talk to klauncher");
+	error_text = i18n("Cannot talk to tdelauncher");
 	error = TDEIO::ERR_SLAVE_DEFINED;
         delete slave;
         return 0;
@@ -445,7 +445,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
     stream2 >> pid >> errorStr;
     if (!pid)
     {
-        error_text = i18n("Unable to create io-slave:\nklauncher said: %1").arg(errorStr);
+        error_text = i18n("Unable to create io-slave:\ntdelauncher said: %1").arg(errorStr);
         error = TDEIO::ERR_CANNOT_LAUNCH_PROCESS;
         delete slave;
         return 0;
diff --git a/kio/kio/slave.h b/tdeio/tdeio/slave.h
index 6f9f02a2f..80ae30d3a 100644
--- a/kio/kio/slave.h
+++ b/tdeio/tdeio/slave.h
@@ -29,8 +29,8 @@
 
 #include <kurl.h>
 
-#include "kio/slaveinterface.h"
-#include "kio/connection.h"
+#include "tdeio/slaveinterface.h"
+#include "tdeio/connection.h"
 
 class TDEServerSocket;
 class TDESocket;
@@ -153,34 +153,34 @@ namespace TDEIO {
 
         static Slave* holdSlave( const TQString &protocol, const KURL& url );
 
-	// == communication with connected kioslave ==
+	// == communication with connected tdeioslave ==
 	// whenever possible prefer these methods over the respective
 	// methods in connection()
 	/**
-	 * Suspends the operation of the attached kioslave.
+	 * Suspends the operation of the attached tdeioslave.
 	 */
         void suspend();		// TODO(BIC): make virtual
 	/**
-	 * Resumes the operation of the attached kioslave.
+	 * Resumes the operation of the attached tdeioslave.
 	 */
         void resume();		// TODO(BIC): make virtual
 	/**
-	 * Tells wether the kioslave is suspended.
-	 * @return true if the kioslave is suspended.
+	 * Tells wether the tdeioslave is suspended.
+	 * @return true if the tdeioslave is suspended.
 	 * @since 3.2
 	 */
         bool suspended();	// TODO(BIC): make virtual
 	/**
-	 * Sends the given command to the kioslave.
+	 * Sends the given command to the tdeioslave.
 	 * @param cmd command id
 	 * @param data byte array containing data
 	 * @since 3.2
 	 */
         void send(int cmd, const TQByteArray &data = TQByteArray());// TODO(BIC): make virtual
-	// == end communication with connected kioslave ==
+	// == end communication with connected tdeioslave ==
 
 	/**
-	 * Puts the kioslave associated with @p url at halt.
+	 * Puts the tdeioslave associated with @p url at halt.
 	 */
 	void hold(const KURL &url);	// TODO(BIC): make virtual
 
diff --git a/kio/kio/slavebase.cpp b/tdeio/tdeio/slavebase.cpp
index 07d784527..e979f530b 100644
--- a/kio/kio/slavebase.cpp
+++ b/tdeio/tdeio/slavebase.cpp
@@ -53,10 +53,10 @@
 
 #include "kremoteencoding.h"
 
-#include "kio/slavebase.h"
-#include "kio/connection.h"
-#include "kio/ioslave_defaults.h"
-#include "kio/slaveinterface.h"
+#include "tdeio/slavebase.h"
+#include "tdeio/connection.h"
+#include "tdeio/ioslave_defaults.h"
+#include "tdeio/slaveinterface.h"
 
 #include "uiserver_stub.h"
 
@@ -147,7 +147,7 @@ static void genericsig_handler(int sigNumber)
    signal(sigNumber,SIG_IGN);
    //WABA: Don't do anything that requires malloc, we can deadlock on it since
    //a SIGTERM signal can come in while we are in malloc/free.
-   //kdDebug()<<"kioslave : exiting due to signal "<<sigNumber<<endl;
+   //kdDebug()<<"tdeioslave : exiting due to signal "<<sigNumber<<endl;
    //set the flag which will be checked in dispatchLoop() and which *should* be checked
    //in lengthy operations in the various slaves
    if (globalSlave!=0)
@@ -739,7 +739,7 @@ void SlaveBase::sigsegv_handler(int sig)
     // Debug and printf should be avoided because they might
     // call malloc.. and get in a nice recursive malloc loop
     char buffer[120];
-    snprintf(buffer, sizeof(buffer), "kioslave: ####### CRASH ###### protocol = %s pid = %d signal = %d\n", s_protocol, getpid(), sig);
+    snprintf(buffer, sizeof(buffer), "tdeioslave: ####### CRASH ###### protocol = %s pid = %d signal = %d\n", s_protocol, getpid(), sig);
     write(2, buffer, strlen(buffer));
 #ifndef NDEBUG
 #ifdef HAVE_BACKTRACE
@@ -861,7 +861,7 @@ bool SlaveBase::openPassDlg( AuthInfo& info, const TQString &errorMsg )
 
     (void) dcopClient(); // Make sure to have a dcop client.
 
-    UIServer_stub uiserver( "kio_uiserver", "UIServer" );
+    UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
     if (progressId)
       uiserver.setJobVisible( progressId, false );
 
diff --git a/kio/kio/slavebase.h b/tdeio/tdeio/slavebase.h
index a65a1f94f..1030d94c4 100644
--- a/kio/kio/slavebase.h
+++ b/tdeio/tdeio/slavebase.h
@@ -21,9 +21,9 @@
 #define __slavebase_h
 
 #include <kurl.h>
-#include <kconfigbase.h>
-#include <kio/global.h>
-#include <kio/authinfo.h>
+#include <tdeconfigbase.h>
+#include <tdeio/global.h>
+#include <tdeio/authinfo.h>
 
 class DCOPClient;
 class KRemoteEncoding;
@@ -35,7 +35,7 @@ class SlaveBasePrivate;
 
 /**
  * There are two classes that specifies the protocol between application (job)
- * and kioslave. SlaveInterface is the class to use on the application end,
+ * and tdeioslave. SlaveInterface is the class to use on the application end,
  * SlaveBase is the one to use on the slave end.
  *
  * Slave implementations should simply inherit SlaveBase
@@ -261,7 +261,7 @@ public:
      * Note: for ContinueCancel, buttonYes is the continue button and buttonNo is unused.
      *       and for Information, none is used.
      * @param dontAskAgainName A checkbox is added with which further confirmation can be turned off.
-     *        The string is used to lookup and store the setting in kioslaverc.
+     *        The string is used to lookup and store the setting in tdeioslaverc.
      * @return a button code, as defined in KMessageBox, or 0 on communication error.
      * @since 3.3
      */
diff --git a/kio/kio/slaveconfig.cpp b/tdeio/tdeio/slaveconfig.cpp
index c0ec44779..e81146e76 100644
--- a/kio/kio/slaveconfig.cpp
+++ b/tdeio/tdeio/slaveconfig.cpp
@@ -24,7 +24,7 @@
 
 #include <tqdict.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstaticdeleter.h>
 #include <kprotocolinfo.h>
 #include <kprotocolmanager.h>
diff --git a/kio/kio/slaveconfig.h b/tdeio/tdeio/slaveconfig.h
index 5bdc6cda8..500910062 100644
--- a/kio/kio/slaveconfig.h
+++ b/tdeio/tdeio/slaveconfig.h
@@ -22,7 +22,7 @@
 #define KIO_SLAVE_CONFIG_H
 
 #include <tqobject.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 namespace TDEIO {
 
diff --git a/kio/kio/slaveinterface.cpp b/tdeio/tdeio/slaveinterface.cpp
index 5ba2f6e86..40b66c47a 100644
--- a/kio/kio/slaveinterface.cpp
+++ b/tdeio/tdeio/slaveinterface.cpp
@@ -16,9 +16,9 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kio/slaveinterface.h"
-#include "kio/slavebase.h"
-#include "kio/connection.h"
+#include "tdeio/slaveinterface.h"
+#include "tdeio/slavebase.h"
+#include "tdeio/connection.h"
 #include <errno.h>
 #include <assert.h>
 #include <kdebug.h>
@@ -26,7 +26,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include <signal.h>
-#include <kio/observer.h>
+#include <tdeio/observer.h>
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <time.h>
diff --git a/kio/kio/slaveinterface.h b/tdeio/tdeio/slaveinterface.h
index 8ac7b683e..a8992ee65 100644
--- a/kio/kio/slaveinterface.h
+++ b/tdeio/tdeio/slaveinterface.h
@@ -26,8 +26,8 @@
 #include <tqobject.h>
 
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/authinfo.h>
+#include <tdeio/global.h>
+#include <tdeio/authinfo.h>
 #include <kdatastream.h>
 
 namespace TDEIO {
@@ -85,7 +85,7 @@ class SlaveInterfacePrivate;
 
 /**
  * There are two classes that specifies the protocol between application
- * (TDEIO::Job) and kioslave. SlaveInterface is the class to use on the application
+ * (TDEIO::Job) and tdeioslave. SlaveInterface is the class to use on the application
  * end, SlaveBase is the one to use on the slave end.
  *
  * A call to foo() results in a call to slotFoo() on the other end.
diff --git a/kio/kio/statusbarprogress.cpp b/tdeio/tdeio/statusbarprogress.cpp
index 66517ca03..66517ca03 100644
--- a/kio/kio/statusbarprogress.cpp
+++ b/tdeio/tdeio/statusbarprogress.cpp
diff --git a/kio/kio/statusbarprogress.h b/tdeio/tdeio/statusbarprogress.h
index d1d591fbe..d1d591fbe 100644
--- a/kio/kio/statusbarprogress.h
+++ b/tdeio/tdeio/statusbarprogress.h
diff --git a/kio/kio/tcpslavebase.cpp b/tdeio/tdeio/tcpslavebase.cpp
index 8d3cc49ff..2b7df9d7b 100644
--- a/kio/kio/tcpslavebase.cpp
+++ b/tdeio/tdeio/tcpslavebase.cpp
@@ -58,7 +58,7 @@
 #include <kprotocolmanager.h>
 #include <kde_file.h>
 
-#include "kio/tcpslavebase.h"
+#include "tdeio/tcpslavebase.h"
 
 using namespace TDEIO;
 
@@ -327,7 +327,7 @@ bool TCPSlaveBase::connectToHost( const TQString &host,
                                    "WarnOnLeaveSSLMode" );
 
            // Move this setting into KSSL instead
-          TDEConfig *config = new TDEConfig("kioslaverc");
+          TDEConfig *config = new TDEConfig("tdeioslaverc");
           config->setGroup("Notification Messages");
 
           if (!config->readBoolEntry("WarnOnLeaveSSLMode", true)) {
@@ -630,8 +630,8 @@ KSSLCertificateHome::KSSLAuthAction aa;
     if (!d->dcc) {
         d->dcc = new DCOPClient;
         d->dcc->attach();
-        if (!d->dcc->isApplicationRegistered("kio_uiserver")) {
-           TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",
+        if (!d->dcc->isApplicationRegistered("tdeio_uiserver")) {
+           TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",
                                                    TQStringList() );
         }
     }
@@ -642,7 +642,7 @@ KSSLCertificateHome::KSSLAuthAction aa;
      arg << ourHost;
      arg << certs;
      arg << metaData("window-id").toInt();
-     bool rc = d->dcc->call("kio_uiserver", "UIServer",
+     bool rc = d->dcc->call("tdeio_uiserver", "UIServer",
                                "showSSLCertDialog(TQString, TQStringList,int)",
                                data, rettype, retval);
 
@@ -894,8 +894,8 @@ int TCPSlaveBase::verifyCertificate()
                    if (!d->dcc) {
                       d->dcc = new DCOPClient;
                       d->dcc->attach();
-                      if (!d->dcc->isApplicationRegistered("kio_uiserver")) {
-                         TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",
+                      if (!d->dcc->isApplicationRegistered("tdeio_uiserver")) {
+                         TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",
                          TQStringList() );
                       }
 
@@ -905,7 +905,7 @@ int TCPSlaveBase::verifyCertificate()
                    TQDataStream arg(data, IO_WriteOnly);
                    arg << theurl << mOutgoingMetaData;
                    arg << metaData("window-id").toInt();
-                        d->dcc->call("kio_uiserver", "UIServer",
+                        d->dcc->call("tdeio_uiserver", "UIServer",
                                 "showSSLInfoDialog(TQString,TDEIO::MetaData,int)",
                                 data, ignoretype, ignore);
                 }
@@ -1022,8 +1022,8 @@ int TCPSlaveBase::verifyCertificate()
                    if (!d->dcc) {
                       d->dcc = new DCOPClient;
                       d->dcc->attach();
-                      if (!d->dcc->isApplicationRegistered("kio_uiserver")) {
-                         TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",
+                      if (!d->dcc->isApplicationRegistered("tdeio_uiserver")) {
+                         TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",
                          TQStringList() );
                       }
                    }
@@ -1032,7 +1032,7 @@ int TCPSlaveBase::verifyCertificate()
                    TQDataStream arg(data, IO_WriteOnly);
                    arg << theurl << mOutgoingMetaData;
                    arg << metaData("window-id").toInt();
-                        d->dcc->call("kio_uiserver", "UIServer",
+                        d->dcc->call("tdeio_uiserver", "UIServer",
                                 "showSSLInfoDialog(TQString,TDEIO::MetaData,int)",
                                 data, ignoretype, ignore);
                 }
@@ -1090,7 +1090,7 @@ int TCPSlaveBase::verifyCertificate()
                                                    i18n("C&onnect"),
                                                    "WarnOnEnterSSLMode" );
       // Move this setting into KSSL instead
-      TDEConfig *config = new TDEConfig("kioslaverc");
+      TDEConfig *config = new TDEConfig("tdeioslaverc");
       config->setGroup("Notification Messages");
 
       if (!config->readBoolEntry("WarnOnEnterSSLMode", true)) {
@@ -1106,8 +1106,8 @@ int TCPSlaveBase::verifyCertificate()
           if (!d->dcc) {
              d->dcc = new DCOPClient;
              d->dcc->attach();
-             if (!d->dcc->isApplicationRegistered("kio_uiserver")) {
-                TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",
+             if (!d->dcc->isApplicationRegistered("tdeio_uiserver")) {
+                TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",
                 TQStringList() );
              }
           }
@@ -1116,7 +1116,7 @@ int TCPSlaveBase::verifyCertificate()
           TQDataStream arg(data, IO_WriteOnly);
           arg << theurl << mOutgoingMetaData;
           arg << metaData("window-id").toInt();
-          d->dcc->call("kio_uiserver", "UIServer",
+          d->dcc->call("tdeio_uiserver", "UIServer",
                        "showSSLInfoDialog(TQString,TDEIO::MetaData,int)",
                        data, ignoretype, ignore);
       }
diff --git a/kio/kio/tcpslavebase.h b/tdeio/tdeio/tcpslavebase.h
index 52081c807..4903dd7ac 100644
--- a/kio/kio/tcpslavebase.h
+++ b/tdeio/tdeio/tcpslavebase.h
@@ -28,14 +28,14 @@
 #include <stdio.h>
 
 #include <kextsock.h>
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 
 
 namespace TDEIO {
 
 /**
  * There are two classes that specifies the protocol between application (job)
- * and kioslave. SlaveInterface is the class to use on the application end,
+ * and tdeioslave. SlaveInterface is the class to use on the application end,
  * SlaveBase is the one to use on the slave end.
  *
  * Slave implementations should simply inherit SlaveBase
diff --git a/kio/kio/kfilefilter.cpp b/tdeio/tdeio/tdefilefilter.cpp
index c927804b5..310b86221 100644
--- a/kio/kio/kfilefilter.cpp
+++ b/tdeio/tdeio/tdefilefilter.cpp
@@ -20,10 +20,10 @@
 
 #include <tqregexp.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobal.h>
 
-#include "kfilefilter.h"
+#include "tdefilefilter.h"
 
 KSimpleFileFilter::KSimpleFileFilter()
     : m_filterDotFiles( true ),
diff --git a/kio/kio/kfilefilter.h b/tdeio/tdeio/tdefilefilter.h
index 2891e800e..2891e800e 100644
--- a/kio/kio/kfilefilter.h
+++ b/tdeio/tdeio/tdefilefilter.h
diff --git a/kio/kio/kfileitem.cpp b/tdeio/tdeio/tdefileitem.cpp
index fa08ae961..bd043504a 100644
--- a/kio/kio/kfileitem.cpp
+++ b/tdeio/tdeio/tdefileitem.cpp
@@ -29,7 +29,7 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include "kfileitem.h"
+#include "tdefileitem.h"
 
 #include <tqdir.h>
 #include <tqfile.h>
@@ -38,7 +38,7 @@
 #include <tqimage.h>
 
 #include <kdebug.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <ksambashare.h>
 #include <knfsshare.h>
 #include <kglobal.h>
@@ -162,7 +162,7 @@ void KFileItem::init( bool _determineMimeTypeOnDemand )
           m_bLink = true;
           if ( KDE_stat( path.data(), &buf ) == 0 )
               mode = buf.st_mode;
-          else // link pointing to nowhere (see kio/file/file.cc)
+          else // link pointing to nowhere (see tdeio/file/file.cc)
               mode = (S_IFMT-1) | S_IRWXU | S_IRWXG | S_IRWXO;
         }
         // While we're at it, store the times
diff --git a/kio/kio/kfileitem.h b/tdeio/tdeio/tdefileitem.h
index 0fcba9f4a..7097d7bc5 100644
--- a/kio/kio/kfileitem.h
+++ b/tdeio/tdeio/tdefileitem.h
@@ -17,18 +17,18 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kfileitem_h__
-#define __kfileitem_h__
+#ifndef __tdefileitem_h__
+#define __tdefileitem_h__
 
 #include <tqstringlist.h>
 #include <sys/stat.h>
 
 #include <tqptrlist.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kurl.h>
 #include <kacl.h>
 #include <kmimetype.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 #define KFILEITEM_HAS_ISWRITABLE // only used in libkonq/konq_iconviewwidget.cc, will be removed for 3.4
 
@@ -434,13 +434,13 @@ public:
    * for use with TQIconView) does
    *
    * \code
-   * kfileItem->setExtraData( this, iconViewItem );
+   * tdefileItem->setExtraData( this, iconViewItem );
    * \endcode
    *
    * and can later access the iconViewItem by doing
    *
    * \code
-   * KFileIconViewItem *iconViewItem = static_cast<KFileIconViewItem*>( kfileItem->extraData( this ));
+   * KFileIconViewItem *iconViewItem = static_cast<KFileIconViewItem*>( tdefileItem->extraData( this ));
    * \endcode
    *
    * This is usually more efficient then having every view associate data to
diff --git a/kio/kio/kfilemetainfo.cpp b/tdeio/tdeio/tdefilemetainfo.cpp
index a5d34fa07..4943dea93 100644
--- a/kio/kio/kfilemetainfo.cpp
+++ b/tdeio/tdeio/tdefilemetainfo.cpp
@@ -33,9 +33,9 @@
 #include <kmimetype.h>
 #include <kdatastream.h> // needed for serialization of bool
 #include <klocale.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
-#include "kfilemetainfo.h"
+#include "tdefilemetainfo.h"
 
 // shared data of a KFileMetaInfoItem
 class KFileMetaInfoItem::Data : public TQShared
@@ -1120,7 +1120,7 @@ KFileMimeTypeInfo * KFileMetaInfoProvider::addMimeTypeInfo(
 TQStringList KFileMetaInfoProvider::supportedMimeTypes() const
 {
     TQStringList allMimeTypes;
-    TQString kfilePlugin = "KFilePlugin";
+    TQString tdefilePlugin = "KFilePlugin";
 
     KTrader::OfferList offers = KTrader::self()->query( "KFilePlugin" );
     KTrader::OfferListIterator it = offers.begin();
@@ -1130,7 +1130,7 @@ TQStringList KFileMetaInfoProvider::supportedMimeTypes() const
         TQStringList::ConstIterator it2 = mimeTypes.begin();
         for ( ; it2 != mimeTypes.end(); ++it2 )
             if ( allMimeTypes.find( *it2 ) == allMimeTypes.end() &&
-                 *it2 != kfilePlugin ) // also in serviceTypes()
+                 *it2 != tdefilePlugin ) // also in serviceTypes()
                 allMimeTypes.append( *it2 );
     }
 
@@ -1856,4 +1856,4 @@ TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& info )
     return s;
 }
 
-#include "kfilemetainfo.moc"
+#include "tdefilemetainfo.moc"
diff --git a/kio/kio/kfilemetainfo.h b/tdeio/tdeio/tdefilemetainfo.h
index ea843a5f3..8cc3fdbdf 100644
--- a/kio/kio/kfilemetainfo.h
+++ b/tdeio/tdeio/tdefilemetainfo.h
@@ -1359,7 +1359,7 @@ private:
  * Example:
  *  @code
  *  typedef KGenericFactory<FooPlugin> FooFactory;
- *  K_EXPORT_COMPONENT_FACTORY(kfile_foo, FooFactory("kfile_foo"));
+ *  K_EXPORT_COMPONENT_FACTORY(tdefile_foo, FooFactory("tdefile_foo"));
  *  @endcode
  *
  * To make your plugin available within KDE, you also need to provide a
@@ -1385,7 +1385,7 @@ private:
  *  Type=Service
  *  Name=Foo Info
  *  ServiceTypes=KFilePlugin
- *  X-TDE-Library=kfile_foo
+ *  X-TDE-Library=tdefile_foo
  *  MimeType=application/x-foo
  *  PreferredGroups=FooInfo
  *  PreferredItems=Items,Size
diff --git a/kio/kio/kfileshare.cpp b/tdeio/tdeio/tdefileshare.cpp
index bf8cdca1d..fe6e0bd15 100644
--- a/kio/kio/kfileshare.cpp
+++ b/tdeio/tdeio/tdefileshare.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kfileshare.h"
+#include "tdefileshare.h"
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqregexp.h>
@@ -343,4 +343,4 @@ bool KFileShare::nfsActive()
     return false;
 }
 
-#include "kfileshare.moc"
+#include "tdefileshare.moc"
diff --git a/kio/kio/kfileshare.h b/tdeio/tdeio/tdefileshare.h
index ff473c122..e18749972 100644
--- a/kio/kio/kfileshare.h
+++ b/tdeio/tdeio/tdefileshare.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef kfileshare_h
-#define kfileshare_h
+#ifndef tdefileshare_h
+#define tdefileshare_h
 #include <tqobject.h>
 
 #include <tdelibs_export.h>
diff --git a/kio/kio/tdelficon.cpp b/tdeio/tdeio/tdelficon.cpp
index 49ceffd24..49ceffd24 100644
--- a/kio/kio/tdelficon.cpp
+++ b/tdeio/tdeio/tdelficon.cpp
diff --git a/kio/kio/tdelficon.h b/tdeio/tdeio/tdelficon.h
index 7a962bdaa..7a962bdaa 100644
--- a/kio/kio/tdelficon.h
+++ b/tdeio/tdeio/tdelficon.h
diff --git a/kio/kio/thumbcreator.h b/tdeio/tdeio/thumbcreator.h
index 79d499e7f..756dd0cf9 100644
--- a/kio/kio/thumbcreator.h
+++ b/tdeio/tdeio/thumbcreator.h
@@ -28,7 +28,7 @@ class TQImage;
  * This is the baseclass for "thumbnail-plugins" in KDE. Using the class
  * TDEIO::PreviewJob allows you to generate small images (thumbnails)
  * for any kind of file, where a "ThumbCreator" is available. Have a look
- * at tdebase/kioslave/thumbnail/ for existing ThumbCreators.
+ * at tdebase/tdeioslave/thumbnail/ for existing ThumbCreators.
  *
  * What you need to do to create and register a ThumbCreator:
  * @li Inherit from this class and reimplement the create() method to
diff --git a/kio/kio/yacc.c b/tdeio/tdeio/yacc.c
index a6fa63428..a6fa63428 100644
--- a/kio/kio/yacc.c
+++ b/tdeio/tdeio/yacc.c
diff --git a/kio/kio/yacc.h b/tdeio/tdeio/yacc.h
index ca84fb025..ca84fb025 100644
--- a/kio/kio/yacc.h
+++ b/tdeio/tdeio/yacc.h
diff --git a/kio/kio/yacc.y b/tdeio/tdeio/yacc.y
index 1b86f4737..1b86f4737 100644
--- a/kio/kio/yacc.y
+++ b/tdeio/tdeio/yacc.y
diff --git a/kio/kioexec/CMakeLists.txt b/tdeio/tdeioexec/CMakeLists.txt
index 0ab606643..b0cdf0b52 100644
--- a/kio/kioexec/CMakeLists.txt
+++ b/tdeio/tdeioexec/CMakeLists.txt
@@ -16,8 +16,8 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -25,9 +25,9 @@ link_directories(
 )
 
 
-##### kioexec ###################################
+##### tdeioexec ###################################
 
-set( target kioexec )
+set( target tdeioexec )
 
 set( ${target}_SRCS
   main.cpp
@@ -35,7 +35,7 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/tdeio/tdeioexec/Makefile.am b/tdeio/tdeioexec/Makefile.am
new file mode 100644
index 000000000..2879342ff
--- /dev/null
+++ b/tdeio/tdeioexec/Makefile.am
@@ -0,0 +1,19 @@
+AM_CPPFLAGS = $(all_includes)
+
+bin_PROGRAMS = tdeioexec
+
+tdeioexec_SOURCES = main.cpp
+tdeioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeioexec_LDADD   = $(LIB_KIO)
+
+noinst_HEADERS = main.h
+METASOURCES = AUTO
+
+messages:
+	$(XGETTEXT) $(tdeioexec_SOURCES) -o $(podir)/tdeioexec.pot
+
+install-exec-local:
+	@rm -f $(DESTDIR)$(bindir)/kfmexec
+	@$(LN_S) tdeioexec $(DESTDIR)$(bindir)/kfmexec
+
+include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kio/kioexec/README b/tdeio/tdeioexec/README
index daaa38bdb..daaa38bdb 100644
--- a/kio/kioexec/README
+++ b/tdeio/tdeioexec/README
diff --git a/kio/kioexec/main.cpp b/tdeio/tdeioexec/main.cpp
index 40badcbe0..9f7bd9faa 100644
--- a/kio/kioexec/main.cpp
+++ b/tdeio/tdeioexec/main.cpp
@@ -30,9 +30,9 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <krun.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kprocess.h>
 #include <kservice.h>
 #include <klocale.h>
@@ -271,7 +271,7 @@ void KIOExec::slotRunApp()
 
 int main( int argc, char **argv )
 {
-    TDEAboutData aboutData( "kioexec", I18N_NOOP("KIOExec"),
+    TDEAboutData aboutData( "tdeioexec", I18N_NOOP("KIOExec"),
         VERSION, description, TDEAboutData::License_GPL,
         "(c) 1998-2000,2003 The KFM/Konqueror Developers");
     aboutData.addAuthor("David Faure",0, "faure@kde.org");
diff --git a/kio/kioexec/main.h b/tdeio/tdeioexec/main.h
index beb6a2297..beb6a2297 100644
--- a/kio/kioexec/main.h
+++ b/tdeio/tdeioexec/main.h
diff --git a/kio/kioslave.upd b/tdeio/tdeioslave.upd
index f1ad015d3..cd4972741 100644
--- a/kio/kioslave.upd
+++ b/tdeio/tdeioslave.upd
@@ -1,18 +1,18 @@
 # Hello world
 Id=kde2.2/r1
-File=kioslaverc,kio_httprc
+File=tdeioslaverc,kio_httprc
 Group=Cache Settings,
 Key=MaxCacheSize
 Key=MaxCacheAge
 Key=UseCache
-File=kioslaverc
+File=tdeioslaverc
 Group=Browser Settings/UserAgent,UserAgent
 AllKeys
 Id=kde2.2/r2
-File=kioslaverc,kio_httprc
+File=tdeioslaverc,kio_httprc
 Group=UserAgent
 Script=useragent.pl,perl
 Id=kde2.2/r3
-File=kioslaverc
+File=tdeioslaverc
 Group=Proxy Settings
 Script=proxytype.pl,perl
diff --git a/kio/tests/CMakeLists.txt b/tdeio/tests/CMakeLists.txt
index 54378f5c8..a9f6bd4ef 100644
--- a/kio/tests/CMakeLists.txt
+++ b/tdeio/tests/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -21,16 +21,16 @@ link_directories(
 )
 
 
-##### ktradertest ###############################
+##### tdetradertest ###############################
 
-set( target ktradertest )
+set( target tdetradertest )
 
 set( ${target}_SRCS
-  ktradertest.cpp
+  tdetradertest.cpp
 )
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kio/tests/Makefile.am b/tdeio/tests/Makefile.am
index 3a81dfc57..138d0f0d2 100644
--- a/kio/tests/Makefile.am
+++ b/tdeio/tests/Makefile.am
@@ -16,12 +16,12 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeio $(all_includes)
 LDADD = $(LIB_KIO)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 check_PROGRAMS = tdesycocatest getalltest kruntest ktartest kziptest\
-                 kioslavetest kdirwatchtest kshredtest speed kurifiltertest \
+                 tdeioslavetest kdirwatchtest kshredtest speed kurifiltertest \
                  kdefaultprogresstest kmimemagictest \
                  kfiltertest kiopassdlgtest kscantest kdirlistertest \
                  previewtest kionetrctest kdcopcheck metatest \
@@ -37,12 +37,12 @@ check-local: kziptest
 
 TESTS = kmimetypetest
 
-bin_PROGRAMS = ktradertest
+bin_PROGRAMS = tdetradertest
 
 METASOURCES = AUTO
 
 speed_SOURCES = speed.cpp
-kioslavetest_SOURCES = kioslavetest.cpp
+tdeioslavetest_SOURCES = tdeioslavetest.cpp
 kshredtest_SOURCES = kshredtest.cpp
 kdefaultprogresstest_SOURCES = kdefaultprogresstest.cpp
 kionetrctest_SOURCES = kionetrctest.cpp
@@ -53,7 +53,7 @@ kdcopcheck_SOURCES = kdcopcheck.cpp
 getalltest_SOURCES = getalltest.cpp
 kruntest_SOURCES = kruntest.cpp
 kdirwatchtest_SOURCES = kdirwatchtest.cpp
-ktradertest_SOURCES = ktradertest.cpp
+tdetradertest_SOURCES = tdetradertest.cpp
 kmimemagictest_SOURCES = kmimemagictest.cpp
 kfiltertest_SOURCES = kfiltertest.cpp
 kscantest_SOURCES = kscantest.cpp
@@ -80,7 +80,7 @@ tdeunittest_kdirwatch_la_SOURCES = kdirwatchunittest.cpp
 tdeunittest_kdirwatch_la_LIBADD = $(LIB_KUNITTEST) $(LIB_KIO)
 tdeunittest_kdirwatch_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
 
-# kfile meta stuff. Comment this in, if you want a small
+# tdefile meta stuff. Comment this in, if you want a small
 # metadata plugin test and "make install".
 #kde_module_LTLIBRARIES = dummymeta.la
 #dummymeta_la_SOURCES = dummymeta.cpp
diff --git a/kio/tests/dataprotocoltest.cpp b/tdeio/tests/dataprotocoltest.cpp
index dfacd92e4..e236a2d7c 100644
--- a/kio/tests/dataprotocoltest.cpp
+++ b/tdeio/tests/dataprotocoltest.cpp
@@ -1,4 +1,4 @@
-// testing the data kioslave
+// testing the data tdeioslave
 // (C) 2002, 2003 Leo Savernik
 //
 // invoke "make dataprotocoltest" to generate the binary inside KDE CVS
@@ -16,7 +16,7 @@
 #  define TESTKIO
 #endif
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <tqcstring.h>
 #include <tqstring.h>
diff --git a/kio/tests/dummymeta.cpp b/tdeio/tests/dummymeta.cpp
index 938b4d00b..938b4d00b 100644
--- a/kio/tests/dummymeta.cpp
+++ b/tdeio/tests/dummymeta.cpp
diff --git a/kio/tests/dummymeta.desktop b/tdeio/tests/dummymeta.desktop
index 6d2748c82..6d2748c82 100644
--- a/kio/tests/dummymeta.desktop
+++ b/tdeio/tests/dummymeta.desktop
diff --git a/kio/tests/dummymeta.h b/tdeio/tests/dummymeta.h
index 053c48ecb..4cefcc01d 100644
--- a/kio/tests/dummymeta.h
+++ b/tdeio/tests/dummymeta.h
@@ -1,7 +1,7 @@
 #ifndef DUMMYMETA_H
 #define DUMMYMETA_H
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class KFileMetaInfo;
 
diff --git a/kio/tests/getalltest.cpp b/tdeio/tests/getalltest.cpp
index 07d8723ed..07d8723ed 100644
--- a/kio/tests/getalltest.cpp
+++ b/tdeio/tests/getalltest.cpp
diff --git a/kio/tests/jobtest.cpp b/tdeio/tests/jobtest.cpp
index e811aaec4..12f106cd2 100644
--- a/kio/tests/jobtest.cpp
+++ b/tdeio/tests/jobtest.cpp
@@ -24,7 +24,7 @@
 #include <kurl.h>
 #include <kapplication.h>
 #include <klargefile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kdebug.h>
 #include <kcmdlineargs.h>
 #include <kprotocolinfo.h>
@@ -44,7 +44,7 @@
 #include <time.h>
 #include <utime.h>
 
-// The code comes partly from tdebase/kioslave/trash/testtrash.cpp
+// The code comes partly from tdebase/tdeioslave/trash/testtrash.cpp
 
 static bool check(const TQString& txt, TQString a, TQString b)
 {
diff --git a/kio/tests/jobtest.h b/tdeio/tests/jobtest.h
index 61051fbaf..aeaceff0d 100644
--- a/kio/tests/jobtest.h
+++ b/tdeio/tests/jobtest.h
@@ -22,7 +22,7 @@
 
 #include <tqstring.h>
 #include <tqobject.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class JobTest : public TQObject
 {
diff --git a/kio/tests/kacltest.cpp b/tdeio/tests/kacltest.cpp
index 45ace585f..b55aedce8 100644
--- a/kio/tests/kacltest.cpp
+++ b/tdeio/tests/kacltest.cpp
@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <tqdir.h>
 
-// The code comes partly from tdebase/kioslave/trash/testtrash.cpp
+// The code comes partly from tdebase/tdeioslave/trash/testtrash.cpp
 
 static bool check(const TQString& txt, TQString a, TQString b)
 {
diff --git a/kio/tests/kacltest.h b/tdeio/tests/kacltest.h
index 1a85e4109..1a85e4109 100644
--- a/kio/tests/kacltest.h
+++ b/tdeio/tests/kacltest.h
diff --git a/kio/tests/kdcopcheck.cpp b/tdeio/tests/kdcopcheck.cpp
index 79f050f51..79f050f51 100644
--- a/kio/tests/kdcopcheck.cpp
+++ b/tdeio/tests/kdcopcheck.cpp
diff --git a/kio/tests/kdcopcheck.h b/tdeio/tests/kdcopcheck.h
index 593dbba1e..593dbba1e 100644
--- a/kio/tests/kdcopcheck.h
+++ b/tdeio/tests/kdcopcheck.h
diff --git a/kio/tests/kdefaultprogresstest.cpp b/tdeio/tests/kdefaultprogresstest.cpp
index 79ad44e3c..7e77611ed 100644
--- a/kio/tests/kdefaultprogresstest.cpp
+++ b/tdeio/tests/kdefaultprogresstest.cpp
@@ -1,5 +1,5 @@
 #include <kapplication.h>
-#include <kio/defaultprogress.h>
+#include <tdeio/defaultprogress.h>
 #include <kurl.h>
 #include <kdebug.h>
 
diff --git a/kio/tests/kdirlistertest.cpp b/tdeio/tests/kdirlistertest.cpp
index 000fb200c..000fb200c 100644
--- a/kio/tests/kdirlistertest.cpp
+++ b/tdeio/tests/kdirlistertest.cpp
diff --git a/kio/tests/kdirlistertest.h b/tdeio/tests/kdirlistertest.h
index 065f7478d..484121eef 100644
--- a/kio/tests/kdirlistertest.h
+++ b/tdeio/tests/kdirlistertest.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include <iostream>
 
diff --git a/kio/tests/kdirwatchtest.cpp b/tdeio/tests/kdirwatchtest.cpp
index c741b20f0..c741b20f0 100644
--- a/kio/tests/kdirwatchtest.cpp
+++ b/tdeio/tests/kdirwatchtest.cpp
diff --git a/kio/tests/kdirwatchtest.h b/tdeio/tests/kdirwatchtest.h
index 24dc94a91..24dc94a91 100644
--- a/kio/tests/kdirwatchtest.h
+++ b/tdeio/tests/kdirwatchtest.h
diff --git a/kio/tests/kdirwatchunittest.cpp b/tdeio/tests/kdirwatchunittest.cpp
index 3d7505a3f..3d7505a3f 100644
--- a/kio/tests/kdirwatchunittest.cpp
+++ b/tdeio/tests/kdirwatchunittest.cpp
diff --git a/kio/tests/kdirwatchunittest.h b/tdeio/tests/kdirwatchunittest.h
index 42222a787..42222a787 100644
--- a/kio/tests/kdirwatchunittest.h
+++ b/tdeio/tests/kdirwatchunittest.h
diff --git a/kio/tests/kfiltertest.cpp b/tdeio/tests/kfiltertest.cpp
index 1922e207e..1922e207e 100644
--- a/kio/tests/kfiltertest.cpp
+++ b/tdeio/tests/kfiltertest.cpp
diff --git a/kio/tests/kionetrctest.cpp b/tdeio/tests/kionetrctest.cpp
index 2d96c8495..2d96c8495 100644
--- a/kio/tests/kionetrctest.cpp
+++ b/tdeio/tests/kionetrctest.cpp
diff --git a/kio/tests/kiopassdlgtest.cpp b/tdeio/tests/kiopassdlgtest.cpp
index adb14a306..adb14a306 100644
--- a/kio/tests/kiopassdlgtest.cpp
+++ b/tdeio/tests/kiopassdlgtest.cpp
diff --git a/kio/tests/kmfitest.cpp b/tdeio/tests/kmfitest.cpp
index 40530184d..a2ec91717 100644
--- a/kio/tests/kmfitest.cpp
+++ b/tdeio/tests/kmfitest.cpp
@@ -3,7 +3,7 @@
 #include <tqfile.h>
 #include <kinstance.h>
 #include <kurl.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kmimetype.h>
 
 int main (int argc, char **argv)
diff --git a/kio/tests/kmimefromext.cpp b/tdeio/tests/kmimefromext.cpp
index 026d4173b..026d4173b 100644
--- a/kio/tests/kmimefromext.cpp
+++ b/tdeio/tests/kmimefromext.cpp
diff --git a/kio/tests/kmimemagictest.cpp b/tdeio/tests/kmimemagictest.cpp
index 00c545c3c..00c545c3c 100644
--- a/kio/tests/kmimemagictest.cpp
+++ b/tdeio/tests/kmimemagictest.cpp
diff --git a/kio/tests/kmimetypetest.cpp b/tdeio/tests/kmimetypetest.cpp
index 5d963c81c..5d963c81c 100644
--- a/kio/tests/kmimetypetest.cpp
+++ b/tdeio/tests/kmimetypetest.cpp
diff --git a/kio/tests/kpropsdlgtest.cpp b/tdeio/tests/kpropsdlgtest.cpp
index 811f03923..811f03923 100644
--- a/kio/tests/kpropsdlgtest.cpp
+++ b/tdeio/tests/kpropsdlgtest.cpp
diff --git a/kio/tests/kprotocolinfotest.cpp b/tdeio/tests/kprotocolinfotest.cpp
index 845f3367c..845f3367c 100644
--- a/kio/tests/kprotocolinfotest.cpp
+++ b/tdeio/tests/kprotocolinfotest.cpp
diff --git a/kio/tests/kruntest.cpp b/tdeio/tests/kruntest.cpp
index d8f47859b..d8f47859b 100644
--- a/kio/tests/kruntest.cpp
+++ b/tdeio/tests/kruntest.cpp
diff --git a/kio/tests/kruntest.h b/tdeio/tests/kruntest.h
index 68e7a7280..68e7a7280 100644
--- a/kio/tests/kruntest.h
+++ b/tdeio/tests/kruntest.h
diff --git a/kio/tests/kscantest.cpp b/tdeio/tests/kscantest.cpp
index 14abd1b33..14abd1b33 100644
--- a/kio/tests/kscantest.cpp
+++ b/tdeio/tests/kscantest.cpp
diff --git a/kio/tests/kshredtest.cpp b/tdeio/tests/kshredtest.cpp
index 76e87fca4..76e87fca4 100644
--- a/kio/tests/kshredtest.cpp
+++ b/tdeio/tests/kshredtest.cpp
diff --git a/kio/tests/ktartest.cpp b/tdeio/tests/ktartest.cpp
index 2c470f6e4..2c470f6e4 100644
--- a/kio/tests/ktartest.cpp
+++ b/tdeio/tests/ktartest.cpp
diff --git a/kio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp
index 820f97403..473ba6840 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/tdeio/tests/kurifiltertest.cpp
@@ -31,7 +31,7 @@
 
 #include <tqdir.h>
 #include <tqregexp.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 static const char * const s_uritypes[] = { "NET_PROTOCOL", "LOCAL_FILE", "LOCAL_DIR", "EXECUTABLE", "HELP", "SHELL", "BLOCKED", "ERROR", "UNKNOWN" };
 #define NO_FILTERING -2
@@ -292,7 +292,7 @@ int main(int argc, char **argv)
     TQCString home = getenv("HOME");
     TQCString tdehome = getenv("TDEHOME");
 
-    filter( "$SOMEVAR/tdelibs/kio", 0, KURIFilterData::ERROR ); // note: this dir doesn't exist...
+    filter( "$SOMEVAR/tdelibs/tdeio", 0, KURIFilterData::ERROR ); // note: this dir doesn't exist...
     filter( "$ETC/passwd", "/etc/passwd", KURIFilterData::LOCAL_FILE );
     filter( "$QTDIR/doc/html/functions.html#s", TQCString("file://")+qtdir+"/doc/html/functions.html#s", KURIFilterData::LOCAL_FILE );
     filter( "http://www.kde.org/$USER", "http://www.kde.org/$USER", KURIFilterData::NET_PROTOCOL ); // no expansion
diff --git a/kio/tests/kurlcompletiontest.cpp b/tdeio/tests/kurlcompletiontest.cpp
index c8dc99595..c8dc99595 100644
--- a/kio/tests/kurlcompletiontest.cpp
+++ b/tdeio/tests/kurlcompletiontest.cpp
diff --git a/kio/tests/kziptest.cpp b/tdeio/tests/kziptest.cpp
index 84d38d134..84d38d134 100644
--- a/kio/tests/kziptest.cpp
+++ b/tdeio/tests/kziptest.cpp
diff --git a/kio/tests/metatest.cpp b/tdeio/tests/metatest.cpp
index 034d740ed..ee1d38201 100644
--- a/kio/tests/metatest.cpp
+++ b/tdeio/tests/metatest.cpp
@@ -1,5 +1,5 @@
 #include <kapplication.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kcmdlineargs.h>
 #include <tqstringlist.h>
 #include <tqimage.h>
@@ -181,7 +181,7 @@ void removeGroup(KFileMetaInfo& info, TQString group)
 int main( int argc, char **argv )
 {
     // Initialize command line args
-    TDECmdLineArgs::init(argc, argv, "kfilemetatest", "testing kfilmetainfo", "X");
+    TDECmdLineArgs::init(argc, argv, "tdefilemetatest", "testing kfilmetainfo", "X");
 
     // Tell which options are supported
     TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kio/tests/netaccesstest.cpp b/tdeio/tests/netaccesstest.cpp
index c83f45aae..1a5de205d 100644
--- a/kio/tests/netaccesstest.cpp
+++ b/tdeio/tests/netaccesstest.cpp
@@ -19,7 +19,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqfile.h>
 
 int main(int argc, char **argv)
diff --git a/kio/tests/previewtest.cpp b/tdeio/tests/previewtest.cpp
index 62f6c3d62..87bdd326d 100644
--- a/kio/tests/previewtest.cpp
+++ b/tdeio/tests/previewtest.cpp
@@ -7,7 +7,7 @@
 #include <kdebug.h>
 #include <klineedit.h>
 
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 
 #include "previewtest.moc"
 
diff --git a/kio/tests/previewtest.h b/tdeio/tests/previewtest.h
index a749e95a3..5ef82916d 100644
--- a/kio/tests/previewtest.h
+++ b/tdeio/tests/previewtest.h
@@ -1,6 +1,6 @@
 
 #include <tqwidget.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class KLineEdit;
 class TQLabel;
diff --git a/kio/tests/speed.cpp b/tdeio/tests/speed.cpp
index 44a7d9330..978845669 100644
--- a/kio/tests/speed.cpp
+++ b/tdeio/tests/speed.cpp
@@ -20,10 +20,10 @@
 #include <kapplication.h>
 #include <time.h>
 #include "speed.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kcmdlineargs.h>
 #include <tqdir.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 using namespace TDEIO;
 
diff --git a/kio/tests/speed.h b/tdeio/tests/speed.h
index 5b928a18e..d7801ae47 100644
--- a/kio/tests/speed.h
+++ b/tdeio/tests/speed.h
@@ -2,7 +2,7 @@
 #ifndef _SPEED_H
 #define _SPEED_H
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kurl.h>
 
 namespace TDEIO {
diff --git a/kio/tests/kioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp
index 27a99eabc..5fa19073c 100644
--- a/kio/tests/kioslavetest.cpp
+++ b/tdeio/tests/tdeioslavetest.cpp
@@ -20,11 +20,11 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kstatusbar.h>
-#include <kio/job.h>
-#include <kio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/scheduler.h>
 #include <kprotocolinfo.h>
 
-#include "kioslavetest.h"
+#include "tdeioslavetest.h"
 
 using namespace TDEIO;
 
@@ -479,7 +479,7 @@ void KioslaveTest::stopJob() {
 }
 
 static const char version[] = "v0.0.0 0000";   // :-)
-static const char description[] = "Test for kioslaves";
+static const char description[] = "Test for tdeioslaves";
 static KCmdLineOptions options[] =
 {
  { "s", 0, 0 },
@@ -494,7 +494,7 @@ static KCmdLineOptions options[] =
 };
 
 int main(int argc, char **argv) {
-  TDECmdLineArgs::init( argc, argv, "kioslavetest", description, version );
+  TDECmdLineArgs::init( argc, argv, "tdeioslavetest", description, version );
   TDECmdLineArgs::addCmdLineOptions( options );
   TDEApplication app;
 
@@ -552,4 +552,4 @@ int main(int argc, char **argv) {
 }
 
 
-#include "kioslavetest.moc"
+#include "tdeioslavetest.moc"
diff --git a/kio/tests/kioslavetest.h b/tdeio/tests/tdeioslavetest.h
index 79533bbc5..f2cb32af1 100644
--- a/kio/tests/kioslavetest.h
+++ b/tdeio/tests/tdeioslavetest.h
@@ -21,10 +21,10 @@
 
 #include <kmainwindow.h>
 
-#include "kio/job.h"
-#include "kio/global.h"
-#include "kio/statusbarprogress.h"
-#include "kio/slave.h"
+#include "tdeio/job.h"
+#include "tdeio/global.h"
+#include "tdeio/statusbarprogress.h"
+#include "tdeio/slave.h"
 
 class KioslaveTest : public KMainWindow {
   Q_OBJECT
diff --git a/kio/tests/tdesycocatest.cpp b/tdeio/tests/tdesycocatest.cpp
index 45f94ac3c..45f94ac3c 100644
--- a/kio/tests/tdesycocatest.cpp
+++ b/tdeio/tests/tdesycocatest.cpp
diff --git a/kio/tests/tdesycocaupdatetest.cpp b/tdeio/tests/tdesycocaupdatetest.cpp
index e7778e056..e7778e056 100644
--- a/kio/tests/tdesycocaupdatetest.cpp
+++ b/tdeio/tests/tdesycocaupdatetest.cpp
diff --git a/kio/tests/ktradertest.cpp b/tdeio/tests/tdetradertest.cpp
index b05444dfd..c0092f76d 100644
--- a/kio/tests/ktradertest.cpp
+++ b/tdeio/tests/tdetradertest.cpp
@@ -33,7 +33,7 @@ static KCmdLineOptions options[] =
 
 int main( int argc, char **argv )
 {
-  TDECmdLineArgs::init( argc, argv, "ktradertest", "KTradertest", "A KTrader testing tool", "0.0" );
+  TDECmdLineArgs::init( argc, argv, "tdetradertest", "KTradertest", "A KTrader testing tool", "0.0" );
 
   TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/kio/tests/wronglocalsizes.zip b/tdeio/tests/wronglocalsizes.zip
index 3f76738ba..3f76738ba 100644
--- a/kio/tests/wronglocalsizes.zip
+++ b/tdeio/tests/wronglocalsizes.zip
diff --git a/kio/useragent.pl b/tdeio/useragent.pl
index f31e31e1d..f31e31e1d 100755
--- a/kio/useragent.pl
+++ b/tdeio/useragent.pl
diff --git a/kioslave/CMakeLists.txt b/tdeioslave/CMakeLists.txt
index 4c7bfe1c4..4c7bfe1c4 100644
--- a/kioslave/CMakeLists.txt
+++ b/tdeioslave/CMakeLists.txt
diff --git a/kioslave/Mainpage.dox b/tdeioslave/Mainpage.dox
index 44979b667..44979b667 100644
--- a/kioslave/Mainpage.dox
+++ b/tdeioslave/Mainpage.dox
diff --git a/kioslave/Makefile.am b/tdeioslave/Makefile.am
index e6472a9c8..e6472a9c8 100644
--- a/kioslave/Makefile.am
+++ b/tdeioslave/Makefile.am
diff --git a/kioslave/bzip2/CMakeLists.txt b/tdeioslave/bzip2/CMakeLists.txt
index a2354d6b0..22b904ffa 100644
--- a/kioslave/bzip2/CMakeLists.txt
+++ b/tdeioslave/bzip2/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -37,6 +37,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared ${BZIP2_LIBRARIES}
+  LINK tdeio-shared ${BZIP2_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/bzip2/Makefile.am b/tdeioslave/bzip2/Makefile.am
index 9353959ab..963f27e31 100644
--- a/kioslave/bzip2/Makefile.am
+++ b/tdeioslave/bzip2/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kio $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio $(all_includes)
 METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = kbzip2filter.la
diff --git a/kioslave/bzip2/configure.in.in b/tdeioslave/bzip2/configure.in.in
index 99392042d..99392042d 100644
--- a/kioslave/bzip2/configure.in.in
+++ b/tdeioslave/bzip2/configure.in.in
diff --git a/kioslave/bzip2/kbzip2filter.cpp b/tdeioslave/bzip2/kbzip2filter.cpp
index ae72990d8..ae72990d8 100644
--- a/kioslave/bzip2/kbzip2filter.cpp
+++ b/tdeioslave/bzip2/kbzip2filter.cpp
diff --git a/kioslave/bzip2/kbzip2filter.desktop b/tdeioslave/bzip2/kbzip2filter.desktop
index 51f1c0a84..51f1c0a84 100644
--- a/kioslave/bzip2/kbzip2filter.desktop
+++ b/tdeioslave/bzip2/kbzip2filter.desktop
diff --git a/kioslave/bzip2/kbzip2filter.h b/tdeioslave/bzip2/kbzip2filter.h
index 2a7b13cf3..2a7b13cf3 100644
--- a/kioslave/bzip2/kbzip2filter.h
+++ b/tdeioslave/bzip2/kbzip2filter.h
diff --git a/kioslave/file/CMakeLists.txt b/tdeioslave/file/CMakeLists.txt
index 2cf415745..0392de535 100644
--- a/kioslave/file/CMakeLists.txt
+++ b/tdeioslave/file/CMakeLists.txt
@@ -20,8 +20,8 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -31,7 +31,7 @@ link_directories(
 
 ##### headers ###################################
 
-install( FILES file.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+install( FILES file.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
 
 
 ##### other data ################################
@@ -49,7 +49,7 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kioslave/file/Makefile.am b/tdeioslave/file/Makefile.am
index 3daf0cbcc..518b79f46 100644
--- a/kioslave/file/Makefile.am
+++ b/tdeioslave/file/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am of tdebase/kioslave/file
+## Makefile.am of tdebase/tdeioslave/file
 
 AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
 
@@ -14,7 +14,7 @@ kio_file_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(top_builddir)/dco
 noinst_HEADERS = file.h
 
 fileinclude_HEADERS = file.h
-fileincludedir = $(includedir)/kio
+fileincludedir = $(includedir)/tdeio
 
 METASOURCES = AUTO
 
diff --git a/kioslave/file/file.cc b/tdeioslave/file/file.cc
index 73a037b91..499a69330 100644
--- a/kioslave/file/file.cc
+++ b/tdeioslave/file/file.cc
@@ -91,7 +91,7 @@
 #endif
 
 #include <kstandarddirs.h>
-#include <kio/ioslave_defaults.h>
+#include <tdeio/ioslave_defaults.h>
 #include <klargefile.h>
 #include <kglobal.h>
 #include <kmimetype.h>
@@ -999,7 +999,7 @@ bool FileProtocol::createUDSEntry( const TQString & filename, const TQCString &
     assert(entry.count() == 0); // by contract :-)
     // Note: details = 0 (only "file or directory or symlink or doesn't exist") isn't implemented
     // because there's no real performance penalty in kio_file for returning the complete
-    // details. Please consider doing it in your kioslave if you're using this one as a model :)
+    // details. Please consider doing it in your tdeioslave if you're using this one as a model :)
     UDSAtom atom;
     atom.m_uds = TDEIO::UDS_NAME;
     atom.m_str = filename;
diff --git a/kioslave/file/file.h b/tdeioslave/file/file.h
index 9f9d98995..226e0a428 100644
--- a/kioslave/file/file.h
+++ b/tdeioslave/file/file.h
@@ -34,8 +34,8 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 // Note that this header file is installed, so think twice
 // before breaking binary compatibility (read: it is forbidden :)
diff --git a/kioslave/file/file.protocol b/tdeioslave/file/file.protocol
index ae3487999..be7c5d587 100644
--- a/kioslave/file/file.protocol
+++ b/tdeioslave/file/file.protocol
@@ -11,5 +11,5 @@ deleting=true
 linking=true
 moving=true
 maxInstances=4
-DocPath=kioslave/file.html
+DocPath=tdeioslave/file.html
 Class=:local
diff --git a/kioslave/ftp/CMakeLists.txt b/tdeioslave/ftp/CMakeLists.txt
index e0287639b..9f9125fc3 100644
--- a/kioslave/ftp/CMakeLists.txt
+++ b/tdeioslave/ftp/CMakeLists.txt
@@ -15,8 +15,8 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore/network
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -39,6 +39,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/ftp/Makefile.am b/tdeioslave/ftp/Makefile.am
index c062d6430..c062d6430 100644
--- a/kioslave/ftp/Makefile.am
+++ b/tdeioslave/ftp/Makefile.am
diff --git a/kioslave/ftp/configure.in.in b/tdeioslave/ftp/configure.in.in
index 0c94a9b9b..0c94a9b9b 100644
--- a/kioslave/ftp/configure.in.in
+++ b/tdeioslave/ftp/configure.in.in
diff --git a/kioslave/ftp/ftp.cc b/tdeioslave/ftp/ftp.cc
index 3d29e2b65..2099457f2 100644
--- a/kioslave/ftp/ftp.cc
+++ b/tdeioslave/ftp/ftp.cc
@@ -59,8 +59,8 @@
 #include <kmimetype.h>
 #include <ksockaddr.h>
 #include <tdesocketaddress.h>
-#include <kio/ioslave_defaults.h>
-#include <kio/slaveconfig.h>
+#include <tdeio/ioslave_defaults.h>
+#include <tdeio/slaveconfig.h>
 #include <kremoteencoding.h>
 #include <klargefile.h>
 
diff --git a/kioslave/ftp/ftp.h b/tdeioslave/ftp/ftp.h
index 8a847e6da..4b2a1891d 100644
--- a/kioslave/ftp/ftp.h
+++ b/tdeioslave/ftp/ftp.h
@@ -32,7 +32,7 @@
 #include <tqstring.h>
 
 #include <kurl.h>
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 #include <kextsock.h>
 #include <ksocks.h>
 
diff --git a/kioslave/ftp/ftp.protocol b/tdeioslave/ftp/ftp.protocol
index 3af1e33ec..dfed878a8 100644
--- a/kioslave/ftp/ftp.protocol
+++ b/tdeioslave/ftp/ftp.protocol
@@ -14,5 +14,5 @@ moving=true
 ProxiedBy=http
 Icon=ftp
 maxInstances=2
-DocPath=kioslave/ftp.html
+DocPath=tdeioslave/ftp.html
 Class=:internet
diff --git a/kioslave/gzip/CMakeLists.txt b/tdeioslave/gzip/CMakeLists.txt
index e71908c31..d08fc7e64 100644
--- a/kioslave/gzip/CMakeLists.txt
+++ b/tdeioslave/gzip/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -36,6 +36,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/gzip/Makefile.am b/tdeioslave/gzip/Makefile.am
index 0ec2e03c9..22918aef2 100644
--- a/kioslave/gzip/Makefile.am
+++ b/tdeioslave/gzip/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kio $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 METASOURCES = AUTO
 
diff --git a/kioslave/gzip/kgzipfilter.cpp b/tdeioslave/gzip/kgzipfilter.cpp
index 375f9f9bc..375f9f9bc 100644
--- a/kioslave/gzip/kgzipfilter.cpp
+++ b/tdeioslave/gzip/kgzipfilter.cpp
diff --git a/kioslave/gzip/kgzipfilter.desktop b/tdeioslave/gzip/kgzipfilter.desktop
index a3b6c027b..a3b6c027b 100644
--- a/kioslave/gzip/kgzipfilter.desktop
+++ b/tdeioslave/gzip/kgzipfilter.desktop
diff --git a/kioslave/gzip/kgzipfilter.h b/tdeioslave/gzip/kgzipfilter.h
index 73b5173f3..73b5173f3 100644
--- a/kioslave/gzip/kgzipfilter.h
+++ b/tdeioslave/gzip/kgzipfilter.h
diff --git a/kioslave/http/CMakeLists.txt b/tdeioslave/http/CMakeLists.txt
index c093df483..64abe1adb 100644
--- a/kioslave/http/CMakeLists.txt
+++ b/tdeioslave/http/CMakeLists.txt
@@ -20,9 +20,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore/network
   ${CMAKE_SOURCE_DIR}/interfaces
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/httpfilter
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/httpfilter
 )
 
 link_directories(
@@ -48,7 +48,7 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
 )
 
 
@@ -64,6 +64,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK httpfilter-static tdentlm-shared kio-shared
+  LINK httpfilter-static tdentlm-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/http/Makefile.am b/tdeioslave/http/Makefile.am
index 5946fc9f8..184381b0f 100644
--- a/kioslave/http/Makefile.am
+++ b/tdeioslave/http/Makefile.am
@@ -1,9 +1,9 @@
 # $Id$
-# Makefile.am of tdebase/kioslave/http
+# Makefile.am of tdebase/tdeioslave/http
 
 SUBDIRS = kcookiejar
 
-INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/kio/httpfilter -I$(top_srcdir)/tdecore/network $(all_includes) $(GSSAPI_INCS)
+INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdeio/httpfilter -I$(top_srcdir)/tdecore/network $(all_includes) $(GSSAPI_INCS)
 AM_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH)
 
 ####### Files
@@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = kio_http.la
 
 kio_http_la_SOURCES = http.cc
 kio_http_la_METASOURCES = AUTO
-kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kio/misc/tdentlm/libtdentlm.la
+kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/tdeio/misc/tdentlm/libtdentlm.la
 kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
 
 kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp
diff --git a/kioslave/http/README.http_cache_cleaner b/tdeioslave/http/README.http_cache_cleaner
index 7714bfba6..7714bfba6 100644
--- a/kioslave/http/README.http_cache_cleaner
+++ b/tdeioslave/http/README.http_cache_cleaner
diff --git a/kioslave/http/README.webdav b/tdeioslave/http/README.webdav
index c7ee900bb..c7ee900bb 100644
--- a/kioslave/http/README.webdav
+++ b/tdeioslave/http/README.webdav
diff --git a/kioslave/http/THOUGHTS b/tdeioslave/http/THOUGHTS
index 9715b5c2f..5fabc3fcb 100644
--- a/kioslave/http/THOUGHTS
+++ b/tdeioslave/http/THOUGHTS
@@ -17,7 +17,7 @@ to configure access.
 WebDAV support.  MSIE5 calls it web folders support, and a similar
 approach would probably be a good idea.  Perhaps with an exists()
 function.. one could tell if an http url was part of a WebDAV collection..
-and this could be used for some kind of integration with kfile... to
+and this could be used for some kind of integration with tdefile... to
 provide seamless integration.  Uhm, also, this might entail an external
 program (xml parser and such).
 
diff --git a/kioslave/http/TODO b/tdeioslave/http/TODO
index 9dbf60a3e..9dbf60a3e 100644
--- a/kioslave/http/TODO
+++ b/tdeioslave/http/TODO
diff --git a/kioslave/http/configure.in.bot b/tdeioslave/http/configure.in.bot
index 56d051424..56d051424 100644
--- a/kioslave/http/configure.in.bot
+++ b/tdeioslave/http/configure.in.bot
diff --git a/kioslave/http/configure.in.in b/tdeioslave/http/configure.in.in
index a7d1ca7cf..a7d1ca7cf 100644
--- a/kioslave/http/configure.in.in
+++ b/tdeioslave/http/configure.in.in
diff --git a/kioslave/http/http.cc b/tdeioslave/http/http.cc
index e1eefa595..d944364cc 100644
--- a/kioslave/http/http.cc
+++ b/tdeioslave/http/http.cc
@@ -52,7 +52,7 @@
 #include <ksocks.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kextsock.h>
 #include <kservice.h>
 #include <krfcdate.h>
@@ -67,8 +67,8 @@
 #include <kstringhandler.h>
 #include <kremoteencoding.h>
 
-#include "kio/ioslave_defaults.h"
-#include "kio/http_slave_defaults.h"
+#include "tdeio/ioslave_defaults.h"
+#include "tdeio/http_slave_defaults.h"
 
 #include "httpfilter.h"
 #include "http.h"
diff --git a/kioslave/http/http.h b/tdeioslave/http/http.h
index ccbb60ce6..aacdf1d47 100644
--- a/kioslave/http/http.h
+++ b/tdeioslave/http/http.h
@@ -35,8 +35,8 @@
 #include <tqstringlist.h>
 
 #include <kurl.h>
-#include "kio/tcpslavebase.h"
-#include "kio/http.h"
+#include "tdeio/tcpslavebase.h"
+#include "tdeio/http.h"
 
 class DCOPClient;
 class TQDomElement;
@@ -61,7 +61,7 @@ public:
   enum HTTP_AUTH   {AUTH_None, AUTH_Basic, AUTH_NTLM, AUTH_Digest, AUTH_Negotiate};
 
   /** HTTP / DAV method **/
-  // Removed to interfaces/kio/http.h
+  // Removed to interfaces/tdeio/http.h
   //enum HTTP_METHOD {HTTP_GET, HTTP_PUT, HTTP_POST, HTTP_HEAD, HTTP_DELETE,
   //                  HTTP_OPTIONS, DAV_PROPFIND, DAV_PROPPATCH, DAV_MKCOL,
   //                  DAV_COPY, DAV_MOVE, DAV_LOCK, DAV_UNLOCK, DAV_SEARCH };
diff --git a/kioslave/http/http.protocol b/tdeioslave/http/http.protocol
index ea7b57869..60f85c451 100644
--- a/kioslave/http/http.protocol
+++ b/tdeioslave/http/http.protocol
@@ -8,5 +8,5 @@ defaultMimetype=application/octet-stream
 determineMimetypeFromExtension=false
 Icon=www
 maxInstances=3
-DocPath=kioslave/http.html
+DocPath=tdeioslave/http.html
 Class=:internet
diff --git a/kioslave/http/http_cache_cleaner.cpp b/tdeioslave/http/http_cache_cleaner.cpp
index 554d221d5..554d221d5 100644
--- a/kioslave/http/http_cache_cleaner.cpp
+++ b/tdeioslave/http/http_cache_cleaner.cpp
diff --git a/kioslave/http/http_cache_cleaner.desktop b/tdeioslave/http/http_cache_cleaner.desktop
index 33cebb731..33cebb731 100644
--- a/kioslave/http/http_cache_cleaner.desktop
+++ b/tdeioslave/http/http_cache_cleaner.desktop
diff --git a/kioslave/http/https.protocol b/tdeioslave/http/https.protocol
index 8a9c2f0da..5d456599c 100644
--- a/kioslave/http/https.protocol
+++ b/tdeioslave/http/https.protocol
@@ -8,5 +8,5 @@ defaultMimetype=application/octet-stream
 determineMimetypeFromExtension=false
 Icon=www
 config=http
-DocPath=kioslave/https.html
+DocPath=tdeioslave/https.html
 Class=:internet
diff --git a/kioslave/http/kcookiejar/CMakeLists.txt b/tdeioslave/http/kcookiejar/CMakeLists.txt
index 289daa4f0..289daa4f0 100644
--- a/kioslave/http/kcookiejar/CMakeLists.txt
+++ b/tdeioslave/http/kcookiejar/CMakeLists.txt
diff --git a/kioslave/http/kcookiejar/Makefile.am b/tdeioslave/http/kcookiejar/Makefile.am
index 431502c12..dc331a4aa 100644
--- a/kioslave/http/kcookiejar/Makefile.am
+++ b/tdeioslave/http/kcookiejar/Makefile.am
@@ -1,4 +1,4 @@
-# Makefile.am of tdebase/kioslave/http
+# Makefile.am of tdebase/tdeioslave/http
 
 SUBDIRS=tests
 INCLUDES=	$(all_includes)
@@ -24,7 +24,7 @@ kded_DATA = kcookiejar.desktop
 kdeddir = $(kde_servicesdir)/kded
 
 update_DATA = kcookiescfg.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 cookie_DATA = domain_info
 cookiedir = $(kde_datadir)/tdehtml
diff --git a/kioslave/http/kcookiejar/domain_info b/tdeioslave/http/kcookiejar/domain_info
index 94baf8dae..94baf8dae 100644
--- a/kioslave/http/kcookiejar/domain_info
+++ b/tdeioslave/http/kcookiejar/domain_info
diff --git a/kioslave/http/kcookiejar/kcookiejar.cpp b/tdeioslave/http/kcookiejar/kcookiejar.cpp
index 12d92a8df..5cb8d9053 100644
--- a/kioslave/http/kcookiejar/kcookiejar.cpp
+++ b/tdeioslave/http/kcookiejar/kcookiejar.cpp
@@ -65,7 +65,7 @@
 
 #include <kurl.h>
 #include <krfcdate.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksavefile.h>
 #include <kdebug.h>
 
diff --git a/kioslave/http/kcookiejar/kcookiejar.desktop b/tdeioslave/http/kcookiejar/kcookiejar.desktop
index ebc76e2f8..ebc76e2f8 100644
--- a/kioslave/http/kcookiejar/kcookiejar.desktop
+++ b/tdeioslave/http/kcookiejar/kcookiejar.desktop
diff --git a/kioslave/http/kcookiejar/kcookiejar.h b/tdeioslave/http/kcookiejar/kcookiejar.h
index bb16d75d3..bb16d75d3 100644
--- a/kioslave/http/kcookiejar/kcookiejar.h
+++ b/tdeioslave/http/kcookiejar/kcookiejar.h
diff --git a/kioslave/http/kcookiejar/kcookiescfg.upd b/tdeioslave/http/kcookiejar/kcookiescfg.upd
index 0ff26bde0..0ff26bde0 100644
--- a/kioslave/http/kcookiejar/kcookiescfg.upd
+++ b/tdeioslave/http/kcookiejar/kcookiescfg.upd
diff --git a/kioslave/http/kcookiejar/kcookieserver.cpp b/tdeioslave/http/kcookiejar/kcookieserver.cpp
index 94df40b63..ceb1df57f 100644
--- a/kioslave/http/kcookiejar/kcookieserver.cpp
+++ b/tdeioslave/http/kcookiejar/kcookieserver.cpp
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <dcopclient.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
diff --git a/kioslave/http/kcookiejar/kcookieserver.h b/tdeioslave/http/kcookiejar/kcookieserver.h
index 2cbb9ccf1..2cbb9ccf1 100644
--- a/kioslave/http/kcookiejar/kcookieserver.h
+++ b/tdeioslave/http/kcookiejar/kcookieserver.h
diff --git a/kioslave/http/kcookiejar/kcookiewin.cpp b/tdeioslave/http/kcookiejar/kcookiewin.cpp
index 57a22f62c..57a22f62c 100644
--- a/kioslave/http/kcookiejar/kcookiewin.cpp
+++ b/tdeioslave/http/kcookiejar/kcookiewin.cpp
diff --git a/kioslave/http/kcookiejar/kcookiewin.h b/tdeioslave/http/kcookiejar/kcookiewin.h
index d739732dc..d739732dc 100644
--- a/kioslave/http/kcookiejar/kcookiewin.h
+++ b/tdeioslave/http/kcookiejar/kcookiewin.h
diff --git a/kioslave/http/kcookiejar/main.cpp b/tdeioslave/http/kcookiejar/main.cpp
index e24112888..e24112888 100644
--- a/kioslave/http/kcookiejar/main.cpp
+++ b/tdeioslave/http/kcookiejar/main.cpp
diff --git a/kioslave/http/kcookiejar/netscape_cookie_spec.html b/tdeioslave/http/kcookiejar/netscape_cookie_spec.html
index eb190f2e3..eb190f2e3 100644
--- a/kioslave/http/kcookiejar/netscape_cookie_spec.html
+++ b/tdeioslave/http/kcookiejar/netscape_cookie_spec.html
diff --git a/kioslave/http/kcookiejar/rfc2109 b/tdeioslave/http/kcookiejar/rfc2109
index 432fdcc6e..432fdcc6e 100644
--- a/kioslave/http/kcookiejar/rfc2109
+++ b/tdeioslave/http/kcookiejar/rfc2109
diff --git a/kioslave/http/kcookiejar/rfc2965 b/tdeioslave/http/kcookiejar/rfc2965
index 8a4d02b17..8a4d02b17 100644
--- a/kioslave/http/kcookiejar/rfc2965
+++ b/tdeioslave/http/kcookiejar/rfc2965
diff --git a/kioslave/http/kcookiejar/tests/Makefile.am b/tdeioslave/http/kcookiejar/tests/Makefile.am
index 4059cdcd1..3af4677f1 100644
--- a/kioslave/http/kcookiejar/tests/Makefile.am
+++ b/tdeioslave/http/kcookiejar/tests/Makefile.am
@@ -1,5 +1,5 @@
 # $Id$
-# Makefile.am of tdebase/kioslave/http
+# Makefile.am of tdebase/tdeioslave/http
 
 INCLUDES=	$(all_includes) 
 
diff --git a/kioslave/http/kcookiejar/tests/cookie.test b/tdeioslave/http/kcookiejar/tests/cookie.test
index 6619bf82d..6619bf82d 100644
--- a/kioslave/http/kcookiejar/tests/cookie.test
+++ b/tdeioslave/http/kcookiejar/tests/cookie.test
diff --git a/kioslave/http/kcookiejar/tests/cookie_rfc.test b/tdeioslave/http/kcookiejar/tests/cookie_rfc.test
index e1d8a40de..e1d8a40de 100644
--- a/kioslave/http/kcookiejar/tests/cookie_rfc.test
+++ b/tdeioslave/http/kcookiejar/tests/cookie_rfc.test
diff --git a/kioslave/http/kcookiejar/tests/cookie_saving.test b/tdeioslave/http/kcookiejar/tests/cookie_saving.test
index cb9f34c42..cb9f34c42 100644
--- a/kioslave/http/kcookiejar/tests/cookie_saving.test
+++ b/tdeioslave/http/kcookiejar/tests/cookie_saving.test
diff --git a/kioslave/http/kcookiejar/tests/cookie_settings.test b/tdeioslave/http/kcookiejar/tests/cookie_settings.test
index 7fc1a03a7..7fc1a03a7 100644
--- a/kioslave/http/kcookiejar/tests/cookie_settings.test
+++ b/tdeioslave/http/kcookiejar/tests/cookie_settings.test
diff --git a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp b/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp
index 236e2406b..236e2406b 100644
--- a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp
+++ b/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp
diff --git a/kioslave/http/rfc2518.txt b/tdeioslave/http/rfc2518.txt
index 34d2e942a..34d2e942a 100644
--- a/kioslave/http/rfc2518.txt
+++ b/tdeioslave/http/rfc2518.txt
diff --git a/kioslave/http/rfc2616.txt b/tdeioslave/http/rfc2616.txt
index 7be662a97..7be662a97 100644
--- a/kioslave/http/rfc2616.txt
+++ b/tdeioslave/http/rfc2616.txt
diff --git a/kioslave/http/rfc2617.txt b/tdeioslave/http/rfc2617.txt
index da74cc63a..da74cc63a 100644
--- a/kioslave/http/rfc2617.txt
+++ b/tdeioslave/http/rfc2617.txt
diff --git a/kioslave/http/rfc2817.txt b/tdeioslave/http/rfc2817.txt
index a29dfc44b..a29dfc44b 100644
--- a/kioslave/http/rfc2817.txt
+++ b/tdeioslave/http/rfc2817.txt
diff --git a/kioslave/http/rfc2818.txt b/tdeioslave/http/rfc2818.txt
index fff91b1a9..fff91b1a9 100644
--- a/kioslave/http/rfc2818.txt
+++ b/tdeioslave/http/rfc2818.txt
diff --git a/kioslave/http/rfc3229.txt b/tdeioslave/http/rfc3229.txt
index 54a19b685..54a19b685 100644
--- a/kioslave/http/rfc3229.txt
+++ b/tdeioslave/http/rfc3229.txt
diff --git a/kioslave/http/rfc3253.txt b/tdeioslave/http/rfc3253.txt
index 9968eea02..9968eea02 100644
--- a/kioslave/http/rfc3253.txt
+++ b/tdeioslave/http/rfc3253.txt
diff --git a/kioslave/http/shoutcast-icecast.txt b/tdeioslave/http/shoutcast-icecast.txt
index f7bdcf1e7..f7bdcf1e7 100644
--- a/kioslave/http/shoutcast-icecast.txt
+++ b/tdeioslave/http/shoutcast-icecast.txt
diff --git a/kioslave/http/webdav.protocol b/tdeioslave/http/webdav.protocol
index f4f4df462..3fd6287f9 100644
--- a/kioslave/http/webdav.protocol
+++ b/tdeioslave/http/webdav.protocol
@@ -14,5 +14,5 @@ defaultMimetype=application/octet-stream
 determineMimetypeFromExtension=false
 Icon=www
 maxInstances=3
-DocPath=kioslave/webdav.html
+DocPath=tdeioslave/webdav.html
 Class=:internet
diff --git a/kioslave/http/webdavs.protocol b/tdeioslave/http/webdavs.protocol
index c8b7cba3f..12d97499a 100644
--- a/kioslave/http/webdavs.protocol
+++ b/tdeioslave/http/webdavs.protocol
@@ -14,5 +14,5 @@ defaultMimetype=application/octet-stream
 determineMimetypeFromExtension=false
 Icon=www
 config=webdav
-DocPath=kioslave/webdavs.html
+DocPath=tdeioslave/webdavs.html
 Class=:internet
diff --git a/kioslave/iso/CMakeLists.txt b/tdeioslave/iso/CMakeLists.txt
index da6315b77..df3bfeee1 100644
--- a/kioslave/iso/CMakeLists.txt
+++ b/tdeioslave/iso/CMakeLists.txt
@@ -18,8 +18,8 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -46,6 +46,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK isofs-static kio-shared
+  LINK isofs-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/iso/Makefile.am b/tdeioslave/iso/Makefile.am
index f9c0bb754..bc1c7b3ea 100644
--- a/kioslave/iso/Makefile.am
+++ b/tdeioslave/iso/Makefile.am
@@ -25,15 +25,15 @@ install-data-local:
 	$(mkinstalldirs)  $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/
 	$(INSTALL_DATA) $(srcdir)/isoservice.desktop  $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/isoservice.desktop
 	$(mkinstalldirs)  $(DESTDIR)$(kde_confdir)/
-	$(INSTALL_DATA) $(srcdir)/kio_isorc $(DESTDIR)$(kde_confdir)/kio_isorc
+	$(INSTALL_DATA) $(srcdir)/tdeio_isorc $(DESTDIR)$(kde_confdir)/tdeio_isorc
 	$(mkinstalldirs)  $(DESTDIR)$(kde_appsdir)/
-	$(INSTALL_DATA) $(srcdir)/kio_iso.desktop  $(DESTDIR)$(kde_appsdir)/kio_iso.desktop
+	$(INSTALL_DATA) $(srcdir)/tdeio_iso.desktop  $(DESTDIR)$(kde_appsdir)/tdeio_iso.desktop
 
 uninstall-local:
 	-rm -f  $(DESTDIR)$(kde_servicesdir)/iso.protocol
 	-rm -f  $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/isoservice.desktop
-	-rm -f  $(DESTDIR)$(kde_confdir)/kio_isorc
-	-rm -f  $(DESTDIR)$(kde_appsdir)/kio_iso.desktop
+	-rm -f  $(DESTDIR)$(kde_confdir)/tdeio_isorc
+	-rm -f  $(DESTDIR)$(kde_appsdir)/tdeio_iso.desktop
 
 # These paths are KDE specific. Use them:
 # kde_appsdir         Where your application's menu entry (.desktop) should go to.
diff --git a/kioslave/iso/iso.cpp b/tdeioslave/iso/iso.cpp
index 59f5f781e..59f5f781e 100644
--- a/kioslave/iso/iso.cpp
+++ b/tdeioslave/iso/iso.cpp
diff --git a/kioslave/iso/iso.h b/tdeioslave/iso/iso.h
index 136c32736..f0393d7cb 100644
--- a/kioslave/iso/iso.h
+++ b/tdeioslave/iso/iso.h
@@ -22,7 +22,7 @@
 #ifndef _ISO_H
 #define _ISO_H
 
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 #include <sys/types.h>
 #include "kisofile.h"
 
diff --git a/kioslave/iso/iso.protocol b/tdeioslave/iso/iso.protocol
index 0e7d71b64..cd2d1d28b 100644
--- a/kioslave/iso/iso.protocol
+++ b/tdeioslave/iso/iso.protocol
@@ -7,5 +7,5 @@ output=filesystem
 reading=true
 source=true
 Icon=cd
-Description=A kioslave for ISO9660 filesystems
+Description=A tdeioslave for ISO9660 filesystems
 MimeType=application/x-iso
diff --git a/kioslave/iso/isoservice.desktop b/tdeioslave/iso/isoservice.desktop
index 00093709b..00093709b 100644
--- a/kioslave/iso/isoservice.desktop
+++ b/tdeioslave/iso/isoservice.desktop
diff --git a/kioslave/iso/kio_iso.desktop b/tdeioslave/iso/kio_iso.desktop
index 8578f44b4..8578f44b4 100644
--- a/kioslave/iso/kio_iso.desktop
+++ b/tdeioslave/iso/kio_iso.desktop
diff --git a/kioslave/iso/kio_isorc b/tdeioslave/iso/kio_isorc
index 3a874172e..3a874172e 100644
--- a/kioslave/iso/kio_isorc
+++ b/tdeioslave/iso/kio_isorc
diff --git a/kioslave/iso/kiso.cpp b/tdeioslave/iso/kiso.cpp
index b19ec589b..7556a3350 100644
--- a/kioslave/iso/kiso.cpp
+++ b/tdeioslave/iso/kiso.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kmimetype.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kfilterdev.h>
 #include <kfilterbase.h>
 
diff --git a/kioslave/iso/kiso.h b/tdeioslave/iso/kiso.h
index de0f06dca..de0f06dca 100644
--- a/kioslave/iso/kiso.h
+++ b/tdeioslave/iso/kiso.h
diff --git a/kioslave/iso/kisodirectory.cpp b/tdeioslave/iso/kisodirectory.cpp
index 74987a232..74987a232 100644
--- a/kioslave/iso/kisodirectory.cpp
+++ b/tdeioslave/iso/kisodirectory.cpp
diff --git a/kioslave/iso/kisodirectory.h b/tdeioslave/iso/kisodirectory.h
index 74045ac75..74045ac75 100644
--- a/kioslave/iso/kisodirectory.h
+++ b/tdeioslave/iso/kisodirectory.h
diff --git a/kioslave/iso/kisofile.cpp b/tdeioslave/iso/kisofile.cpp
index ffae0d3bc..ffae0d3bc 100644
--- a/kioslave/iso/kisofile.cpp
+++ b/tdeioslave/iso/kisofile.cpp
diff --git a/kioslave/iso/kisofile.h b/tdeioslave/iso/kisofile.h
index 696a8c191..696a8c191 100644
--- a/kioslave/iso/kisofile.h
+++ b/tdeioslave/iso/kisofile.h
diff --git a/kioslave/iso/libisofs/CMakeLists.txt b/tdeioslave/iso/libisofs/CMakeLists.txt
index a9ef936a8..a9ef936a8 100644
--- a/kioslave/iso/libisofs/CMakeLists.txt
+++ b/tdeioslave/iso/libisofs/CMakeLists.txt
diff --git a/kioslave/iso/libisofs/COPYING b/tdeioslave/iso/libisofs/COPYING
index c7aea1896..c7aea1896 100644
--- a/kioslave/iso/libisofs/COPYING
+++ b/tdeioslave/iso/libisofs/COPYING
diff --git a/kioslave/iso/libisofs/ChangeLog b/tdeioslave/iso/libisofs/ChangeLog
index fb46b8056..fb46b8056 100644
--- a/kioslave/iso/libisofs/ChangeLog
+++ b/tdeioslave/iso/libisofs/ChangeLog
diff --git a/kioslave/iso/libisofs/Makefile.am b/tdeioslave/iso/libisofs/Makefile.am
index a1278ff41..a1278ff41 100644
--- a/kioslave/iso/libisofs/Makefile.am
+++ b/tdeioslave/iso/libisofs/Makefile.am
diff --git a/kioslave/iso/libisofs/README b/tdeioslave/iso/libisofs/README
index 45d3bff04..45d3bff04 100644
--- a/kioslave/iso/libisofs/README
+++ b/tdeioslave/iso/libisofs/README
diff --git a/kioslave/iso/libisofs/bswap.h b/tdeioslave/iso/libisofs/bswap.h
index 95520c6ef..95520c6ef 100644
--- a/kioslave/iso/libisofs/bswap.h
+++ b/tdeioslave/iso/libisofs/bswap.h
diff --git a/kioslave/iso/libisofs/el_torito.h b/tdeioslave/iso/libisofs/el_torito.h
index cba83f785..cba83f785 100644
--- a/kioslave/iso/libisofs/el_torito.h
+++ b/tdeioslave/iso/libisofs/el_torito.h
diff --git a/kioslave/iso/libisofs/iso_fs.h b/tdeioslave/iso/libisofs/iso_fs.h
index 43353b0d9..43353b0d9 100644
--- a/kioslave/iso/libisofs/iso_fs.h
+++ b/tdeioslave/iso/libisofs/iso_fs.h
diff --git a/kioslave/iso/libisofs/isofs.c b/tdeioslave/iso/libisofs/isofs.c
index f1db4427c..f1db4427c 100644
--- a/kioslave/iso/libisofs/isofs.c
+++ b/tdeioslave/iso/libisofs/isofs.c
diff --git a/kioslave/iso/libisofs/isofs.h b/tdeioslave/iso/libisofs/isofs.h
index 1d17de4bb..1d17de4bb 100644
--- a/kioslave/iso/libisofs/isofs.h
+++ b/tdeioslave/iso/libisofs/isofs.h
diff --git a/kioslave/iso/libisofs/rock.h b/tdeioslave/iso/libisofs/rock.h
index e85919261..e85919261 100644
--- a/kioslave/iso/libisofs/rock.h
+++ b/tdeioslave/iso/libisofs/rock.h
diff --git a/kioslave/iso/qfilehack.cpp b/tdeioslave/iso/qfilehack.cpp
index f4f788f25..f4f788f25 100644
--- a/kioslave/iso/qfilehack.cpp
+++ b/tdeioslave/iso/qfilehack.cpp
diff --git a/kioslave/iso/qfilehack.h b/tdeioslave/iso/qfilehack.h
index 3f0b1f6a6..3f0b1f6a6 100644
--- a/kioslave/iso/qfilehack.h
+++ b/tdeioslave/iso/qfilehack.h
diff --git a/kioslave/metainfo/CMakeLists.txt b/tdeioslave/metainfo/CMakeLists.txt
index 9c5fcdf20..9b27a8652 100644
--- a/kioslave/metainfo/CMakeLists.txt
+++ b/tdeioslave/metainfo/CMakeLists.txt
@@ -14,8 +14,8 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -38,6 +38,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/metainfo/Makefile.am b/tdeioslave/metainfo/Makefile.am
index c1d1d295e..a5575d9ff 100644
--- a/kioslave/metainfo/Makefile.am
+++ b/tdeioslave/metainfo/Makefile.am
@@ -1,5 +1,5 @@
 ## $Id$
-## Makefile.am of tdebase/kioslave/metainfo
+## Makefile.am of tdebase/tdeioslave/metainfo
 
 INCLUDES = $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
diff --git a/kioslave/metainfo/metainfo.cpp b/tdeioslave/metainfo/metainfo.cpp
index 66e5357f9..abc5cdd96 100644
--- a/kioslave/metainfo/metainfo.cpp
+++ b/tdeioslave/metainfo/metainfo.cpp
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <kmimetype.h>
 #include <kdebug.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <klocale.h>
 #include <stdlib.h>
 
diff --git a/kioslave/metainfo/metainfo.h b/tdeioslave/metainfo/metainfo.h
index a77647180..cc179cc98 100644
--- a/kioslave/metainfo/metainfo.h
+++ b/tdeioslave/metainfo/metainfo.h
@@ -21,7 +21,7 @@
 #ifndef _METAINFO_H_
 #define _METAINFO_H_
 
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 
 class MetaInfoProtocol : public TDEIO::SlaveBase
 {
diff --git a/kioslave/metainfo/metainfo.protocol b/tdeioslave/metainfo/metainfo.protocol
index f1fa9adac..f1fa9adac 100644
--- a/kioslave/metainfo/metainfo.protocol
+++ b/tdeioslave/metainfo/metainfo.protocol
diff --git a/tdemdi/tdemdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp
index 5dfe82d64..db29c293f 100644
--- a/tdemdi/tdemdi/dockcontainer.cpp
+++ b/tdemdi/tdemdi/dockcontainer.cpp
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 //TODO: Well, this is already defined in tdeui/kdockwidget.cpp
diff --git a/tdemdi/tdemdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp
index 490eb2b43..2d1e6a68a 100644
--- a/tdemdi/tdemdi/guiclient.cpp
+++ b/tdemdi/tdemdi/guiclient.cpp
@@ -23,7 +23,7 @@
 
 #include <tqpopupmenu.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktoolbar.h>
 #include <klocale.h>
 #include <kaction.h>
diff --git a/tdemdi/tdemdichildarea.cpp b/tdemdi/tdemdichildarea.cpp
index ed5b0e009..9370bbbe7 100644
--- a/tdemdi/tdemdichildarea.cpp
+++ b/tdemdi/tdemdichildarea.cpp
@@ -30,7 +30,7 @@
 
 #include "tdemdidefines.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/tdemdi/tdemdidockcontainer.cpp b/tdemdi/tdemdidockcontainer.cpp
index 3eb3bce44..17f4dcf8a 100644
--- a/tdemdi/tdemdidockcontainer.cpp
+++ b/tdemdi/tdemdidockcontainer.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 //TODO: Well, this is already defined in tdeui/kdockwidget.cpp
diff --git a/tdemdi/tdemdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp
index 1bb00faf1..51c693f6e 100644
--- a/tdemdi/tdemdiguiclient.cpp
+++ b/tdemdi/tdemdiguiclient.cpp
@@ -22,7 +22,7 @@
 
 #include <tqpopupmenu.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktoolbar.h>
 #include <kmainwindow.h>
 #include <klocale.h>
diff --git a/tdeparts/CMakeLists.txt b/tdeparts/CMakeLists.txt
index 267d64655..341734461 100644
--- a/tdeparts/CMakeLists.txt
+++ b/tdeparts/CMakeLists.txt
@@ -18,9 +18,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 link_directories(
@@ -59,6 +59,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 2.1.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/tdeparts/COMMENTS b/tdeparts/COMMENTS
index abf24ca84..32f0be1d9 100644
--- a/tdeparts/COMMENTS
+++ b/tdeparts/COMMENTS
@@ -255,7 +255,7 @@ changes.
 <dfaure> ok :-)
 <weis> dfaure: Can you have a look at tdeparts/COMMENTS ?
 --
-<dfaure> weis: you should have come before. coolo is talking about re-writing libkio.
+<dfaure> weis: you should have come before. coolo is talking about re-writing libtdeio.
 <dfaure> well in fact he started the rewrite
  dfaure having a look
 <weis> dfaure: Unfortunately I am not paid for KDE but for Qt hacking :-( So I fear I have no time for kio anyway.
diff --git a/tdeparts/Makefile.am b/tdeparts/Makefile.am
index 8fea0f517..6796745a9 100644
--- a/tdeparts/Makefile.am
+++ b/tdeparts/Makefile.am
@@ -2,8 +2,8 @@
 
 AM_LDFLAGS = $(LDFLAGS_AS_NEEDED)
 
-INCLUDES= -I$(srcdir)/../ -I$(top_srcdir)/kio/ -I$(top_srcdir)/libltdl \
-	-I$(top_srcdir)/kfile $(all_includes)
+INCLUDES= -I$(srcdir)/../ -I$(top_srcdir)/tdeio/ -I$(top_srcdir)/libltdl \
+	-I$(top_srcdir)/tdefile $(all_includes)
 libtdeparts_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 3:0:1 -no-undefined
 libtdeparts_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
 
diff --git a/tdeparts/browserrun.cpp b/tdeparts/browserrun.cpp
index 4cff3f8a4..f0951b382 100644
--- a/tdeparts/browserrun.cpp
+++ b/tdeparts/browserrun.cpp
@@ -18,9 +18,9 @@
 
 #include "browserrun.h"
 #include <kmessagebox.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
-#include <kio/scheduler.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
+#include <tdeio/scheduler.h>
 #include <klocale.h>
 #include <kprocess.h>
 #include <kstringhandler.h>
diff --git a/tdeparts/part.cpp b/tdeparts/part.cpp
index 94d096db5..e0fd4e138 100644
--- a/tdeparts/part.cpp
+++ b/tdeparts/part.cpp
@@ -36,9 +36,9 @@
 #include <klocale.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdirnotify_stub.h>
 
 #include <stdio.h>
diff --git a/tdeparts/part.h b/tdeparts/part.h
index 6b2051f72..530da61c3 100644
--- a/tdeparts/part.h
+++ b/tdeparts/part.h
@@ -668,7 +668,7 @@ protected:
    * On failure the function should inform the user about the
    * problem with an appropriate message box. Standard error
    * messages can be constructed using TDEIO::buildErrorString()
-   * in combination with the error codes defined in kio/global.h
+   * in combination with the error codes defined in tdeio/global.h
    */
   virtual bool saveFile() = 0;
 
diff --git a/tdeparts/plugin.cpp b/tdeparts/plugin.cpp
index 457caa71f..e1469ad1c 100644
--- a/tdeparts/plugin.cpp
+++ b/tdeparts/plugin.cpp
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <kxmlguifactory.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 
 using namespace KParts;
diff --git a/tdeparts/tests/Makefile.am b/tdeparts/tests/Makefile.am
index df0a2a5be..0e77c3e4c 100644
--- a/tdeparts/tests/Makefile.am
+++ b/tdeparts/tests/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/kfile -I$(top_srcdir)/kio $(all_includes)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/tdefile -I$(top_srcdir)/tdeio $(all_includes)
 AM_LDFLAGS = $(all_libraries)
 LDADD = $(LIB_KPARTS)
 
diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp
index 5d1bbe5b3..d63002d53 100644
--- a/tdeparts/tests/ghostview.cpp
+++ b/tdeparts/tests/ghostview.cpp
@@ -3,7 +3,7 @@
 #include <kapplication.h>
 #include <kaction.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kcmdlineargs.h>
 #include <klibloader.h>
diff --git a/tdeprint/CMakeLists.txt b/tdeprint/CMakeLists.txt
index a7a97809f..724b0a0cb 100644
--- a/tdeprint/CMakeLists.txt
+++ b/tdeprint/CMakeLists.txt
@@ -32,9 +32,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${CMAKE_SOURCE_DIR}/kded
 )
 
@@ -84,7 +84,7 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared tdeinit_kded-shared
+  LINK tdeio-shared tdeinit_kded-shared
   DEPENDENCIES dcopidl dcopidl2cpp
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
@@ -104,7 +104,7 @@ set( ${target}_SRCS
   kpgeneralpage.cpp kpqtpage.cpp kmthreadjob.cpp
   kpipeprocess.cpp kpfilterpage.cpp kmspecialmanager.cpp
   tdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp
-  kfilelist.cpp kprintaction.cpp kpfileselectpage.cpp
+  tdefilelist.cpp kprintaction.cpp kpfileselectpage.cpp
   treecombobox.cpp kxmlcommand.cpp util.cpp printerfilter.cpp
   marginpreview.cpp marginvaluewidget.cpp marginwidget.cpp
   kpmarginpage.cpp messagewindow.cpp posterpreview.cpp
@@ -116,7 +116,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 4.2.0
-  LINK kio-shared
+  LINK tdeio-shared
   DEPENDENCIES dcopidl dcopidl2cpp
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/tdeprint/Makefile.am b/tdeprint/Makefile.am
index b70e46e93..7ea8df12a 100644
--- a/tdeprint/Makefile.am
+++ b/tdeprint/Makefile.am
@@ -23,7 +23,7 @@ libtdeprint_la_SOURCES = kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp
 		         kprintpreview.cpp kprintdialog.cpp kprinter.cpp kprinterimpl.cpp kprintdialogpage.cpp \
 			 kpcopiespage.cpp kpdriverpage.cpp kprinterpropertydialog.cpp kpgeneralpage.cpp kpqtpage.cpp \
 			 kmthreadjob.cpp kpipeprocess.cpp kpfilterpage.cpp \
-			 kmspecialmanager.cpp tdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp kfilelist.cpp \
+			 kmspecialmanager.cpp tdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp tdefilelist.cpp \
 			 kprintaction.cpp kpfileselectpage.cpp treecombobox.cpp kmfactory.skel kxmlcommand.cpp \
 			 util.cpp printerfilter.cpp marginpreview.cpp marginvaluewidget.cpp marginwidget.cpp \
 			 kpmarginpage.cpp messagewindow.cpp posterpreview.cpp kpposterpage.cpp foomatic2loader.cpp \
@@ -40,7 +40,7 @@ noinst_HEADERS = kmdbentry.h kmfactory.h \
 		 kpcopiespage.h kpdriverpage.h kprinterpropertydialog.h kpgeneralpage.h \
 		 kpqtpage.h kprintprocess.h kmthreadjob.h kpipeprocess.h tdeprintd.h \
 		 kpfilterpage.h kmspecialmanager.h tdeprintcheck.h plugincombobox.h \
-		 kfilelist.h kpfileselectpage.h treecombobox.h kxmlcommand.h \
+		 tdefilelist.h kpfileselectpage.h treecombobox.h kxmlcommand.h \
 		 util.h driverparse.h printerfilter.h marginpreview.h marginwidget.h \
 		 marginvaluewidget.h kpmarginpage.h messagewindow.h \
 		 posterpreview.h kpposterpage.h foomatic2loader.h ppdloader.h
@@ -104,7 +104,7 @@ noinst_LIBRARIES = libdriverparse.a
 libdriverparse_a_SOURCES = driverparse.c
 
 update_DATA = tdeprintrc.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 messages: rc.cpp
 	$(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui" | grep -v /cupsdconf` >> rc.cpp
diff --git a/tdeprint/cups/CMakeLists.txt b/tdeprint/cups/CMakeLists.txt
index 62c48618c..aa882ca7e 100644
--- a/tdeprint/cups/CMakeLists.txt
+++ b/tdeprint/cups/CMakeLists.txt
@@ -26,9 +26,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore/network
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${CMAKE_SOURCE_DIR}/tdeprint
   ${CMAKE_SOURCE_DIR}/tdeprint/management
 )
diff --git a/tdeprint/cups/Makefile.am b/tdeprint/cups/Makefile.am
index 64e8b997d..cdbb0b92c 100644
--- a/tdeprint/cups/Makefile.am
+++ b/tdeprint/cups/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 SUBDIRS = cupsdconf2
 
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management -I$(top_srcdir)/tdecore/network $(all_includes)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeio -I$(top_srcdir)/tdefile -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management -I$(top_srcdir)/tdecore/network $(all_includes)
 
 kde_module_LTLIBRARIES = tdeprint_cups.la
 
diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp
index f0057235e..685ce6e7e 100644
--- a/tdeprint/cups/cupsaddsmb2.cpp
+++ b/tdeprint/cups/cupsaddsmb2.cpp
@@ -30,7 +30,7 @@
 #include <kmessagebox.h>
 #include <tqmessagebox.h>
 #include <tqfile.h>
-#include <kio/passdlg.h>
+#include <tdeio/passdlg.h>
 #include <kdebug.h>
 #include <kseparator.h>
 #include <kactivelabel.h>
diff --git a/tdeprint/cups/cupsdconf2/CMakeLists.txt b/tdeprint/cups/cupsdconf2/CMakeLists.txt
index ceee1bc47..749d84182 100644
--- a/tdeprint/cups/cupsdconf2/CMakeLists.txt
+++ b/tdeprint/cups/cupsdconf2/CMakeLists.txt
@@ -17,9 +17,9 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 link_directories(
@@ -50,5 +50,5 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared ${CUPS_LIBRARIES}
+  LINK tdeio-shared ${CUPS_LIBRARIES}
 )
diff --git a/tdeprint/cups/cupsdconf2/Makefile.am b/tdeprint/cups/cupsdconf2/Makefile.am
index eb7e42159..b0c111bf8 100644
--- a/tdeprint/cups/cupsdconf2/Makefile.am
+++ b/tdeprint/cups/cupsdconf2/Makefile.am
@@ -1,6 +1,6 @@
 #$Id$
 
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile $(all_includes)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeio -I$(top_srcdir)/tdefile $(all_includes)
 
 bin_PROGRAMS =
 lib_LTLIBRARIES =
diff --git a/tdeprint/cups/cupsdconf2/cupsdconf.cpp b/tdeprint/cups/cupsdconf2/cupsdconf.cpp
index a05e44d6f..102ead1c8 100644
--- a/tdeprint/cups/cupsdconf2/cupsdconf.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdconf.cpp
@@ -24,7 +24,7 @@
 #include <tqregexp.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <stdlib.h>
 #include <cups/cups.h>
diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
index ada83d362..d221f2f04 100644
--- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
@@ -41,7 +41,7 @@
 #include <kiconloader.h>
 #include <tqstringlist.h>
 #include <tqwhatsthis.h>
-#include <kio/passdlg.h>
+#include <tdeio/passdlg.h>
 #include <kguiitem.h>
 #include <kprocess.h>
 
diff --git a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
index 61a89f933..00972e368 100644
--- a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
@@ -28,7 +28,7 @@
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 CupsdLogPage::CupsdLogPage(TQWidget *parent, const char *name)
 	: CupsdPage(parent, name)
diff --git a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp
index 7cf0ea74e..25c984ec4 100644
--- a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp
+++ b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp
@@ -22,7 +22,7 @@
 #include <tqlineedit.h>
 #include <tqlayout.h>
 #include <kpushbutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 
 QDirLineEdit::QDirLineEdit(bool file, TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
index b1bd96ee6..c2fcaab7b 100644
--- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
+++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
@@ -24,7 +24,7 @@
 #include <tqpushbutton.h>
 #include <klistview.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 
 QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsinfos.cpp b/tdeprint/cups/cupsinfos.cpp
index 7962b13ef..5013b57cc 100644
--- a/tdeprint/cups/cupsinfos.cpp
+++ b/tdeprint/cups/cupsinfos.cpp
@@ -22,10 +22,10 @@
 #include "kmtimer.h"
 #include "messagewindow.h"
 
-#include <kio/passdlg.h>
-#include <kio/authinfo.h>
+#include <tdeio/passdlg.h>
+#include <tdeio/authinfo.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <kdebug.h>
diff --git a/tdeprint/cups/kmconfigcups.cpp b/tdeprint/cups/kmconfigcups.cpp
index 55a96d9d5..1b0ccdaea 100644
--- a/tdeprint/cups/kmconfigcups.cpp
+++ b/tdeprint/cups/kmconfigcups.cpp
@@ -21,7 +21,7 @@
 #include "kmcupsconfigwidget.h"
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 
 #include <tqlayout.h>
diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp
index 2fe66d787..6f16f5dfa 100644
--- a/tdeprint/cups/kmconfigcupsdir.cpp
+++ b/tdeprint/cups/kmconfigcupsdir.cpp
@@ -23,7 +23,7 @@
 #include <kurlrequester.h>
 #include <klocale.h>
 #include <kdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqgroupbox.h>
 #include <tqlayout.h>
 #include <kcursor.h>
diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp
index ce005fc3b..a62583b1b 100644
--- a/tdeprint/cups/kmcupsconfigwidget.cpp
+++ b/tdeprint/cups/kmcupsconfigwidget.cpp
@@ -30,7 +30,7 @@
 
 #include <klocale.h>
 #include <kcursor.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstringhandler.h>
 
 class PortValidator : public TQIntValidator
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index e5d45a42a..d444db1f2 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -43,7 +43,7 @@
 #include <kdebug.h>
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tdesocketbase.h>
 #include <klibloader.h>
diff --git a/tdeprint/ext/kextprinterimpl.cpp b/tdeprint/ext/kextprinterimpl.cpp
index c976f54e0..8959aa3e8 100644
--- a/tdeprint/ext/kextprinterimpl.cpp
+++ b/tdeprint/ext/kextprinterimpl.cpp
@@ -22,7 +22,7 @@
 
 #include <tqfile.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 KExtPrinterImpl::KExtPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp
index a1b4ad4ee..7d972cbf8 100644
--- a/tdeprint/kmfactory.cpp
+++ b/tdeprint/kmfactory.cpp
@@ -32,7 +32,7 @@
 #include <tqsettings.h>
 
 #include <klibloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kdebug.h>
@@ -43,7 +43,7 @@
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kio/authinfo.h>
+#include <tdeio/authinfo.h>
 
 #include <unistd.h>
 
diff --git a/tdeprint/kmjobmanager.cpp b/tdeprint/kmjobmanager.cpp
index 3496cdb1d..2a0e2ae50 100644
--- a/tdeprint/kmjobmanager.cpp
+++ b/tdeprint/kmjobmanager.cpp
@@ -24,7 +24,7 @@
 
 #include <kaction.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 KMJobManager::KMJobManager(TQObject *parent, const char *name)
 : TQObject(parent,name)
diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp
index 57e06994d..a597b94b6 100644
--- a/tdeprint/kmmanager.cpp
+++ b/tdeprint/kmmanager.cpp
@@ -29,7 +29,7 @@
 #include <zlib.h>
 #include <tqfile.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kapplication.h>
diff --git a/tdeprint/kmprinter.cpp b/tdeprint/kmprinter.cpp
index b18116ef8..22fc9d970 100644
--- a/tdeprint/kmprinter.cpp
+++ b/tdeprint/kmprinter.cpp
@@ -22,7 +22,7 @@
 #include "driver.h"
 
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 KMPrinter::KMPrinter()
 : KMObject()
diff --git a/tdeprint/kpfileselectpage.cpp b/tdeprint/kpfileselectpage.cpp
index f3131717a..6847ade2b 100644
--- a/tdeprint/kpfileselectpage.cpp
+++ b/tdeprint/kpfileselectpage.cpp
@@ -18,7 +18,7 @@
  **/
 
 #include "kpfileselectpage.h"
-#include "kfilelist.h"
+#include "tdefilelist.h"
 
 #include <tqlayout.h>
 #include <tqstringlist.h>
diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp
index 06a61e1c0..518f544f6 100644
--- a/tdeprint/kprintdialog.cpp
+++ b/tdeprint/kprintdialog.cpp
@@ -53,16 +53,16 @@
 
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kguiitem.h>
 #include <kstdguiitem.h>
 #include <kapplication.h>
-#include <kio/renamedlg.h>
+#include <tdeio/renamedlg.h>
 
 #include <time.h>
 
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp
index 3664b4157..4d34280a0 100644
--- a/tdeprint/kprinter.cpp
+++ b/tdeprint/kprinter.cpp
@@ -36,7 +36,7 @@
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <krun.h>
 #include <knotifyclient.h>
 #include <kdebug.h>
diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp
index 5c3d840a0..fd05024a3 100644
--- a/tdeprint/kprinterimpl.cpp
+++ b/tdeprint/kprinterimpl.cpp
@@ -41,7 +41,7 @@
 #include <kmimemagic.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <stdlib.h>
 
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index d5102ed3c..e81a23b08 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktoolbar.h>
 #include <kmimetype.h>
 
diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp
index 5251b990a..a11f79304 100644
--- a/tdeprint/lpd/kmlpdmanager.cpp
+++ b/tdeprint/lpd/kmlpdmanager.cpp
@@ -34,7 +34,7 @@
 
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kprocess.h>
 
 #include <pwd.h>
diff --git a/tdeprint/lpr/kmconfiglpr.cpp b/tdeprint/lpr/kmconfiglpr.cpp
index b5c43ebef..8a6988188 100644
--- a/tdeprint/lpr/kmconfiglpr.cpp
+++ b/tdeprint/lpr/kmconfiglpr.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name)
 : KMConfigPage(parent, name)
diff --git a/tdeprint/lpr/lprsettings.cpp b/tdeprint/lpr/lprsettings.cpp
index 30b650c17..a539f4160 100644
--- a/tdeprint/lpr/lprsettings.cpp
+++ b/tdeprint/lpr/lprsettings.cpp
@@ -21,7 +21,7 @@
 #include "kmmanager.h"
 #include "kmfactory.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
 
diff --git a/tdeprint/management/CMakeLists.txt b/tdeprint/management/CMakeLists.txt
index ccaf2a70a..47dcda996 100644
--- a/tdeprint/management/CMakeLists.txt
+++ b/tdeprint/management/CMakeLists.txt
@@ -24,9 +24,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${CMAKE_SOURCE_DIR}/tdeprint
 )
 
diff --git a/tdeprint/management/Makefile.am b/tdeprint/management/Makefile.am
index f0d1acd9f..f9f5c0ce4 100644
--- a/tdeprint/management/Makefile.am
+++ b/tdeprint/management/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
-INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeprint -I$(top_builddir)/tdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes)
+INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeprint -I$(top_builddir)/tdeprint -I$(top_srcdir)/tdeio -I$(top_srcdir)/tdefile -I$(top_srcdir) $(all_includes)
 
 lib_LTLIBRARIES = libtdeprint_management.la
 kde_module_LTLIBRARIES = libtdeprint_management_module.la
diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp
index ee63e9eeb..b3ef6e329 100644
--- a/tdeprint/management/kmconfigdialog.cpp
+++ b/tdeprint/management/kmconfigdialog.cpp
@@ -32,7 +32,7 @@
 #include <tqlayout.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 KMConfigDialog::KMConfigDialog(TQWidget *parent, const char *name)
 : KDialogBase(IconList,i18n("TDE Print Configuration"),Ok|Cancel,Ok,parent,name,true,true)
diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp
index 2eea53b0e..bcbe1b0f7 100644
--- a/tdeprint/management/kmconfigfilter.cpp
+++ b/tdeprint/management/kmconfigfilter.cpp
@@ -29,7 +29,7 @@
 #include <tqapplication.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klistbox.h>
 #include <kdialog.h>
diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp
index b933cab00..91861f5ca 100644
--- a/tdeprint/management/kmconfigfonts.cpp
+++ b/tdeprint/management/kmconfigfonts.cpp
@@ -29,10 +29,10 @@
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kurlrequester.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <klistview.h>
 #include <kdialog.h>
 
diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp
index f02cfa854..b7c0a1522 100644
--- a/tdeprint/management/kmconfiggeneral.cpp
+++ b/tdeprint/management/kmconfiggeneral.cpp
@@ -30,7 +30,7 @@
 #include <kurlrequester.h>
 #include <krun.h>
 #include <kmimemagic.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <kmessagebox.h>
 #include <kcursor.h>
diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp
index 0fb40fb7b..667b40381 100644
--- a/tdeprint/management/kmconfigjobs.cpp
+++ b/tdeprint/management/kmconfigjobs.cpp
@@ -24,7 +24,7 @@
 
 #include <knuminput.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 
 KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp
index 548968701..3d084f735 100644
--- a/tdeprint/management/kmconfigpreview.cpp
+++ b/tdeprint/management/kmconfigpreview.cpp
@@ -26,7 +26,7 @@
 
 #include <klocale.h>
 #include <kurlrequester.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 
 KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp
index 704a20db5..1b05f8e9c 100644
--- a/tdeprint/management/kmdriverdbwidget.cpp
+++ b/tdeprint/management/kmdriverdbwidget.cpp
@@ -35,9 +35,9 @@
 
 #include <klocale.h>
 #include <kcursor.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kguiitem.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name)
 : TQWidget(parent,name)
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index da8a98016..5e4561c19 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -44,7 +44,7 @@
 #include <kmenubar.h>
 #include <kdebug.h>
 #include <twin.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqtimer.h>
 #include <tqlayout.h>
 #include <stdlib.h>
@@ -52,7 +52,7 @@
 #include <kdialogbase.h>
 #include <tqcheckbox.h>
 #include <kurldrag.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #undef m_manager
 #define	m_manager	KMFactory::self()->jobManager()
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index daafbff97..858fca0fc 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -45,7 +45,7 @@
 #include <kmessagebox.h>
 #include <kaction.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktoolbar.h>
 #include <ktoolbarbutton.h>
 #include <kdebug.h>
diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp
index 9e3775c14..ba6801769 100644
--- a/tdeprint/management/kmspecialprinterdlg.cpp
+++ b/tdeprint/management/kmspecialprinterdlg.cpp
@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kicondialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kseparator.h>
 
 KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmtimer.cpp b/tdeprint/management/kmtimer.cpp
index 5acc27351..a45a9caa0 100644
--- a/tdeprint/management/kmtimer.cpp
+++ b/tdeprint/management/kmtimer.cpp
@@ -20,7 +20,7 @@
 #include "kmtimer.h"
 #include "kmfactory.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 KMTimer* KMTimer::m_self = 0;
 
diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp
index 0e0cd306b..4f57762aa 100644
--- a/tdeprint/management/kmwdrivertest.cpp
+++ b/tdeprint/management/kmwdrivertest.cpp
@@ -32,7 +32,7 @@
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <kguiitem.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name)
 : KMWizardPage(parent,name)
diff --git a/tdeprint/management/kmwfile.cpp b/tdeprint/management/kmwfile.cpp
index 1fbaf45ff..f3b54dcdc 100644
--- a/tdeprint/management/kmwfile.cpp
+++ b/tdeprint/management/kmwfile.cpp
@@ -26,7 +26,7 @@
 
 #include <kurlrequester.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 KMWFile::KMWFile(TQWidget *parent, const char *name)
 : KMWizardPage(parent,name)
diff --git a/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp
index 6f2b4485e..093d2a909 100644
--- a/tdeprint/management/kxmlcommandselector.cpp
+++ b/tdeprint/management/kxmlcommandselector.cpp
@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kseparator.h>
 #include <kguiitem.h>
 #include <kactivelabel.h>
diff --git a/tdeprint/printerfilter.cpp b/tdeprint/printerfilter.cpp
index c30409e66..d1889dd1c 100644
--- a/tdeprint/printerfilter.cpp
+++ b/tdeprint/printerfilter.cpp
@@ -21,7 +21,7 @@
 #include "kmprinter.h"
 #include "kmfactory.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
 
diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp
index 763282ecd..a2a3e6a85 100644
--- a/tdeprint/rlpr/kmproxywidget.cpp
+++ b/tdeprint/rlpr/kmproxywidget.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqvalidator.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 
 KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name)
diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp
index 628205a31..5e927a940 100644
--- a/tdeprint/rlpr/krlprprinterimpl.cpp
+++ b/tdeprint/rlpr/krlprprinterimpl.cpp
@@ -25,7 +25,7 @@
 
 #include <tqfile.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 KRlprPrinterImpl::KRlprPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
diff --git a/tdeprint/specials.desktop b/tdeprint/specials.desktop
index f6edcea32..467a26d7e 100644
--- a/tdeprint/specials.desktop
+++ b/tdeprint/specials.desktop
@@ -768,7 +768,7 @@ Extension=
 Require=exec:/tdeprintfax
 
 [Printer 3]
-Command=ps2pdf -sPAPERSIZE=%psl %in %out && kmailservice 'mailto:?attachment=file:%out' && sleep 15 && rm -f %out
+Command=ps2pdf -sPAPERSIZE=%psl %in %out && tdemailservice 'mailto:?attachment=file:%out' && sleep 15 && rm -f %out
 Comment=Attachment for KMail Composer
 Comment[af]=Aanhegsel vir Kpos Saamsteller
 Comment[ar]=مر�قات كاتب KMail
diff --git a/tdeprint/kfilelist.cpp b/tdeprint/tdefilelist.cpp
index 44bd13a87..9d02b77f6 100644
--- a/tdeprint/kfilelist.cpp
+++ b/tdeprint/tdefilelist.cpp
@@ -17,7 +17,7 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include "kfilelist.h"
+#include "tdefilelist.h"
 
 #include <tqtoolbutton.h>
 #include <tqlabel.h>
@@ -26,9 +26,9 @@
 #include <tqheader.h>
 #include <tqwhatsthis.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurldrag.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <klistview.h>
@@ -323,4 +323,4 @@ void KFileList::slotDown()
 	}
 }
 
-#include "kfilelist.moc"
+#include "tdefilelist.moc"
diff --git a/tdeprint/kfilelist.h b/tdeprint/tdefilelist.h
index d5ef3ada1..d5ef3ada1 100644
--- a/tdeprint/kfilelist.h
+++ b/tdeprint/tdefilelist.h
diff --git a/tdeprint/tdeprintcheck.h b/tdeprint/tdeprintcheck.h
index bb839063f..7ffdf8d6c 100644
--- a/tdeprint/tdeprintcheck.h
+++ b/tdeprint/tdeprintcheck.h
@@ -22,7 +22,7 @@
 
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 class TDEPRINT_EXPORT KdeprintChecker
diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp
index 617fddf8f..02d32ab77 100644
--- a/tdeprint/tdeprintd.cpp
+++ b/tdeprint/tdeprintd.cpp
@@ -26,8 +26,8 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <dcopclient.h>
-#include <kio/passdlg.h>
-#include <kio/authinfo.h>
+#include <tdeio/passdlg.h>
+#include <tdeio/authinfo.h>
 #include <tqlabel.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
diff --git a/tderandr/libtderandr.h b/tderandr/libtderandr.h
index b2b362a90..d597999d8 100644
--- a/tderandr/libtderandr.h
+++ b/tderandr/libtderandr.h
@@ -31,7 +31,7 @@
 
 #include <tqfile.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <tdelibs_export.h>
 
diff --git a/tderandr/randr.h b/tderandr/randr.h
index af3712e71..eb77b03aa 100644
--- a/tderandr/randr.h
+++ b/tderandr/randr.h
@@ -24,7 +24,7 @@
 #include <tqptrlist.h>
 
 #include <tdecmodule.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class KTimerDialog;
 class RandRScreenPrivate;
diff --git a/tderesources/CMakeLists.txt b/tderesources/CMakeLists.txt
index 05ea5a5af..bb4e957e0 100644
--- a/tderesources/CMakeLists.txt
+++ b/tderesources/CMakeLists.txt
@@ -17,9 +17,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 link_directories(
@@ -57,7 +57,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.2.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
   DEPENDENCIES dcopidl
 )
diff --git a/tderesources/configwidget.h b/tderesources/configwidget.h
index 30ebf2a5a..a5b114344 100644
--- a/tderesources/configwidget.h
+++ b/tderesources/configwidget.h
@@ -24,7 +24,7 @@
 
 #include "resource.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwidget.h>
 
diff --git a/tderesources/factory.h b/tderesources/factory.h
index e4b9f0af1..6bb075a88 100644
--- a/tderesources/factory.h
+++ b/tderesources/factory.h
@@ -27,7 +27,7 @@
 #include <tqdict.h>
 #include <tqstring.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
 #include <ktrader.h>
 
@@ -48,7 +48,7 @@ namespace KRES {
  * KABC::Factory *factory = KABC::Factory::self( "contact" );
  *
  * // to allow a transparent configuration of resources, we have
- * // to use a kconfig object.
+ * // to use a tdeconfig object.
  * TDEConfig config( "tst" );
  * config.writePathEntry( "FileName", "/home/foobar/test.vcf" );// resource dependend
  * config.writeEntry( "FileFormat", "vcard" );                  // resource dependend
diff --git a/tderesources/managerimpl.cpp b/tderesources/managerimpl.cpp
index 43c39964e..467f049e9 100644
--- a/tderesources/managerimpl.cpp
+++ b/tderesources/managerimpl.cpp
@@ -26,7 +26,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include "resource.h"
diff --git a/tderesources/resource.cpp b/tderesources/resource.cpp
index 00cdb8768..2a16ee159 100644
--- a/tderesources/resource.cpp
+++ b/tderesources/resource.cpp
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include "resource.h"
 
diff --git a/tderesources/resource.h b/tderesources/resource.h
index 65578bcd1..506ef0eaf 100644
--- a/tderesources/resource.h
+++ b/tderesources/resource.h
@@ -66,7 +66,7 @@ class ConfigWidget;
  
   <B>resourceexample.h</B>:
 \code
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tderesources/resource.h>
 
 class ResourceExample : public KRES::Resource
@@ -84,7 +84,7 @@ class ResourceExample : public KRES::Resource
 
   <B>resourceexample.cpp</B>:
 \code
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "resourceexample.h"
 
diff --git a/tderesources/tderesources.desktop b/tderesources/tderesources.desktop
index 0d907e0e0..245981de7 100644
--- a/tderesources/tderesources.desktop
+++ b/tderesources/tderesources.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell tderesources
+Exec=tdecmshell tderesources
 Icon=about_kde
 Type=Application
 Terminal=false
diff --git a/tdersync/CMakeLists.txt b/tdersync/CMakeLists.txt
index 20ea5b777..1ccc3220a 100644
--- a/tdersync/CMakeLists.txt
+++ b/tdersync/CMakeLists.txt
@@ -18,8 +18,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_SOURCE_DIR}/tdefx
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -45,6 +45,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.1
-  LINK tdeui-shared kio-shared
+  LINK tdeui-shared tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/tdersync/rsyncconfigdialog.cpp b/tdersync/rsyncconfigdialog.cpp
index 0c1cd532a..ac8d32fa3 100644
--- a/tdersync/rsyncconfigdialog.cpp
+++ b/tdersync/rsyncconfigdialog.cpp
@@ -83,7 +83,7 @@
 #include <kpassdlg.h>
 #include <klistview.h>
 #include <kapplication.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include <kdirlister.h>
 #include <kstandarddirs.h>
diff --git a/tdersync/rsyncconfigdialog.h b/tdersync/rsyncconfigdialog.h
index 3da9e6f79..2ce05b8db 100644
--- a/tdersync/rsyncconfigdialog.h
+++ b/tdersync/rsyncconfigdialog.h
@@ -27,7 +27,7 @@
 
 #include <kurl.h>
 #include <kprocess.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klibloader.h>
 #include <kdialogbase.h>
 
diff --git a/tdersync/tdersync.cpp b/tdersync/tdersync.cpp
index 3e9e49981..d940fd7a3 100644
--- a/tdersync/tdersync.cpp
+++ b/tdersync/tdersync.cpp
@@ -50,8 +50,8 @@
 #include <util.h>
 #endif
 
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 #include "tdersync.h"
 #include "rsyncconfigdialog.h"
diff --git a/tdersync/tdersync.h b/tdersync/tdersync.h
index c0af479f2..1e11cb959 100644
--- a/tdersync/tdersync.h
+++ b/tdersync/tdersync.h
@@ -24,11 +24,11 @@
 
 #include <kurl.h>
 #include <kprocess.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klibloader.h>
 #include <tdeparts/plugin.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 #include <tqfile.h>
 #include <tqtimer.h>
@@ -62,7 +62,7 @@
 #include <kpassdlg.h>
 #include <klistview.h>
 #include <kapplication.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include <kdirlister.h>
 #include <kstandarddirs.h>
diff --git a/tdespell2/CMakeLists.txt b/tdespell2/CMakeLists.txt
index ffd852066..01b910862 100644
--- a/tdespell2/CMakeLists.txt
+++ b/tdespell2/CMakeLists.txt
@@ -21,8 +21,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_SOURCE_DIR}/tdeutils
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
diff --git a/tdespell2/broker.cpp b/tdespell2/broker.cpp
index 4dfc0f211..a5df8178c 100644
--- a/tdespell2/broker.cpp
+++ b/tdespell2/broker.cpp
@@ -30,7 +30,7 @@
 
 #include <kplugininfo.h>
 #include <ktrader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kdebug.h>
 
diff --git a/tdespell2/plugins/ispell/ispell_checker.cpp b/tdespell2/plugins/ispell/ispell_checker.cpp
index c07d9a55f..2bcf7ec92 100644
--- a/tdespell2/plugins/ispell/ispell_checker.cpp
+++ b/tdespell2/plugins/ispell/ispell_checker.cpp
@@ -197,7 +197,7 @@ ISpellChecker::ISpellChecker()
      m_chartypes(NULL),
      m_infile(NULL),
      m_outfile(NULL),
-     m_askfilename(NULL),
+     m_astdefilename(NULL),
      m_Trynum(0),
      m_translate_in(0)
 {
diff --git a/tdespell2/plugins/ispell/ispell_checker.h b/tdespell2/plugins/ispell/ispell_checker.h
index 84faa34f9..b9d02c177 100644
--- a/tdespell2/plugins/ispell/ispell_checker.h
+++ b/tdespell2/plugins/ispell/ispell_checker.h
@@ -245,7 +245,7 @@ private:
 	FILE *	m_infile;			/* File being corrected */
 	FILE *	m_outfile;		/* Corrected copy of infile */
 
-	char *	m_askfilename;		/* File specified in -f option */
+	char *	m_astdefilename;		/* File specified in -f option */
 
 	int	m_changes;		/* NZ if changes made to cur. file */
 	int	m_readonly;		/* NZ if current file is readonly */
diff --git a/tdespell2/settings.cpp b/tdespell2/settings.cpp
index 63b45e89d..d1d050ce7 100644
--- a/tdespell2/settings.cpp
+++ b/tdespell2/settings.cpp
@@ -25,7 +25,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqmap.h>
diff --git a/tdespell2/ui/dialog.cpp b/tdespell2/ui/dialog.cpp
index 82548a406..a0ff36c01 100644
--- a/tdespell2/ui/dialog.cpp
+++ b/tdespell2/ui/dialog.cpp
@@ -27,7 +27,7 @@
 #include "dictionary.h"
 #include "settings.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/tdespell2/ui/highlighter.cpp b/tdespell2/ui/highlighter.cpp
index 2d185462d..176d69232 100644
--- a/tdespell2/ui/highlighter.cpp
+++ b/tdespell2/ui/highlighter.cpp
@@ -24,7 +24,7 @@
 #include "dictionary.h"
 #include "settings.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqtextedit.h>
diff --git a/tdesu/Makefile.am b/tdesu/Makefile.am
index 926f3df5d..beec69d29 100644
--- a/tdesu/Makefile.am
+++ b/tdesu/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for libtdesu
 
-INCLUDES = -I$(top_srcdir)/kio/ $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio/ $(all_includes)
 
 lib_LTLIBRARIES = libtdesu.la
 libtdesu_la_SOURCES = client.cpp process.cpp kcookie.cpp su.cpp ssh.cpp stub.cpp tdesu_pty.cpp
diff --git a/tdesu/process.cpp b/tdesu/process.cpp
index 2d8e9a14f..a8d2478a5 100644
--- a/tdesu/process.cpp
+++ b/tdesu/process.cpp
@@ -48,7 +48,7 @@
 #include <tqcstring.h>
 #include <tqfile.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
diff --git a/tdesu/su.cpp b/tdesu/su.cpp
index 60a1abeb6..d75970dd8 100644
--- a/tdesu/su.cpp
+++ b/tdesu/su.cpp
@@ -33,7 +33,7 @@
 #include <tqcstring.h>
 #include <tqfile.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt
index e738e7be3..a42f8e208 100644
--- a/tdeui/CMakeLists.txt
+++ b/tdeui/CMakeLists.txt
@@ -25,9 +25,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdefx
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${FREETYPE_INCLUDE_DIRS}
 )
 
@@ -73,7 +73,7 @@ install( FILES
     ktextedit.h kpassivepopup.h
     kdatetimewidget.h ktimewidget.h ktimezonewidget.h kscrollview.h
     tdespell.h ksconfig.h tdespelldlg.h ksyntaxhighlighter.h
-    ktabbar.h ktabwidget.h ksplashscreen.h kconfigdialog.h
+    ktabbar.h ktabwidget.h ksplashscreen.h tdeconfigdialog.h
     kactionselector.h klanguagebutton.h klistviewsearchline.h
     kpixmapregionselectorwidget.h kpixmapregionselectordialog.h
     kiconviewsearchline.h ktoolbarlabelaction.h kshortcutdialog.h
@@ -138,7 +138,7 @@ set( ${target}_SRCS
   ktoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp
   ksconfig.cpp tdespelldlg.cpp
   tdespell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp
-  ksplashscreen.cpp tdespellui.ui kconfigdialog.cpp
+  ksplashscreen.cpp tdespellui.ui tdeconfigdialog.cpp
   kactionselector.cpp klanguagebutton.cpp klistviewsearchline.cpp
   kpixmapregionselectorwidget.cpp kpixmapregionselectordialog.cpp
   kwhatsthismanager.cpp kiconviewsearchline.cpp
diff --git a/tdeui/Makefile.am b/tdeui/Makefile.am
index f3ccef8b7..13d5b3c4f 100644
--- a/tdeui/Makefile.am
+++ b/tdeui/Makefile.am
@@ -70,7 +70,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 		ktextedit.h kpassivepopup.h \
 		kdatetimewidget.h ktimewidget.h ktimezonewidget.h kscrollview.h \
 		tdespell.h ksconfig.h tdespelldlg.h ksyntaxhighlighter.h \
-		ktabbar.h ktabwidget.h ksplashscreen.h kconfigdialog.h \
+		ktabbar.h ktabwidget.h ksplashscreen.h tdeconfigdialog.h \
 		kactionselector.h klanguagebutton.h klistviewsearchline.h \
 		kpixmapregionselectorwidget.h kpixmapregionselectordialog.h \
 		kiconviewsearchline.h ktoolbarlabelaction.h kshortcutdialog.h
@@ -119,7 +119,7 @@ libtdeui_la_SOURCES = \
 		ktoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp \
 		ksconfig.cpp tdespelldlg.cpp \
 		tdespell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp \
-		ksplashscreen.cpp tdespellui.ui kconfigdialog.cpp \
+		ksplashscreen.cpp tdespellui.ui tdeconfigdialog.cpp \
 		kactionselector.cpp klanguagebutton.cpp klistviewsearchline.cpp \
 		kpixmapregionselectorwidget.cpp kpixmapregionselectordialog.cpp \
 		kwhatsthismanager.cpp kiconviewsearchline.cpp \
diff --git a/tdeui/kactionclasses.cpp b/tdeui/kactionclasses.cpp
index 605ac8379..52b3441c2 100644
--- a/tdeui/kactionclasses.cpp
+++ b/tdeui/kactionclasses.cpp
@@ -43,7 +43,7 @@
 #include <dcopref.h>
 #include <kaccel.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kfontcombo.h>
 #include <kfontdialog.h>
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index ab36f83d7..1812487c1 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -28,7 +28,7 @@
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <klocale.h>
@@ -319,11 +319,11 @@ void KBugReport::slotConfigureEmail()
 {
   if (m_process) return;
   m_process = new TDEProcess;
-  *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount");
+  *m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount");
   connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotSetFrom()));
   if (!m_process->start())
   {
-    kdDebug() << "Couldn't start kcmshell.." << endl;
+    kdDebug() << "Couldn't start tdecmshell.." << endl;
     delete m_process;
     m_process = 0;
     return;
@@ -489,9 +489,9 @@ bool KBugReport::sendBugReport()
     TQString::fromLatin1("submit@bugs.pearsoncomputing.net") );
 
   TQString command;
-  command = locate("exe", "ksendbugmail");
+  command = locate("exe", "tdesendbugmail");
   if (command.isEmpty())
-      command = KStandardDirs::findExe( TQString::fromLatin1("ksendbugmail") );
+      command = KStandardDirs::findExe( TQString::fromLatin1("tdesendbugmail") );
 
   KTempFile outputfile;
   outputfile.close();
diff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h
index b8ddd39f7..aec61d668 100644
--- a/tdeui/kbugreport.h
+++ b/tdeui/kbugreport.h
@@ -57,7 +57,7 @@ public:
 
 protected slots:
   /**
-   * "Configure email" has been clicked - this calls kcmshell System/email
+   * "Configure email" has been clicked - this calls tdecmshell System/email
    */
   virtual void slotConfigureEmail();
   /**
diff --git a/tdeui/kcmenumngr.cpp b/tdeui/kcmenumngr.cpp
index 5af7b6de6..f71a88f79 100644
--- a/tdeui/kcmenumngr.cpp
+++ b/tdeui/kcmenumngr.cpp
@@ -22,7 +22,7 @@
 #include <tqpopupmenu.h>
 #include "kcmenumngr.h"
 #include "kglobal.h"
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "kshortcut.h"
 
 #undef KeyPress
diff --git a/tdeui/kcolorcombo.cpp b/tdeui/kcolorcombo.cpp
index a7dd90ac7..52291f762 100644
--- a/tdeui/kcolorcombo.cpp
+++ b/tdeui/kcolorcombo.cpp
@@ -45,7 +45,7 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index 2651fd05d..7182e9ddc 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -46,7 +46,7 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h
index e0ff8e6e4..247217aaf 100644
--- a/tdeui/kcombobox.h
+++ b/tdeui/kcombobox.h
@@ -654,7 +654,7 @@ public:
      * KPixmapProvider is just an abstract class with the one pure virtual
      * method KPixmapProvider::pixmapFor(). This method is called whenever
      * an item is added to the KHistoryComboBox. Implement it to return your
-     * own custom pixmaps, or use the KURLPixmapProvider from libkio,
+     * own custom pixmaps, or use the KURLPixmapProvider from libtdeio,
      * which uses KMimeType::pixmapForURL to resolve icons.
      *
      * Set @p prov to 0L if you want to disable pixmaps. Default no pixmaps.
diff --git a/tdeui/kcompletionbox.cpp b/tdeui/kcompletionbox.cpp
index efcda9ebe..2e63cb21f 100644
--- a/tdeui/kcompletionbox.cpp
+++ b/tdeui/kcompletionbox.cpp
@@ -27,7 +27,7 @@
 #include <tqstyle.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knotifyclient.h>
 #include <kglobalsettings.h>
 
diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp
index 4bd337c35..3cc224f4a 100644
--- a/tdeui/kcursor.cpp
+++ b/tdeui/kcursor.cpp
@@ -31,7 +31,7 @@
 #include <tqwidget.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqscrollview.h>
 
 #include "kcursor_private.h"
diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp
index 632c7deea..b73b8b4eb 100644
--- a/tdeui/kdatetbl.cpp
+++ b/tdeui/kdatetbl.cpp
@@ -32,7 +32,7 @@
 // When a date is selected by the user, it emits a signal:
 //      dateSelected(TQDate)
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kapplication.h>
diff --git a/tdeui/kdepackages.h b/tdeui/kdepackages.h
index 58ea0f867..fa07e627d 100644
--- a/tdeui/kdepackages.h
+++ b/tdeui/kdepackages.h
@@ -306,8 +306,8 @@ const char * const packages[] = {
 "kchart/usability",
 "kchat",
 "kcoloredit",
-"kconfigeditor",
-"kconfigure",
+"tdeconfigeditor",
+"tdeconfigure",
 "kcontrol",
 "kcontrol/kcmaccess",
 "kcontrol/kcmaccessibility",
@@ -362,7 +362,7 @@ const char * const packages[] = {
 "kcontrol/kcmproxy",
 "kcontrol/kcmsamba",
 "kcontrol/kcmscreensaver",
-"kcontrol/kcmshell",
+"kcontrol/tdecmshell",
 "kcontrol/kcmsmserver",
 "kcontrol/kcmspellchecking",
 "kcontrol/kcmstyle",
@@ -388,9 +388,9 @@ const char * const packages[] = {
 "kde-bluetooth/kbtserialchat",
 "kde-bluetooth/khciconfig",
 "kde-bluetooth/kinputwizard",
-"kde-bluetooth/kio_bluetooth",
-"kde-bluetooth/kio_obex",
-"kde-bluetooth/kio_sdp",
+"kde-bluetooth/tdeio_bluetooth",
+"kde-bluetooth/tdeio_obex",
+"kde-bluetooth/tdeio_sdp",
 "kde-windows",
 "kde-windows/buildsystem",
 "kde-windows/gui",
@@ -421,7 +421,7 @@ const char * const packages[] = {
 "tdelibs/tdeui",
 "tdelibs/kedittoolbar",
 "tdelibs/kimgio",
-"tdelibs/klauncher",
+"tdelibs/tdelauncher",
 "tdelibs/klocale",
 "tdelibs/tdemdi",
 "tdelibs/knetwork",
@@ -572,21 +572,21 @@ const char * const packages[] = {
 "kexi/Usability",
 "keystone",
 "kfax",
-"kfile-plugins",
-"kfile-plugins/OOo",
-"kfile-plugins/PNG",
-"kfile-plugins/avi",
-"kfile-plugins/exr",
-"kfile-plugins/jpeg",
-"kfile-plugins/mp3",
-"kfile-plugins/mpeg",
-"kfile-plugins/ogg",
-"kfile-plugins/pdf",
-"kfile-plugins/ps",
-"kfile-plugins/wav",
-"kfile",
-"kfile/kfileplacesview",
-"kfilereplace",
+"tdefile-plugins",
+"tdefile-plugins/OOo",
+"tdefile-plugins/PNG",
+"tdefile-plugins/avi",
+"tdefile-plugins/exr",
+"tdefile-plugins/jpeg",
+"tdefile-plugins/mp3",
+"tdefile-plugins/mpeg",
+"tdefile-plugins/ogg",
+"tdefile-plugins/pdf",
+"tdefile-plugins/ps",
+"tdefile-plugins/wav",
+"tdefile",
+"tdefile/tdefileplacesview",
+"tdefilereplace",
 "kfind",
 "kfinger",
 "kfloppy",
@@ -638,7 +638,7 @@ const char * const packages[] = {
 "kicker/minipagerapplet",
 "kicker/multiscreen",
 "kicker/naughtyapplet",
-"kicker/quicklauncher",
+"kicker/quictdelauncher",
 "kicker/sidebar",
 "kicker/systemtray",
 "kicker/taskbarapplet",
@@ -654,46 +654,46 @@ const char * const packages[] = {
 "kimdaba",
 "kinkatta",
 "kio",
-"kio/audiocd",
-"kio/cgi",
-"kio/devices",
-"kio/file",
-"kio/fish",
-"kio/floppy",
-"kio/ftp",
-"kio/gopher",
-"kio/help",
-"kio/home",
-"kio/http",
-"kio/imap",
-"kio/info",
-"kio/kamera",
-"kio/kfile",
-"kio/kioslave",
-"kio/kssl",
-"kio/man",
-"kio/media",
-"kio/nfs",
-"kio/nntp",
-"kio/pop3",
-"kio/remote",
-"kio/settings",
-"kio/sftp",
-"kio/sieve",
-"kio/smb",
-"kio/smbro",
-"kio/smtp",
-"kio/svn",
-"kio/system",
-"kio/tar",
-"kio/thumbnail",
-"kio/trash",
-"kio/uiserver",
-"kio/webdav",
-"kio/zeroconf",
-"kio/zip",
+"tdeio/audiocd",
+"tdeio/cgi",
+"tdeio/devices",
+"tdeio/file",
+"tdeio/fish",
+"tdeio/floppy",
+"tdeio/ftp",
+"tdeio/gopher",
+"tdeio/help",
+"tdeio/home",
+"tdeio/http",
+"tdeio/imap",
+"tdeio/info",
+"tdeio/kamera",
+"tdeio/tdefile",
+"tdeio/tdeioslave",
+"tdeio/kssl",
+"tdeio/man",
+"tdeio/media",
+"tdeio/nfs",
+"tdeio/nntp",
+"tdeio/pop3",
+"tdeio/remote",
+"tdeio/settings",
+"tdeio/sftp",
+"tdeio/sieve",
+"tdeio/smb",
+"tdeio/smbro",
+"tdeio/smtp",
+"tdeio/svn",
+"tdeio/system",
+"tdeio/tar",
+"tdeio/thumbnail",
+"tdeio/trash",
+"tdeio/uiserver",
+"tdeio/webdav",
+"tdeio/zeroconf",
+"tdeio/zip",
 "kiosk",
-"kiosk/kiosktool",
+"kiosk/tdeiosktool",
 "kipiplugins",
 "kipiplugins/GPSSync",
 "kipiplugins/HTMLExport",
@@ -815,7 +815,7 @@ const char * const packages[] = {
 "knetload",
 "knetload/Linux Statistics",
 "knetwalk",
-"knetworkconf",
+"knetwortdeconf",
 "knetworkmanager",
 "knetworkmanager/802.1x",
 "knetworkmanager/cellular",
diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp
index 3821e6a26..53d7b4f05 100644
--- a/tdeui/kdialog.cpp
+++ b/tdeui/kdialog.cpp
@@ -18,7 +18,7 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kdialog.h>
 #include <kwhatsthismanager_p.h>
diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp
index 3a7be7a94..46d0697d5 100644
--- a/tdeui/kdialogbase.cpp
+++ b/tdeui/kdialogbase.cpp
@@ -35,7 +35,7 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp
index a1ef8aad1..0bfebe0ab 100644
--- a/tdeui/kdockwidget.cpp
+++ b/tdeui/kdockwidget.cpp
@@ -33,7 +33,7 @@
 #include <tqstyle.h>
 
 #ifndef NO_KDE2
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <ktoolbar.h>
diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp
index 563b007c0..63c4bc2b2 100644
--- a/tdeui/kedittoolbar.cpp
+++ b/tdeui/kedittoolbar.cpp
@@ -40,7 +40,7 @@
 #include <kmessagebox.h>
 #include <kxmlguifactory.h>
 #include <kseparator.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
@@ -1373,8 +1373,8 @@ void KEditToolbarWidget::updateLocal(TQDomElement& elem)
 
 void KEditToolbarWidget::slotChangeIcon()
 {
-  // We can't use KIconChooser here, since it's in libkio
-  // ##### KDE4: reconsider this, e.g. move KEditToolbar to libkio
+  // We can't use KIconChooser here, since it's in libtdeio
+  // ##### KDE4: reconsider this, e.g. move KEditToolbar to libtdeio
   
   //if the process is already running (e.g. when somebody clicked the change button twice (see #127149)) - do nothing... 
   //otherwise m_kdialogProcess will be overwritten and set to zero in slotProcessExited()...crash!
diff --git a/tdeui/kfontcombo.cpp b/tdeui/kfontcombo.cpp
index 1923f6cb9..f36b18510 100644
--- a/tdeui/kfontcombo.cpp
+++ b/tdeui/kfontcombo.cpp
@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 
 #include <kcharsets.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kfontdialog.h>
 
diff --git a/tdeui/kfontdialog.cpp b/tdeui/kfontdialog.cpp
index 01073521d..97f43544c 100644
--- a/tdeui/kfontdialog.cpp
+++ b/tdeui/kfontdialog.cpp
@@ -43,7 +43,7 @@
 
 #include <kapplication.h>
 #include <kcharsets.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp
index 430a23fa0..185450880 100644
--- a/tdeui/kiconview.cpp
+++ b/tdeui/kiconview.cpp
@@ -25,7 +25,7 @@
 
 #include "kiconview.h"
 #include "kwordwrap.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp
index b83cc6d53..8de6a6e59 100644
--- a/tdeui/kkeydialog.cpp
+++ b/tdeui/kkeydialog.cpp
@@ -40,7 +40,7 @@
 #include <kaccelaction.h>
 #include <kactionshortcutlist.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalaccel.h>
diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp
index d70485b09..f6fa42611 100644
--- a/tdeui/klineedit.cpp
+++ b/tdeui/klineedit.cpp
@@ -29,7 +29,7 @@
 #include <tqpainter.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtooltip.h>
 #include <kcursor.h>
 #include <klocale.h>
diff --git a/tdeui/klistview.cpp b/tdeui/klistview.cpp
index b604658f1..24c5f3a4b 100644
--- a/tdeui/klistview.cpp
+++ b/tdeui/klistview.cpp
@@ -28,7 +28,7 @@
 #include <tqpainter.h>
 
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kapplication.h>
 #include <kipc.h>
diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp
index 14f6f6bea..de9bb8f8f 100644
--- a/tdeui/kmainwindow.cpp
+++ b/tdeui/kmainwindow.cpp
@@ -37,7 +37,7 @@
 #include <kaccel.h>
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <khelpmenu.h>
 #include <kmenubar.h>
diff --git a/tdeui/kmainwindow.h b/tdeui/kmainwindow.h
index a66eb8327..5ddb669ee 100644
--- a/tdeui/kmainwindow.h
+++ b/tdeui/kmainwindow.h
@@ -873,7 +873,7 @@ protected:
      * invoked when the session manager requests your application
      * to save its state.
      *
-     * You @em must @em not change the group of the @p kconfig object, since
+     * You @em must @em not change the group of the @p tdeconfig object, since
      * KMainWindow uses one group for each window.  Please
      * reimplement these function in childclasses.
      *
diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp
index f6cac81ab..d2b97f3b0 100644
--- a/tdeui/kmenubar.cpp
+++ b/tdeui/kmenubar.cpp
@@ -32,7 +32,7 @@
 #include <tqstyle.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <kmenubar.h>
 #include <kapplication.h>
diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp
index 524636089..d0c4f0a11 100644
--- a/tdeui/kmessagebox.cpp
+++ b/tdeui/kmessagebox.cpp
@@ -32,7 +32,7 @@
 #include <tqlayout.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kguiitem.h>
diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp
index 7ca2999f1..d38f36980 100644
--- a/tdeui/kpanelapplet.cpp
+++ b/tdeui/kpanelapplet.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "kpanelapplet.h"
 #include "kpanelapplet.moc"
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class KPanelApplet::KPanelAppletPrivate
 {
diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h
index 2ef893927..43c7221aa 100644
--- a/tdeui/kpanelapplet.h
+++ b/tdeui/kpanelapplet.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __kpanelapplet_h__
 
 #include <tqframe.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class TDEConfig;
 class TQPopupMenu;
diff --git a/tdeui/kpanelextension.cpp b/tdeui/kpanelextension.cpp
index aae989c2e..31fbd4343 100644
--- a/tdeui/kpanelextension.cpp
+++ b/tdeui/kpanelextension.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqpopupmenu.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kpanelextension.h"
 #include "kpanelextension.moc"
diff --git a/tdeui/kpanelmenu.cpp b/tdeui/kpanelmenu.cpp
index 101d2aba0..a995661c3 100644
--- a/tdeui/kpanelmenu.cpp
+++ b/tdeui/kpanelmenu.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtimer.h>
 
 #include "kpanelmenu.h"
diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp
index 5803ca477..46a8cccde 100644
--- a/tdeui/kpassdlg.cpp
+++ b/tdeui/kpassdlg.cpp
@@ -41,7 +41,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kaboutdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 
diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp
index fe2414a67..8892ce153 100644
--- a/tdeui/kpassivepopup.cpp
+++ b/tdeui/kpassivepopup.cpp
@@ -6,7 +6,7 @@
  *   email                : sascha.cunz@tiscali.de
  */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqapplication.h>
 #include <tqlabel.h>
diff --git a/tdeui/kpixmapio.cpp b/tdeui/kpixmapio.cpp
index 004a51349..7ce3a1be2 100644
--- a/tdeui/kpixmapio.cpp
+++ b/tdeui/kpixmapio.cpp
@@ -19,7 +19,7 @@
 #include <tqglobal.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <sys/types.h>
diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp
index c61d140dd..35bf0928f 100644
--- a/tdeui/kpushbutton.cpp
+++ b/tdeui/kpushbutton.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kipc.h> 
 #include <kapplication.h>
diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp
index d74a40706..363a9b8b4 100644
--- a/tdeui/ksconfig.cpp
+++ b/tdeui/ksconfig.cpp
@@ -26,10 +26,10 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/tdeui/kscrollview.cpp b/tdeui/kscrollview.cpp
index fe865d31e..997de84b3 100644
--- a/tdeui/kscrollview.cpp
+++ b/tdeui/kscrollview.cpp
@@ -24,7 +24,7 @@
 
 #include "kscrollview.h"
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 struct KScrollView::KScrollViewPrivate {
diff --git a/tdeui/kshortcutdialog.cpp b/tdeui/kshortcutdialog.cpp
index c93194e77..db5e32322 100644
--- a/tdeui/kshortcutdialog.cpp
+++ b/tdeui/kshortcutdialog.cpp
@@ -53,7 +53,7 @@
 #include <tqvbox.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/tdeui/ksplashscreen.cpp b/tdeui/ksplashscreen.cpp
index b88be8e06..a45a579bb 100644
--- a/tdeui/ksplashscreen.cpp
+++ b/tdeui/ksplashscreen.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 
diff --git a/tdeui/kstatusbar.cpp b/tdeui/kstatusbar.cpp
index 7d7856a34..134d7f1a5 100644
--- a/tdeui/kstatusbar.cpp
+++ b/tdeui/kstatusbar.cpp
@@ -20,7 +20,7 @@
 
 #include <kdebug.h>
 #include <kstatusbar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 
diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp
index f86083d0a..57f1dee15 100644
--- a/tdeui/kswitchlanguagedialog.cpp
+++ b/tdeui/kswitchlanguagedialog.cpp
@@ -27,7 +27,7 @@
 #include <tqmap.h>
 
 #include <klanguagebutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp
index 866bcfce1..07ddf93c4 100644
--- a/tdeui/ksyntaxhighlighter.cpp
+++ b/tdeui/ksyntaxhighlighter.cpp
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <tdespell.h>
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index 717d5c574..3b68d583a 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -36,7 +36,7 @@
 
 #include <kimageeffect.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqapplication.h>
 #include <tqbitmap.h>
diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp
index e447eab26..5eef3dd73 100644
--- a/tdeui/ktabwidget.cpp
+++ b/tdeui/ktabwidget.cpp
@@ -22,7 +22,7 @@
 #include <tqstyle.h>
 #include <tqstylesheet.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kstringhandler.h>
 
diff --git a/tdeui/ktimezonewidget.cpp b/tdeui/ktimezonewidget.cpp
index a9a73a4f5..5db720a68 100644
--- a/tdeui/ktimezonewidget.cpp
+++ b/tdeui/ktimezonewidget.cpp
@@ -19,7 +19,7 @@
 
 #include <kdialog.h>
 #include <kdebug.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp
index 085aba857..7be804565 100644
--- a/tdeui/ktip.cpp
+++ b/tdeui/ktip.cpp
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/tdeui/ktoolbar.cpp b/tdeui/ktoolbar.cpp
index 41d416f01..8c64dfdc6 100644
--- a/tdeui/ktoolbar.cpp
+++ b/tdeui/ktoolbar.cpp
@@ -51,7 +51,7 @@
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
 #include <kpopupmenu.h>
diff --git a/tdeui/tdecmodule.cpp b/tdeui/tdecmodule.cpp
index 0b1b4f5fb..85a23341e 100644
--- a/tdeui/tdecmodule.cpp
+++ b/tdeui/tdecmodule.cpp
@@ -24,8 +24,8 @@
 #include <tqlayout.h>
 
 #include <kaboutdata.h>
-#include <kconfigskeleton.h>
-#include <kconfigdialogmanager.h>
+#include <tdeconfigskeleton.h>
+#include <tdeconfigdialogmanager.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kinstance.h>
diff --git a/tdeui/tdecmodule.h b/tdeui/tdecmodule.h
index 41d8d095e..12a10fac9 100644
--- a/tdeui/tdecmodule.h
+++ b/tdeui/tdecmodule.h
@@ -300,9 +300,9 @@ protected:
    * Help: shows a "Help" button.
    * Default: shows a "Use Defaults" button
    * Apply: in kcontrol this will show an "Apply" and "Reset" button
-   *        in kcmshell this will show an "Ok", "Apply" and "Cancel" button
+   *        in tdecmshell this will show an "Ok", "Apply" and "Cancel" button
    *
-   * If Apply is not specified, kcmshell will show a "Close" button.
+   * If Apply is not specified, tdecmshell will show a "Close" button.
    *
    * @see TDECModule::buttons
    */
diff --git a/tdeui/kconfigdialog.cpp b/tdeui/tdeconfigdialog.cpp
index 9707bc26a..c8e848fa3 100644
--- a/tdeui/kconfigdialog.cpp
+++ b/tdeui/tdeconfigdialog.cpp
@@ -19,10 +19,10 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  */
-#include "kconfigdialog.h"
+#include "tdeconfigdialog.h"
 
-#include <kconfigskeleton.h>
-#include <kconfigdialogmanager.h>
+#include <tdeconfigskeleton.h>
+#include <tdeconfigdialogmanager.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
@@ -256,4 +256,4 @@ void TDEConfigDialog::updateWidgetsDefault()
 }
 
 
-#include "kconfigdialog.moc"
+#include "tdeconfigdialog.moc"
diff --git a/tdeui/kconfigdialog.h b/tdeui/tdeconfigdialog.h
index f7cc10e26..f7cc10e26 100644
--- a/tdeui/kconfigdialog.h
+++ b/tdeui/tdeconfigdialog.h
diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp
index 9e92fb47e..bb0c0338b 100644
--- a/tdeui/tests/itemcontainertest.cpp
+++ b/tdeui/tests/itemcontainertest.cpp
@@ -18,7 +18,7 @@
 
 #include <kapplication.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconview.h>
 #include <klistview.h>
 #include <klistbox.h>
diff --git a/tdeui/tests/kcolordlgtest.cpp b/tdeui/tests/kcolordlgtest.cpp
index a6dadcfd3..1a506cbc0 100644
--- a/tdeui/tests/kcolordlgtest.cpp
+++ b/tdeui/tests/kcolordlgtest.cpp
@@ -19,7 +19,7 @@
 
 #include <kapplication.h>
 #include "kcolordialog.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 int main( int argc, char *argv[] )
diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp
index 8b2ecb829..c252c7cf8 100644
--- a/tdeui/tests/kdockwidgetdemo.cpp
+++ b/tdeui/tests/kdockwidgetdemo.cpp
@@ -19,7 +19,7 @@
 #include <tqstrlist.h>
 #include <tqpainter.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 //#include <kimgio.h>
 #include <stdlib.h>
diff --git a/tdeui/tests/kfontdialogtest.cpp b/tdeui/tests/kfontdialogtest.cpp
index 14edee074..0b3d4eb30 100644
--- a/tdeui/tests/kfontdialogtest.cpp
+++ b/tdeui/tests/kfontdialogtest.cpp
@@ -26,7 +26,7 @@
 
 #include <kapplication.h>
 #include "kfontdialog.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
  int main( int argc, char **argv )
diff --git a/tdeutils/CMakeLists.txt b/tdeutils/CMakeLists.txt
index 6f647a2b5..1e1982da4 100644
--- a/tdeutils/CMakeLists.txt
+++ b/tdeutils/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor
 )
diff --git a/tdeutils/Makefile.am b/tdeutils/Makefile.am
index 5ba725545..9bc3e2e49 100644
--- a/tdeutils/Makefile.am
+++ b/tdeutils/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/interfaces/kregexpeditor $(all_includes)
 lib_LTLIBRARIES   = libtdeutils.la
 libtdeutils_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
 # Needs KTrader
-libtdeutils_la_LIBADD  = ../kio/libkio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_X11)
+libtdeutils_la_LIBADD  = ../tdeio/libtdeio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_X11)
 
 libtdeutils_la_SOURCES = kfind.cpp kfinddialog.cpp kreplace.cpp \
                        kreplacedialog.cpp tdecmoduleinfo.cpp tdecmoduleloader.cpp \
diff --git a/tdeutils/kplugininfo.cpp b/tdeutils/kplugininfo.cpp
index aec0a095c..2b4079bb8 100644
--- a/tdeutils/kplugininfo.cpp
+++ b/tdeutils/kplugininfo.cpp
@@ -21,7 +21,7 @@
 #include <ksimpleconfig.h>
 #include <ktrader.h>
 #include <kdebug.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
diff --git a/tdeutils/ksettings/CMakeLists.txt b/tdeutils/ksettings/CMakeLists.txt
index 7a1d5034d..b495c90db 100644
--- a/tdeutils/ksettings/CMakeLists.txt
+++ b/tdeutils/ksettings/CMakeLists.txt
@@ -16,7 +16,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 ##### headers ###################################
diff --git a/tdeutils/ksettings/componentsdialog.cpp b/tdeutils/ksettings/componentsdialog.cpp
index 097d1f6d7..89a5e2cd7 100644
--- a/tdeutils/ksettings/componentsdialog.cpp
+++ b/tdeutils/ksettings/componentsdialog.cpp
@@ -26,7 +26,7 @@
 #include <kplugininfo.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kseparator.h>
 
 namespace KSettings
diff --git a/tdeutils/ksettings/dispatcher.cpp b/tdeutils/ksettings/dispatcher.cpp
index 590ca7e3c..3a423422f 100644
--- a/tdeutils/ksettings/dispatcher.cpp
+++ b/tdeutils/ksettings/dispatcher.cpp
@@ -23,7 +23,7 @@
 
 #include <kstaticdeleter.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <assert.h>
 
 namespace KSettings
diff --git a/tdeutils/tdecmoduleloader.cpp b/tdeutils/tdecmoduleloader.cpp
index 73f6983d3..3627e1777 100644
--- a/tdeutils/tdecmoduleloader.cpp
+++ b/tdeutils/tdecmoduleloader.cpp
@@ -170,9 +170,9 @@ TDECModule* TDECModuleLoader::loadModule(const TDECModuleInfo &mod, ErrorReporti
   /*
    * Ok, we could not load the library.
    * Try to run it as an executable.
-   * This must not be done when calling from kcmshell, or you'll
+   * This must not be done when calling from tdecmshell, or you'll
    * have infinite recursion
-   * (startService calls kcmshell which calls modloader which calls startService...)
+   * (startService calls tdecmshell which calls modloader which calls startService...)
    *
    */
   if(withfallback)
diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp
index 673074c16..d124db091 100644
--- a/tdeutils/tdecmoduleproxy.cpp
+++ b/tdeutils/tdecmoduleproxy.cpp
@@ -151,7 +151,7 @@ TDECModule * TDECModuleProxy::realModule() const
 	if( d->kcm )
 		return d->kcm;
 
-	/* /We/ have no kcm, but kcmshell running with root prevs does.. */
+	/* /We/ have no kcm, but tdecmshell running with root prevs does.. */
 	if( d->rootMode )
 		return 0;
 
@@ -329,7 +329,7 @@ void TDECModuleProxy::runAsRoot()
 	lblBusy->show();
 
 	deleteClient();
-	/* The DCOP registration is now gone, and it will occur again when kcmshell soon 
+	/* The DCOP registration is now gone, and it will occur again when tdecmshell soon 
 	 * registers. Here's a race condition in other words, but how likely is that?
 	 *
 	 * - It's a user initiated action, which means the user have to do weird stuff, very
@@ -340,7 +340,7 @@ void TDECModuleProxy::runAsRoot()
 	 * the DCOP object is established.
 	 */
 
-	/* Prepare the process to run the kcmshell */
+	/* Prepare the process to run the tdecmshell */
 	TQString cmd = moduleInfo().service()->exec().stripWhiteSpace();
 	if (cmd.left(5) == "tdesu")
 	{
@@ -351,7 +351,7 @@ void TDECModuleProxy::runAsRoot()
 			cmd = TQString(cmd.remove( 0, cmd.find( ' ' ) )).stripWhiteSpace();
 	}
 
-	if (cmd.left(8) == "kcmshell")
+	if (cmd.left(8) == "tdecmshell")
 		cmd = TQString(cmd.remove(0,8)).stripWhiteSpace();
 
 	/* Run the process */
@@ -364,7 +364,7 @@ void TDECModuleProxy::runAsRoot()
 		*d->rootProcess << tdesu;
 		*d->rootProcess << "--nonewdcop" << "-n" << "-d" << TQString( "-i%1" ).arg(moduleInfo().icon());
 
-		*d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "kcmshell"))
+		*d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "tdecmshell"))
 			.arg(cmd).arg(d->embedWidget->winId()).arg(TDEGlobal::locale()->language());
 
 		connect(d->rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(rootExited()));
diff --git a/tdeutils/tdecmoduleproxyIface.h b/tdeutils/tdecmoduleproxyIface.h
index 22bfa8e52..79d7a68ac 100644
--- a/tdeutils/tdecmoduleproxyIface.h
+++ b/tdeutils/tdecmoduleproxyIface.h
@@ -93,9 +93,9 @@ k_dcop_signals:
  * @ingroup tdecmodule
  * @brief DCOP interface for communicating with the real module running in root mode.
  * 
- * When a TDECModuleProxy tells kcmshell to load "itself" and embed into the 
+ * When a TDECModuleProxy tells tdecmshell to load "itself" and embed into the 
  * TDECModuleProxy, this DCOP interface is used to communicate to the real TDECModuleProxy, since 
- * the TDECModuleProxy which told kcmshell to load itself, is nothing but a shell.
+ * the TDECModuleProxy which told tdecmshell to load itself, is nothing but a shell.
  *
  * Currently is only the changed signal routed, but it's possible to proxy
  * the rest of the TDECModuleProxy API, if it turns out necessary.
diff --git a/tdeutils/tdecmoduleproxyIfaceImpl.cpp b/tdeutils/tdecmoduleproxyIfaceImpl.cpp
index 53019f72f..127831b02 100644
--- a/tdeutils/tdecmoduleproxyIfaceImpl.cpp
+++ b/tdeutils/tdecmoduleproxyIfaceImpl.cpp
@@ -100,7 +100,7 @@ TDECModuleProxyRootCommunicatorImpl::TDECModuleProxyRootCommunicatorImpl
 		p( const_cast<TDECModuleProxy *>( client ))
 { 
 	/*
-	 * Connect kcmshell's TDECModuleProxy's change signal 
+	 * Connect tdecmshell's TDECModuleProxy's change signal 
 	 * to us, such that we act as a proxy for 
 	 * TDECModuleProxy's API.
 	 */
diff --git a/tdewallet/client/tdewallet.cc b/tdewallet/client/tdewallet.cc
index 73b423cbc..add75c93d 100644
--- a/tdewallet/client/tdewallet.cc
+++ b/tdewallet/client/tdewallet.cc
@@ -20,7 +20,7 @@
 
 #include "tdewallettypes.h"
 #include "tdewallet.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <dcopclient.h>
diff --git a/win/pro_files/kate/part/part.pro b/win/pro_files/kate/part/part.pro
index ad3acfee7..65d87e323 100644
--- a/win/pro_files/kate/part/part.pro
+++ b/win/pro_files/kate/part/part.pro
@@ -12,7 +12,7 @@ LIBS += $$KDELIBDESTDIR/katepartinterfaces$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR/tdetexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX
+	$$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX
 
 INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/kregexpeditor \
 	$(KDELIBS)/tdeutils $(KDELIBS)/tdeprint
diff --git a/win/pro_files/kded/kded.pro b/win/pro_files/kded/kded.pro
index 05f2455cc..ee8de94d2 100644
--- a/win/pro_files/kded/kded.pro
+++ b/win/pro_files/kded/kded.pro
@@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro )
 LIBS += $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX
 
 # icon
-LIBS+=$(KDELIBS)/win/resources/kbuildsycoca.res
+LIBS+=$(KDELIBS)/win/resources/tdebuildsycoca.res
 
 INCLUDEPATH += $(KDELIBS)/kded
 
@@ -13,15 +13,15 @@ system( bash kmoc )
 
 !contains(CONFIG,GUI) {
 	!contains(KW_CONFIG,release) {
-		TARGET = kbuildsycoca_d
+		TARGET = tdebuildsycoca_d
 	}
 	contains(KW_CONFIG,release) {
-		TARGET = kbuildsycoca
+		TARGET = tdebuildsycoca
 	}
 }
 
 SOURCES = \
-kbuildsycoca.cpp \
+tdebuildsycoca.cpp \
 kbuildimageiofactory.cpp \
 kbuildprotocolinfofactory.cpp \
 kbuildservicefactory.cpp \
@@ -32,5 +32,5 @@ vfolder_menu.cpp
 
 HEADERS		=
 
-TRANSLATIONS    = kbuildsycoca_pl.ts
+TRANSLATIONS    = tdebuildsycoca_pl.ts
 
diff --git a/win/pro_files/kded/kded_rel.pro b/win/pro_files/kded/kded_rel.pro
index a878305ba..b17e1f3c7 100644
--- a/win/pro_files/kded/kded_rel.pro
+++ b/win/pro_files/kded/kded_rel.pro
@@ -9,4 +9,4 @@ QMAKE_CXXFLAGS += -DKBUILDSYCOCA_GUI
 
 include( "kded.pro" )
 
-TARGET		= kbuildsycocaw #gui version
+TARGET		= tdebuildsycocaw #gui version
diff --git a/win/pro_files/kdewidgets/kdewidgets.pro b/win/pro_files/kdewidgets/kdewidgets.pro
index 8bbf93cd9..435087785 100644
--- a/win/pro_files/kdewidgets/kdewidgets.pro
+++ b/win/pro_files/kdewidgets/kdewidgets.pro
@@ -11,7 +11,7 @@ TARGET = kdewidgets
 
 DESTDIR		= $$KDELIBDESTDIR/trinity/plugins/designer
 
-LIBS +=  $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \
+LIBS +=  $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR/kabc$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR/tderesources$$KDELIB_SUFFIX 
diff --git a/win/pro_files/kio/kio.pro b/win/pro_files/kio/kio.pro
index 179de7086..15056d021 100644
--- a/win/pro_files/kio/kio.pro
+++ b/win/pro_files/kio/kio.pro
@@ -9,17 +9,17 @@ DEFINES += MAKE_KIO_LIB
 LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX
 
-system( bash kmoc kio kfile misc bookmarks kssl )
+system( bash kmoc kio tdefile misc bookmarks kssl )
 
 TARGET = kio$$KDEBUG
 
-INCLUDEPATH += $(KDELIBS)/tdecore/network $(KDELIBS)/kio/kio $(KDELIBS)/kio/misc $(KDELIBS)/kio/bookmarks \
-  $(KDELIBS)/kio/kssl \
+INCLUDEPATH += $(KDELIBS)/tdecore/network $(KDELIBS)/tdeio/tdeio $(KDELIBS)/tdeio/misc $(KDELIBS)/tdeio/bookmarks \
+  $(KDELIBS)/tdeio/kssl \
   $(KDELIBS)/libltdl $(KDELIBS)/interfaces \
-  $(KDELIBS)/kio/kio/moc $(KDELIBS)/kio/misc/moc $(KDELIBS)/kio/kfile/moc \
-  $(KDELIBS)/kio/misc/moc \
-  $(KDELIBS)/kio/bookmarks/moc \
-  $(KDELIBS)/kio/kssl/moc $(KDELIBS)/tdewallet/client 
+  $(KDELIBS)/tdeio/tdeio/moc $(KDELIBS)/tdeio/misc/moc $(KDELIBS)/tdeio/tdefile/moc \
+  $(KDELIBS)/tdeio/misc/moc \
+  $(KDELIBS)/tdeio/bookmarks/moc \
+  $(KDELIBS)/tdeio/kssl/moc $(KDELIBS)/tdewallet/client 
 
 system( cd kio && dcopidl kdirnotify.h > kdirnotify.kidl && dcopidl2cpp --no-stub kdirnotify.kidl )
 system( cd kio && dcopidl observer.h > observer.kidl && dcopidl2cpp observer.kidl )
@@ -29,78 +29,78 @@ system( cd misc && dcopidl uiserver.h > uiserver.kidl && dcopidl2cpp uiserver.ki
 
 
 SOURCES = \
-kio/authinfo.cpp \
-kio/chmodjob.cpp \
-kio/connection.cpp \
-kio/dataprotocol.cpp \
-kio/dataslave.cpp \
-kio/davjob.cpp \
-kio/defaultprogress.cpp \
-kio/global.cpp \
-kio/job.cpp \
-kio/kacl.cpp \
-kio/kar.cpp \
-kio/karchive.cpp \
-kio/kdatatool.cpp \
-kio/kdcopservicestarter.cpp \
-kio/kdirlister.cpp \
-kio/kdirnotify.cpp \
-kio/kdirwatch.cpp \
-kio/kemailsettings.cpp \
-kio/kfilefilter.cpp \
-kio/kfileitem.cpp \
-kio/kfilemetainfo.cpp \
-kio/kfileshare.cpp \
-kio/kfilterbase.cpp \
-kio/kfilterdev.cpp \
-kio/kimageio.cpp \
-kio/kmimemagic.cpp \
-kio/kmimetype.cpp \
-kio/kmimetypechooser.cpp \
-kio/knfsshare.cpp \
-kio/kprotocolinfo.cpp \
-kio/kprotocolmanager.cpp \
-kio/kremoteencoding.cpp \
-kio/krun.cpp \
-kio/ksambashare.cpp \
-kio/kscan.cpp \
-kio/kservice.cpp \
-kio/kservicefactory.cpp \
-kio/kservicegroup.cpp \
-kio/kservicegroupfactory.cpp \
-kio/kservicetype.cpp \
-kio/kservicetypefactory.cpp \
-kio/kshellcompletion.cpp \
-kio/kshred.cpp \
-kio/ktar.cpp \
-kio/ktrader.cpp \
-kio/ktraderparse.cpp \
-kio/ktraderparsetree.cpp \
-kio/kurifilter.cpp \
-kio/kurlcompletion.cpp \
-kio/kurlpixmapprovider.cpp \
-kio/kuserprofile.cpp \
-kio/kzip.cpp \
-kio/lex.c \
-kio/metainfojob.cpp \
-kio/netaccess.cpp \
-kio/observer.cpp \
-kio/passdlg.cpp \
-kio/paste.cpp \
-kio/pastedialog.cpp \
-kio/previewjob.cpp \
-kio/progressbase.cpp \
-kio/renamedlg.cpp \
-kio/scheduler.cpp \
-kio/sessiondata.cpp \
-kio/skipdlg.cpp \
-kio/slave.cpp \
-kio/slavebase.cpp \
-kio/slaveconfig.cpp \
-kio/slaveinterface.cpp \
-kio/statusbarprogress.cpp \
-kio/tcpslavebase.cpp \
-kio/yacc.c \
+tdeio/authinfo.cpp \
+tdeio/chmodjob.cpp \
+tdeio/connection.cpp \
+tdeio/dataprotocol.cpp \
+tdeio/dataslave.cpp \
+tdeio/davjob.cpp \
+tdeio/defaultprogress.cpp \
+tdeio/global.cpp \
+tdeio/job.cpp \
+tdeio/kacl.cpp \
+tdeio/kar.cpp \
+tdeio/karchive.cpp \
+tdeio/kdatatool.cpp \
+tdeio/kdcopservicestarter.cpp \
+tdeio/kdirlister.cpp \
+tdeio/kdirnotify.cpp \
+tdeio/kdirwatch.cpp \
+tdeio/kemailsettings.cpp \
+tdeio/tdefilefilter.cpp \
+tdeio/tdefileitem.cpp \
+tdeio/tdefilemetainfo.cpp \
+tdeio/tdefileshare.cpp \
+tdeio/kfilterbase.cpp \
+tdeio/kfilterdev.cpp \
+tdeio/kimageio.cpp \
+tdeio/kmimemagic.cpp \
+tdeio/kmimetype.cpp \
+tdeio/kmimetypechooser.cpp \
+tdeio/knfsshare.cpp \
+tdeio/kprotocolinfo.cpp \
+tdeio/kprotocolmanager.cpp \
+tdeio/kremoteencoding.cpp \
+tdeio/krun.cpp \
+tdeio/ksambashare.cpp \
+tdeio/kscan.cpp \
+tdeio/kservice.cpp \
+tdeio/kservicefactory.cpp \
+tdeio/kservicegroup.cpp \
+tdeio/kservicegroupfactory.cpp \
+tdeio/kservicetype.cpp \
+tdeio/kservicetypefactory.cpp \
+tdeio/kshellcompletion.cpp \
+tdeio/kshred.cpp \
+tdeio/ktar.cpp \
+tdeio/ktrader.cpp \
+tdeio/ktraderparse.cpp \
+tdeio/ktraderparsetree.cpp \
+tdeio/kurifilter.cpp \
+tdeio/kurlcompletion.cpp \
+tdeio/kurlpixmapprovider.cpp \
+tdeio/kuserprofile.cpp \
+tdeio/kzip.cpp \
+tdeio/lex.c \
+tdeio/metainfojob.cpp \
+tdeio/netaccess.cpp \
+tdeio/observer.cpp \
+tdeio/passdlg.cpp \
+tdeio/paste.cpp \
+tdeio/pastedialog.cpp \
+tdeio/previewjob.cpp \
+tdeio/progressbase.cpp \
+tdeio/renamedlg.cpp \
+tdeio/scheduler.cpp \
+tdeio/sessiondata.cpp \
+tdeio/skipdlg.cpp \
+tdeio/slave.cpp \
+tdeio/slavebase.cpp \
+tdeio/slaveconfig.cpp \
+tdeio/slaveinterface.cpp \
+tdeio/statusbarprogress.cpp \
+tdeio/tcpslavebase.cpp \
+tdeio/yacc.c \
 \
 bookmarks/kbookmark.cc \
 bookmarks/kbookmarkbar.cc \
@@ -116,41 +116,41 @@ bookmarks/kbookmarkimporter_opera.cc \
 bookmarks/kbookmarkmanager.cc \
 bookmarks/kbookmarkmenu.cc \
 \
-kfile/kcombiview.cpp \
-kfile/kcustommenueditor.cpp \
-kfile/kdiroperator.cpp \
-kfile/kdirselectdialog.cpp \
-kfile/kdirsize.cpp \
-kfile/kdiskfreesp.cpp \
-kfile/kencodingfiledialog.cpp \
-kfile/kfilebookmarkhandler.cpp \
-kfile/kfiledetailview.cpp \
-kfile/kfiledialog.cpp \
-kfile/kfilefiltercombo.cpp \
-kfile/kfileiconview.cpp \
-kfile/kfilemetainfowidget.cpp \
-kfile/kfilemetapreview.cpp \
-kfile/kfilepreview.cpp \
-kfile/kfilesharedlg.cpp \
-kfile/kfilespeedbar.cpp \
-kfile/kfiletreebranch.cpp \
-kfile/kfiletreeview.cpp \
-kfile/kfiletreeviewitem.cpp \
-kfile/kfileview.cpp \
-kfile/kicondialog.cpp \
-kfile/kimagefilepreview.cpp \
-kfile/kmetaprops.cpp \
-kfile/knotifydialog.cpp \
-kfile/kopenwith.cpp \
-kfile/kpreviewprops.cpp \
-kfile/kpreviewwidgetbase.cpp \
-kfile/kpropertiesdialog.cpp \
-kfile/krecentdirs.cpp \
-kfile/krecentdocument.cpp \
-kfile/kurlbar.cpp \
-kfile/kurlcombobox.cpp \
-kfile/kurlrequester.cpp \
-kfile/kurlrequesterdlg.cpp \
+tdefile/kcombiview.cpp \
+tdefile/kcustommenueditor.cpp \
+tdefile/kdiroperator.cpp \
+tdefile/kdirselectdialog.cpp \
+tdefile/kdirsize.cpp \
+tdefile/kdiskfreesp.cpp \
+tdefile/kencodingfiledialog.cpp \
+tdefile/tdefilebookmarkhandler.cpp \
+tdefile/tdefiledetailview.cpp \
+tdefile/tdefiledialog.cpp \
+tdefile/tdefilefiltercombo.cpp \
+tdefile/tdefileiconview.cpp \
+tdefile/tdefilemetainfowidget.cpp \
+tdefile/tdefilemetapreview.cpp \
+tdefile/tdefilepreview.cpp \
+tdefile/tdefilesharedlg.cpp \
+tdefile/tdefilespeedbar.cpp \
+tdefile/tdefiletreebranch.cpp \
+tdefile/tdefiletreeview.cpp \
+tdefile/tdefiletreeviewitem.cpp \
+tdefile/tdefileview.cpp \
+tdefile/kicondialog.cpp \
+tdefile/kimagefilepreview.cpp \
+tdefile/kmetaprops.cpp \
+tdefile/knotifydialog.cpp \
+tdefile/kopenwith.cpp \
+tdefile/kpreviewprops.cpp \
+tdefile/kpreviewwidgetbase.cpp \
+tdefile/kpropertiesdialog.cpp \
+tdefile/krecentdirs.cpp \
+tdefile/krecentdocument.cpp \
+tdefile/kurlbar.cpp \
+tdefile/kurlcombobox.cpp \
+tdefile/kurlrequester.cpp \
+tdefile/kurlrequesterdlg.cpp \
 \
 misc/uiserver.cpp \
 \
@@ -176,7 +176,7 @@ kssl/ksslpeerinfo.cc \
 kssl/kopenssl.cc \
 kssl/ksmimecrypto.cc
 
-#removed kio/kautomount.cpp \
+#removed tdeio/kautomount.cpp \
 
 SOURCES += \
 ../tdecore/kprotocolinfo_tdecore.cpp
@@ -189,10 +189,10 @@ SOURCES += \
 
 # generated:
 SOURCES += \
-kio/kdirnotify_stub.cpp \
-kio/kdirnotify_skel.cpp \
-kio/observer_stub.cpp \
-kio/observer_skel.cpp \
+tdeio/kdirnotify_stub.cpp \
+tdeio/kdirnotify_skel.cpp \
+tdeio/observer_stub.cpp \
+tdeio/observer_skel.cpp \
 \
 bookmarks/kbookmarknotifier_stub.cpp \
 bookmarks/kbookmarknotifier_skel.cpp \
@@ -206,7 +206,7 @@ misc/uiserver_skel.cpp
 FORMS = \
 kssl/keygenwizard.ui \
 kssl/keygenwizard2.ui \
-kfile/knotifywidgetbase.ui \
-kfile/kpropertiesdesktopadvbase.ui \
-kfile/kpropertiesdesktopbase.ui \
-kfile/kpropertiesmimetypebase.ui
+tdefile/knotifywidgetbase.ui \
+tdefile/kpropertiesdesktopadvbase.ui \
+tdefile/kpropertiesdesktopbase.ui \
+tdefile/kpropertiesmimetypebase.ui
diff --git a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro b/win/pro_files/kio/tdefile/tests/tdefiletreeviewtest.pro
index c2d4afa73..58f334806 100644
--- a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro
+++ b/win/pro_files/kio/tdefile/tests/tdefiletreeviewtest.pro
@@ -9,12 +9,12 @@ tdebase_release:CONFIG += windows
 tdebase_release:QMAKE_MAKEFILE = Makefile.release
 
 
-TARGET		= kfiletreeviewtest
+TARGET		= tdefiletreeviewtest
 
 LIBS +=  $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \
-  $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \
+  $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX \
   $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX \
-  $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX
+  $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX
 
 # icon
 LIBS+=$(KDELIBS)/win/resources/kfind.res
@@ -22,7 +22,7 @@ LIBS+=$(KDELIBS)/win/resources/kfind.res
 system( bash kmoc )
 
 SOURCES = \
-kfiletreeviewtest.cpp
+tdefiletreeviewtest.cpp
 
 HEADERS		= 
 
diff --git a/win/pro_files/tdecore/kconfig_compiler/kconfig_compiler.pro b/win/pro_files/tdecore/tdeconfig_compiler/tdeconfig_compiler.pro
index 5b8272185..b8f175369 100644
--- a/win/pro_files/tdecore/kconfig_compiler/kconfig_compiler.pro
+++ b/win/pro_files/tdecore/tdeconfig_compiler/tdeconfig_compiler.pro
@@ -2,7 +2,7 @@ TEMPLATE	= app
 
 include( $(KDELIBS)/win/common.pro )
 
-TARGET = kconfig_compiler
+TARGET = tdeconfig_compiler
 
 win32 {
 #CONFIG -= console
@@ -11,7 +11,7 @@ win32 {
 
 #system( bash kmoc )
 
-SOURCES = kconfig_compiler.cpp
+SOURCES = tdeconfig_compiler.cpp
 
 HEADERS = 
 
diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro
index ed6662391..0e868d6f9 100644
--- a/win/pro_files/tdecore/tdecore.pro
+++ b/win/pro_files/tdecore/tdecore.pro
@@ -46,17 +46,17 @@ kurl.cpp \
 kidna.cpp \
 kstaticdeleter.cpp \
 kstandarddirs.cpp \
-kconfig.cpp \
-kconfigdialogmanager.cpp \
+tdeconfig.cpp \
+tdeconfigdialogmanager.cpp \
 kcharsets.cpp \
 kglobal.cpp \
 kdebug.cpp \
 ktempfile.cpp \
 ktempdir.cpp \
 ksavefile.cpp \
-kconfigbackend.cpp \
-kconfigbase.cpp \
-kconfigskeleton.cpp \
+tdeconfigbackend.cpp \
+tdeconfigbase.cpp \
+tdeconfigskeleton.cpp \
 klockfile.cpp \
 kstdaccel.cpp \
 kcheckaccelerators.cpp \
@@ -96,7 +96,7 @@ kmdcodec.cpp \
 kdcoppropertyproxy.cpp \
 klibloader.cpp \
 kprotocolinfo_tdecore.cpp \
-../kio/kio/kprotocolinfo.cpp \
+../tdeio/tdeio/kprotocolinfo.cpp \
 kprotocolinfofactory.cpp \
 kmountpoint.cpp \
 kmacroexpander.cpp \
diff --git a/win/pro_files/kioslave/bzip2/bzip2.pro b/win/pro_files/tdeioslave/bzip2/bzip2.pro
index ba76a95a4..ba76a95a4 100644
--- a/win/pro_files/kioslave/bzip2/bzip2.pro
+++ b/win/pro_files/tdeioslave/bzip2/bzip2.pro
diff --git a/win/pro_files/kioslave/common.pro b/win/pro_files/tdeioslave/common.pro
index e1a63c761..6b6ee9d54 100644
--- a/win/pro_files/kioslave/common.pro
+++ b/win/pro_files/tdeioslave/common.pro
@@ -4,5 +4,5 @@ CONFIG += trinitylib #this is a dynamic kde library
 
 include( $(KDELIBS)/win/common.pro )
 
-LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX
+LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/kioslave/gzip/gzip.pro b/win/pro_files/tdeioslave/gzip/gzip.pro
index fb09f18c3..fb09f18c3 100644
--- a/win/pro_files/kioslave/gzip/gzip.pro
+++ b/win/pro_files/tdeioslave/gzip/gzip.pro
diff --git a/win/pro_files/kioslave/kioslave.pro b/win/pro_files/tdeioslave/tdeioslave.pro
index a28199480..a28199480 100644
--- a/win/pro_files/kioslave/kioslave.pro
+++ b/win/pro_files/tdeioslave/tdeioslave.pro
diff --git a/win/pro_files/tdeparts/tdeparts.pro b/win/pro_files/tdeparts/tdeparts.pro
index 5e724cd1f..e26516544 100644
--- a/win/pro_files/tdeparts/tdeparts.pro
+++ b/win/pro_files/tdeparts/tdeparts.pro
@@ -9,9 +9,9 @@ DEFINES += MAKE_KPARTS_LIB
 TARGET		= tdeparts$$KDEBUG
 
 LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
- $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX
+ $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX
 
-INCLUDEPATH += $(KDELIBS)/kio/kfile
+INCLUDEPATH += $(KDELIBS)/tdeio/tdefile
 
 system( bash kmoc )
 
diff --git a/win/pro_files/tdeui/tdeui.pro b/win/pro_files/tdeui/tdeui.pro
index 0c8733d55..b6a0a44d2 100644
--- a/win/pro_files/tdeui/tdeui.pro
+++ b/win/pro_files/tdeui/tdeui.pro
@@ -38,7 +38,7 @@ kcolordrag.cpp \
 kcombobox.cpp \
 kcommand.cpp \
 kcompletionbox.cpp \
-kconfigdialog.cpp \
+tdeconfigdialog.cpp \
 kcursor.cpp \
 kdatepicker.cpp \
 kdatetbl.cpp \
diff --git a/win/pro_files/tdeutils/tdeutils.pro b/win/pro_files/tdeutils/tdeutils.pro
index f8e035d72..6507132ee 100644
--- a/win/pro_files/tdeutils/tdeutils.pro
+++ b/win/pro_files/tdeutils/tdeutils.pro
@@ -9,7 +9,7 @@ DEFINES += MAKE_KUTILS_LIB
 TARGET		= tdeutils$$KDEBUG
 
 LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/kio$$KDELIB_SUFFIX 
+	$$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX 
 
 INCLUDEPATH += $(KDELIBS)/interfaces/kregexpeditor
 
diff --git a/win/resources/kbuildsycoca.res b/win/resources/tdebuildsycoca.res
index b26e2349c..b26e2349c 100644
--- a/win/resources/kbuildsycoca.res
+++ b/win/resources/tdebuildsycoca.res
diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg
index 5a6c31512..3fcfe0c20 100644
--- a/win/tools/build_tdelibs_dbg
+++ b/win/tools/build_tdelibs_dbg
@@ -53,8 +53,8 @@ kabc \
 tdeutils \
 tdeparts \
 tdemdi \
-kioslave/gzip \
-kioslave/bzip2 \
+tdeioslave/gzip \
+tdeioslave/bzip2 \
 interfaces/tdetexteditor \
 kate/interfaces \
 kate/part \
diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel
index 2cd412542..399dcadda 100644
--- a/win/tools/build_tdelibs_rel
+++ b/win/tools/build_tdelibs_rel
@@ -53,8 +53,8 @@ kabc \
 tdeutils \
 tdeparts \
 tdemdi \
-kioslave/gzip \
-kioslave/bzip2 \
+tdeioslave/gzip \
+tdeioslave/bzip2 \
 interfaces/tdetexteditor \
 kate/interfaces \
 kate/part \
diff --git a/win/tools/kde_env b/win/tools/kde_env
index 0fbf1410c..c8e630de3 100755
--- a/win/tools/kde_env
+++ b/win/tools/kde_env
@@ -14,7 +14,7 @@ fi
 
 # Generic settings
 export KDELIBS=$KDEWIN\\tdelibs  # KDElibs/win32 source directory
-export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\tdecore;$KDELIBS\\tdefx;$KDELIBS\\tdeprint;$KDELIBS\\tdeui;$KDELIBS\\tdemdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\kfile;$INCLUDE"
+export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\tdecore;$KDELIBS\\tdefx;$KDELIBS\\tdeprint;$KDELIBS\\tdeui;$KDELIBS\\tdemdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\tdefile;$INCLUDE"
 
 # Version information for binaries
 # We're changing this from time to time
diff --git a/win/win32_utils.h b/win/win32_utils.h
index a0702c84c..1f18264cc 100644
--- a/win/win32_utils.h
+++ b/win/win32_utils.h
@@ -81,7 +81,7 @@ bool showWin32FilePropertyDialog(const TQString& fileName);
 /**
  \return two-letter locale name (like "en" or "pl") taken from MS Windows native registry.
  Useful when we don't want to rely on KSyCoCa.
- Used e.g. by kbuildsycoca application.
+ Used e.g. by tdebuildsycoca application.
 */
 KDEWIN32_EXPORT
 TQCString getWin32LocaleName();