Rename a number of libraries and executables to avoid conflicts with KDE4

1230 files changed, 1525 insertions, 1542 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c31da127..7fac2b75 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 aa830cb0..705f0a3a 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 8e5b89c7..c429c4be 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 7bc8cd67..064a575d 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 740bed35..0dd80739 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 278f0c1e..8d11d23e 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 131147ec..b54dc93c 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 ca882628..583ea6a1 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 0f2dcd37..2804971e 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 9556740b..16bb26dc 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 3b6c80e9..ab260c71 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 23d4d5e8..9b14fba0 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 cf170ce2..9b4a0219 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 62ab2926..c20a0c80 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 5b74c886..366e9f95 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 86047114..1b6bad42 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 f15f4ad4..20a75999 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 bfb2a1c7..aa58c0ff 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 f8b7d46c..b06708a1 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 2cc77e57..731c26b5 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 26cc11ac..110f3177 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
index 0505d604..0505d604 100644
--- a/doc/kcontrol/filemanager/kfileman1.png
+++ b/doc/kcontrol/filemanager/tdefileman1.png
diff --git a/doc/kcontrol/filemanager/kfileman2.png b/doc/kcontrol/filemanager/tdefileman2.png
index 6c8d17d7..6c8d17d7 100644
--- a/doc/kcontrol/filemanager/kfileman2.png
+++ b/doc/kcontrol/filemanager/tdefileman2.png
diff --git a/doc/kcontrol/index.docbook b/doc/kcontrol/index.docbook
index 0c892679..f55b3e8e 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 c69d27bc..63a154ea 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 3645669d..07c242b3 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 2c1e0fa1..c6c8ecbb 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 a3abb27c..df1c5f88 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 f41d181b..88e858fe 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
index da80330c..5446ddbe 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
index 085981d9..085981d9 100644
--- a/doc/kioslave/Makefile.am
+++ b/doc/tdeioslave/Makefile.am
diff --git a/doc/kioslave/bzip.docbook b/doc/tdeioslave/bzip.docbook
index 9a3dc90c..e4e7d1bf 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
index 9551632a..ecc2b2e2 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
index 5df94da1..5df94da1 100644
--- a/doc/kioslave/cgi.docbook
+++ b/doc/tdeioslave/cgi.docbook
diff --git a/doc/kioslave/data.docbook b/doc/tdeioslave/data.docbook
index ca0e4e9a..ca0e4e9a 100644
--- a/doc/kioslave/data.docbook
+++ b/doc/tdeioslave/data.docbook
diff --git a/doc/kioslave/file.docbook b/doc/tdeioslave/file.docbook
index 6d19b043..6d19b043 100644
--- a/doc/kioslave/file.docbook
+++ b/doc/tdeioslave/file.docbook
diff --git a/doc/kioslave/finger.docbook b/doc/tdeioslave/finger.docbook
index 27b278c4..b3678fc4 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
index 5063abd0..577199e8 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
index 5a75ba25..5a75ba25 100644
--- a/doc/kioslave/floppy.docbook
+++ b/doc/tdeioslave/floppy.docbook
diff --git a/doc/kioslave/ftp.docbook b/doc/tdeioslave/ftp.docbook
index eb9e7056..eb9e7056 100644
--- a/doc/kioslave/ftp.docbook
+++ b/doc/tdeioslave/ftp.docbook
diff --git a/doc/kioslave/gopher.docbook b/doc/tdeioslave/gopher.docbook
index 29e418fa..29e418fa 100644
--- a/doc/kioslave/gopher.docbook
+++ b/doc/tdeioslave/gopher.docbook
diff --git a/doc/kioslave/gzip.docbook b/doc/tdeioslave/gzip.docbook
index 906f0d65..03a6b996 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
index 43b806de..43b806de 100644
--- a/doc/kioslave/help.docbook
+++ b/doc/tdeioslave/help.docbook
diff --git a/doc/kioslave/http.docbook b/doc/tdeioslave/http.docbook
index d7cde38a..535370b6 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
index 38772f5d..bbaa1b0a 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
index e34c1e4e..8778877c 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
index d5f8e7b6..fc046944 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
index 8a9672a5..8a9672a5 100644
--- a/doc/kioslave/index.docbook
+++ b/doc/tdeioslave/index.docbook
diff --git a/doc/kioslave/info.docbook b/doc/tdeioslave/info.docbook
index 1ea645c3..1ea645c3 100644
--- a/doc/kioslave/info.docbook
+++ b/doc/tdeioslave/info.docbook
diff --git a/doc/kioslave/lan.docbook b/doc/tdeioslave/lan.docbook
index c494b576..ad75ce38 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
index ff23339c..48515751 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
index a0ea6d69..a0ea6d69 100644
--- a/doc/kioslave/mac.docbook
+++ b/doc/tdeioslave/mac.docbook
diff --git a/doc/kioslave/mailto.docbook b/doc/tdeioslave/mailto.docbook
index 3603aea8..ac7fddd4 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
index 8f3324ff..8f3324ff 100644
--- a/doc/kioslave/man.docbook
+++ b/doc/tdeioslave/man.docbook
diff --git a/doc/kioslave/mrml.docbook b/doc/tdeioslave/mrml.docbook
index 6dcde8bd..6dcde8bd 100644
--- a/doc/kioslave/mrml.docbook
+++ b/doc/tdeioslave/mrml.docbook
diff --git a/doc/kioslave/news.docbook b/doc/tdeioslave/news.docbook
index c56e3a8e..d13f2b71 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
index bbe9bb62..bbe9bb62 100644
--- a/doc/kioslave/nfs.docbook
+++ b/doc/tdeioslave/nfs.docbook
diff --git a/doc/kioslave/nntp.docbook b/doc/tdeioslave/nntp.docbook
index 7f213d2c..20de8e95 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
index 1c956a1c..1c956a1c 100644
--- a/doc/kioslave/pop3.docbook
+++ b/doc/tdeioslave/pop3.docbook
diff --git a/doc/kioslave/pop3s.docbook b/doc/tdeioslave/pop3s.docbook
index 856709e8..856709e8 100644
--- a/doc/kioslave/pop3s.docbook
+++ b/doc/tdeioslave/pop3s.docbook
diff --git a/doc/kioslave/print.docbook b/doc/tdeioslave/print.docbook
index 2af8dc13..fa102c3a 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
index b0d358aa..b0d358aa 100644
--- a/doc/kioslave/rlan.docbook
+++ b/doc/tdeioslave/rlan.docbook
diff --git a/doc/kioslave/rlogin.docbook b/doc/tdeioslave/rlogin.docbook
index 5568eead..54e834e9 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
index ff2770a4..ff2770a4 100644
--- a/doc/kioslave/sftp.docbook
+++ b/doc/tdeioslave/sftp.docbook
diff --git a/doc/kioslave/smb.docbook b/doc/tdeioslave/smb.docbook
index 716db415..ef7e9ac9 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
index 2aa2c7db..2aa2c7db 100644
--- a/doc/kioslave/smtp.docbook
+++ b/doc/tdeioslave/smtp.docbook
diff --git a/doc/kioslave/tar.docbook b/doc/tdeioslave/tar.docbook
index 8a540519..8a540519 100644
--- a/doc/kioslave/tar.docbook
+++ b/doc/tdeioslave/tar.docbook
diff --git a/doc/kioslave/telnet.docbook b/doc/tdeioslave/telnet.docbook
index 9d2131e8..9d2131e8 100644
--- a/doc/kioslave/telnet.docbook
+++ b/doc/tdeioslave/telnet.docbook
diff --git a/doc/kioslave/thumbnail.docbook b/doc/tdeioslave/thumbnail.docbook
index 8ad0393b..fb07fe5a 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
index d549384f..8f46546b 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
index edbd635e..23dde138 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 4e8a0af9..840247af 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 79179b4f..51e7cc98 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 8a1b81c0..66de1113 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 87219171..665f3c28 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 db288374..502ba5e9 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 5760b000..71b6f3a4 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 b7ce210f..c22d2081 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 504326bb..7d35b432 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 6dbde4a7..d170f6c7 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 9b9a223d..178e63d0 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 1ceab8a2..78cf6b6f 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 f956c9ea..7ddd1b7b 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 0482b273..beeed208 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 7a6f9c72..8028b3ed 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 627fe47d..bd2e8274 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 f5dd1ea5..e53c0791 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 953a5f31..aa8aaedb 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 87463965..8a001cde 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 044cb73a..4fe15d4f 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 e8ba58ee..1d37c6f1 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 6fca303b..e9854c08 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 fb4b28d0..b81ead94 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 77bba0d1..14940642 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 ea3412f0..c8625de1 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 2e791d89..7ed8b852 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 bc13f53c..9764fa9c 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 48c649c9..7d66fa17 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 218dbfbb..3a7833c0 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 ec3d5d9a..c748c636 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 b9dd2a73..eb360e85 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 12afdde4..058d178d 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 aaf41eda..01399cfa 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 4defb35e..b00caf62 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 f6b63372..05fe47bd 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 5eae86c6..bfe3eff2 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 448eda45..ff200149 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 3aed1a6f..9c207e40 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 f10add59..1edf37a8 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 06d84ff8..fa71af90 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 0c04a8aa..5831c042 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 91ee2765..369c499b 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 0be0eabd..b6452738 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 d74a8a6f..2d5f0646 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 663b4735..f4603164 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 541f0cf8..4af720b0 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 de87133b..e5cab510 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 4553d582..e2fb3ca1 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 32fa1125..baf56c5c 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 a0e59323..684e9d6d 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 0a7eef7f..53a77b2a 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 3a63947a..6abd5f41 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 c2d5305c..8eab2721 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 d686b744..5e30df9d 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 1541c1dd..414e6d60 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 9c60d4f0..4a6bda89 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 c718184b..02379984 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 98025c9b..e637ad5f 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 f5410f18..56226c83 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 4b1ba47e..b35c9c04 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 d457a31b..a8fe02b9 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 a8d0bd5d..3da4e03d 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 77474332..dfa45882 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 017b1537..34259f42 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 a94a37b9..738d3a29 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 ffa16d75..371c8cea 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 47ebb7e6..bacbce72 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 dfb9fdbe..72bb632c 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 42319e23..b76532e5 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 b5c47048..9fffe268 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 bb00b6e9..4cdb46d4 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 3073250f..47439410 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 4631524e..e0acab4e 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 c57d3e08..63c61eaf 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 a8c8dbda..c42a6be0 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 df8d0eef..222b6556 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 8b6da2a9..1fc6ad62 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 c8d25b1b..4eb1c544 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 c394de69..57bc2e92 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 ee9bf8ab..9e194602 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 a6fb2188..19c46e23 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 8b0d2437..e3a4d209 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 dbcf5e92..c906287d 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 abb97358..a98f68cc 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 41a23a1c..42d2db5c 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 e7217c4b..b8315851 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 df59d4b3..bde058d0 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 8ee345b7..9b527e75 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 4973c894..584eba7b 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 b1bae281..35845a38 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 d8d3c9db..1b006504 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 de5a8905..4af3af69 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 c6569948..a12d26b2 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 0ac80151..008914ac 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 0a7dfbef..0961b6d6 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 cd529485..710927b8 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 6fd4adec..721f2830 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 835962ff..812f382d 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 bb8f8077..1b71d65d 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 5a738437..2b7ad8f4 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 5421ff4d..cd67d6be 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 22efcd6d..c2b7b953 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 60588d0b..84471002 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 2a6cfcff..a3f670ad 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 66f148fa..1ff56664 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 6aec4f80..c7cdf29a 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 18659d77..02e591db 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 3a989859..9e2d3e63 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 9d8e2aa9..35cd337c 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 e8302f04..e2b6691c 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 c095c337..0c90238f 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 7e8e4c2e..b253c2b5 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 1ebd9218..0382a17e 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 7ac995b9..840029c2 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 dcef9b85..558998b4 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 60780758..e50838b7 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 0ab009ec..38bded50 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 9253a191..14d5787f 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 c8a7c1e9..5873eb52 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 a0f0ef0c..0aa1224e 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 e0811d99..5a8a72d5 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 1dee413d..451ded7f 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 9ee3d93f..b0ae6866 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 04db5456..f2df0e1e 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 6ba23643..24339345 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 ad61b11c..27aaed1b 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 98135a27..dbaba905 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 8382c5d8..4c3ccbbc 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 fbfc86cd..06a09e2d 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 37ef62b5..c974d7ca 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 6a6d1c7f..a081096a 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 219fb03a..739cd47f 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 e2d897c6..0f07b43a 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 5ab196a6..92fdd7bd 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 6da5c94f..15cad733 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 38056cd3..0fe56e1b 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 0c2de0ed..7916d0b4 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 963ec3c9..190855a8 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 c5db61ec..bce091cd 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 c3d64c7b..4895f273 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 241ac88b..0770094e 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 bb5ccfa5..8a86b1ae 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 0d05799d..3c8801e7 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 c160175b..6496c13f 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 c4a0d26b..e555dc7f 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 dfdb9bad..134e658c 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 7f136357..00000000
--- 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 f288ca5e..fdcb51b1 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 c7c03d10..4c28a1c3 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 1de87f5f..ec8c69c4 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 989d6081..83f977aa 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 57fb765f..6faf700c 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 a2c150a0..5f39afec 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
index 229c243d..d1253790 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
index 46339fc4..4ac55807 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
index d33079e0..a383d9a8 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 00000000..04ab4186
--- /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
index b18e51af..20e502c5 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 456e38b6..c902ce01 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 1eeb2396..6147363b 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 f4b57bde..6690cc44 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 73fa16d5..e6eb85cb 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 6fce4045..f68d1208 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 f177626a..3becc6a7 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 36ce3fa3..e9f6a5da 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 b3dde562..368142cc 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 9a6bb64a..4caf125f 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 4d063b54..73367d24 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 45364c36..06bf2ec0 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 b21e5a54..57e5e86a 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 aa0d185e..c807b075 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 29f0cf30..e2d8d7ae 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 eab4e54d..db831ca6 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 315b0a45..affcb30b 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 4bfae61e..433be9a1 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 30f1859c..ad32eef3 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 f240791c..dd5dcfd1 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 63e444b3..b624cfa6 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 27df8c51..f14e98e2 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 b8ce5b10..04e83e40 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 b5788c97..b5879d0b 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 62f95bd5..22f51170 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 937753bd..81325dd6 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 b00a6b21..0e9cd286 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 8ad181df..9962555e 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 ef77a93c..50c5f800 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
index 4dcce719..4dcce719 100644
--- a/kcontrol/kio/kioslave.kcfg
+++ b/kcontrol/kio/tdeioslave.kcfg
diff --git a/kcontrol/kio/kioslave.kcfgc b/kcontrol/kio/tdeioslave.kcfgc
index 7b5ca780..7b5ca780 100644
--- a/kcontrol/kio/kioslave.kcfgc
+++ b/kcontrol/kio/tdeioslave.kcfgc
diff --git a/kcontrol/kio/useragent.desktop b/kcontrol/kio/useragent.desktop
index 56ba4a0a..200f7b88 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 29181f0a..991200dd 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 1a5b81ca..1072a389 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 67b3c4e1..74aeb0ce 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 f8e97e57..0f4d9fff 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 d7b12811..3e99e5f2 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 f9ef6005..2dddd942 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 12bf6159..70c6a1d1 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 3b4bcb32..93fecee0 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 0fdb4a54..e53afe11 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 bb34bc90..4f973bc4 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 640d6a2c..d04d8213 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 d4f072f1..f316f884 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 c2f74550..b09e8380 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 1e1e0c19..6a85a2e1 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 40e858e4..2f952031 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 e113c147..a83ce360 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 c1f610a4..e7c3fd9c 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 e57a8485..8e5afa96 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 0a6521a6..d69333a7 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 a3234dba..f2a15fd6 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 5fe1fe5c..ec4510b1 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 c2f74550..b09e8380 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 2cfdef4e..6c8aac9e 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 0464f39b..e76e6b9b 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 163bdd4f..617197eb 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 b61abd99..8bc8a3e5 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 1bb71d4d..06eb9bee 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 5a582e68..4e719d18 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 e3674378..18baf833 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 c035c185..84ce7dda 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 3342f434..d4e17af5 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 c8f9f760..6be5c197 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 0c1cd3bc..1e1de227 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 01488fad..8179247e 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 e2340471..b657c2e1 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 34150884..e6fbfa34 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 e0477c0e..409f7f31 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 34e2b004..c7e2ea1e 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 3d4e00bd..6001c26d 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 2336d5e1..c387ec6e 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 f712c8c0..7dd2bb19 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 c9a767ca..d0f4f822 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 66987503..035505d9 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 a478f2f8..db6dda98 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 72d9c1fe..613816f8 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 2d71a367..b3d000aa 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 faf6feb9..e516ddd4 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 85d22cb9..762de201 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 4a481704..a7276683 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 26a3ed3c..07e6b69b 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 b1d209a2..c02101d5 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 604b0701..b60a45cf 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 c990ab66..c604cf55 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 dcd38c1d..55d6babd 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 01e189fd..e3a50847 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 6d2c8e67..05ddf92a 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 0d123c1b..6ebfd7da 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 3104b244..41395377 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 4b7eb309..df51d96f 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 3c8bb6db..46dd7077 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 50017800..57d50ee1 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 384ad2f8..878c73dd 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 18920286..fe13ab4a 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 e4433ff8..9ec3a564 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 6b54baac..6f5d52c3 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 86c1c4b6..47a1474e 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 1bf7e601..d550481b 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 1358e0d5..20a39f23 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 bad8ab2f..0897af02 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 05f6c304..c3c8c07e 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 2d6c10fb..f787293a 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 19dfdb2f..c4b32d11 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 825418e4..e57bc1ec 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 8322dd3e..87ee03a3 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 566a8c50..821a445b 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 acc66880..2105c34d 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 c347590e..600aea70 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 11c09baf..38d47fa2 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 6ebee563..9ee5ea88 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 d761af90..24b47ebe 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 26a9569f..88f0927a 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 f540d7e7..5c274d3c 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 b68be1c2..e03b85ef 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 56fbefa6..78077b92 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
index 3027106c..74284287 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
index 6de7edb1..6de7edb1 100644
--- a/kcontrol/style/keramik/keramikconf.h
+++ b/kcontrol/style/keramik/keramitdeconf.h
diff --git a/kcontrol/style/style.desktop b/kcontrol/style/style.desktop
index 8786a770..29d82d31 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 2429b59b..1aa7c5a1 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 204b2e4e..91d116d8 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 e549b38a..0189c9e5 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 8ae739c2..8e0acc93 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 d2fbcf00..daa507a5 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 0c1b9af1..ad8591cb 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 2c3586b0..f8825b7f 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 0b4a5bf3..61dfde6e 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 9d181922..e86689f2 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 c561d7f9..1fc8b077 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 c0b33e5b..70f19988 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 cc91d205..6901d8f6 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 91523de6..cb15c2b9 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 7ddb2b55..376f8d7d 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 fbaa54f3..5f36b77c 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 a087113d..887362b2 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 512b7e55..baafd651 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 6171810a..51c168bd 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 bc763243..e8135caa 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 b9751944..968cdcc3 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 9e59185a..87e2213c 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 f13a7b2f..f69ee219 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 1b4927db..f363ac17 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 e15c6aab..cc7838b4 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 073a69a5..07fbaf5c 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 cf45c71d..e9c805bf 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 b32c7709..a0bf9255 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 6fee5d5c..bbb49598 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 7e421c6d..c7e73db7 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 ad049256..57287014 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 f951765b..c9feecaf 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 08db2eb9..a263b529 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 ff60d0fd..661d644a 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 05c5f4ef..4433ef36 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 e847cf1f..80c2b2cd 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 024425d2..ef683cbc 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 72512213..56ee83e3 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 29dc8bd9..2684403a 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 5f01274a..a3f5fb56 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 401370b2..acac9212 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 6f983ce7..4904e71e 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 08a70a17..79147ae0 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 17fc4add..9f549e54 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 dca215de..6f940a5b 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 36d566e3..6603e7b7 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
index 90dc6932..420aeac4 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
index 129abec0..8dd0f1fc 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 28bcc838..2ec728f6 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 1c18a9ce..a482a2c1 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 9d8ae06b..61359c8a 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 3919080e..fda0028c 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 fe343879..c0bf8b82 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 6145e18c..fa86a124 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 d0f7fb51..6cbbe126 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 4ff7041f..ded6a063 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 b889e3ba..6ea5e467 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 4b6a1c89..3388daba 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 5b02e313..c0149c8e 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 e20ec598..ebaead73 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 9b35c4b0..a59fc534 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 8a406230..a2c0b099 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 f8251647..72eaa432 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 a0f79c27..10591473 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 557ba0cf..e70b40a9 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 0fdfde83..7846c349 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 a0253854..da0de3ae 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 91dcb535..0e8e5875 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 c01d8f3c..74f29c43 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 2767ae61..1b8baac4 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 0efd5ac2..9d084f0d 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 7dc1fbcf..2cf00ced 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 92b6b10c..27085dd4 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 cbda88d7..fea32db4 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 c5dca33b..c5601db1 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
index 3535ebfd..619b0488 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 e48ec835..8386ba60 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 ae03d9c4..4742430d 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 b6277727..6695114c 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 ca4f56c0..7c06828d 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 9821c0da..2863b904 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 670b39b1..25cf3fda 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 3ebb5557..88c0fae6 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 44be2726..3b64ca69 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 518e4597..c1242f17 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 ae2411b0..b0ddb16c 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 bbd6d142..0608bce3 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 2533b58a..31eb7be2 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 2a1de2e1..27227cd2 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 ff56eb99..488a1813 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 5ce1e1d5..bc383b92 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 3132fa01..6120ca87 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 9481ff76..16e071a1 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 27736ed0..fe167789 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 054f6682..c5d6efb5 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 ddfc612e..b27fa3a0 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 13a7dffc..32cbb9fc 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 19e725d8..be0e97f9 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 1d4f26b4..2ed07c99 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 15bde61c..fbb8ec31 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 35dccf14..f9dd63e9 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 9a80c24b..34d73cf8 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 9b89da87..8cf33686 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 89020952..fff5e1ca 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 bf007c93..c43b76db 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 bf511165..c022762c 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 b86dbd7a..1144a8c3 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 a0384df4..1e586e0d 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 c7c852a3..1f3932b0 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 e5fdbe34..b96caf45 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 a22a98c9..f38062e5 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 243e9786..8a605b32 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
index e5658f1c..87ac3538 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
index 771dc687..771dc687 100644
--- a/kicker/applets/launcher/quicklauncher.desktop
+++ b/kicker/applets/launcher/quictdelauncher.desktop
diff --git a/kicker/applets/launcher/quicklauncher.h b/kicker/applets/launcher/quictdelauncher.h
index 2dadf634..c6fe1d2b 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 72652d74..b55aae92 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 527c92b6..f8a1ac63 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 68d0b5d9..4c57b508 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 3fa31756..5f6a2b80 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 bf8234fe..f53381a1 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 e946f81d..f758d280 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 732f5acd..8a9f6809 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 9320c30f..f1009df4 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 eb663814..4e333276 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 68c7c7c0..0e1ca396 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 f0069cae..5f930190 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 428d0bb7..2f5000b7 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 2749c739..3ba76ca5 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 02f13df2..835174f9 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 9f6914f8..c1375230 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 6e1f1150..478ac01e 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 57904db4..1f45e1fb 100644
--- a/kicker/applets/trash/trashbutton.cpp
+++ b/kicker/applets/trash/trashbutton.cpp
@@ -26,7 +26,7 @@