diff --git a/CMakeLists.txt b/CMakeLists.txt
index c31da1271..7fac2b75b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,6 @@ set( VERSION "R14" )
 
 include( FindPkgConfig )
 include( CheckIncludeFile )
-include( CheckIncludeFiles )
 include( CheckCSourceRuns )
 include( CheckCXXSourceRuns )
 include( CheckCXXSourceCompiles )
@@ -85,16 +84,15 @@ option( WITH_HAL "Enable HAL support" ${WITH_ALL_OPTIONS} )
 option( WITH_TDEHWLIB "Enable TDE hardware library support" OFF )
 option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )
 option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
-option( WITH_KDESKTOP_LOCK_BACKTRACE "Enable backtrace in kdesktop_lock exception handler"  ${WITH_ALL_OPTIONS} )
 
 ##### options comments ##########################
 
-# WITH_SASL         affects kioslaves(kio_ldap kio_smtp kio_pop3)
-# WITH_LDAP         affects kioslaves(kio_ldap)
-# WITH_SAMBA        affects kioslaves(kio_samba) kcontrol
-# WITH_OPENEXR      affects kioslaves(thumbnail)
+# WITH_SASL         affects tdeioslaves(kio_ldap kio_smtp kio_pop3)
+# WITH_LDAP         affects tdeioslaves(kio_ldap)
+# WITH_SAMBA        affects tdeioslaves(kio_samba) kcontrol
+# WITH_OPENEXR      affects tdeioslaves(thumbnail)
 # WITH_XCOMPOSITE   affects twin kicker(taskmanager) tdm
-# WITH_XCURSOR      affects kioslaves(thumbnail), kcontrol(input), kdesktop
+# WITH_XCURSOR      affects tdeioslaves(thumbnail), kcontrol(input), kdesktop
 # WITH_XFIXES       affects twin klipper kicker(taskmanager)
 # WITH_XDAMAGE      affects <nothing>
 # WITH_XEXT         affects <nothing>
@@ -113,8 +111,8 @@ option( WITH_KDESKTOP_LOCK_BACKTRACE "Enable backtrace in kdesktop_lock exceptio
 # WITH_XINERAMA     affects ksplashml
 # WITH_ARTS         affects libkonq khotkeys
 # WITH_I8K          affects ksysguard
-# WITH_HAL          affects kioslaves(media) ksmserver
-# WITH_TDEHWLIB     affects kioslaves(media), replaces WITH_HAL on systems without HAL
+# WITH_HAL          affects tdeioslaves(media) ksmserver
+# WITH_TDEHWLIB     affects tdeioslaves(media), replaces WITH_HAL on systems without HAL
 # WITH_LIBRAW1394   affects kcontrol(view1394)
 # WITH_PAM          affects tdm kdesktop kcheckpass
 # WITH_SHADOW       affects tdm kcheckpass
@@ -145,7 +143,7 @@ option( BUILD_KCONTROL "Build kcontrol" ${BUILD_ALL} )
 option( BUILD_TWIN "Build twin" ${BUILD_ALL} )
 option( BUILD_KATE "Build kate" ${BUILD_ALL} )
 option( BUILD_KONQUEROR "Build konqueror" ${BUILD_ALL} )
-option( BUILD_KIOSLAVES "Build kioslaves" ${BUILD_ALL} )
+option( BUILD_KIOSLAVES "Build tdeioslaves" ${BUILD_ALL} )
 option( BUILD_KICKER "Build kicker" ${BUILD_ALL} )
 option( BUILD_KDESKTOP "Build kdesktop" ${BUILD_ALL} )
 option( BUILD_KONSOLE "Build konsole" ${BUILD_ALL} )
@@ -223,7 +221,7 @@ add_subdirectory( kcontrol )
 tde_conditional_add_subdirectory( BUILD_TWIN twin )
 tde_conditional_add_subdirectory( BUILD_KATE kate )
 tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror )
-tde_conditional_add_subdirectory( BUILD_KIOSLAVES kioslave )
+tde_conditional_add_subdirectory( BUILD_KIOSLAVES tdeioslave )
 tde_conditional_add_subdirectory( BUILD_KICKER kicker )
 tde_conditional_add_subdirectory( BUILD_KDESKTOP kdesktop )
 tde_conditional_add_subdirectory( BUILD_KONSOLE konsole )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index aa830cb0c..705f0a3a3 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -11,13 +11,13 @@
 
 tde_setup_architecture_flags( )
 
-# termios.h (tdm, kioslave)
+# termios.h (tdm, tdeioslave)
 if( BUILD_TDM OR BUILD_KIOSLAVES )
   check_include_file( termios.h HAVE_TERMIOS_H )
 endif( )
 
 
-# sys/ioctl.h (kioslave/fish, kcontrol/info)
+# sys/ioctl.h (tdeioslave/fish, kcontrol/info)
 if( BUILD_KIOSLAVES OR BUILD_KCONTROL )
   check_include_file( sys/ioctl.h HAVE_SYS_IOCTL_H )
 endif( )
@@ -37,7 +37,7 @@ if( WITH_PAM AND (BUILD_KCHECKPASS OR BUILD_TDM) )
 endif( )
 
 
-# hal (ksmserver, kioslaves)
+# hal (ksmserver, tdeioslaves)
 if( WITH_HAL )
   pkg_search_module( HAL hal )
   if( NOT HAL_FOUND )
@@ -80,7 +80,7 @@ if( WITH_XRENDER OR BUILD_KDESKTOP OR BUILD_KONSOLE OR BUILD_KCONTROL OR BUILD_K
 endif( )
 
 
-# xcursor (kioslave, kcontrol)
+# xcursor (tdeioslave, kcontrol)
 if( WITH_XCURSOR )
   pkg_search_module( XCURSOR xcursor )
   if( XCURSOR_FOUND )
@@ -259,7 +259,7 @@ if( BUILD_TDM OR BUILD_KSMSERVER )
 endif( )
 
 
-# dbus-tqt (tdm, ksmserver, kioslaves(media))
+# dbus-tqt (tdm, ksmserver, tdeioslaves(media))
 if( BUILD_TDM OR BUILD_KSMSERVER OR (BUILD_KIOSLAVES AND WITH_HAL) )
 
   if( BUILD_KSMSERVER AND WITH_UPOWER )
diff --git a/README b/README
index 8e5b89c7e..c429c4be9 100644
--- a/README
+++ b/README
@@ -78,7 +78,7 @@ libraries. Here is an overview of the directories:
 * kicker
     The panel at the botton with the K start button and the taskbar etc.
 
-* kioslave
+* tdeioslave
     Infrastructure that helps make every application internet enabled
     e.g. to directly save a file to ftp://place.org/dir/file.txt
 
diff --git a/applnk/compat/battery.desktop b/applnk/compat/battery.desktop
index 7bc8cd674..064a575da 100644
--- a/applnk/compat/battery.desktop
+++ b/applnk/compat/battery.desktop
@@ -69,6 +69,6 @@ Name[zu]=Ikhomputha ephathwayo eyisicaba
 X-TDE-ModuleType=Library
 X-TDE-Library=laptop
 X-TDE-FactoryName=battery
-Exec=kcmshell laptop
+Exec=tdecmshell laptop
 Icon=laptop_battery
 Type=Application
diff --git a/applnk/compat/bwarning.desktop b/applnk/compat/bwarning.desktop
index 740bed35e..0dd80739c 100644
--- a/applnk/compat/bwarning.desktop
+++ b/applnk/compat/bwarning.desktop
@@ -69,6 +69,6 @@ Name[zu]=Ikhomputha ephathwayo eyisicaba
 X-TDE-ModuleType=Library
 X-TDE-Library=laptop
 X-TDE-FactoryName=bwarning
-Exec=kcmshell laptop
+Exec=tdecmshell laptop
 Icon=laptop_battery
 Type=Application
diff --git a/applnk/compat/cwarning.desktop b/applnk/compat/cwarning.desktop
index 278f0c1e4..8d11d23ed 100644
--- a/applnk/compat/cwarning.desktop
+++ b/applnk/compat/cwarning.desktop
@@ -69,6 +69,6 @@ Name[zu]=Ikhomputha ephathwayo eyisicaba
 X-TDE-ModuleType=Library
 X-TDE-Library=laptop
 X-TDE-FactoryName=cwarning
-Exec=kcmshell laptop
+Exec=tdecmshell laptop
 Icon=laptop_battery
 Type=Application
diff --git a/applnk/compat/email.desktop b/applnk/compat/email.desktop
index 131147ec2..b54dc93c4 100644
--- a/applnk/compat/email.desktop
+++ b/applnk/compat/email.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=email
 Type=Application
-Exec=kcmshell kcm_useraccount
+Exec=tdecmshell kcm_useraccount
 DocPath=kcontrol/email/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=useraccount
diff --git a/applnk/compat/kcmkonq.desktop b/applnk/compat/kcmkonq.desktop
index ca882628c..583ea6a14 100644
--- a/applnk/compat/kcmkonq.desktop
+++ b/applnk/compat/kcmkonq.desktop
@@ -88,4 +88,4 @@ X-TDE-Library=konq
 X-TDE-FactoryName=browser
 Type=Application
 Icon=kfm
-Exec=kcmshell filebrowser
+Exec=tdecmshell filebrowser
diff --git a/applnk/compat/kcmkxmlrpcd.desktop b/applnk/compat/kcmkxmlrpcd.desktop
index 0f2dcd373..2804971e0 100644
--- a/applnk/compat/kcmkxmlrpcd.desktop
+++ b/applnk/compat/kcmkxmlrpcd.desktop
@@ -75,6 +75,6 @@ Name[zu]=TDE XML RPC Daemon
 X-TDE-ModuleType=Library
 X-TDE-Library=kded
 X-TDE-Factoryname=kded
-Exec=kcmshell kcmkded
+Exec=tdecmshell kcmkded
 Icon=kded
 Type=Application
diff --git a/applnk/compat/konqhtml.desktop b/applnk/compat/konqhtml.desktop
index 9556740b2..16bb26dc3 100644
--- a/applnk/compat/konqhtml.desktop
+++ b/applnk/compat/konqhtml.desktop
@@ -77,7 +77,7 @@ Name[zh_CN]=Konqueror 浏览器
 Name[zh_TW]=Konqueror 網頁瀏覽器
 Type=Application
 Icon=fonts
-Exec=kcmshell tdehtml_fonts
+Exec=tdecmshell tdehtml_fonts
 X-TDE-ModuleType=Library
 X-TDE-Library=konqhtml
 X-TDE-FactoryName=tdehtml_fonts
diff --git a/applnk/compat/passwords.desktop b/applnk/compat/passwords.desktop
index 3b6c80e9b..ab260c718 100644
--- a/applnk/compat/passwords.desktop
+++ b/applnk/compat/passwords.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Exec=kcmshell kcm_useraccount
+Exec=tdecmshell kcm_useraccount
 Icon=password
 DocPath=kcontrol/passwords/index.html
 NoDisplay=true
diff --git a/applnk/compat/power.desktop b/applnk/compat/power.desktop
index 23d4d5e85..9b14fba03 100644
--- a/applnk/compat/power.desktop
+++ b/applnk/compat/power.desktop
@@ -69,7 +69,7 @@ Name[zu]=Ikhomputha ephathwayo eyisicaba
 X-TDE-ModuleType=Library
 X-TDE-Library=laptop
 X-TDE-FactoryName=power
-Exec=kcmshell laptop
+Exec=tdecmshell laptop
 NoDisplay=true
 Icon=laptop_battery
 Type=Application
diff --git a/applnk/compat/socks.desktop b/applnk/compat/socks.desktop
index cf170ce2b..9b4a0219a 100644
--- a/applnk/compat/socks.desktop
+++ b/applnk/compat/socks.desktop
@@ -17,7 +17,7 @@ Name[ta]=துளைகள்
 Name[te]=సాక్స్
 Type=Application
 Icon=proxy
-Exec=kcmshell proxy
+Exec=tdecmshell proxy
 X-TDE-ModuleType=Library
 X-TDE-Library=kio
 X-TDE-FactoryName=proxy
diff --git a/applnk/compat/userinfo.desktop b/applnk/compat/userinfo.desktop
index 62ab29265..c20a0c80e 100644
--- a/applnk/compat/userinfo.desktop
+++ b/applnk/compat/userinfo.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Exec=kcmshell kcm_useraccount
+Exec=tdecmshell kcm_useraccount
 Icon=tdmconfig
 DocPath=kcontrol/userinfo/index.html
 
diff --git a/applnk/compat/virtualdesktops.desktop b/applnk/compat/virtualdesktops.desktop
index 5b74c886d..366e9f95b 100644
--- a/applnk/compat/virtualdesktops.desktop
+++ b/applnk/compat/virtualdesktops.desktop
@@ -77,7 +77,7 @@ Name[zh_CN]=虚拟桌面
 Name[zh_TW]=多重桌面
 Type=Application
 Icon=desktop
-Exec=kcmshell desktop
+Exec=tdecmshell desktop
 X-TDE-ModuleType=Library
 X-TDE-Library=konq
 X-TDE-FactoryName=ddesktop
diff --git a/config.h.cmake b/config.h.cmake
index 860471147..1b6bad421 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -30,17 +30,17 @@
 // libart
 #cmakedefine HAVE_LIBART 1
 
-// tdm, kioslave
+// tdm, tdeioslave
 #cmakedefine HAVE_TERMIOS_H 1
 
-// kioslave/media
+// tdeioslave/media
 #cmakedefine WITH_HAL 1
 #ifdef WITH_HAL
 #define COMPILE_HALBACKEND
 #define COMPILE_LINUXCDPOLLING
 #endif
 
-// kioslave/media
+// tdeioslave/media
 #cmakedefine WITH_TDEHWLIB 1
 #ifdef WITH_TDEHWLIB
 // forcibly deactivate HAL support and substitute TDE hardware library support
@@ -48,10 +48,10 @@
 #define COMPILE_TDEHARDWAREBACKEND
 #endif
 
-// kioslave/fish, kcontrol/info
+// tdeioslave/fish, kcontrol/info
 #cmakedefine HAVE_SYS_IOCTL_H 1
 
-// kioslave/smtp, kioslave/pop3
+// tdeioslave/smtp, tdeioslave/pop3
 #cmakedefine HAVE_LIBSASL2 1
 
 // tdm, kcontrol
@@ -71,7 +71,7 @@
 // kio_smtp, ksysguard
 #cmakedefine kde_socklen_t @kde_socklen_t@
 
-// kfile_media
+// tdefile_media
 #cmakedefine HAVE_STATVFS
 
 // taskmanager
@@ -121,7 +121,6 @@
 
 // kdesktop
 #cmakedefine KSCREENSAVER_PAM_SERVICE "@KSCREENSAVER_PAM_SERVICE@"
-#cmakedefine WITH_KDESKTOP_LOCK_BACKTRACE 1
 
 // tdm
 #cmakedefine XBINDIR "@XBINDIR@"
diff --git a/configure.in.in b/configure.in.in
index f15f4ad4b..20a759996 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -239,7 +239,7 @@ KDE_EXPAND_MAKEVAR(KDE_BINDIR, kde_bindir)
 AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory])
 AC_SUBST(KDE_BINDIR)
 
-dnl libart is used by tdm, kcontrol and thumbnails code in kioslaves
+dnl libart is used by tdm, kcontrol and thumbnails code in tdeioslaves
 KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
   AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
 ])
diff --git a/doc/faq/panel.docbook b/doc/faq/panel.docbook
index bfb2a1c7d..aa58c0ff2 100644
--- a/doc/faq/panel.docbook
+++ b/doc/faq/panel.docbook
@@ -45,7 +45,7 @@ select Menus, then inside the TDE Menu grouping, select the TDE Menu button icon
 User modifications to the &kmenu; are stored in
 <filename>$<envar>HOME</envar>/.config/menus/applications-kmenuedit.menu</filename>.
 Try moving this file out of the way and then issuing the
-command <userinput><command>kbuildsycoca</command>
+command <userinput><command>tdebuildsycoca</command>
 <option>--noincremental</option></userinput>. This should restore you to the
 default system menus. If that is the case you'll have to recreate your customized menu.
 </para>
diff --git a/doc/glossary/index.docbook b/doc/glossary/index.docbook
index f8b7d46c2..b06708a1a 100644
--- a/doc/glossary/index.docbook
+++ b/doc/glossary/index.docbook
@@ -48,7 +48,7 @@ Slave</glossseealso>
 				configuration cache which, for example, guarantees fast access to the menu
 				entries.</para>
 				<glossseealso 
-otherterm="gloss-kbuildsycoca"><application>KBuildSycoca</application></glossseealso>
+otherterm="gloss-tdebuildsycoca"><application>KBuildSycoca</application></glossseealso>
 			</glossdef>
 		</glossentry>
 	</glossdiv>
@@ -80,7 +80,7 @@ otherterm="gloss-kbuildsycoca"><application>KBuildSycoca</application></glosssee
 
 	<glossdiv id="glossdiv-applications">
 		<title>Applications</title>
-		<glossentry id="gloss-kbuildsycoca">
+		<glossentry id="gloss-tdebuildsycoca">
 			<glossterm><application>KBuildSycoca</application></glossterm>
 			<glossdef><para><application>KBuildSycoca</application> is a command line 
 program and regenerates the
diff --git a/doc/glossary/tdeprintingglossary.docbook b/doc/glossary/tdeprintingglossary.docbook
index 2cc77e57f..731c26b56 100644
--- a/doc/glossary/tdeprintingglossary.docbook
+++ b/doc/glossary/tdeprintingglossary.docbook
@@ -1127,7 +1127,7 @@ now.
                         </glossdef>
                 </glossentry>
 
-                <glossentry id="gloss-printkioslave">
+                <glossentry id="gloss-printtdeioslave">
                         <glossterm>print:/ KIO Slave</glossterm>
                         <glossdef><para>You can use a syntax of "print:/..." to get quick access
 				to TDEPrint resources. Typing "print:/manager" as a Konqueror URL
diff --git a/doc/kcontrol/filemanager/index.docbook b/doc/kcontrol/filemanager/index.docbook
index 26cc11ac5..110f3177f 100644
--- a/doc/kcontrol/filemanager/index.docbook
+++ b/doc/kcontrol/filemanager/index.docbook
@@ -155,7 +155,7 @@ download.</para>
 <screenshot>
   <screeninfo>Download Dialog Box</screeninfo>
   <mediaobject>
-  <imageobject><imagedata fileref="kfileman2.png"
+  <imageobject><imagedata fileref="tdefileman2.png"
  format="PNG"/></imageobject>
   <textobject> <phrase>Download Dialog Box</phrase> </textobject>
   <caption>
@@ -173,7 +173,7 @@ together under a single dialog box.</para>
 <screenshot>
   <screeninfo>Download Dialog Box</screeninfo>
   <mediaobject>
-  <imageobject><imagedata fileref="kfileman1.png"
+  <imageobject><imagedata fileref="tdefileman1.png"
  format="PNG"/></imageobject>
   <textobject><phrase>Download Dialog Box</phrase></textobject>
   <caption>
diff --git a/doc/kcontrol/filemanager/kfileman1.png b/doc/kcontrol/filemanager/tdefileman1.png
similarity index 100%
rename from doc/kcontrol/filemanager/kfileman1.png
rename to doc/kcontrol/filemanager/tdefileman1.png
diff --git a/doc/kcontrol/filemanager/kfileman2.png b/doc/kcontrol/filemanager/tdefileman2.png
similarity index 100%
rename from doc/kcontrol/filemanager/kfileman2.png
rename to doc/kcontrol/filemanager/tdefileman2.png
diff --git a/doc/kcontrol/index.docbook b/doc/kcontrol/index.docbook
index 0c8926797..f55b3e8e4 100644
--- a/doc/kcontrol/index.docbook
+++ b/doc/kcontrol/index.docbook
@@ -308,7 +308,7 @@ the control center.
 <title>Running Individual Modules</title>
 
 <para>
-You can run individual modules without running kcontrol using the command <command>kcmshell</command> from &konsole;. Type <userinput> <command>kcmshell</command><option> --list</option></userinput> to see a list of the available &kcontrolcenter; modules. You can also access individual &kcontrolcenter; modules through adding the <guilabel>Preferences</guilabel> button to either &kicker; or the &kmenu; through their respective configuration dialogs.
+You can run individual modules without running kcontrol using the command <command>tdecmshell</command> from &konsole;. Type <userinput> <command>tdecmshell</command><option> --list</option></userinput> to see a list of the available &kcontrolcenter; modules. You can also access individual &kcontrolcenter; modules through adding the <guilabel>Preferences</guilabel> button to either &kicker; or the &kmenu; through their respective configuration dialogs.
 </para>
 
 </sect1>
diff --git a/doc/kcontrol/proxy/index.docbook b/doc/kcontrol/proxy/index.docbook
index c69d27bc3..63a154eaa 100644
--- a/doc/kcontrol/proxy/index.docbook
+++ b/doc/kcontrol/proxy/index.docbook
@@ -172,7 +172,7 @@ ask for a username or password if it needs to.</para>
 <para>The other option is <guilabel>Use automatic login</guilabel>.
 Select this option if you have already set up a login entry for your
 proxy server in the
-<filename>$<envar>TDEDIR</envar>/share/config/kionetrc</filename>
+<filename>$<envar>TDEDIR</envar>/share/config/tdeionetrc</filename>
 file.</para>
 
 </sect2>
diff --git a/doc/kicker/index.docbook b/doc/kicker/index.docbook
index 3645669d2..07c242b3d 100644
--- a/doc/kicker/index.docbook
+++ b/doc/kicker/index.docbook
@@ -2346,7 +2346,7 @@ Why is my <guisubmenu>Settings</guisubmenu> menu not working?
 <answer>
 <para>
 Your menu entries may be mixed up for some reason. Simply run
-<command>kbuildsycoca</command> on a commandline.
+<command>tdebuildsycoca</command> on a commandline.
 </para>
 </answer>
 </qandaentry>
diff --git a/doc/konqueror/browser.docbook b/doc/konqueror/browser.docbook
index 2c1e0fa17..c6c8ecbb2 100644
--- a/doc/konqueror/browser.docbook
+++ b/doc/konqueror/browser.docbook
@@ -446,15 +446,15 @@ just add a key line
 <screen><userinput>
 OverridenPorts=CommaSeparatedListOfAllowedPorts
 </userinput></screen>
-to <filename>$TDEDIR/share/config/kio_httprc
+to <filename>$TDEDIR/share/config/tdeio_httprc
 </filename> or 
-<filename>~/.trinity/share/config/kio_httprc</filename>.</para>
+<filename>~/.trinity/share/config/tdeio_httprc</filename>.</para>
 <para>For example
 <screen><userinput>OverridenPorts=23,15
 </userinput></screen> 
 (it should not include any embedded spaces).</para>
 <para>&konqueror; will reject the following ports (the list is hardcoded in 
-<filename>tdelibs/kio/kio/job.cpp</filename>):</para>
+<filename>tdelibs/tdeio/tdeio/job.cpp</filename>):</para>
 <para>
  1, 7, 9, 11, 13, 15, 17, 19,
  20, 21, 22, 23, 25, 37, 42, 43,
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook
index a3abb27c8..df1c5f884 100644
--- a/doc/ksplashml/index.docbook
+++ b/doc/ksplashml/index.docbook
@@ -1084,7 +1084,7 @@ appropriate plugin.</para>
 #include &lt;qwidget.h&gt;
 
 #include &lt;kapplication.h&gt;
-#include &lt;kconfig.h&gt;
+#include &lt;tdeconfig.h&gt;
 #include &lt;kdebug.h&gt;
 #include &lt;kdialogbase.h&gt;
 #include &lt;kgenericfactory.h&gt;
diff --git a/doc/kxkb/index.docbook b/doc/kxkb/index.docbook
index f41d181b1..88e858fe8 100644
--- a/doc/kxkb/index.docbook
+++ b/doc/kxkb/index.docbook
@@ -83,7 +83,7 @@ list.</para>
 configuration by selecting <guimenuitem>Configure...</guimenuitem> or
 by opening <application>Control Center</application> and selecting
 Localization/Keyboard Layout. Alternatively, you can start it by
-typing <command>kcmshell keyboard_layout</command> in a
+typing <command>tdecmshell keyboard_layout</command> in a
 terminal.</para>
 
 </sect1>
diff --git a/doc/kioslave/CMakeLists.txt b/doc/tdeioslave/CMakeLists.txt
similarity index 85%
rename from doc/kioslave/CMakeLists.txt
rename to doc/tdeioslave/CMakeLists.txt
index da80330c8..5446ddbea 100644
--- a/doc/kioslave/CMakeLists.txt
+++ b/doc/tdeioslave/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kioslave )
+tde_create_handbook( DESTINATION tdeioslave )
diff --git a/doc/kioslave/Makefile.am b/doc/tdeioslave/Makefile.am
similarity index 100%
rename from doc/kioslave/Makefile.am
rename to doc/tdeioslave/Makefile.am
diff --git a/doc/kioslave/bzip.docbook b/doc/tdeioslave/bzip.docbook
similarity index 67%
rename from doc/kioslave/bzip.docbook
rename to doc/tdeioslave/bzip.docbook
index 9a3dc90cb..e4e7d1bff 100644
--- a/doc/kioslave/bzip.docbook
+++ b/doc/tdeioslave/bzip.docbook
@@ -11,19 +11,19 @@
 used today, having been replaced with bzip2, which offers much better
 compression.</para>
 
-<para>The bzip kioslave is not directly usable, and is intended for use
-as a filter.  For example, the tar kioslave can filter a file through
-the bzip kioslave, in order to display the contents of a <literal
+<para>The bzip tdeioslave is not directly usable, and is intended for use
+as a filter.  For example, the tar tdeioslave can filter a file through
+the bzip tdeioslave, in order to display the contents of a <literal
 role="extension">tar.bz</literal> file directly in a &konqueror;
 window.</para>
 
 <para>If you click on a file compressed with a <literal
-role="extension">bz</literal> extension in &konqueror;, this kioslave is
+role="extension">bz</literal> extension in &konqueror;, this tdeioslave is
 used to uncompress it and display it as a normal (uncompressed)
 file.</para>
 
 <para>If you are a developer, and would like to use the bzip filter,
-you can find documentation on using kioslaves at <ulink
+you can find documentation on using tdeioslaves at <ulink
 url="http://developer.kde.org">http://developer.kde.org</ulink></para>
 
 </article>
diff --git a/doc/kioslave/bzip2.docbook b/doc/tdeioslave/bzip2.docbook
similarity index 66%
rename from doc/kioslave/bzip2.docbook
rename to doc/tdeioslave/bzip2.docbook
index 9551632a5..ecc2b2e29 100644
--- a/doc/kioslave/bzip2.docbook
+++ b/doc/tdeioslave/bzip2.docbook
@@ -9,18 +9,18 @@
 
 <para>Bzip2 is a compression program</para>
 
-<para>The bzip2 kioslave is not directly usable, and is intended for use
-as a filter.  For example, the tar kioslave can filter a file through
-the bzip2 kioslave, in order to display the contents of a <literal
+<para>The bzip2 tdeioslave is not directly usable, and is intended for use
+as a filter.  For example, the tar tdeioslave can filter a file through
+the bzip2 tdeioslave, in order to display the contents of a <literal
 role="extension">tar.bz2</literal> file directly in a &konqueror;
 window.</para>
 
 <para>If you click on a file compressed with a <literal
-role="extension">.bz2</literal> in &konqueror;, this kioslave is used to
+role="extension">.bz2</literal> in &konqueror;, this tdeioslave is used to
 uncompress it and display it as a normal (uncompressed) file.</para>
 
 <para>If you are a developer, and would like to use the bzip2 filter,
-you can find documentation on using kioslaves at <ulink
+you can find documentation on using tdeioslaves at <ulink
 url="http://developer.kde.org">http://developer.kde.org</ulink></para>
 
 <para> See the manual: <ulink url="man:/bzip2">bzip2</ulink>.
diff --git a/doc/kioslave/cgi.docbook b/doc/tdeioslave/cgi.docbook
similarity index 100%
rename from doc/kioslave/cgi.docbook
rename to doc/tdeioslave/cgi.docbook
diff --git a/doc/kioslave/data.docbook b/doc/tdeioslave/data.docbook
similarity index 100%
rename from doc/kioslave/data.docbook
rename to doc/tdeioslave/data.docbook
diff --git a/doc/kioslave/file.docbook b/doc/tdeioslave/file.docbook
similarity index 100%
rename from doc/kioslave/file.docbook
rename to doc/tdeioslave/file.docbook
diff --git a/doc/kioslave/finger.docbook b/doc/tdeioslave/finger.docbook
similarity index 96%
rename from doc/kioslave/finger.docbook
rename to doc/tdeioslave/finger.docbook
index 27b278c48..b3678fc4d 100644
--- a/doc/kioslave/finger.docbook
+++ b/doc/tdeioslave/finger.docbook
@@ -24,7 +24,7 @@ you may find that you get no useful answer for most people.</para>
 hold such information as <acronym>PGP</acronym> keys, the fact they are
 on vacation, and all sorts of information.</para>
 
-<para>Use the finger kioslave like this:
+<para>Use the finger tdeioslave like this:
 <userinput>finger://<replaceable>username</replaceable>@<replaceable>hostname</replaceable></userinput></para>
 
 <para> See the manual: <ulink url="man:/finger">finger</ulink>.
diff --git a/doc/kioslave/fish.docbook b/doc/tdeioslave/fish.docbook
similarity index 98%
rename from doc/kioslave/fish.docbook
rename to doc/tdeioslave/fish.docbook
index 5063abd04..577199e8b 100644
--- a/doc/kioslave/fish.docbook
+++ b/doc/tdeioslave/fish.docbook
@@ -14,7 +14,7 @@
 
 <para>Allows you to access another computer's files using the SEcure Shell (<acronym>SSH</acronym>) protocol.  The remote computer needs to be running the <acronym>SSH</acronym> daemon, but the remainder of the protocol uses standard commandline tools as discussed below.</para>
 
-<para>You can use the fish kioslave like this:
+<para>You can use the fish tdeioslave like this:
 <userinput>fish://<replaceable>hostname</replaceable></userinput> or <userinput>fish://<replaceable>username</replaceable>@<replaceable>hostname</replaceable></userinput>.</para>
 
 <note><para>You need to use double forward slashes.</para></note>
diff --git a/doc/kioslave/floppy.docbook b/doc/tdeioslave/floppy.docbook
similarity index 100%
rename from doc/kioslave/floppy.docbook
rename to doc/tdeioslave/floppy.docbook
diff --git a/doc/kioslave/ftp.docbook b/doc/tdeioslave/ftp.docbook
similarity index 100%
rename from doc/kioslave/ftp.docbook
rename to doc/tdeioslave/ftp.docbook
diff --git a/doc/kioslave/gopher.docbook b/doc/tdeioslave/gopher.docbook
similarity index 100%
rename from doc/kioslave/gopher.docbook
rename to doc/tdeioslave/gopher.docbook
diff --git a/doc/kioslave/gzip.docbook b/doc/tdeioslave/gzip.docbook
similarity index 67%
rename from doc/kioslave/gzip.docbook
rename to doc/tdeioslave/gzip.docbook
index 906f0d654..03a6b9964 100644
--- a/doc/kioslave/gzip.docbook
+++ b/doc/tdeioslave/gzip.docbook
@@ -9,19 +9,19 @@
 
 <para><command>gzip</command> is a compression program</para>
 
-<para>The gzip kioslave is not directly usable, and is intended for use
-as a filter.  For example, the tar kioslave can filter a file through
-the gzip kioslave, in order to display the contents of a <literal
+<para>The gzip tdeioslave is not directly usable, and is intended for use
+as a filter.  For example, the tar tdeioslave can filter a file through
+the gzip tdeioslave, in order to display the contents of a <literal
 role="extension">tar.gz</literal> file directly in a &konqueror;
 window.</para>
 
 <para>If you click on a file compressed with a <literal
-role="extension">gz</literal> extension in &konqueror;, this kioslave is
+role="extension">gz</literal> extension in &konqueror;, this tdeioslave is
 used to uncompress it and display it as a normal (uncompressed)
 file.</para>
 
 <para>If you are a developer, and would like to use the gzip filter, you
-can find documentation on using kioslaves at <ulink
+can find documentation on using tdeioslaves at <ulink
 url="http://developer.kde.org">http://developer.kde.org</ulink></para>
 
 <para> See the manual: <ulink url="man:/gzip">gzip</ulink>.
diff --git a/doc/kioslave/help.docbook b/doc/tdeioslave/help.docbook
similarity index 100%
rename from doc/kioslave/help.docbook
rename to doc/tdeioslave/help.docbook
diff --git a/doc/kioslave/http.docbook b/doc/tdeioslave/http.docbook
similarity index 83%
rename from doc/kioslave/http.docbook
rename to doc/tdeioslave/http.docbook
index d7cde38a2..535370b66 100644
--- a/doc/kioslave/http.docbook
+++ b/doc/tdeioslave/http.docbook
@@ -11,11 +11,11 @@
 <emphasis>H</emphasis>yper<emphasis>T</emphasis>ext
 <emphasis>T</emphasis>ransfer <emphasis>P</emphasis>rotocol.</para>
 
-<para>The http kioslave is used by all &tde; applications to handle
+<para>The http tdeioslave is used by all &tde; applications to handle
 connections to http servers, that is, web servers.  The most common
 usage is to view web pages in the &konqueror; web browser.</para>
 
-<para>You can use the http kioslave in &konqueror; by giving it a
+<para>You can use the http tdeioslave in &konqueror; by giving it a
 <acronym>URL</acronym>.  
 <userinput>http://<replaceable>www.kde.org</replaceable></userinput>.</para>
 
diff --git a/doc/kioslave/https.docbook b/doc/tdeioslave/https.docbook
similarity index 92%
rename from doc/kioslave/https.docbook
rename to doc/tdeioslave/https.docbook
index 38772f5dc..bbaa1b0a3 100644
--- a/doc/kioslave/https.docbook
+++ b/doc/tdeioslave/https.docbook
@@ -8,7 +8,7 @@
 </articleinfo>
 <para>
 HTTPS is 
-<ulink url="help:/kioslave/http.html">HTTP</ulink>
+<ulink url="help:/tdeioslave/http.html">HTTP</ulink>
  encapsulated in an SSL/TLS stream.
 </para>
 <para>
diff --git a/doc/kioslave/imap.docbook b/doc/tdeioslave/imap.docbook
similarity index 94%
rename from doc/kioslave/imap.docbook
rename to doc/tdeioslave/imap.docbook
index e34c1e4e9..8778877ce 100644
--- a/doc/kioslave/imap.docbook
+++ b/doc/tdeioslave/imap.docbook
@@ -19,7 +19,7 @@ everywhere. Messages can be stored on the server, retrieved from there or
 moved between folders.</para>
 
 <para>This plugin is currently mainly used by KMail, but you can also use it
-in any other KDE application that uses kioslave plugins.</para>
+in any other KDE application that uses tdeioslave plugins.</para>
 
 <para>For example in &konqueror;, simply type
 <userinput>imap://username@your.mail.server/</userinput> to get your IMAP
diff --git a/doc/kioslave/imaps.docbook b/doc/tdeioslave/imaps.docbook
similarity index 77%
rename from doc/kioslave/imaps.docbook
rename to doc/tdeioslave/imaps.docbook
index d5f8e7b6f..fc046944c 100644
--- a/doc/kioslave/imaps.docbook
+++ b/doc/tdeioslave/imaps.docbook
@@ -11,7 +11,7 @@
  
 </articleinfo>
 
-<para>IMAPS is the <ulink url="help:/kioslave/imap.html">IMAP</ulink> protocol
+<para>IMAPS is the <ulink url="help:/tdeioslave/imap.html">IMAP</ulink> protocol
 encrypted via SSL.</para>
 
 </article>
diff --git a/doc/kioslave/index.docbook b/doc/tdeioslave/index.docbook
similarity index 100%
rename from doc/kioslave/index.docbook
rename to doc/tdeioslave/index.docbook
diff --git a/doc/kioslave/info.docbook b/doc/tdeioslave/info.docbook
similarity index 100%
rename from doc/kioslave/info.docbook
rename to doc/tdeioslave/info.docbook
diff --git a/doc/kioslave/lan.docbook b/doc/tdeioslave/lan.docbook
similarity index 91%
rename from doc/kioslave/lan.docbook
rename to doc/tdeioslave/lan.docbook
index c494b5767..ad75ce385 100644
--- a/doc/kioslave/lan.docbook
+++ b/doc/tdeioslave/lan.docbook
@@ -12,7 +12,7 @@ This protocol is intended to provide a kind of <quote>network
 neighborhood</quote> but only relying on the TCP/IP protocol stack and with 
 the ability to use other protocols than just <acronym>SMB</acronym>.</para>
 
-<para>The lan kioslave can use &FTP;, &HTTP;, <acronym>SMB</acronym>, 
+<para>The lan tdeioslave can use &FTP;, &HTTP;, <acronym>SMB</acronym>, 
 <acronym>NFS</acronym>, and <acronym>FISH</acronym></para>
 
 <para>It must first be configured in &kcontrol;, 
diff --git a/doc/kioslave/ldap.docbook b/doc/tdeioslave/ldap.docbook
similarity index 91%
rename from doc/kioslave/ldap.docbook
rename to doc/tdeioslave/ldap.docbook
index ff23339c3..48515751d 100644
--- a/doc/kioslave/ldap.docbook
+++ b/doc/tdeioslave/ldap.docbook
@@ -11,7 +11,7 @@
 protocol.  It provides access to an X.500 directory, or to a stand-alone
 <acronym>LDAP</acronym> server.</para>
 
-<para>You can use the ldap kioslave as follows:</para>
+<para>You can use the ldap tdeioslave as follows:</para>
 
 <para><userinput>ldap://host:port/ou=People,o=where,c=de??sub</userinput>
 for a subtree-query</para>
diff --git a/doc/kioslave/mac.docbook b/doc/tdeioslave/mac.docbook
similarity index 100%
rename from doc/kioslave/mac.docbook
rename to doc/tdeioslave/mac.docbook
diff --git a/doc/kioslave/mailto.docbook b/doc/tdeioslave/mailto.docbook
similarity index 87%
rename from doc/kioslave/mailto.docbook
rename to doc/tdeioslave/mailto.docbook
index 3603aea8d..ac7fddd46 100644
--- a/doc/kioslave/mailto.docbook
+++ b/doc/tdeioslave/mailto.docbook
@@ -6,7 +6,7 @@
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 </articleinfo>
-<para>The mailto kioslave is used when you click on a mailto link in an
+<para>The mailto tdeioslave is used when you click on a mailto link in an
 <acronym>HTML</acronym> page.  &konqueror; will open the preferred mail
 client you have configured, with a composer window.  Any information
 supplied in the <acronym>URL</acronym> will be filled in for you.</para>
diff --git a/doc/kioslave/man.docbook b/doc/tdeioslave/man.docbook
similarity index 100%
rename from doc/kioslave/man.docbook
rename to doc/tdeioslave/man.docbook
diff --git a/doc/kioslave/mrml.docbook b/doc/tdeioslave/mrml.docbook
similarity index 100%
rename from doc/kioslave/mrml.docbook
rename to doc/tdeioslave/mrml.docbook
diff --git a/doc/kioslave/news.docbook b/doc/tdeioslave/news.docbook
similarity index 89%
rename from doc/kioslave/news.docbook
rename to doc/tdeioslave/news.docbook
index c56e3a8e0..d13f2b715 100644
--- a/doc/kioslave/news.docbook
+++ b/doc/tdeioslave/news.docbook
@@ -8,7 +8,7 @@
 </articleinfo>
 
 
-<para>The news kioslave is used when you click on a news link on a web
+<para>The news tdeioslave is used when you click on a news link on a web
 page.  It will open &knode;, and if the group referred to in the news
 link is available from your server, it will subscribe you to the group, in
 the first available account you have configured in &knode;</para>
diff --git a/doc/kioslave/nfs.docbook b/doc/tdeioslave/nfs.docbook
similarity index 100%
rename from doc/kioslave/nfs.docbook
rename to doc/tdeioslave/nfs.docbook
diff --git a/doc/kioslave/nntp.docbook b/doc/tdeioslave/nntp.docbook
similarity index 88%
rename from doc/kioslave/nntp.docbook
rename to doc/tdeioslave/nntp.docbook
index 7f213d2c4..20de8e952 100644
--- a/doc/kioslave/nntp.docbook
+++ b/doc/tdeioslave/nntp.docbook
@@ -6,10 +6,10 @@
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 </articleinfo>
-<para>The nntp kioslave accesses <acronym>NNTP</acronym> servers
+<para>The nntp tdeioslave accesses <acronym>NNTP</acronym> servers
 directly.</para>
 
-<para>This kioslave can not be used with servers that do not implement
+<para>This tdeioslave can not be used with servers that do not implement
 the <command>GROUP</command> command, including some versions of the
 popular <application>INN</application> news server which is often used
 by <acronym>ISP</acronym>s.  It does work with
@@ -17,7 +17,7 @@ by <acronym>ISP</acronym>s.  It does work with
 offline cache of news articles on their own hard drive or within their
 <acronym>LAN</acronym>.</para>
 
-<para>You can use the nntp kioslave by typing
+<para>You can use the nntp tdeioslave by typing
 <userinput>nntp://yourserver/groupname</userinput> into the &konqueror;
 <acronym>URL</acronym> bar.</para>
 
diff --git a/doc/kioslave/pop3.docbook b/doc/tdeioslave/pop3.docbook
similarity index 100%
rename from doc/kioslave/pop3.docbook
rename to doc/tdeioslave/pop3.docbook
diff --git a/doc/kioslave/pop3s.docbook b/doc/tdeioslave/pop3s.docbook
similarity index 100%
rename from doc/kioslave/pop3s.docbook
rename to doc/tdeioslave/pop3s.docbook
diff --git a/doc/kioslave/print.docbook b/doc/tdeioslave/print.docbook
similarity index 99%
rename from doc/kioslave/print.docbook
rename to doc/tdeioslave/print.docbook
index 2af8dc134..fa102c3af 100644
--- a/doc/kioslave/print.docbook
+++ b/doc/tdeioslave/print.docbook
@@ -54,7 +54,7 @@ and a short explanation of what they represent:</para>
 
 <varlistentry>
 <term><userinput>print:/ </userinput> (&ie; the root of 
-print-kioslave)</term>
+print-tdeioslave)</term>
 <listitem>
 <para>  virtual root for browsing your print subsystem.
         It displays subfolders <quote>Classes</quote>,
diff --git a/doc/kioslave/rlan.docbook b/doc/tdeioslave/rlan.docbook
similarity index 100%
rename from doc/kioslave/rlan.docbook
rename to doc/tdeioslave/rlan.docbook
diff --git a/doc/kioslave/rlogin.docbook b/doc/tdeioslave/rlogin.docbook
similarity index 87%
rename from doc/kioslave/rlogin.docbook
rename to doc/tdeioslave/rlogin.docbook
index 5568eeade..54e834e9f 100644
--- a/doc/kioslave/rlogin.docbook
+++ b/doc/tdeioslave/rlogin.docbook
@@ -9,14 +9,14 @@
 <para>Using &konqueror; you can start up an <command>rlogin</command>
 session with a server hosting the rlogin service.</para>
 
-<para>To use this kioslave feature, in the &konqueror;
+<para>To use this tdeioslave feature, in the &konqueror;
 <acronym>URL</acronym> bar, type
 <userinput>rlogin:/host_to_connect_to</userinput></para>
 
 <para>This will initialize &konsole; with an <command>rlogin</command>
 session, prompting you for your password.</para>
 
-<para>The <command>rlogin</command> kioslave uses the username of the
+<para>The <command>rlogin</command> tdeioslave uses the username of the
 account you are currently using in &tde;.</para>
 
 <para>After you have successfully entered your password, you can begin
diff --git a/doc/kioslave/sftp.docbook b/doc/tdeioslave/sftp.docbook
similarity index 100%
rename from doc/kioslave/sftp.docbook
rename to doc/tdeioslave/sftp.docbook
diff --git a/doc/kioslave/smb.docbook b/doc/tdeioslave/smb.docbook
similarity index 92%
rename from doc/kioslave/smb.docbook
rename to doc/tdeioslave/smb.docbook
index 716db415f..ef7e9ac98 100644
--- a/doc/kioslave/smb.docbook
+++ b/doc/tdeioslave/smb.docbook
@@ -41,7 +41,7 @@ You can set your default user name and password in the &kcontrol; in
 <menuchoice><guisubmenu>Network</guisubmenu><guimenuitem>Windows
 Shares</guimenuitem></menuchoice>.  This is especially useful if you are a
 member of a &Windows; <acronym>NT</acronym> domain. There you can also set your
-workgroup name, but in most cases this is not required.  The kioslave will ask for your username and password if a default is not set.
+workgroup name, but in most cases this is not required.  The tdeioslave will ask for your username and password if a default is not set.
 </para>
 
 <para>
diff --git a/doc/kioslave/smtp.docbook b/doc/tdeioslave/smtp.docbook
similarity index 100%
rename from doc/kioslave/smtp.docbook
rename to doc/tdeioslave/smtp.docbook
diff --git a/doc/kioslave/tar.docbook b/doc/tdeioslave/tar.docbook
similarity index 100%
rename from doc/kioslave/tar.docbook
rename to doc/tdeioslave/tar.docbook
diff --git a/doc/kioslave/telnet.docbook b/doc/tdeioslave/telnet.docbook
similarity index 100%
rename from doc/kioslave/telnet.docbook
rename to doc/tdeioslave/telnet.docbook
diff --git a/doc/kioslave/thumbnail.docbook b/doc/tdeioslave/thumbnail.docbook
similarity index 67%
rename from doc/kioslave/thumbnail.docbook
rename to doc/tdeioslave/thumbnail.docbook
index 8ad0393b9..fb07fe5ac 100644
--- a/doc/kioslave/thumbnail.docbook
+++ b/doc/tdeioslave/thumbnail.docbook
@@ -6,23 +6,23 @@
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 </articleinfo>
-<para>The thumbnail kioslave is used by &tde; for network transparent
+<para>The thumbnail tdeioslave is used by &tde; for network transparent
 and persistent generation of thumbnails.</para>
 
-<para>The thumbnail kioslave uses plugins to generate the actual
+<para>The thumbnail tdeioslave uses plugins to generate the actual
 thumbnails.  You can enable viewing of these thumbnails from the
 <menuchoice><guimenu>View</guimenu>
 <guisubmenu>Preview</guisubmenu></menuchoice> submenu, available in
 &konqueror; in file manager mode.</para>
 
-<para>The thumbnail kioslave is not directly useful to a user, but if
+<para>The thumbnail tdeioslave is not directly useful to a user, but if
 you are a developer, you can use it within your own applications to
 create file previews.</para>
 
 <para>See the documentation in the sources for more information.  You
 will find these at
-<filename>$<envar>TDEDIR</envar>/include/kio/thumbcreator.h</filename> or
+<filename>$<envar>TDEDIR</envar>/include/tdeio/thumbcreator.h</filename> or
 in the source folder <filename
-class="directory">tdebase/kioslave/thumbnail</filename></para>
+class="directory">tdebase/tdeioslave/thumbnail</filename></para>
 
 </article>
diff --git a/doc/kioslave/webdav.docbook b/doc/tdeioslave/webdav.docbook
similarity index 95%
rename from doc/kioslave/webdav.docbook
rename to doc/tdeioslave/webdav.docbook
index d549384f2..8f46546b0 100644
--- a/doc/kioslave/webdav.docbook
+++ b/doc/tdeioslave/webdav.docbook
@@ -13,7 +13,7 @@
 <emphasis>A</emphasis>uthoring and <emphasis>V</emphasis>ersioning
 protocol for the World Wide Web. It allows for easy management of
 documents and scripts on a <ulink
-url="help:/kioslave/webdav.html">http</ulink> server, and has
+url="help:/tdeioslave/webdav.html">http</ulink> server, and has
 additional features designed to simplify version management amongst
 multiple authors.</para>
 
@@ -60,6 +60,6 @@ such as the author.</para>
 <para>To take advantage of these additional capabilities, you will need an
 application which supports them. No application currently supports them 
 through
-this kioslave.</para>
+this tdeioslave.</para>
 
 </article>
diff --git a/doc/kioslave/webdavs.docbook b/doc/tdeioslave/webdavs.docbook
similarity index 76%
rename from doc/kioslave/webdavs.docbook
rename to doc/tdeioslave/webdavs.docbook
index edbd635e6..23dde138c 100644
--- a/doc/kioslave/webdavs.docbook
+++ b/doc/tdeioslave/webdavs.docbook
@@ -11,7 +11,7 @@
 
 </articleinfo>
 
-<para>WebDAVS is the <ulink url="help:/kioslave/webdav.html">WebDAV</ulink> protocol
+<para>WebDAVS is the <ulink url="help:/tdeioslave/webdav.html">WebDAV</ulink> protocol
 encrypted via SSL.</para>
 
 </article>
diff --git a/doc/tdeprint/highlights.docbook b/doc/tdeprint/highlights.docbook
index 4e8a0af91..840247afa 100644
--- a/doc/tdeprint/highlights.docbook
+++ b/doc/tdeprint/highlights.docbook
@@ -369,7 +369,7 @@ functions that were provided by <application>qtcups</application> and
 <para>Instead of <command>qtcups</command> you can now use the
 <command>kprinter</command> command.  And in place of
 <command>kups</command> you will probably use
-<command>kcmshell printers</command> from now on.
+<command>tdecmshell printers</command> from now on.
 </para>
 
 <para>The &tdeprint; module for &CUPS; also lets you fully administer
diff --git a/doc/tdeprint/tech-overview.docbook b/doc/tdeprint/tech-overview.docbook
index 79179b4fc..51e7cc988 100644
--- a/doc/tdeprint/tech-overview.docbook
+++ b/doc/tdeprint/tech-overview.docbook
@@ -220,7 +220,7 @@ you switch to other parts of the &kcontrol;</para></listitem>
 
 <listitem><para>from a command line (&konsole; or
 mini-<acronym>CLI</acronym>) type <userinput>
-<command>kcmshell</command> <option>printers</option></userinput>.
+<command>tdecmshell</command> <option>printers</option></userinput>.
 This opens just the &tdeprint; part of &kcontrol; to change your settings
 </para></listitem>
 </itemizedlist>
diff --git a/doc/userguide/groupware-kontact.docbook b/doc/userguide/groupware-kontact.docbook
index 8a1b81c00..66de1113a 100644
--- a/doc/userguide/groupware-kontact.docbook
+++ b/doc/userguide/groupware-kontact.docbook
@@ -335,7 +335,7 @@ slow data updates.</para>
 
 <para>Now we have to tell &kontact; to use <acronym>IMAP</acronym> as the
 data source for it's various components. From the &kmenu;, choose
-<guimenuitem>Run command</guimenuitem>, run <userinput><command>kcmshell
+<guimenuitem>Run command</guimenuitem>, run <userinput><command>tdecmshell
 tderesources</command></userinput>. In the combo box select
 <guilabel>Contacts</guilabel>, then press the <guibutton>Add...</guibutton>
 button, and choose <guilabel>Addressbook on IMAP Server via KMail</guilabel>. Then select that new line and
diff --git a/doc/userguide/tde-for-admins.docbook b/doc/userguide/tde-for-admins.docbook
index 872191714..665f3c287 100644
--- a/doc/userguide/tde-for-admins.docbook
+++ b/doc/userguide/tde-for-admins.docbook
@@ -830,7 +830,7 @@ Running...</computeroutput>. The arguments after <command>tdeinit</command>
 are the names of additional processes to be started.  The <token>+</token>
 indicates that <command>tdeinit</command> needs to wait till the process has
 finished.  <command>tdeinit</command> also starts
-<command>dcopserver</command>, <command>klauncher</command> and
+<command>dcopserver</command>, <command>tdelauncher</command> and
 <command>kded</command>.</para>
 
 <para>The second of the two lines asks <command>tdeinit</command> to start
@@ -871,11 +871,11 @@ needed</para>
 </varlistentry>
 
 <varlistentry>
-<term><command>klauncher</command></term>
+<term><command>tdelauncher</command></term>
 <listitem><para>Program launch (this is <emphasis>not</emphasis> the
 <keycombo action="simul">&Alt;<keycap>F2</keycap>
 </keycombo>dialog!)</para>
-<para>See <xref linkend="klauncher"/> for more information.</para>
+<para>See <xref linkend="tdelauncher"/> for more information.</para>
 </listitem>
 </varlistentry>
 
@@ -916,7 +916,7 @@ to see the actual program name:</para>
 <computeroutput>
 waba     23184  0.2  2.1 23428 11124 ?	S    21:41   0:00 tdeinit: Running...
 waba     23187  0.1  2.1 23200 11124 ?	S    21:41   0:00 tdeinit: dcopserver --nosid
-waba     23189  0.2  2.4 25136 12496 ?	S    21:41   0:00 tdeinit: klauncher
+waba     23189  0.2  2.4 25136 12496 ?	S    21:41   0:00 tdeinit: tdelauncher
 waba     23192  0.7  2.8 25596 14772 ?	S    21:41   0:00 tdeinit: kded
 waba     23203  0.8  3.4 31516 17892 ?	S    21:41   0:00 tdeinit:
 knotify
@@ -928,7 +928,7 @@ master <command>tdeinit</command> process. The other processes listed are
 programs started as <acronym>KLM</acronym>s.</para>
 
 <para>When <command>tdeinit</command> starts for the first time it will
-launch <command>dcopserver</command>, <command>klauncher</command>, and
+launch <command>dcopserver</command>, <command>tdelauncher</command>, and
 <command>kded</command>, as well as any additional programs specified on its
 command line in the <command>starttde</command> script, normally
 <command>kcminit</command> and <command>knotify</command>.</para>
@@ -980,7 +980,7 @@ applications or services via the <varname>X-TDE-Init</varname> line:</para>
 <programlisting>
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kcmshell energy
+Exec=tdecmshell energy
 Icon=energy_star
 Type=Application
 X-TDE-Library=energy
@@ -999,21 +999,21 @@ startup problems.</para>
 
 </sect2>
 
-<sect2 id="klauncher">
-<title><command>klauncher</command></title>
+<sect2 id="tdelauncher">
+<title><command>tdelauncher</command></title>
 
-<para><command>klauncher</command> is a daemon which is responsible for
+<para><command>tdelauncher</command> is a daemon which is responsible for
 service activation within &tde;. It operates in close connection with the
 <command>tdeinit</command> master process to start new processes. &tde;
-applications communicate with <command>klauncher</command> over &DCOP; in
+applications communicate with <command>tdelauncher</command> over &DCOP; in
 order to start new applications or services.</para>
 
 <para>Best known from the error message: <computeroutput><errortext>
 KLauncher could not be reached via DCOP </errortext></computeroutput> which
 either indicates a serious problem with the <command>dcopserver</command> or
-that <command>klauncher</command> crashed.</para>
+that <command>tdelauncher</command> crashed.</para>
 
-<para><command>klauncher</command> can be restarted by restarting
+<para><command>tdelauncher</command> can be restarted by restarting
 <command>tdeinit</command> from a console window. Make sure that
 $<envar>HOME</envar>, $<envar>DISPLAY</envar> and the various
 $<envar>TDEDIR(S)</envar> are set correctly when doing so!</para>
@@ -1190,7 +1190,7 @@ on a multi-head system.</para>
 <listitem><para>Set this variable to spawn
 <acronym>KIO</acronym>-slaves directly from the application process
 itself. By default <acronym>KIO</acronym>-slaves are spawned using
-<command>klauncher</command>/<command>tdeinit</command>. This option is
+<command>tdelauncher</command>/<command>tdeinit</command>. This option is
 useful if the <acronym>KIO</acronym>-slave should run in the same
 environment as the application. This can be the case with
 <application>Clearcase</application>.</para>
@@ -1323,7 +1323,7 @@ output of <command>top</command> and <command>ps</command>. Use
 <computeroutput>
 bastian  26061  0.0  2.2 24284 11492 ?       S    21:27   0:00 tdeinit: Running...
 bastian  26064  0.0  2.2 24036 11524 ?       S    21:27   0:00 tdeinit: dcopserver
-bastian  26066  0.1  2.5 26056 12988 ?       S    21:27   0:00 tdeinit: klauncher
+bastian  26066  0.1  2.5 26056 12988 ?       S    21:27   0:00 tdeinit: tdelauncher
 bastian  26069  0.4  3.2 27356 16744 ?       S    21:27   0:00 tdeinit: kded
 bastian  26161  0.2  2.7 25344 14096 ?       S    21:27   0:00 tdeinit: ksmserver
 bastian  26179  1.1  3.4 29716 17812 ?       S    21:27   0:00 tdeinit: kicker
@@ -1619,7 +1619,7 @@ class="directory">/opt/trinity/share/config/SuSE/default/</filename></para></lis
 </sect2>
 </sect1>
 
-<sect1 id="kde-menu">
+<sect1 id="tde-menu">
 <title>&tde; Menu</title>
 
 <sect2 id="how-it-works">
@@ -1824,7 +1824,7 @@ class="directory">$<envar>HOME</envar>/.trinity/share/applnk</filename>
 <para><application>KSycoca</application> caches menu structure and
 information about all available applications. You can rebuild the
 database with
-<userinput><command>kbuildsycoca</command></userinput>. The database
+<userinput><command>tdebuildsycoca</command></userinput>. The database
 which is built lives in <filename
 class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/tdesycoca</filename>.
 It is automatically updated by <application>KDED</application>,
@@ -2281,13 +2281,13 @@ as part of the <guilabel>Configure Konqueror</guilabel> dialog in
 &konqueror;</para>
 
 <para>Individual configuration modules can be started with
-<command>kcmshell</command> <replaceable>module</replaceable></para>
+<command>tdecmshell</command> <replaceable>module</replaceable></para>
 
 <para>To start the Proxy module use:</para>
 <itemizedlist>
-<listitem><para><command>kcmshell</command>
+<listitem><para><command>tdecmshell</command>
 <filename>tde-proxy.desktop</filename></para></listitem>
-<listitem><para><command>kcmshell</command> proxy</para></listitem>
+<listitem><para><command>tdecmshell</command> proxy</para></listitem>
 </itemizedlist>
 
 <para><note><para>Not all applications use configuration modules, often the
@@ -2306,14 +2306,14 @@ class="directory">$<envar>TDEDIR</envar>/share/applications/tde</filename>
 and are sorted under the hidden <guimenu>Settings-Modules</guimenu> menu by
 the <filename>kde-settings.menu</filename>, included from
 <filename>kde-essential.menu</filename></para>
-<screen><userinput><command>kbuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> Settings-Modules</userinput></screen>
+<screen><userinput><command>tdebuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> Settings-Modules</userinput></screen>
 </listitem>
 <listitem>
 <para>Application specific modules normally have a <literal role="extension">.desktop</literal> file under
 <filename>$<envar>TDEDIR</envar>/share/applnk/.hidden</filename> which
 corresponds to the hidden .hidden menu, included as a result of
 <markup>&lt;KDELegacyDirs/&gt;</markup></para>
-<screen><userinput><command>kbuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> .hidden</userinput></screen>
+<screen><userinput><command>tdebuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> .hidden</userinput></screen>
 </listitem>
 <listitem><para>In &tde; 3.3 it is possible to edit the Control Center with
 <application>kcontroledit</application>.
@@ -2481,7 +2481,7 @@ konsole-8954
 <para>One &konsole; is running with a <acronym>PID</acronym> of 8954.</para>
 
 <screen><prompt>&percnt; </prompt><userinput><command>dcop</command><option> konsole-8954</option></userinput>
-KBookmarkManager-.../share/apps/kfile/bookmarks.xml
+KBookmarkManager-.../share/apps/tdefile/bookmarks.xml
 KBookmarkManager-.../share/apps/konqueror/bookmarks.xml
 KBookmarkNotifier
 KDebug
diff --git a/drkonqi/CMakeLists.txt b/drkonqi/CMakeLists.txt
index db2883745..502ba5e90 100644
--- a/drkonqi/CMakeLists.txt
+++ b/drkonqi/CMakeLists.txt
@@ -31,7 +31,7 @@ tde_add_executable( drkonqi AUTOMOC
   SOURCES
     krashdcopinterface.skel main.cpp debugger.cpp
     krashconf.cpp drbugreport.cpp backtrace.cpp toplevel.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
@@ -41,7 +41,7 @@ if( BUILD_CRASHTEST )
   tde_add_executable( crashtest AUTOMOC
     SOURCES
       crashtest.cpp
-    LINK kio-shared
+    LINK tdeio-shared
     DESTINATION ${BIN_INSTALL_DIR}
   )
 endif( BUILD_CRASHTEST )
diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp
index 5760b000e..71b6f3a4a 100644
--- a/drkonqi/debugger.cpp
+++ b/drkonqi/debugger.cpp
@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp
index b7ce210fe..c22d20814 100644
--- a/drkonqi/krashconf.cpp
+++ b/drkonqi/krashconf.cpp
@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************/
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
diff --git a/kappfinder/CMakeLists.txt b/kappfinder/CMakeLists.txt
index 504326bb2..7d35b4329 100644
--- a/kappfinder/CMakeLists.txt
+++ b/kappfinder/CMakeLists.txt
@@ -33,7 +33,7 @@ install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/System RENAME k
 
 tde_add_executable( kappfinder AUTOMOC
   SOURCES main.cpp toplevel.cpp common.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index 6dbde4a7e..d170f6c76 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -32,7 +32,7 @@
 #include <tdeversion.h>
 #include <kcmdlineargs.h>
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <twin.h>
 #include <ktip.h>
 #include <kdebug.h>
diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp
index 9b9a223d0..178e63d07 100644
--- a/kate/app/katedocmanager.cpp
+++ b/kate/app/katedocmanager.cpp
@@ -34,12 +34,12 @@
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
 #include <kmdcodec.h>
 #include <kmessagebox.h>
 #include <kencodingfiledialog.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <twin.h>
 
 #include <tqdatetime.h>
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index 1ceab8a23..78cf6b6fd 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -38,7 +38,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kmimetypechooser.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <krun.h>
 #include <kicondialog.h>
 #include <kpopupmenu.h>
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
index f956c9ea5..7ddd1b7b1 100644
--- a/kate/app/katefilelist.cpp
+++ b/kate/app/katefilelist.cpp
@@ -39,7 +39,7 @@
 #include <tqwhatsthis.h>
 
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
 #include <kpassivepopup.h>
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index 0482b2739..beeed2082 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -53,7 +53,7 @@
 #include <kurlcompletion.h>
 #include <kprotocolinfo.h>
 #include <kdiroperator.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kcombobox.h>
 #include <kaction.h>
@@ -66,7 +66,7 @@
 //END Includes
 
 //BEGIN Toolbar
- // from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
+ // from tdefiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
 static void silenceQToolBar(TQtMsgType, const char *){}
 
 // helper classes to be able to have a toolbar without move handle
diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h
index 7a6f9c728..8028b3ede 100644
--- a/kate/app/katefileselector.h
+++ b/kate/app/katefileselector.h
@@ -26,7 +26,7 @@
 #include <kate/document.h>
 
 #include <tqvbox.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kurl.h>
 #include <ktoolbar.h>
 #include <tqframe.h>
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index 627fe47dd..bd2e82749 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -34,7 +34,7 @@
 #include <kapplication.h>
 #include <kaccelmanager.h>
 #include <kbuttonbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprocess.h>
 #include <kapplication.h>
 #include <klocale.h>
diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp
index f5dd1ea5c..e53c07910 100644
--- a/kate/app/katemain.cpp
+++ b/kate/app/katemain.cpp
@@ -24,7 +24,7 @@
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinstance.h>
 #include <kstartupinfo.h>
 #include <dcopclient.h>
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 953a5f313..aa8aaedb9 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -53,7 +53,7 @@
 #include <kdiroperator.h>
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobalaccel.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 874639652..8a001cdeb 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -29,7 +29,7 @@
 #include <kglobalsettings.h>
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kpopupmenu.h>
 #include <kmessagebox.h>
diff --git a/kate/app/katepluginmanager.cpp b/kate/app/katepluginmanager.cpp
index 044cb73aa..4fe15d4f4 100644
--- a/kate/app/katepluginmanager.cpp
+++ b/kate/app/katepluginmanager.cpp
@@ -26,7 +26,7 @@
 
 #include "../interfaces/application.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqstringlist.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index e8ba58ee5..1d37c6f1d 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -30,7 +30,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <ksqueezedtextlabel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqwidgetstack.h>
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 6fca303bb..e9854c081 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -32,7 +32,7 @@
 #include <tdetexteditor/editorchooser.h>
 #include <tdetexteditor/popupmenuinterface.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tdeversion.h>
 #include <dcopclient.h>
@@ -49,7 +49,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcmdlineargs.h>
 #include <kmessagebox.h>
 #include <kkeydialog.h>
diff --git a/kate/data/CMakeLists.txt b/kate/data/CMakeLists.txt
index fb4b28d03..b81ead948 100644
--- a/kate/data/CMakeLists.txt
+++ b/kate/data/CMakeLists.txt
@@ -15,5 +15,5 @@ install( FILES kateplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 install( FILES kate.desktop kwrite.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 install( FILES kateui.rc externaltools tips DESTINATION ${DATA_INSTALL_DIR}/kate )
 install( FILES kwriteui.rc DESTINATION ${DATA_INSTALL_DIR}/kwrite )
-install( FILES kate-2.4.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+install( FILES kate-2.4.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
 install( FILES katerc DESTINATION ${CONFIG_INSTALL_DIR} )
diff --git a/kate/data/Makefile.am b/kate/data/Makefile.am
index 77bba0d1d..149406426 100644
--- a/kate/data/Makefile.am
+++ b/kate/data/Makefile.am
@@ -12,7 +12,7 @@ rckwrite_DATA = kwriteui.rc
 tipdir = $(kde_datadir)/kate
 tip_DATA = tips
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kate-2.4.upd
 
 kde_conf_DATA = katerc
diff --git a/kcminit/main.cpp b/kcminit/main.cpp
index ea3412f0c..c8625de18 100644
--- a/kcminit/main.cpp
+++ b/kcminit/main.cpp
@@ -33,7 +33,7 @@
 #include <klibloader.h>
 #include <kdebug.h>
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <X11/Xlib.h>
 
@@ -185,7 +185,7 @@ KCMInit::KCMInit( TDECmdLineArgs* args )
   TQByteArray params;
   TQDataStream stream(params, IO_WriteOnly);
   stream << name << value;
-  kapp->dcopClient()->send("klauncher", "klauncher", "setLaunchEnv(TQCString,TQCString)", params);
+  kapp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
   setenv( name, value, 1 ); // apply effect also to itself
 
   if( startup )
diff --git a/kcontrol/TODO b/kcontrol/TODO
index 2e791d895..7ed8b8523 100644
--- a/kcontrol/TODO
+++ b/kcontrol/TODO
@@ -117,7 +117,7 @@ properly in 800x600 (is it 800x600 or 1024x768?). For a start, someone needs to
 * Tons of KCMs and applications have options for selecting binaries which they use(frontends etc.). We need to be a little consistent here and adopt a general policy in this issue.
 If a binary is not in $PATH it is the distributors fault and not KDE. The reason we have a GUI is so people don't have to know about this kinds of internals. The options doesn't mean anything because users use KDE, they're not in run level 3("WTF? cdparanoia? diff? What's that?"). PATH options("Where to search for X") should be removed - it is up to the distributor. Options for selecting what binary to use should be moved out to KConfEdit - they have a use but are very rarely used.
 
-* Rewrite kcmshell to the new TDECModuleProxy and fix bugs. Move it to tdelibs.
+* Rewrite tdecmshell to the new TDECModuleProxy and fix bugs. Move it to tdelibs.
 
 --------------------------------------------------------------------------
 
diff --git a/kcontrol/access/CMakeLists.txt b/kcontrol/access/CMakeLists.txt
index bc13f53cd..9764fa9c8 100644
--- a/kcontrol/access/CMakeLists.txt
+++ b/kcontrol/access/CMakeLists.txt
@@ -31,7 +31,7 @@ install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kaccess )
 
 tde_add_kpart( kcm_access AUTOMOC
   SOURCES kcmaccess.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 48c649c9a..7d66fa17f 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -14,7 +14,7 @@
 #include <kdebug.h>
 #include <kaudioplayer.h>
 #include <knotifyclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <netwm.h>
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index 218dbfbb4..3a7833c05 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -26,7 +26,7 @@
 #include <kcombobox.h>
 #include <kstandarddirs.h>
 #include <kcolorbutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <kshortcut.h>
diff --git a/kcontrol/access/kcmaccess.desktop b/kcontrol/access/kcmaccess.desktop
index ec3d5d9a1..c748c636a 100644
--- a/kcontrol/access/kcmaccess.desktop
+++ b/kcontrol/access/kcmaccess.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=access
 Type=Application
-Exec=kcmshell kcmaccess
+Exec=tdecmshell kcmaccess
 DocPath=kcontrol/kcmaccess/index.html
 
 
diff --git a/kcontrol/accessibility/accessibility.cpp b/kcontrol/accessibility/accessibility.cpp
index b9dd2a734..eb360e85e 100644
--- a/kcontrol/accessibility/accessibility.cpp
+++ b/kcontrol/accessibility/accessibility.cpp
@@ -24,7 +24,7 @@
 
 #include <kaboutdata.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <knuminput.h>
 #include <kurlrequester.h>
diff --git a/kcontrol/accessibility/accessibility.desktop b/kcontrol/accessibility/accessibility.desktop
index 12afdde45..058d178db 100644
--- a/kcontrol/accessibility/accessibility.desktop
+++ b/kcontrol/accessibility/accessibility.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell accessibility
+Exec=tdecmshell accessibility
 Icon=access
 Type=Application
 
diff --git a/kcontrol/arts/CMakeLists.txt b/kcontrol/arts/CMakeLists.txt
index aaf41edaa..01399cfa8 100644
--- a/kcontrol/arts/CMakeLists.txt
+++ b/kcontrol/arts/CMakeLists.txt
@@ -29,6 +29,6 @@ install( FILES arts.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_arts AUTOMOC
   SOURCES arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp
-  LINK kio-shared tdemid-shared
+  LINK tdeio-shared tdemid-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/arts/arts.desktop b/kcontrol/arts/arts.desktop
index 4defb35e3..b00caf62f 100644
--- a/kcontrol/arts/arts.desktop
+++ b/kcontrol/arts/arts.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell arts
+Exec=tdecmshell arts
 Icon=arts
 Type=Application
 DocPath=kcontrol/arts/index.html
diff --git a/kcontrol/background/background.desktop b/kcontrol/background/background.desktop
index f6b63372a..05fe47bd5 100644
--- a/kcontrol/background/background.desktop
+++ b/kcontrol/background/background.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell background
+Exec=tdecmshell background
 Icon=background
 Type=Application
 DocPath=kcontrol/background/index.html
diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index 5eae86c62..bfe3eff28 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -32,7 +32,7 @@
 #include <tqspinbox.h>
 #include <tqwhatsthis.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcolorbutton.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 448eda455..ff200149a 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -40,10 +40,10 @@
 #include <tqwhatsthis.h>
 #include <tqapplication.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
-#include <kfilemetainfo.h>
+#include <tdefiledialog.h>
+#include <tdefilemetainfo.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kimageio.h>
@@ -1243,10 +1243,10 @@ void BGDialog::slotGetNewStuff()
 {
    //FIXME set this to a server when we get one
    //should really be in a .rc file but could be either
-   //kcmshellrc or kcontrolrc
+   //tdecmshellrc or kcontrolrc
    TDEConfig* config = TDEGlobal::config();
    config->setGroup("KNewStuff");
-   config->writeEntry( "ProvidersUrl", "http://download.kde.org/khotnewstuff/wallpaper-providers.xml" );
+   config->writeEntry( "ProvidersUrl", "http://download.kde.org/tdehotnewstuff/wallpaper-providers.xml" );
    config->writeEntry( "StandardResource", "wallpaper" );
    config->sync();
 
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index 3aed1a6fd..9c207e409 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -30,7 +30,7 @@
 #include <ktempfile.h>
 #include <kcursor.h>
 #include <kmimetype.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 #ifdef HAVE_LIBART
 #include <ksvgiconengine.h>
diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp
index f10add59a..1edf37a8d 100644
--- a/kcontrol/background/bgwallpaper.cpp
+++ b/kcontrol/background/bgwallpaper.cpp
@@ -27,7 +27,7 @@
 #include <tqpushbutton.h>
 #include <tqspinbox.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kimageio.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index 06d84ff86..fa71af901 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -18,7 +18,7 @@
 #include <tqlayout.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <kimageio.h>
diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp
index 0c04a8aa4..5831c042a 100644
--- a/kcontrol/bell/bell.cpp
+++ b/kcontrol/bell/bell.cpp
@@ -27,7 +27,7 @@
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
 #include <knotifyclient.h>
diff --git a/kcontrol/bell/bell.desktop b/kcontrol/bell/bell.desktop
index 91ee2765d..369c499be 100644
--- a/kcontrol/bell/bell.desktop
+++ b/kcontrol/bell/bell.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell bell
+Exec=tdecmshell bell
 Icon=bell
 Type=Application
 DocPath=kcontrol/bell/index.html
diff --git a/kcontrol/clock/CMakeLists.txt b/kcontrol/clock/CMakeLists.txt
index 0be0eabd1..b64527389 100644
--- a/kcontrol/clock/CMakeLists.txt
+++ b/kcontrol/clock/CMakeLists.txt
@@ -29,6 +29,6 @@ install( FILES clock.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_clock AUTOMOC
   SOURCES dtime.cpp tzone.cpp main.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/clock/clock.desktop b/kcontrol/clock/clock.desktop
index d74a8a6f4..2d5f06467 100644
--- a/kcontrol/clock/clock.desktop
+++ b/kcontrol/clock/clock.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Exec=kcmshell tde-clock.desktop
+Exec=tdecmshell tde-clock.desktop
 Icon=date
 DocPath=kcontrol/clock/index.html
 
diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp
index 663b4735e..f46031640 100644
--- a/kcontrol/clock/dtime.cpp
+++ b/kcontrol/clock/dtime.cpp
@@ -37,7 +37,7 @@
 #include <kprocess.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "dtime.h"
 #include "dtime.moc"
diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp
index 541f0cf83..4af720b04 100644
--- a/kcontrol/clock/tzone.cpp
+++ b/kcontrol/clock/tzone.cpp
@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 //#include "xpm/world.xpm"
 #include "tzone.h"
diff --git a/kcontrol/colors/CMakeLists.txt b/kcontrol/colors/CMakeLists.txt
index de87133b7..e5cab510f 100644
--- a/kcontrol/colors/CMakeLists.txt
+++ b/kcontrol/colors/CMakeLists.txt
@@ -29,6 +29,6 @@ install( FILES colors.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_colors AUTOMOC
   SOURCES colorscm.cpp widgetcanvas.cpp
-  LINK krdb-static kio-shared
+  LINK krdb-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/colors/colors.desktop b/kcontrol/colors/colors.desktop
index 4553d5824..e2fb3ca19 100644
--- a/kcontrol/colors/colors.desktop
+++ b/kcontrol/colors/colors.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell colors
+Exec=tdecmshell colors
 Icon=colorscm
 Type=Application
 DocPath=kcontrol/colors/index.html
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index 32fa1125f..baf56c5c3 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -24,11 +24,11 @@
 
 #include <kcolorbutton.h>
 #include <kcursor.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kgenericfactory.h>
 #include <kglobalsettings.h>
 #include <kinputdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kipc.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index a0e59323d..684e9d6d3 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -16,7 +16,7 @@
 #include <kcolordrag.h>
 #include <kpixmapeffect.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kpixmap.h>
 
diff --git a/kcontrol/componentchooser/CMakeLists.txt b/kcontrol/componentchooser/CMakeLists.txt
index 0a7eef7f5..53a77b2a1 100644
--- a/kcontrol/componentchooser/CMakeLists.txt
+++ b/kcontrol/componentchooser/CMakeLists.txt
@@ -33,6 +33,6 @@ tde_add_kpart( kcm_componentchooser AUTOMOC
     componentchooser_ui.ui componentconfig_ui.ui
     emailclientconfig_ui.ui terminalemulatorconfig_ui.ui
     browserconfig_ui.ui componentchooser.cpp kcm_componentchooser.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/componentchooser/Makefile.am b/kcontrol/componentchooser/Makefile.am
index 3a63947a0..6abd5f414 100644
--- a/kcontrol/componentchooser/Makefile.am
+++ b/kcontrol/componentchooser/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS= . componentservices
-AM_CPPFLAGS  = -I../ -I$(top_srcdir)/kio -I$(top_srcdir) $(all_includes)
+AM_CPPFLAGS  = -I../ -I$(top_srcdir)/tdeio -I$(top_srcdir) $(all_includes)
 
 METASOURCES = AUTO 
 
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index c2d5305c5..8eab27216 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -262,7 +262,7 @@ void CfgTerminalEmulator::save(TDEConfig *) {
 	delete config;
 
 	KIPC::sendMessageAll(KIPC::SettingsChanged);
-	kapp->dcopClient()->send("klauncher", "klauncher","reparseConfiguration()", TQString::null);
+	kapp->dcopClient()->send("tdelauncher", "tdelauncher","reparseConfiguration()", TQString::null);
 
 	emit changed(false);
 }
diff --git a/kcontrol/componentchooser/componentchooser.desktop b/kcontrol/componentchooser/componentchooser.desktop
index d686b7448..5e30df9dc 100644
--- a/kcontrol/componentchooser/componentchooser.desktop
+++ b/kcontrol/componentchooser/componentchooser.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell componentchooser
+Exec=tdecmshell componentchooser
 Icon=misc
 Type=Application
 
diff --git a/kcontrol/crypto/CMakeLists.txt b/kcontrol/crypto/CMakeLists.txt
index 1541c1ddb..414e6d605 100644
--- a/kcontrol/crypto/CMakeLists.txt
+++ b/kcontrol/crypto/CMakeLists.txt
@@ -44,6 +44,6 @@ install( FILES crypto.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_crypto AUTOMOC
   SOURCES crypto.cpp certexport.cpp kdatetimedlg.cpp
-  LINK kio-shared ${SSL_LIBRARIES}
+  LINK tdeio-shared ${SSL_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/crypto/certexport.cpp b/kcontrol/crypto/certexport.cpp
index 9c60d4f00..4a6bda892 100644
--- a/kcontrol/crypto/certexport.cpp
+++ b/kcontrol/crypto/certexport.cpp
@@ -26,7 +26,7 @@
 #include "certexport.h"
 #include <tqpushbutton.h>
 #include <klineedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqradiobutton.h>
 #include <tqvbuttongroup.h>
 #include <tqlayout.h>
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index c718184ba..023799844 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -50,11 +50,11 @@
 
 #include <kaboutdata.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdatepicker.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <klineedit.h>
diff --git a/kcontrol/crypto/crypto.desktop b/kcontrol/crypto/crypto.desktop
index 98025c9b6..e637ad5ff 100644
--- a/kcontrol/crypto/crypto.desktop
+++ b/kcontrol/crypto/crypto.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=encrypted
 Type=Application
-Exec=kcmshell crypto
+Exec=tdecmshell crypto
 DocPath=kcontrol/crypto/index.html
 
 X-TDE-Library=crypto
diff --git a/kcontrol/css/CMakeLists.txt b/kcontrol/css/CMakeLists.txt
index f5410f187..56226c836 100644
--- a/kcontrol/css/CMakeLists.txt
+++ b/kcontrol/css/CMakeLists.txt
@@ -29,6 +29,6 @@ install( FILES template.css DESTINATION ${DATA_INSTALL_DIR}/kcmcss )
 
 tde_add_kpart( kcm_css AUTOMOC
   SOURCES template.cpp cssconfig.ui csscustom.ui kcmcss.cpp preview.ui
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp
index 4b1ba47ea..b35c9c04c 100644
--- a/kcontrol/css/kcmcss.cpp
+++ b/kcontrol/css/kcmcss.cpp
@@ -7,7 +7,7 @@
 
 #include <kapplication.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kfontdialog.h>
 #include <kgenericfactory.h>
diff --git a/kcontrol/css/kcmcss.desktop b/kcontrol/css/kcmcss.desktop
index d457a31b7..a8fe02b9e 100644
--- a/kcontrol/css/kcmcss.desktop
+++ b/kcontrol/css/kcmcss.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=stylesheet
 Type=Application
-Exec=kcmshell kcmcss
+Exec=tdecmshell kcmcss
 DocPath=kcontrol/kcmcss/index.html
 
 
diff --git a/kcontrol/display/display.desktop b/kcontrol/display/display.desktop
index a8d0bd5dc..3da4e03d2 100644
--- a/kcontrol/display/display.desktop
+++ b/kcontrol/display/display.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=tdescreensaver
 Type=Application
-Exec=kcmshell display
+Exec=tdecmshell display
 DocPath=kcontrol/kcmdisplay/index.html
 
 X-TDE-Library=display
diff --git a/kcontrol/displayconfig/CMakeLists.txt b/kcontrol/displayconfig/CMakeLists.txt
index 774743329..dfa45882b 100644
--- a/kcontrol/displayconfig/CMakeLists.txt
+++ b/kcontrol/displayconfig/CMakeLists.txt
@@ -36,6 +36,6 @@ set_source_files_properties( displayconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CO
 tde_add_kpart( kcm_displayconfig AUTOMOC
   SOURCES
     monitorworkspace.cpp displayconfig.cpp displayconfigbase.ui displayconfig.skel
-  LINK kio-shared tderandr-shared tdeutils-shared
+  LINK tdeio-shared tderandr-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 017b1537c..34259f425 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -30,7 +30,7 @@
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/kcontrol/displayconfig/displayconfig.desktop b/kcontrol/displayconfig/displayconfig.desktop
index a94a37b97..738d3a293 100644
--- a/kcontrol/displayconfig/displayconfig.desktop
+++ b/kcontrol/displayconfig/displayconfig.desktop
@@ -3,7 +3,7 @@ Categories=Qt;TDE;X-TDE-settings-system;
 Comment=Configure display
 Comment[en_US]=Configure display
 DocPath=kcontrol/displayconfig.html
-Exec=kcmshell displayconfig
+Exec=tdecmshell displayconfig
 GenericName=
 GenericName[en_US]=
 Icon=background
diff --git a/kcontrol/dnssd/kcm_tdednssd.desktop b/kcontrol/dnssd/kcm_tdednssd.desktop
index ffa16d753..371c8cea3 100644
--- a/kcontrol/dnssd/kcm_tdednssd.desktop
+++ b/kcontrol/dnssd/kcm_tdednssd.desktop
@@ -67,7 +67,7 @@ Comment[vi]=Cấu hình dịch vụ khám phá
 Comment[wa]=Apontiaedjes do discovraedje do siervice
 Comment[zh_CN]=配置探索服务
 Comment[zh_TW]=設定服務偵測
-Exec=kcmshell kcm_tdednssd
+Exec=tdecmshell kcm_tdednssd
 GenericName=
 GenericName[ko]=일반
 Icon=network_local
diff --git a/kcontrol/ebrowsing/CMakeLists.txt b/kcontrol/ebrowsing/CMakeLists.txt
index 47ebb7e64..bacbce722 100644
--- a/kcontrol/ebrowsing/CMakeLists.txt
+++ b/kcontrol/ebrowsing/CMakeLists.txt
@@ -30,6 +30,6 @@ install( FILES ebrowsing.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_kurifilt AUTOMOC
   SOURCES filteropts.cpp main.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/ebrowsing/Makefile.am b/kcontrol/ebrowsing/Makefile.am
index dfb9fdbe8..72bb632cd 100644
--- a/kcontrol/ebrowsing/Makefile.am
+++ b/kcontrol/ebrowsing/Makefile.am
@@ -11,7 +11,7 @@ kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp
 kcm_kurifilt_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
 kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA)
 # Don't link this lib to the plugins. They are dlopened and linking to them
-# results in crashes when closing kcmshell.
+# results in crashes when closing tdecmshell.
 # plugins/ikws/libkuriikwsfilter.la plugins/shorturi/libkshorturifilter.la
 
 messages: rc.cpp
diff --git a/kcontrol/ebrowsing/ebrowsing.desktop b/kcontrol/ebrowsing/ebrowsing.desktop
index 42319e236..b76532e55 100644
--- a/kcontrol/ebrowsing/ebrowsing.desktop
+++ b/kcontrol/ebrowsing/ebrowsing.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/ebrowsing/index.html
 Icon=enhanced_browsing
-Exec=kcmshell ebrowsing
+Exec=tdecmshell ebrowsing
 
 
 X-TDE-Library=kurifilt
diff --git a/kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt b/kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt
index b5c470483..9fffe268e 100644
--- a/kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt
+++ b/kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_add_kpart( libkuriikwsfilter AUTOMOC
   SOURCES
     kuriikwsfiltereng.cpp kuriikwsfilter.skel
     kuriikwsfilter.cpp searchprovider.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -46,6 +46,6 @@ tde_add_kpart( libkurisearchfilter AUTOMOC
     kurisearchfilter.cpp kurisearchfilter.skel
     kuriikwsfiltereng.cpp ikwsopts.cpp searchproviderdlg.cpp
     searchprovider.cpp searchproviderdlg_ui.ui ikwsopts_ui.ui
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
\ No newline at end of file
diff --git a/kcontrol/ebrowsing/plugins/ikws/Makefile.am b/kcontrol/ebrowsing/plugins/ikws/Makefile.am
index bb00b6e90..4cdb46d42 100644
--- a/kcontrol/ebrowsing/plugins/ikws/Makefile.am
+++ b/kcontrol/ebrowsing/plugins/ikws/Makefile.am
@@ -22,7 +22,7 @@ libkurisearchfilter_la_SOURCES = kurisearchfilter.cpp kurisearchfilter.skel \
       searchproviderdlg_ui.ui ikwsopts_ui.ui
 
 update_DATA = kuriikwsfilter.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 service_DATA = kuriikwsfilter.desktop kurisearchfilter.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index 3073250f7..474394108 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -32,7 +32,7 @@
 #include <dcopref.h>
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klistview.h>
 #include <klocale.h>
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
index 4631524e0..e0acab4e4 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
@@ -32,7 +32,7 @@
 
 /**
  * IMPORTANT: If you change anything here, please run the regression test
- * tdelibs/kio/tests/kurifiltertest
+ * tdelibs/tdeio/tests/kurifiltertest
  */
 
 typedef KGenericFactory<KAutoWebSearch> KAutoWebSearchFactory;
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
index c57d3e080..63c61eaf4 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
@@ -31,7 +31,7 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <kprotocolinfo.h>
@@ -46,7 +46,7 @@
 
 /**
  * IMPORTANT: If you change anything here, please run the regression test
- * tdelibs/kio/tests/kurifiltertest
+ * tdelibs/tdeio/tests/kurifiltertest
  */
 
 KURISearchFilterEngine *KURISearchFilterEngine::s_pSelf = 0;
diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
index a8c8dbda9..c42a6be0c 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
@@ -32,7 +32,7 @@
 
 /**
  * IMPORTANT: If you change anything here, please run the regression test
- * tdelibs/kio/tests/kurifiltertest
+ * tdelibs/tdeio/tests/kurifiltertest
  */
 
 typedef KGenericFactory<KURISearchFilter> KURISearchFilterFactory;
diff --git a/kcontrol/ebrowsing/plugins/localdomain/CMakeLists.txt b/kcontrol/ebrowsing/plugins/localdomain/CMakeLists.txt
index df8d0eefa..222b6556d 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/CMakeLists.txt
+++ b/kcontrol/ebrowsing/plugins/localdomain/CMakeLists.txt
@@ -29,7 +29,7 @@ install( FILES localdomainurifilter.desktop DESTINATION ${SERVICES_INSTALL_DIR}
 
 tde_add_kpart( liblocaldomainurifilter AUTOMOC
   SOURCES localdomainurifilter.cpp localdomainurifilter.skel
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
index 8b6da2a99..1fc6ad629 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
@@ -33,7 +33,7 @@
 
 /**
  * IMPORTANT: If you change anything here, please run the regression test
- * tdelibs/kio/tests/kurifiltertest
+ * tdelibs/tdeio/tests/kurifiltertest
  */
  
 LocalDomainURIFilter::LocalDomainURIFilter( TQObject *parent, const char *name,
diff --git a/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt b/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt
index c8d25b1bf..4eb1c5441 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt
+++ b/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt
@@ -29,6 +29,6 @@ install( FILES kshorturifilterrc DESTINATION ${CONFIG_INSTALL_DIR} )
 
 tde_add_kpart( libkshorturifilter AUTOMOC
   SOURCES kshorturifilter.cpp kshorturifilter.skel
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
index c394de693..57bc2e92f 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <kprotocolinfo.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmimetype.h>
 
 #include "kshorturifilter.h"
@@ -48,10 +48,10 @@
  /**
   * IMPORTANT:
   *  If you change anything here, please run the regression test
-  *  tdelibs/kio/tests/kurifiltertest.
+  *  tdelibs/tdeio/tests/kurifiltertest.
   *
   *  If you add anything here, make sure to add a corresponding
-  *  test code to tdelibs/kio/tests/kurifiltertest.
+  *  test code to tdelibs/tdeio/tests/kurifiltertest.
   */
 
 typedef TQMap<TQString,TQString> EntryMap;
diff --git a/kcontrol/energy/CMakeLists.txt b/kcontrol/energy/CMakeLists.txt
index ee9bf8ab0..9e194602a 100644
--- a/kcontrol/energy/CMakeLists.txt
+++ b/kcontrol/energy/CMakeLists.txt
@@ -60,6 +60,6 @@ install( FILES energy.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden )
 
 tde_add_kpart( kcm_energy AUTOMOC
   SOURCES energy.cpp
-  LINK kio-shared ${XEXT_LIBRARY}
+  LINK tdeio-shared ${XEXT_LIBRARY}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp
index a6fb21887..19c46e235 100644
--- a/kcontrol/energy/energy.cpp
+++ b/kcontrol/energy/energy.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdialog.h>
 #include <kiconloader.h>
diff --git a/kcontrol/energy/energy.desktop b/kcontrol/energy/energy.desktop
index 8b0d24373..e3a4d2093 100644
--- a/kcontrol/energy/energy.desktop
+++ b/kcontrol/energy/energy.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell energy
+Exec=tdecmshell energy
 Icon=energy_star
 DocPath=kcontrol/energy/index.html
 Type=Application
diff --git a/kcontrol/filetypes/CMakeLists.txt b/kcontrol/filetypes/CMakeLists.txt
index dbcf5e929..c906287d8 100644
--- a/kcontrol/filetypes/CMakeLists.txt
+++ b/kcontrol/filetypes/CMakeLists.txt
@@ -28,7 +28,7 @@ install( FILES filetypes.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_filetypes AUTOMOC
   SOURCES control.cpp
-  LINK filetypes-static kio-shared
+  LINK filetypes-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -46,6 +46,6 @@ tde_add_library( filetypes STATIC_PIC AUTOMOC
 
 tde_add_executable( keditfiletype AUTOMOC
   SOURCES keditfiletype.cpp
-  LINK filetypes-static kio-shared
+  LINK filetypes-static tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp
index abb973580..a98f68cce 100644
--- a/kcontrol/filetypes/filetypedetails.cpp
+++ b/kcontrol/filetypes/filetypedetails.cpp
@@ -5,7 +5,7 @@
 #include <tqwhatsthis.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kicondialog.h>
 #include <klineedit.h>
diff --git a/kcontrol/filetypes/filetypes.desktop b/kcontrol/filetypes/filetypes.desktop
index 41a23a1c4..42d2db5cb 100644
--- a/kcontrol/filetypes/filetypes.desktop
+++ b/kcontrol/filetypes/filetypes.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=filetypes
 Type=Application
-Exec=kcmshell filetypes
+Exec=tdecmshell filetypes
 DocPath=kcontrol/filetypes/index.html
 Categories=Qt;TDE;X-TDE-settings-components;
 
diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h
index e7217c4ba..b83158519 100644
--- a/kcontrol/filetypes/filetypesview.h
+++ b/kcontrol/filetypes/filetypesview.h
@@ -4,7 +4,7 @@
 #include <tqptrlist.h>
 #include <tqmap.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdecmodule.h>
 
 #include "typeslistitem.h"
diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp
index df59d4b31..bde058d00 100644
--- a/kcontrol/filetypes/typeslistitem.cpp
+++ b/kcontrol/filetypes/typeslistitem.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
diff --git a/kcontrol/fonts/fonts.desktop b/kcontrol/fonts/fonts.desktop
index 8ee345b7b..9b527e751 100644
--- a/kcontrol/fonts/fonts.desktop
+++ b/kcontrol/fonts/fonts.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell fonts
+Exec=tdecmshell fonts
 Icon=fonts
 Type=Application
 DocPath=kcontrol/fonts/index.html
diff --git a/kcontrol/hwmanager/CMakeLists.txt b/kcontrol/hwmanager/CMakeLists.txt
index 4973c894f..584eba7bc 100644
--- a/kcontrol/hwmanager/CMakeLists.txt
+++ b/kcontrol/hwmanager/CMakeLists.txt
@@ -34,6 +34,6 @@ set_source_files_properties( hwmanager.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDI
 tde_add_kpart( kcm_hwmanager AUTOMOC
   SOURCES
     hwmanager.cpp deviceiconview.cpp devicepropsdlg.cpp devicepropsdlgbase.ui hwmanagerbase.ui hwmanager.skel
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp
index b1bae281a..35845a380 100644
--- a/kcontrol/hwmanager/hwmanager.cpp
+++ b/kcontrol/hwmanager/hwmanager.cpp
@@ -28,7 +28,7 @@
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/kcontrol/hwmanager/hwmanager.desktop b/kcontrol/hwmanager/hwmanager.desktop
index d8d3c9db3..1b006504b 100644
--- a/kcontrol/hwmanager/hwmanager.desktop
+++ b/kcontrol/hwmanager/hwmanager.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell kwmanager
+Exec=tdecmshell kwmanager
 Icon=background
 Type=Application
 DocPath=kcontrol/hwmanager/index.html
diff --git a/kcontrol/iccconfig/CMakeLists.txt b/kcontrol/iccconfig/CMakeLists.txt
index de5a8905a..4af3af694 100644
--- a/kcontrol/iccconfig/CMakeLists.txt
+++ b/kcontrol/iccconfig/CMakeLists.txt
@@ -33,6 +33,6 @@ set_source_files_properties( iccconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDI
 tde_add_kpart( kcm_iccconfig AUTOMOC
   SOURCES
     iccconfig.cpp iccconfigbase.ui iccconfig.skel
-  LINK kio-shared tderandr-shared
+  LINK tdeio-shared tderandr-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index c65699489..a12d26b2d 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -28,7 +28,7 @@
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/kcontrol/iccconfig/iccconfig.desktop b/kcontrol/iccconfig/iccconfig.desktop
index 0ac801513..008914acb 100644
--- a/kcontrol/iccconfig/iccconfig.desktop
+++ b/kcontrol/iccconfig/iccconfig.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell iccconfig
+Exec=tdecmshell iccconfig
 Icon=background
 Type=Application
 DocPath=kcontrol/iccconfig/index.html
diff --git a/kcontrol/icons/CMakeLists.txt b/kcontrol/icons/CMakeLists.txt
index 0a7dfbefb..0961b6d62 100644
--- a/kcontrol/icons/CMakeLists.txt
+++ b/kcontrol/icons/CMakeLists.txt
@@ -31,6 +31,6 @@ install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/Settings/LookNF
 
 tde_add_kpart( kcm_icons AUTOMOC
   SOURCES iconthemes.cpp icons.cpp main.cpp
-  LINK kio-shared ${LIBART_LIBRARIES}
+  LINK tdeio-shared ${LIBART_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index cd529485c..710927b8a 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -20,7 +20,7 @@
 
 #include <kapplication.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconeffect.h>
 #include <kiconloader.h>
diff --git a/kcontrol/icons/icons.desktop b/kcontrol/icons/icons.desktop
index 6fd4adec8..721f2830a 100644
--- a/kcontrol/icons/icons.desktop
+++ b/kcontrol/icons/icons.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/icons/index.html
 Icon=icons
-Exec=kcmshell icons
+Exec=tdecmshell icons
 
 
 X-TDE-Library=icons
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 835962ff6..812f382d2 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -41,8 +41,8 @@
 #include <kprogress.h>
 #include <kiconloader.h>
 
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <ktar.h>
 
 #ifdef HAVE_LIBART
diff --git a/kcontrol/info/cdinfo.desktop b/kcontrol/info/cdinfo.desktop
index bb8f80779..1b71d65d0 100644
--- a/kcontrol/info/cdinfo.desktop
+++ b/kcontrol/info/cdinfo.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell cdinfo
+Exec=tdecmshell cdinfo
 Icon=kcmdevices
 Type=Application
 DocPath=kinfocenter/cdinfo/index.html
diff --git a/kcontrol/info/devices.desktop b/kcontrol/info/devices.desktop
index 5a738437b..2b7ad8f4a 100644
--- a/kcontrol/info/devices.desktop
+++ b/kcontrol/info/devices.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell devices
+Exec=tdecmshell devices
 Icon=kcmdevices
 Type=Application
 DocPath=kinfocenter/devices/index.html
diff --git a/kcontrol/info/dma.desktop b/kcontrol/info/dma.desktop
index 5421ff4d9..cd67d6be3 100644
--- a/kcontrol/info/dma.desktop
+++ b/kcontrol/info/dma.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell dma
+Exec=tdecmshell dma
 Icon=kcmmemory
 Type=Application
 DocPath=kinfocenter/dma/index.html
diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp
index 22efcd6d3..c2b7b953a 100644
--- a/kcontrol/info/info_netbsd.cpp
+++ b/kcontrol/info/info_netbsd.cpp
@@ -43,7 +43,7 @@
 #include <tqtextstream.h>
 
 #include <kdebug.h>
-#include <kio/global.h> /* for TDEIO::convertSize() */
+#include <tdeio/global.h> /* for TDEIO::convertSize() */
 
 typedef struct
   {
diff --git a/kcontrol/info/interrupts.desktop b/kcontrol/info/interrupts.desktop
index 60588d0bf..84471002c 100644
--- a/kcontrol/info/interrupts.desktop
+++ b/kcontrol/info/interrupts.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell interrupts
+Exec=tdecmshell interrupts
 Icon=kcmmemory
 Type=Application
 DocPath=kinfocenter/interrupts/index.html
diff --git a/kcontrol/info/ioports.desktop b/kcontrol/info/ioports.desktop
index 2a6cfcffa..a3f670ad7 100644
--- a/kcontrol/info/ioports.desktop
+++ b/kcontrol/info/ioports.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell ioports
+Exec=tdecmshell ioports
 Icon=kcmmemory
 Type=Application
 DocPath=kinfocenter/ioports/index.html
diff --git a/kcontrol/info/memory.desktop b/kcontrol/info/memory.desktop
index 66f148fa1..1ff56664e 100644
--- a/kcontrol/info/memory.desktop
+++ b/kcontrol/info/memory.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell memory
+Exec=tdecmshell memory
 Icon=kcmmemory
 Type=Application
 DocPath=kinfocenter/memory/index.html
diff --git a/kcontrol/info/opengl.desktop b/kcontrol/info/opengl.desktop
index 6aec4f804..c7cdf29a9 100644
--- a/kcontrol/info/opengl.desktop
+++ b/kcontrol/info/opengl.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 NoDisplay=true
-Exec=kcmshell opengl
+Exec=tdecmshell opengl
 Icon=kcmopengl
 Type=Application
 DocPath=kinfocenter/opengl/index.html
diff --git a/kcontrol/info/partitions.desktop b/kcontrol/info/partitions.desktop
index 18659d77d..02e591db0 100644
--- a/kcontrol/info/partitions.desktop
+++ b/kcontrol/info/partitions.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell partitions
+Exec=tdecmshell partitions
 Icon=kcmpartitions
 Type=Application
 DocPath=kinfocenter/partitions/index.html
diff --git a/kcontrol/info/pci.desktop b/kcontrol/info/pci.desktop
index 3a9898592..9e2d3e635 100644
--- a/kcontrol/info/pci.desktop
+++ b/kcontrol/info/pci.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell pci
+Exec=tdecmshell pci
 Icon=kcmpci
 Type=Application
 DocPath=kinfocenter/pci/index.html
diff --git a/kcontrol/info/processor.desktop b/kcontrol/info/processor.desktop
index 9d8e2aa95..35cd337c7 100644
--- a/kcontrol/info/processor.desktop
+++ b/kcontrol/info/processor.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell processor
+Exec=tdecmshell processor
 Icon=kcmprocessor
 Type=Application
 DocPath=kinfocenter/processor/index.html
diff --git a/kcontrol/info/scsi.desktop b/kcontrol/info/scsi.desktop
index e8302f043..e2b6691c8 100644
--- a/kcontrol/info/scsi.desktop
+++ b/kcontrol/info/scsi.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell scsi
+Exec=tdecmshell scsi
 Icon=kcmscsi
 Type=Application
 DocPath=kinfocenter/scsi/index.html
diff --git a/kcontrol/info/sound.desktop b/kcontrol/info/sound.desktop
index c095c337b..0c90238fe 100644
--- a/kcontrol/info/sound.desktop
+++ b/kcontrol/info/sound.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell sound
+Exec=tdecmshell sound
 Icon=kcmsound
 Type=Application
 DocPath=kinfocenter/sound/index.html
diff --git a/kcontrol/info/xserver.desktop b/kcontrol/info/xserver.desktop
index 7e8e4c2ec..b253c2b53 100644
--- a/kcontrol/info/xserver.desktop
+++ b/kcontrol/info/xserver.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell xserver
+Exec=tdecmshell xserver
 Icon=kcmx
 Type=Application
 DocPath=kinfocenter/xserver/index.html
diff --git a/kcontrol/input/CMakeLists.txt b/kcontrol/input/CMakeLists.txt
index 1ebd92184..0382a17ea 100644
--- a/kcontrol/input/CMakeLists.txt
+++ b/kcontrol/input/CMakeLists.txt
@@ -53,7 +53,7 @@ tde_add_kpart( kcm_input AUTOMOC
   SOURCES
     mouse.cpp kmousedlg.ui main.cpp logitechmouse.cpp
     logitechmouse_base.ui
-  LINK themepage-static kio-shared ${XCURSOR_LIBRARIES} ${LIBUSB_LIBRARIES}
+  LINK themepage-static tdeio-shared ${XCURSOR_LIBRARIES} ${LIBUSB_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kcontrol/input/Makefile.am b/kcontrol/input/Makefile.am
index 7ac995b97..840029c26 100644
--- a/kcontrol/input/Makefile.am
+++ b/kcontrol/input/Makefile.am
@@ -37,7 +37,7 @@ EXTRA_DIST = $(font_DATA)
 
 update_DATA = mouse_cursor_theme.upd
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 install-data-hook:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/fonts/override
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index dcef9b85e..558998b4e 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -23,11 +23,11 @@
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <kprocess.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <kdialog.h>
 
diff --git a/kcontrol/input/logitechmouse.h b/kcontrol/input/logitechmouse.h
index 60780758a..e50838b72 100644
--- a/kcontrol/input/logitechmouse.h
+++ b/kcontrol/input/logitechmouse.h
@@ -28,7 +28,7 @@
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <config.h>
 
diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp
index 0ab009ec9..38bded500 100644
--- a/kcontrol/input/main.cpp
+++ b/kcontrol/input/main.cpp
@@ -27,7 +27,7 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopref.h>
 #include <tqfile.h>
 
@@ -80,13 +80,13 @@ extern "C"
     XDefineCursor(tqt_xdisplay(), tqt_xrootwin(), handle);
     XFreeCursor(tqt_xdisplay(), handle); // Don't leak the cursor
 
-    // Tell klauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment
+    // Tell tdelauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment
     // variables when launching applications.
-    DCOPRef klauncher("klauncher");
+    DCOPRef tdelauncher("tdelauncher");
     if( !theme.isEmpty())
-        klauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), theme);
+        tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), theme);
     if( !size.isEmpty())
-        klauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size);
+        tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size);
 #endif
 
     delete config;
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index 9253a1910..14d5787fa 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -58,7 +58,7 @@
 
 #include <klocale.h>
 #include <kdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kaboutdata.h>
diff --git a/kcontrol/input/mouse.desktop b/kcontrol/input/mouse.desktop
index c8a7c1e96..5873eb523 100644
--- a/kcontrol/input/mouse.desktop
+++ b/kcontrol/input/mouse.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell mouse
+Exec=tdecmshell mouse
 Icon=mouse
 Type=Application
 DocPath=kcontrol/mouse/index.html
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index a0f0ef0cf..0aa1224ec 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -29,8 +29,8 @@
 #include <kdialog.h>
 #include <kmessagebox.h>
 #include <kurlrequesterdlg.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <ktar.h>
 
 #include <tqlayout.h>
diff --git a/kcontrol/ioslaveinfo/CMakeLists.txt b/kcontrol/ioslaveinfo/CMakeLists.txt
index e0811d998..5a8a72d59 100644
--- a/kcontrol/ioslaveinfo/CMakeLists.txt
+++ b/kcontrol/ioslaveinfo/CMakeLists.txt
@@ -29,6 +29,6 @@ tde_install_empty_directory( ${DATA_INSTALL_DIR}/Settings/Information )
 
 tde_add_kpart( kcm_ioslaveinfo AUTOMOC
   SOURCES kcmioslaveinfo.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/ioslaveinfo/ioslaveinfo.desktop b/kcontrol/ioslaveinfo/ioslaveinfo.desktop
index 1dee413d3..451ded7f4 100644
--- a/kcontrol/ioslaveinfo/ioslaveinfo.desktop
+++ b/kcontrol/ioslaveinfo/ioslaveinfo.desktop
@@ -78,7 +78,7 @@ Comment[zh_CN]=可用协议的信息
 Comment[zh_TW]=可用協定的資訊
 Comment[zu]=Ulwazi mayelana nemithetho elandelwayo ekhona
 DocPath=kinfocenter/protocols/index.html
-Exec=kcmshell ioslaveinfo
+Exec=tdecmshell ioslaveinfo
 Icon=history
 Keywords=Protocol,IO slaves,Slaves,Network,Information,Timeout
 Keywords[ar]=الميفاق,IO Slaves,Slaves,الشبكة,معلومات نفاذ الوقت
diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
index 9ee3d93f9..b0ae6866d 100644
--- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
+++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
@@ -32,13 +32,13 @@
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kprotocolinfo.h>
 #include <kstandarddirs.h>
@@ -118,7 +118,7 @@ void KCMIOSlaveInfo::slotResult(TDEIO::Job *)
 
 void KCMIOSlaveInfo::showInfo(const TQString& protocol)
 {
-   TQString file = TQString("kioslave/%1.docbook").arg( protocol );
+   TQString file = TQString("tdeioslave/%1.docbook").arg( protocol );
    file = TDEGlobal::locale()->langLookup( file );
    if (m_tfj)
    {
@@ -129,7 +129,7 @@ void KCMIOSlaveInfo::showInfo(const TQString& protocol)
    if (!file.isEmpty())
    {
        helpData.truncate( 0 );
-       m_tfj = TDEIO::get( KURL( TQString("help:/kioslave/%1.html").arg( protocol ) ), true, false );
+       m_tfj = TDEIO::get( KURL( TQString("help:/tdeioslave/%1.html").arg( protocol ) ), true, false );
        connect( m_tfj, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( slaveHelp( TDEIO::Job *, const TQByteArray &) ) );
        connect( m_tfj, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) );
        return;
diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.h b/kcontrol/ioslaveinfo/kcmioslaveinfo.h
index 04db54566..f2df0e1e4 100644
--- a/kcontrol/ioslaveinfo/kcmioslaveinfo.h
+++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.h
@@ -29,7 +29,7 @@
 
 #include <kaboutdata.h>
 #include <tdecmodule.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klistbox.h>
 #include <ktextbrowser.h>
 
diff --git a/kcontrol/joystick/joystick.desktop b/kcontrol/joystick/joystick.desktop
index 6ba236435..243393457 100644
--- a/kcontrol/joystick/joystick.desktop
+++ b/kcontrol/joystick/joystick.desktop
@@ -66,7 +66,7 @@ Comment[vi]=cần điều khiển - một mô đun điều khiển TDE đêr ki
 Comment[wa]=djîsse di djeu - on module di kcontrol po sayî les djîsses di djeu
 Comment[zh_CN]=Joystick - 测试游戏杆的 kcontrol 模块
 Comment[zh_TW]=搖桿 - 用來測試搖桿的 kcontrol 模組
-Exec=kcmshell joystick
+Exec=tdecmshell joystick
 Keywords=joystick,gamepad
 Keywords[be]=Джойстык,joystick,gamepad
 Keywords[bg]=джойстик, игра, игри, управление, joystick, gamepad
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index ad61b11c1..27aaed1ba 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -38,7 +38,7 @@
 #include <dcopclient.h>
 #include <kaboutdata.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "main.h"
diff --git a/kcontrol/kcontrol/moduleIface.cpp b/kcontrol/kcontrol/moduleIface.cpp
index 98135a27f..dbaba9054 100644
--- a/kcontrol/kcontrol/moduleIface.cpp
+++ b/kcontrol/kcontrol/moduleIface.cpp
@@ -21,7 +21,7 @@
 #include "moduleIface.moc"
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 ModuleIface::ModuleIface(TQObject *parent, const char *name) 
 	: TQObject(parent, name), DCOPObject(name) {
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index 8382c5d81..4c3ccbbc1 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -141,7 +141,7 @@ void ConfigModule::runAsRoot()
   delete _embedStack;
 
   // create an embed widget that will embed the
-  // kcmshell running as root
+  // tdecmshell running as root
   _embedLayout = new TQVBoxLayout(_module->parentWidget());
   _embedFrame = new TQVBox( _module->parentWidget() );
   _embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised );
@@ -165,7 +165,7 @@ void ConfigModule::runAsRoot()
   _embedStack->raiseWidget(_busy);
   connect(_embedWidget, TQT_SIGNAL( windowEmbedded(WId)), TQT_SLOT( embedded()));
 
-  // prepare the process to run the kcmshell
+  // prepare the process to run the tdecmshell
   TQString cmd = service()->exec().stripWhiteSpace();
   bool kdeshell = false;
   if (cmd.left(5) == "tdesu")
@@ -179,7 +179,7 @@ void ConfigModule::runAsRoot()
         }
     }
 
-  if (cmd.left(8) == "kcmshell")
+  if (cmd.left(8) == "tdecmshell")
     {
       cmd = TQString(cmd.remove(0,8)).stripWhiteSpace();
       kdeshell = true;
@@ -198,7 +198,7 @@ void ConfigModule::runAsRoot()
       // We also don't have a way to close the module in that case.
       *_rootProcess << "--n"; // Don't keep password.
       if (kdeshell) {
-         *_rootProcess << TQString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "kcmshell")).arg(cmd).arg(_embedWidget->winId()).arg(TDEGlobal::locale()->language());
+         *_rootProcess << TQString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "tdecmshell")).arg(cmd).arg(_embedWidget->winId()).arg(TDEGlobal::locale()->language());
       }
       else {
          *_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( TDEGlobal::locale()->language() );
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index fbfc86cd7..06a09e2d3 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -20,7 +20,7 @@
 
 #include <kapplication.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kbugreport.h>
 #include <kaboutapplication.h>
 #include <kmessagebox.h>
diff --git a/kcontrol/kded/CMakeLists.txt b/kcontrol/kded/CMakeLists.txt
index 37ef62b5e..c974d7ca0 100644
--- a/kcontrol/kded/CMakeLists.txt
+++ b/kcontrol/kded/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES kcmkded.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_kded AUTOMOC
   SOURCES kcmkded.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/kded/kcmkded.desktop b/kcontrol/kded/kcmkded.desktop
index 6a6d1c7f3..a081096a8 100644
--- a/kcontrol/kded/kcmkded.desktop
+++ b/kcontrol/kded/kcmkded.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell kcmkded
+Exec=tdecmshell kcmkded
 Icon=services
 Type=Application
 
diff --git a/kcontrol/keys/CMakeLists.txt b/kcontrol/keys/CMakeLists.txt
index 219fb03a5..739cd47f2 100644
--- a/kcontrol/keys/CMakeLists.txt
+++ b/kcontrol/keys/CMakeLists.txt
@@ -38,6 +38,6 @@ tde_add_kpart( kcm_keys AUTOMOC
   SOURCES
     shortcuts.cpp modifiers.cpp main.cpp khotkeys.cpp
     treeview.cpp commandShortcuts.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/keys/Makefile.am b/kcontrol/keys/Makefile.am
index e2d897c64..0f07b43a5 100644
--- a/kcontrol/keys/Makefile.am
+++ b/kcontrol/keys/Makefile.am
@@ -14,7 +14,7 @@ messages:
 
 update_DATA = kaccel.upd
 update_SCRIPTS = convertShortcuts.pl
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 xdg_apps_DATA = keys.desktop
 
diff --git a/kcontrol/keys/keys.desktop b/kcontrol/keys/keys.desktop
index 5ab196a6e..92fdd7bdd 100644
--- a/kcontrol/keys/keys.desktop
+++ b/kcontrol/keys/keys.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell keys
+Exec=tdecmshell keys
 Icon=key_bindings
 Type=Application
 DocPath=kcontrol/keys/index.html
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 6da5c94f1..15cad733a 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -7,7 +7,7 @@
 #include <tqwhatsthis.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kkeynative.h>
diff --git a/kcontrol/kfontinst/CMakeLists.txt b/kcontrol/kfontinst/CMakeLists.txt
index 38056cd3c..0fe56e1b4 100644
--- a/kcontrol/kfontinst/CMakeLists.txt
+++ b/kcontrol/kfontinst/CMakeLists.txt
@@ -13,7 +13,7 @@ add_subdirectory( lib )
 add_subdirectory( thumbnail )
 add_subdirectory( viewpart )
 add_subdirectory( kcmfontinst )
-add_subdirectory( kfile-plugin )
+add_subdirectory( tdefile-plugin )
 add_subdirectory( kfontinst )
 add_subdirectory( kio )
 
diff --git a/kcontrol/kfontinst/ChangeLog b/kcontrol/kfontinst/ChangeLog
index 0c2de0ed1..7916d0b45 100644
--- a/kcontrol/kfontinst/ChangeLog
+++ b/kcontrol/kfontinst/ChangeLog
@@ -118,11 +118,11 @@ KDE3.1 -> KDE3.2
 4.  Settings are saved on "Apply".
 5.  Settings tab simplified - some uneccesary settings removed.
 6.  Removal of Anti-Alias tab - relevant settings moved to kcmfonts.
-7.  Add kfile-plugin to display Meta data for fonts.
+7.  Add tdefile-plugin to display Meta data for fonts.
 8.  Remove settings wizard.
 9.  Drop use of internal version numbering - not tagging CVS anyway, so whats the point?
 10. DCOP interface.
-11. Remember size of main window when run via kcmshell.
+11. Remember size of main window when run via tdecmshell.
 
 0.10->0.11 (KDE3.0)
 ===================
diff --git a/kcontrol/kfontinst/Makefile.am b/kcontrol/kfontinst/Makefile.am
index 963ec3c93..190855a8a 100644
--- a/kcontrol/kfontinst/Makefile.am
+++ b/kcontrol/kfontinst/Makefile.am
@@ -3,7 +3,7 @@ FONTINST_TN_SUBDIR=thumbnail
 FONTINST_VP_SUBDIR=viewpart
 endif
 
-SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst kfile-plugin kfontinst kio
+SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin kfontinst kio
 
 EXTRA_DIST = TODO
 
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
index c5db61ecc..bce091cd7 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -51,12 +51,12 @@
 #include <ktoolbar.h>
 #include <ktoolbarbutton.h>
 #include <kstdaccel.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kcmdlineargs.h>
 #include <kapplication.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <kdirlister.h>
 #include <kpushbutton.h>
 #include <kguiitem.h>
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
index c3d64c7b0..4895f273e 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
@@ -36,8 +36,8 @@
 #include <tqstringlist.h>
 #include <tdecmodule.h>
 #include <kurl.h>
-#include <kconfig.h>
-#include <kio/job.h>
+#include <tdeconfig.h>
+#include <tdeio/job.h>
 #ifdef HAVE_XFT
 #include <tdeparts/part.h>
 #endif
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp
index 241ac88bf..0770094e3 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <tqevent.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kurldrag.h>
 #include "KFileFontIconView.h"
 
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h
index bb5ccfa5a..8a86b1ae2 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h
@@ -29,7 +29,7 @@
 // (C) Craig Drummond, 2003, 2004
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <kfileiconview.h>
+#include <tdefileiconview.h>
 
 namespace KFI
 {
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
index 0d05799d9..3c8801e75 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //
-// NOTE: HEAVILY copied from kfiledetailview.cpp...
+// NOTE: HEAVILY copied from tdefiledetailview.cpp...
 //
 //   Copyright (C) 1997 Stephan Kulow <coolo@kde.org>
 //                 2000, 2001 Carsten Pfeiffer <pfeiffer@kde.org>
@@ -39,7 +39,7 @@
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <kapplication.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kicontheme.h>
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
index c160175be..6496c13fd 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
@@ -30,7 +30,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //
-// NOTE: HEAVILY copied from kfiledetailview.cpp...
+// NOTE: HEAVILY copied from tdefiledetailview.cpp...
 //
 //   Copyright (C) 1997 Stephan Kulow <coolo@kde.org>
 //                 2000, 2001 Carste
@@ -42,7 +42,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/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
index c4a0d26b1..e555dc7fd 100644
--- a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
@@ -34,10 +34,10 @@
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 
 namespace KFI
 {
diff --git a/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop b/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop
index dfdb9bad6..134e658c8 100644
--- a/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop
+++ b/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell kcmfontinst
+Exec=tdecmshell kcmfontinst
 Icon=fonts
 Type=Application
 DocPath=kcontrol/kcmfontinst/index.html
diff --git a/kcontrol/kfontinst/kfile-plugin/Makefile.am b/kcontrol/kfontinst/kfile-plugin/Makefile.am
deleted file mode 100644
index 7f136357f..000000000
--- a/kcontrol/kfontinst/kfile-plugin/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-kde_module_LTLIBRARIES = kfile_font.la
-
-kfile_font_la_SOURCES = KFileFont.cpp
-kfile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
-kfile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libkfontinst.la
-
-kdelnkdir = $(kde_servicesdir)
-kde_services_DATA = kfile_font.desktop
-
-AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS)
-
-METASOURCES = AUTO
-noinst_HEADERS = KFileFont.h
diff --git a/kcontrol/kfontinst/kfontinst/CMakeLists.txt b/kcontrol/kfontinst/kfontinst/CMakeLists.txt
index f288ca5ea..fdcb51b15 100644
--- a/kcontrol/kfontinst/kfontinst/CMakeLists.txt
+++ b/kcontrol/kfontinst/kfontinst/CMakeLists.txt
@@ -31,6 +31,6 @@ tde_add_executable( kfontinst
   SOURCES
     Main.cpp FontEngine.cpp Fontmap.cpp GetPid.c
     XConfig.cpp
-  LINK kxftconfig-static kfontinst-shared kio-shared
+  LINK kxftconfig-static kfontinst-shared tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp
index c7c03d107..4c28a1c33 100644
--- a/kcontrol/kfontinst/kio/KioFonts.cpp
+++ b/kcontrol/kfontinst/kio/KioFonts.cpp
@@ -44,11 +44,11 @@
 #include <sys/resource.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <kio/global.h>
-#include <kio/ioslave_defaults.h>
-#include <kio/netaccess.h>
-#include <kio/slaveinterface.h>
-#include <kio/connection.h>
+#include <tdeio/global.h>
+#include <tdeio/ioslave_defaults.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/slaveinterface.h>
+#include <tdeio/connection.h>
 #include <tqtextstream.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/kio/KioFonts.h
index 1de87f5f1..ec8c69c4e 100644
--- a/kcontrol/kfontinst/kio/KioFonts.h
+++ b/kcontrol/kfontinst/kio/KioFonts.h
@@ -31,7 +31,7 @@
 
 #include <fontconfig/fontconfig.h>
 #include <time.h>
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 #include <kurl.h>
 #include <klocale.h>
 #include <tqstring.h>
diff --git a/kcontrol/kfontinst/lib/CMakeLists.txt b/kcontrol/kfontinst/lib/CMakeLists.txt
index 989d60810..83f977aaa 100644
--- a/kcontrol/kfontinst/lib/CMakeLists.txt
+++ b/kcontrol/kfontinst/lib/CMakeLists.txt
@@ -28,6 +28,6 @@ link_directories(
 tde_add_library( kfontinst SHARED
   SOURCES Misc.cpp FcEngine.cpp
   VERSION 0.0.0
-  LINK kio-shared ${XFT_LIBRARIES}
+  LINK tdeio-shared ${XFT_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp
index 57fb765f1..6faf700c6 100644
--- a/kcontrol/kfontinst/lib/FcEngine.cpp
+++ b/kcontrol/kfontinst/lib/FcEngine.cpp
@@ -4,9 +4,9 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <math.h>
 #include "FcEngine.h"
 #include "KfiConstants.h"
diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp
index a2c150a08..5f39afec8 100644
--- a/kcontrol/kfontinst/lib/Misc.cpp
+++ b/kcontrol/kfontinst/lib/Misc.cpp
@@ -31,7 +31,7 @@
 #include <kprocess.h> 
 #include <kstandarddirs.h>
 #include <klargefile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <unistd.h>
 
 namespace KFI
diff --git a/kcontrol/kfontinst/kfile-plugin/CMakeLists.txt b/kcontrol/kfontinst/tdefile-plugin/CMakeLists.txt
similarity index 75%
rename from kcontrol/kfontinst/kfile-plugin/CMakeLists.txt
rename to kcontrol/kfontinst/tdefile-plugin/CMakeLists.txt
index 229c243d7..d12537903 100644
--- a/kcontrol/kfontinst/kfile-plugin/CMakeLists.txt
+++ b/kcontrol/kfontinst/tdefile-plugin/CMakeLists.txt
@@ -24,13 +24,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kfile_font.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_font.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kfile_font (module) #######################
+##### tdefile_font (module) #######################
 
-tde_add_kpart( kfile_font
+tde_add_kpart( tdefile_font
   SOURCES KFileFont.cpp
-  LINK kfontinst-shared kio-shared
+  LINK kfontinst-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/tdefile-plugin/KFileFont.cpp
similarity index 99%
rename from kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
rename to kcontrol/kfontinst/tdefile-plugin/KFileFont.cpp
index 46339fc4f..4ac55807f 100644
--- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
+++ b/kcontrol/kfontinst/tdefile-plugin/KFileFont.cpp
@@ -31,7 +31,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <kgenericfactory.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 static void addEntry(int face, TQString &existing, const TQString &add)
 {
@@ -260,7 +260,7 @@ static bool readAfm(const TQString &file, TQString &full, TQString &family, TQSt
 }   
 
 typedef KGenericFactory<KFI::KFileFontPlugin> KFileFontPluginFactory;
-K_EXPORT_COMPONENT_FACTORY(kfile_font, KFileFontPluginFactory("kfontinst"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_font, KFileFontPluginFactory("kfontinst"))
 
 namespace KFI
 {
diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.h b/kcontrol/kfontinst/tdefile-plugin/KFileFont.h
similarity index 98%
rename from kcontrol/kfontinst/kfile-plugin/KFileFont.h
rename to kcontrol/kfontinst/tdefile-plugin/KFileFont.h
index d33079e0b..a383d9a8e 100644
--- a/kcontrol/kfontinst/kfile-plugin/KFileFont.h
+++ b/kcontrol/kfontinst/tdefile-plugin/KFileFont.h
@@ -29,7 +29,7 @@
 // (C) Craig Drummond, 2003, 2004
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include "FcEngine.h"
 
 namespace KFI
diff --git a/kcontrol/kfontinst/tdefile-plugin/Makefile.am b/kcontrol/kfontinst/tdefile-plugin/Makefile.am
new file mode 100644
index 000000000..04ab41861
--- /dev/null
+++ b/kcontrol/kfontinst/tdefile-plugin/Makefile.am
@@ -0,0 +1,13 @@
+kde_module_LTLIBRARIES = tdefile_font.la
+
+tdefile_font_la_SOURCES = KFileFont.cpp
+tdefile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
+tdefile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libkfontinst.la
+
+kdelnkdir = $(kde_servicesdir)
+kde_services_DATA = tdefile_font.desktop
+
+AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS)
+
+METASOURCES = AUTO
+noinst_HEADERS = KFileFont.h
diff --git a/kcontrol/kfontinst/kfile-plugin/kfile_font.desktop b/kcontrol/kfontinst/tdefile-plugin/tdefile_font.desktop
similarity index 99%
rename from kcontrol/kfontinst/kfile-plugin/kfile_font.desktop
rename to kcontrol/kfontinst/tdefile-plugin/tdefile_font.desktop
index b18e51af7..20e502c59 100644
--- a/kcontrol/kfontinst/kfile-plugin/kfile_font.desktop
+++ b/kcontrol/kfontinst/tdefile-plugin/tdefile_font.desktop
@@ -80,7 +80,7 @@ Name[zh_CN]=字体信息
 Name[zh_TW]=字型資訊
 Name[zu]=Ulwazi lohlobo lwamagama
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_font
+X-TDE-Library=tdefile_font
 MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;application/x-font-otf;application/x-font-ttc;application/x-afm
 PreferredGroups=General
 PreferredItems=Full,Family,Foundry,Weight,Width,Spacing,Slant
diff --git a/kcontrol/kfontinst/thumbnail/FontThumbnail.h b/kcontrol/kfontinst/thumbnail/FontThumbnail.h
index 456e38b65..c902ce019 100644
--- a/kcontrol/kfontinst/thumbnail/FontThumbnail.h
+++ b/kcontrol/kfontinst/thumbnail/FontThumbnail.h
@@ -29,7 +29,7 @@
 // (C) Craig Drummond, 2003, 2004
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 #include "FcEngine.h"
 
 namespace KFI
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
index 1eeb2396c..6147363b9 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
@@ -44,7 +44,7 @@
 #include <tqsettings.h>
 #include <tqstringlist.h>
 #include <tqtimer.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kinstance.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
index f4b57bde0..6690cc44b 100644
--- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
@@ -33,8 +33,8 @@
 #include <klibloader.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 
 #define CFG_GROUP    "FontViewer Settings"
 #define CFG_SIZE_KEY "Window Size"
diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp
index 73fa16d5c..e6eb85cb0 100644
--- a/kcontrol/kicker/applettab_impl.cpp
+++ b/kcontrol/kicker/applettab_impl.cpp
@@ -27,7 +27,7 @@
 #include <tqvbox.h>
 #include <tqfileinfo.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdialog.h>
@@ -137,7 +137,7 @@ void AppletTab::load( bool useDefaults )
         }
     }
   else
-      l_trusted << "clockapplet" << "ksystemtrayapplet" << "krunapplet" << "quicklauncher"
+      l_trusted << "clockapplet" << "ksystemtrayapplet" << "krunapplet" << "quictdelauncher"
                 << "kminipagerapplet" << "ktaskbarapplet" << "eyesapplet" << "kmixapplet";
 
   for ( TQStringList::Iterator it = available.begin(); it != available.end(); ++it )
diff --git a/kcontrol/kicker/kicker_config.desktop b/kcontrol/kicker/kicker_config.desktop
index 6fce40452..f68d12082 100644
--- a/kcontrol/kicker/kicker_config.desktop
+++ b/kcontrol/kicker/kicker_config.desktop
@@ -2,7 +2,7 @@
 Icon=kcmkicker
 Type=Application
 DocPath=kcontrol/panel/index.html
-Exec=kcmshell panel
+Exec=tdecmshell panel
 
 
 X-TDE-Library=kicker
diff --git a/kcontrol/kicker/kicker_config_appearance.desktop b/kcontrol/kicker/kicker_config_appearance.desktop
index f177626a2..3becc6a76 100644
--- a/kcontrol/kicker/kicker_config_appearance.desktop
+++ b/kcontrol/kicker/kicker_config_appearance.desktop
@@ -2,7 +2,7 @@
 Icon=kcmkicker
 Type=Application
 DocPath=kcontrol/panel/index.html#panel-looknfeel
-Exec=kcmshell kicker_appearance
+Exec=tdecmshell kicker_appearance
 
 
 X-TDE-Library=kicker
diff --git a/kcontrol/kicker/kicker_config_arrangement.desktop b/kcontrol/kicker/kicker_config_arrangement.desktop
index 36ce3fa31..e9f6a5da4 100644
--- a/kcontrol/kicker/kicker_config_arrangement.desktop
+++ b/kcontrol/kicker/kicker_config_arrangement.desktop
@@ -2,7 +2,7 @@
 Icon=kcmkicker
 Type=Application
 DocPath=kcontrol/panel/index.html#panel-position
-Exec=kcmshell kicker_arrangement
+Exec=tdecmshell kicker_arrangement
 
 X-TDE-Library=kicker
 X-TDE-FactoryName=kicker_arrangement
diff --git a/kcontrol/kicker/kicker_config_hiding.desktop b/kcontrol/kicker/kicker_config_hiding.desktop
index b3dde5626..368142cc5 100644
--- a/kcontrol/kicker/kicker_config_hiding.desktop
+++ b/kcontrol/kicker/kicker_config_hiding.desktop
@@ -2,7 +2,7 @@
 Icon=kcmkicker
 Type=Application
 DocPath=kcontrol/panel/index.html#panel-hiding
-Exec=kcmshell kicker_hiding
+Exec=tdecmshell kicker_hiding
 
 X-TDE-Library=kicker
 X-TDE-FactoryName=kicker_hiding
diff --git a/kcontrol/kicker/kicker_config_menus.desktop b/kcontrol/kicker/kicker_config_menus.desktop
index 9a6bb64a2..4caf125f7 100644
--- a/kcontrol/kicker/kicker_config_menus.desktop
+++ b/kcontrol/kicker/kicker_config_menus.desktop
@@ -2,7 +2,7 @@
 Icon=kcmkicker
 Type=Application
 DocPath=kcontrol/panel/index.html#panel-menus
-Exec=kcmshell kicker_menus
+Exec=tdecmshell kicker_menus
 
 X-TDE-Library=kicker
 X-TDE-FactoryName=kicker_menus
diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp
index 4d063b54e..73367d24d 100644
--- a/kcontrol/kicker/lookandfeeltab_impl.cpp
+++ b/kcontrol/kicker/lookandfeeltab_impl.cpp
@@ -25,7 +25,7 @@
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconeffect.h>
 #include <kimageio.h>
 #include <klineedit.h>
diff --git a/kcontrol/kicker/main.h b/kcontrol/kicker/main.h
index 45364c366..06bf2ec03 100644
--- a/kcontrol/kicker/main.h
+++ b/kcontrol/kicker/main.h
@@ -19,7 +19,7 @@
 #define __main_h__
 
 #include <dcopobject.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "extensionInfo.h"
 
diff --git a/kcontrol/kicker/panel.desktop b/kcontrol/kicker/panel.desktop
index b21e5a540..57e5e86a3 100644
--- a/kcontrol/kicker/panel.desktop
+++ b/kcontrol/kicker/panel.desktop
@@ -2,7 +2,7 @@
 Icon=kcmkicker
 Type=Application
 DocPath=kcontrol/panel/index.html
-Exec=kcmshell panel
+Exec=tdecmshell panel
 
 
 X-TDE-Library=kicker
diff --git a/kcontrol/kio/CMakeLists.txt b/kcontrol/kio/CMakeLists.txt
index aa0d185e3..c807b075e 100644
--- a/kcontrol/kio/CMakeLists.txt
+++ b/kcontrol/kio/CMakeLists.txt
@@ -50,6 +50,6 @@ tde_add_kpart( kcm_kio AUTOMOC
       kproxydlg_ui.ui kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui
       policydlg_ui.ui useragentdlg_ui.ui uagentproviderdlg_ui.ui
       manualproxy_ui.ui envvarproxy_ui.ui cache_ui.ui
-  LINK kio-shared tdeutils-shared
+  LINK tdeio-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/kio/Makefile.am b/kcontrol/kio/Makefile.am
index 29f0cf30f..e2d8d7ae5 100644
--- a/kcontrol/kio/Makefile.am
+++ b/kcontrol/kio/Makefile.am
@@ -23,7 +23,7 @@ messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kcmkio.pot
 
 update_DATA = socks.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 servicetypes_DATA = uasprovider.desktop
 servicetypesdir = $(kde_servicetypesdir)
diff --git a/kcontrol/kio/cache.cpp b/kcontrol/kio/cache.cpp
index eab4e54dd..db831ca6f 100644
--- a/kcontrol/kio/cache.cpp
+++ b/kcontrol/kio/cache.cpp
@@ -33,7 +33,7 @@
 #include <knuminput.h>
 
 #include "ksaveioconfig.h"
-#include <kio/http_slave_defaults.h>
+#include <tdeio/http_slave_defaults.h>
 
 #include "cache.h"
 #include "cache_ui.h"
diff --git a/kcontrol/kio/cache.desktop b/kcontrol/kio/cache.desktop
index 315b0a450..affcb30bf 100644
--- a/kcontrol/kio/cache.desktop
+++ b/kcontrol/kio/cache.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/cache/index.html
 Icon=cache
-Exec=kcmshell cache
+Exec=tdecmshell cache
 
 
 X-TDE-Library=kio
diff --git a/kcontrol/kio/cookies.desktop b/kcontrol/kio/cookies.desktop
index 4bfae61e8..433be9a18 100644
--- a/kcontrol/kio/cookies.desktop
+++ b/kcontrol/kio/cookies.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/cookies/index.html
 Icon=cookie
-Exec=kcmshell cookies
+Exec=tdecmshell cookies
 
 
 X-TDE-Library=kio
diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/kio/kcookiespolicies.cpp
index 30f1859c4..ad32eef3e 100644
--- a/kcontrol/kio/kcookiespolicies.cpp
+++ b/kcontrol/kio/kcookiespolicies.cpp
@@ -38,7 +38,7 @@
 #include <klistview.h>
 #include <klistviewsearchline.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopref.h>
 
 #include "ksaveioconfig.h"
diff --git a/kcontrol/kio/kmanualproxydlg.cpp b/kcontrol/kio/kmanualproxydlg.cpp
index f240791c2..dd5dcfd16 100644
--- a/kcontrol/kio/kmanualproxydlg.cpp
+++ b/kcontrol/kio/kmanualproxydlg.cpp
@@ -36,7 +36,7 @@
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <kio/ioslave_defaults.h>
+#include <tdeio/ioslave_defaults.h>
 
 #include "manualproxy_ui.h"
 #include "kmanualproxydlg.h"
diff --git a/kcontrol/kio/ksaveioconfig.cpp b/kcontrol/kio/ksaveioconfig.cpp
index 63e444b3b..b624cfa69 100644
--- a/kcontrol/kio/ksaveioconfig.cpp
+++ b/kcontrol/kio/ksaveioconfig.cpp
@@ -18,11 +18,11 @@
 */
 
 #include <dcopref.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstaticdeleter.h>
-#include <kio/ioslave_defaults.h>
+#include <tdeio/ioslave_defaults.h>
 
 #include "ksaveioconfig.h"
 
@@ -57,7 +57,7 @@ TDEConfig* KSaveIOConfig::config()
      d = new KSaveIOConfigPrivate;
 
   if (!d->config)
-     d->config = new TDEConfig("kioslaverc", false, false);
+     d->config = new TDEConfig("tdeioslaverc", false, false);
 
   return d->config;
 }
diff --git a/kcontrol/kio/ksaveioconfig.h b/kcontrol/kio/ksaveioconfig.h
index 27df8c51d..f14e98e22 100644
--- a/kcontrol/kio/ksaveioconfig.h
+++ b/kcontrol/kio/ksaveioconfig.h
@@ -29,7 +29,7 @@ class KSaveIOConfig
 {
 public:
 
-  /* Reload config file (kioslaverc) */
+  /* Reload config file (tdeioslaverc) */
   static void reparseConfiguration();
 
 
diff --git a/kcontrol/kio/lanbrowser.desktop b/kcontrol/kio/lanbrowser.desktop
index b8ce5b10f..04e83e402 100644
--- a/kcontrol/kio/lanbrowser.desktop
+++ b/kcontrol/kio/lanbrowser.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Icon=samba
-Exec=kcmshell lanbrowser
+Exec=tdecmshell lanbrowser
 
 
 X-TDE-Library=kio
diff --git a/kcontrol/kio/netpref.cpp b/kcontrol/kio/netpref.cpp
index b5788c973..b5879d0bd 100644
--- a/kcontrol/kio/netpref.cpp
+++ b/kcontrol/kio/netpref.cpp
@@ -3,11 +3,11 @@
 #include <tqwhatsthis.h>
 #include <tqvgroupbox.h>
 
-#include <kio/ioslave_defaults.h>
+#include <tdeio/ioslave_defaults.h>
 #include <knuminput.h>
 #include <klocale.h>
 #include <kdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "ksaveioconfig.h"
 #include "netpref.h"
diff --git a/kcontrol/kio/netpref.desktop b/kcontrol/kio/netpref.desktop
index 62f95bd5e..22f51170b 100644
--- a/kcontrol/kio/netpref.desktop
+++ b/kcontrol/kio/netpref.desktop
@@ -75,7 +75,7 @@ Comment[xh]=Qwalasela iinketho zomsebenzi womnatha ka wonke-wonke, njengamaxabis
 Comment[zh_CN]=配置通用网络首选项，例如超时值
 Comment[zh_TW]=設定一般網路喜好設定，例如逾時值
 Comment[zu]=Hlanganisela okuncanyelwa uwonkewonke koxhumano olusazekile, njengamanani esikhathi sokuphuma
-Exec=kcmshell netpref
+Exec=tdecmshell netpref
 Icon=network
 Keywords=timeout,iopref,netpref,network preferences,ftp
 Keywords[be]=Тэрмін чакання,Уласцівасці сеткі,timeout,iopref,netpref,network preferences,ftp
diff --git a/kcontrol/kio/proxy.desktop b/kcontrol/kio/proxy.desktop
index 937753bdc..81325dd6d 100644
--- a/kcontrol/kio/proxy.desktop
+++ b/kcontrol/kio/proxy.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/proxy/index.html
 Icon=proxy
-Exec=kcmshell proxy
+Exec=tdecmshell proxy
 
 
 X-TDE-Library=kio
diff --git a/kcontrol/kio/smb.desktop b/kcontrol/kio/smb.desktop
index b00a6b213..0e9cd2863 100644
--- a/kcontrol/kio/smb.desktop
+++ b/kcontrol/kio/smb.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/smb/index.html
 Icon=samba
-Exec=kcmshell smb
+Exec=tdecmshell smb
 
 
 X-TDE-Library=kio
diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp
index 8ad181df6..9962555e7 100644
--- a/kcontrol/kio/smbrodlg.cpp
+++ b/kcontrol/kio/smbrodlg.cpp
@@ -23,7 +23,7 @@
 #include <tqtextcodec.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kcharsets.h>
 #include <kcombobox.h>
@@ -91,7 +91,7 @@ SMBRoOptions::~SMBRoOptions()
 
 void SMBRoOptions::load()
 {
-   TDEConfig *cfg = new TDEConfig("kioslaverc");
+   TDEConfig *cfg = new TDEConfig("tdeioslaverc");
 
    TQString tmp;
    cfg->setGroup( "Browser Settings/SMBro" );
@@ -124,7 +124,7 @@ void SMBRoOptions::load()
 
 void SMBRoOptions::save()
 {
-   TDEConfig *cfg = new TDEConfig("kioslaverc");
+   TDEConfig *cfg = new TDEConfig("tdeioslaverc");
 
    cfg->setGroup( "Browser Settings/SMBro" );
    cfg->writeEntry( "User", m_userLe->text());
diff --git a/kcontrol/kio/socks.cpp b/kcontrol/kio/socks.cpp
index ef77a93c3..50c5f8003 100644
--- a/kcontrol/kio/socks.cpp
+++ b/kcontrol/kio/socks.cpp
@@ -25,7 +25,7 @@
 #include <tqvbuttongroup.h>
 #include <tqcheckbox.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klistview.h>
 #include <kmessagebox.h>
 #include <ksocks.h>
diff --git a/kcontrol/kio/kioslave.kcfg b/kcontrol/kio/tdeioslave.kcfg
similarity index 100%
rename from kcontrol/kio/kioslave.kcfg
rename to kcontrol/kio/tdeioslave.kcfg
diff --git a/kcontrol/kio/kioslave.kcfgc b/kcontrol/kio/tdeioslave.kcfgc
similarity index 100%
rename from kcontrol/kio/kioslave.kcfgc
rename to kcontrol/kio/tdeioslave.kcfgc
diff --git a/kcontrol/kio/useragent.desktop b/kcontrol/kio/useragent.desktop
index 56ba4a0a4..200f7b883 100644
--- a/kcontrol/kio/useragent.desktop
+++ b/kcontrol/kio/useragent.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Icon=agent
-Exec=kcmshell useragent
+Exec=tdecmshell useragent
 DocPath=kcontrol/useragent/index.html
 
 
diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/kio/useragentdlg.cpp
index 29181f0a9..991200dd0 100644
--- a/kcontrol/kio/useragentdlg.cpp
+++ b/kcontrol/kio/useragentdlg.cpp
@@ -32,12 +32,12 @@
 #include <tqvbuttongroup.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
 #include <kmessagebox.h>
 #include <ksimpleconfig.h>
-#include <kio/http_slave_defaults.h>
+#include <tdeio/http_slave_defaults.h>
 
 #include "ksaveioconfig.h"
 #include "fakeuaprovider.h"
diff --git a/kcontrol/knotify/CMakeLists.txt b/kcontrol/knotify/CMakeLists.txt
index 1a5b81ca2..1072a389e 100644
--- a/kcontrol/knotify/CMakeLists.txt
+++ b/kcontrol/knotify/CMakeLists.txt
@@ -31,6 +31,6 @@ install( FILES play.png DESTINATION ${DATA_INSTALL_DIR}/kcontrol/pics )
 
 tde_add_kpart( kcm_knotify AUTOMOC
   SOURCES knotify.cpp playersettings.ui
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/knotify/kcmnotify.desktop b/kcontrol/knotify/kcmnotify.desktop
index 67b3c4e17..74aeb0cec 100644
--- a/kcontrol/knotify/kcmnotify.desktop
+++ b/kcontrol/knotify/kcmnotify.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell kcmnotify
+Exec=tdecmshell kcmnotify
 Icon=knotify
 Type=Application
 DocPath=kcontrol/kcmnotify/index.html
diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp
index f8e97e573..0f4d9fff7 100644
--- a/kcontrol/knotify/knotify.cpp
+++ b/kcontrol/knotify/knotify.cpp
@@ -29,7 +29,7 @@
 
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knotifydialog.h>
 #include <tdeparts/genericfactory.h>
 #include <kstandarddirs.h>
@@ -135,7 +135,7 @@ void KCMKNotify::slotAppActivated( const TQString& text )
 
 void KCMKNotify::slotPlayerSettings()
 {
-    // kcmshell is a modal dialog, and apparently, we can't put a non-modal
+    // tdecmshell is a modal dialog, and apparently, we can't put a non-modal
     // dialog besides a modal dialog. sigh.
     if ( !m_playerSettings )
         m_playerSettings = new PlayerSettingsDialog( this, true );
diff --git a/kcontrol/konq/CMakeLists.txt b/kcontrol/konq/CMakeLists.txt
index d7b12811f..3e99e5f27 100644
--- a/kcontrol/konq/CMakeLists.txt
+++ b/kcontrol/konq/CMakeLists.txt
@@ -45,6 +45,6 @@ tde_add_kpart( kcm_konq AUTOMOC
     behaviour.cpp desktop.cpp desktopbehavior_impl.cpp
     previews.cpp browser.cpp main.cpp rootopts.cpp
     fontopts.cpp  desktopbehavior.ui
-  LINK kio-shared tdeutils-shared
+  LINK tdeio-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/konq/Makefile.am b/kcontrol/konq/Makefile.am
index f9ef60055..2dddd9426 100644
--- a/kcontrol/konq/Makefile.am
+++ b/kcontrol/konq/Makefile.am
@@ -21,7 +21,7 @@ kcmkonq_datadir = $(kde_appsdir)/.hidden
 
 xdg_apps_DATA = desktopbehavior.desktop desktop.desktop desktoppath.desktop filebrowser.desktop
 
-uiserver_DIR = $(kde_includes)/kio
+uiserver_DIR = $(kde_includes)/tdeio
 
 EXTRA_DIST = $(kcm_konq_la_DATA) $(kcmkonq_data_DATA)
 
diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp
index 12bf6159c..70c6a1d1d 100644
--- a/kcontrol/konq/behaviour.cpp
+++ b/kcontrol/konq/behaviour.cpp
@@ -29,8 +29,8 @@
 #include <dcopclient.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
-#include <kio/uiserver_stub.h>
+#include <tdeconfig.h>
+#include <tdeio/uiserver_stub.h>
 #include <klocale.h>
 #include <konq_defaults.h>
 #include <kstandarddirs.h>
@@ -258,9 +258,9 @@ void KBehaviourOptions::save()
     config.writeEntry( "ShowList", cbListProgress->isChecked() );
     config.sync();
     // Tell the running server
-    if ( kapp->dcopClient()->isApplicationRegistered( "kio_uiserver" ) )
+    if ( kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
     {
-      UIServer_stub uiserver( "kio_uiserver", "UIServer" );
+      UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
       uiserver.setListMode( cbListProgress->isChecked() );
     }
 
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index 3b4bcb32a..93fecee08 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -31,7 +31,7 @@
 #include <kdialog.h>
 #include <klineedit.h>
 #include <knuminput.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <netwm.h>
 
diff --git a/kcontrol/konq/desktop.desktop b/kcontrol/konq/desktop.desktop
index 0fdb4a54f..e53afe11a 100644
--- a/kcontrol/konq/desktop.desktop
+++ b/kcontrol/konq/desktop.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/desktop/index.html#desktop-number
 Icon=desktop
-Exec=kcmshell desktop
+Exec=tdecmshell desktop
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konq/desktopbehavior.desktop b/kcontrol/konq/desktopbehavior.desktop
index bb34bc904..4f973bc46 100644
--- a/kcontrol/konq/desktopbehavior.desktop
+++ b/kcontrol/konq/desktopbehavior.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/desktopbehavior/index.html
 Icon=desktop
-Exec=kcmshell desktopbehavior
+Exec=tdecmshell desktopbehavior
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h
index 640d6a2c3..d04d82136 100644
--- a/kcontrol/konq/desktopbehavior_impl.h
+++ b/kcontrol/konq/desktopbehavior_impl.h
@@ -23,7 +23,7 @@
 
 #include "desktopbehavior.h"
 #include "tqlistview.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdecmodule.h>
 
 class DesktopBehavior : public DesktopBehaviorBase
diff --git a/kcontrol/konq/desktoppath.desktop b/kcontrol/konq/desktoppath.desktop
index d4f072f1c..f316f8841 100644
--- a/kcontrol/konq/desktoppath.desktop
+++ b/kcontrol/konq/desktoppath.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/desktop/index.html#desktop-desktop-path
 Icon=kfm
-Exec=kcmshell desktoppath
+Exec=tdecmshell desktoppath
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konq/fileappearance.desktop b/kcontrol/konq/fileappearance.desktop
index c2f74550e..b09e8380f 100644
--- a/kcontrol/konq/fileappearance.desktop
+++ b/kcontrol/konq/fileappearance.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/filemanager/index.html
 Icon=kfm
-Exec=kcmshell fileappearance
+Exec=tdecmshell fileappearance
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konq/filebehavior.desktop b/kcontrol/konq/filebehavior.desktop
index 1e1e0c19b..6a85a2e1e 100644
--- a/kcontrol/konq/filebehavior.desktop
+++ b/kcontrol/konq/filebehavior.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/filemanager/index.html
 Icon=kfm
-Exec=kcmshell filebehavior
+Exec=tdecmshell filebehavior
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konq/filebrowser.desktop b/kcontrol/konq/filebrowser.desktop
index 40e858e43..2f9520314 100644
--- a/kcontrol/konq/filebrowser.desktop
+++ b/kcontrol/konq/filebrowser.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/filemanager/index.html
 Icon=kfm
-Exec=kcmshell filebrowser
+Exec=tdecmshell filebrowser
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konq/filepreviews.desktop b/kcontrol/konq/filepreviews.desktop
index e113c147f..a83ce3601 100644
--- a/kcontrol/konq/filepreviews.desktop
+++ b/kcontrol/konq/filepreviews.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/filemanager/index.html
 Icon=kfm
-Exec=kcmshell filepreviews
+Exec=tdecmshell filepreviews
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index c1f610a46..e7c3fd9cf 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -28,7 +28,7 @@
 
 #include <kapplication.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kfontcombo.h>
 #include <kfontdialog.h>
diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp
index e57a84859..8e5afa965 100644
--- a/kcontrol/konq/main.cpp
+++ b/kcontrol/konq/main.cpp
@@ -30,7 +30,7 @@
 #include "browser.h"
 #include "desktopbehavior_impl.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 static TQCString configname()
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index 0a6521a67..d69333a7c 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -27,7 +27,7 @@
 #include <dcopclient.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
 #include <klistview.h>
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index a3234dba4..f2a15fd65 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -26,11 +26,11 @@
 #include <kapplication.h>
 #include <kcustommenueditor.h>
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobalsettings.h>
 #include <kipc.h>
 #include <klistview.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h
index 5fe1fe5c7..ec4510b1c 100644
--- a/kcontrol/konq/rootopts.h
+++ b/kcontrol/konq/rootopts.h
@@ -16,7 +16,7 @@
 #include <tqstring.h>
 
 #include <tdecmodule.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kurl.h>
 
 class TQCheckBox;
diff --git a/kcontrol/konq/webappearance.desktop b/kcontrol/konq/webappearance.desktop
index c2f74550e..b09e8380f 100644
--- a/kcontrol/konq/webappearance.desktop
+++ b/kcontrol/konq/webappearance.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/filemanager/index.html
 Icon=kfm
-Exec=kcmshell fileappearance
+Exec=tdecmshell fileappearance
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konq/webbehavior.desktop b/kcontrol/konq/webbehavior.desktop
index 2cfdef4ea..6c8aac9eb 100644
--- a/kcontrol/konq/webbehavior.desktop
+++ b/kcontrol/konq/webbehavior.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/filemanager/index.html
 Icon=kfm
-Exec=kcmshell filebehavior
+Exec=tdecmshell filebehavior
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp
index 0464f39bd..e76e6b9b2 100644
--- a/kcontrol/konqhtml/advancedTabDialog.cpp
+++ b/kcontrol/konqhtml/advancedTabDialog.cpp
@@ -28,7 +28,7 @@
 #include <dcopclient.h>
 #include <kcolorbutton.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "advancedTabDialog.h"
 #include "advancedTabOptions.h"
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index 163bdd4f4..617197eba 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -9,7 +9,7 @@
 
 #include <kapplication.h>
 #include <kcharsets.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kfontcombo.h>
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index b61abd99b..8bc8a3e50 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -23,7 +23,7 @@
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp
index 1bb71d4db..06eb9bee1 100644
--- a/kcontrol/konqhtml/filteropts.cpp
+++ b/kcontrol/konqhtml/filteropts.cpp
@@ -16,11 +16,11 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kaboutdata.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <dcopclient.h>
 
 #include <tqlayout.h>
diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h
index 5a582e68c..4e719d181 100644
--- a/kcontrol/konqhtml/htmlopts.h
+++ b/kcontrol/konqhtml/htmlopts.h
@@ -25,7 +25,7 @@
 
 
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdecmodule.h>
 class TQRadioButton;
 class KIntNumInput;
diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp
index e36743783..18baf833f 100644
--- a/kcontrol/konqhtml/jsopts.cpp
+++ b/kcontrol/konqhtml/jsopts.cpp
@@ -14,7 +14,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 #include <tqvgroupbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index c035c1857..84ce7dda0 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -25,7 +25,7 @@
 #include <tqradiobutton.h>
 #include <tqwhatsthis.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kcontrol/konqhtml/khttpoptdlg.h b/kcontrol/konqhtml/khttpoptdlg.h
index 3342f434b..d4e17af56 100644
--- a/kcontrol/konqhtml/khttpoptdlg.h
+++ b/kcontrol/konqhtml/khttpoptdlg.h
@@ -8,7 +8,7 @@
 #include <tqstring.h>
 
 #include <tdecmodule.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 /**
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index c8f9f760d..6be5c1972 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -17,7 +17,7 @@
 #include <dcopclient.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klistview.h>
 #include <klocale.h>
diff --git a/kcontrol/konqhtml/policies.cpp b/kcontrol/konqhtml/policies.cpp
index 0c1cd3bc5..1e1de227e 100644
--- a/kcontrol/konqhtml/policies.cpp
+++ b/kcontrol/konqhtml/policies.cpp
@@ -19,7 +19,7 @@
 
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "policies.h"
diff --git a/kcontrol/konqhtml/tdehtml_behavior.desktop b/kcontrol/konqhtml/tdehtml_behavior.desktop
index 01488fad4..8179247e4 100644
--- a/kcontrol/konqhtml/tdehtml_behavior.desktop
+++ b/kcontrol/konqhtml/tdehtml_behavior.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/tdehtml/index.html#kbrowse-html
 Icon=konqueror
-Exec=kcmshell tdehtml_behavior
+Exec=tdecmshell tdehtml_behavior
 
 
 X-TDE-Library=konqhtml
diff --git a/kcontrol/konqhtml/tdehtml_filter.desktop b/kcontrol/konqhtml/tdehtml_filter.desktop
index e23404714..b657c2e1f 100644
--- a/kcontrol/konqhtml/tdehtml_filter.desktop
+++ b/kcontrol/konqhtml/tdehtml_filter.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/tdehtml/index.html#tdehtml-adblock
 Icon=filter
-Exec=kcmshell tdehtml_filter
+Exec=tdecmshell tdehtml_filter
 
 X-TDE-Library=konqhtml
 X-TDE-FactoryName=tdehtml_filter
diff --git a/kcontrol/konqhtml/tdehtml_fonts.desktop b/kcontrol/konqhtml/tdehtml_fonts.desktop
index 341508848..e6fbfa342 100644
--- a/kcontrol/konqhtml/tdehtml_fonts.desktop
+++ b/kcontrol/konqhtml/tdehtml_fonts.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/tdehtml/index.html#kbrowse-appearance
 Icon=fonts
-Exec=kcmshell tdehtml_fonts
+Exec=tdecmshell tdehtml_fonts
 
 
 X-TDE-Library=konqhtml
diff --git a/kcontrol/konqhtml/tdehtml_java_js.desktop b/kcontrol/konqhtml/tdehtml_java_js.desktop
index e0477c0e6..409f7f313 100644
--- a/kcontrol/konqhtml/tdehtml_java_js.desktop
+++ b/kcontrol/konqhtml/tdehtml_java_js.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/tdehtml/index.html#kbrowse-java
 Icon=konqueror
-Exec=kcmshell tdehtml_java_js
+Exec=tdecmshell tdehtml_java_js
 
 
 X-TDE-Library=konqhtml
diff --git a/kcontrol/konsole/CMakeLists.txt b/kcontrol/konsole/CMakeLists.txt
index 34e2b0041..c7e2ea1ed 100644
--- a/kcontrol/konsole/CMakeLists.txt
+++ b/kcontrol/konsole/CMakeLists.txt
@@ -32,6 +32,6 @@ tde_add_kpart( kcm_konsole AUTOMOC
   SOURCES
     schemaeditor.cpp sessioneditor.cpp kcmkonsole.cpp
     schemadialog.ui sessiondialog.ui kcmkonsoledialog.ui
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 3d4e00bdd..6001c26d9 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -23,7 +23,7 @@
 #include <dcopclient.h>
 
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kfontdialog.h>
 #include <kgenericfactory.h>
@@ -154,7 +154,7 @@ void KCMKonsole::save()
     DCOPClient *dcc = kapp->dcopClient();
     dcc->send("konsole-*", "konsole", "reparseConfiguration()", TQByteArray());
     dcc->send("kdesktop", "default", "configure()", TQByteArray());
-    dcc->send("klauncher", "klauncher", "reparseConfiguration()", TQByteArray());
+    dcc->send("tdelauncher", "tdelauncher", "reparseConfiguration()", TQByteArray());
 
     if (xonXoffOrig != xonXoffNew)
     {
diff --git a/kcontrol/konsole/kcmkonsole.desktop b/kcontrol/konsole/kcmkonsole.desktop
index 2336d5e11..c387ec6e7 100644
--- a/kcontrol/konsole/kcmkonsole.desktop
+++ b/kcontrol/konsole/kcmkonsole.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=konsole
 Type=Application
-Exec=kcmshell kcmkonsole
+Exec=tdecmshell kcmkonsole
 DocPath=kcontrol/kcmkonsole/index.html
 
 X-TDE-Library=konsole
diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index f712c8c0d..7dd2bb19b 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -35,7 +35,7 @@
 
 #include <tqslider.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <tqtoolbutton.h>
 #include <kmessagebox.h>
diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp
index c9a767cac..d0f4f822a 100644
--- a/kcontrol/konsole/sessioneditor.cpp
+++ b/kcontrol/konsole/sessioneditor.cpp
@@ -24,7 +24,7 @@
 #include <kstandarddirs.h>
 
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <kicondialog.h>
 #include <kmessagebox.h>
diff --git a/kcontrol/krdb/CMakeLists.txt b/kcontrol/krdb/CMakeLists.txt
index 669875032..035505d98 100644
--- a/kcontrol/krdb/CMakeLists.txt
+++ b/kcontrol/krdb/CMakeLists.txt
@@ -27,7 +27,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kcmdisplayrc.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+install( FILES kcmdisplayrc.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
 
 
 ##### krdb (static) #############################
diff --git a/kcontrol/krdb/Makefile.am b/kcontrol/krdb/Makefile.am
index a478f2f83..db6dda987 100644
--- a/kcontrol/krdb/Makefile.am
+++ b/kcontrol/krdb/Makefile.am
@@ -12,4 +12,4 @@ messages:
 	$(XGETTEXT) *.cpp -o $(podir)/krdb.pot
 
 update_DATA = kcmdisplayrc.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index 72d9c1fe0..613816f84 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -30,7 +30,7 @@
 #include <dcopclient.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <kstandarddirs.h>
@@ -94,7 +94,7 @@ static void applyGtkStyles(bool active, int version)
    TQByteArray params;
    TQDataStream stream(params, IO_WriteOnly);
    stream << name << value;
-   kapp->dcopClient()->send("klauncher", "klauncher", "setLaunchEnv(TQCString,TQCString)", params);
+   kapp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
 }
 
 // -----------------------------------------------------------------------------
@@ -261,7 +261,7 @@ static void applyQtSettings( TDEConfig& kglobals, TQSettings& settings )
 
   /* ##### looks like kcmfonts skips this, so we don't do this here */
 /*bool usexft = kglobals.readBoolEntry("AntiAliasing", false);
-  kconfig.setGroup("General");
+  tdeconfig.setGroup("General");
   settings.writeEntry("/qt/enableXft", usexft);
   settings.writeEntry("/qt/useXft", usexft); */
 
diff --git a/kcontrol/kthememanager/CMakeLists.txt b/kcontrol/kthememanager/CMakeLists.txt
index 2d71a367e..b3d000aa5 100644
--- a/kcontrol/kthememanager/CMakeLists.txt
+++ b/kcontrol/kthememanager/CMakeLists.txt
@@ -33,6 +33,6 @@ tde_add_kpart( kcm_kthememanager AUTOMOC
   SOURCES
     kthemedlg.ui newthemewidget.ui knewthemedlg.cpp
     ktheme.cpp kthememanager.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index faf6feb9c..e516ddd41 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -28,13 +28,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdatastream.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <kipc.h>
 #include <klocale.h>
 #include <kservice.h>
diff --git a/kcontrol/kthememanager/kthemedlg.ui.h b/kcontrol/kthememanager/kthemedlg.ui.h
index 85d22cb9d..762de201d 100644
--- a/kcontrol/kthememanager/kthemedlg.ui.h
+++ b/kcontrol/kthememanager/kthemedlg.ui.h
@@ -16,34 +16,34 @@ void KThemeDlg::startKonqui( const TQString & url )
 
 void KThemeDlg::startBackground()
 {
-    KRun::runCommand("kcmshell kde-background");
+    KRun::runCommand("tdecmshell kde-background");
 }
 
 
 void KThemeDlg::startColors()
 {
-    KRun::runCommand("kcmshell kde-colors");
+    KRun::runCommand("tdecmshell kde-colors");
 }
 
 
 void KThemeDlg::startStyle()
 {
-    KRun::runCommand("kcmshell kde-style");
+    KRun::runCommand("tdecmshell kde-style");
 }
 
 
 void KThemeDlg::startIcons()
 {
-    KRun::runCommand("kcmshell kde-icons");
+    KRun::runCommand("tdecmshell kde-icons");
 }
 
 void KThemeDlg::startFonts()
 {
-   KRun::runCommand("kcmshell kde-fonts");
+   KRun::runCommand("tdecmshell kde-fonts");
 }
 
 
 void KThemeDlg::startSaver()
 {
-    KRun::runCommand("kcmshell kde-screensaver");
+    KRun::runCommand("tdecmshell kde-screensaver");
 }
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index 4a4817041..a72766837 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kemailsettings.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klistview.h>
diff --git a/kcontrol/kthememanager/kthememanager.desktop b/kcontrol/kthememanager/kthememanager.desktop
index 26a3ed3cd..07e6b69b1 100644
--- a/kcontrol/kthememanager/kthememanager.desktop
+++ b/kcontrol/kthememanager/kthememanager.desktop
@@ -66,7 +66,7 @@ Comment[vi]=Trình quản lý các sắc thái của TDE
 Comment[wa]=Manaedjî tinmes pol rivnance globåle di TDE
 Comment[zh_CN]=管理全局 TDE 视觉主题
 Comment[zh_TW]=管理全域 TDE 視覺佈景
-Exec=kcmshell kthememanager
+Exec=tdecmshell kthememanager
 Icon=kthememgr
 Keywords=themes,look and feel
 Keywords[af]=themes,look and feel,temas
diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp
index b1d209a24..c02101d54 100644
--- a/kcontrol/launch/kcmlaunch.cpp
+++ b/kcontrol/launch/kcmlaunch.cpp
@@ -25,7 +25,7 @@
 #include <dcopclient.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
 #include <knuminput.h>
diff --git a/kcontrol/launch/kcmlaunch.desktop b/kcontrol/launch/kcmlaunch.desktop
index 604b0701f..b60a45cf4 100644
--- a/kcontrol/launch/kcmlaunch.desktop
+++ b/kcontrol/launch/kcmlaunch.desktop
@@ -2,7 +2,7 @@
 Icon=launch
 Type=Application
 DocPath=kcontrol/kcmlaunch/index.html
-Exec=kcmshell kcmlaunch
+Exec=tdecmshell kcmlaunch
 
 
 X-TDE-Library=launch
diff --git a/kcontrol/locale/CMakeLists.txt b/kcontrol/locale/CMakeLists.txt
index c990ab669..c604cf551 100644
--- a/kcontrol/locale/CMakeLists.txt
+++ b/kcontrol/locale/CMakeLists.txt
@@ -33,6 +33,6 @@ tde_add_kpart( kcm_locale AUTOMOC
   SOURCES
     main.cpp toplevel.cpp kcmlocale.cpp klocalesample.cpp
     localenum.cpp localemon.cpp localetime.cpp localeother.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/locale/language.desktop b/kcontrol/locale/language.desktop
index dcd38c1de..55d6babde 100644
--- a/kcontrol/locale/language.desktop
+++ b/kcontrol/locale/language.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell language
+Exec=tdecmshell language
 Icon=locale
 Type=Application
 DocPath=kcontrol/language/index.html
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index 01e189fd4..e3a50847c 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -29,7 +29,7 @@
 #include <tqvgroupbox.h>
 
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kmessagebox.h>
diff --git a/kcontrol/nics/CMakeLists.txt b/kcontrol/nics/CMakeLists.txt
index 6d2c8e675..05ddf92a2 100644
--- a/kcontrol/nics/CMakeLists.txt
+++ b/kcontrol/nics/CMakeLists.txt
@@ -36,6 +36,6 @@ install( FILES nic.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_nic AUTOMOC
   SOURCES nic.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/nics/nic.desktop b/kcontrol/nics/nic.desktop
index 0d123c1b9..6ebfd7daa 100644
--- a/kcontrol/nics/nic.desktop
+++ b/kcontrol/nics/nic.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell nic
+Exec=tdecmshell nic
 Type=Application
 DocPath=kinfocenter/nics/index.html
 Icon=network
diff --git a/kcontrol/performance/kcmkonqyperformance.desktop b/kcontrol/performance/kcmkonqyperformance.desktop
index 3104b244f..413953776 100644
--- a/kcontrol/performance/kcmkonqyperformance.desktop
+++ b/kcontrol/performance/kcmkonqyperformance.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=launch
 Type=Application
-Exec=kcmshell kcmkonqyperformance
+Exec=tdecmshell kcmkonqyperformance
 
 
 X-TDE-Library=performance
diff --git a/kcontrol/performance/kcmperformance.desktop b/kcontrol/performance/kcmperformance.desktop
index 4b7eb3094..df51d96fc 100644
--- a/kcontrol/performance/kcmperformance.desktop
+++ b/kcontrol/performance/kcmperformance.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=launch
 Type=Application
-Exec=kcmshell kcmperformance
+Exec=tdecmshell kcmperformance
 
 
 X-TDE-Library=performance
diff --git a/kcontrol/performance/konqueror.cpp b/kcontrol/performance/konqueror.cpp
index 3c8bb6db3..46dd70774 100644
--- a/kcontrol/performance/konqueror.cpp
+++ b/kcontrol/performance/konqueror.cpp
@@ -19,7 +19,7 @@
 #include "konqueror.h"
 
 #include <dcopref.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqwhatsthis.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
diff --git a/kcontrol/performance/system.cpp b/kcontrol/performance/system.cpp
index 500178002..57d50ee14 100644
--- a/kcontrol/performance/system.cpp
+++ b/kcontrol/performance/system.cpp
@@ -18,7 +18,7 @@
 
 #include "system.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
@@ -49,9 +49,9 @@ SystemWidget::SystemWidget( TQWidget* parent_P )
               " handler will refuse to provide backtrace for the bugreport with this option"
               " turned on (you will need to reproduce it again with this option turned off,"
               " or turn on the developer mode for the crash handler).</p>" );
-    TQWhatsThis::add( cb_disable_kbuildsycoca, tmp );
-    TQWhatsThis::add( label_kbuildsycoca, tmp );
-    connect( cb_disable_kbuildsycoca, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
+    TQWhatsThis::add( cb_disable_tdebuildsycoca, tmp );
+    TQWhatsThis::add( label_tdebuildsycoca, tmp );
+    connect( cb_disable_tdebuildsycoca, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
     defaults();
     }
 
@@ -60,14 +60,14 @@ void SystemWidget::load(bool useDefaults )
     TDEConfig cfg( "kdedrc", true );
 	 cfg.setReadDefaults( useDefaults );
     cfg.setGroup( "General" );
-    cb_disable_kbuildsycoca->setChecked( cfg.readBoolEntry( "DelayedCheck", false ));
+    cb_disable_tdebuildsycoca->setChecked( cfg.readBoolEntry( "DelayedCheck", false ));
     }
 
 void SystemWidget::save()
     {
     TDEConfig cfg( "kdedrc" );
     cfg.setGroup( "General" );
-    cfg.writeEntry( "DelayedCheck", cb_disable_kbuildsycoca->isChecked());
+    cfg.writeEntry( "DelayedCheck", cb_disable_tdebuildsycoca->isChecked());
     }
 
 void SystemWidget::defaults()
diff --git a/kcontrol/performance/system_ui.ui b/kcontrol/performance/system_ui.ui
index 384ad2f86..878c73ddf 100644
--- a/kcontrol/performance/system_ui.ui
+++ b/kcontrol/performance/system_ui.ui
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQCheckBox">
                     <property name="name">
-                        <cstring>cb_disable_kbuildsycoca</cstring>
+                        <cstring>cb_disable_tdebuildsycoca</cstring>
                     </property>
                     <property name="text">
                         <string>Disable &amp;system configuration startup check</string>
@@ -37,7 +37,7 @@
                 </widget>
                 <widget class="TQLabel">
                     <property name="name">
-                        <cstring>label_kbuildsycoca</cstring>
+                        <cstring>label_tdebuildsycoca</cstring>
                     </property>
                     <property name="text">
                         <string>&lt;b&gt;WARNING:&lt;/b&gt; This option may in rare cases lead to various problems. Consult the What's This? (Shift+F1) help for details.</string>
diff --git a/kcontrol/privacy/CMakeLists.txt b/kcontrol/privacy/CMakeLists.txt
index 189202863..fe13ab4a7 100644
--- a/kcontrol/privacy/CMakeLists.txt
+++ b/kcontrol/privacy/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES privacy.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_privacy AUTOMOC
   SOURCES privacy.cpp kprivacysettings.ui kcmprivacydialog.ui kprivacymanager.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index e4433ff8f..9ec3a5647 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -21,7 +21,7 @@
 #include "kprivacymanager.h"
 #include <kapplication.h>
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kprocess.h>
 #include <kglobal.h>
diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp
index 6b54baac6..6f5d52c33 100644
--- a/kcontrol/privacy/privacy.cpp
+++ b/kcontrol/privacy/privacy.cpp
@@ -27,7 +27,7 @@
 #include <tqwhatsthis.h>
 
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
 #include <klistview.h>
diff --git a/kcontrol/privacy/privacy.desktop b/kcontrol/privacy/privacy.desktop
index 86c1c4b68..47a1474ef 100644
--- a/kcontrol/privacy/privacy.desktop
+++ b/kcontrol/privacy/privacy.desktop
@@ -66,7 +66,7 @@ Comment[vi]=Riêng tư - trình điều khiển giúp xoá các dấu vết mà
 Comment[wa]=Vikereye da vosse - on module di kcontrol po rnetyî les passêyes nén volowes ki l' uzeu leye sol sistinme
 Comment[zh_CN]=隐私 - 清除用户留在系统中痕迹的 kcontrol 模块
 Comment[zh_TW]=隱私權 - 一個控制模組用來清除使用者不希望留在系統中的痕跡
-Exec=kcmshell privacy
+Exec=tdecmshell privacy
 Keywords=Privacy,privacy
 Keywords[ar]=خصوصية، الخصوصية
 Keywords[az]=Gizlilik,gizlilik
diff --git a/kcontrol/randr/randr.desktop b/kcontrol/randr/randr.desktop
index 1bf7e6018..d550481be 100644
--- a/kcontrol/randr/randr.desktop
+++ b/kcontrol/randr/randr.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=randr
 Type=Application
-Exec=kcmshell randr
+Exec=tdecmshell randr
 X-TDE-Library=randr
 #X-TDE-Init=randr
 X-TDE-Test-Module=true
diff --git a/kcontrol/samba/CMakeLists.txt b/kcontrol/samba/CMakeLists.txt
index 1358e0d53..20a39f232 100644
--- a/kcontrol/samba/CMakeLists.txt
+++ b/kcontrol/samba/CMakeLists.txt
@@ -31,6 +31,6 @@ tde_add_kpart( kcm_samba AUTOMOC
   SOURCES
     main.cpp ksmbstatus.cpp kcmsambaimports.cpp kcmsambalog.cpp
     kcmsambastatistics.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/samba/kcmsambaimports.h b/kcontrol/samba/kcmsambaimports.h
index bad8ab2fd..0897af021 100644
--- a/kcontrol/samba/kcmsambaimports.h
+++ b/kcontrol/samba/kcmsambaimports.h
@@ -26,7 +26,7 @@
  
 #include <tqtimer.h>
 #include <tqlistview.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class ImportsView: public TQWidget
 {
diff --git a/kcontrol/samba/kcmsambalog.h b/kcontrol/samba/kcmsambalog.h
index 05f6c3040..c3c8c07ea 100644
--- a/kcontrol/samba/kcmsambalog.h
+++ b/kcontrol/samba/kcmsambalog.h
@@ -30,7 +30,7 @@
 #include <tqlistview.h>
 #include <tqevent.h>
 #include <tqapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kurlrequester.h>
 
diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h
index 2d6c10fba..f787293ae 100644
--- a/kcontrol/samba/ksmbstatus.h
+++ b/kcontrol/samba/ksmbstatus.h
@@ -24,7 +24,7 @@
 #include <kprocess.h>
 #include <tqcstring.h>
 #include <tqlistview.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #define SCREEN_XY_OFFSET 20
 
diff --git a/kcontrol/samba/smbstatus.desktop b/kcontrol/samba/smbstatus.desktop
index 19dfdb2fb..c4b32d115 100644
--- a/kcontrol/samba/smbstatus.desktop
+++ b/kcontrol/samba/smbstatus.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell smbstatus
+Exec=tdecmshell smbstatus
 Icon=samba
 Type=Application
 DocPath=kinfocenter/samba/index.html
diff --git a/kcontrol/screensaver/CMakeLists.txt b/kcontrol/screensaver/CMakeLists.txt
index 825418e4f..e57bc1eca 100644
--- a/kcontrol/screensaver/CMakeLists.txt
+++ b/kcontrol/screensaver/CMakeLists.txt
@@ -32,6 +32,6 @@ tde_add_kpart( kcm_screensaver AUTOMOC
     advanceddialogimpl.ui scrnsave.cpp testwin.cpp
     saverlist.cpp saverconfig.cpp advanceddialog.cpp
     kswidget.cpp
-  LINK kio-shared ${GL_LIBRARY}
+  LINK tdeio-shared ${GL_LIBRARY}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/screensaver/advanceddialog.h b/kcontrol/screensaver/advanceddialog.h
index 8322dd3e2..87ee03a31 100644
--- a/kcontrol/screensaver/advanceddialog.h
+++ b/kcontrol/screensaver/advanceddialog.h
@@ -3,7 +3,7 @@
 
 #include <kdialogbase.h>
 #include <tqwidget.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
diff --git a/kcontrol/screensaver/screensaver.desktop b/kcontrol/screensaver/screensaver.desktop
index 566a8c506..821a445b5 100644
--- a/kcontrol/screensaver/screensaver.desktop
+++ b/kcontrol/screensaver/screensaver.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell screensaver
+Exec=tdecmshell screensaver
 Icon=tdescreensaver
 Type=Application
 DocPath=kcontrol/screensaver/index.html
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index acc66880e..2105c34d0 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -32,7 +32,7 @@
 #include <kcarddb.h>
 #include <kcardfactory.h>
 #include <kcardgsm_impl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kglobal.h>
diff --git a/kcontrol/smartcard/smartcard.desktop b/kcontrol/smartcard/smartcard.desktop
index c347590e4..600aea709 100644
--- a/kcontrol/smartcard/smartcard.desktop
+++ b/kcontrol/smartcard/smartcard.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=identity
 Type=Application
-Exec=kcmshell smartcard
+Exec=tdecmshell smartcard
 DocPath=kcontrol/smartcard.html
 
 X-TDE-Library=smartcard
diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp
index 11c09baf7..38d47fa2c 100644
--- a/kcontrol/smserver/kcmsmserver.cpp
+++ b/kcontrol/smserver/kcmsmserver.cpp
@@ -26,7 +26,7 @@
 #include <dcopclient.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <klineedit.h>
 
diff --git a/kcontrol/smserver/kcmsmserver.desktop b/kcontrol/smserver/kcmsmserver.desktop
index 6ebee5632..9ee5ea88f 100644
--- a/kcontrol/smserver/kcmsmserver.desktop
+++ b/kcontrol/smserver/kcmsmserver.desktop
@@ -2,7 +2,7 @@
 Icon=exit
 Type=Application
 DocPath=kcontrol/kcmsmserver/index.html
-Exec=kcmshell kcmsmserver
+Exec=tdecmshell kcmsmserver
 
 
 X-TDE-Library=smserver
diff --git a/kcontrol/spellchecking/spellchecking.desktop b/kcontrol/spellchecking/spellchecking.desktop
index d761af90c..24b47ebea 100644
--- a/kcontrol/spellchecking/spellchecking.desktop
+++ b/kcontrol/spellchecking/spellchecking.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell spellchecking
+Exec=tdecmshell spellchecking
 Icon=spellcheck
 Type=Application
 DocPath=kcontrol/spellchecking/index.html
diff --git a/kcontrol/style/CMakeLists.txt b/kcontrol/style/CMakeLists.txt
index 26a9569ff..88f0927af 100644
--- a/kcontrol/style/CMakeLists.txt
+++ b/kcontrol/style/CMakeLists.txt
@@ -33,6 +33,6 @@ tde_add_kpart( kcm_style AUTOMOC
   SOURCES
     kcmstyle.cpp stylepreview.ui menupreview.cpp
     styleconfdialog.cpp
-  LINK krdb-static kio-shared
+  LINK krdb-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index f540d7e75..5c274d3cc 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -634,9 +634,9 @@ void KCMStyle::save()
 	if (m_bStyleDirty | m_bEffectsDirty)	// Export only if necessary
 	{
 		uint flags = KRdbExportQtSettings;
-		TDEConfig kconfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/);
-		kconfig.setGroup("X11");
-		bool exportKDEColors = kconfig.readBoolEntry("exportKDEColors", true);
+		TDEConfig tdeconfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/);
+		tdeconfig.setGroup("X11");
+		bool exportKDEColors = tdeconfig.readBoolEntry("exportKDEColors", true);
 		if (exportKDEColors)
 			flags |= KRdbExportColors;
 		runRdb( flags );
diff --git a/kcontrol/style/keramik/CMakeLists.txt b/kcontrol/style/keramik/CMakeLists.txt
index b68be1c2e..e03b85ef3 100644
--- a/kcontrol/style/keramik/CMakeLists.txt
+++ b/kcontrol/style/keramik/CMakeLists.txt
@@ -23,7 +23,7 @@ link_directories(
 ##### kstyle_keramik_config (module) ############
 
 tde_add_kpart( kstyle_keramik_config AUTOMOC
-  SOURCES keramikconf.cpp
+  SOURCES keramitdeconf.cpp
   LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/style/keramik/Makefile.am b/kcontrol/style/keramik/Makefile.am
index 56fbefa6b..78077b923 100644
--- a/kcontrol/style/keramik/Makefile.am
+++ b/kcontrol/style/keramik/Makefile.am
@@ -1,10 +1,10 @@
 INCLUDES = $(all_includes)
 
-noinst_HEADERS = keramikconf.h
+noinst_HEADERS = keramitdeconf.h
 kde_module_LTLIBRARIES = kstyle_keramik_config.la
 kstyle_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 kstyle_keramik_config_la_LIBADD  = $(LIB_TDEUI)
-kstyle_keramik_config_la_SOURCES = keramikconf.cpp
+kstyle_keramik_config_la_SOURCES = keramitdeconf.cpp
 METASOURCES = AUTO 
 
 
diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramitdeconf.cpp
similarity index 98%
rename from kcontrol/style/keramik/keramikconf.cpp
rename to kcontrol/style/keramik/keramitdeconf.cpp
index 3027106cd..742842876 100644
--- a/kcontrol/style/keramik/keramikconf.cpp
+++ b/kcontrol/style/keramik/keramitdeconf.cpp
@@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE.
 #include <kglobal.h>
 #include <klocale.h>
 
-#include "keramikconf.h"
+#include "keramitdeconf.h"
 
 extern "C"
 {
@@ -100,4 +100,4 @@ void KeramikStyleConfig::updateChanged()
 		emit changed(true);
 }
 
-#include "keramikconf.moc"
+#include "keramitdeconf.moc"
diff --git a/kcontrol/style/keramik/keramikconf.h b/kcontrol/style/keramik/keramitdeconf.h
similarity index 100%
rename from kcontrol/style/keramik/keramikconf.h
rename to kcontrol/style/keramik/keramitdeconf.h
diff --git a/kcontrol/style/style.desktop b/kcontrol/style/style.desktop
index 8786a7700..29d82d316 100644
--- a/kcontrol/style/style.desktop
+++ b/kcontrol/style/style.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell style
+Exec=tdecmshell style
 Icon=style
 Type=Application
 DocPath=kcontrol/kcmstyle/index.html
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index 2429b59bc..1aa7c5a17 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -28,7 +28,7 @@
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
 #include <twin.h>
diff --git a/kcontrol/taskbar/kcmtaskbar.desktop b/kcontrol/taskbar/kcmtaskbar.desktop
index 204b2e4ec..91d116d89 100644
--- a/kcontrol/taskbar/kcmtaskbar.desktop
+++ b/kcontrol/taskbar/kcmtaskbar.desktop
@@ -2,7 +2,7 @@
 Icon=kmenu
 Type=Application
 DocPath=kcontrol/kcmtaskbar/index.html
-Exec=kcmshell kcmtaskbar
+Exec=tdecmshell kcmtaskbar
 
 
 X-TDE-Library=taskbar
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index e549b38a1..0189c9e56 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -41,7 +41,7 @@
 #include <kcombobox.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
 #include <kimagefilepreview.h>
diff --git a/kcontrol/tdm/tdm-appear.h b/kcontrol/tdm/tdm-appear.h
index 8ae739c2f..8e0acc93d 100644
--- a/kcontrol/tdm/tdm-appear.h
+++ b/kcontrol/tdm/tdm-appear.h
@@ -29,7 +29,7 @@
 
 #include <kcolorbutton.h>
 #include <kurl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 
 #include "klanguagebutton.h"
diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp
index d2fbcf002..daa507a51 100644
--- a/kcontrol/tdm/tdm-users.cpp
+++ b/kcontrol/tdm/tdm-users.cpp
@@ -29,10 +29,10 @@
 #include <tqvgroupbox.h>
 #include <tqpushbutton.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kimageio.h>
 #include <kimagefilepreview.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
diff --git a/kcontrol/tdm/tdm.desktop b/kcontrol/tdm/tdm.desktop
index 0c1b9af1e..ad8591cb4 100644
--- a/kcontrol/tdm/tdm.desktop
+++ b/kcontrol/tdm/tdm.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell tdm
+Exec=tdecmshell tdm
 Icon=tdmconfig
 Type=Application
 DocPath=tdm/index.html#configuring-tdm
diff --git a/kcontrol/usbview/kcmusb.desktop b/kcontrol/usbview/kcmusb.desktop
index 2c3586b05..f8825b7f5 100644
--- a/kcontrol/usbview/kcmusb.desktop
+++ b/kcontrol/usbview/kcmusb.desktop
@@ -2,7 +2,7 @@
 Icon=usb
 Type=Application
 DocPath=kinfocenter/usb/index.html
-Exec=kcmshell kcmusb
+Exec=tdecmshell kcmusb
 
 X-TDE-Library=usb
 X-TDE-ParentApp=kinfocenter
diff --git a/kcontrol/view1394/kcmview1394.desktop b/kcontrol/view1394/kcmview1394.desktop
index 0b4a5bf34..61dfde6e2 100644
--- a/kcontrol/view1394/kcmview1394.desktop
+++ b/kcontrol/view1394/kcmview1394.desktop
@@ -2,7 +2,7 @@
 Icon=ieee1394
 Type=Application
 DocPath=kinfocenter/view1394/index.html
-Exec=kcmshell kcmview1394
+Exec=tdecmshell kcmview1394
 
 X-TDE-Library=view1394
 X-TDE-ParentApp=kinfocenter
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp
index 9d1819223..e86689f2d 100644
--- a/kcontrol/xinerama/kcmxinerama.cpp
+++ b/kcontrol/xinerama/kcmxinerama.cpp
@@ -23,7 +23,7 @@
 #include <dcopclient.h>
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/kcontrol/xinerama/xinerama.desktop b/kcontrol/xinerama/xinerama.desktop
index c561d7f9d..1fc8b0774 100644
--- a/kcontrol/xinerama/xinerama.desktop
+++ b/kcontrol/xinerama/xinerama.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=identity
 Type=Application
-Exec=kcmshell xinerama
+Exec=tdecmshell xinerama
 DocPath=kcontrol/multiplemonitors.html
 
 X-TDE-Library=xinerama
diff --git a/kdcop/CMakeLists.txt b/kdcop/CMakeLists.txt
index c0b33e5b7..70f19988b 100644
--- a/kdcop/CMakeLists.txt
+++ b/kdcop/CMakeLists.txt
@@ -31,6 +31,6 @@ install( FILES kdcopui.rc DESTINATION ${DATA_INSTALL_DIR}/kdcop )
 tde_add_executable( kdcop AUTOMOC
   SOURCES
     kdcop.cpp kdcopwindow.cpp kdcoplistview.cpp kdcopview.ui
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdebugdialog/kabstractdebugdialog.cpp b/kdebugdialog/kabstractdebugdialog.cpp
index cc91d2056..6901d8f68 100644
--- a/kdebugdialog/kabstractdebugdialog.cpp
+++ b/kdebugdialog/kabstractdebugdialog.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "kabstractdebugdialog.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpushbutton.h>
 #include <tqlayout.h>
 #include <kapplication.h>
diff --git a/kdebugdialog/kdebugdialog.cpp b/kdebugdialog/kdebugdialog.cpp
index 91523de6f..cb15c2b98 100644
--- a/kdebugdialog/kdebugdialog.cpp
+++ b/kdebugdialog/kdebugdialog.cpp
@@ -33,7 +33,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kseparator.h>
 #include <kapplication.h>
 #include <dcopclient.h>
diff --git a/kdebugdialog/klistdebugdialog.cpp b/kdebugdialog/klistdebugdialog.cpp
index 7ddb2b559..376f8d7d9 100644
--- a/kdebugdialog/klistdebugdialog.cpp
+++ b/kdebugdialog/klistdebugdialog.cpp
@@ -19,7 +19,7 @@
 
 
 #include "klistdebugdialog.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tqlayout.h>
diff --git a/kdebugdialog/main.cpp b/kdebugdialog/main.cpp
index fbaa54f3e..5f36b77cc 100644
--- a/kdebugdialog/main.cpp
+++ b/kdebugdialog/main.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kuniqueapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqfile.h>
 
diff --git a/kdepasswd/CMakeLists.txt b/kdepasswd/CMakeLists.txt
index a087113da..887362b28 100644
--- a/kdepasswd/CMakeLists.txt
+++ b/kdepasswd/CMakeLists.txt
@@ -32,6 +32,6 @@ install( FILES kdepasswd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_executable( kdepasswd AUTOMOC
   SOURCES kdepasswd.cpp passwd.cpp passwddlg.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdepasswd/kcm/chfacedlg.cpp b/kdepasswd/kcm/chfacedlg.cpp
index 512b7e55f..baafd651e 100644
--- a/kdepasswd/kcm/chfacedlg.cpp
+++ b/kdepasswd/kcm/chfacedlg.cpp
@@ -36,7 +36,7 @@
 
 #include <kdialogbase.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconview.h>
 #include <kimagefilepreview.h>
 #include <kimageio.h>
diff --git a/kdepasswd/kcm/kcm_useraccount.desktop b/kdepasswd/kcm/kcm_useraccount.desktop
index 6171810a3..51c168bd5 100644
--- a/kdepasswd/kcm/kcm_useraccount.desktop
+++ b/kdepasswd/kcm/kcm_useraccount.desktop
@@ -4,7 +4,7 @@ Categories=Qt;TDE;X-TDE-settings-security;
 X-TDE-ParentApp=kcontrol
 X-TDE-Library=useraccount
 Type=Application
-Exec=kcmshell kcm_useraccount
+Exec=tdecmshell kcm_useraccount
 Name=Password & User Account
 Name[af]=Gebruiker rekening en Wagwoord
 Name[ar]=كلمة المرور و حساب المستخدم
diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp
index bc763243d..e8135caae 100644
--- a/kdepasswd/kcm/main.cpp
+++ b/kdepasswd/kcm/main.cpp
@@ -42,7 +42,7 @@
 #include <kgenericfactory.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurl.h>
 #include <kurldrag.h>
 
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index b9751944b..968cdcc31 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -85,7 +85,7 @@ set( ${target}_SRCS
   pixmapserver.cc kcustommenu.cc startupid.cpp minicli_ui.ui
   xautolock_diy.c xautolock_engine.c kshadowengine.cpp
   kshadowsettings.cpp kdesktopshadowsettings.cpp
-  kfileividesktop.cpp kdesktopapp.cpp
+  tdefileividesktop.cpp kdesktopapp.cpp
 )
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
diff --git a/kdesktop/ConfigureChecks.cmake b/kdesktop/ConfigureChecks.cmake
index 9e59185a4..87e2213ce 100644
--- a/kdesktop/ConfigureChecks.cmake
+++ b/kdesktop/ConfigureChecks.cmake
@@ -14,10 +14,3 @@
 if( WITH_PAM AND (NOT DEFINED KSCREENSAVER_PAM_SERVICE) )
   set( KSCREENSAVER_PAM_SERVICE "kde" CACHE INTERNAL "" )
 endif( )
-
-if( WITH_KDESKTOP_LOCK_BACKTRACE )
-  check_include_files( "bfd.h;demangle.h;libiberty.h" HAVE_BINUTILS_DEV )
-  if( NOT HAVE_BINUTILS_DEV )
-    tde_message_fatal( "binutils-dev are required, but not found on your system" )
-  endif( )
-endif( )
diff --git a/kdesktop/DESIGN b/kdesktop/DESIGN
index f13a7b2f5..f69ee2198 100644
--- a/kdesktop/DESIGN
+++ b/kdesktop/DESIGN
@@ -37,8 +37,8 @@ lock* : screen saver/locker
 Libs used by KDesktop
 ======================
  
-tdecore, tdeui, kfile  - usual stuff :)
-libkio - I/O stuff, mimetypes, services, registry
+tdecore, tdeui, tdefile  - usual stuff :)
+libtdeio - I/O stuff, mimetypes, services, registry
 libkonq - properties dialog, templates ("new") menu, dir lister, settings
 
 Screensaver
diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am
index 1b4927db6..f363ac17e 100644
--- a/kdesktop/Makefile.am
+++ b/kdesktop/Makefile.am
@@ -23,7 +23,7 @@ kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \
 	minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \
 	startupid.cpp minicli_ui.ui xautolock_diy.c xautolock_engine.c \
 	kshadowengine.cpp kshadowsettings.cpp \
-	kdesktopshadowsettings.cpp kfileividesktop.cpp \
+	kdesktopshadowsettings.cpp tdefileividesktop.cpp \
 	kdesktopapp.cpp
 
 include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h
diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc
index e15c6aabe..cc7838b42 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cc
@@ -22,7 +22,7 @@
 #include <tqscrollview.h>
 
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <twin.h>
 #include <kapplication.h>
 #include <kdebug.h>
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index 073a69a5a..07fbaf5cd 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -33,7 +33,7 @@
 #include <kcolordrag.h>
 #include <kurldrag.h>
 #include <stdlib.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqfile.h>
 
 #include <tqdir.h>
@@ -49,7 +49,7 @@
 #include <kinputdialog.h>
 #include <kipc.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kprocess.h>
 #include <tdesycoca.h>
 #include <ktempfile.h>
diff --git a/kdesktop/init.cc b/kdesktop/init.cc
index cf45c71d4..e9c805bfe 100644
--- a/kdesktop/init.cc
+++ b/kdesktop/init.cc
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
 #include <kglobalsettings.h>
diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cc
index b32c77096..a0bf92556 100644
--- a/kdesktop/kcustommenu.cc
+++ b/kdesktop/kcustommenu.cc
@@ -20,7 +20,7 @@
 #include <tqimage.h>
 #include <tqregexp.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 
diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index 6fee5d5c4..bbb495989 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -65,7 +65,7 @@
       <label>Sort directories first</label>
       <whatsthis></whatsthis>
       <!-- krootwm.cc:251 -->
-      <!--         aSortDirsFirst->setChecked( kconfig->readBoolEntry("SortDirectoriesFirst", true)); -->
+      <!--         aSortDirsFirst->setChecked( tdeconfig->readBoolEntry("SortDirectoriesFirst", true)); -->
       <!-- krootwm.cc:496 -->
       <!--     config->writeEntry( "SortDirectoriesFirst", b ); -->
     </entry>
diff --git a/kdesktop/kdesktopshadowsettings.h b/kdesktop/kdesktopshadowsettings.h
index 7e421c6d6..c7e73db71 100644
--- a/kdesktop/kdesktopshadowsettings.h
+++ b/kdesktop/kdesktopshadowsettings.h
@@ -25,7 +25,7 @@
 
 #include <tqcolor.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kshadowsettings.h>
 
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index ad049256d..57287014a 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -22,7 +22,7 @@
 #include "desktop.h"
 #include "kdesktopsettings.h"
 
-#include <kio/paste.h>
+#include <tdeio/paste.h>
 #include <kaccel.h>
 #include <kapplication.h>
 #include <kcolordrag.h>
@@ -57,7 +57,7 @@
 
 #include "kshadowengine.h"
 #include "kdesktopshadowsettings.h"
-#include "kfileividesktop.h"
+#include "tdefileividesktop.h"
 
 // for multihead
 extern int kdesktop_screen_number;
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index f951765ba..c9feecaf7 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -24,7 +24,7 @@
 
 #include <konq_iconviewwidget.h>
 #include <kaction.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdirnotify.h>
 #include <kmessagebox.h>
 
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 08db2eb95..a263b529c 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -36,7 +36,7 @@
 #include <kstandarddirs.h>
 #include <kpopupmenu.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcmultidialog.h>
 #include <kbookmarkmenu.h>
 #include <konqbookmarkmanager.h>
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index ff60d0fd6..661d644a6 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -22,13 +22,13 @@
 #include <config.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <kurifilter.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tqscrollview.h>
 #include "kwebdesktop.h"
diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp
index 05c5f4ef2..4433ef367 100644
--- a/kdesktop/kxdglauncher.cpp
+++ b/kdesktop/kxdglauncher.cpp
@@ -30,7 +30,7 @@
 #include <kglobalsettings.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <stdlib.h>
 
diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt
index e847cf1fc..80c2b2cdb 100644
--- a/kdesktop/lock/CMakeLists.txt
+++ b/kdesktop/lock/CMakeLists.txt
@@ -32,16 +32,11 @@ set( target kdesktop_lock )
 
 set( ${target}_SRCS
   lockprocess.cc lockdlg.cc infodlg.cc querydlg.cc sakdlg.cc
-  securedlg.cc autologout.cc main.cc
+  securedlg.cc autologout.cc main.cc backtrace_symbols.c
 )
 
-if( WITH_KDESKTOP_LOCK_BACKTRACE )
-  list( APPEND ${target}_SRCS backtrace_symbols.c )
-  set( BACKTRACE_LIBRARY bfd )
-endif( )
-
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kdesktopsettings-static dmctl-static kio-shared Xext ${BACKTRACE_LIBRARY} ${GL_LIBRARY} "${LINKER_IMMEDIATE_BINDING_FLAGS}"
+  LINK kdesktopsettings-static dmctl-static tdeio-shared Xext bfd ${GL_LIBRARY} "${LINKER_IMMEDIATE_BINDING_FLAGS}"
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc
index 024425d2c..ef683cbcc 100644
--- a/kdesktop/lock/autologout.cc
+++ b/kdesktop/lock/autologout.cc
@@ -10,7 +10,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <dcopref.h>
diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc
index 725122134..56ee83e38 100644
--- a/kdesktop/lock/infodlg.cc
+++ b/kdesktop/lock/infodlg.cc
@@ -16,7 +16,7 @@
 #include <kseparator.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
 #include <kpassdlg.h>
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 29dc8bd9c..2684403a5 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -21,7 +21,7 @@
 #include <kseparator.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
 #include <kpassdlg.h>
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 5f01274a8..a3f5fb56f 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -137,7 +137,6 @@ static Atom   gXA_SCREENSAVER_VERSION;
 
 void print_trace()
 {
-#ifdef WITH_KDESKTOP_LOCK_BACKTRACE
 	void *array[10];
 	size_t size;
 	char **strings;
@@ -153,7 +152,6 @@ void print_trace()
 	}
 
 	free (strings);
-#endif
 }
 
 static void segv_handler(int)
diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc
index 401370b21..acac92127 100644
--- a/kdesktop/lock/querydlg.cc
+++ b/kdesktop/lock/querydlg.cc
@@ -16,7 +16,7 @@
 #include <kseparator.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
 #include <kpassdlg.h>
diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc
index 6f983ce70..4904e71e1 100644
--- a/kdesktop/lock/sakdlg.cc
+++ b/kdesktop/lock/sakdlg.cc
@@ -16,7 +16,7 @@
 #include <kseparator.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
 #include <kpassdlg.h>
diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cc
index 08a70a17d..79147ae0a 100644
--- a/kdesktop/lock/securedlg.cc
+++ b/kdesktop/lock/securedlg.cc
@@ -16,7 +16,7 @@
 #include <kseparator.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
 #include <kpassdlg.h>
diff --git a/kdesktop/main.cc b/kdesktop/main.cc
index 17fc4addf..9f549e54a 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cc
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmanagerselection.h>
 
 #include "desktop.h"
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index dca215de3..6f940a5b2 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -60,7 +60,7 @@
 #include <twin.h>
 #include <tdesu/su.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kguiitem.h>
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 36d566e31..6603e7b7b 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -27,7 +27,7 @@
 #include <kapplication.h>
 #include <tqimage.h>
 #include <tqbitmap.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <X11/Xlib.h>
 
 #define KDE_STARTUP_ICON "kmenu"
diff --git a/kdesktop/kfileividesktop.cpp b/kdesktop/tdefileividesktop.cpp
similarity index 99%
rename from kdesktop/kfileividesktop.cpp
rename to kdesktop/tdefileividesktop.cpp
index 90dc69327..420aeac4f 100644
--- a/kdesktop/kfileividesktop.cpp
+++ b/kdesktop/tdefileividesktop.cpp
@@ -35,7 +35,7 @@
 
 #include <kshadowengine.h>
 #include "kdesktopshadowsettings.h"
-#include "kfileividesktop.h"
+#include "tdefileividesktop.h"
 
 //#define DEBUG
 
diff --git a/kdesktop/kfileividesktop.h b/kdesktop/tdefileividesktop.h
similarity index 99%
rename from kdesktop/kfileividesktop.h
rename to kdesktop/tdefileividesktop.h
index 129abec07..8dd0f1fc4 100644
--- a/kdesktop/kfileividesktop.h
+++ b/kdesktop/tdefileividesktop.h
@@ -28,7 +28,7 @@
 #include <tqpixmap.h>
 #include <tqimage.h>
 #include <tqstring.h>
-#include <kfileivi.h>
+#include <tdefileivi.h>
 
 /*
  * The dither flags used to display the shadow image
diff --git a/kdialog/CMakeLists.txt b/kdialog/CMakeLists.txt
index 28bcc8389..2ec728f66 100644
--- a/kdialog/CMakeLists.txt
+++ b/kdialog/CMakeLists.txt
@@ -26,6 +26,6 @@ tde_add_executable( kdialog AUTOMOC
   SOURCES
     kdialog.cpp widgets.cpp klistboxdialog.cpp
     progressdialog.cpp progressdialogiface.skel
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index 1c18a9ce3..a482a2c15 100644
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@@ -44,7 +44,7 @@
 #include <tqdialog.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kicondialog.h>
 #include <kdirselectdialog.h>
 
diff --git a/kfind/ChangeLog b/kfind/ChangeLog
index 9d8ae06b7..61359c8a5 100644
--- a/kfind/ChangeLog
+++ b/kfind/ChangeLog
@@ -1,7 +1,7 @@
 Fri Jul 30 22:33:25 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 	* kfwin.cpp, kfwin.h: The listview items show a mini-pixmap, like those
-	in kfiledialog. For now, they're static icons (only folder and document
+	in tdefiledialog. For now, they're static icons (only folder and document
 	icons), maybe we can show the correct icons for the mimetypes, later.
 
 	Also introduced drag-support, you can drag files from the list.
diff --git a/kfind/kfind.h b/kfind/kfind.h
index 3919080e9..fda0028ca 100644
--- a/kfind/kfind.h
+++ b/kfind/kfind.h
@@ -8,7 +8,7 @@
 #define KFIND_H
 
 #include <tqwidget.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdirlister.h>
 
 class TQString;
diff --git a/kfind/kfindpart.h b/kfind/kfindpart.h
index fe343879a..c0bf8b825 100644
--- a/kfind/kfindpart.h
+++ b/kfind/kfindpart.h
@@ -22,7 +22,7 @@
 
 #include <tdeparts/browserextension.h>
 #include <tdeparts/part.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdebug.h>
 #include <tqptrlist.h>
 #include <konq_dirpart.h>
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index 6145e18c1..fa86a1240 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -22,7 +22,7 @@
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kregexpeditorinterface.h>
 #include <tdeparts/componentfactory.h>
 #include <kstandarddirs.h>
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index d0f7fb513..6cbbe1268 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -21,7 +21,7 @@
 #include <tqpixmap.h>
 #include <tqdragobject.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kapplication.h>
 #include <krun.h>
@@ -32,7 +32,7 @@
 #include <kmimetype.h>
 #include <kglobal.h>
 #include <kpopupmenu.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurldrag.h>
 #include <tqptrlist.h>
 #include <kdebug.h>
diff --git a/kfind/kfwin.h b/kfind/kfwin.h
index 4ff7041ff..ded6a0631 100644
--- a/kfind/kfwin.h
+++ b/kfind/kfwin.h
@@ -8,7 +8,7 @@
 #define KFWIN_H
 
 #include <klistview.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kurl.h>
 
 class KfArchiver;
diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp
index b889e3ba9..6ea5e467b 100644
--- a/kfind/kquery.cpp
+++ b/kfind/kquery.cpp
@@ -2,8 +2,8 @@
 
 #include <tqfileinfo.h>
 #include <kdebug.h>
-#include <kfileitem.h>
-#include <kfilemetainfo.h>
+#include <tdefileitem.h>
+#include <tdefilemetainfo.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/kfind/kquery.h b/kfind/kquery.h
index 4b6a1c898..3388dabac 100644
--- a/kfind/kquery.h
+++ b/kfind/kquery.h
@@ -9,7 +9,7 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 #include <kprocess.h>
 
diff --git a/khelpcenter/README.metadata b/khelpcenter/README.metadata
index 5b02e313d..c0149c8e5 100644
--- a/khelpcenter/README.metadata
+++ b/khelpcenter/README.metadata
@@ -30,7 +30,7 @@ Icon                        string    Name of icon for document
 DocPath                     URI       Location of document. In addition to the
                                       standard URI schemes like http: and file:
                                       all schemes which are supported through
-                                      kioslaves can be used. In particular the
+                                      tdeioslaves can be used. In particular the
                                       following non-standard URI schemes are
                                       supported:
                                       help:  KDE manual identified by app name
@@ -91,7 +91,7 @@ X-TDE-KHelpcenter           string    If this entry is set to one of the
                                       'kinfocenter'  kinfocenter docs
                                       'kcontrol'     kcontrol module docs
                                       'konqueror'    konqueror plugin docs
-                                      'kioslave'     kioslave docs
+                                      'tdeioslave'     tdeioslave docs
                                       'info'         info pages
 X-DOC-DocumentType          string    Type of document. The type is used to look
                                       up corresponding search handlers.
diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index e20ec598e..ebaead73f 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -22,7 +22,7 @@
 #include <kapplication.h>
 #include <kcharsets.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kfontcombo.h>
 #include <tdehtmldefaults.h>
 #include <klocale.h>
diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp
index 9b35c4b09..a59fc5345 100644
--- a/khelpcenter/formatter.cpp
+++ b/khelpcenter/formatter.cpp
@@ -23,7 +23,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include <tqfile.h>
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index 8a406230a..a2c0b0990 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -21,7 +21,7 @@
 #include "view.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/khelpcenter/htmlsearch.cpp b/khelpcenter/htmlsearch.cpp
index f82516479..72eaa432d 100644
--- a/khelpcenter/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch.cpp
@@ -1,5 +1,5 @@
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "docentry.h"
 
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index a0f79c270..105914733 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -7,7 +7,7 @@
 #include <kstandarddirs.h>
 #include <kprocess.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 #include "progressdialog.h"
diff --git a/khelpcenter/htmlsearch/htmlsearch.desktop b/khelpcenter/htmlsearch/htmlsearch.desktop
index 557ba0cf8..e70b40a96 100644
--- a/khelpcenter/htmlsearch/htmlsearch.desktop
+++ b/khelpcenter/htmlsearch/htmlsearch.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell htmlsearch
+Exec=tdecmshell htmlsearch
 Icon=help_index
 Type=Application
 DocPath=kcontrol/help-index.html
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 0fdfde831..7846c3493 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -25,7 +25,7 @@
 #include <kapplication.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprocess.h>
 #include "klangcombo.h"
 #include <kurlrequester.h>
diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp
index a02538543..da0de3ae4 100644
--- a/khelpcenter/htmlsearchconfig.cpp
+++ b/khelpcenter/htmlsearchconfig.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kurllabel.h>
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 
diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp
index 91dcb535a..0e8e5875b 100644
--- a/khelpcenter/infotree.cpp
+++ b/khelpcenter/infotree.cpp
@@ -24,7 +24,7 @@
 #include "docentry.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klistview.h>
@@ -98,7 +98,7 @@ void InfoTree::build( NavigatorItem *parent )
   TDEConfig *cfg = kapp->config();
   cfg->setGroup( "Info pages" );
   TQStringList infoDirFiles = cfg->readListEntry( "Search paths" );
-  // Default paths taken fron tdebase/kioslave/info/kde-info2html.conf
+  // Default paths taken fron tdebase/tdeioslave/info/kde-info2html.conf
   if ( infoDirFiles.isEmpty() ) { 
     infoDirFiles << "/usr/share/info";
     infoDirFiles << "/usr/info";
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index c01d8f3c3..74f29c434 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -26,7 +26,7 @@
 #include "searchhandler.h"
 #include "searchengine.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
diff --git a/khelpcenter/kcmhelpcenter.desktop b/khelpcenter/kcmhelpcenter.desktop
index 2767ae615..1b8baac49 100644
--- a/khelpcenter/kcmhelpcenter.desktop
+++ b/khelpcenter/kcmhelpcenter.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Exec=kcmshell kcmhelpcenter
+Exec=tdecmshell kcmhelpcenter
 Icon=help
 
 X-TDE-SubstituteUID=true
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index 0efd5ac2b..9d084f0d4 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -31,7 +31,7 @@
 #include <dcopclient.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index 7dc1fbcf3..2cf00ced7 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -28,7 +28,7 @@
 #include "prefs.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopclient.h>
 #include <kiconloader.h>
 #include <kmimemagic.h>
diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h
index 92b6b10cd..27085dd49 100644
--- a/khelpcenter/mainwindow.h
+++ b/khelpcenter/mainwindow.h
@@ -4,7 +4,7 @@
 #include <tqptrlist.h>
 
 #include <kmainwindow.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 #include <tdeparts/browserextension.h>
 #include <dcopclient.h>
diff --git a/khelpcenter/plugins/CMakeLists.txt b/khelpcenter/plugins/CMakeLists.txt
index cbda88d75..fea32db40 100644
--- a/khelpcenter/plugins/CMakeLists.txt
+++ b/khelpcenter/plugins/CMakeLists.txt
@@ -18,5 +18,5 @@ install( FILES
   applets.desktop contact.desktop faq.desktop info.desktop
   links.desktop support.desktop userguide.desktop welcome.desktop
   hardwaremodules.desktop kcontrolmodules.desktop konqplugins.desktop
-  kioslaves.desktop quickstart.desktop visualdict.desktop
+  tdeioslaves.desktop quickstart.desktop visualdict.desktop
   DESTINATION ${DATA_INSTALL_DIR}/khelpcenter/plugins )
diff --git a/khelpcenter/plugins/Makefile.am b/khelpcenter/plugins/Makefile.am
index c5dca33bb..c5601db13 100644
--- a/khelpcenter/plugins/Makefile.am
+++ b/khelpcenter/plugins/Makefile.am
@@ -5,6 +5,6 @@ SUBDIRS = Applications Manpages Scrollkeeper
 plugin_DATA = applets.desktop contact.desktop faq.desktop info.desktop \
   links.desktop support.desktop userguide.desktop welcome.desktop \
   kicmodules.desktop kcontrolmodules.desktop konqplugins.desktop \
-  kioslaves.desktop quickstart.desktop visualdict.desktop
+  tdeioslaves.desktop quickstart.desktop visualdict.desktop
 
 plugindir = $(kde_datadir)/khelpcenter/plugins
diff --git a/khelpcenter/plugins/kioslaves.desktop b/khelpcenter/plugins/tdeioslaves.desktop
similarity index 95%
rename from khelpcenter/plugins/kioslaves.desktop
rename to khelpcenter/plugins/tdeioslaves.desktop
index 3535ebfd1..619b0488c 100644
--- a/khelpcenter/plugins/kioslaves.desktop
+++ b/khelpcenter/plugins/tdeioslaves.desktop
@@ -32,4 +32,4 @@ Icon=contents2
 
 X-DOC-Weight=-400
 
-X-TDE-KHelpcenter-Special=kioslave
+X-TDE-KHelpcenter-Special=tdeioslave
diff --git a/khelpcenter/plugintraverser.cpp b/khelpcenter/plugintraverser.cpp
index e48ec8359..8386ba606 100644
--- a/khelpcenter/plugintraverser.cpp
+++ b/khelpcenter/plugintraverser.cpp
@@ -24,7 +24,7 @@
 #include "navigatoritem.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
@@ -94,7 +94,7 @@ void PluginTraverser::process( DocEntry *entry )
                 entry->khelpcenterSpecial() == "kcontrol" ||
                 entry->khelpcenterSpecial() == "konqueror" ) {
       mNavigator->insertParentAppDocs( entry->khelpcenterSpecial(), mCurrentItem );
-    } else if ( entry->khelpcenterSpecial() == "kioslave" ) {
+    } else if ( entry->khelpcenterSpecial() == "tdeioslave" ) {
       mNavigator->insertIOSlaveDocs( entry->khelpcenterSpecial(), mCurrentItem );
     } else if ( entry->khelpcenterSpecial() == "info" ) {
       mNavigator->insertInfoDocs( mCurrentItem );
diff --git a/khelpcenter/prefs.kcfgc b/khelpcenter/prefs.kcfgc
index ae03d9c4b..4742430de 100644
--- a/khelpcenter/prefs.kcfgc
+++ b/khelpcenter/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=khelpcenter.kcfg
 ClassName=Prefs
 Singleton=true
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index b62777272..6695114c7 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -24,7 +24,7 @@
 #include "docentry.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index ca4f56c01..7c06828dd 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -2,7 +2,7 @@
 
 #include <tqstylesheet.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
diff --git a/khelpcenter/searchengine.h b/khelpcenter/searchengine.h
index 9821c0da0..2863b904f 100644
--- a/khelpcenter/searchengine.h
+++ b/khelpcenter/searchengine.h
@@ -6,7 +6,7 @@
 #include <tqstring.h>
 
 #include <kpixmap.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "docentrytraverser.h"
 
diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp
index 670b39b1b..25cf3fda8 100644
--- a/khotkeys/app/app.cpp
+++ b/khotkeys/app/app.cpp
@@ -17,7 +17,7 @@
 #include "app.h"
 
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include <stdio.h>
diff --git a/khotkeys/app/kded.cpp b/khotkeys/app/kded.cpp
index 3ebb55575..88c0fae6b 100644
--- a/khotkeys/app/kded.cpp
+++ b/khotkeys/app/kded.cpp
@@ -17,7 +17,7 @@
 #include "kded.h"
 
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kapplication.h>
 
diff --git a/khotkeys/data/Makefile.am b/khotkeys/data/Makefile.am
index 44be27263..3b64ca69b 100644
--- a/khotkeys/data/Makefile.am
+++ b/khotkeys/data/Makefile.am
@@ -2,6 +2,6 @@ khotkeys_data_DATA = trinity2b1.khotkeys konqueror_gestures_trinity21.khotkeys p
 khotkeys_datadir = $(kde_datadir)/khotkeys
 
 khotkeys_update_DATA = khotkeys_32b1_update.upd konqueror_gestures_trinity21_update.upd khotkeys_printscreen.upd
-khotkeys_updatedir = $(kde_datadir)/kconf_update
+khotkeys_updatedir = $(kde_datadir)/tdeconf_update
 
 EXTRA_DIST = $(khotkeys_data_DATA) $(khotkeys_update_DATA)
diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp
index 518e45972..c1242f17e 100644
--- a/khotkeys/kcontrol/init.cpp
+++ b/khotkeys/kcontrol/init.cpp
@@ -16,7 +16,7 @@
 
 #include <dcopref.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <stdlib.h>
 
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index ae2411b09..b0ddb16c9 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -26,14 +26,14 @@
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
 #include <ksimpleconfig.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <dcopref.h>
 #include <klibloader.h>
 
diff --git a/khotkeys/kcontrol/khotkeys.desktop b/khotkeys/kcontrol/khotkeys.desktop
index bbd6d1429..0608bce34 100644
--- a/khotkeys/kcontrol/khotkeys.desktop
+++ b/khotkeys/kcontrol/khotkeys.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell khotkeys
+Exec=tdecmshell khotkeys
 Icon=khotkeys
 Type=Application
 
diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp
index 2533b58a0..31eb7be27 100644
--- a/khotkeys/kcontrol/triggers_tab.cpp
+++ b/khotkeys/kcontrol/triggers_tab.cpp
@@ -28,7 +28,7 @@
 #include <klocale.h>
 #include <kapplication.h>
 #include <kshortcut.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kshortcutlist.h>
 #include <kkeybutton.h>
 #include <kkeydialog.h>
diff --git a/khotkeys/shared/CMakeLists.txt b/khotkeys/shared/CMakeLists.txt
index 2a1de2e1e..27227cd2f 100644
--- a/khotkeys/shared/CMakeLists.txt
+++ b/khotkeys/shared/CMakeLists.txt
@@ -37,6 +37,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kio-shared ${XTEST_LIBRARIES}
+  LINK tdeio-shared ${XTEST_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/khotkeys/shared/action_data.cpp b/khotkeys/shared/action_data.cpp
index ff56eb99d..488a18133 100644
--- a/khotkeys/shared/action_data.cpp
+++ b/khotkeys/shared/action_data.cpp
@@ -16,7 +16,7 @@
 
 #include "action_data.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "actions.h"
 
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp
index 5ce1e1d5a..bc383b926 100644
--- a/khotkeys/shared/actions.cpp
+++ b/khotkeys/shared/actions.cpp
@@ -17,7 +17,7 @@
 #include "actions.h"
 
 #include <krun.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kurifilter.h>
 #include <kglobal.h>
diff --git a/khotkeys/shared/conditions.cpp b/khotkeys/shared/conditions.cpp
index 3132fa01d..6120ca875 100644
--- a/khotkeys/shared/conditions.cpp
+++ b/khotkeys/shared/conditions.cpp
@@ -20,7 +20,7 @@
 #include <typeinfo>
 #endif
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <assert.h>
diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp
index 9481ff762..16e071a1e 100644
--- a/khotkeys/shared/settings.cpp
+++ b/khotkeys/shared/settings.cpp
@@ -16,7 +16,7 @@
 
 #include "settings.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kaccel.h>
diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp
index 27736ed0b..fe167789b 100644
--- a/khotkeys/shared/triggers.cpp
+++ b/khotkeys/shared/triggers.cpp
@@ -17,7 +17,7 @@
 #include "triggers.h"
 
 #include <kglobalaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <twinmodule.h>
 #include <klocale.h>
diff --git a/khotkeys/shared/voicesignature.cpp b/khotkeys/shared/voicesignature.cpp
index 054f66827..c5d6efb53 100644
--- a/khotkeys/shared/voicesignature.cpp
+++ b/khotkeys/shared/voicesignature.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "voicesignature.h"
 #include "sound.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <math.h>
 #ifdef PI
diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp
index ddfc612e2..b27fa3a08 100644
--- a/khotkeys/shared/windows.cpp
+++ b/khotkeys/shared/windows.cpp
@@ -19,7 +19,7 @@
 #include <assert.h>
 #include <tqregexp.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <twinmodule.h>
 #include <twin.h>
diff --git a/khotkeys/update/CMakeLists.txt b/khotkeys/update/CMakeLists.txt
index 13a7dffca..32cbb9fc0 100644
--- a/khotkeys/update/CMakeLists.txt
+++ b/khotkeys/update/CMakeLists.txt
@@ -27,5 +27,5 @@ link_directories(
 tde_add_executable( khotkeys_update
   SOURCES update.cpp
   LINK khotkeys_shared-shared
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
 )
diff --git a/khotkeys/update/Makefile.am b/khotkeys/update/Makefile.am
index 19e725d8a..be0e97f9d 100644
--- a/khotkeys/update/Makefile.am
+++ b/khotkeys/update/Makefile.am
@@ -1,5 +1,5 @@
-kconf_PROGRAMS = khotkeys_update
-kconfdir = $(libdir)/kconf_update_bin
+tdeconf_PROGRAMS = khotkeys_update
+tdeconfdir = $(libdir)/tdeconf_update_bin
 
 khotkeys_update_SOURCES = update.cpp
 
diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp
index 1d4f26b45..2ed07c991 100644
--- a/khotkeys/update/update.cpp
+++ b/khotkeys/update/update.cpp
@@ -17,7 +17,7 @@
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 
diff --git a/kicker/applets/clock/Makefile.am b/kicker/applets/clock/Makefile.am
index 15bde61cf..fbb8ec319 100644
--- a/kicker/applets/clock/Makefile.am
+++ b/kicker/applets/clock/Makefile.am
@@ -19,7 +19,7 @@ clock_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 clock_panelapplet_la_LIBADD =  ../../libkicker/libkickermain.la $(LIB_TDEUI)
 
 srcdoc:
-	kdoc -a -p -H -d $$HOME/web/src/clockapplet clockapplet *.h -lqt -ltdecore -ltdeui -lkfile
+	kdoc -a -p -H -d $$HOME/web/src/clockapplet clockapplet *.h -lqt -ltdecore -ltdeui -ltdefile
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp *.h -o $(podir)/clockapplet.pot
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 35dccf148..f9dd63e9e 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -47,10 +47,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kpopupmenu.h>
 #include <kstringhandler.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kfontrequester.h>
 #include <kglobalsettings.h>
-#include <kconfigdialogmanager.h>
+#include <tdeconfigdialogmanager.h>
 #include <kcalendarsystem.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
@@ -1518,12 +1518,12 @@ void ClockApplet::contextMenuActivated(int result)
             proc << locate("exe", "tdesu");
             proc << "--nonewdcop";
             proc << TQString("%1 tde-clock.desktop --lang %2")
-                .arg(locate("exe", "kcmshell"))
+                .arg(locate("exe", "tdecmshell"))
                 .arg(TDEGlobal::locale()->language());
             proc.start(TDEProcess::DontCare);
             break;
         case 104:
-            proc << locate("exe", "kcmshell");
+            proc << locate("exe", "tdecmshell");
             proc << "tde-language.desktop";
             proc.start(TDEProcess::DontCare);
             break;
diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h
index 9a80c24b6..34d73cf83 100644
--- a/kicker/applets/clock/clock.h
+++ b/kicker/applets/clock/clock.h
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dcopobject.h>
 #include <kpanelapplet.h>
 #include <kdirwatch.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include <kickertip.h>
 #include "settings.h"
diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp
index 9b89da87d..8cf336866 100644
--- a/kicker/applets/clock/init.cpp
+++ b/kicker/applets/clock/init.cpp
@@ -47,10 +47,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kpopupmenu.h>
 #include <kstringhandler.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kfontrequester.h>
 #include <kglobalsettings.h>
-#include <kconfigdialogmanager.h>
+#include <tdeconfigdialogmanager.h>
 #include <kcalendarsystem.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
diff --git a/kicker/applets/clock/prefs.kcfgc b/kicker/applets/clock/prefs.kcfgc
index 890209526..fff5e1cad 100644
--- a/kicker/applets/clock/prefs.kcfgc
+++ b/kicker/applets/clock/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=clockapplet.kcfg
 ClassName=Prefs
 Singleton=false
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index bf007c933..c43b76db1 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "zone.h"
 
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
diff --git a/kicker/applets/launcher/CMakeLists.txt b/kicker/applets/launcher/CMakeLists.txt
index bf5111658..c022762c0 100644
--- a/kicker/applets/launcher/CMakeLists.txt
+++ b/kicker/applets/launcher/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES quicklauncher.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
+install( FILES quictdelauncher.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
 install( FILES launcherapplet.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
 
@@ -37,7 +37,7 @@ install( FILES launcherapplet.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
 tde_add_kpart( launcher_panelapplet AUTOMOC
   SOURCES
-    quicklauncher.skel quicklauncher.cpp quickbutton.cpp
+    quictdelauncher.skel quictdelauncher.cpp quickbutton.cpp
     quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp
     configdlgbase.ui prefs.kcfgc configdlg.cpp
   LINK
diff --git a/kicker/applets/launcher/ChangeLog b/kicker/applets/launcher/ChangeLog
index b86dbd7aa..1144a8c35 100644
--- a/kicker/applets/launcher/ChangeLog
+++ b/kicker/applets/launcher/ChangeLog
@@ -4,9 +4,9 @@
 	* Empty panel now has size>0, so user can still drop icons on it.
 	* Fixed gcc 3.4 incompatibilities in EasyVector
 	* Fixed Drag and Drop Bugs :
-	  * Crash when non-url dropped on quicklauncher
-	  * Crash panel button dropped on quicklauncher
-	  * Able to drop objects when quicklauncher is locked
+	  * Crash when non-url dropped on quictdelauncher
+	  * Crash panel button dropped on quictdelauncher
+	  * Able to drop objects when quictdelauncher is locked
 	* Add application context menu now inserts new app at current location
  	
 2004-06-14   Dan Bullok <dan.kde@bullok.com>
@@ -28,7 +28,7 @@
 	* Spouts tons of debugging info to kdDebug (for now).
 	
 2004-06-12   Dan Bullok <dan.kde@bullok.com>
-	* Fixed bug #75351:  Tooltips change to filenames after rearranging applications in quicklauncher.
+	* Fixed bug #75351:  Tooltips change to filenames after rearranging applications in quictdelauncher.
 	* Moved the URL->(menuID,service,kurl) functionality from the QuickButton constructor to its own class: QuickURL.  Very similar code is used elsewhere in kicker, and should eventually be merged.
 	* Renamed some methods in QuickButton (getId -> menuId, getURL -> url) This matches the predominant KDE naming style.
 	* Groundwork laid for variable-sized buttons.
diff --git a/kicker/applets/launcher/Makefile.am b/kicker/applets/launcher/Makefile.am
index a0384df4f..1e586e0dd 100644
--- a/kicker/applets/launcher/Makefile.am
+++ b/kicker/applets/launcher/Makefile.am
@@ -3,13 +3,13 @@ INCLUDES = -I$(top_srcdir)/kicker/libkicker -I$(top_srcdir)/kicker/kicker/ui $(a
 
 kde_module_LTLIBRARIES = launcher_panelapplet.la
 
-launcher_panelapplet_la_SOURCES = quicklauncher.skel quicklauncher.cpp quickbutton.cpp quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp configdlgbase.ui prefs.kcfgc configdlg.cpp
+launcher_panelapplet_la_SOURCES = quictdelauncher.skel quictdelauncher.cpp quickbutton.cpp quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp configdlgbase.ui prefs.kcfgc configdlg.cpp
 
 METASOURCES = AUTO
-noinst_HEADERS = quicklauncher.h quickbutton.h quickaddappsmenu.h easyvector.h quickbuttongroup.h flowgridmanager.h popularity.h configdlg.h
+noinst_HEADERS = quictdelauncher.h quickbutton.h quickaddappsmenu.h easyvector.h quickbuttongroup.h flowgridmanager.h popularity.h configdlg.h
 
 lnkdir = $(kde_datadir)/kicker/applets
-lnk_DATA = quicklauncher.desktop
+lnk_DATA = quictdelauncher.desktop
 
 EXTRA_DIST = $(lnk_DATA)
 
@@ -21,7 +21,7 @@ launcher_panelapplet_la_LIBADD = ../../kicker/core/libkicker_core.la  ../../kick
 kde_kcfg_DATA = launcherapplet.kcfg
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/quicklauncher.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/quictdelauncher.pot
 
 srcdoc:
-	kdoc -a -p -H -d $$HOME/web/src/quicklauncher quicklauncher *.h -lqt -ltdecore -ltdeui
+	kdoc -a -p -H -d $$HOME/web/src/quictdelauncher quictdelauncher *.h -lqt -ltdecore -ltdeui
diff --git a/kicker/applets/launcher/ToDo b/kicker/applets/launcher/ToDo
index c7c852a36..1f3932b08 100644
--- a/kicker/applets/launcher/ToDo
+++ b/kicker/applets/launcher/ToDo
@@ -3,6 +3,6 @@ TODO:
       x * Remove debugging code (makes everything slow).
 	* Tooltip or other popup to alert user that buttons are locked (with a "don't show this again" checkbox).
 	* Docs.
-	* Use old quicklauncher config file if found.  #77959
+	* Use old quictdelauncher config file if found.  #77959
       X * "Add application" context menu should add the new application at the index of the button that summoned the context menu.
       X * Make sure to always have a little space to drop things on, even when there are no buttons.
diff --git a/kicker/applets/launcher/configdlg.h b/kicker/applets/launcher/configdlg.h
index e5fdbe34b..b96caf459 100644
--- a/kicker/applets/launcher/configdlg.h
+++ b/kicker/applets/launcher/configdlg.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef CONFIG_DLG_H
 #define CONFIG_DLG_H
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 class ConfigDlgBase;
 class Prefs;
diff --git a/kicker/applets/launcher/popularity.cpp b/kicker/applets/launcher/popularity.cpp
index a22a98c99..f38062e5b 100644
--- a/kicker/applets/launcher/popularity.cpp
+++ b/kicker/applets/launcher/popularity.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <assert.h>
 #include <algorithm>
 #include <iterator>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <list>
 #include <set>
diff --git a/kicker/applets/launcher/prefs.kcfgc b/kicker/applets/launcher/prefs.kcfgc
index 243e97868..8a605b327 100644
--- a/kicker/applets/launcher/prefs.kcfgc
+++ b/kicker/applets/launcher/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=launcherapplet.kcfg
 ClassName=Prefs
 Singleton=false
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quictdelauncher.cpp
similarity index 98%
rename from kicker/applets/launcher/quicklauncher.cpp
rename to kicker/applets/launcher/quictdelauncher.cpp
index e5658f1cb..87ac35387 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quictdelauncher.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kurldrag.h>
 #include <kdebug.h>
@@ -52,7 +52,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "configdlg.h"
 #include "popularity.h"
-#include "quicklauncher.h"
+#include "quictdelauncher.h"
 #include "quickbutton.h"
 #include "quickaddappsmenu.h"
 #include "quickbuttongroup.h"
@@ -71,10 +71,10 @@ extern "C"
 {
     KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
-        TDEGlobal::locale()->insertCatalogue("quicklauncher");
+        TDEGlobal::locale()->insertCatalogue("quictdelauncher");
         return new QuickLauncher(configFile, KPanelApplet::Normal,
                                  KPanelApplet::Preferences,
-                                 parent, "quicklauncher");
+                                 parent, "quictdelauncher");
     }
 }
 
@@ -107,7 +107,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
     m_oldButtons = 0;
     m_dragButtons = 0;
 
-    m_configAction = new KAction(i18n("Configure Quicklauncher..."), "configure", KShortcut(),
+    m_configAction = new KAction(i18n("Configure Quictdelauncher..."), "configure", KShortcut(),
         TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this));
 
     m_saveTimer = new TQTimer(this, "m_saveTimer");
@@ -135,7 +135,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
         "QuickLauncherApplet",
         "serviceStartedByStorageId(TQString,TQString)",
         false);
-    kdDebug() << "Quicklauncher registered DCOP signal" << endl;
+    kdDebug() << "Quictdelauncher registered DCOP signal" << endl;
 }
 
 
@@ -143,7 +143,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
 
 QuickLauncher::~QuickLauncher()
 {
-    TDEGlobal::locale()->removeCatalogue("quicklauncher");
+    TDEGlobal::locale()->removeCatalogue("quictdelauncher");
     setCustomMenu(0);
     delete m_popup;
     delete m_appletPopup;
@@ -496,7 +496,7 @@ void QuickLauncher::addAppBeforeManually(TQString url, TQString sender)
 
 void QuickLauncher::about()
 {
-    TDEAboutData about("quicklauncher", I18N_NOOP("Quick Launcher"), "2.0",
+    TDEAboutData about("quictdelauncher", I18N_NOOP("Quick Launcher"), "2.0",
                      I18N_NOOP("A simple application launcher"),
                      TDEAboutData::License_GPL_V2, 
                      "(C) 2000 Bill Nagel\n(C) 2004 Dan Bullok\n(C) 2005 Fred Schaettgen");
@@ -949,7 +949,7 @@ void QuickLauncher::serviceStartedByStorageId(TQString /*starter*/, TQString sto
     QuickURL url = QuickURL(locate("apps", service->desktopEntryPath()));
     TQString desktopMenuId(url.menuId());
     kdDebug() << "storageId=" << storageId << " desktopURL=" << desktopMenuId << endl;
-    // A service was started somwhere else. If the quicklauncher contains
+    // A service was started somwhere else. If the quictdelauncher contains
     // this service too, we flash the icon
     QuickButton *startedButton = 0;
     std::set<TQString> buttonIdSet;
@@ -1127,4 +1127,4 @@ void QuickLauncher::positionChange(Position)
 }
 
 
-#include "quicklauncher.moc"
+#include "quictdelauncher.moc"
diff --git a/kicker/applets/launcher/quicklauncher.desktop b/kicker/applets/launcher/quictdelauncher.desktop
similarity index 100%
rename from kicker/applets/launcher/quicklauncher.desktop
rename to kicker/applets/launcher/quictdelauncher.desktop
diff --git a/kicker/applets/launcher/quicklauncher.h b/kicker/applets/launcher/quictdelauncher.h
similarity index 98%
rename from kicker/applets/launcher/quicklauncher.h
rename to kicker/applets/launcher/quictdelauncher.h
index 2dadf6344..c6fe1d2bb 100644
--- a/kicker/applets/launcher/quicklauncher.h
+++ b/kicker/applets/launcher/quictdelauncher.h
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
-#ifndef __quicklauncher_h__
-#define __quicklauncher_h__
+#ifndef __quictdelauncher_h__
+#define __quictdelauncher_h__
 
 #include <dcopobject.h>
 #include <tqimage.h>
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index 72652d74b..b55aae92d 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -250,7 +250,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
 void Lockout::slotLockPrefs()
 {
     // Run the screensaver settings
-    KRun::run( "kcmshell screensaver", KURL::List() );
+    KRun::run( "tdecmshell screensaver", KURL::List() );
 }
 
 void Lockout::slotTransparent()
@@ -266,7 +266,7 @@ void Lockout::slotTransparent()
 void Lockout::slotLogoutPrefs()
 {
     // Run the logout settings.
-    KRun::run( "kcmshell kcmsmserver", KURL::List() );
+    KRun::run( "tdecmshell kcmsmserver", KURL::List() );
 }
 
 void Lockout::slotIconChanged()
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index 527c92b62..f8a1ac630 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -19,7 +19,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
diff --git a/kicker/applets/media/mediaapplet.h b/kicker/applets/media/mediaapplet.h
index 68d0b5d99..4c57b508d 100644
--- a/kicker/applets/media/mediaapplet.h
+++ b/kicker/applets/media/mediaapplet.h
@@ -26,9 +26,9 @@
 
 #include <kpanelapplet.h>
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdirlister.h>
 
 #include <tqptrlist.h>
diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h
index 3fa31756a..5f6a2b80b 100644
--- a/kicker/applets/media/mediumbutton.h
+++ b/kicker/applets/media/mediumbutton.h
@@ -26,7 +26,7 @@
 #include <tqpixmap.h>
 #include <tqcursor.h>
 #include <tqtimer.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kpanelapplet.h>
 #include <kactioncollection.h>
 
diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp
index bf8234fe5..f53381a10 100644
--- a/kicker/applets/media/preferencesdialog.cpp
+++ b/kicker/applets/media/preferencesdialog.cpp
@@ -24,7 +24,7 @@
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
 #include <klistview.h>
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 
 class MediumTypeItem : public TQCheckListItem
 {
diff --git a/kicker/applets/media/preferencesdialog.h b/kicker/applets/media/preferencesdialog.h
index e946f81de..f758d280b 100644
--- a/kicker/applets/media/preferencesdialog.h
+++ b/kicker/applets/media/preferencesdialog.h
@@ -22,7 +22,7 @@
 
 #include <tqwidget.h>
 #include <kdialogbase.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 /**
   *@author ervin
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index 732f5acdb..8a9f68095 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqvariant.h> // avoid X11 #define's
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/kicker/applets/minipager/Makefile.am b/kicker/applets/minipager/Makefile.am
index 9320c30f5..f1009df41 100644
--- a/kicker/applets/minipager/Makefile.am
+++ b/kicker/applets/minipager/Makefile.am
@@ -22,4 +22,4 @@ messages: rc.cpp
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kminipagerapplet.pot
 
 srcdoc:
-	kdoc -a -p -H -d $$HOME/web/src/kminipagerapplet kminipagerapplet *.h -lqt -ltdecore -ltdeui -lkfile
+	kdoc -a -p -H -d $$HOME/web/src/kminipagerapplet kminipagerapplet *.h -lqt -ltdecore -ltdeui -ltdefile
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index eb663814b..4e3332768 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -28,7 +28,7 @@
 
 #include <kiconloader.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutapplication.h>
 #include <kaboutdata.h>
 #include <klocale.h>
diff --git a/kicker/applets/run/CMakeLists.txt b/kicker/applets/run/CMakeLists.txt
index 68c7c7c0c..0e1ca3960 100644
--- a/kicker/applets/run/CMakeLists.txt
+++ b/kicker/applets/run/CMakeLists.txt
@@ -29,6 +29,6 @@ install( FILES runapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets
 
 tde_add_kpart( run_panelapplet AUTOMOC
   SOURCES runapplet.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index f0069cae6..5f930190a 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kurifilter.h>
 #include <kdialog.h>
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index 428d0bb7e..2f5000b72 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -25,7 +25,7 @@
 
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kicker/applets/systemtray/Makefile.am b/kicker/applets/systemtray/Makefile.am
index 2749c7391..3ba76ca5c 100644
--- a/kicker/applets/systemtray/Makefile.am
+++ b/kicker/applets/systemtray/Makefile.am
@@ -21,4 +21,4 @@ messages:
 	$(XGETTEXT)  *.cpp *.h -o $(podir)/ksystemtrayapplet.pot
 
 srcdoc:
-	kdoc -a -p -H -d $$HOME/web/src/ksystemtrayapplet ksystemtrayapplet *.h -lqt -ltdecore -ltdeui -lkfile
+	kdoc -a -p -H -d $$HOME/web/src/ksystemtrayapplet ksystemtrayapplet *.h -lqt -ltdecore -ltdeui -ltdefile
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 02f13df2b..835174f92 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dcopclient.h>
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <krun.h>
diff --git a/kicker/applets/taskbar/Makefile.am b/kicker/applets/taskbar/Makefile.am
index 9f6914f8e..c1375230e 100644
--- a/kicker/applets/taskbar/Makefile.am
+++ b/kicker/applets/taskbar/Makefile.am
@@ -19,4 +19,4 @@ messages:
 	$(XGETTEXT) *.cpp *.h -o $(podir)/ktaskbarapplet.pot
 
 srcdoc:
-	kdoc -a -p -H -d $$HOME/web/src/ktaskbarapplet ktaskbarapplet *.h -lqt -ltdecore -ltdeui -lkfile
+	kdoc -a -p -H -d $$HOME/web/src/ktaskbarapplet ktaskbarapplet *.h -lqt -ltdecore -ltdeui -ltdefile
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index 6e1f11504..478ac01ec 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -19,7 +19,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp
index 57904db43..1f45e1fb4 100644
--- a/kicker/applets/trash/trashbutton.cpp
+++ b/kicker/applets/trash/trashbutton.cpp
@@ -26,7 +26,7 @@
 #include <krun.h>
 #include <kpopupmenu.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <konq_operations.h>
 #include <konq_popupmenu.h>
diff --git a/kicker/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h
index 891e274c0..0ddad290e 100644
--- a/kicker/applets/trash/trashbutton.h
+++ b/kicker/applets/trash/trashbutton.h
@@ -26,7 +26,7 @@
 #include <tqpixmap.h>
 #include <tqcursor.h>
 #include <tqtimer.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kpanelapplet.h>
 #include <kactioncollection.h>
 
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index 393e9a2d6..79c504874 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <twinmodule.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kprocess.h>
 #include <kshell.h>
 #include <twin.h>
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index abd6337df..f35fc997b 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -53,7 +53,7 @@
 */
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <twin.h>
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index 6e011cc71..ff2a7c60d 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -59,7 +59,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kmessagebox.h>
 
diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp
index 31f5c5a33..c3f34c0ac 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.cpp
+++ b/kicker/extensions/kasbar/kasprefsdlg.cpp
@@ -63,7 +63,7 @@
 #include <tqwhatsthis.h>
 
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index a11c18547..86d688b27 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -55,13 +55,13 @@
 #include <tqtimer.h>
 
 #include <kactionclasses.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
 #include <kiconloader.h>
 
-//#include <kconfiggroupsaver.h>
+//#include <tdeconfiggroupsaver.h>
 
 #include <taskmanager.h>
 
diff --git a/kicker/kicker/CMakeLists.txt b/kicker/kicker/CMakeLists.txt
index 313187cee..ce4befcae 100644
--- a/kicker/kicker/CMakeLists.txt
+++ b/kicker/kicker/CMakeLists.txt
@@ -30,12 +30,12 @@ link_directories( ${TQT_LIBRARY_DIRS} )
 
 install( FILES panel.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
 install( FILES kcmkicker.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kickerrc.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+install( FILES kickerrc.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
 
 install( PROGRAMS
     kicker-3.1-properSizeSetting.pl kicker-3.5-taskbarEnums.pl
-    kicker-3.5-kconfigXTize.pl
-  DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+    kicker-3.5-tdeconfigXTize.pl
+  DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
 
 
 ##### kicker-3.4-reverseLayout (executable) #####
@@ -43,7 +43,7 @@ install( PROGRAMS
 tde_add_executable( kicker-3.4-reverseLayout
   SOURCES kicker-3.4-reverseLayout.cpp
   LINK tdecore-shared
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
 )
 
 
diff --git a/kicker/kicker/Makefile.am b/kicker/kicker/Makefile.am
index cf22b5c70..c97d61f60 100644
--- a/kicker/kicker/Makefile.am
+++ b/kicker/kicker/Makefile.am
@@ -28,14 +28,14 @@ messages: rc.cpp
 dummy.cpp:
 	echo > $@
  
-kconf_PROGRAMS = kicker-3.4-reverseLayout
-kconfdir = $(libdir)/kconf_update_bin
+tdeconf_PROGRAMS = kicker-3.4-reverseLayout
+tdeconfdir = $(libdir)/tdeconf_update_bin
 
 kicker_3_4_reverseLayout_SOURCES = kicker-3.4-reverseLayout.cpp
 kicker_3_4_reverseLayout_LDADD   = $(LIB_QT) $(LIB_TDECORE)
 kicker_3_4_reverseLayout_LDFLAGS = $(all_libraries)
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kickerrc.upd
-update_SCRIPTS = kicker-3.1-properSizeSetting.pl kicker-3.5-taskbarEnums.pl kicker-3.5-kconfigXTize.pl
+update_SCRIPTS = kicker-3.1-properSizeSetting.pl kicker-3.5-taskbarEnums.pl kicker-3.5-tdeconfigXTize.pl
 
diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp
index e470fb93a..36d650271 100644
--- a/kicker/kicker/buttons/browserbutton.cpp
+++ b/kicker/kicker/buttons/browserbutton.cpp
@@ -25,10 +25,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtooltip.h>
 #include <tqdragobject.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <konq_operations.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include "kicker.h"
 #include "browser_mnu.h"
diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp
index c35a8bf47..dc6063c2b 100644
--- a/kicker/kicker/buttons/desktopbutton.cpp
+++ b/kicker/kicker/buttons/desktopbutton.cpp
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kglobalsettings.h>
 #include <konq_operations.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include "showdesktop.h"
 #include "kicker.h"
diff --git a/kicker/kicker/buttons/extensionbutton.cpp b/kicker/kicker/buttons/extensionbutton.cpp
index 8ab9fd0bd..f45a61a4b 100644
--- a/kicker/kicker/buttons/extensionbutton.cpp
+++ b/kicker/kicker/buttons/extensionbutton.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqtooltip.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpanelmenu.h>
 
 #include "menuinfo.h"
diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp
index e48386008..016c75aee 100644
--- a/kicker/kicker/buttons/nonkdeappbutton.cpp
+++ b/kicker/kicker/buttons/nonkdeappbutton.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtooltip.h>
 #include <tqdragobject.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdesktopfile.h>
 #include <kapplication.h>
 #include <kglobal.h>
diff --git a/kicker/kicker/buttons/servicemenubutton.cpp b/kicker/kicker/buttons/servicemenubutton.cpp
index 0ebc931f4..a15ba1cf1 100644
--- a/kicker/kicker/buttons/servicemenubutton.cpp
+++ b/kicker/kicker/buttons/servicemenubutton.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqtooltip.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kservicegroup.h>
 #include <klocale.h>
 
diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp
index 132aa8193..ac9934b33 100644
--- a/kicker/kicker/buttons/urlbutton.cpp
+++ b/kicker/kicker/buttons/urlbutton.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqfile.h>
 
 #include <kdesktopfile.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <konq_operations.h>
 #include <kicontheme.h>
 #include <kglobal.h>
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index a35b34fd0..d3d7f10ba 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp
index 56c09f285..1efafe801 100644
--- a/kicker/kicker/core/container_base.cpp
+++ b/kicker/kicker/core/container_base.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpopupmenu.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "global.h"
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index 30c31401d..8196127e9 100644
--- a/kicker/kicker/core/container_button.cpp
+++ b/kicker/kicker/core/container_button.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqlayout.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <tdemultipledrag.h>
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 7639fe146..d2f2982b7 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqcolor.h>
 
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kglobal.h>
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 12949f95b..c42ffc13a 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -45,7 +45,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <krootpixmap.h>
 #include <kpixmap.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kservice.h>
 #include <kurldrag.h>
 
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp
index 62594443f..893cb1665 100644
--- a/kicker/kicker/core/extensionmanager.cpp
+++ b/kicker/kicker/core/extensionmanager.cpp
@@ -27,10 +27,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdlib.h>
 
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
@@ -233,7 +233,7 @@ void ExtensionManager::migrateMenubar()
     // will have a menubar in it, and if so, abort creating one of our
     // own.
     //
-    // the reason i didn't do this as a kconfig_update script is that
+    // the reason i didn't do this as a tdeconfig_update script is that
     // most people don't use this feature, so no reason to penalize
     // everyone, and moreover the user may added this to their main
     // panel, meaning kickerrc itself would have to be vastly modified
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index 3fa04e374..0521e6413 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -29,7 +29,7 @@
 #include <tqtooltip.h>
 
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcmdlineargs.h>
 #include <kcmultidialog.h>
 #include <kcrash.h>
diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp
index 17a148474..e6c5ba842 100644
--- a/kicker/kicker/core/main.cpp
+++ b/kicker/kicker/core/main.cpp
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kdebug.h>
 #include <kaboutdata.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 
diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp
index 6b41f1c50..fbf6b9e43 100644
--- a/kicker/kicker/core/panelextension.cpp
+++ b/kicker/kicker/core/panelextension.cpp
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kglobal.h>
 #include <kpopupmenu.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdguiitem.h>
 
 #include "container_applet.h"
diff --git a/kicker/kicker/kcmkicker.desktop b/kicker/kicker/kcmkicker.desktop
index 929871123..348ed746e 100644
--- a/kicker/kicker/kcmkicker.desktop
+++ b/kicker/kicker/kcmkicker.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkicker
 Type=Application
-Exec=kcmshell %i kicker_config kcmtaskbar
+Exec=tdecmshell %i kicker_config kcmtaskbar
 Name=Configure the Panel
 Name[af]=Stel die paneel op
 Name[ar]=قم بإعداد اللوحة
diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp
index a588c6258..9491e7d41 100644
--- a/kicker/kicker/kicker-3.4-reverseLayout.cpp
+++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp
@@ -130,7 +130,7 @@ int main(int argc, char** argv)
 
     if (!childPanelConfigFiles.isEmpty())
     {
-        // Create a temporary kconf_update .upd file for updating the childpanels
+        // Create a temporary tdeconf_update .upd file for updating the childpanels
         KTempFile tempFile(TQString::null, ".upd");
         TQTextStream* upd = tempFile.textStream();
         for (it = childPanelConfigFiles.begin(); it != childPanelConfigFiles.end(); ++it)
@@ -142,10 +142,10 @@ int main(int argc, char** argv)
         }
         tempFile.close();
 
-        // Run kconf_update on the childpanel config files.
-        TDEProcess kconf_update;
-        kconf_update << "kconf_update" << tempFile.name();
-        kconf_update.start(TDEProcess::Block);
+        // Run tdeconf_update on the childpanel config files.
+        TDEProcess tdeconf_update;
+        tdeconf_update << "tdeconf_update" << tempFile.name();
+        tdeconf_update.start(TDEProcess::Block);
 
         tempFile.unlink();
     }
diff --git a/kicker/kicker/kicker-3.5-kconfigXTize.pl b/kicker/kicker/kicker-3.5-tdeconfigXTize.pl
similarity index 100%
rename from kicker/kicker/kicker-3.5-kconfigXTize.pl
rename to kicker/kicker/kicker-3.5-tdeconfigXTize.pl
diff --git a/kicker/kicker/kickerrc.upd b/kicker/kicker/kickerrc.upd
index 282a52cb1..5b82f9e2c 100644
--- a/kicker/kicker/kickerrc.upd
+++ b/kicker/kicker/kickerrc.upd
@@ -14,9 +14,9 @@ Group=General
 Options=overwrite
 Script=kicker-3.5-taskbarEnums.pl,perl
 
-Id=kde_3_5_kconfigXTize
+Id=kde_3_5_tdeconfigXTize
 File=kickerrc
 Group=menus
-Script=kicker-3.5-kconfigXTize.pl,perl
+Script=kicker-3.5-tdeconfigXTize.pl,perl
 RemoveKey=DetailedEntriesNamesFirst
 RemoveKey=DetailedMenuEntries
diff --git a/kicker/kicker/ui/browser_dlg.cpp b/kicker/kicker/ui/browser_dlg.cpp
index 6aa246eb6..3ebe095dc 100644
--- a/kicker/kicker/ui/browser_dlg.cpp
+++ b/kicker/kicker/ui/browser_dlg.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kglobal.h>
 #include <klocale.h>
 #include <kicondialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
 
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index c6ca4ab32..9aa352500 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -28,12 +28,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kdirwatch.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <kmimetype.h>
 #include <konq_operations.h>
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index 3d33a825a..ee82bc91f 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -50,7 +50,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kpixmapeffect.h>
 #include <kaction.h>
 #include <kbookmarkmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 84c977331..eb87f02d0 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -40,7 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kaboutkde.h>
 #include <kaction.h>
 #include <kbookmarkmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 6f2c4eacb..f5bf25471 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -48,7 +48,7 @@
 #include <kaboutkde.h>
 #include <kaction.h>
 #include <kbookmarkmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
@@ -70,8 +70,8 @@
 #include <kbookmarkmanager.h>
 #include <kbookmark.h>
 #include <kprocess.h>
-#include <kio/jobclasses.h>
-#include <kio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/job.h>
 #include <dcopref.h>
 #include <konq_popupmenu.h>
 #include <konqbookmarkmanager.h>
@@ -3512,16 +3512,16 @@ bool KMenu::ensureServiceRunning(const TQString & service)
     TQDataStream arg(data, IO_WriteOnly);
     arg << service << URLs;
 
-    if ( !kapp->dcopClient()->call( "klauncher", "klauncher", "start_service_by_desktop_name(TQString,TQStringList)",
+    if ( !kapp->dcopClient()->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/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 1e77a1731..dfe3f4433 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdesycocaentry.h>
 #include <kservice.h>
 #include <kurldrag.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "global.h"
 #include "kicker.h"
diff --git a/kicker/libkicker/CMakeLists.txt b/kicker/libkicker/CMakeLists.txt
index 036095728..e2ec5a6ba 100644
--- a/kicker/libkicker/CMakeLists.txt
+++ b/kicker/libkicker/CMakeLists.txt
@@ -37,6 +37,6 @@ 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}
 )
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index f300df3a2..87f990b30 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kiconeffect.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <kservice.h>
 #include <ksimpleconfig.h>
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index e9481ea85..1f011da5a 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpixmap.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdialog.h>
 #include <kdirwatch.h>
diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index 032a2ab05..e4de35081 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -22,7 +22,7 @@
 #include "katesessionmenu.moc"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
diff --git a/kicker/menuext/konq-profiles/CMakeLists.txt b/kicker/menuext/konq-profiles/CMakeLists.txt
index 9154412c8..2847be4fe 100644
--- a/kicker/menuext/konq-profiles/CMakeLists.txt
+++ b/kicker/menuext/konq-profiles/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES konquerormenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menu
 
 tde_add_kpart( kickermenu_konqueror AUTOMOC
   SOURCES konqy_menu.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp
index a3c076741..4ed8c32e1 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.cpp
+++ b/kicker/menuext/konq-profiles/konqy_menu.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kapplication.h>
 #include <krun.h>
 #include <kstandarddirs.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <ksimpleconfig.h>
 
 #include <tqregexp.h>
diff --git a/kicker/menuext/konsole/CMakeLists.txt b/kicker/menuext/konsole/CMakeLists.txt
index e16884acf..9c2f7224f 100644
--- a/kicker/menuext/konsole/CMakeLists.txt
+++ b/kicker/menuext/konsole/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES konsolemenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuex
 
 tde_add_kpart( kickermenu_konsole AUTOMOC
   SOURCES konsole_mnu.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index dbaa1e434..d2fb755bb 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kapplication.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <krun.h>
 #include <kshell.h>
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
index e515e41f5..e12d6ebc1 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
@@ -1,4 +1,4 @@
-// Born as tdelibs/kio/kfile/kfilebookmarkhandler.cpp
+// Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.cpp
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,7 +29,7 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool )
 
     // 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, file );
     }
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.h b/kicker/menuext/konsole/konsolebookmarkhandler.h
index cc0b1886b..733e52442 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.h
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.h
@@ -1,4 +1,4 @@
-// Born as tdelibs/kio/kfile/kfilebookmarkhandler.h
+// Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.h
 
 #ifndef KONSOLEBOOKMARKHANDLER_H
 #define KONSOLEBOOKMARKHANDLER_H
diff --git a/kicker/menuext/recentdocs/CMakeLists.txt b/kicker/menuext/recentdocs/CMakeLists.txt
index ebefed9c6..4b3053efe 100644
--- a/kicker/menuext/recentdocs/CMakeLists.txt
+++ b/kicker/menuext/recentdocs/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES recentdocs.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext
 
 tde_add_kpart( kickermenu_recentdocs AUTOMOC
   SOURCES recentdocsmenu.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kicker/menuext/system/systemmenu.h b/kicker/menuext/system/systemmenu.h
index f25280989..1efbc3c57 100644
--- a/kicker/menuext/system/systemmenu.h
+++ b/kicker/menuext/system/systemmenu.h
@@ -23,7 +23,7 @@
 #include <kpanelmenu.h>
 #include <kurl.h>
 #include <kdirlister.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 class SystemMenu : public KPanelMenu
 {
diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp
index fb10e0f34..e611b039e 100644
--- a/kicker/menuext/tdeprint/print_mnu.cpp
+++ b/kicker/menuext/tdeprint/print_mnu.cpp
@@ -112,7 +112,7 @@ void PrintMenu::slotExec(int ID)
 	    kapp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig"));
 	    break;
         case PRINT_MANAGER_ID:
-            KRun::runCommand("kcmshell tde-printers.desktop");
+            KRun::runCommand("tdecmshell tde-printers.desktop");
             break;
         case PRINT_BROWSER_ID:
             KRun::runCommand("kfmclient openProfile filemanagement print:/", "kfmclient", "konqueror");
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 6215f9ba6..a1d68e98a 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqimage.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/kioslave/media/kfile-plugin/Makefile.am b/kioslave/media/kfile-plugin/Makefile.am
deleted file mode 100644
index 7f694e28b..000000000
--- a/kioslave/media/kfile-plugin/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-kde_module_LTLIBRARIES = kfile_media.la
-
-kfile_media_la_SOURCES = kfilemediaplugin.cpp
-kfile_media_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
-kfile_media_la_LIBADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la
-
-kdelnkdir = $(kde_servicesdir)
-kde_services_DATA = kfile_media.desktop
-
-INCLUDES = -I$(srcdir)/../libmediacommon $(all_includes)
-
-METASOURCES = AUTO
-noinst_HEADERS = kfilemediaplugin.h
diff --git a/kioslave/trash/kfile-plugin/Makefile.am b/kioslave/trash/kfile-plugin/Makefile.am
deleted file mode 100644
index 0668553a8..000000000
--- a/kioslave/trash/kfile-plugin/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-## Makefile.am for trash file meta info plugin
-
-AM_CPPFLAGS      = $(all_includes)
-
-kde_module_LTLIBRARIES = kfile_trash.la
-
-kfile_trash_la_SOURCES = kfile_trash.cpp
-kfile_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_trash_la_LIBADD = ../libtrashcommon.la $(LIB_KIO)
-
-METASOURCES = AUTO
-
-services_DATA = kfile_trash.desktop kfile_trash_system.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
index c3886a3c8..0ff5eb436 100644
--- a/klipper/CMakeLists.txt
+++ b/klipper/CMakeLists.txt
@@ -60,5 +60,5 @@ tde_add_library( klipper_common STATIC_PIC AUTOMOC
     toplevel.skel clipboardpoll.cpp history.cpp historyitem.cpp
     historystringitem.cpp klipperpopup.cpp popupproxy.cpp
     historyimageitem.cpp historyurlitem.cpp
-  LINK kio-shared ${XFIXES_LIBRARIES}
+  LINK tdeio-shared ${XFIXES_LIBRARIES}
 )
diff --git a/klipper/Makefile.am b/klipper/Makefile.am
index 45ef01f8a..83292c936 100644
--- a/klipper/Makefile.am
+++ b/klipper/Makefile.am
@@ -45,7 +45,7 @@ dummy.cpp:
 	echo > dummy.cpp
 
 # update script:
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = klipperrc.upd klippershortcuts.upd
 update_SCRIPTS = klipper-1-2.pl klipper-trinity1.sh
 
diff --git a/klipper/applet.cpp b/klipper/applet.cpp
index 2ec01c2a9..c6c1a0b7d 100644
--- a/klipper/applet.cpp
+++ b/klipper/applet.cpp
@@ -24,7 +24,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "toplevel.h"
 #include "history.h"
@@ -101,7 +101,7 @@ void KlipperApplet::about()
 }
 
 KlipperAppletWidget::KlipperAppletWidget( TQWidget* parent )
-// init() is called first, before KlipperWidget is called with ( parent, kconfig )
+// init() is called first, before KlipperWidget is called with ( parent, tdeconfig )
     : KlipperWidget( ( init(), parent ), new TDEConfig( "klipperrc" ))
 {
 }
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index 163c8eb5f..b7832aae5 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -34,7 +34,7 @@
 #include <kaboutdata.h>
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kipc.h>
 #include <kkeydialog.h>
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index cb891a33d..c2952a736 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -22,7 +22,7 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <ktextedit.h>
 #include <klocale.h>
diff --git a/kmenuedit/CMakeLists.txt b/kmenuedit/CMakeLists.txt
index 0cf7ec2df..e864464f8 100644
--- a/kmenuedit/CMakeLists.txt
+++ b/kmenuedit/CMakeLists.txt
@@ -54,5 +54,5 @@ tde_add_library( kmenueditcommon STATIC_PIC AUTOMOC
   SOURCES
     basictab.cpp treeview.cpp kmenuedit.cpp
     khotkeys.cpp menufile.cpp menuinfo.cpp
-  LINK kio-shared
+  LINK tdeio-shared
 )
diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp
index 9687384d9..bdee0e3b3 100644
--- a/kmenuedit/basictab.cpp
+++ b/kmenuedit/basictab.cpp
@@ -36,7 +36,7 @@
 #include <kicondialog.h>
 #include <kdesktopfile.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kcombobox.h>
 #include <kkeydialog.h>
 #include <kprocess.h>
diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp
index 018b69f0e..48af13124 100644
--- a/kmenuedit/kmenuedit.cpp
+++ b/kmenuedit/kmenuedit.cpp
@@ -22,7 +22,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
 #include <kglobal.h>
diff --git a/knetattach/CMakeLists.txt b/knetattach/CMakeLists.txt
index 37b0ca82e..c695dc4f7 100644
--- a/knetattach/CMakeLists.txt
+++ b/knetattach/CMakeLists.txt
@@ -30,6 +30,6 @@ install( FILES knetattach.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_executable( knetattach AUTOMOC
   SOURCES knetattach.ui main.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui
index 5197c7aee..5b6eb5491 100644
--- a/knetattach/knetattach.ui
+++ b/knetattach/knetattach.ui
@@ -406,7 +406,7 @@
     <tabstop>_useEncryption</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in implementation">kio/netaccess.h</include>
+    <include location="global" impldecl="in implementation">tdeio/netaccess.h</include>
     <include location="global" impldecl="in implementation">kmessagebox.h</include>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
     <include location="global" impldecl="in implementation">klocale.h</include>
diff --git a/konqueror/ChangeLog b/konqueror/ChangeLog
index cc734cffe..19c0a00eb 100644
--- a/konqueror/ChangeLog
+++ b/konqueror/ChangeLog
@@ -327,8 +327,8 @@ Sat Nov 25 17:38:27 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 2000-11-06  David Faure  <faure@kde.org>
 
 	* konq_operations.cc: statURL, calls a slot when it stat'ed
-	the url and created a kfileitem for it.
-	Used in doDrop when the destination's kfileitem is unknown. Fixes #14739.
+	the url and created a tdefileitem for it.
+	Used in doDrop when the destination's tdefileitem is unknown. Fixes #14739.
 	Also, KPropsDlg now does a similar thing when called with a KURL.
 
 2000-11-05  David Faure  <faure@kde.org>
diff --git a/konqueror/DESIGN b/konqueror/DESIGN
index 45ff6e47f..da257cb05 100644
--- a/konqueror/DESIGN
+++ b/konqueror/DESIGN
@@ -25,7 +25,7 @@ The KonqView contains the child part, which can be :
 Where to find those classes
 ===========================
 
-konq_run.* : Re-implementation of KRun (see libkio) for konqueror.
+konq_run.* : Re-implementation of KRun (see libtdeio) for konqueror.
 	   Responsible for finding appropriate view<->mimetype bindings.
 konq_view.* : KonqView, class used by KonqMainView to handle child views
 konq_frame.* : KonqFrame and KonqFrameHeader (handles view-statusbar).
@@ -39,8 +39,8 @@ dirtree/*  : KonqDirTree, the directory tree
 Libs used by konqueror
 ======================
 
-tdecore, tdeui, kfile, tdehtml, tdeparts - usual stuff :)
-libkio - I/O stuff, mimetypes, services
+tdecore, tdeui, tdefile, tdehtml, tdeparts - usual stuff :)
+libtdeio - I/O stuff, mimetypes, services
 libkonq - bookmarks, properties dialog, templates ("new") menu, icon view widget
 
 How konqueror opens URLs
diff --git a/konqueror/TODO b/konqueror/TODO
index 725abeb4a..fad57be2d 100644
--- a/konqueror/TODO
+++ b/konqueror/TODO
@@ -34,7 +34,7 @@ dirtree:
 
 - Create dynamic items when browsing non-local URLs (FTP etc.)
 
-kpropsdlg (kfile):
+kpropsdlg (tdefile):
 ======
 
 - Maybe add GUI (in kpropertiesdialog probably) for user defined actions in .desktop
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index fed36a1e2..ab602eb94 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -13,7 +13,7 @@
 #include <kiconloader.h>
 #include <kurifilter.h>
 #include <ktrader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <assert.h>
 #include <tqfile.h>
@@ -281,12 +281,12 @@ TQString KonqAboutPageFactory::specs()
           .arg( i18n("<A HREF=\"%1\">Cascading Style Sheets</A> (CSS 1, partially CSS 2)").arg("http://www.w3.org/Style/CSS/") )
           .arg( i18n("built-in") )
           .arg( i18n("<A HREF=\"%1\">ECMA-262</A> Edition 3 (roughly equals JavaScript 1.5)").arg("http://www.ecma.ch/ecma1/STAND/ECMA-262.HTM") )
-          .arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell tdehtml_java_js") )
-          .arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.").arg("exec:/kcmshell tdehtml_java_js") ) // leave the double backslashes here, they are necessary for javascript !
+          .arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.").arg("exec:/tdecmshell tdehtml_java_js") )
+          .arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.").arg("exec:/tdecmshell tdehtml_java_js") ) // leave the double backslashes here, they are necessary for javascript !
           .arg( i18n("Secure <A HREF=\"%1\">Java</A><SUP>&reg;</SUP> support").arg("http://java.sun.com") )
           .arg( i18n("JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2\">IBM</A> or <A HREF=\"%3\">Sun</A>)")
                       .arg("http://www.blackdown.org").arg("http://www.ibm.com").arg("http://java.sun.com") )
-          .arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell tdehtml_java_js") ) // TODO Maybe test if Java is enabled ?
+          .arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.").arg("exec:/tdecmshell tdehtml_java_js") ) // TODO Maybe test if Java is enabled ?
           .arg( i18n("Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>&reg;</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>&reg;</SUP></A>Video, etc.)")
                       .arg("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash")
                       .arg("http://www.real.com").arg("http://www.real.com")
@@ -306,7 +306,7 @@ TQString KonqAboutPageFactory::specs()
           .arg( i18n("Transfer protocols") )
           .arg( i18n("HTTP 1.1 (including gzip/bzip2 compression)") )
           .arg( i18n("FTP") )
-          .arg( i18n("and <A HREF=\"%1\">many more...</A>").arg("exec:/kcmshell ioslaveinfo") )
+          .arg( i18n("and <A HREF=\"%1\">many more...</A>").arg("exec:/tdecmshell ioslaveinfo") )
           .arg( i18n("URL-Completion") )
           .arg( i18n("Manual"))
 	  .arg( i18n("Popup"))
@@ -366,7 +366,7 @@ TQString KonqAboutPageFactory::tips()
 		      "using Google, for the search phrase \"KDE\". There are a lot of "
 		      "Web-Shortcuts predefined to make searching for software or looking "
 		      "up certain words in an encyclopedia a breeze. You can even "
-                      "<a href=\"%1\">create your own</a> Web-Shortcuts." ).arg("exec:/kcmshell ebrowsing") )
+                      "<a href=\"%1\">create your own</a> Web-Shortcuts." ).arg("exec:/tdecmshell ebrowsing") )
 	  .arg( i18n( "Use the magnifier button <img width='16' height='16' src=\"%1\"> in the"
 		      " toolbar to increase the font size on your web page.").arg(viewmag_icon_path) )
 	  .arg( i18n( "When you want to paste a new address into the Location toolbar you might want to "
@@ -386,11 +386,11 @@ TQString KonqAboutPageFactory::tips()
 		      ", or create your own ones." ).arg(view_left_right_icon_path))
 	  .arg( i18n( "Use the <a href=\"%1\">user-agent</a> feature if the website you are visiting "
                       "asks you to use a different browser "
-		      "(and do not forget to send a complaint to the webmaster!)" ).arg("exec:/kcmshell useragent") )
+		      "(and do not forget to send a complaint to the webmaster!)" ).arg("exec:/tdecmshell useragent") )
 	  .arg( i18n( "The <img width='16' height='16' src=\"%1\"> History in your SideBar ensures "
 		      "that you can keep track of the pages you have visited recently.").arg(history_icon_path) )
 	  .arg( i18n( "Use a caching <a href=\"%1\">proxy</a> to speed up your"
-		      " Internet connection.").arg("exec:/kcmshell proxy") )
+		      " Internet connection.").arg("exec:/tdecmshell proxy") )
 	  .arg( i18n( "Advanced users will appreciate the Konsole which you can embed into "
 		      "Konqueror (Window -> <img width='16' height='16' SRC=\"%1\"> Show "
  		      "Terminal Emulator).").arg(openterm_icon_path))
@@ -437,7 +437,7 @@ KonqAboutPage::KonqAboutPage( //KonqMainWindow *
 	setCharset(codec->name(), true);
     else
 	setCharset("iso-8859-1", true);
-    // about:blah isn't a kioslave -> disable View source
+    // about:blah isn't a tdeioslave -> disable View source
     KAction * act = actionCollection()->action("viewDocumentSource");
     if ( act )
       act->setEnabled( false );
diff --git a/konqueror/client/CMakeLists.txt b/konqueror/client/CMakeLists.txt
index 558a5d7f9..3ae477d32 100644
--- a/konqueror/client/CMakeLists.txt
+++ b/konqueror/client/CMakeLists.txt
@@ -23,8 +23,8 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kfmclient_3_2.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
-install( PROGRAMS kfmclient_3_2_update.sh DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+install( FILES kfmclient_3_2.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
+install( PROGRAMS kfmclient_3_2_update.sh DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
 
 
 ##### kfmclient (tdeinit) #######################
@@ -39,5 +39,5 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
 )
diff --git a/konqueror/client/Makefile.am b/konqueror/client/Makefile.am
index bef42b01c..059bfa8ec 100644
--- a/konqueror/client/Makefile.am
+++ b/konqueror/client/Makefile.am
@@ -18,6 +18,6 @@ KDesktopIface_DIR = $(top_srcdir)/kdesktop
 messages:
 	$(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kfmclient_3_2.upd
 update_SCRIPTS = kfmclient_3_2_update.sh
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index 649115d5c..6e8ccc2ac 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cc
@@ -25,7 +25,7 @@
 
 #include <tqdir.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kcmdlineargs.h>
 #include <kpropertiesdialog.h>
 #include <klocale.h>
@@ -35,7 +35,7 @@
 #include <kopenwith.h>
 #include <kurlrequesterdlg.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <kservice.h>
diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h
index 425f54d1d..56bef37dc 100644
--- a/konqueror/iconview/konq_iconview.h
+++ b/konqueror/iconview/konq_iconview.h
@@ -26,7 +26,7 @@
 #include <kmimetyperesolver.h>
 #include <tqptrdict.h>
 #include <tqptrlist.h>
-#include <kfileivi.h>
+#include <tdefileivi.h>
 
 class KonqPropsView;
 class KFileItem;
diff --git a/konqueror/keditbookmarks/CMakeLists.txt b/konqueror/keditbookmarks/CMakeLists.txt
index e5954898b..90583b734 100644
--- a/konqueror/keditbookmarks/CMakeLists.txt
+++ b/konqueror/keditbookmarks/CMakeLists.txt
@@ -37,7 +37,7 @@ set( target kbookmarkmerger )
 
 tde_add_executable( ${target}
   SOURCES kbookmarkmerger.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/konqueror/keditbookmarks/DESIGN b/konqueror/keditbookmarks/DESIGN
index 723a279d7..4ebe5e9c5 100644
--- a/konqueror/keditbookmarks/DESIGN
+++ b/konqueror/keditbookmarks/DESIGN
@@ -7,11 +7,11 @@ four main layers:
 various other thingies:
    search           : incremental search implementation
    favicons         : iterating action implementation using bookmarkiterator
-   importers        : forwarders to kio/bookmarks code
-   exporters        : forwarders to kio/bookmarks code, and html export code
+   importers        : forwarders to tdeio/bookmarks code
+   exporters        : forwarders to tdeio/bookmarks code, and html export code
    dcop             : dcop handling, internal interface
    bookmarkiterator : is a baseclass for iterating actions, of sorts...
-   updater          : favicon updating base stuff - kio/tdehtml crap
+   updater          : favicon updating base stuff - tdeio/tdehtml crap
    testlink         : link testing stuff
 
 3 different selection styles:
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 4bcd50735..23e6fe16d 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -45,7 +45,7 @@
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kkeydialog.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index edc4a66bb..7780196ca 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.cpp
+++ b/konqueror/keditbookmarks/bookmarkinfo.cpp
@@ -42,7 +42,7 @@
 #include <kedittoolbar.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <kbookmarkdrag.h>
 #include <kbookmarkmanager.h>
diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp
index 3a9a613c1..4c96765e2 100644
--- a/konqueror/keditbookmarks/importers.cpp
+++ b/konqueror/keditbookmarks/importers.cpp
@@ -30,7 +30,7 @@
 #include <klocale.h>
 
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <kbookmarkmanager.h>
 
diff --git a/konqueror/keditbookmarks/importers.h b/konqueror/keditbookmarks/importers.h
index ef23f5527..eee00823a 100644
--- a/konqueror/keditbookmarks/importers.h
+++ b/konqueror/keditbookmarks/importers.h
@@ -24,7 +24,7 @@
 
 #include "commands.h"
 #include <klocale.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <kcommand.h>
 #include <kbookmark.h>
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 1fa31e967..3a2b14d5e 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -43,7 +43,7 @@
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kkeydialog.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
diff --git a/konqueror/keditbookmarks/testlink.h b/konqueror/keditbookmarks/testlink.h
index a808202e1..a224279df 100644
--- a/konqueror/keditbookmarks/testlink.h
+++ b/konqueror/keditbookmarks/testlink.h
@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kbookmark.h>
 
 #include "listview.h"
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index 8ae218611..eea4d8c58 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -49,7 +49,7 @@
 #include <kedittoolbar.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <kdebug.h>
 
diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp
index 4060b08a8..6d14d89ae 100644
--- a/konqueror/keditbookmarks/updater.cpp
+++ b/konqueror/keditbookmarks/updater.cpp
@@ -30,7 +30,7 @@
 #include <klocale.h>
 #include <kapplication.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tdeparts/part.h>
 #include <tdeparts/componentfactory.h>
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc
index b07135366..6199b59ae 100644
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cc
@@ -20,7 +20,7 @@
 #include <tqpainter.h>
 #include <tqstyle.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcompletionbox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc
index 120f36e4e..d7b36c37b 100644
--- a/konqueror/konq_extensionmanager.cc
+++ b/konqueror/konq_extensionmanager.cc
@@ -17,7 +17,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdeparts/componentfactory.h>
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 09ea92c87..c5e1d7d7a 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -94,13 +94,13 @@
 #include <kurlrequester.h>
 #include <kuserprofile.h>
 #include <twin.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kpopupmenu.h>
 #include <kprocess.h>
-#include <kio/scheduler.h>
-#include <kio/netaccess.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/netaccess.h>
 #include <kaccelmanager.h>
 #include <kstringhandler.h>
 #include <kuser.h>
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index bb850195b..d1b6e0c01 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 #include <tqguardedptr.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include "konq_openurlrequest.h"
 
 #include <tdeparts/mainwindow.h>
diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc
index 07d0b5b77..5ca6c426f 100644
--- a/konqueror/konq_profiledlg.cc
+++ b/konqueror/konq_profiledlg.cc
@@ -31,7 +31,7 @@
 #include <klistview.h>
 #include <kdebug.h>
 #include <kstdguiitem.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>
diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc
index 2082821a8..42b9222ae 100644
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cc
@@ -19,7 +19,7 @@
 
 #include "konq_listview.h"
 #include <konq_settings.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <assert.h>
diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc
index cb942dfe8..9a87baa17 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@@ -22,12 +22,12 @@
 #include "konq_listview.h"
 
 #include <klocale.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kdebug.h>
 #include <kaction.h>
 #include <kservicetype.h>
 #include <kuserprofile.h>
-#include <kio/metainfojob.h>
+#include <tdeio/metainfojob.h>
 
 #include <tqstringlist.h>
 
@@ -349,7 +349,7 @@ void KonqInfoListViewWidget::determineCounts(const KFileItemList& list)
 #warning ### change this
 #endif
         // this will load the plugin which we don't need because we delegate
-        // the job to the kioslave
+        // the job to the tdeioslave
         (*it).hasPlugin = prov->plugin(it.key());
 
         if ( (*it).hasPlugin)
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index 9bdc60e3d..cbfcc446b 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -24,7 +24,7 @@
 #include <tqvaluevector.h>
 
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klistview.h>
 #include <tdeparts/browserextension.h>
 #include <konq_propsview.h>
diff --git a/konqueror/listview/konq_textviewitem.h b/konqueror/listview/konq_textviewitem.h
index f091781e2..cbeda1730 100644
--- a/konqueror/listview/konq_textviewitem.h
+++ b/konqueror/listview/konq_textviewitem.h
@@ -22,7 +22,7 @@
 
 #include <tqlistview.h>
 #include <tqstring.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include "konq_listviewitems.h"
 #include "konq_textviewwidget.h"
diff --git a/konqueror/preloader/CMakeLists.txt b/konqueror/preloader/CMakeLists.txt
index d8e33ef40..09dca4593 100644
--- a/konqueror/preloader/CMakeLists.txt
+++ b/konqueror/preloader/CMakeLists.txt
@@ -40,6 +40,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK konqueror_intern-static kio-shared tdeinit_kded-shared
+  LINK konqueror_intern-static tdeio-shared tdeinit_kded-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cc
index 35b2352e1..aa3d97169 100644
--- a/konqueror/preloader/preloader.cc
+++ b/konqueror/preloader/preloader.cc
@@ -20,7 +20,7 @@
 #include "preloader.h"
 #include "konq_settingsxt.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopref.h>
 #include <kapplication.h>
 #include <dcopclient.h>
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index 838f2aad7..ec9d6ef2a 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -28,14 +28,14 @@
 #include <kaction.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcharsets.h>
 #include <kpopupmenu.h>
 #include <dcopclient.h>
 #include <kgenericfactory.h>
 #include <kprotocolmanager.h>
 #include <kprotocolinfo.h>
-#include <kio/slaveconfig.h>
+#include <tdeio/slaveconfig.h>
 #include <konq_dirpart.h>
 #include <tdeparts/browserextension.h>
 
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
index 16975c405..efd95a88b 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
@@ -24,7 +24,7 @@
 #include <kapplication.h>
 #include "kshellcmddialog.h"
 #include <kgenericfactory.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name,
 	                          const TQStringList & )
diff --git a/konqueror/sidebar/CMakeLists.txt b/konqueror/sidebar/CMakeLists.txt
index fa9c3cbd5..45e483d5a 100644
--- a/konqueror/sidebar/CMakeLists.txt
+++ b/konqueror/sidebar/CMakeLists.txt
@@ -36,8 +36,8 @@ install( FILES konqsidebarplugin.h DESTINATION ${INCLUDE_INSTALL_DIR} )
 install( FILES konqsidebartng.rc DESTINATION ${CONFIG_INSTALL_DIR} )
 install( FILES konq_sidebartng.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES .version DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/entries )
-install( FILES konqsidebartng.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
-install( PROGRAMS move_konqsidebartng_entries.sh DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+install( FILES konqsidebartng.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
+install( PROGRAMS move_konqsidebartng_entries.sh DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
 
 
 ##### konqsidebarplugin (lib) ###################
@@ -66,6 +66,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK konqsidebarplugin-shared konq-shared kio-shared tdeutils-shared
+  LINK konqsidebarplugin-shared konq-shared tdeio-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/konqueror/sidebar/Makefile.am b/konqueror/sidebar/Makefile.am
index 702320841..1cfc7f6ac 100644
--- a/konqueror/sidebar/Makefile.am
+++ b/konqueror/sidebar/Makefile.am
@@ -39,6 +39,6 @@ partrc_DATA = konqsidebartng.rc
 versiondir = $(kde_datadir)/konqsidebartng/entries/
 version_DATA=.version
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = konqsidebartng.upd
 update_SCRIPTS = move_konqsidebartng_entries.sh
diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h
index 0433261c7..7540ef398 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -24,9 +24,9 @@
 #include <tqstring.h>
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqguardedptr.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 class KonqSidebarPluginPrivate;
 
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 6a5ecd22d..44b3cca35 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -36,13 +36,13 @@
 #include <kmessagebox.h>
 #include <kinputdialog.h>
 #include <konq_events.h>
-#include <kfileitem.h>
-#include <kio/netaccess.h>
+#include <tdefileitem.h>
+#include <tdeio/netaccess.h>
 #include <kpopupmenu.h>
 #include <kprocess.h>
 #include <kurlrequesterdlg.h>
 #include <kinputdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdesktopfile.h>
 #include "konqsidebar.h"
 
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 9c31acdf5..57109e7cb 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -27,7 +27,7 @@
 #include <kuserprofile.h>
 #include <tqapplication.h>
 #include <tqclipboard.h>
-#include <kio/paste.h>
+#include <tdeio/paste.h>
 #include <tqfile.h>
 #include <tqpainter.h>
 #include <kiconloader.h>
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
index af915aa46..89b5dcbaf 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
@@ -20,7 +20,7 @@
 #define dirtree_module_h
 
 #include <konq_sidebartreemodule.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <tqpixmap.h>
 #include <tqdict.h>
 #include <tqptrdict.h>
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 30d96f060..fa7f8ba39 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <kaction.h>
 #include <kcursor.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
@@ -278,7 +278,7 @@ void KonqSidebarHistoryModule::slotRemoveEntry()
 void KonqSidebarHistoryModule::slotPreferences()
 {
     // Run the history sidebar settings.
-    KRun::run( "kcmshell kcmhistory", KURL::List() );
+    KRun::run( "tdecmshell kcmhistory", KURL::List() );
 }
 
 void KonqSidebarHistoryModule::slotSortByName()
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index 701f72776..b51c118e2 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -1,6 +1,6 @@
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <dcopclient.h>
 
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index 967616bd5..b2e92c6fd 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -29,7 +29,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kfontdialog.h>
 #include <kgenericfactory.h>
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.desktop b/konqueror/sidebar/trees/history_module/kcmhistory.desktop
index 38b224555..c6c020988 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.desktop
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=history
 Type=Application
-Exec=kcmshell kcmhistory
+Exec=tdecmshell kcmhistory
 
 X-TDE-ModuleType=Library
 X-TDE-Library=history
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index b156c071d..b53ce2635 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -38,7 +38,7 @@
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <kpropertiesdialog.h>
diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
index 8c9b787f8..d6eb37857 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@@ -20,7 +20,7 @@
 #include "konq_sidebartreemodule.h"
 #include <kdebug.h>
 #include <kdirnotify_stub.h>
-#include <kio/paste.h>
+#include <tdeio/paste.h>
 #include <konq_operations.h>
 #include <kprotocolinfo.h>
 #include <kurldrag.h>
diff --git a/konsole/CMakeLists.txt b/konsole/CMakeLists.txt
index 6f0900d3c..65f2e1715 100644
--- a/konsole/CMakeLists.txt
+++ b/konsole/CMakeLists.txt
@@ -34,12 +34,12 @@ install( FILES
 
 install( FILES
     konsole.upd
-  DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+  DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
 
 
 install( PROGRAMS
     schemaStrip.pl
-  DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+  DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
 
 
 install( FILES
diff --git a/konsole/Makefile.am b/konsole/Makefile.am
index 6abe0ad60..cb5fccb8e 100644
--- a/konsole/Makefile.am
+++ b/konsole/Makefile.am
@@ -7,7 +7,7 @@ kde_servicetypes_DATA = terminalemulator.desktop
 
 update_DATA = konsole.upd
 update_SCRIPTS = schemaStrip.pl
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 servicesdir = $(kde_servicesdir)/kded
 services_DATA = kwrited.desktop
diff --git a/konsole/konsole/CMakeLists.txt b/konsole/konsole/CMakeLists.txt
index 4992cdc43..9473db291 100644
--- a/konsole/konsole/CMakeLists.txt
+++ b/konsole/konsole/CMakeLists.txt
@@ -74,5 +74,5 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdeprint-shared kio-shared ${XRENDER_LIBRARIES} dl
+  LINK tdeprint-shared tdeio-shared ${XRENDER_LIBRARIES} dl
 )
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index c00349022..32d9d9643 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -81,7 +81,7 @@
 #include <kglobalsettings.h>
 #include <kshortcut.h>
 #include <kurldrag.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqlabel.h>
 #include <tqtimer.h>
 
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 0e6265321..81449c514 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -94,7 +94,7 @@ Time to start a requirement list.
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequesterdlg.h>
 
 #include <kfontdialog.h>
@@ -138,7 +138,7 @@ Time to start a requirement list.
 #include <tdeparts/componentfactory.h>
 #include <kcharsets.h>
 #include <kcolordialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "konsole.h"
 #include <netwm.h>
@@ -247,7 +247,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
 ,wallpaperSource(0)
 ,sessionIdCounter(0)
 ,monitorSilenceSeconds(10)
-,s_kconfigSchema("")
+,s_tdeconfigSchema("")
 ,m_tabViewMode(ShowIconAndText)
 ,b_dynamicTabHide(false)
 ,b_autoResizeTabs(false)
@@ -1512,8 +1512,8 @@ void Konsole::saveProperties(TDEConfig* config) {
   }
   config->writeEntry("Fullscreen",b_fullscreen);
   config->writeEntry("defaultfont", (se->widget())->getVTFont());
-  s_kconfigSchema = colors->find( se->schemaNo() )->relPath();
-  config->writeEntry("schema",s_kconfigSchema);
+  s_tdeconfigSchema = colors->find( se->schemaNo() )->relPath();
+  config->writeEntry("schema",s_tdeconfigSchema);
   config->writeEntry("scrollbar",n_scroll);
   config->writeEntry("tabbar",n_tabbar);
   config->writeEntry("bellmode",n_bell);
@@ -1618,13 +1618,13 @@ void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool glo
       defaultFont = config->readFontEntry("defaultfont", &tmpFont);
 
       //set the schema
-      s_kconfigSchema=config->readEntry("schema");
-      ColorSchema* sch = colors->find(schema.isEmpty() ? s_kconfigSchema : schema);
+      s_tdeconfigSchema=config->readEntry("schema");
+      ColorSchema* sch = colors->find(schema.isEmpty() ? s_tdeconfigSchema : schema);
       if (!sch)
       {
          sch = (ColorSchema*)colors->at(0);  //the default one
-         kdWarning() << "Could not find schema named " <<s_kconfigSchema<<"; using "<<sch->relPath()<<endl;
-         s_kconfigSchema = sch->relPath();
+         kdWarning() << "Could not find schema named " <<s_tdeconfigSchema<<"; using "<<sch->relPath()<<endl;
+         s_tdeconfigSchema = sch->relPath();
       }
       if (sch->hasSchemaFileChanged()) sch->rereadSchemaFile();
       s_schema = sch->relPath();
@@ -2073,7 +2073,7 @@ void Konsole::slotConfigure()
 {
   TQStringList args;
   args << "kcmkonsole";
-  TDEApplication::tdeinitExec( "kcmshell", args );
+  TDEApplication::tdeinitExec( "tdecmshell", args );
 }
 
 void Konsole::reparseConfiguration()
@@ -2125,13 +2125,13 @@ void Konsole::reparseConfiguration()
   m_shortcuts->readShortcutSettings();
 
   // User may have changed Schema->Set as default schema
-  s_kconfigSchema = TDEGlobal::config()->readEntry("schema");
-  ColorSchema* sch = colors->find(s_kconfigSchema);
+  s_tdeconfigSchema = TDEGlobal::config()->readEntry("schema");
+  ColorSchema* sch = colors->find(s_tdeconfigSchema);
   if (!sch)
   {
      sch = (ColorSchema*)colors->at(0);  //the default one
-     kdWarning() << "Could not find schema named " <<s_kconfigSchema<<"; using "<<sch->relPath()<<endl;
-     s_kconfigSchema = sch->relPath();
+     kdWarning() << "Could not find schema named " <<s_tdeconfigSchema<<"; using "<<sch->relPath()<<endl;
+     s_tdeconfigSchema = sch->relPath();
   }
   if (sch->hasSchemaFileChanged()) sch->rereadSchemaFile();
   s_schema = sch->relPath();
@@ -2819,7 +2819,7 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis
   TQString emu = "xterm";
   TQString icon = "konsole";
   TQString key;
-  TQString sch = s_kconfigSchema;
+  TQString sch = s_tdeconfigSchema;
   TQString txt;
   TQString cwd;
   TQFont font = defaultFont;
@@ -3572,7 +3572,7 @@ void Konsole::setSchema(int numb, TEWidget* tewidget)
   {
     s = (ColorSchema*)colors->at(0);
     kdWarning() << "No schema with serial #"<<numb<<", using "<<s->relPath()<<" (#"<<s->numb()<<")." << endl;
-    s_kconfigSchema = s->relPath();
+    s_tdeconfigSchema = s->relPath();
   }
 
   if (s->hasSchemaFileChanged())
@@ -3589,7 +3589,7 @@ void Konsole::setSchema(const TQString & path)
   {
      s = (ColorSchema*)colors->at(0);  //the default one
      kdWarning() << "No schema with the name " <<path<<", using "<<s->relPath()<<endl;
-     s_kconfigSchema = s->relPath();
+     s_tdeconfigSchema = s->relPath();
   }
   if (s->hasSchemaFileChanged())
   {
diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h
index f24f823ce..d64c30968 100644
--- a/konsole/konsole/konsole.h
+++ b/konsole/konsole/konsole.h
@@ -393,7 +393,7 @@ private:
   int         monitorSilenceSeconds;
 
   TQString     s_schema;
-  TQString     s_kconfigSchema;
+  TQString     s_tdeconfigSchema;
   TQString     s_word_seps;			// characters that are considered part of a word
   TQString     pmPath; // pixmap path
   TQString     dropText;
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index 6562ea0d9..c20982ba2 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -46,7 +46,7 @@
 #include <tqpushbutton.h>
 #include <kpopupmenu.h>
 #include <krootpixmap.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 
 // We can't use the ARGB32 visual when embedded in another application
@@ -574,8 +574,8 @@ void konsolePart::readProperties()
 
   TQString schema = config->readEntry("Schema");
 
-  s_kconfigSchema=config->readEntry("schema");
-  ColorSchema* sch = colors->find(schema.isEmpty() ? s_kconfigSchema : schema);
+  s_tdeconfigSchema=config->readEntry("schema");
+  ColorSchema* sch = colors->find(schema.isEmpty() ? s_tdeconfigSchema : schema);
   if (!sch) {
     sch=(ColorSchema*)colors->at(0);  //the default one
   }
@@ -638,7 +638,7 @@ void konsolePart::saveProperties()
     config->writeEntry("keytab",n_keytab);
     config->writeEntry("has frame",b_framevis);
     config->writeEntry("LineSpacing", te->lineSpacing());
-    config->writeEntry("schema",s_kconfigSchema);
+    config->writeEntry("schema",s_tdeconfigSchema);
     config->writeEntry("scrollbar",n_scroll);
     config->writeEntry("wordseps",s_word_seps);
     config->writeEntry("encoding",n_encoding);
@@ -720,7 +720,7 @@ void konsolePart::keytab_menu_activated(int item)
 void konsolePart::schema_menu_activated(int item)
 {
   setSchema(item);
-  s_kconfigSchema = s_schema; // This is the new default
+  s_tdeconfigSchema = s_schema; // This is the new default
 }
 
 void konsolePart::schema_menu_check()
diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h
index fc76b565b..a8dfde83a 100644
--- a/konsole/konsole/konsole_part.h
+++ b/konsole/konsole/konsole_part.h
@@ -170,7 +170,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
 
     bool        b_framevis:1;
diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp
index b5960727e..e348e440e 100644
--- a/konsole/konsole/konsolebookmarkhandler.cpp
+++ b/konsole/konsole/konsolebookmarkhandler.cpp
@@ -16,13 +16,13 @@
     Boston, MA 02110-1301, USA.
 */
 
-// Born as tdelibs/kio/kfile/kfilebookmarkhandler.cpp
+// Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.cpp
 
 #include <kpopupmenu.h>
 #include <kstandarddirs.h>
 #include <kshell.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <kdebug.h>
 #include <tqfile.h>
 
@@ -41,7 +41,7 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel
     // TODO: Consider removing for KDE4
     TQString new_bm_file = locateLocal( "data", "konsole/bookmarks.xml" );
     if ( !TQFile::exists( new_bm_file ) ) {
-        TQString old_bm_file = locateLocal( "data", "kfile/bookmarks.xml" );
+        TQString old_bm_file = locateLocal( "data", "tdefile/bookmarks.xml" );
         if ( TQFile::exists( old_bm_file ) )
             // We want sync here... 
             if ( !TDEIO::NetAccess::copy( KURL( old_bm_file ), 
diff --git a/konsole/konsole/konsolebookmarkhandler.h b/konsole/konsole/konsolebookmarkhandler.h
index e8d2845bd..5f99dfb31 100644
--- a/konsole/konsole/konsolebookmarkhandler.h
+++ b/konsole/konsole/konsolebookmarkhandler.h
@@ -16,7 +16,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-// Born as tdelibs/kio/kfile/kfilebookmarkhandler.h
+// Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.h
 
 #ifndef KONSOLEBOOKMARKHANDLER_H
 #define KONSOLEBOOKMARKHANDLER_H
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index f3dba695a..9e12a340d 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -39,7 +39,7 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 
 #include <config.h>
diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp
index 2d3e3901f..638bc498f 100644
--- a/konsole/konsole/schema.cpp
+++ b/konsole/konsole/schema.cpp
@@ -57,7 +57,7 @@
 #include <tqdatetime.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 
diff --git a/kpager/config.cpp b/kpager/config.cpp
index e92d1ce4f..d665da9d3 100644
--- a/kpager/config.cpp
+++ b/kpager/config.cpp
@@ -31,7 +31,7 @@
 
 #include <kdialogbase.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kseparator.h>
 #include <kapplication.h>
 #include <kdebug.h>
diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp
index f713ca4f6..f2e643eb7 100644
--- a/kpager/desktop.cpp
+++ b/kpager/desktop.cpp
@@ -32,7 +32,7 @@
 #include <kglobalsettings.h>
 #include <twinmodule.h>
 #include <twin.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <ksharedpixmap.h>
diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp
index e2477a254..e75f1a0f1 100644
--- a/kpager/kpager.cpp
+++ b/kpager/kpager.cpp
@@ -47,7 +47,7 @@
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <twin.h>
diff --git a/kpersonalizer/CMakeLists.txt b/kpersonalizer/CMakeLists.txt
index 27a5ede93..4c151b493 100644
--- a/kpersonalizer/CMakeLists.txt
+++ b/kpersonalizer/CMakeLists.txt
@@ -40,6 +40,6 @@ tde_add_executable( kpersonalizer AUTOMOC
     kpersonalizer.cpp main.cpp kfindlanguage.cpp
     kcountrypagedlg.ui kospagedlg.ui keyecandypagedlg.ui
     kstylepagedlg.ui krefinepagedlg.ui ksysinfo.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index 818fd02e3..b48e84b22 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -167,7 +167,7 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan
 			kapp->dcopClient()->attach();
 		// tdesycoca needs to be rebuilt
 		TDEProcess proc;
-		proc << TQString::fromLatin1("kbuildsycoca");
+		proc << TQString::fromLatin1("tdebuildsycoca");
 		proc.start(TDEProcess::DontCare);
 		kdDebug() << "KLocaleConfig::save : sending signal to kdesktop" << endl;
 		// inform kicker and kdeskop about the new language
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index 2ad4a486b..47c0ce37c 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -34,7 +34,7 @@
 #include <klistview.h>
 #include <krun.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <stdlib.h>
 
diff --git a/kpersonalizer/krefinepage.cpp b/kpersonalizer/krefinepage.cpp
index d6038deae..8ea304140 100644
--- a/kpersonalizer/krefinepage.cpp
+++ b/kpersonalizer/krefinepage.cpp
@@ -18,7 +18,7 @@
 #include <tqpushbutton.h>
 
 #include <krun.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp
index 1b10d3082..eff55cb39 100644
--- a/kpersonalizer/kstylepage.cpp
+++ b/kpersonalizer/kstylepage.cpp
@@ -25,7 +25,7 @@
 #include <tqstyle.h>
 #include <tqobjectlist.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
 #include <kglobal.h>
@@ -187,17 +187,17 @@ void KStylePage::saveColors(bool curSettings){
 
 	////////////////////////////////////////////////////
 	// KDE-1.x support
-	KSimpleConfig *kconfig =
+	KSimpleConfig *tdeconfig =
 	new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" );
-	kconfig->setGroup( "General" );
-	kconfig->writeEntry("background", toSave->background );
-	kconfig->writeEntry("selectBackground", toSave->selectBackground );
-	kconfig->writeEntry("foreground", toSave->foreground );
-	kconfig->writeEntry("windowForeground", toSave->windowForeground );
-	kconfig->writeEntry("windowBackground", toSave->windowBackground );
-	kconfig->writeEntry("selectForeground", toSave->selectForeground );
-	kconfig->sync();
-	delete kconfig;
+	tdeconfig->setGroup( "General" );
+	tdeconfig->writeEntry("background", toSave->background );
+	tdeconfig->writeEntry("selectBackground", toSave->selectBackground );
+	tdeconfig->writeEntry("foreground", toSave->foreground );
+	tdeconfig->writeEntry("windowForeground", toSave->windowForeground );
+	tdeconfig->writeEntry("windowBackground", toSave->windowBackground );
+	tdeconfig->writeEntry("selectForeground", toSave->selectForeground );
+	tdeconfig->sync();
+	delete tdeconfig;
 
 	config->setGroup("KDE");
 	// write the color scheme filename and the contrast, default 7, otherwise from file
diff --git a/kreadconfig/kreadconfig.cpp b/kreadconfig/kreadconfig.cpp
index 5e41137a6..f0b0c22dd 100644
--- a/kreadconfig/kreadconfig.cpp
+++ b/kreadconfig/kreadconfig.cpp
@@ -24,7 +24,7 @@
  *		rm someFile
  *	fi
  */
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
diff --git a/kreadconfig/kwriteconfig.cpp b/kreadconfig/kwriteconfig.cpp
index 9e8d75a1e..d554483bc 100644
--- a/kreadconfig/kwriteconfig.cpp
+++ b/kreadconfig/kwriteconfig.cpp
@@ -6,7 +6,7 @@
  * License: GPL
  *
  */
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
diff --git a/ksmserver/Makefile.am b/ksmserver/Makefile.am
index 502ffb8e9..d9d4a55e3 100644
--- a/ksmserver/Makefile.am
+++ b/ksmserver/Makefile.am
@@ -38,7 +38,7 @@ pics_DATA = shutdownkonq.png
 
 update_DATA = ksmserver.upd
 update_SCRIPTS = move_session_config.sh
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 
 EXTRA_PROGRAMS = testsh
diff --git a/ksmserver/README b/ksmserver/README
index 29202255b..b2c26273b 100644
--- a/ksmserver/README
+++ b/ksmserver/README
@@ -54,7 +54,7 @@ follow the startup order (but note that this is just a documentation
 which may get outdated, so in case of doubts the source wins ;) ).
 
 The starttde scripts already launches tdeinit, which in turns launches
-TDE daemons like dcopserver, klauncher and kded. Kded loads autoloaded
+TDE daemons like dcopserver, tdelauncher and kded. Kded loads autoloaded
 kded modules, i.e. those that have X-TDE-Kded-autoload=true in .desktop
 files. The exact way autoloading works is controlled by X-TDE-Kded-phase=,
 which may be 0, 1 or 2 (the default). Kded phase 0 means the module is
@@ -68,13 +68,13 @@ Startkde also launches kcminit, which performs initialization done by kcontrol
 modules. There are three kcminit phases, 0, 1 and 2, controlled
 by X-TDE-Init-Phase= in the .desktop file, which defaults to 1. Phase 0 kcminit
 modules should be only those that really need to be run early in the startup
-process (and those should probably actually use kstartupconfig in starttde
+process (and those should probably actually use tdestartupconfig in starttde
 to be done even before tdeinit and daemons). After executing phase 0
 modules kcminit returns and waits.
 
 When ksmserver is launched, the first thing it does is launching
 the window manager, as the WM is necessary before any windows are possibly
-shown. When the WM is ready, ksmserver tells klauncher to perform autostart
+shown. When the WM is ready, ksmserver tells tdelauncher to perform autostart
 phase 0 ($TDEHOME/share/autostart). There are 3 autostart phases, 0, 1 and 2,
 defined by X-TDE-autostart-phase, defaulting to 2. Phase 0 is reserved only
 for the actual visible base components of TDE, i.e. KDesktop and Kicker,
@@ -84,7 +84,7 @@ waiting for autostart phase 0 until both KDesktop and Kicker are ready.
 
 Next step is telling the waiting kcminit to perform phase 1 - all kcminit
 modules that should be executed before TDE startup is considered done.
-After that ksmserver tells klauncher to perform autostart phase 1,
+After that ksmserver tells tdelauncher to perform autostart phase 1,
 i.e. launching normal components of TDE that should be available right
 after TDE startup, and after this session restore is performed,
 i.e. launching all applications that were running during last session
@@ -92,7 +92,7 @@ saving (usually logout).
 
 By this time TDE session is considered to be more or less ready and
 ksmserver does the knotify starttde event (i.e. plays the login sound).
-It also tells klauncher to perform autostart phase 2, kded to load all
+It also tells tdelauncher to perform autostart phase 2, kded to load all
 remaining autoload (i.e. kded phase 2) modules, kcminit to execute
 kcminit phase 2 (kcontrol modules that do initialization that can wait,
 like launching daemons) and kdesktop to execute the user Autostart folder.
diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp
index 27e45611c..80f4e0984 100644
--- a/ksmserver/legacy.cpp
+++ b/ksmserver/legacy.cpp
@@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <twinmodule.h>
 
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index 402f395e5..942c2fade 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -22,7 +22,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "server.h"
 
 
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index 6f93549d9..4d70b365d 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -68,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <unistd.h>
 #include <kapplication.h>
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index 2d9ce713a..729090961 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -68,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <unistd.h>
 #include <kapplication.h>
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index 254aa9966..c5a01353f 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -38,7 +38,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #include <tqeventloop.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
@@ -52,7 +52,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #include <kimageeffect.h>
 #include <kdialog.h>
 #include <kseparator.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <dcopclient.h>
 #include <dcopref.h>
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index fd383aa54..98829c419 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -67,7 +67,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <unistd.h>
 #include <kapplication.h>
diff --git a/ksmserver/startupdlg.cpp b/ksmserver/startupdlg.cpp
index 2d42dd3a2..0ec5d02d5 100644
--- a/ksmserver/startupdlg.cpp
+++ b/ksmserver/startupdlg.cpp
@@ -29,7 +29,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #include <tqeventloop.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
@@ -43,7 +43,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #include <kimageeffect.h>
 #include <kdialog.h>
 #include <kseparator.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <dcopclient.h>
 #include <dcopref.h>
diff --git a/ksplashml/kcmksplash/CMakeLists.txt b/ksplashml/kcmksplash/CMakeLists.txt
index 45822facd..864346089 100644
--- a/ksplashml/kcmksplash/CMakeLists.txt
+++ b/ksplashml/kcmksplash/CMakeLists.txt
@@ -33,6 +33,6 @@ install( FILES ksplashthememgr.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_ksplashthemes AUTOMOC
   SOURCES installer.cpp main.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp
index 1e17a301a..73c5da99e 100644
--- a/ksplashml/kcmksplash/installer.cpp
+++ b/ksplashml/kcmksplash/installer.cpp
@@ -20,7 +20,7 @@
 #include "installer.h"
 
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -30,7 +30,7 @@
 #include <ktar.h>
 #include <ktrader.h>
 #include <kurldrag.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 ThemeListBox::ThemeListBox(TQWidget *parent)
   : KListBox(parent)
diff --git a/ksplashml/kcmksplash/ksplashthememgr.desktop b/ksplashml/kcmksplash/ksplashthememgr.desktop
index 5413c9924..295af7a6a 100644
--- a/ksplashml/kcmksplash/ksplashthememgr.desktop
+++ b/ksplashml/kcmksplash/ksplashthememgr.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Icon=ksplash
-Exec=kcmshell ksplashthememgr
+Exec=tdecmshell ksplashthememgr
 DocPath=ksplashml/themes.html
 
 X-TDE-ModuleType=Library
diff --git a/ksplashml/main.cpp b/ksplashml/main.cpp
index f184fb7a6..8dd826d40 100644
--- a/ksplashml/main.cpp
+++ b/ksplashml/main.cpp
@@ -20,7 +20,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <dcopclient.h>
diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index 39839cca6..830516355 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kglobalsettings.h>
diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp
index df7556bac..ca00f3406 100644
--- a/ksplashml/themeengine/objkstheme.cpp
+++ b/ksplashml/themeengine/objkstheme.cpp
@@ -11,7 +11,7 @@
 
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/ksplashml/themeengine/redmond/CMakeLists.txt b/ksplashml/themeengine/redmond/CMakeLists.txt
index b8947a0aa..a6e0b0229 100644
--- a/ksplashml/themeengine/redmond/CMakeLists.txt
+++ b/ksplashml/themeengine/redmond/CMakeLists.txt
@@ -33,6 +33,6 @@ install( FILES ksplashredmond.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 tde_add_kpart( ksplashredmond AUTOMOC
   SOURCES previewredmond.cpp themeredmond.cpp
-  LINK ksplashthemes-shared kio-shared
+  LINK ksplashthemes-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp
index 0328c0365..4b19a3012 100644
--- a/ksplashml/themeengine/redmond/themeredmond.cpp
+++ b/ksplashml/themeengine/redmond/themeredmond.cpp
@@ -14,7 +14,7 @@
 #include <unistd.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kfontcombo.h>
diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp
index 26c47eea0..df8067ace 100644
--- a/ksplashml/themeengine/standard/themestandard.cpp
+++ b/ksplashml/themeengine/standard/themestandard.cpp
@@ -16,7 +16,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqdesktopwidget.h>
 #include <tqlabel.h>
diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp
index b9a7c208f..ff069803a 100644
--- a/ksplashml/themeengine/themeengine.cpp
+++ b/ksplashml/themeengine/themeengine.cpp
@@ -15,7 +15,7 @@
 
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <twin.h>
diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp
index 21c899adc..611ddb345 100644
--- a/ksplashml/themeengine/unified/themeunified.cpp
+++ b/ksplashml/themeengine/unified/themeunified.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kglobalsettings.h>
diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp
index cb71de070..4cbfc2513 100644
--- a/ksplashml/wndmain.cpp
+++ b/ksplashml/wndmain.cpp
@@ -12,7 +12,7 @@
 #include <unistd.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/ksysguard/gui/SensorDisplayLib/CMakeLists.txt b/ksysguard/gui/SensorDisplayLib/CMakeLists.txt
index b6cfacf4f..0fe416a0b 100644
--- a/ksysguard/gui/SensorDisplayLib/CMakeLists.txt
+++ b/ksysguard/gui/SensorDisplayLib/CMakeLists.txt
@@ -36,5 +36,5 @@ tde_add_library( sensordisplays STATIC_PIC AUTOMOC
     ListViewSettings.cc SignalPlotter.cc ListViewSettingsWidget.ui
     LogFileSettings.ui MultiMeterSettingsWidget.ui SensorLoggerDlgWidget.ui
     SensorLoggerSettingsWidget.ui
-  LINK ksgrd-shared kio-shared
+  LINK ksgrd-shared tdeio-shared
 )
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
index 86b5b17ee..5bb68b394 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
@@ -186,8 +186,8 @@ ProcessList::ProcessList(TQWidget *parent, const char* name)
 		aliases.insert("tdm", new TQString("kdeapp"));
 		aliases.insert("khotkeys", new TQString("kdeapp"));
 		aliases.insert("kio_file", new TQString("kdeapp"));
-		aliases.insert("kio_uiserver", new TQString("kdeapp"));
-		aliases.insert("klauncher", new TQString("kdeapp"));
+		aliases.insert("tdeio_uiserver", new TQString("kdeapp"));
+		aliases.insert("tdelauncher", new TQString("kdeapp"));
 		aliases.insert("ksmserver", new TQString("kdeapp"));
 		aliases.insert("kwrapper", new TQString("kdeapp"));
 		aliases.insert("kwrited", new TQString("kdeapp"));
diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc
index 7271bab8e..123c3f2d4 100644
--- a/ksysguard/gui/Workspace.cc
+++ b/ksysguard/gui/Workspace.cc
@@ -26,8 +26,8 @@
 #include <tqwhatsthis.h>
 
 #include <kdebug.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/ksysguard/gui/ksgrd/SensorManager.h b/ksysguard/gui/ksgrd/SensorManager.h
index a362de351..1e859c638 100644
--- a/ksysguard/gui/ksgrd/SensorManager.h
+++ b/ksysguard/gui/ksgrd/SensorManager.h
@@ -21,7 +21,7 @@
 #ifndef KSG_SENSORMANAGER_H
 #define KSG_SENSORMANAGER_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqdict.h>
 #include <tqobject.h>
diff --git a/ksysguard/gui/ksgrd/StyleEngine.cc b/ksysguard/gui/ksgrd/StyleEngine.cc
index 8b0613cf9..3d4bb6c81 100644
--- a/ksysguard/gui/ksgrd/StyleEngine.cc
+++ b/ksysguard/gui/ksgrd/StyleEngine.cc
@@ -25,7 +25,7 @@
 #include <tqpushbutton.h>
 #include <tqspinbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include "StyleSettings.h"
diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp
index 86d6fd750..e5270196d 100644
--- a/ksystraycmd/ksystraycmd.cpp
+++ b/ksystraycmd/ksystraycmd.cpp
@@ -11,7 +11,7 @@
 #include <kpopupmenu.h>
 #include <kprocess.h>
 #include <twinmodule.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksystemtray.h>
 
 #include <netwm.h>
diff --git a/ktip/tips b/ktip/tips
index 2d54819a4..5067d82c0 100644
--- a/ktip/tips
+++ b/ktip/tips
@@ -924,7 +924,7 @@ increase the speed, or any other key to stop the scrolling.
 
 <tip category="General|Help">
 <html>
-<p>You can use Konqueror's help:/ kioslave to have quick and easy
+<p>You can use Konqueror's help:/ tdeioslave to have quick and easy
 access to an application's handbook by typing <b>help:/</b>, directly
 followed by the application name, in the Location bar. So, for example
 to view the handbook for kwrite simply type help:/kwrite.</p>
diff --git a/kxkb/CMakeLists.txt b/kxkb/CMakeLists.txt
index f36a003bd..9ba350e94 100644
--- a/kxkb/CMakeLists.txt
+++ b/kxkb/CMakeLists.txt
@@ -40,7 +40,7 @@ tde_add_kpart( kcm_keyboard AUTOMOC
     extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp
     pixmap.cpp kcmlayout.cpp kcmlayoutwidget.ui
     kcmmisc.cpp kcmmiscwidget.ui
-  LINK kio-shared xkbfile ${XTEST_LIBRARIES}
+  LINK tdeio-shared xkbfile ${XTEST_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp
index c73fb620f..a87844875 100644
--- a/kxkb/kcmlayout.cpp
+++ b/kxkb/kcmlayout.cpp
@@ -16,7 +16,7 @@
 
 #include <kkeydialog.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp
index e3f8f66c8..780fad7e8 100644
--- a/kxkb/kcmmisc.cpp
+++ b/kxkb/kcmmisc.cpp
@@ -38,7 +38,7 @@
 #include <tqradiobutton.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <kapplication.h>
 #include <kglobal.h>
diff --git a/kxkb/keyboard.desktop b/kxkb/keyboard.desktop
index 0b1c8bd33..d087acdfc 100644
--- a/kxkb/keyboard.desktop
+++ b/kxkb/keyboard.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell keyboard
+Exec=tdecmshell keyboard
 Icon=keyboard
 Type=Application
 DocPath=kcontrol/keyboard/index.html
diff --git a/kxkb/keyboard_layout.desktop b/kxkb/keyboard_layout.desktop
index 1080dbdd3..3486ca845 100644
--- a/kxkb/keyboard_layout.desktop
+++ b/kxkb/keyboard_layout.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell keyboard_layout
+Exec=tdecmshell keyboard_layout
 Icon=keyboard
 Type=Application
 DocPath=kxkb/index.html
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp
index 7e9b11fa9..4e5ad5192 100644
--- a/kxkb/kxkb.cpp
+++ b/kxkb/kxkb.cpp
@@ -46,7 +46,7 @@ DESCRIPTION
 #include <kaction.h>
 #include <kpopupmenu.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "x11helper.h"
 #include "kxkb.h"
@@ -269,7 +269,7 @@ void KXKBApp::menuActivated(int id)
 	else if (id == KxkbLabelController::CONFIG_MENU_ID)
     {
         TDEProcess p;
-        p << "kcmshell" << "keyboard_layout";
+        p << "tdecmshell" << "keyboard_layout";
         p.start(TDEProcess::DontCare);
 	}
 	else if (id == KxkbLabelController::HELP_MENU_ID)
diff --git a/kxkb/kxkbconfig.cpp b/kxkb/kxkbconfig.cpp
index 5ddfe8b9a..517f0ccdd 100644
--- a/kxkb/kxkbconfig.cpp
+++ b/kxkb/kxkbconfig.cpp
@@ -15,7 +15,7 @@
 #include <tqstringlist.h>
 #include <tqdict.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "kxkbconfig.h"
diff --git a/libkonq/CMakeLists.txt b/libkonq/CMakeLists.txt
index b1b9b4a47..4da045169 100644
--- a/libkonq/CMakeLists.txt
+++ b/libkonq/CMakeLists.txt
@@ -33,7 +33,7 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    konq_popupmenu.h knewmenu.h kfileivi.h konq_drag.h
+    konq_popupmenu.h knewmenu.h tdefileivi.h konq_drag.h
     konq_iconviewwidget.h konq_defaults.h konq_settings.h
     konq_operations.h libkonq_export.h konq_dirpart.h
     konq_propsview.h konq_events.h konq_undo.h
@@ -53,7 +53,7 @@ install( FILES konqpopupmenuplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DI
 
 tde_add_library( konq SHARED AUTOMOC
   SOURCES
-    konq_popupmenu.cc knewmenu.cc konq_xmlguiclient.cc kfileivi.cc
+    konq_popupmenu.cc knewmenu.cc konq_xmlguiclient.cc tdefileivi.cc
     konq_iconviewwidget.cc konq_settings.cc konq_drag.cc konq_operations.cc
     konq_dirpart.cc konq_propsview.cc konq_events.cc konq_bgnddlg.cc konq_undo.cc
     konq_undo.skel konq_historymgr.cc konq_historycomm.cc konq_historycomm.skel
diff --git a/libkonq/DESIGN b/libkonq/DESIGN
index 0f9fa893b..b925226ba 100644
--- a/libkonq/DESIGN
+++ b/libkonq/DESIGN
@@ -1,5 +1,5 @@
 libkonq is the construction kit for a file manager 
-(together with libkio, which is at a lower level)
+(together with libtdeio, which is at a lower level)
 
 It is used by konqueror, of course, but also by kdesktop, which is 
 another file manager in fact, and by apps that want to use
@@ -23,7 +23,7 @@ konq_operations.*: common operations to all views, like deleting files, and
 konq_undo.*     : undo feature for file operations
 
 3) icons
-kfileivi.*      : icon representing a file (inherits QListViewItem and 
+tdefileivi.*      : icon representing a file (inherits QListViewItem and 
                   uses KFileItem for holding file information)
 konq_iconviewwidget.* : the specialisation of QIconView that knows about files.
                   Basic widget for icon views in konqueror and kdesktop.
diff --git a/libkonq/Makefile.am b/libkonq/Makefile.am
index e34e62e08..327c97450 100644
--- a/libkonq/Makefile.am
+++ b/libkonq/Makefile.am
@@ -25,7 +25,7 @@ libkonq_la_LIBADD = $(LIB_KPARTS)
 
 libkonq_la_SOURCES = konq_popupmenu.cc knewmenu.cc \
    konq_xmlguiclient.cc\
-   kfileivi.cc konq_iconviewwidget.cc konq_settings.cc konq_drag.cc  \
+   tdefileivi.cc konq_iconviewwidget.cc konq_settings.cc konq_drag.cc  \
    konq_operations.cc \
    konq_dirpart.cc konq_propsview.cc konq_events.cc konq_bgnddlg.cc \
    konq_undo.cc konq_undo.skel \
@@ -43,7 +43,7 @@ servicetypedir = $(kde_servicetypesdir)
 METASOURCES = AUTO
 
 include_HEADERS = konq_popupmenu.h knewmenu.h \
-    kfileivi.h konq_drag.h konq_iconviewwidget.h \
+    tdefileivi.h konq_drag.h konq_iconviewwidget.h \
     konq_defaults.h konq_settings.h \
     konq_operations.h libkonq_export.h \
     konq_dirpart.h konq_propsview.h konq_events.h \
@@ -67,6 +67,6 @@ noinst_HEADERS = konq_sound.h
 messages:
 	$(XGETTEXT) *.cc *.h -o $(podir)/libkonq.pot
 
-DOXYGEN_REFERENCES = dcop tdecore kio/bookmarks
+DOXYGEN_REFERENCES = dcop tdecore tdeio/bookmarks
 include ../admin/Doxyfile.am
 
diff --git a/libkonq/favicons/Makefile.am b/libkonq/favicons/Makefile.am
index a53c7faf1..6676fd54f 100644
--- a/libkonq/favicons/Makefile.am
+++ b/libkonq/favicons/Makefile.am
@@ -12,4 +12,4 @@ services_DATA = favicons.desktop
 
 update_DATA = favicons.upd
 update_SCRIPTS = move_favicons.sh
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp
index 1bf9feb83..7bc0bbc22 100644
--- a/libkonq/favicons/favicons.cpp
+++ b/libkonq/favicons/favicons.cpp
@@ -31,7 +31,7 @@
 #include <kimageio.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "favicons.moc"
 
diff --git a/libkonq/kivdirectoryoverlay.cc b/libkonq/kivdirectoryoverlay.cc
index cfc2a05e2..c162a4261 100644
--- a/libkonq/kivdirectoryoverlay.cc
+++ b/libkonq/kivdirectoryoverlay.cc
@@ -23,8 +23,8 @@
 #include <tqbitmap.h>
 #include <tqimage.h>
 
-#include <kfileivi.h>
-#include <kfileitem.h>
+#include <tdefileivi.h>
+#include <tdefileitem.h>
 #include <kapplication.h>
 #include <kdirlister.h>
 #include <kstandarddirs.h>
diff --git a/libkonq/kivdirectoryoverlay.h b/libkonq/kivdirectoryoverlay.h
index 209958b35..1734f8108 100644
--- a/libkonq/kivdirectoryoverlay.h
+++ b/libkonq/kivdirectoryoverlay.h
@@ -20,7 +20,7 @@
 #ifndef _KIVDIRECTORYOVERLAY_H_
 #define _KIVDIRECTORYOVERLAY_H_
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <libkonq_export.h>
 
 #include <tqdict.h>
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc
index f962adafc..5620a650d 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cc
@@ -31,8 +31,8 @@
 #include <kpopupmenu.h>
 #include <krun.h>
 
-#include <kio/job.h>
-#include <kio/renamedlg.h>
+#include <tdeio/job.h>
+#include <tdeio/renamedlg.h>
 
 #include <kpropertiesdialog.h>
 #include "konq_operations.h"
diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc
index 59fc097b8..2257d3f56 100644
--- a/libkonq/konq_dirpart.cc
+++ b/libkonq/konq_dirpart.cc
@@ -22,7 +22,7 @@
 #include "konq_propsview.h"
 #include "konq_settings.h"
 
-#include <kio/paste.h>
+#include <tdeio/paste.h>
 #include <kapplication.h>
 #include <kaction.h>
 #include <kdatastream.h>
diff --git a/libkonq/konq_dirpart.h b/libkonq/konq_dirpart.h
index ffe176224..12e9de49d 100644
--- a/libkonq/konq_dirpart.h
+++ b/libkonq/konq_dirpart.h
@@ -23,9 +23,9 @@
 #include <tqstring.h>
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdatastream.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <libkonq_export.h>
 
 class KDirLister;
diff --git a/libkonq/konq_events.cc b/libkonq/konq_events.cc
index f608a8cdc..17e0f3381 100644
--- a/libkonq/konq_events.cc
+++ b/libkonq/konq_events.cc
@@ -1,5 +1,5 @@
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include "konq_events.h"
 
diff --git a/libkonq/konq_faviconmgr.cc b/libkonq/konq_faviconmgr.cc
index 37b01741f..cf7370bc5 100644
--- a/libkonq/konq_faviconmgr.cc
+++ b/libkonq/konq_faviconmgr.cc
@@ -19,7 +19,7 @@
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kmimetype.h>
 
diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cc
index c576a043a..6dc470d17 100644
--- a/libkonq/konq_filetip.cc
+++ b/libkonq/konq_filetip.cc
@@ -21,7 +21,7 @@
 
 #include <konq_filetip.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
diff --git a/libkonq/konq_filetip.h b/libkonq/konq_filetip.h
index 93c82780b..4bbc9d0e2 100644
--- a/libkonq/konq_filetip.h
+++ b/libkonq/konq_filetip.h
@@ -24,7 +24,7 @@
 
 #include <tqframe.h>
 #include <tqpixmap.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 
 #include <libkonq_export.h>
 
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index b82610d33..34f5791a6 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -35,8 +35,8 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kio/previewjob.h>
-#include <kfileivi.h>
+#include <tdeio/previewjob.h>
+#include <tdefileivi.h>
 #include <konq_settings.h>
 #include <konq_drag.h>
 #include <kglobalsettings.h>
diff --git a/libkonq/konq_iconviewwidget.h b/libkonq/konq_iconviewwidget.h
index 1a4884db7..c7c280ca6 100644
--- a/libkonq/konq_iconviewwidget.h
+++ b/libkonq/konq_iconviewwidget.h
@@ -24,8 +24,8 @@
 #include <kiconview.h>
 #include <kurl.h>
 #include <tqguardedptr.h>
-#include <kfileitem.h>
-#include <kio/jobclasses.h>
+#include <tdefileitem.h>
+#include <tdeio/jobclasses.h>
 #include <libkonq_export.h>
 
 class KonqFMSettings;
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc
index 40a30aa10..cbd38a60a 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cc
@@ -41,16 +41,16 @@
 #include <kapplication.h>
 #include <kipc.h>
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdesktopfile.h>
 #include <kurldrag.h>
 #include <kglobalsettings.h>
 #include <kimageio.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/paste.h>
-#include <kio/netaccess.h>
-#include <kio/renamedlg.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/paste.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/renamedlg.h>
 #include <konq_drag.h>
 #include <konq_iconviewwidget.h>
 #include <kprotocolinfo.h>
diff --git a/libkonq/konq_operations.h b/libkonq/konq_operations.h
index 1ffd14690..c6cef7431 100644
--- a/libkonq/konq_operations.h
+++ b/libkonq/konq_operations.h
@@ -192,7 +192,7 @@ private:
     KIOPasteInfo * m_pasteInfo;
 };
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 /// Restore multiple trashed files
 class KonqMultiRestoreJob : public TDEIO::Job
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index 294e43337..e11ef9046 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -37,7 +37,7 @@
 
 #include <assert.h>
 
-#include <kfileshare.h>
+#include <tdefileshare.h>
 #include <kprocess.h>
 
 #include "kpropertiesdialog.h"
@@ -1130,7 +1130,7 @@ void KonqPopupMenu::slotPopupProperties()
 
 KPropertiesDialog* KonqPopupMenu::showPropertiesDialog()
 {
-    // It may be that the kfileitem was created by hand
+    // It may be that the tdefileitem was created by hand
     // (see KonqKfmIconView::slotMouseButtonPressed)
     // In that case, we can get more precise info in the properties
     // (like permissions) if we stat the URL.
diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h
index aaa7f6f07..130e9ae6f 100644
--- a/libkonq/konq_popupmenu.h
+++ b/libkonq/konq_popupmenu.h
@@ -29,7 +29,7 @@
 
 #include <tqstringlist.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kmimetype.h> // for KDEDesktopMimeType
 #include <libkonq_export.h>
 
diff --git a/libkonq/konq_undo.cc b/libkonq/konq_undo.cc
index 4c3599816..4909a3d76 100644
--- a/libkonq/konq_undo.cc
+++ b/libkonq/konq_undo.cc
@@ -21,7 +21,7 @@
 
 #undef Always
 
-#include <kio/uiserver_stub.h>
+#include <tdeio/uiserver_stub.h>
 #include "konq_operations.h"
 
 #include <assert.h>
@@ -34,10 +34,10 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kipc.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kdirnotify_stub.h>
 
 inline const char *dcopTypeName( const KonqCommand & ) { return "KonqCommand"; }
@@ -166,7 +166,7 @@ class KonqUndoManager::KonqUndoManagerPrivate
 public:
   KonqUndoManagerPrivate()
   {
-      m_uiserver = new UIServer_stub( "kio_uiserver", "UIServer" );
+      m_uiserver = new UIServer_stub( "tdeio_uiserver", "UIServer" );
       m_undoJob = 0;
   }
   ~KonqUndoManagerPrivate()
diff --git a/libkonq/kfileivi.cc b/libkonq/tdefileivi.cc
similarity index 99%
rename from libkonq/kfileivi.cc
rename to libkonq/tdefileivi.cc
index 84691faa5..f38fd766d 100644
--- a/libkonq/kfileivi.cc
+++ b/libkonq/tdefileivi.cc
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kfileivi.h"
+#include "tdefileivi.h"
 #include "kivdirectoryoverlay.h"
 #include "konq_iconviewwidget.h"
 #include "konq_operations.h"
@@ -27,7 +27,7 @@
 
 #include <kurldrag.h>
 #include <kiconeffect.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdebug.h>
 #include <krun.h>
 
diff --git a/libkonq/kfileivi.h b/libkonq/tdefileivi.h
similarity index 98%
rename from libkonq/kfileivi.h
rename to libkonq/tdefileivi.h
index 6c16907ec..e9e0cf420 100644
--- a/libkonq/kfileivi.h
+++ b/libkonq/tdefileivi.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kfileivi_h__
-#define __kfileivi_h__
+#ifndef __tdefileivi_h__
+#define __tdefileivi_h__
 
 #include <kiconview.h>
 #include <kiconloader.h>
@@ -229,7 +229,7 @@ private:
 
     /**
      * Private data for KFileIVI
-     * Implementation in kfileivi.cc
+     * Implementation in tdefileivi.cc
      */
     struct Private;
 
diff --git a/migratekde3 b/migratekde3
index 4b7d48e30..89555a10b 100755
--- a/migratekde3
+++ b/migratekde3
@@ -20,7 +20,7 @@
 # If KDialog is unavailable until after $HOME/.trinity exists, such
 # as after running KPersonalizer, then this script will not help.
 # Also, KPersonalizer automatically creates a skeleton profile directory
-# when launched, as does some command line tools such as kconf_update.
+# when launched, as does some command line tools such as tdeconf_update.
 #
 # Additionally, this script was written mainly from a command line
 # login perspective. This script and concept needs testing and
@@ -443,7 +443,7 @@ if [ -n "$KDE3_PROFILE" ] && [ -d "$KDE3_PROFILE" ]; then
     mv $HOME/.trinity/share/config/kritarc $HOME/.trinity/share/config/chalkrc 2>/dev/null
     mv $HOME/.trinity/share/apps/krita $HOME/.trinity/share/apps/chalk 2>/dev/null
   fi
-  # Note: Don't run kconf_update, which is run automatically when starting TDE.
+  # Note: Don't run tdeconf_update, which is run automatically when starting TDE.
   # Note: Don't run any profile R14 updates: starttde does that through the r14-xdg-update script.
   echo
   echo "Done!" 1>&2
diff --git a/nsplugins/CMakeLists.txt b/nsplugins/CMakeLists.txt
index 9ed66c7bb..278ac1f88 100644
--- a/nsplugins/CMakeLists.txt
+++ b/nsplugins/CMakeLists.txt
@@ -54,7 +54,7 @@ tde_add_kpart( kcm_nsplugins AUTOMOC
 
 tde_add_executable( nspluginscan AUTOMOC
   SOURCES pluginscan.cpp
-  LINK pluginpaths-static kio-shared Xt
+  LINK pluginpaths-static tdeio-shared Xt
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp
index 16234c62f..4613dc617 100644
--- a/nsplugins/kcm_nsplugins.cpp
+++ b/nsplugins/kcm_nsplugins.cpp
@@ -25,7 +25,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequester.h>
 
 #include <tqwhatsthis.h>
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index 115490552..87191a5d7 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -33,7 +33,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopclient.h>
 #include <dcopstub.h>
 #include <tqlayout.h>
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index 104619f29..97d56ad53 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -25,8 +25,8 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <tdeparts/browserinterface.h>
 #include <tdeparts/browserextension.h>
diff --git a/nsplugins/plugin_paths.cpp b/nsplugins/plugin_paths.cpp
index 121fc9d64..905d90551 100644
--- a/nsplugins/plugin_paths.cpp
+++ b/nsplugins/plugin_paths.cpp
@@ -25,7 +25,7 @@
 
 #include "plugin_paths.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <stdlib.h>
 
 TQStringList getSearchPaths()
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index 867497ef4..aa836c36b 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -45,7 +45,7 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <klibloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcrash.h>
 #include <kdesktopfile.h>
 #include <kservicetype.h>
@@ -657,5 +657,5 @@ int main( int argc, char **argv )
     if ( !dcc->isAttached() )
         dcc->attach();
     // Tel kded to update sycoca database.
-    dcc->send("kded", "kbuildsycoca", "recreate()", TQByteArray());
+    dcc->send("kded", "tdebuildsycoca", "recreate()", TQByteArray());
 }
diff --git a/nsplugins/tdehtml_plugins.desktop b/nsplugins/tdehtml_plugins.desktop
index b38c16160..b79fa3100 100644
--- a/nsplugins/tdehtml_plugins.desktop
+++ b/nsplugins/tdehtml_plugins.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/tdehtml/index.html#kbrowse-plugins
 Icon=konqueror
-Exec=kcmshell tdehtml_plugins
+Exec=tdecmshell tdehtml_plugins
 
 X-TDE-ModuleType=Library
 X-TDE-Library=konqhtml
diff --git a/nsplugins/viewer/CMakeLists.txt b/nsplugins/viewer/CMakeLists.txt
index cfd95de6c..14cd69135 100644
--- a/nsplugins/viewer/CMakeLists.txt
+++ b/nsplugins/viewer/CMakeLists.txt
@@ -30,6 +30,6 @@ tde_add_executable( nspluginviewer AUTOMOC
     ../NSPluginCallbackIface.stub NSPluginClassIface.skel
     nsplugin.cpp viewer.cpp kxt.cpp qxteventloop.cpp
     glibevents.cpp
-  LINK tdeparts-shared kio-shared ${GLIB2_LIBRARIES} Xt dl
+  LINK tdeparts-shared tdeio-shared ${GLIB2_LIBRARIES} Xt dl
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 535502a87..874ac53ea 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -44,10 +44,10 @@
 #endif
 
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klibloader.h>
 #include <klocale.h>
 #include <kprocess.h>
diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h
index 6eb5d6be3..96bb1da15 100644
--- a/nsplugins/viewer/nsplugin.h
+++ b/nsplugins/viewer/nsplugin.h
@@ -42,7 +42,7 @@
 #include <tqguardedptr.h>
 
 #include <tdeparts/browserextension.h>  // for URLArgs
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 
 #define XP_UNIX
diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp
index af72ef6cc..9e73c5542 100644
--- a/nsplugins/viewer/viewer.cpp
+++ b/nsplugins/viewer/viewer.cpp
@@ -44,7 +44,7 @@
 #ifdef Bool
 #undef Bool
 #endif
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #if TQT_VERSION < 0x030100
 #include "kxt.h"
diff --git a/starttde b/starttde
index bf127f239..7106efa4b 100644
--- a/starttde
+++ b/starttde
@@ -98,7 +98,7 @@ fi
 # tdeinit is used to fork off processes which improves memory usage
 # and startup time.
 #
-# * tdeinit starts the dcopserver and klauncher first.
+# * tdeinit starts the dcopserver and tdelauncher first.
 # * Then kded is started. kded is responsible for keeping the sycoca
 #   database up to date. When an up to date database is present it goes
 #   into the background and the startup continues.
@@ -274,7 +274,7 @@ if [ -d "$tdehome" ]; then
 else
   echo "[starttde] Creating $tdehome" 1>&2
 fi
-# Please see kstartupconfig source for usage.
+# Please see tdestartupconfig source for usage.
 mkdir -m 700 -p "$tdehome"
 mkdir -m 700 -p "$tdehome/share"
 mkdir -m 700 -p "$tdehome/share/config"
@@ -290,9 +290,9 @@ kcmrandrrc [Screen2]
 kcmrandrrc [Screen3]
 kcmfonts General forceFontDPI 0
 EOF
-$TDEDIR/bin/kstartupconfig
+$TDEDIR/bin/tdestartupconfig
 if test $? -ne 0; then
-  xmessage -center -geometry 500x100 "Could not start kstartupconfig. Check your installation."
+  xmessage -center -geometry 500x100 "Could not start tdestartupconfig. Check your installation."
 fi
 # $tdehome/share/config/startupconfig should exist but avoid script failure if not.
 if [ -r "$tdehome/share/config/startupconfig" ]; then
diff --git a/tdeinit/displayconfig.cpp b/tdeinit/displayconfig.cpp
index 565e02e85..215d763e2 100644
--- a/tdeinit/displayconfig.cpp
+++ b/tdeinit/displayconfig.cpp
@@ -29,7 +29,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <pwd.h>
 #include <signal.h>
diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp
index 4790db560..f42d258a0 100644
--- a/tdeinit/phase1.cpp
+++ b/tdeinit/phase1.cpp
@@ -29,7 +29,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <pwd.h>
 #include <signal.h>
diff --git a/kioslave/CMakeLists.txt b/tdeioslave/CMakeLists.txt
similarity index 100%
rename from kioslave/CMakeLists.txt
rename to tdeioslave/CMakeLists.txt
diff --git a/kioslave/ConfigureChecks.cmake b/tdeioslave/ConfigureChecks.cmake
similarity index 100%
rename from kioslave/ConfigureChecks.cmake
rename to tdeioslave/ConfigureChecks.cmake
diff --git a/kioslave/DEBUG.howto b/tdeioslave/DEBUG.howto
similarity index 90%
rename from kioslave/DEBUG.howto
rename to tdeioslave/DEBUG.howto
index d15cb7034..6218f2fba 100644
--- a/kioslave/DEBUG.howto
+++ b/tdeioslave/DEBUG.howto
@@ -3,7 +3,7 @@ This document describes how you can debug an io-slave with gdb.
 How does an io-slave get started?
 =================================
 
-Your application request 'klauncher' via DCOP for a slave. If 'klauncher' does 
+Your application request 'tdelauncher' via DCOP for a slave. If 'tdelauncher' does 
 not have an idle slave ready, it will ask tdeinit to start a new one.
 tdeinit forks and dlopens the library that contains the io-slave.
 Then it calls kdemain() or, if that is not present, main() in the library.
@@ -13,14 +13,14 @@ Attaching gdb to a io-slave
 ===========================
 
 Due to the above sequence it is rather hard to get an io-slave in your
-debugger. But wait there is hope. You can start klauncher in such a way
+debugger. But wait there is hope. You can start tdelauncher in such a way
 that slaves for a certain protocol are started in debug mode.
 
 E.g. to start all 'http' slaves in debug mode, you type:
 
 	TDE_SLAVE_DEBUG_WAIT=http tdeinit
 
-This will restart 'tdeinit' and 'klauncher'.
+This will restart 'tdeinit' and 'tdelauncher'.
 
 When your application now requests a http slave, the slave will be started
 by tdeinit, but before it calls kdemain() (cq. main()) it will suspend the
@@ -49,7 +49,7 @@ Debugging io-slaves with valgrind
 =================================
 
 KLauncher can be told to run certain io-slaves through valgrind. The following
-command can be used to let klauncher run all https io-slaves via valgrind:
+command can be used to let tdelauncher run all https io-slaves via valgrind:
 
 	TDE_SLAVE_VALGRIND=https tdeinit
 
@@ -78,7 +78,7 @@ This redirects all debug info for areas 7103 and 7113 (as used by kio_http)
 to the file /tmp/http.
 
 To get debug information from the SMB slave you can add the following to
-kioslaverc:
+tdeioslaverc:
 
 [SMB]
 DebugLevel=100
diff --git a/kioslave/DESIGN b/tdeioslave/DESIGN
similarity index 75%
rename from kioslave/DESIGN
rename to tdeioslave/DESIGN
index d1b21fd3a..9b62f3c34 100644
--- a/kioslave/DESIGN
+++ b/tdeioslave/DESIGN
@@ -1,8 +1,8 @@
-What is a kioslave you ask yourself?
+What is a tdeioslave you ask yourself?
 
-A kioslave is a program designed to be intimately familiar with a certian
+A tdeioslave is a program designed to be intimately familiar with a certian
 protocol, so that a standardized interface can be used to get at data from
-any number of places.  A few examples are the http and ftp kioslaves,
+any number of places.  A few examples are the http and ftp tdeioslaves,
 which using nearly identical methods will retrieve data from an http or
 ftp server respectively.
 
@@ -19,14 +19,14 @@ online.
 That's nice, but how can I use it?
 
 Any time you'd like to use non blocking IO over a high level protocol
-(such as HTTP or FTP) a kioslave is for you.
+(such as HTTP or FTP) a tdeioslave is for you.
 
 That's nice, but how do I use it?
 
 Basically, you create "jobs" by calling a public TDEIO::blah method
-(the correct prototypes, etc, are in kio/job.h). Once this is done, you
+(the correct prototypes, etc, are in tdeio/job.h). Once this is done, you
 connect to the result() signal, and wait for the result. There are
-other signals emitted by jobs, see kio/jobclasses.h. Once again,
+other signals emitted by jobs, see tdeio/jobclasses.h. Once again,
 see the online documentation for more.
 
 
diff --git a/kioslave/Makefile.am b/tdeioslave/Makefile.am
similarity index 80%
rename from kioslave/Makefile.am
rename to tdeioslave/Makefile.am
index 67e21cd87..d7e98a4bc 100644
--- a/kioslave/Makefile.am
+++ b/tdeioslave/Makefile.am
@@ -1,8 +1,8 @@
-if include_kioslave_ldap
+if include_tdeioslave_ldap
 LDAP_SUBDIR=ldap
 endif
 
-if include_kioslave_smb
+if include_tdeioslave_smb
 SMB_SUBDIR=smb
 endif
 
diff --git a/kioslave/about/CMakeLists.txt b/tdeioslave/about/CMakeLists.txt
similarity index 97%
rename from kioslave/about/CMakeLists.txt
rename to tdeioslave/about/CMakeLists.txt
index a0e588286..aaa2a5aff 100644
--- a/kioslave/about/CMakeLists.txt
+++ b/tdeioslave/about/CMakeLists.txt
@@ -31,6 +31,6 @@ set( target kio_about )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES kio_about.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/about/Makefile.am b/tdeioslave/about/Makefile.am
similarity index 83%
rename from kioslave/about/Makefile.am
rename to tdeioslave/about/Makefile.am
index df887e150..18bffeeec 100644
--- a/kioslave/about/Makefile.am
+++ b/tdeioslave/about/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am of tdebase/kioslave/about
+## Makefile.am of tdebase/tdeioslave/about
 
 INCLUDES= $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
@@ -18,4 +18,4 @@ kdelnkdir = $(kde_servicesdir)
 METASOURCES = AUTO
 
 messages:
-	$(XGETTEXT) *.cpp *.h -o $(podir)/kio_about.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdeio_about.pot
diff --git a/kioslave/about/about.protocol b/tdeioslave/about/about.protocol
similarity index 100%
rename from kioslave/about/about.protocol
rename to tdeioslave/about/about.protocol
diff --git a/kioslave/about/kio_about.cpp b/tdeioslave/about/kio_about.cpp
similarity index 100%
rename from kioslave/about/kio_about.cpp
rename to tdeioslave/about/kio_about.cpp
diff --git a/kioslave/about/kio_about.h b/tdeioslave/about/kio_about.h
similarity index 95%
rename from kioslave/about/kio_about.h
rename to tdeioslave/about/kio_about.h
index db1302f04..eacaf09dc 100644
--- a/kioslave/about/kio_about.h
+++ b/tdeioslave/about/kio_about.h
@@ -22,8 +22,8 @@
 
 #include <tqcstring.h>
 
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 
 class AboutProtocol : public TDEIO::SlaveBase
diff --git a/kioslave/cgi/CMakeLists.txt b/tdeioslave/cgi/CMakeLists.txt
similarity index 97%
rename from kioslave/cgi/CMakeLists.txt
rename to tdeioslave/cgi/CMakeLists.txt
index ba13d948f..87923f86c 100644
--- a/kioslave/cgi/CMakeLists.txt
+++ b/tdeioslave/cgi/CMakeLists.txt
@@ -34,6 +34,6 @@ set( target kio_cgi )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES cgi.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/cgi/Makefile.am b/tdeioslave/cgi/Makefile.am
similarity index 100%
rename from kioslave/cgi/Makefile.am
rename to tdeioslave/cgi/Makefile.am
diff --git a/kioslave/cgi/README b/tdeioslave/cgi/README
similarity index 100%
rename from kioslave/cgi/README
rename to tdeioslave/cgi/README
diff --git a/kioslave/cgi/cgi.cpp b/tdeioslave/cgi/cgi.cpp
similarity index 99%
rename from kioslave/cgi/cgi.cpp
rename to tdeioslave/cgi/cgi.cpp
index 9f8906f17..317b1610a 100644
--- a/kioslave/cgi/cgi.cpp
+++ b/tdeioslave/cgi/cgi.cpp
@@ -27,7 +27,7 @@
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "cgi.h"
 
diff --git a/kioslave/cgi/cgi.h b/tdeioslave/cgi/cgi.h
similarity index 97%
rename from kioslave/cgi/cgi.h
rename to tdeioslave/cgi/cgi.h
index 8f9dc88c8..165b34a47 100644
--- a/kioslave/cgi/cgi.h
+++ b/tdeioslave/cgi/cgi.h
@@ -20,7 +20,7 @@
 
 #include <tqobject.h>
 
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 
 class TDEProcess;
 
diff --git a/kioslave/cgi/cgi.protocol b/tdeioslave/cgi/cgi.protocol
similarity index 76%
rename from kioslave/cgi/cgi.protocol
rename to tdeioslave/cgi/cgi.protocol
index 9c6cc378e..eb6c45217 100644
--- a/kioslave/cgi/cgi.protocol
+++ b/tdeioslave/cgi/cgi.protocol
@@ -4,5 +4,5 @@ protocol=cgi
 input=none
 output=filesystem
 reading=true
-DocPath=kioslave/cgi.html
+DocPath=tdeioslave/cgi.html
 Icon=html
diff --git a/kioslave/cgi/kcmcgi/CMakeLists.txt b/tdeioslave/cgi/kcmcgi/CMakeLists.txt
similarity index 97%
rename from kioslave/cgi/kcmcgi/CMakeLists.txt
rename to tdeioslave/cgi/kcmcgi/CMakeLists.txt
index 9993fb52f..09354b919 100644
--- a/kioslave/cgi/kcmcgi/CMakeLists.txt
+++ b/tdeioslave/cgi/kcmcgi/CMakeLists.txt
@@ -31,6 +31,6 @@ set( target kcm_cgi )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES kcmcgi.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/cgi/kcmcgi/Makefile.am b/tdeioslave/cgi/kcmcgi/Makefile.am
similarity index 100%
rename from kioslave/cgi/kcmcgi/Makefile.am
rename to tdeioslave/cgi/kcmcgi/Makefile.am
diff --git a/kioslave/cgi/kcmcgi/kcmcgi.cpp b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
similarity index 98%
rename from kioslave/cgi/kcmcgi/kcmcgi.cpp
rename to tdeioslave/cgi/kcmcgi/kcmcgi.cpp
index 828f50f69..9f270374a 100644
--- a/kioslave/cgi/kcmcgi/kcmcgi.cpp
+++ b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
@@ -16,11 +16,11 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kaboutdata.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <tqlayout.h>
 #include <tqlistbox.h>
diff --git a/kioslave/cgi/kcmcgi/kcmcgi.desktop b/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
similarity index 99%
rename from kioslave/cgi/kcmcgi/kcmcgi.desktop
rename to tdeioslave/cgi/kcmcgi/kcmcgi.desktop
index e3f47dc99..0b4bb3b2c 100644
--- a/kioslave/cgi/kcmcgi/kcmcgi.desktop
+++ b/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=run
 Type=Application
-Exec=kcmshell kcmcgi
+Exec=tdecmshell kcmcgi
 DocPath=
 X-TDE-ModuleType=Library
 X-TDE-Library=cgi
@@ -189,7 +189,7 @@ Keywords[hi]=सीजीआई,केआईओ,स्लेव,पथ
 Keywords[hr]=CGI,KIO,Slave,Paths,podčinjeni,putanje
 Keywords[hu]=CGI,KIO,protokoll,elérési utak
 Keywords[is]=CGI,KIO,þræll,slóðir
-Keywords[it]=CGI,KIO,kioslave,percorsi
+Keywords[it]=CGI,KIO,tdeioslave,percorsi
 Keywords[ja]=CGI,KIO,スレーブ,パス
 Keywords[km]=CGI,KIO,កូនចៅ,ផ្លូវ
 Keywords[lt]=CGI,KIO,Slave,Paths, keliai
diff --git a/kioslave/cgi/kcmcgi/kcmcgi.h b/tdeioslave/cgi/kcmcgi/kcmcgi.h
similarity index 100%
rename from kioslave/cgi/kcmcgi/kcmcgi.h
rename to tdeioslave/cgi/kcmcgi/kcmcgi.h
diff --git a/kioslave/configure.in.bot b/tdeioslave/configure.in.bot
similarity index 100%
rename from kioslave/configure.in.bot
rename to tdeioslave/configure.in.bot
diff --git a/kioslave/configure.in.in b/tdeioslave/configure.in.in
similarity index 100%
rename from kioslave/configure.in.in
rename to tdeioslave/configure.in.in
diff --git a/kioslave/filter/CMakeLists.txt b/tdeioslave/filter/CMakeLists.txt
similarity index 97%
rename from kioslave/filter/CMakeLists.txt
rename to tdeioslave/filter/CMakeLists.txt
index 11694d2dd..4b0c3d36c 100644
--- a/kioslave/filter/CMakeLists.txt
+++ b/tdeioslave/filter/CMakeLists.txt
@@ -31,6 +31,6 @@ set( target kio_filter )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES filter.cc
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/filter/Makefile.am b/tdeioslave/filter/Makefile.am
similarity index 100%
rename from kioslave/filter/Makefile.am
rename to tdeioslave/filter/Makefile.am
diff --git a/kioslave/filter/bzip.protocol b/tdeioslave/filter/bzip.protocol
similarity index 81%
rename from kioslave/filter/bzip.protocol
rename to tdeioslave/filter/bzip.protocol
index 65564992a..4d729f5ea 100644
--- a/kioslave/filter/bzip.protocol
+++ b/tdeioslave/filter/bzip.protocol
@@ -6,5 +6,5 @@ input=stream
 output=stream
 reading=true
 source=false
-DocPath=kioslave/bzip.html
+DocPath=tdeioslave/bzip.html
 Icon=ark
diff --git a/kioslave/filter/bzip2.protocol b/tdeioslave/filter/bzip2.protocol
similarity index 81%
rename from kioslave/filter/bzip2.protocol
rename to tdeioslave/filter/bzip2.protocol
index c7d7c782a..c2b8d2c51 100644
--- a/kioslave/filter/bzip2.protocol
+++ b/tdeioslave/filter/bzip2.protocol
@@ -6,5 +6,5 @@ input=stream
 output=stream
 reading=true
 source=false
-DocPath=kioslave/bzip2.html
+DocPath=tdeioslave/bzip2.html
 Icon=ark
diff --git a/kioslave/filter/configure.in.in b/tdeioslave/filter/configure.in.in
similarity index 100%
rename from kioslave/filter/configure.in.in
rename to tdeioslave/filter/configure.in.in
diff --git a/kioslave/filter/filter.cc b/tdeioslave/filter/filter.cc
similarity index 100%
rename from kioslave/filter/filter.cc
rename to tdeioslave/filter/filter.cc
diff --git a/kioslave/filter/filter.h b/tdeioslave/filter/filter.h
similarity index 96%
rename from kioslave/filter/filter.h
rename to tdeioslave/filter/filter.h
index 54a91322a..9457f0b73 100644
--- a/kioslave/filter/filter.h
+++ b/tdeioslave/filter/filter.h
@@ -25,8 +25,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __filter_h__
 
 #include <tqobject.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 class FilterProtocol : public TQObject, public TDEIO::SlaveBase
 {
diff --git a/kioslave/filter/gzip.protocol b/tdeioslave/filter/gzip.protocol
similarity index 81%
rename from kioslave/filter/gzip.protocol
rename to tdeioslave/filter/gzip.protocol
index 75908e381..f0f57911c 100644
--- a/kioslave/filter/gzip.protocol
+++ b/tdeioslave/filter/gzip.protocol
@@ -6,5 +6,5 @@ input=stream
 output=stream
 reading=true
 source=false
-DocPath=kioslave/gzip.html
+DocPath=tdeioslave/gzip.html
 Icon=ark
diff --git a/kioslave/finger/CMakeLists.txt b/tdeioslave/finger/CMakeLists.txt
similarity index 94%
rename from kioslave/finger/CMakeLists.txt
rename to tdeioslave/finger/CMakeLists.txt
index 8f70b4188..096b483d0 100644
--- a/kioslave/finger/CMakeLists.txt
+++ b/tdeioslave/finger/CMakeLists.txt
@@ -23,7 +23,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES finger.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kio_finger.pl kio_finger.css DESTINATION ${DATA_INSTALL_DIR}/kio_finger )
+install( FILES kio_finger.pl kio_finger.css DESTINATION ${DATA_INSTALL_DIR}/tdeio_finger )
 
 
 ##### kio_finger (module) #######################
@@ -32,6 +32,6 @@ set( target kio_finger )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES kio_finger.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/finger/Makefile.am b/tdeioslave/finger/Makefile.am
similarity index 79%
rename from kioslave/finger/Makefile.am
rename to tdeioslave/finger/Makefile.am
index 55066bf74..9c2792df3 100644
--- a/kioslave/finger/Makefile.am
+++ b/tdeioslave/finger/Makefile.am
@@ -1,5 +1,5 @@
 ## Makfile.am for kio_finger
-## Edit from Makefile.am of tdebase/kioslave/man
+## Edit from Makefile.am of tdebase/tdeioslave/man
 
 INCLUDES= $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
@@ -18,10 +18,10 @@ kdelnk_DATA = finger.protocol
 kdelnkdir = $(kde_servicesdir)
 
 kio_finger_data_DATA = kio_finger.pl kio_finger.css
-kio_finger_datadir = $(kde_datadir)/kio_finger
+kio_finger_datadir = $(kde_datadir)/tdeio_finger
 EXTRA_DIST=$(kio_finger_data_DATA)   
 
 METASOURCES = AUTO
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_finger.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_finger.pot
diff --git a/kioslave/finger/finger.protocol b/tdeioslave/finger/finger.protocol
similarity index 79%
rename from kioslave/finger/finger.protocol
rename to tdeioslave/finger/finger.protocol
index d11553c41..8e2cdc80f 100644
--- a/kioslave/finger/finger.protocol
+++ b/tdeioslave/finger/finger.protocol
@@ -5,5 +5,5 @@ input=none
 output=stream
 reading=true
 defaultMimetype=text/html
-DocPath=kioslave/finger.html
+DocPath=tdeioslave/finger.html
 Icon=tdmconfig
diff --git a/kioslave/finger/kio_finger.cpp b/tdeioslave/finger/kio_finger.cpp
similarity index 97%
rename from kioslave/finger/kio_finger.cpp
rename to tdeioslave/finger/kio_finger.cpp
index 8f330b95e..b223e1024 100644
--- a/kioslave/finger/kio_finger.cpp
+++ b/tdeioslave/finger/kio_finger.cpp
@@ -198,7 +198,7 @@ void FingerProtocol::getProgramPath()
       //kdDebug() << "Finger command found:" << *myFingerPath << endl;
     }
 
-  myFingerPerlScript = new TQString(locate("data","kio_finger/kio_finger.pl"));
+  myFingerPerlScript = new TQString(locate("data","kio_finger/tdeio_finger.pl"));
   if (myFingerPerlScript->isEmpty())
     {
       //kdDebug() << "kio_finger.pl script not found" << endl;
@@ -211,7 +211,7 @@ void FingerProtocol::getProgramPath()
       //kdDebug() << "kio_finger perl script found: " << *myFingerPerlScript << endl;
     }
 
-  myFingerCSSFile = new TQString(locate("data","kio_finger/kio_finger.css"));
+  myFingerCSSFile = new TQString(locate("data","kio_finger/tdeio_finger.css"));
   if (myFingerCSSFile->isEmpty())
     {
       //kdDebug() << "kio_finger.css file not found" << endl;
diff --git a/kioslave/finger/kio_finger.css b/tdeioslave/finger/kio_finger.css
similarity index 100%
rename from kioslave/finger/kio_finger.css
rename to tdeioslave/finger/kio_finger.css
diff --git a/kioslave/finger/kio_finger.h b/tdeioslave/finger/kio_finger.h
similarity index 97%
rename from kioslave/finger/kio_finger.h
rename to tdeioslave/finger/kio_finger.h
index e9044f26d..eac8ad291 100644
--- a/kioslave/finger/kio_finger.h
+++ b/tdeioslave/finger/kio_finger.h
@@ -25,8 +25,8 @@
 
 #include <kurl.h>
 #include <kprocess.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 class FingerProtocol : public TQObject, public TDEIO::SlaveBase
 {
diff --git a/kioslave/finger/kio_finger.pl b/tdeioslave/finger/kio_finger.pl
similarity index 100%
rename from kioslave/finger/kio_finger.pl
rename to tdeioslave/finger/kio_finger.pl
diff --git a/kioslave/fish/AUTHORS b/tdeioslave/fish/AUTHORS
similarity index 100%
rename from kioslave/fish/AUTHORS
rename to tdeioslave/fish/AUTHORS
diff --git a/kioslave/fish/CMakeLists.txt b/tdeioslave/fish/CMakeLists.txt
similarity index 97%
rename from kioslave/fish/CMakeLists.txt
rename to tdeioslave/fish/CMakeLists.txt
index 77049ce8b..445ea418f 100644
--- a/kioslave/fish/CMakeLists.txt
+++ b/tdeioslave/fish/CMakeLists.txt
@@ -40,6 +40,6 @@ set( target kio_fish )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES fish.cpp
-  LINK kio-shared util
+  LINK tdeio-shared util
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/fish/COPYING b/tdeioslave/fish/COPYING
similarity index 100%
rename from kioslave/fish/COPYING
rename to tdeioslave/fish/COPYING
diff --git a/kioslave/fish/ChangeLog b/tdeioslave/fish/ChangeLog
similarity index 100%
rename from kioslave/fish/ChangeLog
rename to tdeioslave/fish/ChangeLog
diff --git a/kioslave/fish/ConfigureChecks.cmake b/tdeioslave/fish/ConfigureChecks.cmake
similarity index 100%
rename from kioslave/fish/ConfigureChecks.cmake
rename to tdeioslave/fish/ConfigureChecks.cmake
diff --git a/kioslave/fish/FAQ b/tdeioslave/fish/FAQ
similarity index 100%
rename from kioslave/fish/FAQ
rename to tdeioslave/fish/FAQ
diff --git a/kioslave/fish/INSTALL b/tdeioslave/fish/INSTALL
similarity index 100%
rename from kioslave/fish/INSTALL
rename to tdeioslave/fish/INSTALL
diff --git a/kioslave/fish/Makefile.am b/tdeioslave/fish/Makefile.am
similarity index 95%
rename from kioslave/fish/Makefile.am
rename to tdeioslave/fish/Makefile.am
index bf7169bcf..35ca64fd4 100644
--- a/kioslave/fish/Makefile.am
+++ b/tdeioslave/fish/Makefile.am
@@ -27,7 +27,7 @@ fishcode.h: fish.pl
 	echo ');' >> $@;
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_fish.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_fish.pot
 
 
 
diff --git a/kioslave/fish/README b/tdeioslave/fish/README
similarity index 100%
rename from kioslave/fish/README
rename to tdeioslave/fish/README
diff --git a/kioslave/fish/TODO b/tdeioslave/fish/TODO
similarity index 100%
rename from kioslave/fish/TODO
rename to tdeioslave/fish/TODO
diff --git a/kioslave/fish/configure.in.in b/tdeioslave/fish/configure.in.in
similarity index 100%
rename from kioslave/fish/configure.in.in
rename to tdeioslave/fish/configure.in.in
diff --git a/kioslave/fish/fish.cpp b/tdeioslave/fish/fish.cpp
similarity index 99%
rename from kioslave/fish/fish.cpp
rename to tdeioslave/fish/fish.cpp
index 3a527e39e..0bf44482e 100644
--- a/kioslave/fish/fish.cpp
+++ b/tdeioslave/fish/fish.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          fish.cpp  -  a FISH kioslave
+                          fish.cpp  -  a FISH tdeioslave
                              -------------------
     begin                : Thu Oct  4 17:09:14 CEST 2001
     copyright            : (C) 2001-2003 by J�rg Walter
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 /*
-  This code contains fragments and ideas from the ftp kioslave
+  This code contains fragments and ideas from the ftp tdeioslave
   done by David Faure <faure@kde.org>.
 
   Structure is a bit complicated, since I made the mistake to use
diff --git a/kioslave/fish/fish.h b/tdeioslave/fish/fish.h
similarity index 98%
rename from kioslave/fish/fish.h
rename to tdeioslave/fish/fish.h
index 8a85a9bd2..43dd5477d 100644
--- a/kioslave/fish/fish.h
+++ b/tdeioslave/fish/fish.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          fish.h  -  a FISH kioslave
+                          fish.h  -  a FISH tdeioslave
                              -------------------
     begin                : Thu Oct  4 17:09:14 CEST 2001
     copyright            : (C) 2001 by J�rg Walter
@@ -21,10 +21,10 @@
 
 
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 #include <kprocess.h>
-#include <kio/authinfo.h>
+#include <tdeio/authinfo.h>
 #include <time.h>
 
 #define FISH_EXEC_CMD 'X'
diff --git a/kioslave/fish/fish.pl b/tdeioslave/fish/fish.pl
similarity index 99%
rename from kioslave/fish/fish.pl
rename to tdeioslave/fish/fish.pl
index 1ba539f9f..1fe13841f 100755
--- a/kioslave/fish/fish.pl
+++ b/tdeioslave/fish/fish.pl
@@ -12,7 +12,7 @@ more reliable.
 use Fcntl;
 
 $|++;
-#open(DEBUG,">/tmp/kio_fish.debug.$$.log");
+#open(DEBUG,">/tmp/tdeio_fish.debug.$$.log");
 # save code in initial directory if just transferred
 if (defined $code) {
     unlink('.fishsrv.pl');
diff --git a/kioslave/fish/fish.protocol b/tdeioslave/fish/fish.protocol
similarity index 64%
rename from kioslave/fish/fish.protocol
rename to tdeioslave/fish/fish.protocol
index c14599d50..451050fcf 100644
--- a/kioslave/fish/fish.protocol
+++ b/tdeioslave/fish/fish.protocol
@@ -11,38 +11,38 @@ deleting=true
 linking=true
 moving=true
 Icon=remote
-Description=A kioslave for the FISH protocol
+Description=A tdeioslave for the FISH protocol
 Description[af]='n Kioslave vir die FISH protokol
 Description[be]=Kioslave для пратакола FISH
-Description[bn]=ফিশ (FISH) প্রোটোকল-এর জন্য একটি kioslave
+Description[bn]=ফিশ (FISH) প্রোটোকল-এর জন্য একটি tdeioslave
 Description[br]=Ur c'hioslave evit ar c'homenad FISH
-Description[bs]=kioslave za FISH protokol
-Description[ca]=Un kioslave pel protocol FISH
+Description[bs]=tdeioslave za FISH protokol
+Description[ca]=Un tdeioslave pel protocol FISH
 Description[cs]=Pomocný protokol pro FISH
 Description[csb]=Plugins protokòłu FISH
-Description[da]=En kioslave for FISH-protokollen
+Description[da]=En tdeioslave for FISH-protokollen
 Description[de]=Ein-/Ausgabemodul für das FISH-Protokoll
-Description[el]=Ένας kioslave για το πρωτόκολλο FISH
+Description[el]=Ένας tdeioslave για το πρωτόκολλο FISH
 Description[eo]=K-enel-sklavo por la FISH protokolo
-Description[es]=Un kioslave para el protocolo FISH
+Description[es]=Un tdeioslave para el protocolo FISH
 Description[et]=FISH protokolli IO-moodul
-Description[eu]=FISH protokolorako kioslavea
-Description[fa]=یک kioslave برای قرارداد FISH
+Description[eu]=FISH protokolorako tdeioslavea
+Description[fa]=یک tdeioslave برای قرارداد FISH
 Description[fi]=Liitäntä FISH-yhteyskäytäntö
 Description[fr]=Un module d'entrées / sorties pour le protocole FISH
-Description[fy]=In kioslave foar it FISH protokol
-Description[ga]=kioslave le haghaidh an phrótacail FISH
-Description[gl]=Un kioslave para o protocolo FISH
-Description[he]=ממשק  kioslave עבור פרוטוקול FISH
+Description[fy]=In tdeioslave foar it FISH protokol
+Description[ga]=tdeioslave le haghaidh an phrótacail FISH
+Description[gl]=Un tdeioslave para o protocolo FISH
+Description[he]=ממשק  tdeioslave עבור פרוטוקול FISH
 Description[hi]=फिश प्रोटोकॉल हेतु के-आई-ओ-स्लेव
 Description[hr]=Kioslave za FISH protokol
 Description[hu]=KDE-protokoll a FISH protokollhoz
-Description[is]=kioslave fyrir FISH samskiptaregluna
-Description[it]=Un kioslave per il protocollo FISH
-Description[ja]=FISH プロトコルのための kioslave
-Description[ka]=kioslave FISH პროტოკოლისთვის
+Description[is]=tdeioslave fyrir FISH samskiptaregluna
+Description[it]=Un tdeioslave per il protocollo FISH
+Description[ja]=FISH プロトコルのための tdeioslave
+Description[ka]=tdeioslave FISH პროტოკოლისთვის
 Description[kk]=FISH протоколға арналған файл жүйесінің модулі
-Description[km]=kioslave សម្រាប់​ពិធីការ FISH
+Description[km]=tdeioslave សម្រាប់​ពិធីការ FISH
 Description[ko]=FISH 프로토콜을 위한 KIO 슬레이브
 Description[lt]=Kiovergas FISH protokolui
 Description[lv]=KIO vergs FISH protokolam
@@ -51,31 +51,31 @@ Description[ms]=Hamba kio untuk protokol FISH
 Description[nb]=En IU-slave for FISH-protokollen
 Description[nds]=En In-/Utgaavdeenst för dat FISH-Protokoll
 Description[ne]=FISH प्रोटोकलका लागि एउटा किओस्लेभ
-Description[nl]=Een kioslave voor het protocol FISH
+Description[nl]=Een tdeioslave voor het protocol FISH
 Description[nn]=Ein IU-slave for FISH-protokollen
-Description[pa]=FISH ਪਰੋਟੋਕਾਲ ਲਈ kioslave
+Description[pa]=FISH ਪਰੋਟੋਕਾਲ ਲਈ tdeioslave
 Description[pl]=Wtyczka protokołu FISH
-Description[pt]=Um 'kioslave' para o protocolo FISH
+Description[pt]=Um 'tdeioslave' para o protocolo FISH
 Description[pt_BR]=Uma implementação para o protocolo FISH
 Description[ro]=Un dispozitiv de I/E pentru protocolul FISH
 Description[ru]=Модуль файловой системы для протокола FISH
 Description[rw]=kio-umugaragu ya Porotokole FISH
 Description[se]=SO-šláva FISH-protokolla várás
-Description[sk]=kioslave pre protokol FISH
-Description[sl]=kioslave za protokol FISH
+Description[sk]=tdeioslave pre protokol FISH
+Description[sl]=tdeioslave za protokol FISH
 Description[sr]=Kioslave за протокол FISH
 Description[sr@Latn]=Kioslave za protokol FISH
 Description[sv]=En I/O-slav för protokollet FISH
 Description[ta]=FISH நெறிமுறைக்கான ஒரு க்யோஸ்லேவ்
 Description[te]=ఫిష్ ప్రొటొకాల్ కొరకు ఐఒ బానిస
 Description[th]=ตัวนำข้อมูลเข้า-ออกสำหรับโปรโตคอล FISH
-Description[tr]=FISH protokolü için kioslave
+Description[tr]=FISH protokolü için tdeioslave
 Description[tt]=FISH protokolı öçen birem sistemeneñ modulı
 Description[uk]=Підлеглий B/В для протоколу FISH
 Description[uz]=FISH protokoli uchun KCH-sleyv
 Description[uz@cyrillic]=FISH протоколи учун КЧ-слейв
-Description[vi]=A kioslave (đày tớ vào ra KDE) cho giao thức FISH
-Description[wa]=On kioslave pol protocole FISH
+Description[vi]=A tdeioslave (đày tớ vào ra KDE) cho giao thức FISH
+Description[wa]=On tdeioslave pol protocole FISH
 Description[zh_CN]=FISH 协议的 KIO 仆人
-Description[zh_TW]=用於 FISH 通訊協定的 kioslave
-DocPath=kioslave/fish.html
+Description[zh_TW]=用於 FISH 通訊協定的 tdeioslave
+DocPath=tdeioslave/fish.html
diff --git a/kioslave/fish/genfishcode.cmake b/tdeioslave/fish/genfishcode.cmake
similarity index 100%
rename from kioslave/fish/genfishcode.cmake
rename to tdeioslave/fish/genfishcode.cmake
diff --git a/kioslave/fish/genfishcode.pl b/tdeioslave/fish/genfishcode.pl
similarity index 100%
rename from kioslave/fish/genfishcode.pl
rename to tdeioslave/fish/genfishcode.pl
diff --git a/kioslave/fish/nxfish.protocol b/tdeioslave/fish/nxfish.protocol
similarity index 57%
rename from kioslave/fish/nxfish.protocol
rename to tdeioslave/fish/nxfish.protocol
index f050282af..1a6ffbb48 100644
--- a/kioslave/fish/nxfish.protocol
+++ b/tdeioslave/fish/nxfish.protocol
@@ -11,64 +11,64 @@ deleting=true
 linking=true
 moving=true
 Icon=remote
-Description=A kioslave for the NXFISH protocol
+Description=A tdeioslave for the NXFISH protocol
 Description[af]='n Kioslave vir die NXFISH protokol
 Description[be]=Kioslave для пратакола NXFISH
 Description[br]=Ur c'hioslave evit ar c'homenad NXFISH
-Description[bs]=kioslave za NXFISH protokol
-Description[ca]=Un kioslave pel protocol NXFISH
+Description[bs]=tdeioslave za NXFISH protokol
+Description[ca]=Un tdeioslave pel protocol NXFISH
 Description[cs]=Pomocný protokol pro NXFISH
 Description[csb]=Plugins protokòłu NXFISH
-Description[da]=En kioslave for NXFISH-protokollen
+Description[da]=En tdeioslave for NXFISH-protokollen
 Description[de]=Ein-/Ausgabemodul für das NXFISH-Protokoll
-Description[el]=Ένας kioslave για το πρωτόκολλο NXFISH
+Description[el]=Ένας tdeioslave για το πρωτόκολλο NXFISH
 Description[eo]=K-enel-sklavo por la NXFISH protokolo
-Description[es]=Un kioslave para el protocolo NXFISH
+Description[es]=Un tdeioslave para el protocolo NXFISH
 Description[et]=NXFISH protokolli IO-moodul
-Description[eu]=NXFISH protokolorako kioslavea
-Description[fa]=یک kioslave برای قرارداد NXFISH
+Description[eu]=NXFISH protokolorako tdeioslavea
+Description[fa]=یک tdeioslave برای قرارداد NXFISH
 Description[fi]=Liitäntä NXFISH-yhteyskäytäntö
 Description[fr]=Un module d'entrées / sorties pour le protocole NXFISH
-Description[fy]=In kioslave foar it protokol NXFISH
-Description[ga]=kioslave le haghaidh an phrótacail NXFISH
-Description[gl]=Un kioslave para o protocolo NXFISH
-Description[he]=ממשק kioslave עבור פרוטוקול NXFISH
+Description[fy]=In tdeioslave foar it protokol NXFISH
+Description[ga]=tdeioslave le haghaidh an phrótacail NXFISH
+Description[gl]=Un tdeioslave para o protocolo NXFISH
+Description[he]=ממשק tdeioslave עבור פרוטוקול NXFISH
 Description[hr]=Kioslave za NXFISH protokol
 Description[hu]=KDE-protokoll az NXFISH protokollhoz
-Description[is]=kioslave fyrir NXFISH samskiptaregluna
-Description[it]=Un kioslave per il protocollo NXFISH
-Description[ja]=NXFISH プロトコルのための kioslave
-Description[ka]=kioslave NXFISH ოქმისთვის
-Description[kk]=NXFISH протоколы үшін kioslave
-Description[km]=kioslave សម្រាប់​ពិធីការ NXFISH
+Description[is]=tdeioslave fyrir NXFISH samskiptaregluna
+Description[it]=Un tdeioslave per il protocollo NXFISH
+Description[ja]=NXFISH プロトコルのための tdeioslave
+Description[ka]=tdeioslave NXFISH ოქმისთვის
+Description[kk]=NXFISH протоколы үшін tdeioslave
+Description[km]=tdeioslave សម្រាប់​ពិធីការ NXFISH
 Description[ko]=FISH 프로토콜을 위한 KIO 슬레이브
 Description[lt]=Pagalbinė kio programa NXFISH protokolui
 Description[mk]=КИО-служител за протоколот NXFISH
 Description[nb]=En kioskslave for NXFISH-protokollen
 Description[nds]=En In-/Utgaavdeenst för dat NXFISH-Protokoll
 Description[ne]=NXFISH प्रोटोकलका लागि किओस्लेभ
-Description[nl]=Een kioslave voor het protocol NXFISH
+Description[nl]=Een tdeioslave voor het protocol NXFISH
 Description[nn]=Ein IU-slave for NXFISH-protokollen
-Description[pa]=NXFISH ਪਰੋਟੋਕਾਲ ਲਈ kioslave
+Description[pa]=NXFISH ਪਰੋਟੋਕਾਲ ਲਈ tdeioslave
 Description[pl]=Wtyczka protokołu NXFISH
-Description[pt]=Um 'kioslave' para o protocolo NXFISH
+Description[pt]=Um 'tdeioslave' para o protocolo NXFISH
 Description[pt_BR]=Uma implementação para o protocolo NXFISH
-Description[ro]=Un kioslave pentru protocolul NXFISH
+Description[ro]=Un tdeioslave pentru protocolul NXFISH
 Description[ru]=Модуль файловой системы для протокола NXFISH
 Description[se]=SO-šláva NXFISH-protokolla várás
-Description[sk]=kioslave pre protokol NXFISH
-Description[sl]=kioslave za protokol NXFISH
+Description[sk]=tdeioslave pre protokol NXFISH
+Description[sl]=tdeioslave za protokol NXFISH
 Description[sr]=Kioslave за протокол NXFISH
 Description[sr@Latn]=Kioslave za protokol NXFISH
 Description[sv]=En I/O-slav för protokollet NXFISH
 Description[te]=ఎన్ ఎక్స్ ఫిష్ ప్రొటొకాల్ కొరకు ఐఒ బానిస
 Description[th]=ตัวนำข้อมูลเข้า-ออกสำหรับโปรโตคอล NXFISH
-Description[tr]=NXFISH protokolü için kioslave
+Description[tr]=NXFISH protokolü için tdeioslave
 Description[uk]=Підлеглий B/В для протоколу NXFISH
 Description[uz]=NXFISH protokoli uchun KCH-sleyvi
 Description[uz@cyrillic]=NXFISH протоколи учун КЧ-слейви
-Description[vi]=A kioslave (đày tớ vào ra KDE) cho giao thức NXFISH
-Description[wa]=On kioslave pol protocole NXFISH
+Description[vi]=A tdeioslave (đày tớ vào ra KDE) cho giao thức NXFISH
+Description[wa]=On tdeioslave pol protocole NXFISH
 Description[zh_CN]=NXFISH 协议的 KIO 仆人
-Description[zh_TW]=用於 NXFISH 通訊協定的 kioslave
-DocPath=kioslave/fish.html
+Description[zh_TW]=用於 NXFISH 通訊協定的 tdeioslave
+DocPath=tdeioslave/fish.html
diff --git a/kioslave/floppy/AUTHORS b/tdeioslave/floppy/AUTHORS
similarity index 100%
rename from kioslave/floppy/AUTHORS
rename to tdeioslave/floppy/AUTHORS
diff --git a/kioslave/floppy/CMakeLists.txt b/tdeioslave/floppy/CMakeLists.txt
similarity index 97%
rename from kioslave/floppy/CMakeLists.txt
rename to tdeioslave/floppy/CMakeLists.txt
index 0b369e251..b328998ab 100644
--- a/kioslave/floppy/CMakeLists.txt
+++ b/tdeioslave/floppy/CMakeLists.txt
@@ -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/floppy/Makefile.am b/tdeioslave/floppy/Makefile.am
similarity index 79%
rename from kioslave/floppy/Makefile.am
rename to tdeioslave/floppy/Makefile.am
index 7d33ec865..ec422f75d 100644
--- a/kioslave/floppy/Makefile.am
+++ b/tdeioslave/floppy/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am of tdebase/kioslave/floppy
+## Makefile.am of tdebase/tdeioslave/floppy
 
 INCLUDES= $(all_includes)
 AM_LDFLAGS = $(all_libraries)
@@ -17,4 +17,4 @@ kdelnkdir = $(kde_servicesdir)
 METASOURCES = AUTO
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_floppy.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_floppy.pot
diff --git a/kioslave/floppy/README b/tdeioslave/floppy/README
similarity index 100%
rename from kioslave/floppy/README
rename to tdeioslave/floppy/README
diff --git a/kioslave/floppy/TODO b/tdeioslave/floppy/TODO
similarity index 100%
rename from kioslave/floppy/TODO
rename to tdeioslave/floppy/TODO
diff --git a/kioslave/floppy/floppy.protocol b/tdeioslave/floppy/floppy.protocol
similarity index 86%
rename from kioslave/floppy/floppy.protocol
rename to tdeioslave/floppy/floppy.protocol
index 3dcae5c78..af861d1be 100644
--- a/kioslave/floppy/floppy.protocol
+++ b/tdeioslave/floppy/floppy.protocol
@@ -10,5 +10,5 @@ makedir=true
 deleting=true
 moving=true
 Icon=3floppy_mount
-DocPath=kioslave/floppy.html
+DocPath=tdeioslave/floppy.html
 Class=:local
diff --git a/kioslave/floppy/kio_floppy.cpp b/tdeioslave/floppy/kio_floppy.cpp
similarity index 99%
rename from kioslave/floppy/kio_floppy.cpp
rename to tdeioslave/floppy/kio_floppy.cpp
index 8b80e8d54..626a4a1f0 100644
--- a/kioslave/floppy/kio_floppy.cpp
+++ b/tdeioslave/floppy/kio_floppy.cpp
@@ -44,7 +44,7 @@
 
 #include <kinstance.h>
 #include <kdebug.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 
 using namespace TDEIO;
diff --git a/kioslave/floppy/kio_floppy.h b/tdeioslave/floppy/kio_floppy.h
similarity index 97%
rename from kioslave/floppy/kio_floppy.h
rename to tdeioslave/floppy/kio_floppy.h
index 783e496ae..d38340729 100644
--- a/kioslave/floppy/kio_floppy.h
+++ b/tdeioslave/floppy/kio_floppy.h
@@ -20,8 +20,8 @@
 #ifndef KIO_FLOPPY_H
 #define KIO_FLOPPY_H
 
-#include <kio/slavebase.h>
-#include <kio/global.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/global.h>
 
 #include "program.h"
 
diff --git a/kioslave/floppy/program.cpp b/tdeioslave/floppy/program.cpp
similarity index 100%
rename from kioslave/floppy/program.cpp
rename to tdeioslave/floppy/program.cpp
diff --git a/kioslave/floppy/program.h b/tdeioslave/floppy/program.h
similarity index 100%
rename from kioslave/floppy/program.h
rename to tdeioslave/floppy/program.h
diff --git a/kioslave/home/CMakeLists.txt b/tdeioslave/home/CMakeLists.txt
similarity index 97%
rename from kioslave/home/CMakeLists.txt
rename to tdeioslave/home/CMakeLists.txt
index 99639d9cb..bfc9e6cff 100644
--- a/kioslave/home/CMakeLists.txt
+++ b/tdeioslave/home/CMakeLists.txt
@@ -43,6 +43,6 @@ set( target kio_home )
 tde_add_kpart( ${target}
   SOURCES dummy.cpp
   EMBED kiohome-static
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/home/Makefile.am b/tdeioslave/home/Makefile.am
similarity index 71%
rename from kioslave/home/Makefile.am
rename to tdeioslave/home/Makefile.am
index be10e5bcc..38b73e653 100644
--- a/kioslave/home/Makefile.am
+++ b/tdeioslave/home/Makefile.am
@@ -7,7 +7,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = kio_home.la
 
 kio_home_la_SOURCES = dummy.cpp
-kio_home_la_LIBADD  = libkiohome.la $(LIB_KIO)
+kio_home_la_LIBADD  = libtdeiohome.la $(LIB_KIO)
 kio_home_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
 dummy.cpp:
@@ -15,12 +15,12 @@ dummy.cpp:
 
 kde_services_DATA = home.protocol
 
-noinst_LTLIBRARIES = libkiohome.la
-libkiohome_la_SOURCES = kio_home.cpp homeimpl.cpp
+noinst_LTLIBRARIES = libtdeiohome.la
+libtdeiohome_la_SOURCES = kio_home.cpp homeimpl.cpp
 
 check_PROGRAMS = testhome
 testhome_SOURCES = testhome.cpp
-testhome_LDADD = libkiohome.la $(LIB_KIO)
+testhome_LDADD = libtdeiohome.la $(LIB_KIO)
 testhome_LDFLAGS = $(all_libraries)
 
 ## TODO in unsermake: TESTS = testhome
@@ -28,5 +28,5 @@ check: testhome
 	./testhome
 
 messages:
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/kio_home.pot
+	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_home.pot
 
diff --git a/kioslave/home/dummy.cpp b/tdeioslave/home/dummy.cpp
similarity index 100%
rename from kioslave/home/dummy.cpp
rename to tdeioslave/home/dummy.cpp
diff --git a/kioslave/home/home.protocol b/tdeioslave/home/home.protocol
similarity index 90%
rename from kioslave/home/home.protocol
rename to tdeioslave/home/home.protocol
index 59f6cba5d..da2a556cd 100644
--- a/kioslave/home/home.protocol
+++ b/tdeioslave/home/home.protocol
@@ -12,7 +12,7 @@ linking=true
 moving=true
 Icon=folder_home
 maxInstances=4
-#TODO DocPath=kioslave/file.html
+#TODO DocPath=tdeioslave/file.html
 Class=:local
 Parent=system:/
 deleteRecursive=true
diff --git a/kioslave/home/homeimpl.cpp b/tdeioslave/home/homeimpl.cpp
similarity index 100%
rename from kioslave/home/homeimpl.cpp
rename to tdeioslave/home/homeimpl.cpp
diff --git a/kioslave/home/homeimpl.h b/tdeioslave/home/homeimpl.h
similarity index 97%
rename from kioslave/home/homeimpl.h
rename to tdeioslave/home/homeimpl.h
index 786fa598a..5884d8ab7 100644
--- a/kioslave/home/homeimpl.h
+++ b/tdeioslave/home/homeimpl.h
@@ -20,8 +20,8 @@
 #ifndef HOMEIMPL_H
 #define HOMEIMPL_H
 
-#include <kio/global.h>
-#include <kio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 #include <kuser.h>
 
diff --git a/kioslave/home/kdedmodule/CMakeLists.txt b/tdeioslave/home/kdedmodule/CMakeLists.txt
similarity index 100%
rename from kioslave/home/kdedmodule/CMakeLists.txt
rename to tdeioslave/home/kdedmodule/CMakeLists.txt
diff --git a/kioslave/home/kdedmodule/Makefile.am b/tdeioslave/home/kdedmodule/Makefile.am
similarity index 100%
rename from kioslave/home/kdedmodule/Makefile.am
rename to tdeioslave/home/kdedmodule/Makefile.am
diff --git a/kioslave/home/kdedmodule/homedirnotify.cpp b/tdeioslave/home/kdedmodule/homedirnotify.cpp
similarity index 100%
rename from kioslave/home/kdedmodule/homedirnotify.cpp
rename to tdeioslave/home/kdedmodule/homedirnotify.cpp
diff --git a/kioslave/home/kdedmodule/homedirnotify.desktop b/tdeioslave/home/kdedmodule/homedirnotify.desktop
similarity index 100%
rename from kioslave/home/kdedmodule/homedirnotify.desktop
rename to tdeioslave/home/kdedmodule/homedirnotify.desktop
diff --git a/kioslave/home/kdedmodule/homedirnotify.h b/tdeioslave/home/kdedmodule/homedirnotify.h
similarity index 100%
rename from kioslave/home/kdedmodule/homedirnotify.h
rename to tdeioslave/home/kdedmodule/homedirnotify.h
diff --git a/kioslave/home/kdedmodule/homedirnotifymodule.cpp b/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp
similarity index 100%
rename from kioslave/home/kdedmodule/homedirnotifymodule.cpp
rename to tdeioslave/home/kdedmodule/homedirnotifymodule.cpp
diff --git a/kioslave/home/kdedmodule/homedirnotifymodule.h b/tdeioslave/home/kdedmodule/homedirnotifymodule.h
similarity index 100%
rename from kioslave/home/kdedmodule/homedirnotifymodule.h
rename to tdeioslave/home/kdedmodule/homedirnotifymodule.h
diff --git a/kioslave/home/kio_home.cpp b/tdeioslave/home/kio_home.cpp
similarity index 100%
rename from kioslave/home/kio_home.cpp
rename to tdeioslave/home/kio_home.cpp
diff --git a/kioslave/home/kio_home.h b/tdeioslave/home/kio_home.h
similarity index 97%
rename from kioslave/home/kio_home.h
rename to tdeioslave/home/kio_home.h
index 25607a5d4..db5d8902c 100644
--- a/kioslave/home/kio_home.h
+++ b/tdeioslave/home/kio_home.h
@@ -20,7 +20,7 @@
 #ifndef KIO_HOME_H
 #define KIO_HOME_H
 
-#include <kio/forwardingslavebase.h>
+#include <tdeio/forwardingslavebase.h>
 #include "homeimpl.h"
 
 class HomeProtocol : public TDEIO::ForwardingSlaveBase
diff --git a/kioslave/home/testhome.cpp b/tdeioslave/home/testhome.cpp
similarity index 100%
rename from kioslave/home/testhome.cpp
rename to tdeioslave/home/testhome.cpp
diff --git a/kioslave/home/testhome.h b/tdeioslave/home/testhome.h
similarity index 100%
rename from kioslave/home/testhome.h
rename to tdeioslave/home/testhome.h
diff --git a/kioslave/info/CMakeLists.txt b/tdeioslave/info/CMakeLists.txt
similarity index 94%
rename from kioslave/info/CMakeLists.txt
rename to tdeioslave/info/CMakeLists.txt
index f2dfb52e8..ed2a72f61 100644
--- a/kioslave/info/CMakeLists.txt
+++ b/tdeioslave/info/CMakeLists.txt
@@ -23,8 +23,8 @@ link_directories(
 ##### other data ################################
 
 install( FILES info.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kde-info2html.conf DESTINATION ${DATA_INSTALL_DIR}/kio_info )
-install( PROGRAMS kde-info2html DESTINATION ${DATA_INSTALL_DIR}/kio_info )
+install( FILES kde-info2html.conf DESTINATION ${DATA_INSTALL_DIR}/tdeio_info )
+install( PROGRAMS kde-info2html DESTINATION ${DATA_INSTALL_DIR}/tdeio_info )
 
 
 ##### kio_info (module) #########################
@@ -33,7 +33,7 @@ set( target kio_info )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES info.cc
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kioslave/info/LICENSE b/tdeioslave/info/LICENSE
similarity index 100%
rename from kioslave/info/LICENSE
rename to tdeioslave/info/LICENSE
diff --git a/kioslave/info/Makefile.am b/tdeioslave/info/Makefile.am
similarity index 81%
rename from kioslave/info/Makefile.am
rename to tdeioslave/info/Makefile.am
index ec1976df6..37bbe3083 100644
--- a/kioslave/info/Makefile.am
+++ b/tdeioslave/info/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am of tdebase/kioslave/info
+## Makefile.am of tdebase/tdeioslave/info
 
 INCLUDES = $(all_includes)
 
@@ -18,4 +18,4 @@ kdelnkdir = $(kde_servicesdir)
 
 kio_info_data_DATA = kde-info2html.conf
 kio_info_data_SCRIPTS = kde-info2html
-kio_info_datadir = $(kde_datadir)/kio_info
+kio_info_datadir = $(kde_datadir)/tdeio_info
diff --git a/kioslave/info/info.cc b/tdeioslave/info/info.cc
similarity index 100%
rename from kioslave/info/info.cc
rename to tdeioslave/info/info.cc
diff --git a/kioslave/info/info.h b/tdeioslave/info/info.h
similarity index 95%
rename from kioslave/info/info.h
rename to tdeioslave/info/info.h
index 639348513..c77240613 100644
--- a/kioslave/info/info.h
+++ b/tdeioslave/info/info.h
@@ -3,7 +3,7 @@
 
 #include <tqobject.h>
 
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 
 class TDEProcess;
 
diff --git a/kioslave/info/info.protocol b/tdeioslave/info/info.protocol
similarity index 85%
rename from kioslave/info/info.protocol
rename to tdeioslave/info/info.protocol
index 3bb600aea..491511ed2 100644
--- a/kioslave/info/info.protocol
+++ b/tdeioslave/info/info.protocol
@@ -6,6 +6,6 @@ output=filesystem
 reading=true
 defaultMimetype=text/html
 determineMimetypeFromExtension=false
-DocPath=kioslave/info.html
+DocPath=tdeioslave/info.html
 Icon=help_index
 Class=:local
diff --git a/kioslave/info/kde-info2html b/tdeioslave/info/kde-info2html
similarity index 99%
rename from kioslave/info/kde-info2html
rename to tdeioslave/info/kde-info2html
index df01ccedf..b84d984f4 100755
--- a/kioslave/info/kde-info2html
+++ b/tdeioslave/info/kde-info2html
@@ -100,7 +100,7 @@ EOF
 #---------------------------------------------------------
 #                     Redirect
 #---------------------------------------------------------
-# Since we can't do a kioslave redirection from here, we resort to an HTML
+# Since we can't do a tdeioslave redirection from here, we resort to an HTML
 # redirection.
 #
 # It could be simpler to just output the correct page, but that would leave the
diff --git a/kioslave/info/kde-info2html.conf b/tdeioslave/info/kde-info2html.conf
similarity index 100%
rename from kioslave/info/kde-info2html.conf
rename to tdeioslave/info/kde-info2html.conf
diff --git a/kioslave/ldap/CMakeLists.txt b/tdeioslave/ldap/CMakeLists.txt
similarity index 100%
rename from kioslave/ldap/CMakeLists.txt
rename to tdeioslave/ldap/CMakeLists.txt
diff --git a/kioslave/ldap/ConfigureChecks.cmake b/tdeioslave/ldap/ConfigureChecks.cmake
similarity index 100%
rename from kioslave/ldap/ConfigureChecks.cmake
rename to tdeioslave/ldap/ConfigureChecks.cmake
diff --git a/kioslave/ldap/LICENSE b/tdeioslave/ldap/LICENSE
similarity index 100%
rename from kioslave/ldap/LICENSE
rename to tdeioslave/ldap/LICENSE
diff --git a/kioslave/ldap/Makefile.am b/tdeioslave/ldap/Makefile.am
similarity index 85%
rename from kioslave/ldap/Makefile.am
rename to tdeioslave/ldap/Makefile.am
index 5e85a19cb..ca66e1b17 100644
--- a/kioslave/ldap/Makefile.am
+++ b/tdeioslave/ldap/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am of tdebase/kioslave/ldap
+## Makefile.am of tdebase/tdeioslave/ldap
 
 INCLUDES   = $(all_includes) $(LDAP_INCS)
 AM_CXXFLAGS = -DLDAP_DEPRECATED
@@ -19,4 +19,4 @@ kdelnk_DATA = ldap.protocol ldaps.protocol
 kdelnkdir = $(kde_servicesdir)
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_ldap.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_ldap.pot
diff --git a/kioslave/ldap/configure.in.in b/tdeioslave/ldap/configure.in.in
similarity index 97%
rename from kioslave/ldap/configure.in.in
rename to tdeioslave/ldap/configure.in.in
index b23c12387..a4257d3db 100644
--- a/kioslave/ldap/configure.in.in
+++ b/tdeioslave/ldap/configure.in.in
@@ -108,4 +108,4 @@ AC_SUBST(LDAP_INCS)
 AC_SUBST(LDAP_LIBS)
 AC_SUBST(LDAP_RPATH)
 
-AM_CONDITIONAL(include_kioslave_ldap, test -n "$LDAP_SUBDIR")
+AM_CONDITIONAL(include_tdeioslave_ldap, test -n "$LDAP_SUBDIR")
diff --git a/kioslave/ldap/kio_ldap.cpp b/tdeioslave/ldap/kio_ldap.cpp
similarity index 100%
rename from kioslave/ldap/kio_ldap.cpp
rename to tdeioslave/ldap/kio_ldap.cpp
diff --git a/kioslave/ldap/kio_ldap.h b/tdeioslave/ldap/kio_ldap.h
similarity index 97%
rename from kioslave/ldap/kio_ldap.h
rename to tdeioslave/ldap/kio_ldap.h
index 4ee15ad2b..f3bd61fe5 100644
--- a/kioslave/ldap/kio_ldap.h
+++ b/tdeioslave/ldap/kio_ldap.h
@@ -4,8 +4,8 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 
-#include <kio/slavebase.h>
-#include <kio/authinfo.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/authinfo.h>
 
 #define LDAP_DEPRECATED 1 /* Needed for ldap_simple_bind_s with openldap >= 2.3.x */
 #include <lber.h>
diff --git a/kioslave/ldap/ldap.protocol b/tdeioslave/ldap/ldap.protocol
similarity index 89%
rename from kioslave/ldap/ldap.protocol
rename to tdeioslave/ldap/ldap.protocol
index 3ab0b7eb5..3e1e77b4b 100644
--- a/kioslave/ldap/ldap.protocol
+++ b/tdeioslave/ldap/ldap.protocol
@@ -13,5 +13,5 @@ deleting=true
 #moving=true
 mimetype=text/plain
 determineMimetypeFromExtension=false
-DocPath=kioslave/ldap.html
+DocPath=tdeioslave/ldap.html
 Icon=kaddressbook
diff --git a/kioslave/ldap/ldaps.protocol b/tdeioslave/ldap/ldaps.protocol
similarity index 89%
rename from kioslave/ldap/ldaps.protocol
rename to tdeioslave/ldap/ldaps.protocol
index 542faa597..1dd927506 100644
--- a/kioslave/ldap/ldaps.protocol
+++ b/tdeioslave/ldap/ldaps.protocol
@@ -13,5 +13,5 @@ deleting=true
 #moving=true
 mimetype=text/plain
 determineMimetypeFromExtension=false
-DocPath=kioslave/ldap.html
+DocPath=tdeioslave/ldap.html
 Icon=kaddressbook
diff --git a/kioslave/mac/AUTHORS b/tdeioslave/mac/AUTHORS
similarity index 100%
rename from kioslave/mac/AUTHORS
rename to tdeioslave/mac/AUTHORS
diff --git a/kioslave/mac/CMakeLists.txt b/tdeioslave/mac/CMakeLists.txt
similarity index 97%
rename from kioslave/mac/CMakeLists.txt
rename to tdeioslave/mac/CMakeLists.txt
index fbe700838..6b1b92f6e 100644
--- a/kioslave/mac/CMakeLists.txt
+++ b/tdeioslave/mac/CMakeLists.txt
@@ -32,7 +32,7 @@ set( target kio_mac )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES kio_mac.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kioslave/mac/ChangeLog b/tdeioslave/mac/ChangeLog
similarity index 100%
rename from kioslave/mac/ChangeLog
rename to tdeioslave/mac/ChangeLog
diff --git a/kioslave/mac/Makefile.am b/tdeioslave/mac/Makefile.am
similarity index 91%
rename from kioslave/mac/Makefile.am
rename to tdeioslave/mac/Makefile.am
index 37c94589e..dfd79d822 100644
--- a/kioslave/mac/Makefile.am
+++ b/tdeioslave/mac/Makefile.am
@@ -20,4 +20,4 @@ METASOURCES = AUTO
 KDE_ICON = AUTO
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_mac.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_mac.pot
diff --git a/kioslave/mac/README b/tdeioslave/mac/README
similarity index 100%
rename from kioslave/mac/README
rename to tdeioslave/mac/README
diff --git a/kioslave/mac/TODO b/tdeioslave/mac/TODO
similarity index 100%
rename from kioslave/mac/TODO
rename to tdeioslave/mac/TODO
diff --git a/kioslave/mac/cr16-app-mac.png b/tdeioslave/mac/cr16-app-mac.png
similarity index 100%
rename from kioslave/mac/cr16-app-mac.png
rename to tdeioslave/mac/cr16-app-mac.png
diff --git a/kioslave/mac/cr32-app-mac.png b/tdeioslave/mac/cr32-app-mac.png
similarity index 100%
rename from kioslave/mac/cr32-app-mac.png
rename to tdeioslave/mac/cr32-app-mac.png
diff --git a/kioslave/mac/kio_mac.cpp b/tdeioslave/mac/kio_mac.cpp
similarity index 99%
rename from kioslave/mac/kio_mac.cpp
rename to tdeioslave/mac/kio_mac.cpp
index a7fc4da0f..d26cc47e5 100644
--- a/kioslave/mac/kio_mac.cpp
+++ b/tdeioslave/mac/kio_mac.cpp
@@ -21,7 +21,7 @@
 #include <kinstance.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqstring.h>
 #include <tqregexp.h>
 
@@ -396,7 +396,7 @@ TQValueList<TDEIO::UDSAtom> MacProtocol::makeUDS(const TQString& _line) {
             atom.m_uds = TDEIO::UDS_LINK_DEST;
             atom.m_str = fileRE.cap(9); //I have a file called "Mozilla alias" the name
                                           // of which displays funny because of this.
-                                          // No idea why.  Same for other kioslaves. A font thing?
+                                          // No idea why.  Same for other tdeioslaves. A font thing?
             entry.append(atom);
             } else {
             atom.m_uds = TDEIO::UDS_FILE_TYPE;
diff --git a/kioslave/mac/kio_mac.h b/tdeioslave/mac/kio_mac.h
similarity index 97%
rename from kioslave/mac/kio_mac.h
rename to tdeioslave/mac/kio_mac.h
index 2501791b2..e497e9918 100644
--- a/kioslave/mac/kio_mac.h
+++ b/tdeioslave/mac/kio_mac.h
@@ -16,8 +16,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kio/slavebase.h>
-#include <kio/global.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/global.h>
 #include <kurl.h>
 #include <kprocess.h>
 
diff --git a/kioslave/mac/mac.protocol b/tdeioslave/mac/mac.protocol
similarity index 61%
rename from kioslave/mac/mac.protocol
rename to tdeioslave/mac/mac.protocol
index cef77621d..9e94132bb 100644
--- a/kioslave/mac/mac.protocol
+++ b/tdeioslave/mac/mac.protocol
@@ -6,38 +6,38 @@ output=filesystem
 reading=true
 listing=Name,Type,Size,Date
 defaultMimetype=application/octet-stream
-Description=A kioslave for MacOS HFS+ partitions
+Description=A tdeioslave for MacOS HFS+ partitions
 Description[af]='n Kioslave vir MacOS HFS+ partisies
 Description[be]=Kioslave для раздзелаў MacOS HFS+
-Description[bn]=ম্যাক-ও-এস HFS+ পার্টিশন-এর জন্য একটি kioslave
+Description[bn]=ম্যাক-ও-এস HFS+ পার্টিশন-এর জন্য একটি tdeioslave
 Description[br]=Ur c'hioslave evit ar parzhadurioù MacOS HFS+
-Description[bs]=kioslave za MacOS HFS+ particije
-Description[ca]=Un kioslave per a particions MacOS HFS+
+Description[bs]=tdeioslave za MacOS HFS+ particije
+Description[ca]=Un tdeioslave per a particions MacOS HFS+
 Description[cs]=Pomocný protokol pro diskové oddíly MacOS HFS+
 Description[csb]=Plugins protokòłu dlô particëji HFS+ systemë MacOS
-Description[da]=En kioslave for MacOS HFS+ partitioner
+Description[da]=En tdeioslave for MacOS HFS+ partitioner
 Description[de]=Ein-/Ausgabemodul für MacOS HFS+ Partitionen
-Description[el]=Ένας kioslave για κατατμήσεις MacOS HFS+
+Description[el]=Ένας tdeioslave για κατατμήσεις MacOS HFS+
 Description[eo]=K-enel-sklavo por MacOS HFS+ subdiskoj
-Description[es]=Un kioslave para particiones  MacOS HFS+
+Description[es]=Un tdeioslave para particiones  MacOS HFS+
 Description[et]=MacOS-i HFS+-partitsioonide IO-moodul
-Description[eu]=MacOS HFS+ zatiketetarako kioslavea
-Description[fa]=یک kioslave برای افرازهای HFS+ سیستم عامل مکینتاش
+Description[eu]=MacOS HFS+ zatiketetarako tdeioslavea
+Description[fa]=یک tdeioslave برای افرازهای HFS+ سیستم عامل مکینتاش
 Description[fi]=Liitäntä MacOS HFS+ osioinneille
 Description[fr]=Un module d'entrées / sorties pour les partitions MacOS HFS+
-Description[fy]=In kioslave foar MacOS HFS+-partities
-Description[ga]=kioslave le haghaidh deighiltí MacOS HFS+
-Description[gl]=Un kioslave para particións MacOS HFS+
-Description[he]=ממשק kioslave עבור מחיצות MacOS HFS+
+Description[fy]=In tdeioslave foar MacOS HFS+-partities
+Description[ga]=tdeioslave le haghaidh deighiltí MacOS HFS+
+Description[gl]=Un tdeioslave para particións MacOS HFS+
+Description[he]=ממשק tdeioslave עבור מחיצות MacOS HFS+
 Description[hi]=मॅक-ओएस एचएफ़एस+ पार्टीशनों के लिए के-आई-ओ-स्लेव
 Description[hr]=Kioslave za MacOS HFS+ particije
 Description[hu]=KDE-protokoll MacOS HFS+ partíciók kezeléséhez
-Description[is]=kioslave fyrir MacOS HFS+ disksneiðar
-Description[it]=Un kioslave per partizioni MacOS HFS+
-Description[ja]=MacOS HFS+ パーティションのための kioslave
-Description[ka]=kioslave MacOS HFS+ პარტიციებისთვის
+Description[is]=tdeioslave fyrir MacOS HFS+ disksneiðar
+Description[it]=Un tdeioslave per partizioni MacOS HFS+
+Description[ja]=MacOS HFS+ パーティションのための tdeioslave
+Description[ka]=tdeioslave MacOS HFS+ პარტიციებისთვის
 Description[kk]=MacOS HFS+ файл жүйесінің енгізу-шығару модулі
-Description[km]=kioslave សម្រាប់​ភាគ MacOS HFS+
+Description[km]=tdeioslave សម្រាប់​ភាគ MacOS HFS+
 Description[lt]=Kiovergas MacOS HFS+ dalmenims
 Description[lv]=KIO vergs MacOS HFS+ partīcijām
 Description[mk]=kio-служител за HFS+ партиции од MacOS
@@ -45,29 +45,29 @@ Description[ms]=Hamba kio untuk MacOS HFS+ petak
 Description[nb]=En kioskslave for MacOS HFS+-partisjoner
 Description[nds]=En In-/Utgaavdeenst för MacOS-HFS+-Partitschonen
 Description[ne]=MacOS HFS+ विभाजनका लागि किओस्लेभ
-Description[nl]=Een kioslave voor MacOS HFS+-partities
+Description[nl]=Een tdeioslave voor MacOS HFS+-partities
 Description[nn]=Ein IU-slave for MacOS HFS+-partisjonar
-Description[pa]=MacOS HFS+ ਭਾਗਾਂ ਲਈ kioslave
+Description[pa]=MacOS HFS+ ਭਾਗਾਂ ਲਈ tdeioslave
 Description[pl]=Wtyczka protokołu dla partycji HFS+ systemu MacOS
-Description[pt]=Um 'kioslave' para partições MacOS HFS+
+Description[pt]=Um 'tdeioslave' para partições MacOS HFS+
 Description[pt_BR]=Um protocolo para as partições HFS+ do MacOS 
 Description[ro]=Un dispozitiv de I/E pentru partiții HFS+ MacOS
 Description[ru]=Модуль ввода-вывода для файловой системы MacOS HFS+
 Description[rw]=Kio-umugaragu ya MacOS HFS+ibicedisiki
 Description[se]=SO-šláva MacOS HFS+-partišuvnnaid várás
-Description[sk]=kioslave pre MacOS HFS+
-Description[sl]=kioslave za razdelke MacOS HFS+
+Description[sk]=tdeioslave pre MacOS HFS+
+Description[sl]=tdeioslave za razdelke MacOS HFS+
 Description[sr]=Kioslave за MacOS-ове HFS+ партиције
 Description[sr@Latn]=Kioslave za MacOS-ove HFS+ particije
 Description[sv]=En I/O-slav för MacOS HFS+ partitioner
 Description[ta]=MacOS HFS+ partitionsக்கு ஒரு க்யோஸ்லேவ்
 Description[th]=ตัวนำข้อมูลเข้า-ออกสำหรับพาร์ติชั่นที่ใช้ระบบไฟล์ HFS+ ของ MacOS 
-Description[tr]=MacOS HFS+ bölümleri için kioslave
+Description[tr]=MacOS HFS+ bölümleri için tdeioslave
 Description[tt]=MacOS HFS+ bülemnäre öçen birem sistemeneñ modulı
 Description[uk]=Підлеглий B/В для розділів MacOS HFS+
-Description[vi]=A kioslave (đày tớ vào ra KDE) cho MacOS HFS và các phân vùng
-Description[wa]=On kioslave po MacOS HFS + pårticions
+Description[vi]=A tdeioslave (đày tớ vào ra KDE) cho MacOS HFS và các phân vùng
+Description[wa]=On tdeioslave po MacOS HFS + pårticions
 Description[zh_CN]=MacOS HFS+ 分区的 KIO 仆人
-Description[zh_TW]=用於 MacOS HFS+ 分割區的 kioslave
+Description[zh_TW]=用於 MacOS HFS+ 分割區的 tdeioslave
 Icon=mac
-DocPath=kioslave/mac.html
+DocPath=tdeioslave/mac.html
diff --git a/kioslave/man/CMakeLists.txt b/tdeioslave/man/CMakeLists.txt
similarity index 92%
rename from kioslave/man/CMakeLists.txt
rename to tdeioslave/man/CMakeLists.txt
index 09434d131..fca109df0 100644
--- a/kioslave/man/CMakeLists.txt
+++ b/tdeioslave/man/CMakeLists.txt
@@ -35,7 +35,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES man.protocol kmanpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kio_man.css DESTINATION ${DATA_INSTALL_DIR}/kio_man )
+install( FILES kio_man.css DESTINATION ${DATA_INSTALL_DIR}/tdeio_man )
 
 
 ##### kio_man (module) ##########################
@@ -44,7 +44,7 @@ set( target kio_man )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES man2html.cpp kio_man.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kioslave/man/LICENSE b/tdeioslave/man/LICENSE
similarity index 100%
rename from kioslave/man/LICENSE
rename to tdeioslave/man/LICENSE
diff --git a/kioslave/man/Makefile.am b/tdeioslave/man/Makefile.am
similarity index 92%
rename from kioslave/man/Makefile.am
rename to tdeioslave/man/Makefile.am
index 80d9ffa96..d43edb74d 100644
--- a/kioslave/man/Makefile.am
+++ b/tdeioslave/man/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am of tdebase/kioslave/man
+## Makefile.am of tdebase/tdeioslave/man
 
 INCLUDES= $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
@@ -29,13 +29,13 @@ kdelnk_DATA = man.protocol kmanpart.desktop
 kdelnkdir = $(kde_servicesdir)
 
 kio_man_data_DATA = kio_man.css
-kio_man_datadir = $(kde_datadir)/kio_man
+kio_man_datadir = $(kde_datadir)/tdeio_man
 EXTRA_DIST=$(kio_man_data_DATA)
 
 METASOURCES = AUTO
 
 messages:
-	$(XGETTEXT) *.cpp *.h -o $(podir)/kio_man.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdeio_man.pot
 
 man2html_SOURCES = dummy.cpp
 man2html_LDADD = man2html_simple.o $(LIB_QT)
diff --git a/kioslave/man/kio_man.cpp b/tdeioslave/man/kio_man.cpp
similarity index 99%
rename from kioslave/man/kio_man.cpp
rename to tdeioslave/man/kio_man.cpp
index 1fd81de8d..d2ef8cb94 100644
--- a/kioslave/man/kio_man.cpp
+++ b/tdeioslave/man/kio_man.cpp
@@ -122,7 +122,7 @@ MANProtocol::MANProtocol(const TQCString &pool_socket, const TQCString &app_sock
     m_cssPath=strPath.local8Bit(); // ### TODO encode for CSS
     section_names << "1" << "2" << "3" << "3n" << "3p" << "4" << "5" << "6" << "7"
                   << "8" << "9" << "l" << "n";
-    m_manCSSFile = locate( "data", "kio_man/kio_man.css" );
+    m_manCSSFile = locate( "data", "kio_man/tdeio_man.css" );
 }
 
 MANProtocol *MANProtocol::self() { return _self; }
diff --git a/kioslave/man/kio_man.css b/tdeioslave/man/kio_man.css
similarity index 100%
rename from kioslave/man/kio_man.css
rename to tdeioslave/man/kio_man.css
diff --git a/kioslave/man/kio_man.h b/tdeioslave/man/kio_man.h
similarity index 98%
rename from kioslave/man/kio_man.h
rename to tdeioslave/man/kio_man.h
index caa59ff3b..829a07964 100644
--- a/kioslave/man/kio_man.h
+++ b/tdeioslave/man/kio_man.h
@@ -28,8 +28,8 @@
 #include <tqbuffer.h>
 
 
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 
 class MANProtocol : public TQObject, public TDEIO::SlaveBase
diff --git a/kioslave/man/kio_man_test.cpp b/tdeioslave/man/kio_man_test.cpp
similarity index 85%
rename from kioslave/man/kio_man_test.cpp
rename to tdeioslave/man/kio_man_test.cpp
index 03a7ee12e..a181c47b3 100644
--- a/kioslave/man/kio_man_test.cpp
+++ b/tdeioslave/man/kio_man_test.cpp
@@ -29,7 +29,7 @@ int main(int argc, char **argv)
 {
   TDEApplication a( argc, argv , "p2");
 
-  MANProtocol testproto("/tmp/kiotest.in", "/tmp/kiotest.out");
+  MANProtocol testproto("/tmp/tdeiotest.in", "/tmp/tdeiotest.out");
   testproto.showIndex("3");
 
   return 0;
diff --git a/kioslave/man/kmanpart.cpp b/tdeioslave/man/kmanpart.cpp
similarity index 100%
rename from kioslave/man/kmanpart.cpp
rename to tdeioslave/man/kmanpart.cpp
diff --git a/kioslave/man/kmanpart.desktop b/tdeioslave/man/kmanpart.desktop
similarity index 100%
rename from kioslave/man/kmanpart.desktop
rename to tdeioslave/man/kmanpart.desktop
diff --git a/kioslave/man/kmanpart.h b/tdeioslave/man/kmanpart.h
similarity index 97%
rename from kioslave/man/kmanpart.h
rename to tdeioslave/man/kmanpart.h
index 971a48550..20a451c91 100644
--- a/kioslave/man/kmanpart.h
+++ b/tdeioslave/man/kmanpart.h
@@ -25,8 +25,8 @@
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
 #include <tdehtml_part.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 
 #include <tqcstring.h>
 
diff --git a/kioslave/man/man.protocol b/tdeioslave/man/man.protocol
similarity index 86%
rename from kioslave/man/man.protocol
rename to tdeioslave/man/man.protocol
index 5df21f19d..555970fdc 100644
--- a/kioslave/man/man.protocol
+++ b/tdeioslave/man/man.protocol
@@ -7,6 +7,6 @@ reading=true
 listing=Name
 defaultMimetype=text/html
 determineMimetypeFromExtension=false
-DocPath=kioslave/man.html
+DocPath=tdeioslave/man.html
 Icon=man
 Class=:local
diff --git a/kioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp
similarity index 100%
rename from kioslave/man/man2html.cpp
rename to tdeioslave/man/man2html.cpp
diff --git a/kioslave/man/man2html.h b/tdeioslave/man/man2html.h
similarity index 100%
rename from kioslave/man/man2html.h
rename to tdeioslave/man/man2html.h
diff --git a/kioslave/media/CMakeLists.txt b/tdeioslave/media/CMakeLists.txt
similarity index 94%
rename from kioslave/media/CMakeLists.txt
rename to tdeioslave/media/CMakeLists.txt
index 6c39b47fe..68d4bf9d6 100644
--- a/kioslave/media/CMakeLists.txt
+++ b/tdeioslave/media/CMakeLists.txt
@@ -13,7 +13,7 @@ add_subdirectory( libmediacommon )
 add_subdirectory( mediamanager )
 add_subdirectory( medianotifier )
 add_subdirectory( mounthelper )
-add_subdirectory( kfile-plugin )
+add_subdirectory( tdefile-plugin )
 add_subdirectory( tdecmodule )
 add_subdirectory( mimetypes )
 add_subdirectory( services )
@@ -54,6 +54,6 @@ set( target kio_media )
 tde_add_kpart( ${target} AUTOMOC
   SOURCES dummy.cpp
   EMBED kiomedia-static
-  LINK mediacommon-static kio-shared
+  LINK mediacommon-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/media/Makefile.am b/tdeioslave/media/Makefile.am
similarity index 59%
rename from kioslave/media/Makefile.am
rename to tdeioslave/media/Makefile.am
index 978f17cbc..b82e48557 100644
--- a/kioslave/media/Makefile.am
+++ b/tdeioslave/media/Makefile.am
@@ -3,7 +3,7 @@ PROPSDLGPLUGINDIR = propsdlgplugin
 endif
 
 SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \
-          kfile-plugin tdecmodule mimetypes services $(PROPSDLGPLUGINDIR)
+          tdefile-plugin tdecmodule mimetypes services $(PROPSDLGPLUGINDIR)
 
 INCLUDES = -I$(srcdir)/libmediacommon $(all_includes)
 METASOURCES = AUTO
@@ -11,7 +11,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = kio_media.la
 
 kio_media_la_SOURCES = dummy.cpp
-kio_media_la_LIBADD  = libkiomedia.la libmediacommon/libmediacommon.la $(LIB_KIO)
+kio_media_la_LIBADD  = libtdeiomedia.la libmediacommon/libmediacommon.la $(LIB_KIO)
 kio_media_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
 dummy.cpp:
@@ -19,12 +19,12 @@ dummy.cpp:
 
 kde_services_DATA = media.protocol
 
-noinst_LTLIBRARIES = libkiomedia.la
-libkiomedia_la_SOURCES = kio_media.cpp mediaimpl.cpp mediaimpl.skel
+noinst_LTLIBRARIES = libtdeiomedia.la
+libtdeiomedia_la_SOURCES = kio_media.cpp mediaimpl.cpp mediaimpl.skel
 
 check_PROGRAMS = testmedia
 testmedia_SOURCES = testmedia.cpp
-testmedia_LDADD = libkiomedia.la $(LIB_KIO)
+testmedia_LDADD = libtdeiomedia.la $(LIB_KIO)
 testmedia_LDFLAGS = $(all_libraries)
 
 ## TODO in unsermake: TESTS = testmedia
@@ -33,4 +33,4 @@ check: testmedia
 
 messages: rc.cpp
 	$(EXTRACTRC) propsdlgplugin/propertiespagegui.ui >> rc.cpp
-	$(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot
+	$(XGETTEXT) *.cpp *.h tdefile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/tdeio_media.pot
diff --git a/kioslave/media/configure.in.in b/tdeioslave/media/configure.in.in
similarity index 100%
rename from kioslave/media/configure.in.in
rename to tdeioslave/media/configure.in.in
diff --git a/kioslave/media/contrib/README b/tdeioslave/media/contrib/README
similarity index 100%
rename from kioslave/media/contrib/README
rename to tdeioslave/media/contrib/README
diff --git a/kioslave/media/contrib/mediamanager_usbstorage.dev b/tdeioslave/media/contrib/mediamanager_usbstorage.dev
similarity index 100%
rename from kioslave/media/contrib/mediamanager_usbstorage.dev
rename to tdeioslave/media/contrib/mediamanager_usbstorage.dev
diff --git a/kioslave/media/contrib/usbcam b/tdeioslave/media/contrib/usbcam
similarity index 100%
rename from kioslave/media/contrib/usbcam
rename to tdeioslave/media/contrib/usbcam
diff --git a/kioslave/media/dummy.cpp b/tdeioslave/media/dummy.cpp
similarity index 100%
rename from kioslave/media/dummy.cpp
rename to tdeioslave/media/dummy.cpp
diff --git a/kioslave/media/kio_media.cpp b/tdeioslave/media/kio_media.cpp
similarity index 100%
rename from kioslave/media/kio_media.cpp
rename to tdeioslave/media/kio_media.cpp
diff --git a/kioslave/media/kio_media.h b/tdeioslave/media/kio_media.h
similarity index 97%
rename from kioslave/media/kio_media.h
rename to tdeioslave/media/kio_media.h
index 8a4cd86fb..bf1325475 100644
--- a/kioslave/media/kio_media.h
+++ b/tdeioslave/media/kio_media.h
@@ -20,7 +20,7 @@
 #ifndef _KIO_MEDIA_H_
 #define _KIO_MEDIA_H_
 
-#include <kio/forwardingslavebase.h>
+#include <tdeio/forwardingslavebase.h>
 
 #include "mediaimpl.h"
 
diff --git a/kioslave/media/libmediacommon/CMakeLists.txt b/tdeioslave/media/libmediacommon/CMakeLists.txt
similarity index 100%
rename from kioslave/media/libmediacommon/CMakeLists.txt
rename to tdeioslave/media/libmediacommon/CMakeLists.txt
diff --git a/kioslave/media/libmediacommon/Makefile.am b/tdeioslave/media/libmediacommon/Makefile.am
similarity index 100%
rename from kioslave/media/libmediacommon/Makefile.am
rename to tdeioslave/media/libmediacommon/Makefile.am
diff --git a/kioslave/media/libmediacommon/actionlistboxitem.cpp b/tdeioslave/media/libmediacommon/actionlistboxitem.cpp
similarity index 100%
rename from kioslave/media/libmediacommon/actionlistboxitem.cpp
rename to tdeioslave/media/libmediacommon/actionlistboxitem.cpp
diff --git a/kioslave/media/libmediacommon/actionlistboxitem.h b/tdeioslave/media/libmediacommon/actionlistboxitem.h
similarity index 100%
rename from kioslave/media/libmediacommon/actionlistboxitem.h
rename to tdeioslave/media/libmediacommon/actionlistboxitem.h
diff --git a/kioslave/media/libmediacommon/mediamanagersettings.kcfg b/tdeioslave/media/libmediacommon/mediamanagersettings.kcfg
similarity index 100%
rename from kioslave/media/libmediacommon/mediamanagersettings.kcfg
rename to tdeioslave/media/libmediacommon/mediamanagersettings.kcfg
diff --git a/kioslave/media/libmediacommon/mediamanagersettings.kcfgc b/tdeioslave/media/libmediacommon/mediamanagersettings.kcfgc
similarity index 100%
rename from kioslave/media/libmediacommon/mediamanagersettings.kcfgc
rename to tdeioslave/media/libmediacommon/mediamanagersettings.kcfgc
diff --git a/kioslave/media/libmediacommon/medium.cpp b/tdeioslave/media/libmediacommon/medium.cpp
similarity index 99%
rename from kioslave/media/libmediacommon/medium.cpp
rename to tdeioslave/media/libmediacommon/medium.cpp
index 38d68725b..7b97fb1a0 100644
--- a/kioslave/media/libmediacommon/medium.cpp
+++ b/tdeioslave/media/libmediacommon/medium.cpp
@@ -18,7 +18,7 @@
 
 #include "medium.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 const TQString Medium::SEPARATOR = "---";
diff --git a/kioslave/media/libmediacommon/medium.h b/tdeioslave/media/libmediacommon/medium.h
similarity index 100%
rename from kioslave/media/libmediacommon/medium.h
rename to tdeioslave/media/libmediacommon/medium.h
diff --git a/kioslave/media/libmediacommon/notifieraction.cpp b/tdeioslave/media/libmediacommon/notifieraction.cpp
similarity index 100%
rename from kioslave/media/libmediacommon/notifieraction.cpp
rename to tdeioslave/media/libmediacommon/notifieraction.cpp
diff --git a/kioslave/media/libmediacommon/notifieraction.h b/tdeioslave/media/libmediacommon/notifieraction.h
similarity index 98%
rename from kioslave/media/libmediacommon/notifieraction.h
rename to tdeioslave/media/libmediacommon/notifieraction.h
index 21e2f01f4..0b8a87cac 100644
--- a/kioslave/media/libmediacommon/notifieraction.h
+++ b/tdeioslave/media/libmediacommon/notifieraction.h
@@ -20,7 +20,7 @@
 #ifndef _NOTIFIERACTION_H_
 #define _NOTIFIERACTION_H_
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <tqstring.h>
 #include <tqpixmap.h>
 
diff --git a/kioslave/media/libmediacommon/notifiernothingaction.cpp b/tdeioslave/media/libmediacommon/notifiernothingaction.cpp
similarity index 100%
rename from kioslave/media/libmediacommon/notifiernothingaction.cpp
rename to tdeioslave/media/libmediacommon/notifiernothingaction.cpp
diff --git a/kioslave/media/libmediacommon/notifiernothingaction.h b/tdeioslave/media/libmediacommon/notifiernothingaction.h
similarity index 100%
rename from kioslave/media/libmediacommon/notifiernothingaction.h
rename to tdeioslave/media/libmediacommon/notifiernothingaction.h
diff --git a/kioslave/media/libmediacommon/notifieropenaction.cpp b/tdeioslave/media/libmediacommon/notifieropenaction.cpp
similarity index 100%
rename from kioslave/media/libmediacommon/notifieropenaction.cpp
rename to tdeioslave/media/libmediacommon/notifieropenaction.cpp
diff --git a/kioslave/media/libmediacommon/notifieropenaction.h b/tdeioslave/media/libmediacommon/notifieropenaction.h
similarity index 100%
rename from kioslave/media/libmediacommon/notifieropenaction.h
rename to tdeioslave/media/libmediacommon/notifieropenaction.h
diff --git a/kioslave/media/libmediacommon/notifierserviceaction.cpp b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp
similarity index 100%
rename from kioslave/media/libmediacommon/notifierserviceaction.cpp
rename to tdeioslave/media/libmediacommon/notifierserviceaction.cpp
diff --git a/kioslave/media/libmediacommon/notifierserviceaction.h b/tdeioslave/media/libmediacommon/notifierserviceaction.h
similarity index 100%
rename from kioslave/media/libmediacommon/notifierserviceaction.h
rename to tdeioslave/media/libmediacommon/notifierserviceaction.h
diff --git a/kioslave/media/libmediacommon/notifiersettings.cpp b/tdeioslave/media/libmediacommon/notifiersettings.cpp
similarity index 100%
rename from kioslave/media/libmediacommon/notifiersettings.cpp
rename to tdeioslave/media/libmediacommon/notifiersettings.cpp
diff --git a/kioslave/media/libmediacommon/notifiersettings.h b/tdeioslave/media/libmediacommon/notifiersettings.h
similarity index 100%
rename from kioslave/media/libmediacommon/notifiersettings.h
rename to tdeioslave/media/libmediacommon/notifiersettings.h
diff --git a/kioslave/media/media.protocol b/tdeioslave/media/media.protocol
similarity index 89%
rename from kioslave/media/media.protocol
rename to tdeioslave/media/media.protocol
index 053611c1f..f535e1a41 100644
--- a/kioslave/media/media.protocol
+++ b/tdeioslave/media/media.protocol
@@ -12,7 +12,7 @@ linking=true
 moving=true
 Icon=system
 maxInstances=4
-#TODO DocPath=kioslave/file.html
+#TODO DocPath=tdeioslave/file.html
 Class=:local
 deleteRecursive=true
 fileNameUsedForCopying=Name
diff --git a/kioslave/media/mediaimpl.cpp b/tdeioslave/media/mediaimpl.cpp
similarity index 99%
rename from kioslave/media/mediaimpl.cpp
rename to tdeioslave/media/mediaimpl.cpp
index 8f132776b..a6ed957ae 100644
--- a/kioslave/media/mediaimpl.cpp
+++ b/tdeioslave/media/mediaimpl.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <kmimetype.h>
 
diff --git a/kioslave/media/mediaimpl.h b/tdeioslave/media/mediaimpl.h
similarity index 98%
rename from kioslave/media/mediaimpl.h
rename to tdeioslave/media/mediaimpl.h
index 4675ee2f9..1080d6783 100644
--- a/kioslave/media/mediaimpl.h
+++ b/tdeioslave/media/mediaimpl.h
@@ -20,8 +20,8 @@
 #ifndef _MEDIAIMPL_H_
 #define _MEDIAIMPL_H_
 
-#include <kio/global.h>
-#include <kio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 #include <dcopobject.h>
 
diff --git a/kioslave/media/mediamanager/CMakeLists.txt b/tdeioslave/media/mediamanager/CMakeLists.txt
similarity index 93%
rename from kioslave/media/mediamanager/CMakeLists.txt
rename to tdeioslave/media/mediamanager/CMakeLists.txt
index 1c1a076b3..5a73f3708 100644
--- a/kioslave/media/mediamanager/CMakeLists.txt
+++ b/tdeioslave/media/mediamanager/CMakeLists.txt
@@ -11,8 +11,8 @@
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/kioslave/media/libmediacommon
-  ${CMAKE_SOURCE_DIR}/kioslave/media/libmediacommon
+  ${CMAKE_BINARY_DIR}/tdeioslave/media/libmediacommon
+  ${CMAKE_SOURCE_DIR}/tdeioslave/media/libmediacommon
   ${CMAKE_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
diff --git a/kioslave/media/mediamanager/Makefile.am b/tdeioslave/media/mediamanager/Makefile.am
similarity index 100%
rename from kioslave/media/mediamanager/Makefile.am
rename to tdeioslave/media/mediamanager/Makefile.am
diff --git a/kioslave/media/mediamanager/backendbase.cpp b/tdeioslave/media/mediamanager/backendbase.cpp
similarity index 100%
rename from kioslave/media/mediamanager/backendbase.cpp
rename to tdeioslave/media/mediamanager/backendbase.cpp
diff --git a/kioslave/media/mediamanager/backendbase.h b/tdeioslave/media/mediamanager/backendbase.h
similarity index 100%
rename from kioslave/media/mediamanager/backendbase.h
rename to tdeioslave/media/mediamanager/backendbase.h
diff --git a/kioslave/media/mediamanager/decryptdialog.ui b/tdeioslave/media/mediamanager/decryptdialog.ui
similarity index 100%
rename from kioslave/media/mediamanager/decryptdialog.ui
rename to tdeioslave/media/mediamanager/decryptdialog.ui
diff --git a/kioslave/media/mediamanager/dialog.cpp b/tdeioslave/media/mediamanager/dialog.cpp
similarity index 100%
rename from kioslave/media/mediamanager/dialog.cpp
rename to tdeioslave/media/mediamanager/dialog.cpp
diff --git a/kioslave/media/mediamanager/dialog.h b/tdeioslave/media/mediamanager/dialog.h
similarity index 98%
rename from kioslave/media/mediamanager/dialog.h
rename to tdeioslave/media/mediamanager/dialog.h
index 872486f5b..dc1d552d8 100644
--- a/kioslave/media/mediamanager/dialog.h
+++ b/tdeioslave/media/mediamanager/dialog.h
@@ -25,7 +25,7 @@
 
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
diff --git a/kioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp
similarity index 99%
rename from kioslave/media/mediamanager/fstabbackend.cpp
rename to tdeioslave/media/mediamanager/fstabbackend.cpp
index b15e26683..0069a8e8e 100644
--- a/kioslave/media/mediamanager/fstabbackend.cpp
+++ b/tdeioslave/media/mediamanager/fstabbackend.cpp
@@ -37,8 +37,8 @@
 #endif
 
 #include <klocale.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <kurl.h>
diff --git a/kioslave/media/mediamanager/fstabbackend.h b/tdeioslave/media/mediamanager/fstabbackend.h
similarity index 100%
rename from kioslave/media/mediamanager/fstabbackend.h
rename to tdeioslave/media/mediamanager/fstabbackend.h
diff --git a/kioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp
similarity index 99%
rename from kioslave/media/mediamanager/halbackend.cpp
rename to tdeioslave/media/mediamanager/halbackend.cpp
index 072c6cc3a..aba2b0175 100644
--- a/kioslave/media/mediamanager/halbackend.cpp
+++ b/tdeioslave/media/mediamanager/halbackend.cpp
@@ -31,11 +31,11 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqstylesheet.h>
 #include <kmountpoint.h>
 #include <kmessagebox.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kprotocolinfo.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
diff --git a/kioslave/media/mediamanager/halbackend.h b/tdeioslave/media/mediamanager/halbackend.h
similarity index 100%
rename from kioslave/media/mediamanager/halbackend.h
rename to tdeioslave/media/mediamanager/halbackend.h
diff --git a/kioslave/media/mediamanager/linuxcdpolling.cpp b/tdeioslave/media/mediamanager/linuxcdpolling.cpp
similarity index 100%
rename from kioslave/media/mediamanager/linuxcdpolling.cpp
rename to tdeioslave/media/mediamanager/linuxcdpolling.cpp
diff --git a/kioslave/media/mediamanager/linuxcdpolling.h b/tdeioslave/media/mediamanager/linuxcdpolling.h
similarity index 100%
rename from kioslave/media/mediamanager/linuxcdpolling.h
rename to tdeioslave/media/mediamanager/linuxcdpolling.h
diff --git a/kioslave/media/mediamanager/mediadirnotify.cpp b/tdeioslave/media/mediamanager/mediadirnotify.cpp
similarity index 100%
rename from kioslave/media/mediamanager/mediadirnotify.cpp
rename to tdeioslave/media/mediamanager/mediadirnotify.cpp
diff --git a/kioslave/media/mediamanager/mediadirnotify.h b/tdeioslave/media/mediamanager/mediadirnotify.h
similarity index 100%
rename from kioslave/media/mediamanager/mediadirnotify.h
rename to tdeioslave/media/mediamanager/mediadirnotify.h
diff --git a/kioslave/media/mediamanager/medialist.cpp b/tdeioslave/media/mediamanager/medialist.cpp
similarity index 100%
rename from kioslave/media/mediamanager/medialist.cpp
rename to tdeioslave/media/mediamanager/medialist.cpp
diff --git a/kioslave/media/mediamanager/medialist.h b/tdeioslave/media/mediamanager/medialist.h
similarity index 100%
rename from kioslave/media/mediamanager/medialist.h
rename to tdeioslave/media/mediamanager/medialist.h
diff --git a/kioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp
similarity index 100%
rename from kioslave/media/mediamanager/mediamanager.cpp
rename to tdeioslave/media/mediamanager/mediamanager.cpp
diff --git a/kioslave/media/mediamanager/mediamanager.desktop b/tdeioslave/media/mediamanager/mediamanager.desktop
similarity index 100%
rename from kioslave/media/mediamanager/mediamanager.desktop
rename to tdeioslave/media/mediamanager/mediamanager.desktop
diff --git a/kioslave/media/mediamanager/mediamanager.h b/tdeioslave/media/mediamanager/mediamanager.h
similarity index 100%
rename from kioslave/media/mediamanager/mediamanager.h
rename to tdeioslave/media/mediamanager/mediamanager.h
diff --git a/kioslave/media/mediamanager/removablebackend.cpp b/tdeioslave/media/mediamanager/removablebackend.cpp
similarity index 100%
rename from kioslave/media/mediamanager/removablebackend.cpp
rename to tdeioslave/media/mediamanager/removablebackend.cpp
diff --git a/kioslave/media/mediamanager/removablebackend.h b/tdeioslave/media/mediamanager/removablebackend.h
similarity index 100%
rename from kioslave/media/mediamanager/removablebackend.h
rename to tdeioslave/media/mediamanager/removablebackend.h
diff --git a/kioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
similarity index 99%
rename from kioslave/media/mediamanager/tdehardwarebackend.cpp
rename to tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index 65c6431cf..32ed746cf 100644
--- a/kioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -25,8 +25,8 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
-#include <kio/job.h>
+#include <tdeconfig.h>
+#include <tdeio/job.h>
 #include <kprocess.h>
 #include <kmimetype.h>
 #include <kmountpoint.h>
@@ -252,7 +252,7 @@ void TDEBackend::AddDevice(TDEStorageDevice * sdevice, bool allowNotification)
 
 	// PTP camera
 	if (sdevice->isDiskOfType(TDEDiskDeviceType::Camera)) {
-		// PTP cameras are handled by the "camera" kioslave
+		// PTP cameras are handled by the "camera" tdeioslave
 		if (KProtocolInfo::isKnownProtocol( TQString("camera") ) )
 		{
 			// Create medium
@@ -557,7 +557,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 	if (!medium->needMounting()) {
 		if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) {
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice)) {
-				// Encrypted base devices must be set to this mimetype or they won't open when the base device node is passed to the kioslave
+				// Encrypted base devices must be set to this mimetype or they won't open when the base device node is passed to the tdeioslave
 				mimeType = "media/removable_mounted";
 			}
 		}
@@ -1058,7 +1058,7 @@ TQString TDEBackend::mount(const Medium *medium)
 			}
 			else {
 				// Just for some added fun, if udev emits a medium change event, which I then forward, with mounted==0, it stops the MediaProtocol::listDir method dead in its tracks,
-				// and therefore the media:/ kioslave won't refresh after the encrypted device mount
+				// and therefore the media:/ tdeioslave won't refresh after the encrypted device mount
 				// Therefore, I need to ignore all change events on this device during the mount process and hope nothing bad happens as a result!
 				if (!m_ignoreDeviceChangeEvents.contains(sdevice->uniqueID())) {
 					m_ignoreDeviceChangeEvents.append(sdevice->uniqueID());
diff --git a/kioslave/media/mediamanager/tdehardwarebackend.h b/tdeioslave/media/mediamanager/tdehardwarebackend.h
similarity index 100%
rename from kioslave/media/mediamanager/tdehardwarebackend.h
rename to tdeioslave/media/mediamanager/tdehardwarebackend.h
diff --git a/kioslave/media/medianotifier/CMakeLists.txt b/tdeioslave/media/medianotifier/CMakeLists.txt
similarity index 89%
rename from kioslave/media/medianotifier/CMakeLists.txt
rename to tdeioslave/media/medianotifier/CMakeLists.txt
index 44d6cb308..9618f79ab 100644
--- a/kioslave/media/medianotifier/CMakeLists.txt
+++ b/tdeioslave/media/medianotifier/CMakeLists.txt
@@ -11,8 +11,8 @@
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/kioslave/media/libmediacommon
-  ${CMAKE_SOURCE_DIR}/kioslave/media/libmediacommon
+  ${CMAKE_BINARY_DIR}/tdeioslave/media/libmediacommon
+  ${CMAKE_SOURCE_DIR}/tdeioslave/media/libmediacommon
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/kioslave/media/medianotifier/Makefile.am b/tdeioslave/media/medianotifier/Makefile.am
similarity index 100%
rename from kioslave/media/medianotifier/Makefile.am
rename to tdeioslave/media/medianotifier/Makefile.am
diff --git a/kioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp
similarity index 100%
rename from kioslave/media/medianotifier/medianotifier.cpp
rename to tdeioslave/media/medianotifier/medianotifier.cpp
diff --git a/kioslave/media/medianotifier/medianotifier.desktop b/tdeioslave/media/medianotifier/medianotifier.desktop
similarity index 100%
rename from kioslave/media/medianotifier/medianotifier.desktop
rename to tdeioslave/media/medianotifier/medianotifier.desktop
diff --git a/kioslave/media/medianotifier/medianotifier.h b/tdeioslave/media/medianotifier/medianotifier.h
similarity index 97%
rename from kioslave/media/medianotifier/medianotifier.h
rename to tdeioslave/media/medianotifier/medianotifier.h
index acbb23505..9e9a772bb 100644
--- a/kioslave/media/medianotifier/medianotifier.h
+++ b/tdeioslave/media/medianotifier/medianotifier.h
@@ -21,8 +21,8 @@
 #define _MEDIANOTIFIER_H_
 
 #include <kdedmodule.h>
-#include <kfileitem.h>
-#include <kio/job.h>
+#include <tdefileitem.h>
+#include <tdeio/job.h>
 #include <kmessagebox.h>
 
 #include <tqstring.h>
diff --git a/kioslave/media/medianotifier/notificationdialog.cpp b/tdeioslave/media/medianotifier/notificationdialog.cpp
similarity index 98%
rename from kioslave/media/medianotifier/notificationdialog.cpp
rename to tdeioslave/media/medianotifier/notificationdialog.cpp
index 29cf6b4f2..c74228198 100644
--- a/kioslave/media/medianotifier/notificationdialog.cpp
+++ b/tdeioslave/media/medianotifier/notificationdialog.cpp
@@ -23,7 +23,7 @@
 #include <krun.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klistbox.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
@@ -141,7 +141,7 @@ void NotificationDialog::launchAction( NotifierAction *action )
 
 void NotificationDialog::slotConfigure()
 {
-	KRun::runCommand("kcmshell media");
+	KRun::runCommand("tdecmshell media");
 }
 
 #include "notificationdialog.moc"
diff --git a/kioslave/media/medianotifier/notificationdialog.h b/tdeioslave/media/medianotifier/notificationdialog.h
similarity index 98%
rename from kioslave/media/medianotifier/notificationdialog.h
rename to tdeioslave/media/medianotifier/notificationdialog.h
index f073676e3..01792c2a5 100644
--- a/kioslave/media/medianotifier/notificationdialog.h
+++ b/tdeioslave/media/medianotifier/notificationdialog.h
@@ -23,7 +23,7 @@
 #include <kdialogbase.h>
 #include <klistbox.h>
 #include <kdirwatch.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include "notifiersettings.h"
 #include "notifieraction.h"
diff --git a/kioslave/media/medianotifier/notificationdialogview.ui b/tdeioslave/media/medianotifier/notificationdialogview.ui
similarity index 100%
rename from kioslave/media/medianotifier/notificationdialogview.ui
rename to tdeioslave/media/medianotifier/notificationdialogview.ui
diff --git a/kioslave/media/mimetypes/CMakeLists.txt b/tdeioslave/media/mimetypes/CMakeLists.txt
similarity index 100%
rename from kioslave/media/mimetypes/CMakeLists.txt
rename to tdeioslave/media/mimetypes/CMakeLists.txt
diff --git a/kioslave/media/mimetypes/Makefile.am b/tdeioslave/media/mimetypes/Makefile.am
similarity index 100%
rename from kioslave/media/mimetypes/Makefile.am
rename to tdeioslave/media/mimetypes/Makefile.am
diff --git a/kioslave/media/mimetypes/audiocd.desktop b/tdeioslave/media/mimetypes/audiocd.desktop
similarity index 100%
rename from kioslave/media/mimetypes/audiocd.desktop
rename to tdeioslave/media/mimetypes/audiocd.desktop
diff --git a/kioslave/media/mimetypes/blankcd.desktop b/tdeioslave/media/mimetypes/blankcd.desktop
similarity index 100%
rename from kioslave/media/mimetypes/blankcd.desktop
rename to tdeioslave/media/mimetypes/blankcd.desktop
diff --git a/kioslave/media/mimetypes/blankdvd.desktop b/tdeioslave/media/mimetypes/blankdvd.desktop
similarity index 100%
rename from kioslave/media/mimetypes/blankdvd.desktop
rename to tdeioslave/media/mimetypes/blankdvd.desktop
diff --git a/kioslave/media/mimetypes/camera_mounted.desktop b/tdeioslave/media/mimetypes/camera_mounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/camera_mounted.desktop
rename to tdeioslave/media/mimetypes/camera_mounted.desktop
diff --git a/kioslave/media/mimetypes/camera_unmounted.desktop b/tdeioslave/media/mimetypes/camera_unmounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/camera_unmounted.desktop
rename to tdeioslave/media/mimetypes/camera_unmounted.desktop
diff --git a/kioslave/media/mimetypes/cdrom_mounted.desktop b/tdeioslave/media/mimetypes/cdrom_mounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/cdrom_mounted.desktop
rename to tdeioslave/media/mimetypes/cdrom_mounted.desktop
diff --git a/kioslave/media/mimetypes/cdrom_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/cdrom_mounted_decrypted.desktop
rename to tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop
diff --git a/kioslave/media/mimetypes/cdrom_unmounted.desktop b/tdeioslave/media/mimetypes/cdrom_unmounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/cdrom_unmounted.desktop
rename to tdeioslave/media/mimetypes/cdrom_unmounted.desktop
diff --git a/kioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop
rename to tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop
diff --git a/kioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop
rename to tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop
diff --git a/kioslave/media/mimetypes/cdwriter_mounted.desktop b/tdeioslave/media/mimetypes/cdwriter_mounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/cdwriter_mounted.desktop
rename to tdeioslave/media/mimetypes/cdwriter_mounted.desktop
diff --git a/kioslave/media/mimetypes/cdwriter_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/cdwriter_mounted_decrypted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/cdwriter_mounted_decrypted.desktop
rename to tdeioslave/media/mimetypes/cdwriter_mounted_decrypted.desktop
diff --git a/kioslave/media/mimetypes/cdwriter_unmounted.desktop b/tdeioslave/media/mimetypes/cdwriter_unmounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/cdwriter_unmounted.desktop
rename to tdeioslave/media/mimetypes/cdwriter_unmounted.desktop
diff --git a/kioslave/media/mimetypes/cdwriter_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/cdwriter_unmounted_decrypted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/cdwriter_unmounted_decrypted.desktop
rename to tdeioslave/media/mimetypes/cdwriter_unmounted_decrypted.desktop
diff --git a/kioslave/media/mimetypes/cdwriter_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/cdwriter_unmounted_encrypted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/cdwriter_unmounted_encrypted.desktop
rename to tdeioslave/media/mimetypes/cdwriter_unmounted_encrypted.desktop
diff --git a/kioslave/media/mimetypes/dvd_mounted.desktop b/tdeioslave/media/mimetypes/dvd_mounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/dvd_mounted.desktop
rename to tdeioslave/media/mimetypes/dvd_mounted.desktop
diff --git a/kioslave/media/mimetypes/dvd_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/dvd_mounted_decrypted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/dvd_mounted_decrypted.desktop
rename to tdeioslave/media/mimetypes/dvd_mounted_decrypted.desktop
diff --git a/kioslave/media/mimetypes/dvd_unmounted.desktop b/tdeioslave/media/mimetypes/dvd_unmounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/dvd_unmounted.desktop
rename to tdeioslave/media/mimetypes/dvd_unmounted.desktop
diff --git a/kioslave/media/mimetypes/dvd_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/dvd_unmounted_decrypted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/dvd_unmounted_decrypted.desktop
rename to tdeioslave/media/mimetypes/dvd_unmounted_decrypted.desktop
diff --git a/kioslave/media/mimetypes/dvd_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/dvd_unmounted_encrypted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/dvd_unmounted_encrypted.desktop
rename to tdeioslave/media/mimetypes/dvd_unmounted_encrypted.desktop
diff --git a/kioslave/media/mimetypes/dvdvideo.desktop b/tdeioslave/media/mimetypes/dvdvideo.desktop
similarity index 100%
rename from kioslave/media/mimetypes/dvdvideo.desktop
rename to tdeioslave/media/mimetypes/dvdvideo.desktop
diff --git a/kioslave/media/mimetypes/floppy5_mounted.desktop b/tdeioslave/media/mimetypes/floppy5_mounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/floppy5_mounted.desktop
rename to tdeioslave/media/mimetypes/floppy5_mounted.desktop
diff --git a/kioslave/media/mimetypes/floppy5_unmounted.desktop b/tdeioslave/media/mimetypes/floppy5_unmounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/floppy5_unmounted.desktop
rename to tdeioslave/media/mimetypes/floppy5_unmounted.desktop
diff --git a/kioslave/media/mimetypes/floppy_mounted.desktop b/tdeioslave/media/mimetypes/floppy_mounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/floppy_mounted.desktop
rename to tdeioslave/media/mimetypes/floppy_mounted.desktop
diff --git a/kioslave/media/mimetypes/floppy_unmounted.desktop b/tdeioslave/media/mimetypes/floppy_unmounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/floppy_unmounted.desktop
rename to tdeioslave/media/mimetypes/floppy_unmounted.desktop
diff --git a/kioslave/media/mimetypes/gphoto2camera.desktop b/tdeioslave/media/mimetypes/gphoto2camera.desktop
similarity index 100%
rename from kioslave/media/mimetypes/gphoto2camera.desktop
rename to tdeioslave/media/mimetypes/gphoto2camera.desktop
diff --git a/kioslave/media/mimetypes/hdd_mounted.desktop b/tdeioslave/media/mimetypes/hdd_mounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/hdd_mounted.desktop
rename to tdeioslave/media/mimetypes/hdd_mounted.desktop
diff --git a/kioslave/media/mimetypes/hdd_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/hdd_mounted_decrypted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/hdd_mounted_decrypted.desktop
rename to tdeioslave/media/mimetypes/hdd_mounted_decrypted.desktop
diff --git a/kioslave/media/mimetypes/hdd_unmounted.desktop b/tdeioslave/media/mimetypes/hdd_unmounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/hdd_unmounted.desktop
rename to tdeioslave/media/mimetypes/hdd_unmounted.desktop
diff --git a/kioslave/media/mimetypes/hdd_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/hdd_unmounted_decrypted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/hdd_unmounted_decrypted.desktop
rename to tdeioslave/media/mimetypes/hdd_unmounted_decrypted.desktop
diff --git a/kioslave/media/mimetypes/hdd_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/hdd_unmounted_encrypted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/hdd_unmounted_encrypted.desktop
rename to tdeioslave/media/mimetypes/hdd_unmounted_encrypted.desktop
diff --git a/kioslave/media/mimetypes/mycomputer.desktop b/tdeioslave/media/mimetypes/mycomputer.desktop
similarity index 100%
rename from kioslave/media/mimetypes/mycomputer.desktop
rename to tdeioslave/media/mimetypes/mycomputer.desktop
diff --git a/kioslave/media/mimetypes/mydocuments.desktop b/tdeioslave/media/mimetypes/mydocuments.desktop
similarity index 100%
rename from kioslave/media/mimetypes/mydocuments.desktop
rename to tdeioslave/media/mimetypes/mydocuments.desktop
diff --git a/kioslave/media/mimetypes/mynetworkplaces.desktop b/tdeioslave/media/mimetypes/mynetworkplaces.desktop
similarity index 100%
rename from kioslave/media/mimetypes/mynetworkplaces.desktop
rename to tdeioslave/media/mimetypes/mynetworkplaces.desktop
diff --git a/kioslave/media/mimetypes/nfs_mounted.desktop b/tdeioslave/media/mimetypes/nfs_mounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/nfs_mounted.desktop
rename to tdeioslave/media/mimetypes/nfs_mounted.desktop
diff --git a/kioslave/media/mimetypes/nfs_unmounted.desktop b/tdeioslave/media/mimetypes/nfs_unmounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/nfs_unmounted.desktop
rename to tdeioslave/media/mimetypes/nfs_unmounted.desktop
diff --git a/kioslave/media/mimetypes/printers.desktop b/tdeioslave/media/mimetypes/printers.desktop
similarity index 100%
rename from kioslave/media/mimetypes/printers.desktop
rename to tdeioslave/media/mimetypes/printers.desktop
diff --git a/kioslave/media/mimetypes/removable_mounted.desktop b/tdeioslave/media/mimetypes/removable_mounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/removable_mounted.desktop
rename to tdeioslave/media/mimetypes/removable_mounted.desktop
diff --git a/kioslave/media/mimetypes/removable_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/removable_mounted_decrypted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/removable_mounted_decrypted.desktop
rename to tdeioslave/media/mimetypes/removable_mounted_decrypted.desktop
diff --git a/kioslave/media/mimetypes/removable_unmounted.desktop b/tdeioslave/media/mimetypes/removable_unmounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/removable_unmounted.desktop
rename to tdeioslave/media/mimetypes/removable_unmounted.desktop
diff --git a/kioslave/media/mimetypes/removable_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/removable_unmounted_decrypted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/removable_unmounted_decrypted.desktop
rename to tdeioslave/media/mimetypes/removable_unmounted_decrypted.desktop
diff --git a/kioslave/media/mimetypes/removable_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/removable_unmounted_encrypted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/removable_unmounted_encrypted.desktop
rename to tdeioslave/media/mimetypes/removable_unmounted_encrypted.desktop
diff --git a/kioslave/media/mimetypes/smb_mounted.desktop b/tdeioslave/media/mimetypes/smb_mounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/smb_mounted.desktop
rename to tdeioslave/media/mimetypes/smb_mounted.desktop
diff --git a/kioslave/media/mimetypes/smb_unmounted.desktop b/tdeioslave/media/mimetypes/smb_unmounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/smb_unmounted.desktop
rename to tdeioslave/media/mimetypes/smb_unmounted.desktop
diff --git a/kioslave/media/mimetypes/svcd.desktop b/tdeioslave/media/mimetypes/svcd.desktop
similarity index 100%
rename from kioslave/media/mimetypes/svcd.desktop
rename to tdeioslave/media/mimetypes/svcd.desktop
diff --git a/kioslave/media/mimetypes/trash.desktop b/tdeioslave/media/mimetypes/trash.desktop
similarity index 100%
rename from kioslave/media/mimetypes/trash.desktop
rename to tdeioslave/media/mimetypes/trash.desktop
diff --git a/kioslave/media/mimetypes/vcd.desktop b/tdeioslave/media/mimetypes/vcd.desktop
similarity index 100%
rename from kioslave/media/mimetypes/vcd.desktop
rename to tdeioslave/media/mimetypes/vcd.desktop
diff --git a/kioslave/media/mimetypes/webbrowser.desktop b/tdeioslave/media/mimetypes/webbrowser.desktop
similarity index 100%
rename from kioslave/media/mimetypes/webbrowser.desktop
rename to tdeioslave/media/mimetypes/webbrowser.desktop
diff --git a/kioslave/media/mimetypes/zip_mounted.desktop b/tdeioslave/media/mimetypes/zip_mounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/zip_mounted.desktop
rename to tdeioslave/media/mimetypes/zip_mounted.desktop
diff --git a/kioslave/media/mimetypes/zip_unmounted.desktop b/tdeioslave/media/mimetypes/zip_unmounted.desktop
similarity index 100%
rename from kioslave/media/mimetypes/zip_unmounted.desktop
rename to tdeioslave/media/mimetypes/zip_unmounted.desktop
diff --git a/kioslave/media/mounthelper/CMakeLists.txt b/tdeioslave/media/mounthelper/CMakeLists.txt
similarity index 87%
rename from kioslave/media/mounthelper/CMakeLists.txt
rename to tdeioslave/media/mounthelper/CMakeLists.txt
index 099a07764..ea06278a8 100644
--- a/kioslave/media/mounthelper/CMakeLists.txt
+++ b/tdeioslave/media/mounthelper/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/kioslave/media/libmediacommon
+  ${CMAKE_SOURCE_DIR}/tdeioslave/media/libmediacommon
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -31,6 +31,6 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK mediacommon-static kio-shared
+  LINK mediacommon-static tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kioslave/media/mounthelper/Makefile.am b/tdeioslave/media/mounthelper/Makefile.am
similarity index 100%
rename from kioslave/media/mounthelper/Makefile.am
rename to tdeioslave/media/mounthelper/Makefile.am
diff --git a/kioslave/media/mounthelper/decryptdialog.ui b/tdeioslave/media/mounthelper/decryptdialog.ui
similarity index 100%
rename from kioslave/media/mounthelper/decryptdialog.ui
rename to tdeioslave/media/mounthelper/decryptdialog.ui
diff --git a/kioslave/media/mounthelper/dialog.cpp b/tdeioslave/media/mounthelper/dialog.cpp
similarity index 100%
rename from kioslave/media/mounthelper/dialog.cpp
rename to tdeioslave/media/mounthelper/dialog.cpp
diff --git a/kioslave/media/mounthelper/dialog.h b/tdeioslave/media/mounthelper/dialog.h
similarity index 98%
rename from kioslave/media/mounthelper/dialog.h
rename to tdeioslave/media/mounthelper/dialog.h
index 872486f5b..dc1d552d8 100644
--- a/kioslave/media/mounthelper/dialog.h
+++ b/tdeioslave/media/mounthelper/dialog.h
@@ -25,7 +25,7 @@
 
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/kio_media_mounthelper.cpp
similarity index 100%
rename from kioslave/media/mounthelper/kio_media_mounthelper.cpp
rename to tdeioslave/media/mounthelper/kio_media_mounthelper.cpp
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.h b/tdeioslave/media/mounthelper/kio_media_mounthelper.h
similarity index 98%
rename from kioslave/media/mounthelper/kio_media_mounthelper.h
rename to tdeioslave/media/mounthelper/kio_media_mounthelper.h
index 7eff1e54a..50ea88b3b 100644
--- a/kioslave/media/mounthelper/kio_media_mounthelper.h
+++ b/tdeioslave/media/mounthelper/kio_media_mounthelper.h
@@ -24,7 +24,7 @@
 
 #include <kapplication.h>
 #include <tqstring.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "medium.h"
 
diff --git a/kioslave/media/propsdlgplugin/CMakeLists.txt b/tdeioslave/media/propsdlgplugin/CMakeLists.txt
similarity index 95%
rename from kioslave/media/propsdlgplugin/CMakeLists.txt
rename to tdeioslave/media/propsdlgplugin/CMakeLists.txt
index 17189ec46..f029b52ab 100644
--- a/kioslave/media/propsdlgplugin/CMakeLists.txt
+++ b/tdeioslave/media/propsdlgplugin/CMakeLists.txt
@@ -30,6 +30,6 @@ install( FILES media_propsdlgplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}
 tde_add_kpart( media_propsdlgplugin AUTOMOC
   SOURCES
     propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp
-  LINK mediacommon-static kio-shared
+  LINK mediacommon-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/media/propsdlgplugin/Makefile.am b/tdeioslave/media/propsdlgplugin/Makefile.am
similarity index 100%
rename from kioslave/media/propsdlgplugin/Makefile.am
rename to tdeioslave/media/propsdlgplugin/Makefile.am
diff --git a/kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop b/tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop
similarity index 100%
rename from kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop
rename to tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop
diff --git a/kioslave/media/propsdlgplugin/propertiespage.cpp b/tdeioslave/media/propsdlgplugin/propertiespage.cpp
similarity index 100%
rename from kioslave/media/propsdlgplugin/propertiespage.cpp
rename to tdeioslave/media/propsdlgplugin/propertiespage.cpp
diff --git a/kioslave/media/propsdlgplugin/propertiespage.h b/tdeioslave/media/propsdlgplugin/propertiespage.h
similarity index 100%
rename from kioslave/media/propsdlgplugin/propertiespage.h
rename to tdeioslave/media/propsdlgplugin/propertiespage.h
diff --git a/kioslave/media/propsdlgplugin/propertiespagegui.ui b/tdeioslave/media/propsdlgplugin/propertiespagegui.ui
similarity index 100%
rename from kioslave/media/propsdlgplugin/propertiespagegui.ui
rename to tdeioslave/media/propsdlgplugin/propertiespagegui.ui
diff --git a/kioslave/media/propsdlgplugin/propertiespagegui.ui.h b/tdeioslave/media/propsdlgplugin/propertiespagegui.ui.h
similarity index 100%
rename from kioslave/media/propsdlgplugin/propertiespagegui.ui.h
rename to tdeioslave/media/propsdlgplugin/propertiespagegui.ui.h
diff --git a/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
similarity index 99%
rename from kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
rename to tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
index 59433a5da..1ceff0bc1 100644
--- a/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
@@ -26,7 +26,7 @@
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
-#include <kfileshare.h>
+#include <tdefileshare.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
diff --git a/kioslave/media/propsdlgplugin/propsdlgshareplugin.h b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.h
similarity index 100%
rename from kioslave/media/propsdlgplugin/propsdlgshareplugin.h
rename to tdeioslave/media/propsdlgplugin/propsdlgshareplugin.h
diff --git a/kioslave/media/services/CMakeLists.txt b/tdeioslave/media/services/CMakeLists.txt
similarity index 100%
rename from kioslave/media/services/CMakeLists.txt
rename to tdeioslave/media/services/CMakeLists.txt
diff --git a/kioslave/media/services/Makefile.am b/tdeioslave/media/services/Makefile.am
similarity index 100%
rename from kioslave/media/services/Makefile.am
rename to tdeioslave/media/services/Makefile.am
diff --git a/kioslave/media/services/media_decrypt.desktop b/tdeioslave/media/services/media_decrypt.desktop
similarity index 100%
rename from kioslave/media/services/media_decrypt.desktop
rename to tdeioslave/media/services/media_decrypt.desktop
diff --git a/kioslave/media/services/media_eject.desktop b/tdeioslave/media/services/media_eject.desktop
similarity index 100%
rename from kioslave/media/services/media_eject.desktop
rename to tdeioslave/media/services/media_eject.desktop
diff --git a/kioslave/media/services/media_mount.desktop b/tdeioslave/media/services/media_mount.desktop
similarity index 100%
rename from kioslave/media/services/media_mount.desktop
rename to tdeioslave/media/services/media_mount.desktop
diff --git a/kioslave/media/services/media_safelyremove.desktop b/tdeioslave/media/services/media_safelyremove.desktop
similarity index 100%
rename from kioslave/media/services/media_safelyremove.desktop
rename to tdeioslave/media/services/media_safelyremove.desktop
diff --git a/kioslave/media/services/media_unmount.desktop b/tdeioslave/media/services/media_unmount.desktop
similarity index 100%
rename from kioslave/media/services/media_unmount.desktop
rename to tdeioslave/media/services/media_unmount.desktop
diff --git a/kioslave/media/tdecmodule/CMakeLists.txt b/tdeioslave/media/tdecmodule/CMakeLists.txt
similarity index 85%
rename from kioslave/media/tdecmodule/CMakeLists.txt
rename to tdeioslave/media/tdecmodule/CMakeLists.txt
index 4a1dc2345..80128471e 100644
--- a/kioslave/media/tdecmodule/CMakeLists.txt
+++ b/tdeioslave/media/tdecmodule/CMakeLists.txt
@@ -11,8 +11,8 @@
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/kioslave/media/libmediacommon
-  ${CMAKE_SOURCE_DIR}/kioslave/media/libmediacommon
+  ${CMAKE_BINARY_DIR}/tdeioslave/media/libmediacommon
+  ${CMAKE_SOURCE_DIR}/tdeioslave/media/libmediacommon
   ${CMAKE_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
@@ -40,6 +40,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK mediacommon-static kio-shared
+  LINK mediacommon-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/media/tdecmodule/Makefile.am b/tdeioslave/media/tdecmodule/Makefile.am
similarity index 100%
rename from kioslave/media/tdecmodule/Makefile.am
rename to tdeioslave/media/tdecmodule/Makefile.am
diff --git a/kioslave/media/tdecmodule/main.cpp b/tdeioslave/media/tdecmodule/main.cpp
similarity index 100%
rename from kioslave/media/tdecmodule/main.cpp
rename to tdeioslave/media/tdecmodule/main.cpp
diff --git a/kioslave/media/tdecmodule/main.h b/tdeioslave/media/tdecmodule/main.h
similarity index 100%
rename from kioslave/media/tdecmodule/main.h
rename to tdeioslave/media/tdecmodule/main.h
diff --git a/kioslave/media/tdecmodule/managermodule.cpp b/tdeioslave/media/tdecmodule/managermodule.cpp
similarity index 99%
rename from kioslave/media/tdecmodule/managermodule.cpp
rename to tdeioslave/media/tdecmodule/managermodule.cpp
index 4c9859889..3a44c446e 100644
--- a/kioslave/media/tdecmodule/managermodule.cpp
+++ b/tdeioslave/media/tdecmodule/managermodule.cpp
@@ -21,7 +21,7 @@
 
 #include "managermodule.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <dcopref.h>
 #include <tqbutton.h>
diff --git a/kioslave/media/tdecmodule/managermodule.h b/tdeioslave/media/tdecmodule/managermodule.h
similarity index 100%
rename from kioslave/media/tdecmodule/managermodule.h
rename to tdeioslave/media/tdecmodule/managermodule.h
diff --git a/kioslave/media/tdecmodule/managermoduleview.ui b/tdeioslave/media/tdecmodule/managermoduleview.ui
similarity index 100%
rename from kioslave/media/tdecmodule/managermoduleview.ui
rename to tdeioslave/media/tdecmodule/managermoduleview.ui
diff --git a/kioslave/media/tdecmodule/media.desktop b/tdeioslave/media/tdecmodule/media.desktop
similarity index 99%
rename from kioslave/media/tdecmodule/media.desktop
rename to tdeioslave/media/tdecmodule/media.desktop
index 4afd68cb5..d93f876f4 100644
--- a/kioslave/media/tdecmodule/media.desktop
+++ b/tdeioslave/media/tdecmodule/media.desktop
@@ -2,7 +2,7 @@
 Type=Application
 #DocPath=
 Icon=system
-Exec=kcmshell media
+Exec=tdecmshell media
 
 
 X-TDE-Library=media
diff --git a/kioslave/media/tdecmodule/mimetypelistboxitem.cpp b/tdeioslave/media/tdecmodule/mimetypelistboxitem.cpp
similarity index 100%
rename from kioslave/media/tdecmodule/mimetypelistboxitem.cpp
rename to tdeioslave/media/tdecmodule/mimetypelistboxitem.cpp
diff --git a/kioslave/media/tdecmodule/mimetypelistboxitem.h b/tdeioslave/media/tdecmodule/mimetypelistboxitem.h
similarity index 100%
rename from kioslave/media/tdecmodule/mimetypelistboxitem.h
rename to tdeioslave/media/tdecmodule/mimetypelistboxitem.h
diff --git a/kioslave/media/tdecmodule/notifiermodule.cpp b/tdeioslave/media/tdecmodule/notifiermodule.cpp
similarity index 100%
rename from kioslave/media/tdecmodule/notifiermodule.cpp
rename to tdeioslave/media/tdecmodule/notifiermodule.cpp
diff --git a/kioslave/media/tdecmodule/notifiermodule.h b/tdeioslave/media/tdecmodule/notifiermodule.h
similarity index 100%
rename from kioslave/media/tdecmodule/notifiermodule.h
rename to tdeioslave/media/tdecmodule/notifiermodule.h
diff --git a/kioslave/media/tdecmodule/notifiermoduleview.ui b/tdeioslave/media/tdecmodule/notifiermoduleview.ui
similarity index 100%
rename from kioslave/media/tdecmodule/notifiermoduleview.ui
rename to tdeioslave/media/tdecmodule/notifiermoduleview.ui
diff --git a/kioslave/media/tdecmodule/serviceconfigdialog.cpp b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
similarity index 100%
rename from kioslave/media/tdecmodule/serviceconfigdialog.cpp
rename to tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
diff --git a/kioslave/media/tdecmodule/serviceconfigdialog.h b/tdeioslave/media/tdecmodule/serviceconfigdialog.h
similarity index 100%
rename from kioslave/media/tdecmodule/serviceconfigdialog.h
rename to tdeioslave/media/tdecmodule/serviceconfigdialog.h
diff --git a/kioslave/media/tdecmodule/serviceview.ui b/tdeioslave/media/tdecmodule/serviceview.ui
similarity index 100%
rename from kioslave/media/tdecmodule/serviceview.ui
rename to tdeioslave/media/tdecmodule/serviceview.ui
diff --git a/kioslave/media/kfile-plugin/CMakeLists.txt b/tdeioslave/media/tdefile-plugin/CMakeLists.txt
similarity index 68%
rename from kioslave/media/kfile-plugin/CMakeLists.txt
rename to tdeioslave/media/tdefile-plugin/CMakeLists.txt
index 591fd77f0..88c9220fa 100644
--- a/kioslave/media/kfile-plugin/CMakeLists.txt
+++ b/tdeioslave/media/tdefile-plugin/CMakeLists.txt
@@ -13,7 +13,7 @@ check_include_file( "sys/statvfs.h" HAVE_STATVFS )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/kioslave/media/libmediacommon
+  ${CMAKE_SOURCE_DIR}/tdeioslave/media/libmediacommon
   ${CMAKE_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
@@ -26,15 +26,15 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kfile_media.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_media.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kfile_media (module) ######################
+##### tdefile_media (module) ######################
 
-set( target kfile_media )
+set( target tdefile_media )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES kfilemediaplugin.cpp
-  LINK mediacommon-static kio-shared
+  SOURCES tdefilemediaplugin.cpp
+  LINK mediacommon-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/media/tdefile-plugin/Makefile.am b/tdeioslave/media/tdefile-plugin/Makefile.am
new file mode 100644
index 000000000..15807ea19
--- /dev/null
+++ b/tdeioslave/media/tdefile-plugin/Makefile.am
@@ -0,0 +1,13 @@
+kde_module_LTLIBRARIES = tdefile_media.la
+
+tdefile_media_la_SOURCES = tdefilemediaplugin.cpp
+tdefile_media_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
+tdefile_media_la_LIBADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la
+
+kdelnkdir = $(kde_servicesdir)
+kde_services_DATA = tdefile_media.desktop
+
+INCLUDES = -I$(srcdir)/../libmediacommon $(all_includes)
+
+METASOURCES = AUTO
+noinst_HEADERS = tdefilemediaplugin.h
diff --git a/kioslave/media/kfile-plugin/kfile_media.desktop b/tdeioslave/media/tdefile-plugin/tdefile_media.desktop
similarity index 99%
rename from kioslave/media/kfile-plugin/kfile_media.desktop
rename to tdeioslave/media/tdefile-plugin/tdefile_media.desktop
index 1ef4628f1..7d652e09a 100644
--- a/kioslave/media/kfile-plugin/kfile_media.desktop
+++ b/tdeioslave/media/tdefile-plugin/tdefile_media.desktop
@@ -71,5 +71,5 @@ Name[wa]=Informåcions sol mediom
 Name[zh_CN]=介质信息
 Name[zh_TW]=媒體資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_media
+X-TDE-Library=tdefile_media
 MimeType=media/audiocd;media/hdd_mounted;media/hdd_mounted_decrypted;media/blankcd;media/hdd_unmounted;media/hdd_unmounted_decrypted;media/blankdvd;media/cdrom_mounted;media/cdrom_mounted_decrypted;media/cdrom_unmounted;media/cdrom_unmounted_decrypted;media/cdwriter_mounted;media/cdwriter_mounted_decrypted;media/nfs_mounted;media/cdwriter_unmounted;media/cdwriter_unmounted_decrypted;media/nfs_unmounted;media/removable_mounted;media/removable_mounted_decrypted;media/dvd_mounted;media/dvd_mounted_decrypted;media/removable_unmounted;media/removable_unmounted_decrypted;media/dvd_unmounted;media/dvd_unmounted_decrypted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted
diff --git a/kioslave/media/kfile-plugin/kfilemediaplugin.cpp b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
similarity index 97%
rename from kioslave/media/kfile-plugin/kfilemediaplugin.cpp
rename to tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
index c6174da81..20e68e459 100644
--- a/kioslave/media/kfile-plugin/kfilemediaplugin.cpp
+++ b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "config.h"
-#include "kfilemediaplugin.h"
+#include "tdefilemediaplugin.h"
 
 #include <kgenericfactory.h>
 
@@ -39,7 +39,7 @@
 #endif
 
 typedef KGenericFactory<KFileMediaPlugin> KFileMediaPluginFactory;
-K_EXPORT_COMPONENT_FACTORY(kfile_media, KFileMediaPluginFactory("kio_media"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_media, KFileMediaPluginFactory("kio_media"))
 
 KFileMediaPlugin::KFileMediaPlugin(TQObject *parent, const char *name,
 		                     const TQStringList& args)
@@ -204,4 +204,4 @@ void KFileMediaPlugin::addMimeType(const char *mimeType)
 	setHint( item, KFileMimeTypeInfo::Thumbnail );
 }
 
-#include "kfilemediaplugin.moc"
+#include "tdefilemediaplugin.moc"
diff --git a/kioslave/media/kfile-plugin/kfilemediaplugin.h b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.h
similarity index 96%
rename from kioslave/media/kfile-plugin/kfilemediaplugin.h
rename to tdeioslave/media/tdefile-plugin/tdefilemediaplugin.h
index df99c46c1..e8dc7d26a 100644
--- a/kioslave/media/kfile-plugin/kfilemediaplugin.h
+++ b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.h
@@ -20,9 +20,9 @@
 #ifndef _KFILE_MEDIA_H_
 #define _KFILE_MEDIA_H_
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include "medium.h"
 
diff --git a/kioslave/media/testmedia.cpp b/tdeioslave/media/testmedia.cpp
similarity index 100%
rename from kioslave/media/testmedia.cpp
rename to tdeioslave/media/testmedia.cpp
diff --git a/kioslave/media/testmedia.h b/tdeioslave/media/testmedia.h
similarity index 100%
rename from kioslave/media/testmedia.h
rename to tdeioslave/media/testmedia.h
diff --git a/kioslave/nfs/AUTHORS b/tdeioslave/nfs/AUTHORS
similarity index 100%
rename from kioslave/nfs/AUTHORS
rename to tdeioslave/nfs/AUTHORS
diff --git a/kioslave/nfs/CMakeLists.txt b/tdeioslave/nfs/CMakeLists.txt
similarity index 98%
rename from kioslave/nfs/CMakeLists.txt
rename to tdeioslave/nfs/CMakeLists.txt
index b24506bf3..da9040fc9 100644
--- a/kioslave/nfs/CMakeLists.txt
+++ b/tdeioslave/nfs/CMakeLists.txt
@@ -40,6 +40,6 @@ add_custom_command( OUTPUT nfs_prot_xdr.c
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES kio_nfs.cpp mount_xdr.c nfs_prot_xdr.c
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/nfs/Makefile.am b/tdeioslave/nfs/Makefile.am
similarity index 88%
rename from kioslave/nfs/Makefile.am
rename to tdeioslave/nfs/Makefile.am
index 6dcb5ed3e..4ab02fc1d 100644
--- a/kioslave/nfs/Makefile.am
+++ b/tdeioslave/nfs/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am of tdebase/kioslave/man
+## Makefile.am of tdebase/tdeioslave/man
 
 INCLUDES= $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
@@ -25,4 +25,4 @@ $(srcdir)/nfs_prot_xdr.c: $(srcdir)/nfs_prot.x
 	cd $(srcdir) && rpcgen ./nfs_prot.x
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_nfs.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_nfs.pot
diff --git a/kioslave/nfs/README b/tdeioslave/nfs/README
similarity index 100%
rename from kioslave/nfs/README
rename to tdeioslave/nfs/README
diff --git a/kioslave/nfs/TODO b/tdeioslave/nfs/TODO
similarity index 100%
rename from kioslave/nfs/TODO
rename to tdeioslave/nfs/TODO
diff --git a/kioslave/nfs/kio_nfs.cpp b/tdeioslave/nfs/kio_nfs.cpp
similarity index 99%
rename from kioslave/nfs/kio_nfs.cpp
rename to tdeioslave/nfs/kio_nfs.cpp
index b28f3d61e..8148a7745 100644
--- a/kioslave/nfs/kio_nfs.cpp
+++ b/tdeioslave/nfs/kio_nfs.cpp
@@ -52,7 +52,7 @@
 #include <kinstance.h>
 #include <klocale.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <iostream>
 
 #include "nfs_prot.h"
diff --git a/kioslave/nfs/kio_nfs.h b/tdeioslave/nfs/kio_nfs.h
similarity index 98%
rename from kioslave/nfs/kio_nfs.h
rename to tdeioslave/nfs/kio_nfs.h
index 73b36e64d..b548fc487 100644
--- a/kioslave/nfs/kio_nfs.h
+++ b/tdeioslave/nfs/kio_nfs.h
@@ -20,8 +20,8 @@
 #ifndef KIO_NFS_H
 #define KIO_NFS_H
 
-#include <kio/slavebase.h>
-#include <kio/global.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/global.h>
 
 #include <tqmap.h>
 #include <tqstring.h>
diff --git a/kioslave/nfs/mount.h b/tdeioslave/nfs/mount.h
similarity index 100%
rename from kioslave/nfs/mount.h
rename to tdeioslave/nfs/mount.h
diff --git a/kioslave/nfs/mount.x b/tdeioslave/nfs/mount.x
similarity index 100%
rename from kioslave/nfs/mount.x
rename to tdeioslave/nfs/mount.x
diff --git a/kioslave/nfs/mount_xdr.c b/tdeioslave/nfs/mount_xdr.c
similarity index 100%
rename from kioslave/nfs/mount_xdr.c
rename to tdeioslave/nfs/mount_xdr.c
diff --git a/kioslave/nfs/nfs.protocol b/tdeioslave/nfs/nfs.protocol
similarity index 89%
rename from kioslave/nfs/nfs.protocol
rename to tdeioslave/nfs/nfs.protocol
index 377b01505..8f62d779a 100644
--- a/kioslave/nfs/nfs.protocol
+++ b/tdeioslave/nfs/nfs.protocol
@@ -10,5 +10,5 @@ makedir=true
 deleting=true
 linking=true
 moving=true
-DocPath=kioslave/nfs.html
+DocPath=tdeioslave/nfs.html
 Icon=nfs_mount
diff --git a/kioslave/nfs/nfs_prot.h b/tdeioslave/nfs/nfs_prot.h
similarity index 100%
rename from kioslave/nfs/nfs_prot.h
rename to tdeioslave/nfs/nfs_prot.h
diff --git a/kioslave/nfs/nfs_prot.x b/tdeioslave/nfs/nfs_prot.x
similarity index 100%
rename from kioslave/nfs/nfs_prot.x
rename to tdeioslave/nfs/nfs_prot.x
diff --git a/kioslave/nfs/nfs_prot_xdr.c b/tdeioslave/nfs/nfs_prot_xdr.c
similarity index 100%
rename from kioslave/nfs/nfs_prot_xdr.c
rename to tdeioslave/nfs/nfs_prot_xdr.c
diff --git a/kioslave/nntp/CMakeLists.txt b/tdeioslave/nntp/CMakeLists.txt
similarity index 97%
rename from kioslave/nntp/CMakeLists.txt
rename to tdeioslave/nntp/CMakeLists.txt
index 271d2c64e..d3401c455 100644
--- a/kioslave/nntp/CMakeLists.txt
+++ b/tdeioslave/nntp/CMakeLists.txt
@@ -31,6 +31,6 @@ set( target kio_nntp )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES nntp.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/nntp/LICENSE b/tdeioslave/nntp/LICENSE
similarity index 100%
rename from kioslave/nntp/LICENSE
rename to tdeioslave/nntp/LICENSE
diff --git a/kioslave/nntp/Makefile.am b/tdeioslave/nntp/Makefile.am
similarity index 88%
rename from kioslave/nntp/Makefile.am
rename to tdeioslave/nntp/Makefile.am
index b06d31600..a48a7de80 100644
--- a/kioslave/nntp/Makefile.am
+++ b/tdeioslave/nntp/Makefile.am
@@ -16,4 +16,4 @@ kdelnk_DATA = nntp.protocol nntps.protocol
 kdelnkdir = $(kde_servicesdir)
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_nntp.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_nntp.pot
diff --git a/kioslave/nntp/nntp.cpp b/tdeioslave/nntp/nntp.cpp
similarity index 100%
rename from kioslave/nntp/nntp.cpp
rename to tdeioslave/nntp/nntp.cpp
diff --git a/kioslave/nntp/nntp.h b/tdeioslave/nntp/nntp.h
similarity index 98%
rename from kioslave/nntp/nntp.h
rename to tdeioslave/nntp/nntp.h
index 1d369b775..7e6859c50 100644
--- a/kioslave/nntp/nntp.h
+++ b/tdeioslave/nntp/nntp.h
@@ -12,8 +12,8 @@
 #define _NNTP_H
 
 #include <tqstring.h>
-#include <kio/global.h>
-#include <kio/tcpslavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/tcpslavebase.h>
 
 #define MAX_PACKET_LEN 4096
 
diff --git a/kioslave/nntp/nntp.protocol b/tdeioslave/nntp/nntp.protocol
similarity index 83%
rename from kioslave/nntp/nntp.protocol
rename to tdeioslave/nntp/nntp.protocol
index 1ae8a25f7..8a51f88fb 100644
--- a/kioslave/nntp/nntp.protocol
+++ b/tdeioslave/nntp/nntp.protocol
@@ -7,5 +7,5 @@ listing=Name,Type,Size
 reading=true
 writing=true
 deleting=false
-DocPath=kioslave/nntp.html
+DocPath=tdeioslave/nntp.html
 Icon=news
diff --git a/kioslave/nntp/nntps.protocol b/tdeioslave/nntp/nntps.protocol
similarity index 83%
rename from kioslave/nntp/nntps.protocol
rename to tdeioslave/nntp/nntps.protocol
index 4d2e61422..dd975d250 100644
--- a/kioslave/nntp/nntps.protocol
+++ b/tdeioslave/nntp/nntps.protocol
@@ -7,5 +7,5 @@ listing=Name,Type,Size
 reading=true
 writing=true
 deleting=false
-DocPath=kioslave/nntp.html
+DocPath=tdeioslave/nntp.html
 Icon=news
diff --git a/kioslave/pop3/CMakeLists.txt b/tdeioslave/pop3/CMakeLists.txt
similarity index 95%
rename from kioslave/pop3/CMakeLists.txt
rename to tdeioslave/pop3/CMakeLists.txt
index ed558f7cb..a5fcaf2da 100644
--- a/kioslave/pop3/CMakeLists.txt
+++ b/tdeioslave/pop3/CMakeLists.txt
@@ -32,6 +32,6 @@ set( target kio_pop3 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES pop3.cc
-  LINK kio-shared ${SASL_LIBRARIES}
+  LINK tdeio-shared ${SASL_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/pop3/Makefile.am b/tdeioslave/pop3/Makefile.am
similarity index 89%
rename from kioslave/pop3/Makefile.am
rename to tdeioslave/pop3/Makefile.am
index 03ce04104..86d649b66 100644
--- a/kioslave/pop3/Makefile.am
+++ b/tdeioslave/pop3/Makefile.am
@@ -14,4 +14,4 @@ kdelnk_DATA = pop3.protocol pop3s.protocol
 kdelnkdir = $(kde_servicesdir)
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/kio_pop3.pot
+	$(XGETTEXT) *.cc -o $(podir)/tdeio_pop3.pot
diff --git a/kioslave/pop3/pop3.cc b/tdeioslave/pop3/pop3.cc
similarity index 99%
rename from kioslave/pop3/pop3.cc
rename to tdeioslave/pop3/pop3.cc
index e950f79c1..e4518da08 100644
--- a/kioslave/pop3/pop3.cc
+++ b/tdeioslave/pop3/pop3.cc
@@ -58,9 +58,9 @@ extern "C" {
 #include <kprotocolmanager.h>
 #include <ksock.h>
 
-#include <kio/connection.h>
-#include <kio/slaveinterface.h>
-#include <kio/passdlg.h>
+#include <tdeio/connection.h>
+#include <tdeio/slaveinterface.h>
+#include <tdeio/passdlg.h>
 #include "pop3.h"
 
 #define GREETING_BUF_LEN 1024
diff --git a/kioslave/pop3/pop3.h b/tdeioslave/pop3/pop3.h
similarity index 99%
rename from kioslave/pop3/pop3.h
rename to tdeioslave/pop3/pop3.h
index 60b23c3e8..62812c82c 100644
--- a/kioslave/pop3/pop3.h
+++ b/tdeioslave/pop3/pop3.h
@@ -35,7 +35,7 @@
 
 #include <tqstring.h>
 
-#include <kio/tcpslavebase.h>
+#include <tdeio/tcpslavebase.h>
 
 #define MAX_PACKET_LEN 4096
 
diff --git a/kioslave/pop3/pop3.protocol b/tdeioslave/pop3/pop3.protocol
similarity index 88%
rename from kioslave/pop3/pop3.protocol
rename to tdeioslave/pop3/pop3.protocol
index ba20ae70d..23560fa48 100644
--- a/kioslave/pop3/pop3.protocol
+++ b/tdeioslave/pop3/pop3.protocol
@@ -12,5 +12,5 @@ source=true
 makedir=false
 linking=false
 moving=false
-DocPath=kioslave/pop3.html
+DocPath=tdeioslave/pop3.html
 Icon=folder_inbox
diff --git a/kioslave/pop3/pop3s.protocol b/tdeioslave/pop3/pop3s.protocol
similarity index 88%
rename from kioslave/pop3/pop3s.protocol
rename to tdeioslave/pop3/pop3s.protocol
index 2f9f848c2..8bcf0c899 100644
--- a/kioslave/pop3/pop3s.protocol
+++ b/tdeioslave/pop3/pop3s.protocol
@@ -12,5 +12,5 @@ source=true
 makedir=false
 linking=false
 moving=false
-DocPath=kioslave/pop3s.html
+DocPath=tdeioslave/pop3s.html
 Icon=folder_inbox
diff --git a/kioslave/remote/CMakeLists.txt b/tdeioslave/remote/CMakeLists.txt
similarity index 98%
rename from kioslave/remote/CMakeLists.txt
rename to tdeioslave/remote/CMakeLists.txt
index 74daa992a..fe4c29154 100644
--- a/kioslave/remote/CMakeLists.txt
+++ b/tdeioslave/remote/CMakeLists.txt
@@ -45,6 +45,6 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy
 tde_add_kpart( ${target}
   SOURCES dummy.cpp
   EMBED kioremote-static
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/remote/Makefile.am b/tdeioslave/remote/Makefile.am
similarity index 70%
rename from kioslave/remote/Makefile.am
rename to tdeioslave/remote/Makefile.am
index 073bfd12e..4acb4e999 100644
--- a/kioslave/remote/Makefile.am
+++ b/tdeioslave/remote/Makefile.am
@@ -7,7 +7,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = kio_remote.la
 
 kio_remote_la_SOURCES = dummy.cpp
-kio_remote_la_LIBADD  = libkioremote.la $(LIB_KIO)
+kio_remote_la_LIBADD  = libtdeioremote.la $(LIB_KIO)
 kio_remote_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
 dummy.cpp:
@@ -15,12 +15,12 @@ dummy.cpp:
 
 kde_services_DATA = remote.protocol
 
-noinst_LTLIBRARIES = libkioremote.la
-libkioremote_la_SOURCES = kio_remote.cpp remoteimpl.cpp
+noinst_LTLIBRARIES = libtdeioremote.la
+libtdeioremote_la_SOURCES = kio_remote.cpp remoteimpl.cpp
 
 check_PROGRAMS = testremote
 testremote_SOURCES = testremote.cpp
-testremote_LDADD = libkioremote.la $(LIB_KIO)
+testremote_LDADD = libtdeioremote.la $(LIB_KIO)
 testremote_LDFLAGS = $(all_libraries)
 
 ## TODO in unsermake: TESTS = testremote
@@ -28,5 +28,5 @@ check: testremote
 	./testremote
 
 messages:
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/kio_remote.pot
+	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_remote.pot
 
diff --git a/kioslave/remote/dummy.cpp b/tdeioslave/remote/dummy.cpp
similarity index 100%
rename from kioslave/remote/dummy.cpp
rename to tdeioslave/remote/dummy.cpp
diff --git a/kioslave/remote/kdedmodule/CMakeLists.txt b/tdeioslave/remote/kdedmodule/CMakeLists.txt
similarity index 100%
rename from kioslave/remote/kdedmodule/CMakeLists.txt
rename to tdeioslave/remote/kdedmodule/CMakeLists.txt
diff --git a/kioslave/remote/kdedmodule/Makefile.am b/tdeioslave/remote/kdedmodule/Makefile.am
similarity index 100%
rename from kioslave/remote/kdedmodule/Makefile.am
rename to tdeioslave/remote/kdedmodule/Makefile.am
diff --git a/kioslave/remote/kdedmodule/remotedirnotify.cpp b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
similarity index 100%
rename from kioslave/remote/kdedmodule/remotedirnotify.cpp
rename to tdeioslave/remote/kdedmodule/remotedirnotify.cpp
diff --git a/kioslave/remote/kdedmodule/remotedirnotify.desktop b/tdeioslave/remote/kdedmodule/remotedirnotify.desktop
similarity index 100%
rename from kioslave/remote/kdedmodule/remotedirnotify.desktop
rename to tdeioslave/remote/kdedmodule/remotedirnotify.desktop
diff --git a/kioslave/remote/kdedmodule/remotedirnotify.h b/tdeioslave/remote/kdedmodule/remotedirnotify.h
similarity index 100%
rename from kioslave/remote/kdedmodule/remotedirnotify.h
rename to tdeioslave/remote/kdedmodule/remotedirnotify.h
diff --git a/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp b/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp
similarity index 100%
rename from kioslave/remote/kdedmodule/remotedirnotifymodule.cpp
rename to tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp
diff --git a/kioslave/remote/kdedmodule/remotedirnotifymodule.h b/tdeioslave/remote/kdedmodule/remotedirnotifymodule.h
similarity index 100%
rename from kioslave/remote/kdedmodule/remotedirnotifymodule.h
rename to tdeioslave/remote/kdedmodule/remotedirnotifymodule.h
diff --git a/kioslave/remote/kio_remote.cpp b/tdeioslave/remote/kio_remote.cpp
similarity index 100%
rename from kioslave/remote/kio_remote.cpp
rename to tdeioslave/remote/kio_remote.cpp
diff --git a/kioslave/remote/kio_remote.h b/tdeioslave/remote/kio_remote.h
similarity index 98%
rename from kioslave/remote/kio_remote.h
rename to tdeioslave/remote/kio_remote.h
index 77ac1d7cb..ebc6dd1ad 100644
--- a/kioslave/remote/kio_remote.h
+++ b/tdeioslave/remote/kio_remote.h
@@ -20,7 +20,7 @@
 #ifndef KIO_REMOTE_H
 #define KIO_REMOTE_H
 
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 #include "remoteimpl.h"
 
 class RemoteProtocol : public TDEIO::SlaveBase
diff --git a/kioslave/remote/remote.protocol b/tdeioslave/remote/remote.protocol
similarity index 88%
rename from kioslave/remote/remote.protocol
rename to tdeioslave/remote/remote.protocol
index 6554be442..69cc638aa 100644
--- a/kioslave/remote/remote.protocol
+++ b/tdeioslave/remote/remote.protocol
@@ -12,6 +12,6 @@ linking=true
 moving=true
 Icon=network
 maxInstances=4
-#TODO DocPath=kioslave/file.html
+#TODO DocPath=tdeioslave/file.html
 Class=:local
 deleteRecursive=true
diff --git a/kioslave/remote/remoteimpl.cpp b/tdeioslave/remote/remoteimpl.cpp
similarity index 100%
rename from kioslave/remote/remoteimpl.cpp
rename to tdeioslave/remote/remoteimpl.cpp
diff --git a/kioslave/remote/remoteimpl.h b/tdeioslave/remote/remoteimpl.h
similarity index 97%
rename from kioslave/remote/remoteimpl.h
rename to tdeioslave/remote/remoteimpl.h
index ff16099dc..33aed3b0a 100644
--- a/kioslave/remote/remoteimpl.h
+++ b/tdeioslave/remote/remoteimpl.h
@@ -20,8 +20,8 @@
 #ifndef REMOTEIMPL_H
 #define REMOTEIMPL_H
 
-#include <kio/global.h>
-#include <kio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 #include <tqstring.h>
diff --git a/kioslave/remote/testremote.cpp b/tdeioslave/remote/testremote.cpp
similarity index 100%
rename from kioslave/remote/testremote.cpp
rename to tdeioslave/remote/testremote.cpp
diff --git a/kioslave/remote/testremote.h b/tdeioslave/remote/testremote.h
similarity index 100%
rename from kioslave/remote/testremote.h
rename to tdeioslave/remote/testremote.h
diff --git a/kioslave/settings/CMakeLists.txt b/tdeioslave/settings/CMakeLists.txt
similarity index 97%
rename from kioslave/settings/CMakeLists.txt
rename to tdeioslave/settings/CMakeLists.txt
index 7732c7661..c2a0d1d06 100644
--- a/kioslave/settings/CMakeLists.txt
+++ b/tdeioslave/settings/CMakeLists.txt
@@ -33,6 +33,6 @@ set( target kio_settings )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES kio_settings.cc
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/settings/Makefile.am b/tdeioslave/settings/Makefile.am
similarity index 93%
rename from kioslave/settings/Makefile.am
rename to tdeioslave/settings/Makefile.am
index e302f7d90..7daa4e009 100644
--- a/kioslave/settings/Makefile.am
+++ b/tdeioslave/settings/Makefile.am
@@ -17,5 +17,5 @@ kdelnkdir = $(kde_servicesdir)
 SUBDIRS=. 
 
 messages:
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/kio_settings.pot
+	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_settings.pot
 
diff --git a/kioslave/settings/applications.protocol b/tdeioslave/settings/applications.protocol
similarity index 100%
rename from kioslave/settings/applications.protocol
rename to tdeioslave/settings/applications.protocol
diff --git a/kioslave/settings/kio_settings.cc b/tdeioslave/settings/kio_settings.cc
similarity index 99%
rename from kioslave/settings/kio_settings.cc
rename to tdeioslave/settings/kio_settings.cc
index 5622cb8aa..7060df177 100644
--- a/kioslave/settings/kio_settings.cc
+++ b/tdeioslave/settings/kio_settings.cc
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 #include <kinstance.h>
 #include <kdebug.h>
 #include <tqtextstream.h>
@@ -51,7 +51,7 @@ private:
 extern "C" {
 	KDE_EXPORT int kdemain( int, char **argv )
 	{
-	  kdDebug() << "kdemain for settings kioslave" << endl;
+	  kdDebug() << "kdemain for settings tdeioslave" << endl;
 	  TDEInstance instance( "kio_settings" );
 	  SettingsProtocol slave(argv[1], argv[2], argv[3]);
 	  slave.dispatchLoop();
diff --git a/kioslave/settings/kio_settings.h b/tdeioslave/settings/kio_settings.h
similarity index 100%
rename from kioslave/settings/kio_settings.h
rename to tdeioslave/settings/kio_settings.h
diff --git a/kioslave/settings/programs.protocol b/tdeioslave/settings/programs.protocol
similarity index 100%
rename from kioslave/settings/programs.protocol
rename to tdeioslave/settings/programs.protocol
diff --git a/kioslave/settings/settings.protocol b/tdeioslave/settings/settings.protocol
similarity index 100%
rename from kioslave/settings/settings.protocol
rename to tdeioslave/settings/settings.protocol
diff --git a/kioslave/sftp/AUTHORS b/tdeioslave/sftp/AUTHORS
similarity index 100%
rename from kioslave/sftp/AUTHORS
rename to tdeioslave/sftp/AUTHORS
diff --git a/kioslave/sftp/CHANGELOG b/tdeioslave/sftp/CHANGELOG
similarity index 100%
rename from kioslave/sftp/CHANGELOG
rename to tdeioslave/sftp/CHANGELOG
diff --git a/kioslave/sftp/CMakeLists.txt b/tdeioslave/sftp/CMakeLists.txt
similarity index 97%
rename from kioslave/sftp/CMakeLists.txt
rename to tdeioslave/sftp/CMakeLists.txt
index c068166b0..cf07ed2b3 100644
--- a/kioslave/sftp/CMakeLists.txt
+++ b/tdeioslave/sftp/CMakeLists.txt
@@ -32,6 +32,6 @@ set( target kio_sftp )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES process.cpp atomicio.cpp kio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/sftp/DEBUGGING b/tdeioslave/sftp/DEBUGGING
similarity index 100%
rename from kioslave/sftp/DEBUGGING
rename to tdeioslave/sftp/DEBUGGING
diff --git a/kioslave/sftp/Makefile.am b/tdeioslave/sftp/Makefile.am
similarity index 89%
rename from kioslave/sftp/Makefile.am
rename to tdeioslave/sftp/Makefile.am
index abbb91323..4bc14c203 100644
--- a/kioslave/sftp/Makefile.am
+++ b/tdeioslave/sftp/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am of tdebase/kioslave/sftp
+## Makefile.am of tdebase/tdeioslave/sftp
 
 INCLUDES = $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
@@ -22,4 +22,4 @@ kdelnk_DATA = sftp.protocol
 kdelnkdir = $(kde_servicesdir)
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_sftp.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_sftp.pot
diff --git a/kioslave/sftp/TODO b/tdeioslave/sftp/TODO
similarity index 100%
rename from kioslave/sftp/TODO
rename to tdeioslave/sftp/TODO
diff --git a/kioslave/sftp/atomicio.cpp b/tdeioslave/sftp/atomicio.cpp
similarity index 100%
rename from kioslave/sftp/atomicio.cpp
rename to tdeioslave/sftp/atomicio.cpp
diff --git a/kioslave/sftp/atomicio.h b/tdeioslave/sftp/atomicio.h
similarity index 100%
rename from kioslave/sftp/atomicio.h
rename to tdeioslave/sftp/atomicio.h
diff --git a/kioslave/sftp/kio_sftp.cpp b/tdeioslave/sftp/kio_sftp.cpp
similarity index 99%
rename from kioslave/sftp/kio_sftp.cpp
rename to tdeioslave/sftp/kio_sftp.cpp
index 73f5bfc6d..719fb9136 100644
--- a/kioslave/sftp/kio_sftp.cpp
+++ b/tdeioslave/sftp/kio_sftp.cpp
@@ -61,7 +61,7 @@ So we can't connect.
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kio/ioslave_defaults.h>
+#include <tdeio/ioslave_defaults.h>
 #include <kmimetype.h>
 #include <kmimemagic.h>
 #include <klargefile.h>
diff --git a/kioslave/sftp/kio_sftp.h b/tdeioslave/sftp/kio_sftp.h
similarity index 99%
rename from kioslave/sftp/kio_sftp.h
rename to tdeioslave/sftp/kio_sftp.h
index e9120452b..1674221b8 100644
--- a/kioslave/sftp/kio_sftp.h
+++ b/tdeioslave/sftp/kio_sftp.h
@@ -22,8 +22,8 @@
 #include <tqobject.h>
 
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 #include <kdebug.h>
 
 #include "process.h"
diff --git a/kioslave/sftp/ksshprocess.cpp b/tdeioslave/sftp/ksshprocess.cpp
similarity index 100%
rename from kioslave/sftp/ksshprocess.cpp
rename to tdeioslave/sftp/ksshprocess.cpp
diff --git a/kioslave/sftp/ksshprocess.h b/tdeioslave/sftp/ksshprocess.h
similarity index 100%
rename from kioslave/sftp/ksshprocess.h
rename to tdeioslave/sftp/ksshprocess.h
diff --git a/kioslave/sftp/ksshprocesstest.cpp b/tdeioslave/sftp/ksshprocesstest.cpp
similarity index 100%
rename from kioslave/sftp/ksshprocesstest.cpp
rename to tdeioslave/sftp/ksshprocesstest.cpp
diff --git a/kioslave/sftp/process.cpp b/tdeioslave/sftp/process.cpp
similarity index 100%
rename from kioslave/sftp/process.cpp
rename to tdeioslave/sftp/process.cpp
diff --git a/kioslave/sftp/process.h b/tdeioslave/sftp/process.h
similarity index 100%
rename from kioslave/sftp/process.h
rename to tdeioslave/sftp/process.h
diff --git a/kioslave/sftp/sftp.h b/tdeioslave/sftp/sftp.h
similarity index 100%
rename from kioslave/sftp/sftp.h
rename to tdeioslave/sftp/sftp.h
diff --git a/kioslave/sftp/sftp.protocol b/tdeioslave/sftp/sftp.protocol
similarity index 60%
rename from kioslave/sftp/sftp.protocol
rename to tdeioslave/sftp/sftp.protocol
index 177cd86e9..3b915bff8 100644
--- a/kioslave/sftp/sftp.protocol
+++ b/tdeioslave/sftp/sftp.protocol
@@ -12,73 +12,73 @@ makedir=true
 deleting=true
 moving=true
 Icon=ftp
-Description=A kioslave for sftp
+Description=A tdeioslave for sftp
 Description[af]='n Kioslave vir sftp
 Description[be]=Kioslave для sftp
-Description[bg]=kioslave за sftp
-Description[bn]=এস.এফ.টি.পি-র জন্য একটি kioslave
-Description[br]=Ur kioslave evit sftp
-Description[bs]=kioslave za SFTP
-Description[ca]=Un kioslave per a sftp
+Description[bg]=tdeioslave за sftp
+Description[bn]=এস.এফ.টি.পি-র জন্য একটি tdeioslave
+Description[br]=Ur tdeioslave evit sftp
+Description[bs]=tdeioslave za SFTP
+Description[ca]=Un tdeioslave per a sftp
 Description[cs]=Protokol KDE pro sftp
 Description[csb]=Plugins dlô procedurë òbsłużënkù sftp
-Description[da]=En kioslave for sftp
+Description[da]=En tdeioslave for sftp
 Description[de]=Ein-/Ausgabemodul für das sftp-Protokoll
-Description[el]=Ένας kioslave για sftp
+Description[el]=Ένας tdeioslave για sftp
 Description[eo]=kenelsklavo por sftp
-Description[es]=Un kioslave para sftp
+Description[es]=Un tdeioslave para sftp
 Description[et]=SFTP IO-moodul
-Description[eu]=Sftp-rako kioslave bat
-Description[fa]=یک kioslave برای sftp
+Description[eu]=Sftp-rako tdeioslave bat
+Description[fa]=یک tdeioslave برای sftp
 Description[fi]=Sftp:n liitin
 Description[fr]=Un module d'entrées / sorties pour le sftp
-Description[fy]=Een kioslave Foar sftp
-Description[ga]=kioslave le haghaidh sftp
-Description[gl]=Un kioslave para sftp
-Description[he]=ממשק kioslave עבור sftp
+Description[fy]=Een tdeioslave Foar sftp
+Description[ga]=tdeioslave le haghaidh sftp
+Description[gl]=Un tdeioslave para sftp
+Description[he]=ממשק tdeioslave עבור sftp
 Description[hi]=एसएफटीपी के लिए केआईओस्लेव
 Description[hr]=Kioslave za SFTP
 Description[hu]=KDE-protokoll az sftp-hez
-Description[is]=kioslave fyrir sftp
-Description[it]=Un kioslave per sftp
-Description[ja]=sftp のための kioslave
+Description[is]=tdeioslave fyrir sftp
+Description[it]=Un tdeioslave per sftp
+Description[ja]=sftp のための tdeioslave
 Description[kk]=sftp-ке арналған енгізу-шығару модулі
-Description[km]=kioslave របស់ sftp
+Description[km]=tdeioslave របស់ sftp
 Description[ko]=SFTP KIO 슬레이브
 Description[lt]=Kiovergas sftp protokolui
 Description[lv]=KIO vergs priekš sftp
 Description[mk]=kio-служител за sftp
 Description[ms]=Kioslave untuk sftp
-Description[nb]=En kioslave for sftp
+Description[nb]=En tdeioslave for sftp
 Description[nds]=En In-/Utgaavdeenst för sftpl
 Description[ne]=sftp का लागि एउटा किओस्लेभ
-Description[nl]=Een kioslave voor sftp
-Description[nn]=Ein kioslave for sftp
-Description[pa]=sftp ਲਈ kioslave
+Description[nl]=Een tdeioslave voor sftp
+Description[nn]=Ein tdeioslave for sftp
+Description[pa]=sftp ਲਈ tdeioslave
 Description[pl]=Wtyczka protokołu sftp
-Description[pt]=Um 'kioslave' para sftp
+Description[pt]=Um 'tdeioslave' para sftp
 Description[pt_BR]=Uma implementação para o sftp
 Description[ro]=Un dispozitiv de I/E pentru SFTP
 Description[ru]=Модуль ввода-вывода для sftp
-Description[rw]=kioslave ya sftp
+Description[rw]=tdeioslave ya sftp
 Description[se]=ŠO-šláva sftp-protokolla várás
-Description[sk]=kioslave pre sftp
-Description[sl]=kioslave za sftp
+Description[sk]=tdeioslave pre sftp
+Description[sl]=tdeioslave za sftp
 Description[sr]=Kioslave за SFTP
 Description[sr@Latn]=Kioslave za SFTP
 Description[sv]=En I/O-slav för SFTP
 Description[ta]=sftpக்கான ஒரு க்யோஸ்லேவ்
 Description[te]=ఎస్ ఎఫ్ టి పి కొరకు ఐఒ బానిస
 Description[th]=ตัวนำข้อมูลเข้า-ออกสำหรับ sftp
-Description[tr]=Sftp için kioslave
-Description[tt]=sftp öçen kioslave
+Description[tr]=Sftp için tdeioslave
+Description[tt]=sftp öçen tdeioslave
 Description[uk]=Підлеглий В/В для sftp
 Description[uz]=SFTP uchun KCH-sleyv
 Description[uz@cyrillic]=SFTP учун КЧ-слейв
-Description[vi]=A kioslave (đày tớ vào ra KDE) cho sftp
-Description[wa]=On kioslave po sftp
-Description[zh_CN]=sftp 的 kioslave
-Description[zh_TW]=sftp 的 kioslave
-DocPath=kioslave/sftp.html
+Description[vi]=A tdeioslave (đày tớ vào ra KDE) cho sftp
+Description[wa]=On tdeioslave po sftp
+Description[zh_CN]=sftp 的 tdeioslave
+Description[zh_TW]=sftp 的 tdeioslave
+DocPath=tdeioslave/sftp.html
 Icon=ftp
 Class=:internet
diff --git a/kioslave/sftp/sftpfileattr.cpp b/tdeioslave/sftp/sftpfileattr.cpp
similarity index 99%
rename from kioslave/sftp/sftpfileattr.cpp
rename to tdeioslave/sftp/sftpfileattr.cpp
index 95a82677f..4c25909d9 100644
--- a/kioslave/sftp/sftpfileattr.cpp
+++ b/tdeioslave/sftp/sftpfileattr.cpp
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 #include <tqdatastream.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kremoteencoding.h>
 
 using namespace TDEIO;
diff --git a/kioslave/sftp/sftpfileattr.h b/tdeioslave/sftp/sftpfileattr.h
similarity index 99%
rename from kioslave/sftp/sftpfileattr.h
rename to tdeioslave/sftp/sftpfileattr.h
index 543153b5e..43b56979d 100644
--- a/kioslave/sftp/sftpfileattr.h
+++ b/tdeioslave/sftp/sftpfileattr.h
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 #include <tqdatastream.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kdebug.h>
 
 #include "sftp.h"
diff --git a/kioslave/smb/CMakeLists.txt b/tdeioslave/smb/CMakeLists.txt
similarity index 96%
rename from kioslave/smb/CMakeLists.txt
rename to tdeioslave/smb/CMakeLists.txt
index 4591192c9..2493c2a85 100644
--- a/kioslave/smb/CMakeLists.txt
+++ b/tdeioslave/smb/CMakeLists.txt
@@ -38,6 +38,6 @@ tde_add_kpart( kio_smb AUTOMOC
   SOURCES
     kio_smb.cpp kio_smb_auth.cpp kio_smb_browse.cpp kio_smb_config.cpp
     kio_smb_dir.cpp kio_smb_file.cpp kio_smb_internal.cpp kio_smb_mount.cpp
-  LINK kio-shared ${SMBCLIENT_LIBRARIES}
+  LINK tdeio-shared ${SMBCLIENT_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/smb/ConfigureChecks.cmake b/tdeioslave/smb/ConfigureChecks.cmake
similarity index 100%
rename from kioslave/smb/ConfigureChecks.cmake
rename to tdeioslave/smb/ConfigureChecks.cmake
diff --git a/kioslave/smb/Makefile.am b/tdeioslave/smb/Makefile.am
similarity index 90%
rename from kioslave/smb/Makefile.am
rename to tdeioslave/smb/Makefile.am
index 896897325..97a4034da 100644
--- a/kioslave/smb/Makefile.am
+++ b/tdeioslave/smb/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am of tdebase/kioslave/man
+## Makefile.am of tdebase/tdeioslave/man
 
 INCLUDES=$(all_includes)
 
@@ -34,4 +34,4 @@ mimetypedir = $(kde_mimedir)/application
 mimetype_DATA = x-smb-workgroup.desktop x-smb-server.desktop
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_smb.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_smb.pot
diff --git a/kioslave/smb/configure.in.bot b/tdeioslave/smb/configure.in.bot
similarity index 82%
rename from kioslave/smb/configure.in.bot
rename to tdeioslave/smb/configure.in.bot
index 0d478c414..a8a95566c 100644
--- a/kioslave/smb/configure.in.bot
+++ b/tdeioslave/smb/configure.in.bot
@@ -3,7 +3,7 @@ if test "x$with_samba" = xcheck && test "x$have_libsmbclient" = xno; then
   echo "You're missing libsmbclient from samba 3.0"
   echo "KDE will not be able to browse windows shares without it,"
   echo "consider installing it."
-  echo "Look at kioslave/smb/libsmbclient-HOWTO.txt"
+  echo "Look at tdeioslave/smb/libsmbclient-HOWTO.txt"
   echo ""
   all_tests=bad
 fi
diff --git a/kioslave/smb/configure.in.in b/tdeioslave/smb/configure.in.in
similarity index 91%
rename from kioslave/smb/configure.in.in
rename to tdeioslave/smb/configure.in.in
index 0a0cdcc86..59b8272c8 100644
--- a/kioslave/smb/configure.in.in
+++ b/tdeioslave/smb/configure.in.in
@@ -27,7 +27,7 @@ if test "x$with_samba" != xno; then
   fi
 fi
 
-AM_CONDITIONAL(include_kioslave_smb, test "x$have_libsmbclient" = xyes)
+AM_CONDITIONAL(include_tdeioslave_smb, test "x$have_libsmbclient" = xyes)
 
 ])
 
diff --git a/kioslave/smb/kio_smb.cpp b/tdeioslave/smb/kio_smb.cpp
similarity index 98%
rename from kioslave/smb/kio_smb.cpp
rename to tdeioslave/smb/kio_smb.cpp
index 8895588dd..193df965f 100644
--- a/kioslave/smb/kio_smb.cpp
+++ b/tdeioslave/smb/kio_smb.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 //
-// Project:     SMB kioslave for KDE2
+// Project:     SMB tdeioslave for KDE2
 //
 // File:        Top level implementation file for kio_smb.cpp
 //
diff --git a/kioslave/smb/kio_smb.h b/tdeioslave/smb/kio_smb.h
similarity index 99%
rename from kioslave/smb/kio_smb.h
rename to tdeioslave/smb/kio_smb.h
index d111c7646..34ad0200a 100644
--- a/kioslave/smb/kio_smb.h
+++ b/tdeioslave/smb/kio_smb.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 //
-// Project:     SMB kioslave for KDE2
+// Project:     SMB tdeioslave for KDE2
 //
 // File:        kio_smb.h
 //
@@ -50,8 +50,8 @@
 //--------------
 #include <kdebug.h>
 #include <kinstance.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 #include <kurl.h>
 #include <klocale.h>
 
diff --git a/kioslave/smb/kio_smb_auth.cpp b/tdeioslave/smb/kio_smb_auth.cpp
similarity index 98%
rename from kioslave/smb/kio_smb_auth.cpp
rename to tdeioslave/smb/kio_smb_auth.cpp
index b03e77420..f11d80b3a 100644
--- a/kioslave/smb/kio_smb_auth.cpp
+++ b/tdeioslave/smb/kio_smb_auth.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 //
-// Project:     SMB kioslave for KDE2
+// Project:     SMB tdeioslave for KDE2
 //
 // File:        kio_smb_auth.cpp
 //
@@ -163,7 +163,7 @@ bool SMBSlave::auth_initialize_smbc()
     if(m_initialized_smbc == false)
     {
         kdDebug(KIO_SMB) << "smbc_init call" << endl;
-        KSimpleConfig cfg( "kioslaverc", true );
+        KSimpleConfig cfg( "tdeioslaverc", true );
 
         cfg.setGroup( "SMB" );
         int debug_level = cfg.readNumEntry( "DebugLevel", 0 );
diff --git a/kioslave/smb/kio_smb_browse.cpp b/tdeioslave/smb/kio_smb_browse.cpp
similarity index 99%
rename from kioslave/smb/kio_smb_browse.cpp
rename to tdeioslave/smb/kio_smb_browse.cpp
index b8f237653..26c379bde 100644
--- a/kioslave/smb/kio_smb_browse.cpp
+++ b/tdeioslave/smb/kio_smb_browse.cpp
@@ -1,7 +1,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// Project:     SMB kioslave for KDE2
+// Project:     SMB tdeioslave for KDE2
 //
 // File:        kio_smb_browse.cpp
 //
diff --git a/kioslave/smb/kio_smb_config.cpp b/tdeioslave/smb/kio_smb_config.cpp
similarity index 95%
rename from kioslave/smb/kio_smb_config.cpp
rename to tdeioslave/smb/kio_smb_config.cpp
index 123462772..8179371e7 100644
--- a/kioslave/smb/kio_smb_config.cpp
+++ b/tdeioslave/smb/kio_smb_config.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 //
-// Project:     SMB kioslave for KDE2
+// Project:     SMB tdeioslave for KDE2
 //
 // File:        kio_smb_config.cpp
 //
@@ -31,13 +31,13 @@
 
 #include "kio_smb.h"
 #include "kio_smb_internal.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqtextcodec.h>
 //===========================================================================
 void SMBSlave::reparseConfiguration()
 {
-  TDEConfig *cfg = new TDEConfig("kioslaverc", true);
+  TDEConfig *cfg = new TDEConfig("tdeioslaverc", true);
   cfg->setGroup("Browser Settings/SMBro");
   m_default_user=cfg->readEntry("User");
 //  m_default_workgroup=cfg->readEntry("Workgroup");
diff --git a/kioslave/smb/kio_smb_dir.cpp b/tdeioslave/smb/kio_smb_dir.cpp
similarity index 99%
rename from kioslave/smb/kio_smb_dir.cpp
rename to tdeioslave/smb/kio_smb_dir.cpp
index 54c3b6cfb..02dfc8100 100644
--- a/kioslave/smb/kio_smb_dir.cpp
+++ b/tdeioslave/smb/kio_smb_dir.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 //
-// Project:     SMB kioslave for KDE2
+// Project:     SMB tdeioslave for KDE2
 //
 // File:        kio_smb_dir.cpp
 //
diff --git a/kioslave/smb/kio_smb_file.cpp b/tdeioslave/smb/kio_smb_file.cpp
similarity index 99%
rename from kioslave/smb/kio_smb_file.cpp
rename to tdeioslave/smb/kio_smb_file.cpp
index 25137c8ce..b65f79f42 100644
--- a/kioslave/smb/kio_smb_file.cpp
+++ b/tdeioslave/smb/kio_smb_file.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 //
-// Project:     SMB kioslave for KDE2
+// Project:     SMB tdeioslave for KDE2
 //
 // File:        kio_smb_file.cpp
 //
diff --git a/kioslave/smb/kio_smb_internal.cpp b/tdeioslave/smb/kio_smb_internal.cpp
similarity index 98%
rename from kioslave/smb/kio_smb_internal.cpp
rename to tdeioslave/smb/kio_smb_internal.cpp
index 3660e3e8a..8f56a8f62 100644
--- a/kioslave/smb/kio_smb_internal.cpp
+++ b/tdeioslave/smb/kio_smb_internal.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 //
-// Project:     SMB kioslave for KDE2
+// Project:     SMB tdeioslave for KDE2
 //
 // File:        kio_smb_internal.cpp
 //
@@ -33,7 +33,7 @@
 
 #include <tqtextcodec.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 
diff --git a/kioslave/smb/kio_smb_internal.h b/tdeioslave/smb/kio_smb_internal.h
similarity index 98%
rename from kioslave/smb/kio_smb_internal.h
rename to tdeioslave/smb/kio_smb_internal.h
index b6da04e58..2d97aee31 100644
--- a/kioslave/smb/kio_smb_internal.h
+++ b/tdeioslave/smb/kio_smb_internal.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 //
-// Project:     SMB kioslave for KDE2
+// Project:     SMB tdeioslave for KDE2
 //
 // File:        kio_smb_internal.h
 //
@@ -31,7 +31,7 @@
 #ifndef KIO_SMB_INTERNAL_H_INCLUDED
 #define KIO_SMB_INTERNAL_H_INCLUDED
 
-#include <kio/authinfo.h>
+#include <tdeio/authinfo.h>
 
 /**
  *   Types of a SMBURL :
diff --git a/kioslave/smb/kio_smb_mount.cpp b/tdeioslave/smb/kio_smb_mount.cpp
similarity index 100%
rename from kioslave/smb/kio_smb_mount.cpp
rename to tdeioslave/smb/kio_smb_mount.cpp
diff --git a/kioslave/smb/libsmbclient-HOWTO.txt b/tdeioslave/smb/libsmbclient-HOWTO.txt
similarity index 100%
rename from kioslave/smb/libsmbclient-HOWTO.txt
rename to tdeioslave/smb/libsmbclient-HOWTO.txt
diff --git a/kioslave/smb/smb-network.desktop b/tdeioslave/smb/smb-network.desktop
similarity index 100%
rename from kioslave/smb/smb-network.desktop
rename to tdeioslave/smb/smb-network.desktop
diff --git a/kioslave/smb/smb.protocol b/tdeioslave/smb/smb.protocol
similarity index 86%
rename from kioslave/smb/smb.protocol
rename to tdeioslave/smb/smb.protocol
index dbfca9129..2c0bda020 100644
--- a/kioslave/smb/smb.protocol
+++ b/tdeioslave/smb/smb.protocol
@@ -8,5 +8,5 @@ reading=true
 writing=true
 makedir=true
 deleting=true
-DocPath=kioslave/smb.html
+DocPath=tdeioslave/smb.html
 Icon=samba
diff --git a/kioslave/smb/x-smb-server.desktop b/tdeioslave/smb/x-smb-server.desktop
similarity index 100%
rename from kioslave/smb/x-smb-server.desktop
rename to tdeioslave/smb/x-smb-server.desktop
diff --git a/kioslave/smb/x-smb-workgroup.desktop b/tdeioslave/smb/x-smb-workgroup.desktop
similarity index 100%
rename from kioslave/smb/x-smb-workgroup.desktop
rename to tdeioslave/smb/x-smb-workgroup.desktop
diff --git a/kioslave/smtp/CMakeLists.txt b/tdeioslave/smtp/CMakeLists.txt
similarity index 95%
rename from kioslave/smtp/CMakeLists.txt
rename to tdeioslave/smtp/CMakeLists.txt
index af475cbc6..57095a364 100644
--- a/kioslave/smtp/CMakeLists.txt
+++ b/tdeioslave/smtp/CMakeLists.txt
@@ -32,6 +32,6 @@ set( target kio_smtp )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc
-  LINK kio-shared ${SASL_LIBRARIES}
+  LINK tdeio-shared ${SASL_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/smtp/Makefile.am b/tdeioslave/smtp/Makefile.am
similarity index 96%
rename from kioslave/smtp/Makefile.am
rename to tdeioslave/smtp/Makefile.am
index a3ec64a14..7808a24db 100644
--- a/kioslave/smtp/Makefile.am
+++ b/tdeioslave/smtp/Makefile.am
@@ -34,4 +34,4 @@ interactivesmtpserver_LDFLAGS = $(all_libraries)
 interactivesmtpserver_METASOURCES = AUTO
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/kio_smtp.pot
+	$(XGETTEXT) *.cc -o $(podir)/tdeio_smtp.pot
diff --git a/kioslave/smtp/TODO b/tdeioslave/smtp/TODO
similarity index 100%
rename from kioslave/smtp/TODO
rename to tdeioslave/smtp/TODO
diff --git a/kioslave/smtp/capabilities.cc b/tdeioslave/smtp/capabilities.cc
similarity index 98%
rename from kioslave/smtp/capabilities.cc
rename to tdeioslave/smtp/capabilities.cc
index 0172934dd..bf91071b3 100644
--- a/kioslave/smtp/capabilities.cc
+++ b/tdeioslave/smtp/capabilities.cc
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     capabilities.cc
 
-    This file is part of kio_smtp, the KDE SMTP kioslave.
+    This file is part of kio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/kioslave/smtp/capabilities.h b/tdeioslave/smtp/capabilities.h
similarity index 97%
rename from kioslave/smtp/capabilities.h
rename to tdeioslave/smtp/capabilities.h
index 9f9464104..5004cbaac 100644
--- a/kioslave/smtp/capabilities.h
+++ b/tdeioslave/smtp/capabilities.h
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     capabilities.h
 
-    This file is part of kio_smtp, the KDE SMTP kioslave.
+    This file is part of kio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/kioslave/smtp/command.cc b/tdeioslave/smtp/command.cc
similarity index 99%
rename from kioslave/smtp/command.cc
rename to tdeioslave/smtp/command.cc
index 2971c291a..3817d5fd6 100644
--- a/kioslave/smtp/command.cc
+++ b/tdeioslave/smtp/command.cc
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     command.cc
 
-    This file is part of kio_smtp, the KDE SMTP kioslave.
+    This file is part of kio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmdcodec.h>
-#include <kio/slavebase.h> // for test_commands, where SMTPProtocol is not derived from TCPSlaveBase
+#include <tdeio/slavebase.h> // for test_commands, where SMTPProtocol is not derived from TCPSlaveBase
 
 #include <assert.h>
 
diff --git a/kioslave/smtp/command.h b/tdeioslave/smtp/command.h
similarity index 99%
rename from kioslave/smtp/command.h
rename to tdeioslave/smtp/command.h
index ed3e1fb66..48d08df22 100644
--- a/kioslave/smtp/command.h
+++ b/tdeioslave/smtp/command.h
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     command.h
 
-    This file is part of kio_smtp, the KDE SMTP kioslave.
+    This file is part of kio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@ extern "C" {
 }
 #endif
 
-#include <kio/authinfo.h>
+#include <tdeio/authinfo.h>
 
 class SMTPProtocol;
 class TQStrIList;
diff --git a/kioslave/smtp/compliance.txt b/tdeioslave/smtp/compliance.txt
similarity index 94%
rename from kioslave/smtp/compliance.txt
rename to tdeioslave/smtp/compliance.txt
index b6b9874c8..5b305a765 100644
--- a/kioslave/smtp/compliance.txt
+++ b/tdeioslave/smtp/compliance.txt
@@ -1,4 +1,4 @@
-The SMTP kioslave currently conforms to the following SMTP-related RFCs:
+The SMTP tdeioslave currently conforms to the following SMTP-related RFCs:
 
 Base Spec:
 2821 Simple Mail Transfer Protocol. J. Klensin, Ed.. April 2001.
diff --git a/kioslave/smtp/interactivesmtpserver.cc b/tdeioslave/smtp/interactivesmtpserver.cc
similarity index 99%
rename from kioslave/smtp/interactivesmtpserver.cc
rename to tdeioslave/smtp/interactivesmtpserver.cc
index 54c0b58be..7e84b8d3e 100644
--- a/kioslave/smtp/interactivesmtpserver.cc
+++ b/tdeioslave/smtp/interactivesmtpserver.cc
@@ -3,7 +3,7 @@
 
     Code based on the serverSocket example by Jesper Pedersen.
 
-    This file is part of the testsuite of kio_smtp, the KDE SMTP kioslave.
+    This file is part of the testsuite of kio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2004 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/kioslave/smtp/interactivesmtpserver.h b/tdeioslave/smtp/interactivesmtpserver.h
similarity index 99%
rename from kioslave/smtp/interactivesmtpserver.h
rename to tdeioslave/smtp/interactivesmtpserver.h
index 39a07f6a9..3e4b4b29d 100644
--- a/kioslave/smtp/interactivesmtpserver.h
+++ b/tdeioslave/smtp/interactivesmtpserver.h
@@ -6,7 +6,7 @@
 
     Code based on the serverSocket example by Jesper Pedersen.
 
-    This file is part of the testsuite of kio_smtp, the KDE SMTP kioslave.
+    This file is part of the testsuite of kio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2004 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/kioslave/smtp/request.cc b/tdeioslave/smtp/request.cc
similarity index 98%
rename from kioslave/smtp/request.cc
rename to tdeioslave/smtp/request.cc
index 84a1663f8..8019a04f7 100644
--- a/kioslave/smtp/request.cc
+++ b/tdeioslave/smtp/request.cc
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     request.cc
 
-    This file is part of kio_smtp, the KDE SMTP kioslave.
+    This file is part of kio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/kioslave/smtp/request.h b/tdeioslave/smtp/request.h
similarity index 98%
rename from kioslave/smtp/request.h
rename to tdeioslave/smtp/request.h
index e1b3acda8..21e2067fb 100644
--- a/kioslave/smtp/request.h
+++ b/tdeioslave/smtp/request.h
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     request.h
 
-    This file is part of kio_smtp, the KDE SMTP kioslave.
+    This file is part of kio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/kioslave/smtp/response.cc b/tdeioslave/smtp/response.cc
similarity index 98%
rename from kioslave/smtp/response.cc
rename to tdeioslave/smtp/response.cc
index 0ddce0e5a..da5569cf7 100644
--- a/kioslave/smtp/response.cc
+++ b/tdeioslave/smtp/response.cc
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     response.cc
 
-    This file is part of kio_smtp, the KDE SMTP kioslave.
+    This file is part of kio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
 #include "response.h"
 
 #include <klocale.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <tqstring.h>
 
diff --git a/kioslave/smtp/response.h b/tdeioslave/smtp/response.h
similarity index 98%
rename from kioslave/smtp/response.h
rename to tdeioslave/smtp/response.h
index 2fd48ebf3..6c749b9e4 100644
--- a/kioslave/smtp/response.h
+++ b/tdeioslave/smtp/response.h
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     response.h
 
-    This file is part of kio_smtp, the KDE SMTP kioslave.
+    This file is part of kio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/kioslave/smtp/smtp.cc b/tdeioslave/smtp/smtp.cc
similarity index 99%
rename from kioslave/smtp/smtp.cc
rename to tdeioslave/smtp/smtp.cc
index b1effa415..aa3ebfe75 100644
--- a/kioslave/smtp/smtp.cc
+++ b/tdeioslave/smtp/smtp.cc
@@ -57,8 +57,8 @@ using KioSMTP::TransactionState;
 #include <ksock.h>
 #include <kdebug.h>
 #include <kinstance.h>
-#include <kio/connection.h>
-#include <kio/slaveinterface.h>
+#include <tdeio/connection.h>
+#include <tdeio/slaveinterface.h>
 #include <klocale.h>
 
 #include <tqstring.h>
diff --git a/kioslave/smtp/smtp.h b/tdeioslave/smtp/smtp.h
similarity index 99%
rename from kioslave/smtp/smtp.h
rename to tdeioslave/smtp/smtp.h
index eef1aab42..e9d9b833b 100644
--- a/kioslave/smtp/smtp.h
+++ b/tdeioslave/smtp/smtp.h
@@ -29,7 +29,7 @@
 #ifndef _SMTP_H
 #define _SMTP_H
 
-#include <kio/tcpslavebase.h>
+#include <tdeio/tcpslavebase.h>
 
 #include "capabilities.h"
 
diff --git a/kioslave/smtp/smtp.protocol b/tdeioslave/smtp/smtp.protocol
similarity index 88%
rename from kioslave/smtp/smtp.protocol
rename to tdeioslave/smtp/smtp.protocol
index e01be9c7f..9a90cc397 100644
--- a/kioslave/smtp/smtp.protocol
+++ b/tdeioslave/smtp/smtp.protocol
@@ -12,5 +12,5 @@ source=true
 makedir=false
 linking=false
 moving=false
-DocPath=kioslave/smtp.html
+DocPath=tdeioslave/smtp.html
 Icon=folder_outbox
diff --git a/kioslave/smtp/smtps.protocol b/tdeioslave/smtp/smtps.protocol
similarity index 100%
rename from kioslave/smtp/smtps.protocol
rename to tdeioslave/smtp/smtps.protocol
diff --git a/kioslave/smtp/test_commands.cc b/tdeioslave/smtp/test_commands.cc
similarity index 99%
rename from kioslave/smtp/test_commands.cc
rename to tdeioslave/smtp/test_commands.cc
index 458b386b8..d8a5f0d4e 100644
--- a/kioslave/smtp/test_commands.cc
+++ b/tdeioslave/smtp/test_commands.cc
@@ -1,4 +1,4 @@
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kdebug.h>
 
 #include <tqstring.h>
diff --git a/kioslave/smtp/test_headergeneration.cc b/tdeioslave/smtp/test_headergeneration.cc
similarity index 100%
rename from kioslave/smtp/test_headergeneration.cc
rename to tdeioslave/smtp/test_headergeneration.cc
diff --git a/kioslave/smtp/test_responseparser.cc b/tdeioslave/smtp/test_responseparser.cc
similarity index 100%
rename from kioslave/smtp/test_responseparser.cc
rename to tdeioslave/smtp/test_responseparser.cc
diff --git a/kioslave/smtp/transactionstate.cc b/tdeioslave/smtp/transactionstate.cc
similarity index 97%
rename from kioslave/smtp/transactionstate.cc
rename to tdeioslave/smtp/transactionstate.cc
index b34b45227..886fe35b5 100644
--- a/kioslave/smtp/transactionstate.cc
+++ b/tdeioslave/smtp/transactionstate.cc
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     transactionstate.cc
 
-    This file is part of kio_smtp, the KDE SMTP kioslave.
+    This file is part of kio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
 
 #include "transactionstate.h"
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 
 #include <tqstringlist.h>
diff --git a/kioslave/smtp/transactionstate.h b/tdeioslave/smtp/transactionstate.h
similarity index 99%
rename from kioslave/smtp/transactionstate.h
rename to tdeioslave/smtp/transactionstate.h
index d2f9ef797..c62f52ae0 100644
--- a/kioslave/smtp/transactionstate.h
+++ b/tdeioslave/smtp/transactionstate.h
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     transactionstate.h
 
-    This file is part of kio_smtp, the KDE SMTP kioslave.
+    This file is part of kio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/kioslave/system/CMakeLists.txt b/tdeioslave/system/CMakeLists.txt
similarity index 97%
rename from kioslave/system/CMakeLists.txt
rename to tdeioslave/system/CMakeLists.txt
index edd4751d8..b9fea814d 100644
--- a/kioslave/system/CMakeLists.txt
+++ b/tdeioslave/system/CMakeLists.txt
@@ -45,6 +45,6 @@ set( target kio_system )
 tde_add_kpart( ${target} AUTOMOC
   SOURCES dummy.cpp
   EMBED kiosystem-static
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/system/Makefile.am b/tdeioslave/system/Makefile.am
similarity index 70%
rename from kioslave/system/Makefile.am
rename to tdeioslave/system/Makefile.am
index fb71211dc..5fc63eb5c 100644
--- a/kioslave/system/Makefile.am
+++ b/tdeioslave/system/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = kio_system.la
 
 kio_system_la_SOURCES = dummy.cpp
-kio_system_la_LIBADD  = libkiosystem.la $(LIB_KIO)
+kio_system_la_LIBADD  = libtdeiosystem.la $(LIB_KIO)
 kio_system_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
 dummy.cpp:
@@ -14,12 +14,12 @@ dummy.cpp:
 
 kde_services_DATA = system.protocol
 
-noinst_LTLIBRARIES = libkiosystem.la
-libkiosystem_la_SOURCES = kio_system.cpp systemimpl.cpp
+noinst_LTLIBRARIES = libtdeiosystem.la
+libtdeiosystem_la_SOURCES = kio_system.cpp systemimpl.cpp
 
 check_PROGRAMS = testsystem
 testsystem_SOURCES = testsystem.cpp
-testsystem_LDADD = libkiosystem.la $(LIB_KIO)
+testsystem_LDADD = libtdeiosystem.la $(LIB_KIO)
 testsystem_LDFLAGS = $(all_libraries)
 
 ## TODO in unsermake: TESTS = testsystem
@@ -27,5 +27,5 @@ check: testsystem
 	./testsystem
 
 messages:
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/kio_system.pot
+	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_system.pot
 
diff --git a/kioslave/system/dummy.cpp b/tdeioslave/system/dummy.cpp
similarity index 100%
rename from kioslave/system/dummy.cpp
rename to tdeioslave/system/dummy.cpp
diff --git a/kioslave/system/entries/CMakeLists.txt b/tdeioslave/system/entries/CMakeLists.txt
similarity index 100%
rename from kioslave/system/entries/CMakeLists.txt
rename to tdeioslave/system/entries/CMakeLists.txt
diff --git a/kioslave/system/entries/Makefile.am b/tdeioslave/system/entries/Makefile.am
similarity index 100%
rename from kioslave/system/entries/Makefile.am
rename to tdeioslave/system/entries/Makefile.am
diff --git a/kioslave/system/entries/documents.desktop b/tdeioslave/system/entries/documents.desktop
similarity index 100%
rename from kioslave/system/entries/documents.desktop
rename to tdeioslave/system/entries/documents.desktop
diff --git a/kioslave/system/entries/home.desktop b/tdeioslave/system/entries/home.desktop
similarity index 100%
rename from kioslave/system/entries/home.desktop
rename to tdeioslave/system/entries/home.desktop
diff --git a/kioslave/system/entries/media.desktop b/tdeioslave/system/entries/media.desktop
similarity index 100%
rename from kioslave/system/entries/media.desktop
rename to tdeioslave/system/entries/media.desktop
diff --git a/kioslave/system/entries/remote.desktop b/tdeioslave/system/entries/remote.desktop
similarity index 100%
rename from kioslave/system/entries/remote.desktop
rename to tdeioslave/system/entries/remote.desktop
diff --git a/kioslave/system/entries/trash.desktop b/tdeioslave/system/entries/trash.desktop
similarity index 100%
rename from kioslave/system/entries/trash.desktop
rename to tdeioslave/system/entries/trash.desktop
diff --git a/kioslave/system/entries/users.desktop b/tdeioslave/system/entries/users.desktop
similarity index 100%
rename from kioslave/system/entries/users.desktop
rename to tdeioslave/system/entries/users.desktop
diff --git a/kioslave/system/kdedmodule/CMakeLists.txt b/tdeioslave/system/kdedmodule/CMakeLists.txt
similarity index 100%
rename from kioslave/system/kdedmodule/CMakeLists.txt
rename to tdeioslave/system/kdedmodule/CMakeLists.txt
diff --git a/kioslave/system/kdedmodule/Makefile.am b/tdeioslave/system/kdedmodule/Makefile.am
similarity index 100%
rename from kioslave/system/kdedmodule/Makefile.am
rename to tdeioslave/system/kdedmodule/Makefile.am
diff --git a/kioslave/system/kdedmodule/systemdirnotify.cpp b/tdeioslave/system/kdedmodule/systemdirnotify.cpp
similarity index 100%
rename from kioslave/system/kdedmodule/systemdirnotify.cpp
rename to tdeioslave/system/kdedmodule/systemdirnotify.cpp
diff --git a/kioslave/system/kdedmodule/systemdirnotify.desktop b/tdeioslave/system/kdedmodule/systemdirnotify.desktop
similarity index 100%
rename from kioslave/system/kdedmodule/systemdirnotify.desktop
rename to tdeioslave/system/kdedmodule/systemdirnotify.desktop
diff --git a/kioslave/system/kdedmodule/systemdirnotify.h b/tdeioslave/system/kdedmodule/systemdirnotify.h
similarity index 100%
rename from kioslave/system/kdedmodule/systemdirnotify.h
rename to tdeioslave/system/kdedmodule/systemdirnotify.h
diff --git a/kioslave/system/kdedmodule/systemdirnotifymodule.cpp b/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp
similarity index 100%
rename from kioslave/system/kdedmodule/systemdirnotifymodule.cpp
rename to tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp
diff --git a/kioslave/system/kdedmodule/systemdirnotifymodule.h b/tdeioslave/system/kdedmodule/systemdirnotifymodule.h
similarity index 100%
rename from kioslave/system/kdedmodule/systemdirnotifymodule.h
rename to tdeioslave/system/kdedmodule/systemdirnotifymodule.h
diff --git a/kioslave/system/kio_system.cpp b/tdeioslave/system/kio_system.cpp
similarity index 100%
rename from kioslave/system/kio_system.cpp
rename to tdeioslave/system/kio_system.cpp
diff --git a/kioslave/system/kio_system.h b/tdeioslave/system/kio_system.h
similarity index 97%
rename from kioslave/system/kio_system.h
rename to tdeioslave/system/kio_system.h
index 7958e124d..fb3423889 100644
--- a/kioslave/system/kio_system.h
+++ b/tdeioslave/system/kio_system.h
@@ -20,7 +20,7 @@
 #ifndef _KIO_MEDIA_H_
 #define _KIO_MEDIA_H_
 
-#include <kio/forwardingslavebase.h>
+#include <tdeio/forwardingslavebase.h>
 
 #include "systemimpl.h"
 
diff --git a/kioslave/system/mimetypes/CMakeLists.txt b/tdeioslave/system/mimetypes/CMakeLists.txt
similarity index 100%
rename from kioslave/system/mimetypes/CMakeLists.txt
rename to tdeioslave/system/mimetypes/CMakeLists.txt
diff --git a/kioslave/system/mimetypes/Makefile.am b/tdeioslave/system/mimetypes/Makefile.am
similarity index 100%
rename from kioslave/system/mimetypes/Makefile.am
rename to tdeioslave/system/mimetypes/Makefile.am
diff --git a/kioslave/system/mimetypes/system_directory.desktop b/tdeioslave/system/mimetypes/system_directory.desktop
similarity index 100%
rename from kioslave/system/mimetypes/system_directory.desktop
rename to tdeioslave/system/mimetypes/system_directory.desktop
diff --git a/kioslave/system/system.protocol b/tdeioslave/system/system.protocol
similarity index 89%
rename from kioslave/system/system.protocol
rename to tdeioslave/system/system.protocol
index 1f5723e3e..9aa6fbd6c 100644
--- a/kioslave/system/system.protocol
+++ b/tdeioslave/system/system.protocol
@@ -12,7 +12,7 @@ linking=true
 moving=true
 Icon=system
 maxInstances=4
-#TODO DocPath=kioslave/file.html
+#TODO DocPath=tdeioslave/file.html
 Class=:local
 deleteRecursive=true
 fileNameUsedForCopying=Name
diff --git a/kioslave/system/systemimpl.cpp b/tdeioslave/system/systemimpl.cpp
similarity index 100%
rename from kioslave/system/systemimpl.cpp
rename to tdeioslave/system/systemimpl.cpp
diff --git a/kioslave/system/systemimpl.h b/tdeioslave/system/systemimpl.h
similarity index 97%
rename from kioslave/system/systemimpl.h
rename to tdeioslave/system/systemimpl.h
index fcc4cda48..6270489c8 100644
--- a/kioslave/system/systemimpl.h
+++ b/tdeioslave/system/systemimpl.h
@@ -20,8 +20,8 @@
 #ifndef SYSTEMIMPL_H
 #define SYSTEMIMPL_H
 
-#include <kio/global.h>
-#include <kio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
 #include <kdesktopfile.h>
 #include <kurl.h>
 #include <dcopobject.h>
diff --git a/kioslave/system/testsystem.cpp b/tdeioslave/system/testsystem.cpp
similarity index 100%
rename from kioslave/system/testsystem.cpp
rename to tdeioslave/system/testsystem.cpp
diff --git a/kioslave/system/testsystem.h b/tdeioslave/system/testsystem.h
similarity index 100%
rename from kioslave/system/testsystem.h
rename to tdeioslave/system/testsystem.h
diff --git a/kioslave/tar/CMakeLists.txt b/tdeioslave/tar/CMakeLists.txt
similarity index 97%
rename from kioslave/tar/CMakeLists.txt
rename to tdeioslave/tar/CMakeLists.txt
index 4e7bbcb3f..0e5ce7684 100644
--- a/kioslave/tar/CMakeLists.txt
+++ b/tdeioslave/tar/CMakeLists.txt
@@ -32,6 +32,6 @@ set( target kio_tar )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES tar.cc
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/tar/Makefile.am b/tdeioslave/tar/Makefile.am
similarity index 86%
rename from kioslave/tar/Makefile.am
rename to tdeioslave/tar/Makefile.am
index d77b2abf9..31fd98ebf 100644
--- a/kioslave/tar/Makefile.am
+++ b/tdeioslave/tar/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am of tdebase/kioslave/tar
+## Makefile.am of tdebase/tdeioslave/tar
 
 INCLUDES = $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
@@ -21,4 +21,4 @@ kdelnk_DATA = tar.protocol ar.protocol zip.protocol
 kdelnkdir = $(kde_servicesdir)
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/kio_tar.pot
+	$(XGETTEXT) *.cc -o $(podir)/tdeio_tar.pot
diff --git a/kioslave/tar/ar.protocol b/tdeioslave/tar/ar.protocol
similarity index 88%
rename from kioslave/tar/ar.protocol
rename to tdeioslave/tar/ar.protocol
index 7bdc3e746..31e765a7a 100644
--- a/kioslave/tar/ar.protocol
+++ b/tdeioslave/tar/ar.protocol
@@ -7,6 +7,6 @@ output=filesystem
 listing=Name,Type,Size,Date,Access,Owner,Group,Link
 reading=true
 source=true
-DocPath=kioslave/ar.html
+DocPath=tdeioslave/ar.html
 Icon=ar
 Class=:local
diff --git a/kioslave/tar/ktartest.cpp b/tdeioslave/tar/ktartest.cpp
similarity index 100%
rename from kioslave/tar/ktartest.cpp
rename to tdeioslave/tar/ktartest.cpp
diff --git a/kioslave/tar/tar.cc b/tdeioslave/tar/tar.cc
similarity index 99%
rename from kioslave/tar/tar.cc
rename to tdeioslave/tar/tar.cc
index e56b9941c..bce89644d 100644
--- a/kioslave/tar/tar.cc
+++ b/tdeioslave/tar/tar.cc
@@ -19,7 +19,7 @@
 #include <kmimemagic.h>
 #include <klocale.h>
 #include <kde_file.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kremoteencoding.h>
 
 #include <errno.h> // to be removed
diff --git a/kioslave/tar/tar.h b/tdeioslave/tar/tar.h
similarity index 97%
rename from kioslave/tar/tar.h
rename to tdeioslave/tar/tar.h
index 95887e559..42cb2457a 100644
--- a/kioslave/tar/tar.h
+++ b/tdeioslave/tar/tar.h
@@ -22,8 +22,8 @@
 
 #include <sys/types.h>
 
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 class ArchiveProtocol : public TDEIO::SlaveBase
 {
diff --git a/kioslave/tar/tar.protocol b/tdeioslave/tar/tar.protocol
similarity index 87%
rename from kioslave/tar/tar.protocol
rename to tdeioslave/tar/tar.protocol
index 096ed249a..bd97ba6bb 100644
--- a/kioslave/tar/tar.protocol
+++ b/tdeioslave/tar/tar.protocol
@@ -7,6 +7,6 @@ output=filesystem
 listing=Name,Type,Size,Date,Access,Owner,Group,Link
 reading=true
 source=true
-DocPath=kioslave/tar.html
+DocPath=tdeioslave/tar.html
 Icon=tar
 Class=:local
diff --git a/kioslave/tar/zip.protocol b/tdeioslave/tar/zip.protocol
similarity index 87%
rename from kioslave/tar/zip.protocol
rename to tdeioslave/tar/zip.protocol
index a7dffe7ad..d67d5b2ff 100644
--- a/kioslave/tar/zip.protocol
+++ b/tdeioslave/tar/zip.protocol
@@ -7,6 +7,6 @@ output=filesystem
 listing=Name,Type,Size,Date,Access,Owner,Group,Link
 reading=true
 source=true
-DocPath=kioslave/zip.html
+DocPath=tdeioslave/zip.html
 Icon=zip
 Class=:local
diff --git a/kioslave/thumbnail/CMakeLists.txt b/tdeioslave/thumbnail/CMakeLists.txt
similarity index 97%
rename from kioslave/thumbnail/CMakeLists.txt
rename to tdeioslave/thumbnail/CMakeLists.txt
index 9000b3494..9836c76af 100644
--- a/kioslave/thumbnail/CMakeLists.txt
+++ b/tdeioslave/thumbnail/CMakeLists.txt
@@ -52,7 +52,7 @@ set( target kio_thumbnail )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES thumbnail.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -63,7 +63,7 @@ set( target imagethumbnail )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES imagecreator.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -74,7 +74,7 @@ set( target textthumbnail )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES textcreator.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kioslave/thumbnail/Makefile.am b/tdeioslave/thumbnail/Makefile.am
similarity index 95%
rename from kioslave/thumbnail/Makefile.am
rename to tdeioslave/thumbnail/Makefile.am
index ecd2e492b..93697f148 100644
--- a/kioslave/thumbnail/Makefile.am
+++ b/tdeioslave/thumbnail/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am of tdebase/kioslave/thumbnail
+## Makefile.am of tdebase/tdeioslave/thumbnail
 
 INCLUDES = $(all_includes) $(EXR_FLAGS)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
@@ -65,5 +65,5 @@ services_DATA = imagethumbnail.desktop textthumbnail.desktop \
 servicesdir = $(kde_servicesdir)
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_thumbnail.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_thumbnail.pot
 
diff --git a/kioslave/thumbnail/configure.in.in b/tdeioslave/thumbnail/configure.in.in
similarity index 100%
rename from kioslave/thumbnail/configure.in.in
rename to tdeioslave/thumbnail/configure.in.in
diff --git a/kioslave/thumbnail/cursorcreator.cpp b/tdeioslave/thumbnail/cursorcreator.cpp
similarity index 100%
rename from kioslave/thumbnail/cursorcreator.cpp
rename to tdeioslave/thumbnail/cursorcreator.cpp
diff --git a/kioslave/thumbnail/cursorcreator.h b/tdeioslave/thumbnail/cursorcreator.h
similarity index 97%
rename from kioslave/thumbnail/cursorcreator.h
rename to tdeioslave/thumbnail/cursorcreator.h
index 9fd7c7fa4..a9b845fd0 100644
--- a/kioslave/thumbnail/cursorcreator.h
+++ b/tdeioslave/thumbnail/cursorcreator.h
@@ -20,7 +20,7 @@
 #ifndef _CURSORCREATOR_H_
 #define _CURSORCREATOR_H_
 
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 
 class CursorCreator : public ThumbCreator
 {
diff --git a/kioslave/thumbnail/cursorthumbnail.desktop b/tdeioslave/thumbnail/cursorthumbnail.desktop
similarity index 100%
rename from kioslave/thumbnail/cursorthumbnail.desktop
rename to tdeioslave/thumbnail/cursorthumbnail.desktop
diff --git a/kioslave/thumbnail/djvucreator.cpp b/tdeioslave/thumbnail/djvucreator.cpp
similarity index 100%
rename from kioslave/thumbnail/djvucreator.cpp
rename to tdeioslave/thumbnail/djvucreator.cpp
diff --git a/kioslave/thumbnail/djvucreator.h b/tdeioslave/thumbnail/djvucreator.h
similarity index 97%
rename from kioslave/thumbnail/djvucreator.h
rename to tdeioslave/thumbnail/djvucreator.h
index f5df3650b..b1335ac7c 100644
--- a/kioslave/thumbnail/djvucreator.h
+++ b/tdeioslave/thumbnail/djvucreator.h
@@ -21,7 +21,7 @@
 #ifndef _DJVUCREATOR_H_
 #define _DJVUCREATOR_H_
 
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 
 class DjVuCreator : public ThumbCreator
 {
diff --git a/kioslave/thumbnail/djvuthumbnail.desktop b/tdeioslave/thumbnail/djvuthumbnail.desktop
similarity index 100%
rename from kioslave/thumbnail/djvuthumbnail.desktop
rename to tdeioslave/thumbnail/djvuthumbnail.desktop
diff --git a/kioslave/thumbnail/exrcreator.cpp b/tdeioslave/thumbnail/exrcreator.cpp
similarity index 99%
rename from kioslave/thumbnail/exrcreator.cpp
rename to tdeioslave/thumbnail/exrcreator.cpp
index 39e8f1fe2..59c1fba76 100644
--- a/kioslave/thumbnail/exrcreator.cpp
+++ b/tdeioslave/thumbnail/exrcreator.cpp
@@ -21,7 +21,7 @@
 
 #include <kimageio.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <tqfile.h>
 
diff --git a/kioslave/thumbnail/exrcreator.h b/tdeioslave/thumbnail/exrcreator.h
similarity index 97%
rename from kioslave/thumbnail/exrcreator.h
rename to tdeioslave/thumbnail/exrcreator.h
index 75e11d455..8fb831bec 100644
--- a/kioslave/thumbnail/exrcreator.h
+++ b/tdeioslave/thumbnail/exrcreator.h
@@ -20,7 +20,7 @@
 #ifndef _EXRCREATOR_H_
 #define _EXRCREATOR_H_
 
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 
 class EXRCreator : public ThumbCreator
 {
diff --git a/kioslave/thumbnail/exrthumbnail.desktop b/tdeioslave/thumbnail/exrthumbnail.desktop
similarity index 100%
rename from kioslave/thumbnail/exrthumbnail.desktop
rename to tdeioslave/thumbnail/exrthumbnail.desktop
diff --git a/kioslave/thumbnail/htmlcreator.cpp b/tdeioslave/thumbnail/htmlcreator.cpp
similarity index 100%
rename from kioslave/thumbnail/htmlcreator.cpp
rename to tdeioslave/thumbnail/htmlcreator.cpp
diff --git a/kioslave/thumbnail/htmlcreator.h b/tdeioslave/thumbnail/htmlcreator.h
similarity index 97%
rename from kioslave/thumbnail/htmlcreator.h
rename to tdeioslave/thumbnail/htmlcreator.h
index f131ed1ad..31ef0f398 100644
--- a/kioslave/thumbnail/htmlcreator.h
+++ b/tdeioslave/thumbnail/htmlcreator.h
@@ -21,7 +21,7 @@
 #ifndef _HTMLCREATOR_H_
 #define _HTMLCREATOR_H_
 
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 
 class KHTMLPart;
 
diff --git a/kioslave/thumbnail/htmlthumbnail.desktop b/tdeioslave/thumbnail/htmlthumbnail.desktop
similarity index 100%
rename from kioslave/thumbnail/htmlthumbnail.desktop
rename to tdeioslave/thumbnail/htmlthumbnail.desktop
diff --git a/kioslave/thumbnail/imagecreator.cpp b/tdeioslave/thumbnail/imagecreator.cpp
similarity index 100%
rename from kioslave/thumbnail/imagecreator.cpp
rename to tdeioslave/thumbnail/imagecreator.cpp
diff --git a/kioslave/thumbnail/imagecreator.h b/tdeioslave/thumbnail/imagecreator.h
similarity index 97%
rename from kioslave/thumbnail/imagecreator.h
rename to tdeioslave/thumbnail/imagecreator.h
index cc527438d..05278611d 100644
--- a/kioslave/thumbnail/imagecreator.h
+++ b/tdeioslave/thumbnail/imagecreator.h
@@ -20,7 +20,7 @@
 #ifndef _IMAGECREATOR_H_
 #define _IMAGECREATOR_H_
 
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 
 class ImageCreator : public ThumbCreator
 {
diff --git a/kioslave/thumbnail/imagethumbnail.desktop b/tdeioslave/thumbnail/imagethumbnail.desktop
similarity index 100%
rename from kioslave/thumbnail/imagethumbnail.desktop
rename to tdeioslave/thumbnail/imagethumbnail.desktop
diff --git a/kioslave/thumbnail/textcreator.cpp b/tdeioslave/thumbnail/textcreator.cpp
similarity index 100%
rename from kioslave/thumbnail/textcreator.cpp
rename to tdeioslave/thumbnail/textcreator.cpp
diff --git a/kioslave/thumbnail/textcreator.h b/tdeioslave/thumbnail/textcreator.h
similarity index 97%
rename from kioslave/thumbnail/textcreator.h
rename to tdeioslave/thumbnail/textcreator.h
index 02b14aec9..e3ab984d1 100644
--- a/kioslave/thumbnail/textcreator.h
+++ b/tdeioslave/thumbnail/textcreator.h
@@ -21,7 +21,7 @@
 #define _TEXTCREATOR_H_
 
 #include <tqpixmap.h>
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 
 class KPixmapSplitter;
 
diff --git a/kioslave/thumbnail/textthumbnail.desktop b/tdeioslave/thumbnail/textthumbnail.desktop
similarity index 100%
rename from kioslave/thumbnail/textthumbnail.desktop
rename to tdeioslave/thumbnail/textthumbnail.desktop
diff --git a/kioslave/thumbnail/thumbcreator.desktop b/tdeioslave/thumbnail/thumbcreator.desktop
similarity index 100%
rename from kioslave/thumbnail/thumbcreator.desktop
rename to tdeioslave/thumbnail/thumbcreator.desktop
diff --git a/kioslave/thumbnail/thumbnail.cpp b/tdeioslave/thumbnail/thumbnail.cpp
similarity index 99%
rename from kioslave/thumbnail/thumbnail.cpp
rename to tdeioslave/thumbnail/thumbnail.cpp
index 3dbd5b4a3..1d5d4c929 100644
--- a/kioslave/thumbnail/thumbnail.cpp
+++ b/tdeioslave/thumbnail/thumbnail.cpp
@@ -46,12 +46,12 @@
 #include <kservice.h>
 #include <kservicetype.h>
 #include <kuserprofile.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <klocale.h>
 
 #include <config.h> // For HAVE_NICE
 #include "thumbnail.h"
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 
 // Use correctly TDEInstance instead of TDEApplication (but then no TQPixmap)
 #undef USE_KINSTANCE
diff --git a/kioslave/thumbnail/thumbnail.h b/tdeioslave/thumbnail/thumbnail.h
similarity index 98%
rename from kioslave/thumbnail/thumbnail.h
rename to tdeioslave/thumbnail/thumbnail.h
index 091ad02c2..760d3b151 100644
--- a/kioslave/thumbnail/thumbnail.h
+++ b/tdeioslave/thumbnail/thumbnail.h
@@ -22,7 +22,7 @@
 
 #include <tqdict.h>
 
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 
 class ThumbCreator;
 class TQImage;
diff --git a/kioslave/thumbnail/thumbnail.protocol b/tdeioslave/thumbnail/thumbnail.protocol
similarity index 77%
rename from kioslave/thumbnail/thumbnail.protocol
rename to tdeioslave/thumbnail/thumbnail.protocol
index 774db3225..b1426c893 100644
--- a/kioslave/thumbnail/thumbnail.protocol
+++ b/tdeioslave/thumbnail/thumbnail.protocol
@@ -5,5 +5,5 @@ input=stream
 output=stream
 reading=true
 source=false
-DocPath=kioslave/thumbnail.html
+DocPath=tdeioslave/thumbnail.html
 Icon=thumbnail
diff --git a/kioslave/trash/CMakeLists.txt b/tdeioslave/trash/CMakeLists.txt
similarity index 91%
rename from kioslave/trash/CMakeLists.txt
rename to tdeioslave/trash/CMakeLists.txt
index 5dfd62cb2..e54fba381 100644
--- a/kioslave/trash/CMakeLists.txt
+++ b/tdeioslave/trash/CMakeLists.txt
@@ -9,7 +9,7 @@
 #
 #################################################
 
-add_subdirectory( kfile-plugin )
+add_subdirectory( tdefile-plugin )
 
 
 include_directories(
@@ -43,7 +43,7 @@ set( target kio_trash )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES kio_trash.cpp
-  LINK trashcommon-static kio-shared
+  LINK trashcommon-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -54,6 +54,6 @@ set( target ktrash )
 
 tde_add_executable( ${target}
   SOURCES ktrash.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kioslave/trash/DESIGN b/tdeioslave/trash/DESIGN
similarity index 100%
rename from kioslave/trash/DESIGN
rename to tdeioslave/trash/DESIGN
diff --git a/kioslave/trash/Makefile.am b/tdeioslave/trash/Makefile.am
similarity index 93%
rename from kioslave/trash/Makefile.am
rename to tdeioslave/trash/Makefile.am
index 94b7ab519..dae7debd5 100644
--- a/kioslave/trash/Makefile.am
+++ b/tdeioslave/trash/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
-SUBDIRS = . kfile-plugin
+SUBDIRS = . tdefile-plugin
 
 kde_module_LTLIBRARIES = kio_trash.la
 
@@ -27,5 +27,5 @@ testtrash_LDFLAGS = $(all_libraries)
 TESTS = testtrash
 
 messages:
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/kio_trash.pot
+	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_trash.pot
 
diff --git a/kioslave/trash/kio_trash.cpp b/tdeioslave/trash/kio_trash.cpp
similarity index 99%
rename from kioslave/trash/kio_trash.cpp
rename to tdeioslave/trash/kio_trash.cpp
index f77cbf9ab..26cfb4c6b 100644
--- a/kioslave/trash/kio_trash.cpp
+++ b/tdeioslave/trash/kio_trash.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "kio_trash.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
diff --git a/kioslave/trash/kio_trash.h b/tdeioslave/trash/kio_trash.h
similarity index 98%
rename from kioslave/trash/kio_trash.h
rename to tdeioslave/trash/kio_trash.h
index 6f94512d7..ceaa27cfb 100644
--- a/kioslave/trash/kio_trash.h
+++ b/tdeioslave/trash/kio_trash.h
@@ -20,7 +20,7 @@
 #ifndef KIO_TRASH_H
 #define KIO_TRASH_H
 
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 #include "trashimpl.h"
 namespace TDEIO { class Job; }
 
diff --git a/kioslave/trash/ktrash.cpp b/tdeioslave/trash/ktrash.cpp
similarity index 98%
rename from kioslave/trash/ktrash.cpp
rename to tdeioslave/trash/ktrash.cpp
index b05cac249..395aabb6b 100644
--- a/kioslave/trash/ktrash.cpp
+++ b/tdeioslave/trash/ktrash.cpp
@@ -18,8 +18,8 @@
 */
 
 #include <kapplication.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kdirnotify_stub.h>
diff --git a/kioslave/trash/kfile-plugin/CMakeLists.txt b/tdeioslave/trash/tdefile-plugin/CMakeLists.txt
similarity index 74%
rename from kioslave/trash/kfile-plugin/CMakeLists.txt
rename to tdeioslave/trash/tdefile-plugin/CMakeLists.txt
index 920144faa..cfd52e186 100644
--- a/kioslave/trash/kfile-plugin/CMakeLists.txt
+++ b/tdeioslave/trash/tdefile-plugin/CMakeLists.txt
@@ -23,16 +23,16 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    kfile_trash.desktop kfile_trash_system.desktop
+    tdefile_trash.desktop tdefile_trash_system.desktop
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kfile_trash (module) ######################
+##### tdefile_trash (module) ######################
 
-set( target kfile_trash )
+set( target tdefile_trash )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES kfile_trash.cpp
-  LINK trashcommon-static kio-shared
+  SOURCES tdefile_trash.cpp
+  LINK trashcommon-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/trash/tdefile-plugin/Makefile.am b/tdeioslave/trash/tdefile-plugin/Makefile.am
new file mode 100644
index 000000000..50d2373e9
--- /dev/null
+++ b/tdeioslave/trash/tdefile-plugin/Makefile.am
@@ -0,0 +1,14 @@
+## Makefile.am for trash file meta info plugin
+
+AM_CPPFLAGS      = $(all_includes)
+
+kde_module_LTLIBRARIES = tdefile_trash.la
+
+tdefile_trash_la_SOURCES = tdefile_trash.cpp
+tdefile_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_trash_la_LIBADD = ../libtrashcommon.la $(LIB_KIO)
+
+METASOURCES = AUTO
+
+services_DATA = tdefile_trash.desktop tdefile_trash_system.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kioslave/trash/kfile-plugin/RETURNED_ITEMS b/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS
similarity index 80%
rename from kioslave/trash/kfile-plugin/RETURNED_ITEMS
rename to tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS
index 3e34c5b6d..f4e10f262 100644
--- a/kioslave/trash/kfile-plugin/RETURNED_ITEMS
+++ b/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS
@@ -1,4 +1,4 @@
-kfile_trash
+tdefile_trash
 ===========
 QString OriginalPath
 DateTime DateOfDeletion
diff --git a/kioslave/trash/kfile-plugin/kfile_trash.cpp b/tdeioslave/trash/tdefile-plugin/tdefile_trash.cpp
similarity index 93%
rename from kioslave/trash/kfile-plugin/kfile_trash.cpp
rename to tdeioslave/trash/tdefile-plugin/tdefile_trash.cpp
index 182d9c40e..cf4487d06 100644
--- a/kioslave/trash/kfile-plugin/kfile_trash.cpp
+++ b/tdeioslave/trash/tdefile-plugin/tdefile_trash.cpp
@@ -1,6 +1,6 @@
 /* This file is part of the KDE project
  * Copyright (C) 2004 David Faure <faure@kde.org>
- *     Based on kfile_txt.cpp by Nadeem Hasan <nhasan@kde.org>
+ *     Based on tdefile_txt.cpp by Nadeem Hasan <nhasan@kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
@@ -18,7 +18,7 @@
  *
  */
 
-#include "kfile_trash.h"
+#include "tdefile_trash.h"
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
@@ -29,7 +29,7 @@
 
 typedef KGenericFactory<KTrashPlugin> TrashFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_trash, TrashFactory("kfile_trash"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_trash, TrashFactory("tdefile_trash"))
 
 KTrashPlugin::KTrashPlugin(TQObject *parent, const char *name,
         const TQStringList &args) : KFilePlugin(parent, name, args)
@@ -90,4 +90,4 @@ bool KTrashPlugin::readInfo(KFileMetaInfo& info, uint)
     return true;
 }
 
-#include "kfile_trash.moc"
+#include "tdefile_trash.moc"
diff --git a/kioslave/trash/kfile-plugin/kfile_trash.desktop b/tdeioslave/trash/tdefile-plugin/tdefile_trash.desktop
similarity index 99%
rename from kioslave/trash/kfile-plugin/kfile_trash.desktop
rename to tdeioslave/trash/tdefile-plugin/tdefile_trash.desktop
index 4b58a68dc..18416c2f0 100644
--- a/kioslave/trash/kfile-plugin/kfile_trash.desktop
+++ b/tdeioslave/trash/tdefile-plugin/tdefile_trash.desktop
@@ -73,7 +73,7 @@ Name[wa]=Informåcion sol fitchî batch
 Name[zh_CN]=回收站文件信息
 Name[zh_TW]=資源回收桶檔案資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_trash
+X-TDE-Library=tdefile_trash
 X-TDE-Protocol=trash
 PreferredGroups=General
 PreferredItems=OriginalPath,DateOfDeletion
diff --git a/kioslave/trash/kfile-plugin/kfile_trash.h b/tdeioslave/trash/tdefile-plugin/tdefile_trash.h
similarity index 92%
rename from kioslave/trash/kfile-plugin/kfile_trash.h
rename to tdeioslave/trash/tdefile-plugin/tdefile_trash.h
index 33f83e911..ad3d276d6 100644
--- a/kioslave/trash/kfile-plugin/kfile_trash.h
+++ b/tdeioslave/trash/tdefile-plugin/tdefile_trash.h
@@ -1,6 +1,6 @@
 /* This file is part of the KDE project
  * Copyright (C) 2004 David Faure <faure@kde.org>
- *     Based on kfile_txt.h by Nadeem Hasan <nhasan@kde.org>
+ *     Based on tdefile_txt.h by Nadeem Hasan <nhasan@kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
@@ -21,7 +21,7 @@
 #ifndef __KFILE_TRASH_H_
 #define __KFILE_TRASH_H_
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include "../trashimpl.h"
 
 class TQStringList;
diff --git a/kioslave/trash/kfile-plugin/kfile_trash_system.desktop b/tdeioslave/trash/tdefile-plugin/tdefile_trash_system.desktop
similarity index 99%
rename from kioslave/trash/kfile-plugin/kfile_trash_system.desktop
rename to tdeioslave/trash/tdefile-plugin/tdefile_trash_system.desktop
index 3e3c8fe47..3413db36c 100644
--- a/kioslave/trash/kfile-plugin/kfile_trash_system.desktop
+++ b/tdeioslave/trash/tdefile-plugin/tdefile_trash_system.desktop
@@ -73,7 +73,7 @@ Name[wa]=Informåcion sol fitchî batch
 Name[zh_CN]=回收站文件信息
 Name[zh_TW]=資源回收桶檔案資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_trash
+X-TDE-Library=tdefile_trash
 X-TDE-Protocol=system
 PreferredGroups=General
 PreferredItems=OriginalPath,DateOfDeletion
diff --git a/kioslave/trash/testtrash.cpp b/tdeioslave/trash/testtrash.cpp
similarity index 99%
rename from kioslave/trash/testtrash.cpp
rename to tdeioslave/trash/testtrash.cpp
index e3d06a6d2..519de964c 100644
--- a/kioslave/trash/testtrash.cpp
+++ b/tdeioslave/trash/testtrash.cpp
@@ -29,8 +29,8 @@
 #include <kurl.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <kdebug.h>
 #include <kcmdlineargs.h>
 
@@ -42,7 +42,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <assert.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kstandarddirs.h>
 
 static bool check(const TQString& txt, TQString a, TQString b)
diff --git a/kioslave/trash/testtrash.h b/tdeioslave/trash/testtrash.h
similarity index 100%
rename from kioslave/trash/testtrash.h
rename to tdeioslave/trash/testtrash.h
diff --git a/kioslave/trash/trash.protocol b/tdeioslave/trash/trash.protocol
similarity index 100%
rename from kioslave/trash/trash.protocol
rename to tdeioslave/trash/trash.protocol
diff --git a/kioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp
similarity index 99%
rename from kioslave/trash/trashimpl.cpp
rename to tdeioslave/trash/trashimpl.cpp
index 3e109c119..a31ee1122 100644
--- a/kioslave/trash/trashimpl.cpp
+++ b/tdeioslave/trash/trashimpl.cpp
@@ -20,9 +20,9 @@
 #include "trashimpl.h"
 #include <klocale.h>
 #include <klargefile.h>
-#include <kio/global.h>
-#include <kio/renamedlg.h>
-#include <kio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/renamedlg.h>
+#include <tdeio/job.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <kdirnotify_stub.h>
@@ -30,8 +30,8 @@
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 #include <kmountpoint.h>
-#include <kfileitem.h>
-#include <kio/chmodjob.h>
+#include <tdefileitem.h>
+#include <tdeio/chmodjob.h>
 
 #include <dcopref.h>
 
@@ -224,7 +224,7 @@ bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fi
     url.setPath( infoPath( trashId, origFileName ) ); // we first try with origFileName
     KURL baseDirectory;
     baseDirectory.setPath( url.directory() );
-    // Here we need to use O_EXCL to avoid race conditions with other kioslave processes
+    // Here we need to use O_EXCL to avoid race conditions with other tdeioslave processes
     int fd = 0;
     do {
         kdDebug() << k_funcinfo << "trying to create " << url.path()  << endl;
diff --git a/kioslave/trash/trashimpl.h b/tdeioslave/trash/trashimpl.h
similarity index 98%
rename from kioslave/trash/trashimpl.h
rename to tdeioslave/trash/trashimpl.h
index 366f8a869..6aa941013 100644
--- a/kioslave/trash/trashimpl.h
+++ b/tdeioslave/trash/trashimpl.h
@@ -20,7 +20,7 @@
 #ifndef TRASHIMPL_H
 #define TRASHIMPL_H
 
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <ksimpleconfig.h>
 
 #include <tqstring.h>
@@ -173,10 +173,10 @@ private:
     KSimpleConfig m_config;
 
     // We don't cache any data related to the trashed files.
-    // Another kioslave could change that behind our feet.
+    // Another tdeioslave could change that behind our feet.
     // If we want to start caching data - and avoiding some race conditions -,
     // we should turn this class into a kded module and use DCOP to talk to it
-    // from the kioslave.
+    // from the tdeioslave.
 };
 
 #endif
diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp
index be6546214..5ee3cdde8 100644
--- a/tdeprint/kprinter/printwrapper.cpp
+++ b/tdeprint/kprinter/printwrapper.cpp
@@ -36,7 +36,7 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <ktempfile.h>
diff --git a/tdeprint/printmgr/printers.desktop b/tdeprint/printmgr/printers.desktop
index fff6ba026..c6e5679b5 100644
--- a/tdeprint/printmgr/printers.desktop
+++ b/tdeprint/printmgr/printers.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell printers
+Exec=tdecmshell printers
 Icon=printmgr
 Type=Application
 DocPath=tdeprint/index.html
diff --git a/tdeprint/slave/Makefile.am b/tdeprint/slave/Makefile.am
index 46dbe4250..8cfba4dd7 100644
--- a/tdeprint/slave/Makefile.am
+++ b/tdeprint/slave/Makefile.am
@@ -19,4 +19,4 @@ servicesdir = $(kde_servicesdir)
 services_DATA = print.protocol printdb.protocol
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kio_print.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_print.pot
diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp
index 8c8001ddc..844934137 100644
--- a/tdeprint/slave/kio_print.cpp
+++ b/tdeprint/slave/kio_print.cpp
@@ -29,11 +29,11 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kinstance.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
diff --git a/tdeprint/slave/kio_print.h b/tdeprint/slave/kio_print.h
index afd337ba6..1b7158eb9 100644
--- a/tdeprint/slave/kio_print.h
+++ b/tdeprint/slave/kio_print.h
@@ -20,8 +20,8 @@
 #ifndef KIO_PRINT_H
 #define KIO_PRINT_H
 
-#include <kio/slavebase.h>
-#include <kio/global.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/global.h>
 #include <tqstring.h>
 #include <tqbuffer.h>
 
diff --git a/tdeprint/slave/print.protocol b/tdeprint/slave/print.protocol
index 38989160b..7fe7c7fd0 100644
--- a/tdeprint/slave/print.protocol
+++ b/tdeprint/slave/print.protocol
@@ -11,5 +11,5 @@ deleting=false
 moving=false
 linking=false
 Icon=postscript
-DocPath=kioslave/print.html
+DocPath=tdeioslave/print.html
 defaultMimetype=application/octet-stream
diff --git a/tdeprint/tdeprintfax/conffax.cpp b/tdeprint/tdeprintfax/conffax.cpp
index 97d5e036a..26b6b77ab 100644
--- a/tdeprint/tdeprintfax/conffax.cpp
+++ b/tdeprint/tdeprintfax/conffax.cpp
@@ -27,7 +27,7 @@
 #include <tqprinter.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kseparator.h>
 
diff --git a/tdeprint/tdeprintfax/confgeneral.cpp b/tdeprint/tdeprintfax/confgeneral.cpp
index 0526ee684..d7471fc5d 100644
--- a/tdeprint/tdeprintfax/confgeneral.cpp
+++ b/tdeprint/tdeprintfax/confgeneral.cpp
@@ -26,7 +26,7 @@
 #include <tqcheckbox.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kseparator.h>
 
diff --git a/tdeprint/tdeprintfax/confsystem.cpp b/tdeprint/tdeprintfax/confsystem.cpp
index e1171962a..167e8b6f7 100644
--- a/tdeprint/tdeprintfax/confsystem.cpp
+++ b/tdeprint/tdeprintfax/confsystem.cpp
@@ -27,7 +27,7 @@
 #include <tqcombobox.h>
  
 #include <kglobal.h> 
-#include <kconfig.h> 
+#include <tdeconfig.h> 
 #include <klocale.h>
 #include <kseparator.h>
 
diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp
index fd0073b7a..6cc0e115f 100644
--- a/tdeprint/tdeprintfax/faxab.cpp
+++ b/tdeprint/tdeprintfax/faxab.cpp
@@ -32,7 +32,7 @@
 #include <krun.h>
 #include <kstdguiitem.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 FaxAB::FaxAB(TQWidget *parent, const char *name)
 : KDialog(parent, name, true)
diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp
index 2c8faffc6..78f0a119a 100644
--- a/tdeprint/tdeprintfax/faxctrl.cpp
+++ b/tdeprint/tdeprintfax/faxctrl.cpp
@@ -37,7 +37,7 @@
 
 #include <kprocess.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdialogbase.h>
 #include <kmimetype.h>
@@ -47,7 +47,7 @@
 #include <kemailsettings.h>
 #include <kdebug.h>
 #include <kstdguiitem.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 
 #include <stdlib.h>
diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp
index 95266a95b..015bf7172 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.cpp
+++ b/tdeprint/tdeprintfax/tdeprintfax.cpp
@@ -43,9 +43,9 @@
 #include <tqheader.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmimetype.h>
 #include <kseparator.h>
 #include <ksystemtray.h>
diff --git a/tdescreensaver/blankscrn.cpp b/tdescreensaver/blankscrn.cpp
index e2c6ed889..13c75a53a 100644
--- a/tdescreensaver/blankscrn.cpp
+++ b/tdescreensaver/blankscrn.cpp
@@ -12,7 +12,7 @@
 #include <tqlayout.h>
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcolordialog.h>
 #include <kbuttonbox.h>
 #include <kcolorbutton.h>
diff --git a/tdescreensaver/random.cpp b/tdescreensaver/random.cpp
index cc8b7d279..eb6401b6a 100644
--- a/tdescreensaver/random.cpp
+++ b/tdescreensaver/random.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include <kcmdlineargs.h>
 #include <kdialogbase.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "tdescreensaver_vroot.h"
 #include "random.h"
diff --git a/tdesu/tdesu/CMakeLists.txt b/tdesu/tdesu/CMakeLists.txt
index 7eb878140..afc846ccd 100644
--- a/tdesu/tdesu/CMakeLists.txt
+++ b/tdesu/tdesu/CMakeLists.txt
@@ -25,6 +25,6 @@ link_directories(
 
 tde_add_executable( tdesu AUTOMOC
   SOURCES tdesu.cpp sudlg.cpp
-  LINK tdesu-shared kio-shared
+  LINK tdesu-shared tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/tdesu/tdesu/sudlg.cpp b/tdesu/tdesu/sudlg.cpp
index a32298dad..086e3a427 100644
--- a/tdesu/tdesu/sudlg.cpp
+++ b/tdesu/tdesu/sudlg.cpp
@@ -6,7 +6,7 @@
 
 #include <config.h>
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp
index 0159b828d..753125903 100644
--- a/tdesu/tdesu/tdesu.cpp
+++ b/tdesu/tdesu/tdesu.cpp
@@ -31,7 +31,7 @@
 #include <kglobal.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
diff --git a/tdm/TODO b/tdm/TODO
index 75518b779..a36dd8edf 100644
--- a/tdm/TODO
+++ b/tdm/TODO
@@ -46,7 +46,7 @@ save these options to .dmrc?
 
 - make config position independent
 - parse /etc/kderc?
-- merge multiple tdmrcs in the style of kconfig. how to set section priorities?
+- merge multiple tdmrcs in the style of tdeconfig. how to set section priorities?
 - gentdmconf: treat backgroundrc as an ini file, not as a text blob
 - add proper quoting and dequoting to gentdmconf ini parser & writer
 
diff --git a/tdm/backend/client.c b/tdm/backend/client.c
index 0cf4e216b..313812f3f 100644
--- a/tdm/backend/client.c
+++ b/tdm/backend/client.c
@@ -133,7 +133,7 @@ static char tty[16], hostname[100];
 static struct spwd *sp;
 # endif
 # ifdef KERBEROS
-static char krbtkfile[MAXPATHLEN];
+static char krbttdefile[MAXPATHLEN];
 # endif
 #endif
 
@@ -719,24 +719,24 @@ Verify( GConvFunc gconv, int rootok )
 			V_RET_FAIL( 0 );
 		}
 
-		sprintf( krbtkfile, "%s.%.*s", TKT_ROOT, MAXPATHLEN - strlen( TKT_ROOT ) - 2, td->name );
-		krb_set_tkt_string( krbtkfile );
-		unlink( krbtkfile );
+		sprintf( krbttdefile, "%s.%.*s", TKT_ROOT, MAXPATHLEN - strlen( TKT_ROOT ) - 2, td->name );
+		krb_set_tkt_string( krbttdefile );
+		unlink( krbttdefile );
 
 		ret = krb_verify_user( curuser, "", realm, curpass, 1, "rcmd" );
 		if (ret == KSUCCESS) {
-			chown( krbtkfile, p->pw_uid, p->pw_gid );
+			chown( krbttdefile, p->pw_uid, p->pw_gid );
 			Debug( "KerberosIV verify succeeded\n" );
 			goto done;
 		} else if (ret != KDC_PR_UNKNOWN && ret != SKDC_CANT) {
 			LogError( "KerberosIV verification failure %\"s for %s\n",
 			          krb_get_err_text( ret ), curuser );
-			krbtkfile[0] = '\0';
+			krbttdefile[0] = '\0';
 			V_RET_FAIL( 0 );
 		}
 		Debug( "KerberosIV verify failed: %s\n", krb_get_err_text( ret ) );
 	}
-	krbtkfile[0] = '\0';
+	krbttdefile[0] = '\0';
 # endif	 /* KERBEROS */
 
 # if defined(ultrix) || defined(__ultrix__)
@@ -1259,7 +1259,7 @@ StartClient()
 	}
 # else /* _AIX */
 #  if defined(KERBEROS) && !defined(NO_AFS)
-	if (krbtkfile[0] != '\0') {
+	if (krbttdefile[0] != '\0') {
 		if (k_hasafs()) {
 			if (k_setpag() == -1)
 				LogError( "setpag() for %s failed\n", curuser );
@@ -1307,8 +1307,8 @@ StartClient()
 	if (cursource == PWSRC_AUTOLOGIN)
 		env = setEnv (env, "TDM_AUTOLOGIN", curuser);
 #if !defined(USE_PAM) && !defined(_AIX) && defined(KERBEROS)
-	if (krbtkfile[0] != '\0')
-		env = setEnv( env, "KRBTKFILE", krbtkfile );
+	if (krbttdefile[0] != '\0')
+		env = setEnv( env, "KRBTKFILE", krbttdefile );
 #endif
 #ifdef WITH_CONSOLE_KIT
 	if (ck_session_cookie != NULL) {
@@ -1752,7 +1752,7 @@ SessionExit( int status )
 #endif /* K5AUTH */
 #if !defined(USE_PAM) && !defined(_AIX)
 # ifdef KERBEROS
-				if (krbtkfile[0]) {
+				if (krbttdefile[0]) {
 					(void)dest_tkt();
 #  ifndef NO_AFS
 					if (k_hasafs())
diff --git a/tdm/kfrontend/CMakeLists.txt b/tdm/kfrontend/CMakeLists.txt
index bf2449fd6..092e68b78 100644
--- a/tdm/kfrontend/CMakeLists.txt
+++ b/tdm/kfrontend/CMakeLists.txt
@@ -76,7 +76,7 @@ tde_add_executable( tdm_greet AUTOMOC
 
 tde_add_executable( krootimage AUTOMOC
   SOURCES krootimage.cpp
-  LINK bgnd-static kio-shared
+  LINK bgnd-static tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cc
index dfa65a945..8ba04697e 100644
--- a/tdm/kfrontend/sakdlg.cc
+++ b/tdm/kfrontend/sakdlg.cc
@@ -16,7 +16,7 @@
 #include <kseparator.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
 #include <kpassdlg.h>
diff --git a/tdm/kfrontend/tdmclock.cpp b/tdm/kfrontend/tdmclock.cpp
index 14d8deeaf..3bafc2aaa 100644
--- a/tdm/kfrontend/tdmclock.cpp
+++ b/tdm/kfrontend/tdmclock.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "tdmclock.h"
 
 //#include <kapplication.h>
-//#include <kconfig.h>
+//#include <tdeconfig.h>
 
 #include <tqdatetime.h>
 #include <tqpixmap.h>
diff --git a/tdm/kfrontend/tdmconfig.cpp b/tdm/kfrontend/tdmconfig.cpp
index 5b57a6375..c50b94f85 100644
--- a/tdm/kfrontend/tdmconfig.cpp
+++ b/tdm/kfrontend/tdmconfig.cpp
@@ -64,7 +64,7 @@ GetCfgQStrList( int id )
 	return qsl;
 }
 
-// Based on kconfigbase.cpp
+// Based on tdeconfigbase.cpp
 static TQFont
 Str2Font( const TQString &aValue )
 {
diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp
index db598aed2..8b1f61a3c 100644
--- a/tdm/kfrontend/tdmshutdown.cpp
+++ b/tdm/kfrontend/tdmshutdown.cpp
@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdialog.h>
 #include <kstandarddirs.h>
 #include <kuser.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 
 #include <tqcombobox.h>
diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp
index 2295e500a..3f3c4d418 100644
--- a/tqt3integration/module/module.cpp
+++ b/tqt3integration/module/module.cpp
@@ -24,7 +24,7 @@
 #include <dcopclient.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <krecentdocument.h>
diff --git a/tqt3integration/module/module.h b/tqt3integration/module/module.h
index 81b794c86..4a4f215d4 100644
--- a/tqt3integration/module/module.h
+++ b/tqt3integration/module/module.h
@@ -24,7 +24,7 @@
 #include <kcolordialog.h>
 #include <kdedmodule.h>
 #include <kdirselectdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kfontdialog.h>
 #include <kdialogbase.h>
 
diff --git a/twin/CONFIGURING b/twin/CONFIGURING
index 01b6696a5..071f9d6dc 100644
--- a/twin/CONFIGURING
+++ b/twin/CONFIGURING
@@ -48,7 +48,7 @@ these steps:
  (e.g. foobar_fix_maxsize in this example case)
 - Be careful with manual modifications of the file, especially make sure the count=
  field in the [General] group is updated if needed
-- Create a file for kconfig_update like this (named twin_foobar_fix_maxsize.upd
+- Create a file for tdeconfig_update like this (named twin_foobar_fix_maxsize.upd
  in this example):
 
 # twin_foobar_fix_maxsize.upd start # 
@@ -61,8 +61,8 @@ Script=twin_update_default_rules
 
 # twin_foobar_fix_maxsize.upd end # 
 
-- The kconfig_file (twin_foobar_fix_maxsize.upd) is to be placed
- in $TDEDIR/share/apps/kconf_update/
+- The tdeconfig_file (twin_foobar_fix_maxsize.upd) is to be placed
+ in $TDEDIR/share/apps/tdeconf_update/
 - The file with the window-specific settings (foobar_fix_maxsize) is to be placed
  in $TDEDIR/share/apps/twin/default_rules/
 
diff --git a/twin/README b/twin/README
index 652fa83ae..8d61c7163 100644
--- a/twin/README
+++ b/twin/README
@@ -160,7 +160,7 @@ mainwindow should in the cookie dialog case point to the Konqueror window
 for which it has been shown. This is solved in kcookiejar by including
 the window id in the DCOP call. When the cookie dialog is shown, its
 WM_TRANSIENT_FOR property is manually set using the XSetTransientForHint()
-call (see tdelibs/kioslave/http/kcookiejar/kcookiewin.cpp). The arguments
+call (see tdelibs/tdeioslave/http/kcookiejar/kcookiewin.cpp). The arguments
 to XSetTransientForHint() call are the X display (i.e. qt_xdisplay()),
 the window id on which the WM_TRANSIENT_FOR property is to be set
 (i.e. use QWidget::winId()), and the window id of the mainwindow.
diff --git a/twin/activation.cpp b/twin/activation.cpp
index f54b37232..c2c910818 100644
--- a/twin/activation.cpp
+++ b/twin/activation.cpp
@@ -293,7 +293,7 @@ void Workspace::activateClient( Client* c, bool force )
     // As they usually belong to the current active window but fail to provide
     // this information, updating their user time would make the user time
     // of the currently active window old, and reject further activation for it.
-    // E.g. typing URL in minicli which will show kio_uiserver dialog (with workaround),
+    // E.g. typing URL in minicli which will show tdeio_uiserver dialog (with workaround),
     // and then kdesktop shows dialog about SSL certificate.
     // This needs also avoiding user creation time in Client::readUserTimeMapTimestamp().
     if( !c->ignoreFocusStealing())
diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index 4e174cf44..71d6fdfdd 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -20,7 +20,7 @@
 #include <kiconeffect.h>
 #include <kdrawutil.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqbitmap.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
diff --git a/twin/clients/b2/config/config.h b/twin/clients/b2/config/config.h
index 53bd42767..a1ca8ebdd 100644
--- a/twin/clients/b2/config/config.h
+++ b/twin/clients/b2/config/config.h
@@ -14,7 +14,7 @@
 #include <tqhgroupbox.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class B2Config: public TQObject
 {
diff --git a/twin/clients/default/config/config.h b/twin/clients/default/config/config.h
index fcd9fbf23..a09ac1ab3 100644
--- a/twin/clients/default/config/config.h
+++ b/twin/clients/default/config/config.h
@@ -12,7 +12,7 @@
 
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp
index 52fff00f3..938a9e06d 100644
--- a/twin/clients/default/kdedefault.cpp
+++ b/twin/clients/default/kdedefault.cpp
@@ -12,7 +12,7 @@
 
 #include "kdedefault.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kpixmapeffect.h>
 #include <kimageeffect.h>
diff --git a/twin/clients/keramik/config/CMakeLists.txt b/twin/clients/keramik/config/CMakeLists.txt
index 7b5bdb339..6fce6dfaf 100644
--- a/twin/clients/keramik/config/CMakeLists.txt
+++ b/twin/clients/keramik/config/CMakeLists.txt
@@ -23,7 +23,7 @@ link_directories(
 ##### twin_keramik_config (module) ##############
 
 tde_add_kpart( twin_keramik_config AUTOMOC
-  SOURCES config.cpp keramikconfig.ui
+  SOURCES config.cpp keramitdeconfig.ui
   LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/twin/clients/keramik/config/Makefile.am b/twin/clients/keramik/config/Makefile.am
index 19ee4f27d..aa6014cf5 100644
--- a/twin/clients/keramik/config/Makefile.am
+++ b/twin/clients/keramik/config/Makefile.am
@@ -2,12 +2,12 @@ INCLUDES                       = $(all_includes)
 
 kde_module_LTLIBRARIES         = twin_keramik_config.la
 
-twin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui
+twin_keramik_config_la_SOURCES = config.cpp keramitdeconfig.ui
 twin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 twin_keramik_config_la_LIBADD  = $(LIB_TDEUI)
 
 METASOURCES                    = AUTO
-noinst_HEADERS                 = config.h keramikconfig.h
+noinst_HEADERS                 = config.h keramitdeconfig.h
 
 lnkdir                         = $(kde_datadir)/twin
 
diff --git a/twin/clients/keramik/config/config.h b/twin/clients/keramik/config/config.h
index 4138fe958..7907f28e5 100644
--- a/twin/clients/keramik/config/config.h
+++ b/twin/clients/keramik/config/config.h
@@ -25,9 +25,9 @@
 #ifndef __KWIN_KERAMIK_CONFIG_H
 #define __KWIN_KERAMIK_CONFIG_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
-#include "keramikconfig.h"
+#include "keramitdeconfig.h"
 
 class KeramikConfig: public TQObject
 {
diff --git a/twin/clients/keramik/config/keramikconfig.ui b/twin/clients/keramik/config/keramitdeconfig.ui
similarity index 100%
rename from twin/clients/keramik/config/keramikconfig.ui
rename to twin/clients/keramik/config/keramitdeconfig.ui
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index 3825a851a..d90291ad2 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconeffect.h>
 
diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp
index 33b71994e..d2bf002ed 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/twin/clients/kwmtheme/kwmthemeclient.cpp
@@ -1,4 +1,4 @@
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kwmthemeclient.h"
 #include <kglobal.h>
 #include <tqlayout.h>
diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp
index 58d54a118..0f91d9005 100644
--- a/twin/clients/laptop/laptopclient.cpp
+++ b/twin/clients/laptop/laptopclient.cpp
@@ -6,7 +6,7 @@
  * Copyright (c) 2003 Luciano Montanaro <mikelima@cirulla.net>
  */
 
-#include <kconfig.h> // up here to avoid X11 header conflict :P
+#include <tdeconfig.h> // up here to avoid X11 header conflict :P
 #include "laptopclient.h"
 #include <tqdrawutil.h>
 #include <kpixmapeffect.h>
diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp
index 4c87829be..8eefe484d 100644
--- a/twin/clients/modernsystem/config/config.cpp
+++ b/twin/clients/modernsystem/config/config.cpp
@@ -1,7 +1,7 @@
 // Melchior FRANZ  <mfranz@kde.org>	-- 2001-04-22
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kglobal.h>
diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp
index 8fbd1e38c..f58855fe3 100644
--- a/twin/clients/modernsystem/modernsys.cpp
+++ b/twin/clients/modernsystem/modernsys.cpp
@@ -1,7 +1,7 @@
 // Daniel M. DULEY <mosfet@kde.org>               original work
 // Melchior FRANZ  <a8603365@unet.univie.ac.at>   configuration options
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <tqlayout.h>
diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp
index d79800d4a..4477fdd02 100644
--- a/twin/clients/plastik/config/config.cpp
+++ b/twin/clients/plastik/config/config.cpp
@@ -27,7 +27,7 @@
 #include <tqspinbox.h>
 #include <tqwhatsthis.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
 
diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp
index 2072302d7..5e03b7a51 100644
--- a/twin/clients/plastik/plastik.cpp
+++ b/twin/clients/plastik/plastik.cpp
@@ -24,7 +24,7 @@
 #include <tqpainter.h>
 #include <tqimage.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
 
diff --git a/twin/clients/quartz/config/config.h b/twin/clients/quartz/config/config.h
index d334930c8..f68b9ef27 100644
--- a/twin/clients/quartz/config/config.h
+++ b/twin/clients/quartz/config/config.h
@@ -12,7 +12,7 @@
 
 #include <tqcheckbox.h>
 #include <tqvbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class QuartzConfig: public TQObject
 {
diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp
index 09d3ccf52..00aee9c58 100644
--- a/twin/clients/quartz/quartz.cpp
+++ b/twin/clients/quartz/quartz.cpp
@@ -14,7 +14,7 @@
  *
  */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdrawutil.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp
index 94bf98f35..53ec5a4df 100644
--- a/twin/clients/web/Web.cpp
+++ b/twin/clients/web/Web.cpp
@@ -22,7 +22,7 @@
 
 #include <tqpainter.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "Web.h"
 #include "WebButton.h"
diff --git a/twin/data/CMakeLists.txt b/twin/data/CMakeLists.txt
index 808d65e06..9a0ce88da 100644
--- a/twin/data/CMakeLists.txt
+++ b/twin/data/CMakeLists.txt
@@ -45,7 +45,7 @@ install( FILES
 tde_add_executable( twin_update_window_settings
   SOURCES update_window_settings.cpp
   LINK tdecore-shared
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
 )
 
 
@@ -54,5 +54,5 @@ tde_add_executable( twin_update_window_settings
 tde_add_executable( twin_update_default_rules
   SOURCES update_default_rules.cpp
   LINK tdecore-shared
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
 )
diff --git a/twin/data/Makefile.am b/twin/data/Makefile.am
index 81bc0db43..0a2dab482 100644
--- a/twin/data/Makefile.am
+++ b/twin/data/Makefile.am
@@ -1,5 +1,5 @@
-kconf_PROGRAMS = twin_update_window_settings twin_update_default_rules
-kconfdir = $(libdir)/kconf_update_bin
+tdeconf_PROGRAMS = twin_update_window_settings twin_update_default_rules
+tdeconfdir = $(libdir)/tdeconf_update_bin
 
 twin_update_window_settings_SOURCES = update_window_settings.cpp
 twin_update_window_settings_LDADD   = $(LIB_TDECORE) $(KDE_RPATH)
@@ -19,7 +19,7 @@ sound_DATA = pop.wav
 update_DATA = twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd twin_focus1.upd \
         twinupdatewindowsettings.upd twin_focus2.upd twin_fsp_workarounds_1.upd
 update_SCRIPTS = pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 twin_default_rules_DATA = fsp_workarounds_1.twinrules
 twin_default_rulesdir = $(kde_datadir)/twin/default_rules
diff --git a/twin/data/twin_focus1.sh b/twin/data/twin_focus1.sh
index 6ffe0e039..afb05acac 100644
--- a/twin/data/twin_focus1.sh
+++ b/twin/data/twin_focus1.sh
@@ -2,12 +2,12 @@
 was=
 while read line; do
     if echo "$line" | grep '^IgnoreFocusStealingClasses=' >/dev/null 2>/dev/null; then
-        echo "$line" | sed 's/\(^IgnoreFocusStealingClasses=.*$\)/\1,kio_uiserver/'
+        echo "$line" | sed 's/\(^IgnoreFocusStealingClasses=.*$\)/\1,tdeio_uiserver/'
         was=1
     else
         echo "$line"
     fi
 done
 if test -z "$was"; then
-    echo "IgnoreFocusStealingClasses=kio_uiserver"
+    echo "IgnoreFocusStealingClasses=tdeio_uiserver"
 fi
diff --git a/twin/data/update_default_rules.cpp b/twin/data/update_default_rules.cpp
index 61b03d3c4..1afde0bee 100644
--- a/twin/data/update_default_rules.cpp
+++ b/twin/data/update_default_rules.cpp
@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 // read addtional window rules and add them to twinrulesrc
 
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp
index 40b25db9c..e52f8c760 100644
--- a/twin/data/update_window_settings.cpp
+++ b/twin/data/update_window_settings.cpp
@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 // updates per-window settings from KDE3.2 to KDE3.3
 
 #include <netwm_def.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinstance.h>
 #include <dcopclient.h>
 
diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp
index 8c12f9048..238bb2498 100644
--- a/twin/kcmtwin/twindecoration/preview.cpp
+++ b/twin/kcmtwin/twindecoration/preview.cpp
@@ -21,7 +21,7 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <tqlabel.h>
 #include <tqstyle.h>
diff --git a/twin/kcmtwin/twindecoration/twindecoration.desktop b/twin/kcmtwin/twindecoration/twindecoration.desktop
index cc9c29084..f036b36ab 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.desktop
+++ b/twin/kcmtwin/twindecoration/twindecoration.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell twindecoration
+Exec=tdecmshell twindecoration
 Icon=kcmkwm
 Type=Application
 DocPath=kcontrol/twindecoration/index.html
diff --git a/twin/kcmtwin/twindecoration/twindecoration.h b/twin/kcmtwin/twindecoration/twindecoration.h
index 49af27d71..cf968df1d 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.h
+++ b/twin/kcmtwin/twindecoration/twindecoration.h
@@ -33,7 +33,7 @@
 #include <tdecmodule.h>
 #include <dcopobject.h>
 #include <buttons.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klibloader.h>
 
diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index 0743ca31f..aac2436d1 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -24,7 +24,7 @@
 #include <kapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kaboutdata.h>
 #include <kdialog.h>
diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp
index 5c1e22d35..41a635c51 100644
--- a/twin/kcmtwin/twinoptions/mouse.cpp
+++ b/twin/kcmtwin/twinoptions/mouse.cpp
@@ -31,7 +31,7 @@
 #include <dcopclient.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobalsettings.h>
 #include <kseparator.h>
diff --git a/twin/kcmtwin/twinoptions/twinactions.desktop b/twin/kcmtwin/twinoptions/twinactions.desktop
index bde13343d..b6cacad48 100644
--- a/twin/kcmtwin/twinoptions/twinactions.desktop
+++ b/twin/kcmtwin/twinoptions/twinactions.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinactions
+Exec=tdecmshell twinactions
 DocPath=kcontrol/windowmanagement/index.html#action-actions
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/twinadvanced.desktop b/twin/kcmtwin/twinoptions/twinadvanced.desktop
index 529a806c6..1929d330f 100644
--- a/twin/kcmtwin/twinoptions/twinadvanced.desktop
+++ b/twin/kcmtwin/twinoptions/twinadvanced.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinadvanced
+Exec=tdecmshell twinadvanced
 DocPath=kcontrol/windowmanagement/index.html#action-advanced
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/twinfocus.desktop b/twin/kcmtwin/twinoptions/twinfocus.desktop
index 5db9181e1..530d09206 100644
--- a/twin/kcmtwin/twinoptions/twinfocus.desktop
+++ b/twin/kcmtwin/twinoptions/twinfocus.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinfocus
+Exec=tdecmshell twinfocus
 DocPath=kcontrol/windowmanagement/index.html#action-focus
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/twinmoving.desktop b/twin/kcmtwin/twinoptions/twinmoving.desktop
index 1845b682e..144406d97 100644
--- a/twin/kcmtwin/twinoptions/twinmoving.desktop
+++ b/twin/kcmtwin/twinoptions/twinmoving.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinmoving
+Exec=tdecmshell twinmoving
 DocPath=kcontrol/windowmanagement/index.html#action-moving
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/twinoptions.desktop b/twin/kcmtwin/twinoptions/twinoptions.desktop
index 2f1eab87c..1fc2e1a95 100644
--- a/twin/kcmtwin/twinoptions/twinoptions.desktop
+++ b/twin/kcmtwin/twinoptions/twinoptions.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinoptions
+Exec=tdecmshell twinoptions
 DocPath=kcontrol/windowmanagement/index.html
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/twintranslucency.desktop b/twin/kcmtwin/twinoptions/twintranslucency.desktop
index 164fe8d7a..3ff002dac 100644
--- a/twin/kcmtwin/twinoptions/twintranslucency.desktop
+++ b/twin/kcmtwin/twinoptions/twintranslucency.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twintranslucency
+Exec=tdecmshell twintranslucency
 DocPath=kcontrol/windowmanagement/index.html#action-translucency
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index 41a593388..991b425b6 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -37,7 +37,7 @@
 #include <kactivelabel.h>
 #include <klocale.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <kapplication.h>
 #include <kdialog.h>
diff --git a/twin/kcmtwin/twinrules/kcm.h b/twin/kcmtwin/twinrules/kcm.h
index 33d7c2664..5e89a7773 100644
--- a/twin/kcmtwin/twinrules/kcm.h
+++ b/twin/kcmtwin/twinrules/kcm.h
@@ -21,7 +21,7 @@
 #define __KCM_H__
 
 #include <tdecmodule.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class TDEConfig;
 class TDEAboutData;
diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp
index 4b36bd795..78bec0302 100644
--- a/twin/kcmtwin/twinrules/main.cpp
+++ b/twin/kcmtwin/twinrules/main.cpp
@@ -19,7 +19,7 @@
 #include <kcmdlineargs.h>
 #include <kapplication.h>
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <twin.h>
 
diff --git a/twin/kcmtwin/twinrules/ruleslist.cpp b/twin/kcmtwin/twinrules/ruleslist.cpp
index c7634c3ac..2f7c4582a 100644
--- a/twin/kcmtwin/twinrules/ruleslist.cpp
+++ b/twin/kcmtwin/twinrules/ruleslist.cpp
@@ -22,7 +22,7 @@
 #include <kpushbutton.h>
 #include <assert.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "ruleswidget.h"
 
diff --git a/twin/kcmtwin/twinrules/twinrules.desktop b/twin/kcmtwin/twinrules/twinrules.desktop
index eba872171..061609041 100644
--- a/twin/kcmtwin/twinrules/twinrules.desktop
+++ b/twin/kcmtwin/twinrules/twinrules.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinrules
+Exec=tdecmshell twinrules
 DocPath=kcontrol/windowmanagement/index.html
 
 X-TDE-ModuleType=Library
diff --git a/twin/lib/kdecoration_p.cpp b/twin/lib/kdecoration_p.cpp
index 66d886aec..73e2d9871 100644
--- a/twin/lib/kdecoration_p.cpp
+++ b/twin/lib/kdecoration_p.cpp
@@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include "kdecoration_p.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <tqpalette.h>
 #include <tqapplication.h>
diff --git a/twin/lib/kdecoration_plugins_p.cpp b/twin/lib/kdecoration_plugins_p.cpp
index e6c6cfe36..632539f66 100644
--- a/twin/lib/kdecoration_plugins_p.cpp
+++ b/twin/lib/kdecoration_plugins_p.cpp
@@ -25,7 +25,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include "kdecoration_plugins_p.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <klibloader.h>
diff --git a/twin/main.cpp b/twin/main.cpp
index e9474d4f9..b21540db0 100644
--- a/twin/main.cpp
+++ b/twin/main.cpp
@@ -10,7 +10,7 @@ License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
 //#define QT_CLEAN_NAMESPACE
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "main.h"
 
diff --git a/twin/options.cpp b/twin/options.cpp
index d1dc123c5..25bcb6a33 100644
--- a/twin/options.cpp
+++ b/twin/options.cpp
@@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tqpalette.h>
 #include <tqpixmap.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <tqtooltip.h>
diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp
index e047981cc..3f5aa4d90 100644
--- a/twin/popupinfo.cpp
+++ b/twin/popupinfo.cpp
@@ -20,7 +20,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tqstyle.h>
 #include <kglobal.h>
 #include <fixx11h.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tqapplication.h>
diff --git a/twin/rules.cpp b/twin/rules.cpp
index 6f2b3b615..c9eba17ac 100644
--- a/twin/rules.cpp
+++ b/twin/rules.cpp
@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "rules.h"
 
 #include <fixx11h.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqregexp.h>
 #include <ktempfile.h>
 #include <ksimpleconfig.h>
diff --git a/twin/sm.cpp b/twin/sm.cpp
index af8217bfb..0ce286fdd 100644
--- a/twin/sm.cpp
+++ b/twin/sm.cpp
@@ -18,7 +18,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <stdlib.h>
 #include <pwd.h>
 #include <fixx11h.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "workspace.h"
@@ -101,7 +101,7 @@ void Workspace::storeSession( TDEConfig* config, SMSavePhase phase )
             config->writeEntry( TQString("fullscreen")+n, (int) c->fullScreenMode() );
             config->writeEntry( TQString("desktop")+n, c->desktop() );
     	    // the config entry is called "iconified" for back. comp. reasons
-            // (kconf_update script for updating session files would be too complicated)
+            // (tdeconf_update script for updating session files would be too complicated)
             config->writeEntry( TQString("iconified")+n, c->isMinimized() );
             // the config entry is called "sticky" for back. comp. reasons
             config->writeEntry( TQString("sticky")+n, c->isOnAllDesktops() );
diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp
index de5006903..85da5a7be 100644
--- a/twin/tabbox.cpp
+++ b/twin/tabbox.cpp
@@ -19,7 +19,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tqstyle.h>
 #include <kglobal.h>
 #include <fixx11h.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <tqapplication.h>
 #include <tqdesktopwidget.h>
diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp
index db625ba15..e69ce5932 100644
--- a/twin/tools/decobenchmark/main.cpp
+++ b/twin/tools/decobenchmark/main.cpp
@@ -21,7 +21,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdecoration_plugins_p.h>
 #include <kdecorationfactory.h>
 
diff --git a/twin/tools/decobenchmark/preview.cpp b/twin/tools/decobenchmark/preview.cpp
index ece91c734..b6bc6691f 100644
--- a/twin/tools/decobenchmark/preview.cpp
+++ b/twin/tools/decobenchmark/preview.cpp
@@ -23,7 +23,7 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <tqlabel.h>
 #include <tqstyle.h>
diff --git a/twin/useractions.cpp b/twin/useractions.cpp
index 09e93b27f..1b5769f8d 100644
--- a/twin/useractions.cpp
+++ b/twin/useractions.cpp
@@ -25,7 +25,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalaccel.h>
 #include <kapplication.h>
 #include <tqregexp.h>
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index 4778caaa3..85308f66d 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <kapplication.h>
 #include <kstartupinfo.h>
 #include <fixx11h.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <tqpopupmenu.h>
 #include <klocale.h>
@@ -1220,7 +1220,7 @@ TQStringList Workspace::configModules(bool controlCenter)
 
 void Workspace::configureWM()
     {
-    TDEApplication::tdeinitExec( "kcmshell", configModules(false) );
+    TDEApplication::tdeinitExec( "tdecmshell", configModules(false) );
     }
 
 /*!