Rename kioslaves

278 files changed, 538 insertions, 538 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fac2b75b..c9139a324 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,9 +87,9 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
 
 ##### options comments ##########################
 
-# WITH_SASL         affects tdeioslaves(kio_ldap kio_smtp kio_pop3)
-# WITH_LDAP         affects tdeioslaves(kio_ldap)
-# WITH_SAMBA        affects tdeioslaves(kio_samba) kcontrol
+# WITH_SASL         affects tdeioslaves(tdeio_ldap tdeio_smtp tdeio_pop3)
+# WITH_LDAP         affects tdeioslaves(tdeio_ldap)
+# WITH_SAMBA        affects tdeioslaves(tdeio_samba) kcontrol
 # WITH_OPENEXR      affects tdeioslaves(thumbnail)
 # WITH_XCOMPOSITE   affects twin kicker(taskmanager) tdm
 # WITH_XCURSOR      affects tdeioslaves(thumbnail), kcontrol(input), kdesktop
diff --git a/kcontrol/CMakeLists.txt b/kcontrol/CMakeLists.txt
index 92a032463..1d4dfcf59 100644
--- a/kcontrol/CMakeLists.txt
+++ b/kcontrol/CMakeLists.txt
@@ -38,7 +38,7 @@ if( BUILD_KCONTROL )
   add_subdirectory( launch )
   add_subdirectory( keys )
   add_subdirectory( tdm )
-  add_subdirectory( kio )
+  add_subdirectory( tdeio )
   add_subdirectory( konq )
   add_subdirectory( style )
   add_subdirectory( konqhtml )
diff --git a/kcontrol/kfontinst/CMakeLists.txt b/kcontrol/kfontinst/CMakeLists.txt
index 0fe56e1b4..e974f2a10 100644
--- a/kcontrol/kfontinst/CMakeLists.txt
+++ b/kcontrol/kfontinst/CMakeLists.txt
@@ -15,6 +15,6 @@ add_subdirectory( viewpart )
 add_subdirectory( kcmfontinst )
 add_subdirectory( tdefile-plugin )
 add_subdirectory( kfontinst )
-add_subdirectory( kio )
+add_subdirectory( tdeio )
 
 install( FILES installfont.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )
diff --git a/kcontrol/kfontinst/kio/CMakeLists.txt b/kcontrol/kfontinst/tdeio/CMakeLists.txt
index 9c6d0ad83..dff38b281 100644
--- a/kcontrol/kfontinst/kio/CMakeLists.txt
+++ b/kcontrol/kfontinst/tdeio/CMakeLists.txt
@@ -30,9 +30,9 @@ install( FILES fonts.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virt
 install( FILES folder.desktop system-folder.desktop package.desktop DESTINATION ${MIME_INSTALL_DIR}/fonts )
 
 
-##### kio_fonts (module) #######################
+##### tdeio_fonts (module) #######################
 
-tde_add_kpart( kio_fonts AUTOMOC
+tde_add_kpart( tdeio_fonts AUTOMOC
   SOURCES KioFonts.cpp
   LINK kxftconfig-static kfontinst-shared tdesu-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/tdeio/KioFonts.cpp
index 4c28a1c33..a443ef546 100644
--- a/kcontrol/kfontinst/kio/KioFonts.cpp
+++ b/kcontrol/kfontinst/tdeio/KioFonts.cpp
@@ -28,8 +28,8 @@
 
 /***************************************************************************
 
-    NOTE: Large sections of this code are copied from kio_file
-          -- can't just inherit from kio_file as kio_file uses "error(...);
+    NOTE: Large sections of this code are copied from tdeio_file
+          -- can't just inherit from tdeio_file as tdeio_file uses "error(...);
              return;" So there is no way to know if an error occured!
 
  ***************************************************************************/
@@ -104,13 +104,13 @@ int kdemain(int argc, char **argv)
 {
     if (argc != 4)
     {
-        fprintf(stderr, "Usage: kio_" KFI_KIO_FONTS_PROTOCOL " protocol domain-socket1 domain-socket2\n");
+        fprintf(stderr, "Usage: tdeio_" KFI_KIO_FONTS_PROTOCOL " protocol domain-socket1 domain-socket2\n");
         exit(-1);
     }
 
     KLocale::setMainCatalogue(KFI_CATALOGUE);
 
-    TDEInstance instance("kio_" KFI_KIO_FONTS_PROTOCOL);
+    TDEInstance instance("tdeio_" KFI_KIO_FONTS_PROTOCOL);
     KFI::CKioFonts slave(argv[2], argv[3]);
 
     slave.dispatchLoop();
diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/tdeio/KioFonts.h
index ec8c69c4e..ec8c69c4e 100644
--- a/kcontrol/kfontinst/kio/KioFonts.h
+++ b/kcontrol/kfontinst/tdeio/KioFonts.h
diff --git a/kcontrol/kfontinst/kio/Makefile.am b/kcontrol/kfontinst/tdeio/Makefile.am
index ca22d13bd..9f59e28b8 100644
--- a/kcontrol/kfontinst/kio/Makefile.am
+++ b/kcontrol/kfontinst/tdeio/Makefile.am
@@ -1,9 +1,9 @@
-kde_module_LTLIBRARIES = kio_fonts.la
-kio_fonts_la_SOURCES = \
+kde_module_LTLIBRARIES = tdeio_fonts.la
+tdeio_fonts_la_SOURCES = \
 KioFonts.cpp
 
-kio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libkfontinst.la
-kio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined
+tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libkfontinst.la
+tdeio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined
 AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
 
 # The kxftconfig stuf really belongs to tdebase/kcontrol/fonts - here only so that can distribute this as an archive.
diff --git a/kcontrol/kfontinst/kio/folder.desktop b/kcontrol/kfontinst/tdeio/folder.desktop
index 848feabe5..848feabe5 100644
--- a/kcontrol/kfontinst/kio/folder.desktop
+++ b/kcontrol/kfontinst/tdeio/folder.desktop
diff --git a/kcontrol/kfontinst/kio/fonts.desktop b/kcontrol/kfontinst/tdeio/fonts.desktop
index ac0f592cf..ac0f592cf 100644
--- a/kcontrol/kfontinst/kio/fonts.desktop
+++ b/kcontrol/kfontinst/tdeio/fonts.desktop
diff --git a/kcontrol/kfontinst/kio/fonts.protocol b/kcontrol/kfontinst/tdeio/fonts.protocol
index 7f54dd0cc..02e5e5f29 100644
--- a/kcontrol/kfontinst/kio/fonts.protocol
+++ b/kcontrol/kfontinst/tdeio/fonts.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_fonts
+exec=tdeio_fonts
 protocol=fonts
 input=none
 output=filesystem
diff --git a/kcontrol/kfontinst/kio/package.desktop b/kcontrol/kfontinst/tdeio/package.desktop
index 2d2e1e4af..2d2e1e4af 100644
--- a/kcontrol/kfontinst/kio/package.desktop
+++ b/kcontrol/kfontinst/tdeio/package.desktop
diff --git a/kcontrol/kfontinst/kio/system-folder.desktop b/kcontrol/kfontinst/tdeio/system-folder.desktop
index d2500c295..d2500c295 100644
--- a/kcontrol/kfontinst/kio/system-folder.desktop
+++ b/kcontrol/kfontinst/tdeio/system-folder.desktop
diff --git a/kcontrol/kio/CMakeLists.txt b/kcontrol/tdeio/CMakeLists.txt
index c807b075e..08e0c9098 100644
--- a/kcontrol/kio/CMakeLists.txt
+++ b/kcontrol/tdeio/CMakeLists.txt
@@ -38,9 +38,9 @@ install( FILES uasprovider.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 install( FILES smb.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden )
 
 
-##### kcm_kio (module) ##########################
+##### kcm_tdeio (module) ##########################
 
-tde_add_kpart( kcm_kio AUTOMOC
+tde_add_kpart( kcm_tdeio AUTOMOC
   SOURCES
     policydlg.cpp kcookiesmain.cpp kcookiespolicies.cpp
       main.cpp smbrodlg.cpp useragentdlg.cpp kproxydlgbase.cpp
diff --git a/kcontrol/kio/Makefile.am b/kcontrol/tdeio/Makefile.am
index e2d8d7ae5..8252bc487 100644
--- a/kcontrol/kio/Makefile.am
+++ b/kcontrol/tdeio/Makefile.am
@@ -5,9 +5,9 @@ AM_LDFLAGS =  $(all_libraries)
 
 METASOURCES = AUTO
 
-kde_module_LTLIBRARIES = kcm_kio.la
+kde_module_LTLIBRARIES = kcm_tdeio.la
 
-kcm_kio_la_SOURCES = policydlg.cpp kcookiesmain.cpp kcookiespolicies.cpp \
+kcm_tdeio_la_SOURCES = policydlg.cpp kcookiesmain.cpp kcookiespolicies.cpp \
       main.cpp smbrodlg.cpp useragentdlg.cpp kproxydlgbase.cpp \
       kmanualproxydlg.cpp kenvvarproxydlg.cpp kproxydlg.cpp \
       kcookiesmanagement.cpp fakeuaprovider.cpp uagentproviderdlg.cpp \
@@ -16,11 +16,11 @@ kcm_kio_la_SOURCES = policydlg.cpp kcookiesmain.cpp kcookiespolicies.cpp \
       policydlg_ui.ui useragentdlg_ui.ui uagentproviderdlg_ui.ui \
       manualproxy_ui.ui envvarproxy_ui.ui cache_ui.ui
 
-kcm_kio_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kcm_kio_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS)
+kcm_tdeio_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kcm_tdeio_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS)
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kcmkio.pot
+	$(XGETTEXT) *.cpp -o $(podir)/kcmtdeio.pot
 
 update_DATA = socks.upd
 updatedir = $(kde_datadir)/tdeconf_update
diff --git a/kcontrol/kio/UA-DESKTOP-FILE-HOWTO b/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO
index a592d4b57..a592d4b57 100644
--- a/kcontrol/kio/UA-DESKTOP-FILE-HOWTO
+++ b/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO
diff --git a/kcontrol/kio/cache.cpp b/kcontrol/tdeio/cache.cpp
index db831ca6f..990770a2a 100644
--- a/kcontrol/kio/cache.cpp
+++ b/kcontrol/tdeio/cache.cpp
@@ -39,7 +39,7 @@
 #include "cache_ui.h"
 
 KCacheConfigDialog::KCacheConfigDialog( TQWidget* parent )
-                   :TDECModule( parent, "kcmkio" )
+                   :TDECModule( parent, "kcmtdeio" )
 {
   TQVBoxLayout* mainLayout = new TQVBoxLayout(this, 0, 0);
   m_dlg = new CacheDlgUI(this);
@@ -118,7 +118,7 @@ void KCacheConfigDialog::configChanged()
 void KCacheConfigDialog::slotClearCache()
 {
   TDEProcess process;
-  process << "kio_http_cache_cleaner" << "--clear-all";
+  process << "tdeio_http_cache_cleaner" << "--clear-all";
   process.start(TDEProcess::DontCare);
   // Cleaning up might take a while. Better detach.
   process.detach();
diff --git a/kcontrol/kio/cache.desktop b/kcontrol/tdeio/cache.desktop
index affcb30bf..7820fc38f 100644
--- a/kcontrol/kio/cache.desktop
+++ b/kcontrol/tdeio/cache.desktop
@@ -5,7 +5,7 @@ Icon=cache
 Exec=tdecmshell cache
 
 
-X-TDE-Library=kio
+X-TDE-Library=tdeio
 X-TDE-FactoryName=cache
 X-TDE-ParentApp=kcontrol
 
diff --git a/kcontrol/kio/cache.h b/kcontrol/tdeio/cache.h
index 03a4d0581..03a4d0581 100644
--- a/kcontrol/kio/cache.h
+++ b/kcontrol/tdeio/cache.h
diff --git a/kcontrol/kio/cache_ui.ui b/kcontrol/tdeio/cache_ui.ui
index ce9aed797..ce9aed797 100644
--- a/kcontrol/kio/cache_ui.ui
+++ b/kcontrol/tdeio/cache_ui.ui
diff --git a/kcontrol/kio/cookies.desktop b/kcontrol/tdeio/cookies.desktop
index 433be9a18..8428daf5a 100644
--- a/kcontrol/kio/cookies.desktop
+++ b/kcontrol/tdeio/cookies.desktop
@@ -5,7 +5,7 @@ Icon=cookie
 Exec=tdecmshell cookies
 
 
-X-TDE-Library=kio
+X-TDE-Library=tdeio
 X-TDE-FactoryName=cookie
 X-TDE-ParentApp=kcontrol
 
diff --git a/kcontrol/kio/envvarproxy_ui.ui b/kcontrol/tdeio/envvarproxy_ui.ui
index 3e1babf90..3e1babf90 100644
--- a/kcontrol/kio/envvarproxy_ui.ui
+++ b/kcontrol/tdeio/envvarproxy_ui.ui
diff --git a/kcontrol/kio/fakeuaprovider.cpp b/kcontrol/tdeio/fakeuaprovider.cpp
index e00c63862..e00c63862 100644
--- a/kcontrol/kio/fakeuaprovider.cpp
+++ b/kcontrol/tdeio/fakeuaprovider.cpp
diff --git a/kcontrol/kio/fakeuaprovider.h b/kcontrol/tdeio/fakeuaprovider.h
index 8aedb639d..8aedb639d 100644
--- a/kcontrol/kio/fakeuaprovider.h
+++ b/kcontrol/tdeio/fakeuaprovider.h
diff --git a/kcontrol/kio/kcookiesmain.cpp b/kcontrol/tdeio/kcookiesmain.cpp
index a17c70603..a904beb08 100644
--- a/kcontrol/kio/kcookiesmain.cpp
+++ b/kcontrol/tdeio/kcookiesmain.cpp
@@ -17,7 +17,7 @@
 #include "kcookiesmanagement.h"
 
 KCookiesMain::KCookiesMain(TQWidget *parent)
-  : TDECModule(parent, "kcmkio")
+  : TDECModule(parent, "kcmtdeio")
 {
     management = 0;
     bool managerOK = true;
@@ -28,7 +28,7 @@ KCookiesMain::KCookiesMain(TQWidget *parent)
     if( !reply.isValid() )
     {
        managerOK = false;
-       kdDebug(7103) << "kcm_kio: KDED could not load KCookiejar!" << endl;
+       kdDebug(7103) << "kcm_tdeio: KDED could not load KCookiejar!" << endl;
        KMessageBox::sorry(0, i18n("Unable to start the cookie handler service.\n"
                              "You will not be able to manage the cookies that "
                              "are stored on your computer."));
diff --git a/kcontrol/kio/kcookiesmain.h b/kcontrol/tdeio/kcookiesmain.h
index 14b202ff4..14b202ff4 100644
--- a/kcontrol/kio/kcookiesmain.h
+++ b/kcontrol/tdeio/kcookiesmain.h
diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/tdeio/kcookiesmanagement.cpp
index c5a98fcc2..172b0f5e0 100644
--- a/kcontrol/kio/kcookiesmanagement.cpp
+++ b/kcontrol/tdeio/kcookiesmanagement.cpp
@@ -100,7 +100,7 @@ TQString CookieListViewItem::text(int f) const
 }
 
 KCookiesManagement::KCookiesManagement(TQWidget *parent)
-                   : TDECModule(parent, "kcmkio")
+                   : TDECModule(parent, "kcmtdeio")
 {
   // Toplevel layout
   TQVBoxLayout* mainLayout = new TQVBoxLayout(this, KDialog::marginHint(),
diff --git a/kcontrol/kio/kcookiesmanagement.h b/kcontrol/tdeio/kcookiesmanagement.h
index 51e31fbee..51e31fbee 100644
--- a/kcontrol/kio/kcookiesmanagement.h
+++ b/kcontrol/tdeio/kcookiesmanagement.h
diff --git a/kcontrol/kio/kcookiesmanagementdlg_ui.ui b/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui
index e4fb65121..e4fb65121 100644
--- a/kcontrol/kio/kcookiesmanagementdlg_ui.ui
+++ b/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui
diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/tdeio/kcookiespolicies.cpp
index ad32eef3e..803edf07f 100644
--- a/kcontrol/kio/kcookiespolicies.cpp
+++ b/kcontrol/tdeio/kcookiespolicies.cpp
@@ -47,7 +47,7 @@
 #include "kcookiespoliciesdlg_ui.h"
 
 KCookiesPolicies::KCookiesPolicies(TQWidget *parent)
-                 :TDECModule(parent, "kcmkio")
+                 :TDECModule(parent, "kcmtdeio")
 {
     TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 0, 0);
 
diff --git a/kcontrol/kio/kcookiespolicies.h b/kcontrol/tdeio/kcookiespolicies.h
index 50ce7a62b..50ce7a62b 100644
--- a/kcontrol/kio/kcookiespolicies.h
+++ b/kcontrol/tdeio/kcookiespolicies.h
diff --git a/kcontrol/kio/kcookiespoliciesdlg_ui.ui b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
index 880b41cba..880b41cba 100644
--- a/kcontrol/kio/kcookiespoliciesdlg_ui.ui
+++ b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
diff --git a/kcontrol/kio/kenvvarproxydlg.cpp b/kcontrol/tdeio/kenvvarproxydlg.cpp
index 22accb4e9..22accb4e9 100644
--- a/kcontrol/kio/kenvvarproxydlg.cpp
+++ b/kcontrol/tdeio/kenvvarproxydlg.cpp
diff --git a/kcontrol/kio/kenvvarproxydlg.h b/kcontrol/tdeio/kenvvarproxydlg.h
index 3ddbc989f..3ddbc989f 100644
--- a/kcontrol/kio/kenvvarproxydlg.h
+++ b/kcontrol/tdeio/kenvvarproxydlg.h
diff --git a/kcontrol/kio/kmanualproxydlg.cpp b/kcontrol/tdeio/kmanualproxydlg.cpp
index dd5dcfd16..dd5dcfd16 100644
--- a/kcontrol/kio/kmanualproxydlg.cpp
+++ b/kcontrol/tdeio/kmanualproxydlg.cpp
diff --git a/kcontrol/kio/kmanualproxydlg.h b/kcontrol/tdeio/kmanualproxydlg.h
index 18cbd6f0a..18cbd6f0a 100644
--- a/kcontrol/kio/kmanualproxydlg.h
+++ b/kcontrol/tdeio/kmanualproxydlg.h
diff --git a/kcontrol/kio/kproxydlg.cpp b/kcontrol/tdeio/kproxydlg.cpp
index f3cb65bff..a165f9576 100644
--- a/kcontrol/kio/kproxydlg.cpp
+++ b/kcontrol/tdeio/kproxydlg.cpp
@@ -41,7 +41,7 @@
 #include "kproxydlg_ui.h"
 
 KProxyOptions::KProxyOptions (TQWidget* parent )
-              :TDECModule (parent, "kcmkio")
+              :TDECModule (parent, "kcmtdeio")
 {
   TQVBoxLayout *layout = new TQVBoxLayout(this);
   
@@ -96,7 +96,7 @@ TQString KProxyOptions::quickHelp() const
 
 
 KProxyDialog::KProxyDialog( TQWidget* parent)
-             :TDECModule( parent, "kcmkio" )
+             :TDECModule( parent, "kcmtdeio" )
 {
   TQVBoxLayout* mainLayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                               KDialog::spacingHint() );
diff --git a/kcontrol/kio/kproxydlg.h b/kcontrol/tdeio/kproxydlg.h
index 30bdb935b..30bdb935b 100644
--- a/kcontrol/kio/kproxydlg.h
+++ b/kcontrol/tdeio/kproxydlg.h
diff --git a/kcontrol/kio/kproxydlg_ui.ui b/kcontrol/tdeio/kproxydlg_ui.ui
index e2edb2d27..e2edb2d27 100644
--- a/kcontrol/kio/kproxydlg_ui.ui
+++ b/kcontrol/tdeio/kproxydlg_ui.ui
diff --git a/kcontrol/kio/kproxydlgbase.cpp b/kcontrol/tdeio/kproxydlgbase.cpp
index e95625713..e95625713 100644
--- a/kcontrol/kio/kproxydlgbase.cpp
+++ b/kcontrol/tdeio/kproxydlgbase.cpp
diff --git a/kcontrol/kio/kproxydlgbase.h b/kcontrol/tdeio/kproxydlgbase.h
index 06ffa8753..06ffa8753 100644
--- a/kcontrol/kio/kproxydlgbase.h
+++ b/kcontrol/tdeio/kproxydlgbase.h
diff --git a/kcontrol/kio/ksaveioconfig.cpp b/kcontrol/tdeio/ksaveioconfig.cpp
index b624cfa69..845184158 100644
--- a/kcontrol/kio/ksaveioconfig.cpp
+++ b/kcontrol/tdeio/ksaveioconfig.cpp
@@ -68,7 +68,7 @@ TDEConfig* KSaveIOConfig::http_config()
      d = new KSaveIOConfigPrivate;
 
   if (!d->http_config)
-     d->http_config = new TDEConfig("kio_httprc", false, false);
+     d->http_config = new TDEConfig("tdeio_httprc", false, false);
 
   return d->http_config;
 }
diff --git a/kcontrol/kio/ksaveioconfig.h b/kcontrol/tdeio/ksaveioconfig.h
index f14e98e22..f14e98e22 100644
--- a/kcontrol/kio/ksaveioconfig.h
+++ b/kcontrol/tdeio/ksaveioconfig.h
diff --git a/kcontrol/kio/lanbrowser.desktop b/kcontrol/tdeio/lanbrowser.desktop
index 04e83e402..87901589e 100644
--- a/kcontrol/kio/lanbrowser.desktop
+++ b/kcontrol/tdeio/lanbrowser.desktop
@@ -4,7 +4,7 @@ Icon=samba
 Exec=tdecmshell lanbrowser
 
 
-X-TDE-Library=kio
+X-TDE-Library=tdeio
 X-TDE-FactoryName=lanbrowser
 
 Name=Local Network Browsing
diff --git a/kcontrol/kio/main.cpp b/kcontrol/tdeio/main.cpp
index 5a19288d9..3fe2fd8a0 100644
--- a/kcontrol/kio/main.cpp
+++ b/kcontrol/tdeio/main.cpp
@@ -1,7 +1,7 @@
 // (c) Torben Weis 1998
 // (c) David Faure 1998
 /*
- * main.cpp for lisa,reslisa,kio_lan and kio_rlan kcm module
+ * main.cpp for lisa,reslisa,tdeio_lan and tdeio_rlan kcm module
  *
  *  Copyright (C) 2000,2001 Alexander Neundorf <[email protected]>
  *
@@ -78,7 +78,7 @@ extern "C"
 }
 
 LanBrowser::LanBrowser(TQWidget *parent)
-:TDECModule(parent,"kcmkio")
+:TDECModule(parent,"kcmtdeio")
 ,layout(this)
 ,tabs(this)
 {
@@ -119,11 +119,11 @@ LanBrowser::LanBrowser(TQWidget *parent)
 //     connect(resLisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
 //   }
 
-   kioLanPage = TDECModuleLoader::loadModule("kcmkiolan",  TDECModuleLoader::None, &tabs);
-   if (kioLanPage)
+   tdeioLanPage = TDECModuleLoader::loadModule("kcmtdeiolan",  TDECModuleLoader::None, &tabs);
+   if (tdeioLanPage)
    {
-     tabs.addTab(kioLanPage,i18n("lan:/ Iosla&ve"));
-     connect(kioLanPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
+     tabs.addTab(tdeioLanPage,i18n("lan:/ Iosla&ve"));
+     connect(tdeioLanPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
    }
 
    setButtons(Apply|Help);
@@ -137,8 +137,8 @@ void LanBrowser::load()
      lisaPage->load();
 //   if (resLisaPage)
 //     resLisaPage->load();
-   if (kioLanPage)
-     kioLanPage->load();
+   if (tdeioLanPage)
+     tdeioLanPage->load();
    emit changed(false);
 }
 
@@ -147,8 +147,8 @@ void LanBrowser::save()
    smbPage->save();
 //   if (resLisaPage)
 //     resLisaPage->save();
-   if (kioLanPage)
-     kioLanPage->save();
+   if (tdeioLanPage)
+     tdeioLanPage->save();
    if (lisaPage)
      lisaPage->save();
    emit changed(false);
diff --git a/kcontrol/kio/main.h b/kcontrol/tdeio/main.h
index ca2e15da0..a208b942a 100644
--- a/kcontrol/kio/main.h
+++ b/kcontrol/tdeio/main.h
@@ -1,5 +1,5 @@
 /*
- * main.cpp for lisa,reslisa,kio_lan and kio_rlan kcm module
+ * main.cpp for lisa,reslisa,tdeio_lan and tdeio_rlan kcm module
  *
  *  Copyright (C) 2000 Alexander Neundorf <[email protected]>
  *
@@ -40,7 +40,7 @@ class LanBrowser:public TDECModule
       TDECModule *smbPage;
       TDECModule *lisaPage;
 //      TDECModule *resLisaPage;
-      TDECModule *kioLanPage;
+      TDECModule *tdeioLanPage;
 };
 #endif
 
diff --git a/kcontrol/kio/manualproxy_ui.ui b/kcontrol/tdeio/manualproxy_ui.ui
index 43567977e..43567977e 100644
--- a/kcontrol/kio/manualproxy_ui.ui
+++ b/kcontrol/tdeio/manualproxy_ui.ui
diff --git a/kcontrol/kio/netpref.cpp b/kcontrol/tdeio/netpref.cpp
index b5879d0bd..ea3de857c 100644
--- a/kcontrol/kio/netpref.cpp
+++ b/kcontrol/tdeio/netpref.cpp
@@ -15,7 +15,7 @@
 #define MAX_TIMEOUT_VALUE  3600
 
 KIOPreferences::KIOPreferences( TQWidget* parent )
-               :TDECModule( parent, "kcmkio" )
+               :TDECModule( parent, "kcmtdeio" )
 {
     TQVBoxLayout* mainLayout = new TQVBoxLayout( this, 0,
                                                KDialog::spacingHint() );
@@ -90,7 +90,7 @@ void KIOPreferences::load()
   sb_serverConnect->setValue( proto.connectTimeout() );
   sb_proxyConnect->setValue( proto.proxyConnectTimeout() );
 
-  TDEConfig config( "kio_ftprc", true, false );
+  TDEConfig config( "tdeio_ftprc", true, false );
   cb_ftpEnablePasv->setChecked( !config.readBoolEntry( "DisablePassiveMode", false ) );
   cb_ftpMarkPartial->setChecked( config.readBoolEntry( "MarkPartial", true ) );
   emit changed( false );
@@ -103,7 +103,7 @@ void KIOPreferences::save()
   KSaveIOConfig::setConnectTimeout( sb_serverConnect->value() );
   KSaveIOConfig::setProxyConnectTimeout( sb_proxyConnect->value() );
 
-  TDEConfig config( "kio_ftprc", false, false );
+  TDEConfig config( "tdeio_ftprc", false, false );
   config.writeEntry( "DisablePassiveMode", !cb_ftpEnablePasv->isChecked() );
   config.writeEntry( "MarkPartial", cb_ftpMarkPartial->isChecked() );
   config.sync();
diff --git a/kcontrol/kio/netpref.desktop b/kcontrol/tdeio/netpref.desktop
index 22f51170b..9b3bcdf10 100644
--- a/kcontrol/kio/netpref.desktop
+++ b/kcontrol/tdeio/netpref.desktop
@@ -198,7 +198,7 @@ Name[zh_TW]=連線偏好設定
 Type=Application
 DocPath=kcontrol/netpref/index.html
 X-TDE-FactoryName=netpref
-X-TDE-Library=kio
+X-TDE-Library=tdeio
 
 X-TDE-ParentApp=kcontrol
 
diff --git a/kcontrol/kio/netpref.h b/kcontrol/tdeio/netpref.h
index 30584a598..30584a598 100644
--- a/kcontrol/kio/netpref.h
+++ b/kcontrol/tdeio/netpref.h
diff --git a/kcontrol/kio/policydlg.cpp b/kcontrol/tdeio/policydlg.cpp
index 44862f51e..44862f51e 100644
--- a/kcontrol/kio/policydlg.cpp
+++ b/kcontrol/tdeio/policydlg.cpp
diff --git a/kcontrol/kio/policydlg.h b/kcontrol/tdeio/policydlg.h
index 2bf7a4c99..2bf7a4c99 100644
--- a/kcontrol/kio/policydlg.h
+++ b/kcontrol/tdeio/policydlg.h
diff --git a/kcontrol/kio/policydlg_ui.ui b/kcontrol/tdeio/policydlg_ui.ui
index 015359829..015359829 100644
--- a/kcontrol/kio/policydlg_ui.ui
+++ b/kcontrol/tdeio/policydlg_ui.ui
diff --git a/kcontrol/kio/proxy.desktop b/kcontrol/tdeio/proxy.desktop
index 81325dd6d..c39a0ec7c 100644
--- a/kcontrol/kio/proxy.desktop
+++ b/kcontrol/tdeio/proxy.desktop
@@ -5,7 +5,7 @@ Icon=proxy
 Exec=tdecmshell proxy
 
 
-X-TDE-Library=kio
+X-TDE-Library=tdeio
 X-TDE-FactoryName=proxy
 X-TDE-ParentApp=kcontrol
 
diff --git a/kcontrol/kio/smb.desktop b/kcontrol/tdeio/smb.desktop
index 0e9cd2863..11b905303 100644
--- a/kcontrol/kio/smb.desktop
+++ b/kcontrol/tdeio/smb.desktop
@@ -5,7 +5,7 @@ Icon=samba
 Exec=tdecmshell smb
 
 
-X-TDE-Library=kio
+X-TDE-Library=tdeio
 X-TDE-FactoryName=smb
 X-TDE-ParentApp=kcontrol
 
diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/tdeio/smbrodlg.cpp
index 9962555e7..617c27b98 100644
--- a/kcontrol/kio/smbrodlg.cpp
+++ b/kcontrol/tdeio/smbrodlg.cpp
@@ -36,7 +36,7 @@
 
 
 SMBRoOptions::SMBRoOptions(TQWidget *parent)
-  : TDECModule(parent, "kcmkio")
+  : TDECModule(parent, "kcmtdeio")
 {
    TQGridLayout *layout = new TQGridLayout(this,2,-1,KDialog::marginHint(),
          KDialog::spacingHint());
diff --git a/kcontrol/kio/smbrodlg.h b/kcontrol/tdeio/smbrodlg.h
index 1c9d0347d..1c9d0347d 100644
--- a/kcontrol/kio/smbrodlg.h
+++ b/kcontrol/tdeio/smbrodlg.h
diff --git a/kcontrol/kio/socks.cpp b/kcontrol/tdeio/socks.cpp
index 50c5f8003..a27f0c2df 100644
--- a/kcontrol/kio/socks.cpp
+++ b/kcontrol/tdeio/socks.cpp
@@ -35,7 +35,7 @@
 #include <kaboutdata.h>
 
 KSocksConfig::KSocksConfig(TQWidget *parent)
-  : TDECModule(parent, "kcmkio")
+  : TDECModule(parent, "kcmtdeio")
 {
 
   TDEAboutData *about =
diff --git a/kcontrol/kio/socks.h b/kcontrol/tdeio/socks.h
index f5c5cb2a4..f5c5cb2a4 100644
--- a/kcontrol/kio/socks.h
+++ b/kcontrol/tdeio/socks.h
diff --git a/kcontrol/kio/socks.upd b/kcontrol/tdeio/socks.upd
index 3b8bfd7f9..3b8bfd7f9 100644
--- a/kcontrol/kio/socks.upd
+++ b/kcontrol/tdeio/socks.upd
diff --git a/kcontrol/kio/socksbase.ui b/kcontrol/tdeio/socksbase.ui
index bfda8e776..bfda8e776 100644
--- a/kcontrol/kio/socksbase.ui
+++ b/kcontrol/tdeio/socksbase.ui
diff --git a/kcontrol/kio/kio_ftprc.kcfg b/kcontrol/tdeio/tdeio_ftprc.kcfg
index 610b2e68a..12482d15b 100644
--- a/kcontrol/kio/kio_ftprc.kcfg
+++ b/kcontrol/tdeio/tdeio_ftprc.kcfg
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="kio_ftprc" />
+ <kcfgfile name="tdeio_ftprc" />
  <group name="DesktopIcons" >
  
    <entry name="DisablePassiveMode" type="Bool">
diff --git a/kcontrol/kio/kio_ftprc.kcfgc b/kcontrol/tdeio/tdeio_ftprc.kcfgc
index 7b5ca780f..756df0d9f 100644
--- a/kcontrol/kio/kio_ftprc.kcfgc
+++ b/kcontrol/tdeio/tdeio_ftprc.kcfgc
@@ -1,4 +1,4 @@
-File=kio_ftprc.kcfg
+File=tdeio_ftprc.kcfg
 ClassName=KioFtp
 Singleton=true
 Mutators=true
diff --git a/kcontrol/kio/tdeioslave.kcfg b/kcontrol/tdeio/tdeioslave.kcfg
index 4dcce7191..05b08d267 100644
--- a/kcontrol/kio/tdeioslave.kcfg
+++ b/kcontrol/tdeio/tdeioslave.kcfg
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="kio_ftprc" />
+ <kcfgfile name="tdeio_ftprc" />
  <group name="General">
    <entry name="PersistentProxyConnection" type="Bool">
      <default>false</default>
diff --git a/kcontrol/kio/tdeioslave.kcfgc b/kcontrol/tdeio/tdeioslave.kcfgc
index 7b5ca780f..756df0d9f 100644
--- a/kcontrol/kio/tdeioslave.kcfgc
+++ b/kcontrol/tdeio/tdeioslave.kcfgc
@@ -1,4 +1,4 @@
-File=kio_ftprc.kcfg
+File=tdeio_ftprc.kcfg
 ClassName=KioFtp
 Singleton=true
 Mutators=true
diff --git a/kcontrol/kio/uagentproviderdlg.cpp b/kcontrol/tdeio/uagentproviderdlg.cpp
index 9e945948d..9e945948d 100644
--- a/kcontrol/kio/uagentproviderdlg.cpp
+++ b/kcontrol/tdeio/uagentproviderdlg.cpp
diff --git a/kcontrol/kio/uagentproviderdlg.h b/kcontrol/tdeio/uagentproviderdlg.h
index 3e60edb54..3e60edb54 100644
--- a/kcontrol/kio/uagentproviderdlg.h
+++ b/kcontrol/tdeio/uagentproviderdlg.h
diff --git a/kcontrol/kio/uagentproviderdlg_ui.ui b/kcontrol/tdeio/uagentproviderdlg_ui.ui
index 2082e3db4..2082e3db4 100644
--- a/kcontrol/kio/uagentproviderdlg_ui.ui
+++ b/kcontrol/tdeio/uagentproviderdlg_ui.ui
diff --git a/kcontrol/kio/uasprovider.desktop b/kcontrol/tdeio/uasprovider.desktop
index f6f6feb24..f6f6feb24 100644
--- a/kcontrol/kio/uasprovider.desktop
+++ b/kcontrol/tdeio/uasprovider.desktop
diff --git a/kcontrol/kio/uasproviders/CMakeLists.txt b/kcontrol/tdeio/uasproviders/CMakeLists.txt
index 95f1823c8..95f1823c8 100644
--- a/kcontrol/kio/uasproviders/CMakeLists.txt
+++ b/kcontrol/tdeio/uasproviders/CMakeLists.txt
diff --git a/kcontrol/kio/uasproviders/Makefile.am b/kcontrol/tdeio/uasproviders/Makefile.am
index 868ccbd16..868ccbd16 100644
--- a/kcontrol/kio/uasproviders/Makefile.am
+++ b/kcontrol/tdeio/uasproviders/Makefile.am
diff --git a/kcontrol/kio/uasproviders/ie401onwinnt4.desktop b/kcontrol/tdeio/uasproviders/ie401onwinnt4.desktop
index 1aacae9a3..1aacae9a3 100644
--- a/kcontrol/kio/uasproviders/ie401onwinnt4.desktop
+++ b/kcontrol/tdeio/uasproviders/ie401onwinnt4.desktop
diff --git a/kcontrol/kio/uasproviders/ie45onwinnt5.desktop b/kcontrol/tdeio/uasproviders/ie45onwinnt5.desktop
index 94fa23150..94fa23150 100644
--- a/kcontrol/kio/uasproviders/ie45onwinnt5.desktop
+++ b/kcontrol/tdeio/uasproviders/ie45onwinnt5.desktop
diff --git a/kcontrol/kio/uasproviders/ie501onwinnt5.desktop b/kcontrol/tdeio/uasproviders/ie501onwinnt5.desktop
index a32a4a606..a32a4a606 100644
--- a/kcontrol/kio/uasproviders/ie501onwinnt5.desktop
+++ b/kcontrol/tdeio/uasproviders/ie501onwinnt5.desktop
diff --git a/kcontrol/kio/uasproviders/ie50onppc.desktop b/kcontrol/tdeio/uasproviders/ie50onppc.desktop
index 2f14da7b1..2f14da7b1 100644
--- a/kcontrol/kio/uasproviders/ie50onppc.desktop
+++ b/kcontrol/tdeio/uasproviders/ie50onppc.desktop
diff --git a/kcontrol/kio/uasproviders/ie55onwin98.desktop b/kcontrol/tdeio/uasproviders/ie55onwin98.desktop
index f5c7046f0..f5c7046f0 100644
--- a/kcontrol/kio/uasproviders/ie55onwin98.desktop
+++ b/kcontrol/tdeio/uasproviders/ie55onwin98.desktop
diff --git a/kcontrol/kio/uasproviders/ie55onwinnt5.desktop b/kcontrol/tdeio/uasproviders/ie55onwinnt5.desktop
index 89740ed21..89740ed21 100644
--- a/kcontrol/kio/uasproviders/ie55onwinnt5.desktop
+++ b/kcontrol/tdeio/uasproviders/ie55onwinnt5.desktop
diff --git a/kcontrol/kio/uasproviders/ie60oncurrent.desktop b/kcontrol/tdeio/uasproviders/ie60oncurrent.desktop
index 09abff044..09abff044 100644
--- a/kcontrol/kio/uasproviders/ie60oncurrent.desktop
+++ b/kcontrol/tdeio/uasproviders/ie60oncurrent.desktop
diff --git a/kcontrol/kio/uasproviders/ie60onwinnt51.desktop b/kcontrol/tdeio/uasproviders/ie60onwinnt51.desktop
index 133643167..133643167 100644
--- a/kcontrol/kio/uasproviders/ie60onwinnt51.desktop
+++ b/kcontrol/tdeio/uasproviders/ie60onwinnt51.desktop
diff --git a/kcontrol/kio/uasproviders/lynxoncurrent.desktop b/kcontrol/tdeio/uasproviders/lynxoncurrent.desktop
index 78d6855fe..78d6855fe 100644
--- a/kcontrol/kio/uasproviders/lynxoncurrent.desktop
+++ b/kcontrol/tdeio/uasproviders/lynxoncurrent.desktop
diff --git a/kcontrol/kio/uasproviders/ns71oncurrent.desktop b/kcontrol/tdeio/uasproviders/ns71oncurrent.desktop
index 6246257d9..6246257d9 100644
--- a/kcontrol/kio/uasproviders/ns71oncurrent.desktop
+++ b/kcontrol/tdeio/uasproviders/ns71oncurrent.desktop
diff --git a/kcontrol/kio/uasproviders/ns71onwinnt51.desktop b/kcontrol/tdeio/uasproviders/ns71onwinnt51.desktop
index 7486f17a2..7486f17a2 100644
--- a/kcontrol/kio/uasproviders/ns71onwinnt51.desktop
+++ b/kcontrol/tdeio/uasproviders/ns71onwinnt51.desktop
diff --git a/kcontrol/kio/uasproviders/op75oncurrent.desktop b/kcontrol/tdeio/uasproviders/op75oncurrent.desktop
index 64c0c234b..64c0c234b 100644
--- a/kcontrol/kio/uasproviders/op75oncurrent.desktop
+++ b/kcontrol/tdeio/uasproviders/op75oncurrent.desktop
diff --git a/kcontrol/kio/uasproviders/w3moncurrent.desktop b/kcontrol/tdeio/uasproviders/w3moncurrent.desktop
index 1e71a50f8..1e71a50f8 100644
--- a/kcontrol/kio/uasproviders/w3moncurrent.desktop
+++ b/kcontrol/tdeio/uasproviders/w3moncurrent.desktop
diff --git a/kcontrol/kio/uasproviders/wgetoncurrent.desktop b/kcontrol/tdeio/uasproviders/wgetoncurrent.desktop
index 17e07ba55..17e07ba55 100644
--- a/kcontrol/kio/uasproviders/wgetoncurrent.desktop
+++ b/kcontrol/tdeio/uasproviders/wgetoncurrent.desktop
diff --git a/kcontrol/kio/uninstall.desktop b/kcontrol/tdeio/uninstall.desktop
index e1e3e1732..e1e3e1732 100644
--- a/kcontrol/kio/uninstall.desktop
+++ b/kcontrol/tdeio/uninstall.desktop
diff --git a/kcontrol/kio/useragent.desktop b/kcontrol/tdeio/useragent.desktop
index 200f7b883..5209c0d5f 100644
--- a/kcontrol/kio/useragent.desktop
+++ b/kcontrol/tdeio/useragent.desktop
@@ -5,7 +5,7 @@ Exec=tdecmshell useragent
 DocPath=kcontrol/useragent/index.html
 
 
-X-TDE-Library=kio
+X-TDE-Library=tdeio
 X-TDE-FactoryName=useragent
 X-TDE-ParentApp=kcontrol
 
diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/tdeio/useragentdlg.cpp
index 991200dd0..67f13bf8b 100644
--- a/kcontrol/kio/useragentdlg.cpp
+++ b/kcontrol/tdeio/useragentdlg.cpp
@@ -47,7 +47,7 @@
 #include "useragentdlg_ui.h"
 
 UserAgentDlg::UserAgentDlg( TQWidget * parent )
-             :TDECModule( parent, "kcmkio" )
+             :TDECModule( parent, "kcmtdeio" )
 {
   TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
@@ -87,7 +87,7 @@ void UserAgentDlg::load()
   d_itemsSelected = 0;
   dlg->lvDomainPolicyList->clear();
 
-  m_config = new TDEConfig("kio_httprc", false, false);
+  m_config = new TDEConfig("tdeio_httprc", false, false);
   m_provider = new FakeUASProvider();
 
   TQStringList list = m_config->groupList();
@@ -186,7 +186,7 @@ void UserAgentDlg::save()
   if (!deleteList.isEmpty())
   {
      // Remove entries from local file.
-     KSimpleConfig cfg("kio_httprc");
+     KSimpleConfig cfg("tdeio_httprc");
      for ( TQStringList::Iterator it = deleteList.begin();
            it != deleteList.end(); ++it )
      {
diff --git a/kcontrol/kio/useragentdlg.h b/kcontrol/tdeio/useragentdlg.h
index 746a8524a..746a8524a 100644
--- a/kcontrol/kio/useragentdlg.h
+++ b/kcontrol/tdeio/useragentdlg.h
diff --git a/kcontrol/kio/useragentdlg_ui.ui b/kcontrol/tdeio/useragentdlg_ui.ui
index 1e5d55c4e..1e5d55c4e 100644
--- a/kcontrol/kio/useragentdlg_ui.ui
+++ b/kcontrol/tdeio/useragentdlg_ui.ui
diff --git a/tdeioslave/DEBUG.howto b/tdeioslave/DEBUG.howto
index 6218f2fba..813df102d 100644
--- a/tdeioslave/DEBUG.howto
+++ b/tdeioslave/DEBUG.howto
@@ -74,7 +74,7 @@ $TDEDIR/share/config/kdebugrc.
        InfoOutput=0
        InfoFilename=/tmp/http 
 
-This redirects all debug info for areas 7103 and 7113 (as used by kio_http) 
+This redirects all debug info for areas 7103 and 7113 (as used by tdeio_http) 
 to the file /tmp/http.
 
 To get debug information from the SMB slave you can add the following to
diff --git a/tdeioslave/DESIGN b/tdeioslave/DESIGN
index 9b62f3c34..01a0da1f6 100644
--- a/tdeioslave/DESIGN
+++ b/tdeioslave/DESIGN
@@ -10,7 +10,7 @@ Well, that's nice.  How do they work?
 
 To understand it, you'll need two ice cubes, a pair of handcuffs, and a
 ferret.  Some Crisco (or other shortening) is optional.  Well, that aside,
-this document focuses on the business end of the whole kio library.  The
+this document focuses on the business end of the whole tdeio library.  The
 ioslave. See the documentation of the SlaveBase class for the methods
 you need to reimplement, and see 
 http://developer.kde.org/documentation/design/kde/ioslaves/ for more docu
diff --git a/tdeioslave/about/CMakeLists.txt b/tdeioslave/about/CMakeLists.txt
index aaa2a5aff..ef7073ed1 100644
--- a/tdeioslave/about/CMakeLists.txt
+++ b/tdeioslave/about/CMakeLists.txt
@@ -25,12 +25,12 @@ link_directories(
 install( FILES about.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_about (module) ########################
+##### tdeio_about (module) ########################
 
-set( target kio_about )
+set( target tdeio_about )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES kio_about.cpp
+  SOURCES tdeio_about.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/about/Makefile.am b/tdeioslave/about/Makefile.am
index 18bffeeec..7ac082ee3 100644
--- a/tdeioslave/about/Makefile.am
+++ b/tdeioslave/about/Makefile.am
@@ -5,12 +5,12 @@ AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_about.la
+kde_module_LTLIBRARIES = tdeio_about.la
 
-kio_about_la_SOURCES = kio_about.cpp
-kio_about_la_LIBADD = $(LIB_KSYCOCA)
-kio_about_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-noinst_HEADERS = kio_about.h
+tdeio_about_la_SOURCES = tdeio_about.cpp
+tdeio_about_la_LIBADD = $(LIB_KSYCOCA)
+tdeio_about_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+noinst_HEADERS = tdeio_about.h
 
 kdelnk_DATA = about.protocol
 kdelnkdir = $(kde_servicesdir)
diff --git a/tdeioslave/about/about.protocol b/tdeioslave/about/about.protocol
index bc685bfe5..ae6172561 100644
--- a/tdeioslave/about/about.protocol
+++ b/tdeioslave/about/about.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_about
+exec=tdeio_about
 protocol=about
 input=none
 output=filesystem
diff --git a/tdeioslave/about/kio_about.cpp b/tdeioslave/about/tdeio_about.cpp
index 29fba8e4a..f8ac109f3 100644
--- a/tdeioslave/about/kio_about.cpp
+++ b/tdeioslave/about/tdeio_about.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kio_about.h"
+#include "tdeio_about.h"
 
 #include <stdlib.h>
 #include <tqstring.h>
@@ -59,11 +59,11 @@ extern "C"
 {
     int KDE_EXPORT kdemain( int argc, char **argv ) {
 
-        TDEInstance instance("kio_about");
+        TDEInstance instance("tdeio_about");
 
         if (argc != 4)
         {
-            fprintf(stderr, "Usage: kio_about protocol domain-socket1 domain-socket2\n");
+            fprintf(stderr, "Usage: tdeio_about protocol domain-socket1 domain-socket2\n");
             exit(-1);
         }
 
diff --git a/tdeioslave/about/kio_about.h b/tdeioslave/about/tdeio_about.h
index eacaf09dc..9d8eedc79 100644
--- a/tdeioslave/about/kio_about.h
+++ b/tdeioslave/about/tdeio_about.h
@@ -17,8 +17,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef __kio_about_h__
-#define __kio_about_h__
+#ifndef __tdeio_about_h__
+#define __tdeio_about_h__
 
 #include <tqcstring.h>
 
diff --git a/tdeioslave/cgi/CMakeLists.txt b/tdeioslave/cgi/CMakeLists.txt
index 87923f86c..130aa9a1e 100644
--- a/tdeioslave/cgi/CMakeLists.txt
+++ b/tdeioslave/cgi/CMakeLists.txt
@@ -28,9 +28,9 @@ link_directories(
 install( FILES cgi.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_cgi (module) ##########################
+##### tdeio_cgi (module) ##########################
 
-set( target kio_cgi )
+set( target tdeio_cgi )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES cgi.cpp
diff --git a/tdeioslave/cgi/Makefile.am b/tdeioslave/cgi/Makefile.am
index cc71753e9..b996757cf 100644
--- a/tdeioslave/cgi/Makefile.am
+++ b/tdeioslave/cgi/Makefile.am
@@ -2,11 +2,11 @@ SUBDIRS = kcmcgi
 
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = kio_cgi.la
+kde_module_LTLIBRARIES = tdeio_cgi.la
 
-kio_cgi_la_SOURCES = cgi.cpp
-kio_cgi_la_LIBADD = $(LIB_KIO)
-kio_cgi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_cgi_la_SOURCES = cgi.cpp
+tdeio_cgi_la_LIBADD = $(LIB_KIO)
+tdeio_cgi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = cgi.h
 
diff --git a/tdeioslave/cgi/cgi.cpp b/tdeioslave/cgi/cgi.cpp
index 317b1610a..e0e03e454 100644
--- a/tdeioslave/cgi/cgi.cpp
+++ b/tdeioslave/cgi/cgi.cpp
@@ -257,13 +257,13 @@ extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ); }
 
 int kdemain( int argc, char **argv )
 {
-  TDEInstance instance( "kio_cgi" );
+  TDEInstance instance( "tdeio_cgi" );
 
-  kdDebug(7124) << "kio_cgi starting " << getpid() << endl;
+  kdDebug(7124) << "tdeio_cgi starting " << getpid() << endl;
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_cgi protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_cgi protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
 
diff --git a/tdeioslave/cgi/cgi.protocol b/tdeioslave/cgi/cgi.protocol
index eb6c45217..24910f731 100644
--- a/tdeioslave/cgi/cgi.protocol
+++ b/tdeioslave/cgi/cgi.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_cgi
+exec=tdeio_cgi
 protocol=cgi
 input=none
 output=filesystem
diff --git a/tdeioslave/configure.in.in b/tdeioslave/configure.in.in
index 331a300b8..27632c31a 100644
--- a/tdeioslave/configure.in.in
+++ b/tdeioslave/configure.in.in
@@ -3,7 +3,7 @@ KDE_CHECK_SSL
 sasl2_header="no"
 SASL2_LIBS=""
 
-KDE_CHECK_HEADERS(sasl.h)dnl SASL1 header is enough for kio_ldap
+KDE_CHECK_HEADERS(sasl.h)dnl SASL1 header is enough for tdeio_ldap
 KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
 if test "$sasl2_header" = "yes" ; then
   KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2")
diff --git a/tdeioslave/filter/CMakeLists.txt b/tdeioslave/filter/CMakeLists.txt
index 4b0c3d36c..587a89fb6 100644
--- a/tdeioslave/filter/CMakeLists.txt
+++ b/tdeioslave/filter/CMakeLists.txt
@@ -25,9 +25,9 @@ link_directories(
 install( FILES gzip.protocol bzip.protocol bzip2.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_filter (module) #######################
+##### tdeio_filter (module) #######################
 
-set( target kio_filter )
+set( target tdeio_filter )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES filter.cc
diff --git a/tdeioslave/filter/Makefile.am b/tdeioslave/filter/Makefile.am
index f315064c8..d4e58d7f8 100644
--- a/tdeioslave/filter/Makefile.am
+++ b/tdeioslave/filter/Makefile.am
@@ -2,11 +2,11 @@ KDE_CPPFLAGS = -DQT_NO_CAST_ASCII
 
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = kio_filter.la
+kde_module_LTLIBRARIES = tdeio_filter.la
 
-kio_filter_la_SOURCES = filter.cc
-kio_filter_la_LIBADD = $(LIB_KSYCOCA)
-kio_filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_filter_la_SOURCES = filter.cc
+tdeio_filter_la_LIBADD = $(LIB_KSYCOCA)
+tdeio_filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 noinst_HEADERS = filter.h
 
 METASOURCES = AUTO
diff --git a/tdeioslave/filter/bzip.protocol b/tdeioslave/filter/bzip.protocol
index 4d729f5ea..46d74ca33 100644
--- a/tdeioslave/filter/bzip.protocol
+++ b/tdeioslave/filter/bzip.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_filter
+exec=tdeio_filter
 protocol=bzip
 mimetype=application/x-bzip
 input=stream
diff --git a/tdeioslave/filter/bzip2.protocol b/tdeioslave/filter/bzip2.protocol
index c2b8d2c51..7d0d66fcf 100644
--- a/tdeioslave/filter/bzip2.protocol
+++ b/tdeioslave/filter/bzip2.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_filter
+exec=tdeio_filter
 protocol=bzip2
 mimetype=application/x-bzip2
 input=stream
diff --git a/tdeioslave/filter/filter.cc b/tdeioslave/filter/filter.cc
index 793921c6c..a429103e1 100644
--- a/tdeioslave/filter/filter.cc
+++ b/tdeioslave/filter/filter.cc
@@ -36,13 +36,13 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char ** argv)
 {
-  TDEInstance instance( "kio_filter" );
+  TDEInstance instance( "tdeio_filter" );
 
   kdDebug(7110) << "Starting " << getpid() << endl;
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_filter protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_filter protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
 
diff --git a/tdeioslave/filter/gzip.protocol b/tdeioslave/filter/gzip.protocol
index f0f57911c..01aee5b5d 100644
--- a/tdeioslave/filter/gzip.protocol
+++ b/tdeioslave/filter/gzip.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_filter
+exec=tdeio_filter
 protocol=gzip
 mimetype=application/gzip
 input=stream
diff --git a/tdeioslave/finger/CMakeLists.txt b/tdeioslave/finger/CMakeLists.txt
index 096b483d0..65088aaf4 100644
--- a/tdeioslave/finger/CMakeLists.txt
+++ b/tdeioslave/finger/CMakeLists.txt
@@ -23,15 +23,15 @@ link_directories(
 ##### other data ################################
 
 install( FILES finger.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kio_finger.pl kio_finger.css DESTINATION ${DATA_INSTALL_DIR}/tdeio_finger )
+install( FILES tdeio_finger.pl tdeio_finger.css DESTINATION ${DATA_INSTALL_DIR}/tdeio_finger )
 
 
-##### kio_finger (module) #######################
+##### tdeio_finger (module) #######################
 
-set( target kio_finger )
+set( target tdeio_finger )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES kio_finger.cpp
+  SOURCES tdeio_finger.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/finger/Makefile.am b/tdeioslave/finger/Makefile.am
index 9c2792df3..46e0ff69c 100644
--- a/tdeioslave/finger/Makefile.am
+++ b/tdeioslave/finger/Makefile.am
@@ -1,4 +1,4 @@
-## Makfile.am for kio_finger
+## Makfile.am for tdeio_finger
 ## Edit from Makefile.am of tdebase/tdeioslave/man
 
 INCLUDES= $(all_includes)
@@ -6,20 +6,20 @@ AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_finger.la
+kde_module_LTLIBRARIES = tdeio_finger.la
 
-kio_finger_la_SOURCES = kio_finger.cpp 
-kio_finger_la_LIBADD = -lkio
-kio_finger_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_finger_la_SOURCES = tdeio_finger.cpp 
+tdeio_finger_la_LIBADD = -ltdeio
+tdeio_finger_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
-noinst_HEADERS = kio_finger.h 
+noinst_HEADERS = tdeio_finger.h 
 
 kdelnk_DATA = finger.protocol
 kdelnkdir = $(kde_servicesdir)
 
-kio_finger_data_DATA = kio_finger.pl kio_finger.css
-kio_finger_datadir = $(kde_datadir)/tdeio_finger
-EXTRA_DIST=$(kio_finger_data_DATA)   
+tdeio_finger_data_DATA = tdeio_finger.pl tdeio_finger.css
+tdeio_finger_datadir = $(kde_datadir)/tdeio_finger
+EXTRA_DIST=$(tdeio_finger_data_DATA)   
 
 METASOURCES = AUTO
 
diff --git a/tdeioslave/finger/finger.protocol b/tdeioslave/finger/finger.protocol
index 8e2cdc80f..59bfec017 100644
--- a/tdeioslave/finger/finger.protocol
+++ b/tdeioslave/finger/finger.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_finger
+exec=tdeio_finger
 protocol=finger
 input=none
 output=stream
diff --git a/tdeioslave/finger/kio_finger.cpp b/tdeioslave/finger/tdeio_finger.cpp
index b223e1024..ba0294918 100644
--- a/tdeioslave/finger/kio_finger.cpp
+++ b/tdeioslave/finger/tdeio_finger.cpp
@@ -1,6 +1,6 @@
 
 /***************************************************************************
-                          kio_finger.cpp  -  description
+                          tdeio_finger.cpp  -  description
                              -------------------
     begin                : Sun Aug 12 2000
     copyright            : (C) 2000 by Andreas Schlapbach
@@ -34,7 +34,7 @@
 #include <klocale.h>
 #include <kurl.h>
 
-#include "kio_finger.h"
+#include "tdeio_finger.h"
 
 
 using namespace TDEIO;
@@ -45,20 +45,20 @@ extern "C"
 {
   KDE_EXPORT int kdemain( int argc, char **argv )
   {
-    TDEInstance instance( "kio_finger" );
+    TDEInstance instance( "tdeio_finger" );
 
-    //kdDebug() << "*** Starting kio_finger " << getpid() << endl;
+    //kdDebug() << "*** Starting tdeio_finger " << getpid() << endl;
 
     if (argc != 4)
       {
-	fprintf(stderr, "Usage: kio_finger protocol domain-socket1 domain-socket2\n");
+	fprintf(stderr, "Usage: tdeio_finger protocol domain-socket1 domain-socket2\n");
 	exit(-1);
       }
 
     FingerProtocol slave(argv[2], argv[3]);
     slave.dispatchLoop();
 
-    //kdDebug() << "*** kio_finger Done" << endl;
+    //kdDebug() << "*** tdeio_finger Done" << endl;
     return 0;
   }
 }
@@ -95,7 +95,7 @@ FingerProtocol::~FingerProtocol()
 
 void FingerProtocol::get(const KURL& url )
 {
-  //kdDebug() << "kio_finger::get(const KURL& url)" << endl ;
+  //kdDebug() << "tdeio_finger::get(const KURL& url)" << endl ;
 
   this->parseCommandLine(url);
 
@@ -198,28 +198,28 @@ void FingerProtocol::getProgramPath()
       //kdDebug() << "Finger command found:" << *myFingerPath << endl;
     }
 
-  myFingerPerlScript = new TQString(locate("data","kio_finger/tdeio_finger.pl"));
+  myFingerPerlScript = new TQString(locate("data","tdeio_finger/tdeio_finger.pl"));
   if (myFingerPerlScript->isEmpty())
     {
-      //kdDebug() << "kio_finger.pl script not found" << endl;
+      //kdDebug() << "tdeio_finger.pl script not found" << endl;
       this->error(ERR_CANNOT_LAUNCH_PROCESS,
-		  i18n("kio_finger Perl script not found."));
+		  i18n("tdeio_finger Perl script not found."));
       exit();
     }
   else
     {
-      //kdDebug() << "kio_finger perl script found: " << *myFingerPerlScript << endl;
+      //kdDebug() << "tdeio_finger perl script found: " << *myFingerPerlScript << endl;
     }
 
-  myFingerCSSFile = new TQString(locate("data","kio_finger/tdeio_finger.css"));
+  myFingerCSSFile = new TQString(locate("data","tdeio_finger/tdeio_finger.css"));
   if (myFingerCSSFile->isEmpty())
     {
-      //kdDebug() << "kio_finger.css file not found" << endl;
-      this->warning(i18n("kio_finger CSS script not found. Output will look ugly."));
+      //kdDebug() << "tdeio_finger.css file not found" << endl;
+      this->warning(i18n("tdeio_finger CSS script not found. Output will look ugly."));
     }
   else
     {
-      //kdDebug() << "kio_finger CSS file found: " << *myFingerCSSFile << endl;
+      //kdDebug() << "tdeio_finger CSS file found: " << *myFingerCSSFile << endl;
     }
 }
 
@@ -261,6 +261,6 @@ void FingerProtocol::parseCommandLine(const KURL& url)
 }
 
 /* ---------------------------------------------------------------------------------- */
-#include "kio_finger.moc"
+#include "tdeio_finger.moc"
 /* ---------------------------------------------------------------------------------- */
 
diff --git a/tdeioslave/finger/kio_finger.css b/tdeioslave/finger/tdeio_finger.css
index 06deb81aa..06deb81aa 100644
--- a/tdeioslave/finger/kio_finger.css
+++ b/tdeioslave/finger/tdeio_finger.css
diff --git a/tdeioslave/finger/kio_finger.h b/tdeioslave/finger/tdeio_finger.h
index eac8ad291..3d083d2ed 100644
--- a/tdeioslave/finger/kio_finger.h
+++ b/tdeioslave/finger/tdeio_finger.h
@@ -1,6 +1,6 @@
 
 /***************************************************************************
-                          kio_finger.h  -  description
+                          tdeio_finger.h  -  description
                              -------------------
     begin                : Sun Aug 12 2000
     copyright            : (C) 2000 by Andreas Schlapbach
@@ -17,8 +17,8 @@
  ***************************************************************************/
 
 
-#ifndef __kio_finger_h__
-#define __kio_finger_h__
+#ifndef __tdeio_finger_h__
+#define __tdeio_finger_h__
 
 #include <tqstring.h>
 #include <tqcstring.h>
diff --git a/tdeioslave/finger/kio_finger.pl b/tdeioslave/finger/tdeio_finger.pl
index 8965ea523..8965ea523 100644
--- a/tdeioslave/finger/kio_finger.pl
+++ b/tdeioslave/finger/tdeio_finger.pl
diff --git a/tdeioslave/fish/CMakeLists.txt b/tdeioslave/fish/CMakeLists.txt
index 445ea418f..b0498131a 100644
--- a/tdeioslave/fish/CMakeLists.txt
+++ b/tdeioslave/fish/CMakeLists.txt
@@ -28,7 +28,7 @@ link_directories(
 install( FILES fish.protocol nxfish.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_fish (module) #########################
+##### tdeio_fish (module) #########################
 
 add_custom_command( OUTPUT fishcode.h
   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/genfishcode.pl ${CMAKE_CURRENT_SOURCE_DIR}/fish.pl > fishcode.h
@@ -36,7 +36,7 @@ add_custom_command( OUTPUT fishcode.h
 
 set_property( SOURCE fish.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/fishcode.h )
 
-set( target kio_fish )
+set( target tdeio_fish )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES fish.cpp
diff --git a/tdeioslave/fish/FAQ b/tdeioslave/fish/FAQ
index dce0aef41..6c96494e7 100644
--- a/tdeioslave/fish/FAQ
+++ b/tdeioslave/fish/FAQ
@@ -1,4 +1,4 @@
-Freqeuently Asked Questions, last updated for kio_fish 1.1
+Freqeuently Asked Questions, last updated for tdeio_fish 1.1
 
 Q: Typing fish:/some.host.com does not work
 A: It is fish://some.host.com (double slash)
diff --git a/tdeioslave/fish/Makefile.am b/tdeioslave/fish/Makefile.am
index 35ca64fd4..e060da76f 100644
--- a/tdeioslave/fish/Makefile.am
+++ b/tdeioslave/fish/Makefile.am
@@ -1,11 +1,11 @@
-kde_module_LTLIBRARIES = kio_fish.la
+kde_module_LTLIBRARIES = tdeio_fish.la
 
 INCLUDES = $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
-kio_fish_la_SOURCES = fish.cpp
-kio_fish_la_LIBADD = $(LIB_KSYCOCA) $(LIBUTIL) 
-kio_fish_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lutil
+tdeio_fish_la_SOURCES = fish.cpp
+tdeio_fish_la_LIBADD = $(LIB_KSYCOCA) $(LIBUTIL) 
+tdeio_fish_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lutil
 noinst_HEADERS = fishcode.h fish.h
 
 EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO FAQ fish.pl
diff --git a/tdeioslave/fish/README b/tdeioslave/fish/README
index d1afdc3d1..d71098256 100644
--- a/tdeioslave/fish/README
+++ b/tdeioslave/fish/README
@@ -1,4 +1,4 @@
-Overview of kio_fish
+Overview of tdeio_fish
 ====================
 
   ------------------------------------------------------------------------
diff --git a/tdeioslave/fish/fish.cpp b/tdeioslave/fish/fish.cpp
index 0bf44482e..30f033753 100644
--- a/tdeioslave/fish/fish.cpp
+++ b/tdeioslave/fish/fish.cpp
@@ -126,7 +126,7 @@ static void ripper(int)
 
 int KDE_EXPORT kdemain( int argc, char **argv )
 {
-    KLocale::setMainCatalogue("kio_fish");
+    KLocale::setMainCatalogue("tdeio_fish");
     TDEInstance instance("fish");
 
     myDebug( << "*** Starting fish " << endl);
diff --git a/tdeioslave/fish/fish.pl b/tdeioslave/fish/fish.pl
index 1fe13841f..ace813bb9 100755
--- a/tdeioslave/fish/fish.pl
+++ b/tdeioslave/fish/fish.pl
@@ -3,9 +3,9 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, version 2 of the License
 =pod
-This file was transferred by kio_fish, a network client part of the
+This file was transferred by tdeio_fish, a network client part of the
 KDE project. You may safely delete it, it will be transferred again
-when needed. It's only purpose is to make kio_fish access faster and
+when needed. It's only purpose is to make tdeio_fish access faster and
 more reliable.
 =cut
 
diff --git a/tdeioslave/fish/fish.protocol b/tdeioslave/fish/fish.protocol
index 451050fcf..dfff5a789 100644
--- a/tdeioslave/fish/fish.protocol
+++ b/tdeioslave/fish/fish.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_fish
+exec=tdeio_fish
 protocol=fish
 input=none
 output=filesystem
diff --git a/tdeioslave/fish/nxfish.protocol b/tdeioslave/fish/nxfish.protocol
index 1a6ffbb48..27f1fb853 100644
--- a/tdeioslave/fish/nxfish.protocol
+++ b/tdeioslave/fish/nxfish.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_fish
+exec=tdeio_fish
 protocol=nxfish
 input=none
 output=filesystem
diff --git a/tdeioslave/floppy/CMakeLists.txt b/tdeioslave/floppy/CMakeLists.txt
index b328998ab..3ce6ffe01 100644
--- a/tdeioslave/floppy/CMakeLists.txt
+++ b/tdeioslave/floppy/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 install( FILES floppy.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_floppy (module) #######################
+##### tdeio_floppy (module) #######################
 
-set( target kio_floppy )
+set( target tdeio_floppy )
 
 set( ${target}_SRCS
-  kio_floppy.cpp program.cpp
+  tdeio_floppy.cpp program.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/tdeioslave/floppy/Makefile.am b/tdeioslave/floppy/Makefile.am
index ec422f75d..e6b52fe17 100644
--- a/tdeioslave/floppy/Makefile.am
+++ b/tdeioslave/floppy/Makefile.am
@@ -5,11 +5,11 @@ AM_LDFLAGS = $(all_libraries)
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_floppy.la
+kde_module_LTLIBRARIES = tdeio_floppy.la
 
-kio_floppy_la_SOURCES = kio_floppy.cpp program.cpp
-kio_floppy_la_LIBADD = $(LIB_KIO)
-kio_floppy_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_floppy_la_SOURCES = tdeio_floppy.cpp program.cpp
+tdeio_floppy_la_LIBADD = $(LIB_KIO)
+tdeio_floppy_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 kdelnk_DATA = floppy.protocol
 kdelnkdir = $(kde_servicesdir)
diff --git a/tdeioslave/floppy/floppy.protocol b/tdeioslave/floppy/floppy.protocol
index af861d1be..84a1b12b8 100644
--- a/tdeioslave/floppy/floppy.protocol
+++ b/tdeioslave/floppy/floppy.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_floppy
+exec=tdeio_floppy
 protocol=floppy
 input=none
 output=filesystem
diff --git a/tdeioslave/floppy/kio_floppy.cpp b/tdeioslave/floppy/tdeio_floppy.cpp
index 626a4a1f0..0e576e472 100644
--- a/tdeioslave/floppy/kio_floppy.cpp
+++ b/tdeioslave/floppy/tdeio_floppy.cpp
@@ -40,7 +40,7 @@
 #include <tqcstring.h>
 #include <tqfile.h>
 
-#include "kio_floppy.h"
+#include "tdeio_floppy.h"
 
 #include <kinstance.h>
 #include <kdebug.h>
@@ -53,11 +53,11 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
-  TDEInstance instance( "kio_floppy" );
+  TDEInstance instance( "tdeio_floppy" );
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_floppy protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_floppy protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
   kdDebug(7101) << "Floppy: kdemain: starting" << endl;
diff --git a/tdeioslave/floppy/kio_floppy.h b/tdeioslave/floppy/tdeio_floppy.h
index d38340729..d38340729 100644
--- a/tdeioslave/floppy/kio_floppy.h
+++ b/tdeioslave/floppy/tdeio_floppy.h
diff --git a/tdeioslave/home/CMakeLists.txt b/tdeioslave/home/CMakeLists.txt
index bfc9e6cff..3d569681f 100644
--- a/tdeioslave/home/CMakeLists.txt
+++ b/tdeioslave/home/CMakeLists.txt
@@ -27,22 +27,22 @@ link_directories(
 install( FILES home.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kiohome (static) ##########################
+##### tdeiohome (static) ##########################
 
-set( target kiohome )
+set( target tdeiohome )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
-  SOURCES kio_home.cpp homeimpl.cpp
+  SOURCES tdeio_home.cpp homeimpl.cpp
 )
 
 
-##### kio_home (module) #########################
+##### tdeio_home (module) #########################
 
-set( target kio_home )
+set( target tdeio_home )
 
 tde_add_kpart( ${target}
   SOURCES dummy.cpp
-  EMBED kiohome-static
+  EMBED tdeiohome-static
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/home/Makefile.am b/tdeioslave/home/Makefile.am
index 38b73e653..d40341aab 100644
--- a/tdeioslave/home/Makefile.am
+++ b/tdeioslave/home/Makefile.am
@@ -4,11 +4,11 @@ SUBDIRS= . kdedmodule
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
-kde_module_LTLIBRARIES = kio_home.la
+kde_module_LTLIBRARIES = tdeio_home.la
 
-kio_home_la_SOURCES = dummy.cpp
-kio_home_la_LIBADD  = libtdeiohome.la $(LIB_KIO)
-kio_home_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
+tdeio_home_la_SOURCES = dummy.cpp
+tdeio_home_la_LIBADD  = libtdeiohome.la $(LIB_KIO)
+tdeio_home_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
 dummy.cpp:
 	echo > dummy.cpp
@@ -16,7 +16,7 @@ dummy.cpp:
 kde_services_DATA = home.protocol
 
 noinst_LTLIBRARIES = libtdeiohome.la
-libtdeiohome_la_SOURCES = kio_home.cpp homeimpl.cpp
+libtdeiohome_la_SOURCES = tdeio_home.cpp homeimpl.cpp
 
 check_PROGRAMS = testhome
 testhome_SOURCES = testhome.cpp
diff --git a/tdeioslave/home/home.protocol b/tdeioslave/home/home.protocol
index da2a556cd..53192efe0 100644
--- a/tdeioslave/home/home.protocol
+++ b/tdeioslave/home/home.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_home
+exec=tdeio_home
 protocol=home
 input=none
 output=filesystem
diff --git a/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp b/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp
index 4eb71c332..19bcff988 100644
--- a/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp
+++ b/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp
@@ -30,7 +30,7 @@ HomeDirNotifyModule::HomeDirNotifyModule(const TQCString &obj)
 extern "C" {
 	KDE_EXPORT KDEDModule *create_homedirnotify(const TQCString &obj)
 	{
-		TDEGlobal::locale()->insertCatalogue("kio_home");
+		TDEGlobal::locale()->insertCatalogue("tdeio_home");
 		return new HomeDirNotifyModule(obj);
 	}
 }
diff --git a/tdeioslave/home/kio_home.cpp b/tdeioslave/home/tdeio_home.cpp
index bd55aee0a..23d78778b 100644
--- a/tdeioslave/home/kio_home.cpp
+++ b/tdeioslave/home/tdeio_home.cpp
@@ -27,7 +27,7 @@
 #include <kglobal.h>
 
 
-#include "kio_home.h"
+#include "tdeio_home.h"
 
 static const KCmdLineOptions options[] =
 {
@@ -42,7 +42,7 @@ extern "C" {
 	{
 		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
-		TDECmdLineArgs::init(argc, argv, "kio_home", 0, 0, 0, 0);
+		TDECmdLineArgs::init(argc, argv, "tdeio_home", 0, 0, 0, 0);
 		TDECmdLineArgs::addCmdLineOptions( options );
 		TDEApplication app( false, false );
 		// We want to be anonymous even if we use DCOP
diff --git a/tdeioslave/home/kio_home.h b/tdeioslave/home/tdeio_home.h
index db5d8902c..db5d8902c 100644
--- a/tdeioslave/home/kio_home.h
+++ b/tdeioslave/home/tdeio_home.h
diff --git a/tdeioslave/home/testhome.cpp b/tdeioslave/home/testhome.cpp
index 66b2df126..643c21e32 100644
--- a/tdeioslave/home/testhome.cpp
+++ b/tdeioslave/home/testhome.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kio_home.h"
+#include "tdeio_home.h"
 #include "testhome.h"
 
 #include <config.h>
diff --git a/tdeioslave/info/CMakeLists.txt b/tdeioslave/info/CMakeLists.txt
index ed2a72f61..75fab8d92 100644
--- a/tdeioslave/info/CMakeLists.txt
+++ b/tdeioslave/info/CMakeLists.txt
@@ -27,9 +27,9 @@ install( FILES kde-info2html.conf DESTINATION ${DATA_INSTALL_DIR}/tdeio_info )
 install( PROGRAMS kde-info2html DESTINATION ${DATA_INSTALL_DIR}/tdeio_info )
 
 
-##### kio_info (module) #########################
+##### tdeio_info (module) #########################
 
-set( target kio_info )
+set( target tdeio_info )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES info.cc
diff --git a/tdeioslave/info/Makefile.am b/tdeioslave/info/Makefile.am
index 37bbe3083..1b2d21f32 100644
--- a/tdeioslave/info/Makefile.am
+++ b/tdeioslave/info/Makefile.am
@@ -6,16 +6,16 @@ METASOURCES = AUTO
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_info.la
+kde_module_LTLIBRARIES = tdeio_info.la
 
-kio_info_la_SOURCES = info.cc
-kio_info_la_LIBADD = $(LIB_KIO)
-kio_info_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_info_la_SOURCES = info.cc
+tdeio_info_la_LIBADD = $(LIB_KIO)
+tdeio_info_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 noinst_HEADERS = info.h
 
 kdelnk_DATA = info.protocol
 kdelnkdir = $(kde_servicesdir)
 
-kio_info_data_DATA = kde-info2html.conf
-kio_info_data_SCRIPTS = kde-info2html
-kio_info_datadir = $(kde_datadir)/tdeio_info
+tdeio_info_data_DATA = kde-info2html.conf
+tdeio_info_data_SCRIPTS = kde-info2html
+tdeio_info_datadir = $(kde_datadir)/tdeio_info
diff --git a/tdeioslave/info/info.cc b/tdeioslave/info/info.cc
index 71d2dc863..ee11eabbd 100644
--- a/tdeioslave/info/info.cc
+++ b/tdeioslave/info/info.cc
@@ -26,8 +26,8 @@ InfoProtocol::InfoProtocol( const TQCString &pool, const TQCString &app )
     kdDebug( 7108 ) << "InfoProtocol::InfoProtocol" << endl;
 
     m_perl = TDEGlobal::dirs()->findExe( "perl" );
-    m_infoScript = locate( "data", "kio_info/kde-info2html" );
-    m_infoConf = locate("data", "kio_info/kde-info2html.conf");
+    m_infoScript = locate( "data", "tdeio_info/kde-info2html" );
+    m_infoConf = locate("data", "tdeio_info/kde-info2html.conf");
 
     if( m_perl.isNull() || m_infoScript.isNull() || m_infoConf.isNull() ) {
 	kdError( 7108 ) << "Critical error: Cannot locate files for HTML-conversion" << endl;
@@ -35,7 +35,7 @@ InfoProtocol::InfoProtocol( const TQCString &pool, const TQCString &app )
 	if ( m_perl.isNull() ) {
 		errorStr = "perl.";
 	} else {
-		TQString missing =m_infoScript.isNull() ?  "kio_info/kde-info2html" : "kio_info/kde-info2html.conf";
+		TQString missing =m_infoScript.isNull() ?  "tdeio_info/kde-info2html" : "tdeio_info/kde-info2html.conf";
 		errorStr = "kde-info2html" + i18n( "\nUnable to locate file %1 which is necessary to run this service. "
 				"Please check your software installation" ).arg( missing );
 	}
@@ -244,13 +244,13 @@ extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ); }
 
 int kdemain( int argc, char **argv )
 {
-  TDEInstance instance( "kio_info" );
+  TDEInstance instance( "tdeio_info" );
 
-  kdDebug() << "kio_info starting " << getpid() << endl;
+  kdDebug() << "tdeio_info starting " << getpid() << endl;
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_info protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_info protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
 
diff --git a/tdeioslave/info/info.protocol b/tdeioslave/info/info.protocol
index 491511ed2..fc8db0dfa 100644
--- a/tdeioslave/info/info.protocol
+++ b/tdeioslave/info/info.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_info
+exec=tdeio_info
 protocol=info
 input=none
 output=filesystem
diff --git a/tdeioslave/ldap/CMakeLists.txt b/tdeioslave/ldap/CMakeLists.txt
index ebf162205..d05048e0d 100644
--- a/tdeioslave/ldap/CMakeLists.txt
+++ b/tdeioslave/ldap/CMakeLists.txt
@@ -28,10 +28,10 @@ link_directories(
 install( FILES ldap.protocol ldaps.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_ldap (module) #########################
+##### tdeio_ldap (module) #########################
 
-tde_add_kpart( kio_ldap AUTOMOC
-  SOURCES kio_ldap.cpp
+tde_add_kpart( tdeio_ldap AUTOMOC
+  SOURCES tdeio_ldap.cpp
   LINK kabc-shared ${LDAP_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/ldap/Makefile.am b/tdeioslave/ldap/Makefile.am
index ca66e1b17..3f71b669b 100644
--- a/tdeioslave/ldap/Makefile.am
+++ b/tdeioslave/ldap/Makefile.am
@@ -7,13 +7,13 @@ LDADD      = $(LIB_KIO) $(LDAP_LIBS)
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_ldap.la
+kde_module_LTLIBRARIES = tdeio_ldap.la
 
-kio_ldap_la_SOURCES = kio_ldap.cpp
-kio_ldap_la_LIBADD = $(LIB_KIO) $(LDAP_LIBS) $(LIB_KABC)
-kio_ldap_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) -module $(KDE_PLUGIN)
+tdeio_ldap_la_SOURCES = tdeio_ldap.cpp
+tdeio_ldap_la_LIBADD = $(LIB_KIO) $(LDAP_LIBS) $(LIB_KABC)
+tdeio_ldap_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) -module $(KDE_PLUGIN)
 
-noinst_HEADERS = kio_ldap.h
+noinst_HEADERS = tdeio_ldap.h
 
 kdelnk_DATA = ldap.protocol ldaps.protocol
 kdelnkdir = $(kde_servicesdir)
diff --git a/tdeioslave/ldap/ldap.protocol b/tdeioslave/ldap/ldap.protocol
index 3e1e77b4b..3082c6cb7 100644
--- a/tdeioslave/ldap/ldap.protocol
+++ b/tdeioslave/ldap/ldap.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_ldap
+exec=tdeio_ldap
 protocol=ldap
 input=none
 output=filesystem
diff --git a/tdeioslave/ldap/ldaps.protocol b/tdeioslave/ldap/ldaps.protocol
index 1dd927506..2bcb2234c 100644
--- a/tdeioslave/ldap/ldaps.protocol
+++ b/tdeioslave/ldap/ldaps.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_ldap
+exec=tdeio_ldap
 protocol=ldaps
 input=none
 output=filesystem
diff --git a/tdeioslave/ldap/kio_ldap.cpp b/tdeioslave/ldap/tdeio_ldap.cpp
index d4a29f1d4..2e22e6994 100644
--- a/tdeioslave/ldap/kio_ldap.cpp
+++ b/tdeioslave/ldap/tdeio_ldap.cpp
@@ -22,7 +22,7 @@
 #endif
 #include <kabc/ldif.h>
 
-#include "kio_ldap.h"
+#include "tdeio_ldap.h"
 
 using namespace TDEIO;
 using namespace KABC;
@@ -34,12 +34,12 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
  */
 int kdemain( int argc, char **argv )
 {
-  TDEInstance instance( "kio_ldap" );
+  TDEInstance instance( "tdeio_ldap" );
 
   kdDebug(7125) << "Starting " << getpid() << endl;
 
   if ( argc != 4 ) {
-    kdError() << "Usage kio_ldap protocol pool app" << endl;
+    kdError() << "Usage tdeio_ldap protocol pool app" << endl;
     return -1;
   }
 
@@ -93,7 +93,7 @@ void LDAPProtocol::LDAPErr( const KURL &url, int err )
   closeConnection();
   
   switch (err) {
-/* FIXME: is it worth mapping the following error codes to kio errors?
+/* FIXME: is it worth mapping the following error codes to tdeio errors?
 
 	LDAP_OPERATIONS_ERROR 
   LDAP_STRONG_AUTH_REQUIRED
@@ -943,14 +943,14 @@ void LDAPProtocol::put( const KURL &_url, int, bool overwrite, bool )
               FREELDAPMEM;
               return;
             case LDIF::Entry_Del:
-              kdDebug(7125) << "kio_ldap_del" << endl;
+              kdDebug(7125) << "tdeio_ldap_del" << endl;
               controlsFromMetaData( &serverctrls, &clientctrls );
               ldaperr = ldap_delete_ext_s( mLDAP, ldif.dn().utf8(), 
                 serverctrls, clientctrls );
               FREELDAPMEM;
               break;
             case LDIF::Entry_Modrdn:
-              kdDebug(7125) << "kio_ldap_modrdn olddn:" << ldif.dn() << 
+              kdDebug(7125) << "tdeio_ldap_modrdn olddn:" << ldif.dn() << 
                 " newRdn: " <<  ldif.newRdn() << 
                 " newSuperior: " << ldif.newSuperior() << 
                 " deloldrdn: " << ldif.delOldRdn() << endl;
@@ -962,7 +962,7 @@ void LDAPProtocol::put( const KURL &_url, int, bool overwrite, bool )
               FREELDAPMEM;
               break;
             case LDIF::Entry_Mod:
-              kdDebug(7125) << "kio_ldap_mod"  << endl;
+              kdDebug(7125) << "tdeio_ldap_mod"  << endl;
               if ( lmod ) {
                 controlsFromMetaData( &serverctrls, &clientctrls );
                 ldaperr = ldap_modify_ext_s( mLDAP, ldif.dn().utf8(), lmod,
@@ -971,7 +971,7 @@ void LDAPProtocol::put( const KURL &_url, int, bool overwrite, bool )
               }
               break;
             case LDIF::Entry_Add:
-              kdDebug(7125) << "kio_ldap_add " << ldif.dn() << endl;
+              kdDebug(7125) << "tdeio_ldap_add " << ldif.dn() << endl;
               if ( lmod ) {
                 controlsFromMetaData( &serverctrls, &clientctrls );
                 ldaperr = ldap_add_ext_s( mLDAP, ldif.dn().utf8(), lmod,
diff --git a/tdeioslave/ldap/kio_ldap.h b/tdeioslave/ldap/tdeio_ldap.h
index f3bd61fe5..f3bd61fe5 100644
--- a/tdeioslave/ldap/kio_ldap.h
+++ b/tdeioslave/ldap/tdeio_ldap.h
diff --git a/tdeioslave/mac/CMakeLists.txt b/tdeioslave/mac/CMakeLists.txt
index 6b1b92f6e..36c141a35 100644
--- a/tdeioslave/mac/CMakeLists.txt
+++ b/tdeioslave/mac/CMakeLists.txt
@@ -26,12 +26,12 @@ install( FILES mac.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 tde_install_icons( )
 
 
-##### kio_mac (module) ##########################
+##### tdeio_mac (module) ##########################
 
-set( target kio_mac )
+set( target tdeio_mac )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES kio_mac.cpp
+  SOURCES tdeio_mac.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/mac/ChangeLog b/tdeioslave/mac/ChangeLog
index 6c8f647ce..5de37eda2 100644
--- a/tdeioslave/mac/ChangeLog
+++ b/tdeioslave/mac/ChangeLog
@@ -18,7 +18,7 @@
 	- Converts some HFS+ file types and application labels into mimetypes
 	- Added a SuSE Makefile
 	- Hopefully managed to get the SuSE RPMs working
-	- When copying files kio-mac now reports the amount progressed so
+	- When copying files tdeio-mac now reports the amount progressed so
   	  you can see how much has been copied
 	- Text files are now copies over in text mode by default
 
diff --git a/tdeioslave/mac/Makefile.am b/tdeioslave/mac/Makefile.am
index dfd79d822..42f73b507 100644
--- a/tdeioslave/mac/Makefile.am
+++ b/tdeioslave/mac/Makefile.am
@@ -1,17 +1,17 @@
-## Makfile.am for kio_mac
+## Makfile.am for tdeio_mac
 
 INCLUDES= $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_mac.la
+kde_module_LTLIBRARIES = tdeio_mac.la
 
-kio_mac_la_SOURCES = kio_mac.cpp
-kio_mac_la_LIBADD = -lkio
-kio_mac_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_mac_la_SOURCES = tdeio_mac.cpp
+tdeio_mac_la_LIBADD = -ltdeio
+tdeio_mac_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
-noinst_HEADERS = kio_mac.h
+noinst_HEADERS = tdeio_mac.h
 
 kdelnk_DATA = mac.protocol
 kdelnkdir = $(kde_servicesdir)
diff --git a/tdeioslave/mac/README b/tdeioslave/mac/README
index bb907dd9c..7ac1b5a3d 100644
--- a/tdeioslave/mac/README
+++ b/tdeioslave/mac/README
@@ -7,7 +7,7 @@ From the hfsplus man page:
        2^64  blocks,  resulting in much more efficient storage of
        many small files on large disks."
 
-This kio slave lets you read an HFS+ partition from konqueror
+This tdeio slave lets you read an HFS+ partition from konqueror
 or any other KDE file dialogue.  It uses hfsplus tools so you will
 need these installed for it to work.
 
@@ -52,7 +52,7 @@ For some reason some directories in MacOS end in a funny tall f
 character.  This seems to confuse hfstools.
 
 You can't easiily use the command line tools while you are browsing
-using kio-mac in Konqueror.  Konqueror continuously refreshes it's
+using tdeio-mac in Konqueror.  Konqueror continuously refreshes it's
 view which mean hpmount is being called every few seconds.  Click on
 Konqueror's home button before using the tools yourself on the command
 line.
diff --git a/tdeioslave/mac/TODO b/tdeioslave/mac/TODO
index e94d88254..69fcb0d2e 100644
--- a/tdeioslave/mac/TODO
+++ b/tdeioslave/mac/TODO
@@ -1,7 +1,7 @@
 FIXMEs:
 	Amazingly, none that I can think of
 
-grep TODO kio_mac.cpp
+grep TODO tdeio_mac.cpp
         //TODO this means dev=foo must be the last argument in the query
         //TODO this error interrupts the user when typing ?dev=foo on each letter of foo
         //TODO are there any more characters to escape?
diff --git a/tdeioslave/mac/mac.protocol b/tdeioslave/mac/mac.protocol
index 9e94132bb..1a9044158 100644
--- a/tdeioslave/mac/mac.protocol
+++ b/tdeioslave/mac/mac.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_mac
+exec=tdeio_mac
 protocol=mac
 input=none
 output=filesystem
diff --git a/tdeioslave/mac/kio_mac.cpp b/tdeioslave/mac/tdeio_mac.cpp
index d26cc47e5..707d995ee 100644
--- a/tdeioslave/mac/kio_mac.cpp
+++ b/tdeioslave/mac/tdeio_mac.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kio_mac.cpp
+                          tdeio_mac.cpp
                              -------------------
     copyright            : (C) 2002 Jonathan Riddell
     email                : [email protected]
@@ -30,13 +30,13 @@
 #include <iostream>
 #include <time.h>
 
-#include "kio_mac.moc"
+#include "tdeio_mac.moc"
 
 using namespace TDEIO;
 
 extern "C" {
     int KDE_EXPORT kdemain(int, char **argv) {
-        TDEInstance instance("kio_mac");
+        TDEInstance instance("tdeio_mac");
         MacProtocol slave(argv[2], argv[3]);
         slave.dispatchLoop();
         return 0;
diff --git a/tdeioslave/mac/kio_mac.h b/tdeioslave/mac/tdeio_mac.h
index e497e9918..e497e9918 100644
--- a/tdeioslave/mac/kio_mac.h
+++ b/tdeioslave/mac/tdeio_mac.h
diff --git a/tdeioslave/man/CMakeLists.txt b/tdeioslave/man/CMakeLists.txt
index fca109df0..ad3ed012b 100644
--- a/tdeioslave/man/CMakeLists.txt
+++ b/tdeioslave/man/CMakeLists.txt
@@ -9,7 +9,7 @@
 #
 #################################################
 
-# FIXME not built: man2html, kio_man_test
+# FIXME not built: man2html, tdeio_man_test
 
 
 ##### system checks #############################
@@ -35,15 +35,15 @@ link_directories(
 ##### other data ################################
 
 install( FILES man.protocol kmanpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kio_man.css DESTINATION ${DATA_INSTALL_DIR}/tdeio_man )
+install( FILES tdeio_man.css DESTINATION ${DATA_INSTALL_DIR}/tdeio_man )
 
 
-##### kio_man (module) ##########################
+##### tdeio_man (module) ##########################
 
-set( target kio_man )
+set( target tdeio_man )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES man2html.cpp kio_man.cpp
+  SOURCES man2html.cpp tdeio_man.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/man/Makefile.am b/tdeioslave/man/Makefile.am
index d43edb74d..7b2554ba0 100644
--- a/tdeioslave/man/Makefile.am
+++ b/tdeioslave/man/Makefile.am
@@ -3,22 +3,22 @@
 INCLUDES= $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
-EXTRA_PROGRAMS = kio_man_test man2html
+EXTRA_PROGRAMS = tdeio_man_test man2html
 
 ####### just for testing ([email protected], 15.02.2001)
 
-kio_man_test_SOURCES = kio_man_test.cpp
-kio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kio_man_test_LDADD = man2html.lo kio_man.lo $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+tdeio_man_test_SOURCES = tdeio_man_test.cpp
+tdeio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeio_man_test_LDADD = man2html.lo tdeio_man.lo $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_man.la  libkmanpart.la
+kde_module_LTLIBRARIES = tdeio_man.la  libkmanpart.la
 
-kio_man_la_SOURCES = man2html.cpp kio_man.cpp
-kio_man_la_LIBADD = $(LIB_KSYCOCA)
-kio_man_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-noinst_HEADERS = kio_man.h
+tdeio_man_la_SOURCES = man2html.cpp tdeio_man.cpp
+tdeio_man_la_LIBADD = $(LIB_KSYCOCA)
+tdeio_man_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+noinst_HEADERS = tdeio_man.h
 ### TODO Why is man2htmk.h distributed?
 
 libkmanpart_la_SOURCES = kmanpart.cpp
@@ -28,9 +28,9 @@ libkmanpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 kdelnk_DATA = man.protocol kmanpart.desktop
 kdelnkdir = $(kde_servicesdir)
 
-kio_man_data_DATA = kio_man.css
-kio_man_datadir = $(kde_datadir)/tdeio_man
-EXTRA_DIST=$(kio_man_data_DATA)
+tdeio_man_data_DATA = tdeio_man.css
+tdeio_man_datadir = $(kde_datadir)/tdeio_man
+EXTRA_DIST=$(tdeio_man_data_DATA)
 
 METASOURCES = AUTO
 
diff --git a/tdeioslave/man/man.protocol b/tdeioslave/man/man.protocol
index 555970fdc..37a57cec4 100644
--- a/tdeioslave/man/man.protocol
+++ b/tdeioslave/man/man.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_man
+exec=tdeio_man
 protocol=man
 input=none
 output=filesystem
diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp
index ec46b2d3d..577f7d53a 100644
--- a/tdeioslave/man/man2html.cpp
+++ b/tdeioslave/man/man2html.cpp
@@ -4073,7 +4073,7 @@ static char *scan_request(char *c)
                             // Most English man pages are in ISO-8859-1
                             out_html("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\">\n");
 #else
-                            // kio_man transforms from local to UTF-8
+                            // tdeio_man transforms from local to UTF-8
                             out_html("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=");
                             out_html(TQTextCodec::codecForLocale()->mimeName());
                             out_html("\">\n");
diff --git a/tdeioslave/man/kio_man.cpp b/tdeioslave/man/tdeio_man.cpp
index d2ef8cb94..4c4f1945c 100644
--- a/tdeioslave/man/kio_man.cpp
+++ b/tdeioslave/man/tdeio_man.cpp
@@ -39,8 +39,8 @@
 #include <klocale.h>
 #include <kmimetype.h>
 
-#include "kio_man.h"
-#include "kio_man.moc"
+#include "tdeio_man.h"
+#include "tdeio_man.moc"
 #include "man2html.h"
 #include <assert.h>
 #include <kfilterbase.h>
@@ -122,7 +122,7 @@ MANProtocol::MANProtocol(const TQCString &pool_socket, const TQCString &app_sock
     m_cssPath=strPath.local8Bit(); // ### TODO encode for CSS
     section_names << "1" << "2" << "3" << "3n" << "3p" << "4" << "5" << "6" << "7"
                   << "8" << "9" << "l" << "n";
-    m_manCSSFile = locate( "data", "kio_man/tdeio_man.css" );
+    m_manCSSFile = locate( "data", "tdeio_man/tdeio_man.css" );
 }
 
 MANProtocol *MANProtocol::self() { return _self; }
@@ -692,13 +692,13 @@ extern "C"
 
     int KDE_EXPORT kdemain( int argc, char **argv ) {
 
-        TDEInstance instance("kio_man");
+        TDEInstance instance("tdeio_man");
 
         kdDebug(7107) <<  "STARTING " << getpid() << endl;
 
         if (argc != 4)
         {
-            fprintf(stderr, "Usage: kio_man protocol domain-socket1 domain-socket2\n");
+            fprintf(stderr, "Usage: tdeio_man protocol domain-socket1 domain-socket2\n");
             exit(-1);
         }
 
diff --git a/tdeioslave/man/kio_man.css b/tdeioslave/man/tdeio_man.css
index 8a9f378bc..8a9f378bc 100644
--- a/tdeioslave/man/kio_man.css
+++ b/tdeioslave/man/tdeio_man.css
diff --git a/tdeioslave/man/kio_man.h b/tdeioslave/man/tdeio_man.h
index 829a07964..7ba9d1dbc 100644
--- a/tdeioslave/man/kio_man.h
+++ b/tdeioslave/man/tdeio_man.h
@@ -17,8 +17,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef __kio_man_h__
-#define __kio_man_h__
+#ifndef __tdeio_man_h__
+#define __tdeio_man_h__
 
 
 #include <tqstring.h>
@@ -93,7 +93,7 @@ private:
     TQCString m_htmlPath; ///< Path to TDE resources, encoded for HTML
     TQCString m_cssPath; ///< Path to TDE resources, encoded for CSS
     TQBuffer m_outputBuffer; ///< Buffer for the output
-    TQString m_manCSSFile; ///< Path to kio_man.css
+    TQString m_manCSSFile; ///< Path to tdeio_man.css
 };
 
 
diff --git a/tdeioslave/man/kio_man_test.cpp b/tdeioslave/man/tdeio_man_test.cpp
index a181c47b3..a7f41434e 100644
--- a/tdeioslave/man/kio_man_test.cpp
+++ b/tdeioslave/man/tdeio_man_test.cpp
@@ -2,19 +2,19 @@
 
 #include <tqobject.h>
 
-#include "kio_man.h"
+#include "tdeio_man.h"
 
 
 #include <kapplication.h>
 #include <klocale.h>
 
 
-class kio_man_test : public  MANProtocol
+class tdeio_man_test : public  MANProtocol
 {
   Q_OBJECT
 
 public:
-  kio_man_test(const TQCString &pool_socket, const TQCString &app_socket);
+  tdeio_man_test(const TQCString &pool_socket, const TQCString &app_socket);
 
 protected:
   virtual void data(int);
diff --git a/tdeioslave/media/CMakeLists.txt b/tdeioslave/media/CMakeLists.txt
index 68d4bf9d6..0746d259c 100644
--- a/tdeioslave/media/CMakeLists.txt
+++ b/tdeioslave/media/CMakeLists.txt
@@ -38,22 +38,22 @@ link_directories(
 install( FILES media.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kiomedia (static) #########################
+##### tdeiomedia (static) #########################
 
-set( target kiomedia )
+set( target tdeiomedia )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
-  SOURCES kio_media.cpp mediaimpl.cpp mediaimpl.skel
+  SOURCES tdeio_media.cpp mediaimpl.cpp mediaimpl.skel
 )
 
 
-##### kio_media (module) ########################
+##### tdeio_media (module) ########################
 
-set( target kio_media )
+set( target tdeio_media )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES dummy.cpp
-  EMBED kiomedia-static
+  EMBED tdeiomedia-static
   LINK mediacommon-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/media/Makefile.am b/tdeioslave/media/Makefile.am
index b82e48557..c827568a4 100644
--- a/tdeioslave/media/Makefile.am
+++ b/tdeioslave/media/Makefile.am
@@ -8,11 +8,11 @@ SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \
 INCLUDES = -I$(srcdir)/libmediacommon $(all_includes)
 METASOURCES = AUTO
 
-kde_module_LTLIBRARIES = kio_media.la
+kde_module_LTLIBRARIES = tdeio_media.la
 
-kio_media_la_SOURCES = dummy.cpp
-kio_media_la_LIBADD  = libtdeiomedia.la libmediacommon/libmediacommon.la $(LIB_KIO)
-kio_media_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
+tdeio_media_la_SOURCES = dummy.cpp
+tdeio_media_la_LIBADD  = libtdeiomedia.la libmediacommon/libmediacommon.la $(LIB_KIO)
+tdeio_media_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
 dummy.cpp:
 	echo > dummy.cpp
@@ -20,7 +20,7 @@ dummy.cpp:
 kde_services_DATA = media.protocol
 
 noinst_LTLIBRARIES = libtdeiomedia.la
-libtdeiomedia_la_SOURCES = kio_media.cpp mediaimpl.cpp mediaimpl.skel
+libtdeiomedia_la_SOURCES = tdeio_media.cpp mediaimpl.cpp mediaimpl.skel
 
 check_PROGRAMS = testmedia
 testmedia_SOURCES = testmedia.cpp
diff --git a/tdeioslave/media/media.protocol b/tdeioslave/media/media.protocol
index f535e1a41..c390d6fca 100644
--- a/tdeioslave/media/media.protocol
+++ b/tdeioslave/media/media.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_media
+exec=tdeio_media
 protocol=media
 input=none
 output=filesystem
diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp
index aba2b0175..1022b36be 100644
--- a/tdeioslave/media/mediamanager/halbackend.cpp
+++ b/tdeioslave/media/mediamanager/halbackend.cpp
@@ -377,7 +377,7 @@ void HALBackend::DeviceCondition(const char* udi, const char* condition)
         }
         if (medium) {
 	    TDEProcess p;
-	    p << "kio_media_mounthelper" << "-e" << medium->name();
+	    p << "tdeio_media_mounthelper" << "-e" << medium->name();
 	    p.start(TDEProcess::DontCare);
         }
     }
diff --git a/tdeioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp
index db2c12a71..511eb6c64 100644
--- a/tdeioslave/media/mediamanager/mediamanager.cpp
+++ b/tdeioslave/media/mediamanager/mediamanager.cpp
@@ -415,7 +415,7 @@ void MediaManager::slotMediumChanged(const TQString &/*id*/, const TQString &nam
 extern "C" {
     KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj)
     {
-        TDEGlobal::locale()->insertCatalogue("kio_media");
+        TDEGlobal::locale()->insertCatalogue("tdeio_media");
         return new MediaManager(obj);
     }
 }
diff --git a/tdeioslave/media/mounthelper/CMakeLists.txt b/tdeioslave/media/mounthelper/CMakeLists.txt
index ea06278a8..766fe3def 100644
--- a/tdeioslave/media/mounthelper/CMakeLists.txt
+++ b/tdeioslave/media/mounthelper/CMakeLists.txt
@@ -21,12 +21,12 @@ link_directories(
 )
 
 
-##### kio_media_mounthelper (executable) ########
+##### tdeio_media_mounthelper (executable) ########
 
-set( target kio_media_mounthelper )
+set( target tdeio_media_mounthelper )
 
 set( ${target}_SRCS
-  kio_media_mounthelper.cpp decryptdialog.ui dialog.cpp
+  tdeio_media_mounthelper.cpp decryptdialog.ui dialog.cpp
 )
 
 tde_add_executable( ${target} AUTOMOC
diff --git a/tdeioslave/media/mounthelper/Makefile.am b/tdeioslave/media/mounthelper/Makefile.am
index 934559d40..c1e056c18 100644
--- a/tdeioslave/media/mounthelper/Makefile.am
+++ b/tdeioslave/media/mounthelper/Makefile.am
@@ -1,12 +1,12 @@
-bin_PROGRAMS = kio_media_mounthelper
+bin_PROGRAMS = tdeio_media_mounthelper
 
 INCLUDES = -I$(srcdir)/../libmediacommon $(all_includes)
 AM_LDFLAGS = $(all_libraries)
 
-kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp decryptdialog.ui dialog.cpp
+tdeio_media_mounthelper_SOURCES = tdeio_media_mounthelper.cpp decryptdialog.ui dialog.cpp
 
-kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_TDEUI)
+tdeio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_TDEUI)
 
 METASOURCES = AUTO
 
diff --git a/tdeioslave/media/mounthelper/kio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
index f321293d6..038a4de57 100644
--- a/tdeioslave/media/mounthelper/kio_media_mounthelper.cpp
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
@@ -35,7 +35,7 @@
 #include <kmimetype.h>
 
 #include "dialog.h"
-#include "kio_media_mounthelper.h"
+#include "tdeio_media_mounthelper.h"
 
 const Medium MountHelper::findMedium(const KURL &url)
 {
@@ -263,12 +263,12 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-	TDECmdLineArgs::init(argc, argv, "kio_media_mounthelper",
-	                   "kio_media_mounthelper", "kio_media_mounthelper",
+	TDECmdLineArgs::init(argc, argv, "tdeio_media_mounthelper",
+	                   "tdeio_media_mounthelper", "tdeio_media_mounthelper",
 	                   "0.1");
 
 	TDECmdLineArgs::addCmdLineOptions( options );
-	TDEGlobal::locale()->setMainCatalogue("kio_media");
+	TDEGlobal::locale()->setMainCatalogue("tdeio_media");
 	TDEApplication::addCmdLineOptions();
 
 	if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage();
@@ -279,4 +279,4 @@ int main(int argc, char **argv)
 	return app->exec();
 }
 
-#include "kio_media_mounthelper.moc"
+#include "tdeio_media_mounthelper.moc"
diff --git a/tdeioslave/media/mounthelper/kio_media_mounthelper.h b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
index 50ea88b3b..50ea88b3b 100644
--- a/tdeioslave/media/mounthelper/kio_media_mounthelper.h
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
diff --git a/tdeioslave/media/services/media_decrypt.desktop b/tdeioslave/media/services/media_decrypt.desktop
index dd8dadc39..4adef7d90 100644
--- a/tdeioslave/media/services/media_decrypt.desktop
+++ b/tdeioslave/media/services/media_decrypt.desktop
@@ -1,5 +1,5 @@
 [Desktop Action Decrypt]
-Exec=kio_media_mounthelper -d %u
+Exec=tdeio_media_mounthelper -d %u
 Icon=decrypted
 Name=Decrypt
 Name[de]=Entschlüsseln
diff --git a/tdeioslave/media/services/media_eject.desktop b/tdeioslave/media/services/media_eject.desktop
index af30d1088..121f83340 100644
--- a/tdeioslave/media/services/media_eject.desktop
+++ b/tdeioslave/media/services/media_eject.desktop
@@ -86,5 +86,5 @@ Name[xh]=Khuphela ngaphandle
 Name[zh_CN]=弹出
 Name[zh_TW]=退出
 Name[zu]=Khipha
-Exec=kio_media_mounthelper -e %u
+Exec=tdeio_media_mounthelper -e %u
 
diff --git a/tdeioslave/media/services/media_mount.desktop b/tdeioslave/media/services/media_mount.desktop
index 8011fe577..a8a943bb8 100644
--- a/tdeioslave/media/services/media_mount.desktop
+++ b/tdeioslave/media/services/media_mount.desktop
@@ -83,5 +83,5 @@ Name[xh]=Layisha
 Name[zh_CN]=挂载
 Name[zh_TW]=掛載
 Name[zu]=Yenyusa
-Exec=kio_media_mounthelper -m %u
+Exec=tdeio_media_mounthelper -m %u
 
diff --git a/tdeioslave/media/services/media_safelyremove.desktop b/tdeioslave/media/services/media_safelyremove.desktop
index 3dac85f15..37f3d3b7b 100644
--- a/tdeioslave/media/services/media_safelyremove.desktop
+++ b/tdeioslave/media/services/media_safelyremove.desktop
@@ -71,5 +71,5 @@ Name[vi]=Gỡ ra An toàn
 Name[wa]=Ositer e såvrité
 Name[zh_CN]=安全删除
 Name[zh_TW]=安全的移除
-Exec=kio_media_mounthelper -s %u
+Exec=tdeio_media_mounthelper -s %u
 
diff --git a/tdeioslave/media/services/media_unmount.desktop b/tdeioslave/media/services/media_unmount.desktop
index 04ced9d0d..c76adf1f5 100644
--- a/tdeioslave/media/services/media_unmount.desktop
+++ b/tdeioslave/media/services/media_unmount.desktop
@@ -83,5 +83,5 @@ Name[xh]=Sukuyilayisha
 Name[zh_CN]=卸载
 Name[zh_TW]=卸載
 Name[zu]=Yehlisa
-Exec=kio_media_mounthelper -u %u
+Exec=tdeio_media_mounthelper -u %u
 
diff --git a/tdeioslave/media/tdecmodule/main.cpp b/tdeioslave/media/tdecmodule/main.cpp
index 9036583df..9d8c4cb8f 100644
--- a/tdeioslave/media/tdecmodule/main.cpp
+++ b/tdeioslave/media/tdecmodule/main.cpp
@@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_media, MediaFactory( "kcmmedia" ) )
 MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList& )
 	: TDECModule(MediaFactory::instance(), parent, name )
 {
-	TDEGlobal::locale()->insertCatalogue("kio_media");
+	TDEGlobal::locale()->insertCatalogue("tdeio_media");
 	TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 	TQTabWidget *tab = new TQTabWidget( this );
 	
diff --git a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
index 20e68e459..dc46e8287 100644
--- a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
+++ b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
@@ -39,7 +39,7 @@
 #endif
 
 typedef KGenericFactory<KFileMediaPlugin> KFileMediaPluginFactory;
-K_EXPORT_COMPONENT_FACTORY(tdefile_media, KFileMediaPluginFactory("kio_media"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_media, KFileMediaPluginFactory("tdeio_media"))
 
 KFileMediaPlugin::KFileMediaPlugin(TQObject *parent, const char *name,
 		                     const TQStringList& args)
diff --git a/tdeioslave/media/kio_media.cpp b/tdeioslave/media/tdeio_media.cpp
index d1647c6fc..c8af18133 100644
--- a/tdeioslave/media/kio_media.cpp
+++ b/tdeioslave/media/tdeio_media.cpp
@@ -28,7 +28,7 @@
 #include <tqeventloop.h>
 
 #include "mediaimpl.h"
-#include "kio_media.h"
+#include "tdeio_media.h"
 
 
 static const KCmdLineOptions options[] =
@@ -44,7 +44,7 @@ extern "C" {
 	{
 		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
-		TDECmdLineArgs::init(argc, argv, "kio_media", 0, 0, 0, 0);
+		TDECmdLineArgs::init(argc, argv, "tdeio_media", 0, 0, 0, 0);
 		TDECmdLineArgs::addCmdLineOptions( options );
 		TDEApplication app( false, false );
 		// We want to be anonymous even if we use DCOP
@@ -273,4 +273,4 @@ void MediaProtocol::slotWarning( const TQString &msg )
 	warning( msg );
 }
 
-#include "kio_media.moc"
+#include "tdeio_media.moc"
diff --git a/tdeioslave/media/kio_media.h b/tdeioslave/media/tdeio_media.h
index bf1325475..bf1325475 100644
--- a/tdeioslave/media/kio_media.h
+++ b/tdeioslave/media/tdeio_media.h
diff --git a/tdeioslave/media/testmedia.cpp b/tdeioslave/media/testmedia.cpp
index eb0871f6f..ebd4f6b53 100644
--- a/tdeioslave/media/testmedia.cpp
+++ b/tdeioslave/media/testmedia.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kio_media.h"
+#include "tdeio_media.h"
 #include "testmedia.h"
 
 #include <config.h>
diff --git a/tdeioslave/nfs/CMakeLists.txt b/tdeioslave/nfs/CMakeLists.txt
index da9040fc9..c6ccd04f8 100644
--- a/tdeioslave/nfs/CMakeLists.txt
+++ b/tdeioslave/nfs/CMakeLists.txt
@@ -26,9 +26,9 @@ link_directories(
 install( FILES nfs.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_nfs (module) ##########################
+##### tdeio_nfs (module) ##########################
 
-set( target kio_nfs )
+set( target tdeio_nfs )
 
 add_custom_command( OUTPUT mount_xdr.c
   COMMAND rpcgen -c -o mount_xdr.c ${CMAKE_CURRENT_SOURCE_DIR}/mount.x
@@ -39,7 +39,7 @@ add_custom_command( OUTPUT nfs_prot_xdr.c
   DEPENDS nfs_prot.x )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES kio_nfs.cpp mount_xdr.c nfs_prot_xdr.c
+  SOURCES tdeio_nfs.cpp mount_xdr.c nfs_prot_xdr.c
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/nfs/Makefile.am b/tdeioslave/nfs/Makefile.am
index 4ab02fc1d..0857fa223 100644
--- a/tdeioslave/nfs/Makefile.am
+++ b/tdeioslave/nfs/Makefile.am
@@ -5,11 +5,11 @@ AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_nfs.la
+kde_module_LTLIBRARIES = tdeio_nfs.la
 
-kio_nfs_la_SOURCES = kio_nfs.cpp mount_xdr.c nfs_prot_xdr.c
-kio_nfs_la_LIBADD = -lkio $(LIBRPC)
-kio_nfs_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_nfs_la_SOURCES = tdeio_nfs.cpp mount_xdr.c nfs_prot_xdr.c
+tdeio_nfs_la_LIBADD = -ltdeio $(LIBRPC)
+tdeio_nfs_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 noinst_HEADERS = nfs_prot.h mount.h
 
 kdelnk_DATA = nfs.protocol
diff --git a/tdeioslave/nfs/nfs.protocol b/tdeioslave/nfs/nfs.protocol
index 8f62d779a..faaa442e1 100644
--- a/tdeioslave/nfs/nfs.protocol
+++ b/tdeioslave/nfs/nfs.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_nfs
+exec=tdeio_nfs
 protocol=nfs
 input=none
 output=filesystem
diff --git a/tdeioslave/nfs/kio_nfs.cpp b/tdeioslave/nfs/tdeio_nfs.cpp
index 8148a7745..d0051e10b 100644
--- a/tdeioslave/nfs/kio_nfs.cpp
+++ b/tdeioslave/nfs/tdeio_nfs.cpp
@@ -58,7 +58,7 @@
 #include "nfs_prot.h"
 #define fhandle _fhandle
 #include "mount.h"
-#include "kio_nfs.h"
+#include "tdeio_nfs.h"
 
 #define MAXHOSTLEN 256
 
@@ -113,11 +113,11 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
-  TDEInstance instance( "kio_nfs" );
+  TDEInstance instance( "tdeio_nfs" );
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_nfs protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_nfs protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
   kdDebug(7121) << "NFS: kdemain: starting" << endl;
diff --git a/tdeioslave/nfs/kio_nfs.h b/tdeioslave/nfs/tdeio_nfs.h
index b548fc487..b548fc487 100644
--- a/tdeioslave/nfs/kio_nfs.h
+++ b/tdeioslave/nfs/tdeio_nfs.h
diff --git a/tdeioslave/nntp/CMakeLists.txt b/tdeioslave/nntp/CMakeLists.txt
index d3401c455..3fb4ed1c6 100644
--- a/tdeioslave/nntp/CMakeLists.txt
+++ b/tdeioslave/nntp/CMakeLists.txt
@@ -25,9 +25,9 @@ link_directories(
 install( FILES nntp.protocol nntps.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_nntp (module) #########################
+##### tdeio_nntp (module) #########################
 
-set( target kio_nntp )
+set( target tdeio_nntp )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES nntp.cpp
diff --git a/tdeioslave/nntp/Makefile.am b/tdeioslave/nntp/Makefile.am
index a48a7de80..9f1b322eb 100644
--- a/tdeioslave/nntp/Makefile.am
+++ b/tdeioslave/nntp/Makefile.am
@@ -2,11 +2,11 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes)
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_nntp.la
+kde_module_LTLIBRARIES = tdeio_nntp.la
 
-kio_nntp_la_SOURCES = nntp.cpp
-kio_nntp_la_LIBADD  = $(LIB_KIO)
-kio_nntp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_nntp_la_SOURCES = nntp.cpp
+tdeio_nntp_la_LIBADD  = $(LIB_KIO)
+tdeio_nntp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 METASOURCES = AUTO
 
diff --git a/tdeioslave/nntp/nntp.cpp b/tdeioslave/nntp/nntp.cpp
index b92ff6a30..7353e0e2e 100644
--- a/tdeioslave/nntp/nntp.cpp
+++ b/tdeioslave/nntp/nntp.cpp
@@ -39,9 +39,9 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
 
 int kdemain(int argc, char **argv) {
 
-  TDEInstance instance ("kio_nntp");
+  TDEInstance instance ("tdeio_nntp");
   if (argc != 4) {
-    fprintf(stderr, "Usage: kio_nntp protocol domain-socket1 domain-socket2\n");
+    fprintf(stderr, "Usage: tdeio_nntp protocol domain-socket1 domain-socket2\n");
     exit(-1);
   }
 
diff --git a/tdeioslave/nntp/nntp.protocol b/tdeioslave/nntp/nntp.protocol
index 8a51f88fb..ed5754bb6 100644
--- a/tdeioslave/nntp/nntp.protocol
+++ b/tdeioslave/nntp/nntp.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_nntp
+exec=tdeio_nntp
 protocol=nntp
 input=none
 output=filesystem
diff --git a/tdeioslave/nntp/nntps.protocol b/tdeioslave/nntp/nntps.protocol
index dd975d250..aafa37218 100644
--- a/tdeioslave/nntp/nntps.protocol
+++ b/tdeioslave/nntp/nntps.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_nntp
+exec=tdeio_nntp
 protocol=nntps
 input=none
 output=filesystem
diff --git a/tdeioslave/pop3/CMakeLists.txt b/tdeioslave/pop3/CMakeLists.txt
index a5fcaf2da..fb0dbcbb1 100644
--- a/tdeioslave/pop3/CMakeLists.txt
+++ b/tdeioslave/pop3/CMakeLists.txt
@@ -26,9 +26,9 @@ link_directories(
 install( FILES pop3.protocol pop3s.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_pop3 (module) #########################
+##### tdeio_pop3 (module) #########################
 
-set( target kio_pop3 )
+set( target tdeio_pop3 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES pop3.cc
diff --git a/tdeioslave/pop3/Makefile.am b/tdeioslave/pop3/Makefile.am
index 86d649b66..1bd5c95e5 100644
--- a/tdeioslave/pop3/Makefile.am
+++ b/tdeioslave/pop3/Makefile.am
@@ -2,11 +2,11 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes)
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_pop3.la
+kde_module_LTLIBRARIES = tdeio_pop3.la
 
-kio_pop3_la_SOURCES = pop3.cc
-kio_pop3_la_LIBADD  = $(LIB_KIO) $(SASL2_LIBS)
-kio_pop3_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_pop3_la_SOURCES = pop3.cc
+tdeio_pop3_la_LIBADD  = $(LIB_KIO) $(SASL2_LIBS)
+tdeio_pop3_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = pop3.h
 
diff --git a/tdeioslave/pop3/pop3.cc b/tdeioslave/pop3/pop3.cc
index e4518da08..9b45f47f3 100644
--- a/tdeioslave/pop3/pop3.cc
+++ b/tdeioslave/pop3/pop3.cc
@@ -92,7 +92,7 @@ int kdemain(int argc, char **argv)
 {
 
   if (argc != 4) {
-    POP3_DEBUG << "Usage: kio_pop3 protocol domain-socket1 domain-socket2"
+    POP3_DEBUG << "Usage: tdeio_pop3 protocol domain-socket1 domain-socket2"
         << endl;
     return -1;
   }
@@ -104,7 +104,7 @@ int kdemain(int argc, char **argv)
   }
 #endif
 
-  TDEInstance instance("kio_pop3");
+  TDEInstance instance("tdeio_pop3");
   POP3Protocol *slave;
 
   // Are we looking to use SSL?
@@ -599,7 +599,7 @@ int POP3Protocol::loginSASL( TDEIO::AuthInfo &ai )
 #else
   if (metaData("auth") == "SASL") {
     closeConnection();
-    error(ERR_COULD_NOT_LOGIN, i18n("SASL authentication is not compiled into kio_pop3."));
+    error(ERR_COULD_NOT_LOGIN, i18n("SASL authentication is not compiled into tdeio_pop3."));
     return -1;
   }
   return 1; //if SASL not explicitly required, try another method (USER/PASS)
diff --git a/tdeioslave/pop3/pop3.protocol b/tdeioslave/pop3/pop3.protocol
index 23560fa48..7aa3e442f 100644
--- a/tdeioslave/pop3/pop3.protocol
+++ b/tdeioslave/pop3/pop3.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_pop3
+exec=tdeio_pop3
 protocol=pop3
 Capabilities=SASL
 input=none
diff --git a/tdeioslave/pop3/pop3s.protocol b/tdeioslave/pop3/pop3s.protocol
index 8bcf0c899..772f72d37 100644
--- a/tdeioslave/pop3/pop3s.protocol
+++ b/tdeioslave/pop3/pop3s.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_pop3
+exec=tdeio_pop3
 protocol=pop3s
 Capabilities=SASL
 input=none
diff --git a/tdeioslave/remote/CMakeLists.txt b/tdeioslave/remote/CMakeLists.txt
index fe4c29154..82e7c1fd1 100644
--- a/tdeioslave/remote/CMakeLists.txt
+++ b/tdeioslave/remote/CMakeLists.txt
@@ -27,24 +27,24 @@ link_directories(
 install( FILES remote.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kioremote (static) ########################
+##### tdeioremote (static) ########################
 
-set( target kioremote )
+set( target tdeioremote )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
-  SOURCES kio_remote.cpp remoteimpl.cpp
+  SOURCES tdeio_remote.cpp remoteimpl.cpp
 )
 
 
-##### kio_remote (module) #######################
+##### tdeio_remote (module) #######################
 
-set( target kio_remote )
+set( target tdeio_remote )
 
 configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY )
 
 tde_add_kpart( ${target}
   SOURCES dummy.cpp
-  EMBED kioremote-static
+  EMBED tdeioremote-static
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/remote/Makefile.am b/tdeioslave/remote/Makefile.am
index 4acb4e999..780e0ac36 100644
--- a/tdeioslave/remote/Makefile.am
+++ b/tdeioslave/remote/Makefile.am
@@ -4,11 +4,11 @@ SUBDIRS= . kdedmodule
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
-kde_module_LTLIBRARIES = kio_remote.la
+kde_module_LTLIBRARIES = tdeio_remote.la
 
-kio_remote_la_SOURCES = dummy.cpp
-kio_remote_la_LIBADD  = libtdeioremote.la $(LIB_KIO)
-kio_remote_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
+tdeio_remote_la_SOURCES = dummy.cpp
+tdeio_remote_la_LIBADD  = libtdeioremote.la $(LIB_KIO)
+tdeio_remote_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
 dummy.cpp:
 	echo > dummy.cpp
@@ -16,7 +16,7 @@ dummy.cpp:
 kde_services_DATA = remote.protocol
 
 noinst_LTLIBRARIES = libtdeioremote.la
-libtdeioremote_la_SOURCES = kio_remote.cpp remoteimpl.cpp
+libtdeioremote_la_SOURCES = tdeio_remote.cpp remoteimpl.cpp
 
 check_PROGRAMS = testremote
 testremote_SOURCES = testremote.cpp
diff --git a/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp b/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp
index 13bfcfc29..04b7a2bee 100644
--- a/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp
+++ b/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp
@@ -30,7 +30,7 @@ RemoteDirNotifyModule::RemoteDirNotifyModule(const TQCString &obj)
 extern "C" {
 	KDE_EXPORT KDEDModule *create_remotedirnotify(const TQCString &obj)
 	{
-		TDEGlobal::locale()->insertCatalogue("kio_remote");
+		TDEGlobal::locale()->insertCatalogue("tdeio_remote");
 		return new RemoteDirNotifyModule(obj);
 	}
 }
diff --git a/tdeioslave/remote/remote.protocol b/tdeioslave/remote/remote.protocol
index 69cc638aa..2d28b3a47 100644
--- a/tdeioslave/remote/remote.protocol
+++ b/tdeioslave/remote/remote.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_remote
+exec=tdeio_remote
 protocol=remote
 input=none
 output=filesystem
diff --git a/tdeioslave/remote/kio_remote.cpp b/tdeioslave/remote/tdeio_remote.cpp
index 87437700f..d4522de3e 100644
--- a/tdeioslave/remote/kio_remote.cpp
+++ b/tdeioslave/remote/tdeio_remote.cpp
@@ -27,7 +27,7 @@
 #include <kglobal.h>
 
 
-#include "kio_remote.h"
+#include "tdeio_remote.h"
 
 static const KCmdLineOptions options[] =
 {
@@ -42,7 +42,7 @@ extern "C" {
 	{
 		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
-		TDECmdLineArgs::init(argc, argv, "kio_remote", 0, 0, 0, 0);
+		TDECmdLineArgs::init(argc, argv, "tdeio_remote", 0, 0, 0, 0);
 		TDECmdLineArgs::addCmdLineOptions( options );
 		TDEApplication app( false, false );
 		// We want to be anonymous even if we use DCOP
diff --git a/tdeioslave/remote/kio_remote.h b/tdeioslave/remote/tdeio_remote.h
index ebc6dd1ad..ebc6dd1ad 100644
--- a/tdeioslave/remote/kio_remote.h
+++ b/tdeioslave/remote/tdeio_remote.h
diff --git a/tdeioslave/remote/testremote.cpp b/tdeioslave/remote/testremote.cpp
index d091c5bc4..3071772a9 100644
--- a/tdeioslave/remote/testremote.cpp
+++ b/tdeioslave/remote/testremote.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kio_remote.h"
+#include "tdeio_remote.h"
 #include "testremote.h"
 
 #include <config.h>
diff --git a/tdeioslave/settings/CMakeLists.txt b/tdeioslave/settings/CMakeLists.txt
index c2a0d1d06..9b723f8b4 100644
--- a/tdeioslave/settings/CMakeLists.txt
+++ b/tdeioslave/settings/CMakeLists.txt
@@ -27,12 +27,12 @@ install( FILES
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_settings (module) #####################
+##### tdeio_settings (module) #####################
 
-set( target kio_settings )
+set( target tdeio_settings )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES kio_settings.cc
+  SOURCES tdeio_settings.cc
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/settings/Makefile.am b/tdeioslave/settings/Makefile.am
index 7daa4e009..2c2ac9320 100644
--- a/tdeioslave/settings/Makefile.am
+++ b/tdeioslave/settings/Makefile.am
@@ -2,13 +2,13 @@ INCLUDES= $(all_includes)
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_settings.la
+kde_module_LTLIBRARIES = tdeio_settings.la
 
-kio_settings_la_SOURCES = kio_settings.cc
-kio_settings_la_LIBADD  = $(LIB_KSYCOCA)
-kio_settings_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_settings_la_SOURCES = tdeio_settings.cc
+tdeio_settings_la_LIBADD  = $(LIB_KSYCOCA)
+tdeio_settings_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
-noinst_HEADERS = kio_settings.h
+noinst_HEADERS = tdeio_settings.h
 
 kdelnk_DATA = settings.protocol programs.protocol applications.protocol
 kdelnkdir = $(kde_servicesdir)
diff --git a/tdeioslave/settings/applications.protocol b/tdeioslave/settings/applications.protocol
index 0193dfb8b..7d35ae254 100644
--- a/tdeioslave/settings/applications.protocol
+++ b/tdeioslave/settings/applications.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_settings
+exec=tdeio_settings
 protocol=applications
 input=none
 output=filesystem
diff --git a/tdeioslave/settings/programs.protocol b/tdeioslave/settings/programs.protocol
index c09ac6372..a02219d3e 100644
--- a/tdeioslave/settings/programs.protocol
+++ b/tdeioslave/settings/programs.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_settings
+exec=tdeio_settings
 protocol=programs
 input=none
 output=filesystem
diff --git a/tdeioslave/settings/settings.protocol b/tdeioslave/settings/settings.protocol
index 268bc0c69..a02ed9145 100644
--- a/tdeioslave/settings/settings.protocol
+++ b/tdeioslave/settings/settings.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_settings
+exec=tdeio_settings
 protocol=settings
 input=none
 output=filesystem
diff --git a/tdeioslave/settings/kio_settings.cc b/tdeioslave/settings/tdeio_settings.cc
index 7060df177..47635693d 100644
--- a/tdeioslave/settings/kio_settings.cc
+++ b/tdeioslave/settings/tdeio_settings.cc
@@ -52,7 +52,7 @@ extern "C" {
 	KDE_EXPORT int kdemain( int, char **argv )
 	{
 	  kdDebug() << "kdemain for settings tdeioslave" << endl;
-	  TDEInstance instance( "kio_settings" );
+	  TDEInstance instance( "tdeio_settings" );
 	  SettingsProtocol slave(argv[1], argv[2], argv[3]);
 	  slave.dispatchLoop();
 	  return 0;
diff --git a/tdeioslave/settings/kio_settings.h b/tdeioslave/settings/tdeio_settings.h
index e69de29bb..e69de29bb 100644
--- a/tdeioslave/settings/kio_settings.h
+++ b/tdeioslave/settings/tdeio_settings.h
diff --git a/tdeioslave/sftp/CHANGELOG b/tdeioslave/sftp/CHANGELOG
index b60e7f44b..c34cd9dec 100644
--- a/tdeioslave/sftp/CHANGELOG
+++ b/tdeioslave/sftp/CHANGELOG
@@ -32,7 +32,7 @@
 7-22-2001 - probable solution to getting password prompt -- open with controlling
             but don't connect stdin/out to terminal. duh!
 8-9-2001  - Doh! I haven't kept very good logs. Look at the cvs logs for better info.
-          - At this point kio_sftp is using KSshProcess which I wrote in order to make
+          - At this point tdeio_sftp is using KSshProcess which I wrote in order to make
             a standard interface to the various version of ssh out there. So far it is
             working fairly well.  We also now report host key changes to the user and
             allow them to choose whether or not to continue. This is a big improvement.
diff --git a/tdeioslave/sftp/CMakeLists.txt b/tdeioslave/sftp/CMakeLists.txt
index cf07ed2b3..0cee3a838 100644
--- a/tdeioslave/sftp/CMakeLists.txt
+++ b/tdeioslave/sftp/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 install( FILES sftp.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_sftp (module) #########################
+##### tdeio_sftp (module) #########################
 
-set( target kio_sftp )
+set( target tdeio_sftp )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES process.cpp atomicio.cpp kio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
+  SOURCES process.cpp atomicio.cpp tdeio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/sftp/Makefile.am b/tdeioslave/sftp/Makefile.am
index 4bc14c203..d64f7567c 100644
--- a/tdeioslave/sftp/Makefile.am
+++ b/tdeioslave/sftp/Makefile.am
@@ -11,12 +11,12 @@ check_PROGRAMS = ksshprocesstest
 ksshprocesstest_SOURCES = ksshprocesstest.cpp
 ksshprocesstest_LDADD = $(LIB_KSYCOCA) ksshprocess.lo process.lo atomicio.lo
 
-kde_module_LTLIBRARIES = kio_sftp.la
+kde_module_LTLIBRARIES = tdeio_sftp.la
 
-kio_sftp_la_SOURCES = process.cpp atomicio.cpp kio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
-kio_sftp_la_LIBADD = $(LIB_KIO)
-kio_sftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-noinst_HEADERS = atomicio.h kio_sftp.h ksshprocess.h process.h sftpfileattr.h sftp.h
+tdeio_sftp_la_SOURCES = process.cpp atomicio.cpp tdeio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
+tdeio_sftp_la_LIBADD = $(LIB_KIO)
+tdeio_sftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+noinst_HEADERS = atomicio.h tdeio_sftp.h ksshprocess.h process.h sftpfileattr.h sftp.h
 
 kdelnk_DATA = sftp.protocol
 kdelnkdir = $(kde_servicesdir)
diff --git a/tdeioslave/sftp/sftp.protocol b/tdeioslave/sftp/sftp.protocol
index 3b915bff8..522b23b01 100644
--- a/tdeioslave/sftp/sftp.protocol
+++ b/tdeioslave/sftp/sftp.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_sftp
+exec=tdeio_sftp
 protocol=sftp
 input=none
 listing=Name,Type,Size,Date,Access,Owner,Group,Link
diff --git a/tdeioslave/sftp/kio_sftp.cpp b/tdeioslave/sftp/tdeio_sftp.cpp
index 719fb9136..f31ad03c6 100644
--- a/tdeioslave/sftp/kio_sftp.cpp
+++ b/tdeioslave/sftp/tdeio_sftp.cpp
@@ -68,7 +68,7 @@ So we can't connect.
 #include <kremoteencoding.h>
 
 #include "sftp.h"
-#include "kio_sftp.h"
+#include "tdeio_sftp.h"
 #include "atomicio.h"
 #include "sftpfileattr.h"
 #include "ksshprocess.h"
@@ -79,19 +79,19 @@ extern "C"
 {
   int KDE_EXPORT kdemain( int argc, char **argv )
   {
-    TDEInstance instance( "kio_sftp" );
+    TDEInstance instance( "tdeio_sftp" );
 
-    kdDebug(KIO_SFTP_DB) << "*** Starting kio_sftp " << endl;
+    kdDebug(KIO_SFTP_DB) << "*** Starting tdeio_sftp " << endl;
 
     if (argc != 4) {
-      kdDebug(KIO_SFTP_DB) << "Usage: kio_sftp  protocol domain-socket1 domain-socket2" << endl;
+      kdDebug(KIO_SFTP_DB) << "Usage: tdeio_sftp  protocol domain-socket1 domain-socket2" << endl;
       exit(-1);
     }
 
     sftpProtocol slave(argv[2], argv[3]);
     slave.dispatchLoop();
 
-    kdDebug(KIO_SFTP_DB) << "*** kio_sftp Done" << endl;
+    kdDebug(KIO_SFTP_DB) << "*** tdeio_sftp Done" << endl;
     return 0;
   }
 }
@@ -132,7 +132,7 @@ static int writeToFile (int fd, const char *buf, size_t len)
 }
 
 sftpProtocol::sftpProtocol(const TQCString &pool_socket, const TQCString &app_socket)
-             : SlaveBase("kio_sftp", pool_socket, app_socket),
+             : SlaveBase("tdeio_sftp", pool_socket, app_socket),
                   mConnected(false), mPort(-1), mMsgId(0) {
   kdDebug(KIO_SFTP_DB) << "sftpProtocol(): pid = " << getpid() << endl;
 }
@@ -1899,7 +1899,7 @@ int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){
     }
 
     if( type != SSH2_FXP_NAME ) {
-        kdError(KIO_SFTP_DB) << "kio_sftpProtocl::sftpReadDir(): Unexpected message" << endl;
+        kdError(KIO_SFTP_DB) << "tdeio_sftpProtocl::sftpReadDir(): Unexpected message" << endl;
         return -1;
     }
 
diff --git a/tdeioslave/sftp/kio_sftp.h b/tdeioslave/sftp/tdeio_sftp.h
index 1674221b8..23ff101b7 100644
--- a/tdeioslave/sftp/kio_sftp.h
+++ b/tdeioslave/sftp/tdeio_sftp.h
@@ -14,8 +14,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef __kio_sftp_h__
-#define __kio_sftp_h__
+#ifndef __tdeio_sftp_h__
+#define __tdeio_sftp_h__
 
 #include <tqstring.h>
 #include <tqcstring.h>
diff --git a/tdeioslave/smb/CMakeLists.txt b/tdeioslave/smb/CMakeLists.txt
index 2493c2a85..23cc1f000 100644
--- a/tdeioslave/smb/CMakeLists.txt
+++ b/tdeioslave/smb/CMakeLists.txt
@@ -32,12 +32,12 @@ install( FILES smb-network.desktop DESTINATION ${DATA_INSTALL_DIR}/remoteview )
 install( FILES x-smb-workgroup.desktop x-smb-server.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
 
 
-##### kio_smb (module) ##########################
+##### tdeio_smb (module) ##########################
 
-tde_add_kpart( kio_smb AUTOMOC
+tde_add_kpart( tdeio_smb AUTOMOC
   SOURCES
-    kio_smb.cpp kio_smb_auth.cpp kio_smb_browse.cpp kio_smb_config.cpp
-    kio_smb_dir.cpp kio_smb_file.cpp kio_smb_internal.cpp kio_smb_mount.cpp
+    tdeio_smb.cpp tdeio_smb_auth.cpp tdeio_smb_browse.cpp tdeio_smb_config.cpp
+    tdeio_smb_dir.cpp tdeio_smb_file.cpp tdeio_smb_internal.cpp tdeio_smb_mount.cpp
   LINK tdeio-shared ${SMBCLIENT_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/smb/Makefile.am b/tdeioslave/smb/Makefile.am
index 97a4034da..ed3ef6d46 100644
--- a/tdeioslave/smb/Makefile.am
+++ b/tdeioslave/smb/Makefile.am
@@ -2,21 +2,21 @@
 
 INCLUDES=$(all_includes)
 
-kde_module_LTLIBRARIES = kio_smb.la
-kio_smb_la_SOURCES = kio_smb.cpp \
-             kio_smb_auth.cpp \
-             kio_smb_browse.cpp \
-             kio_smb_config.cpp \
-             kio_smb_dir.cpp \
-             kio_smb_file.cpp \
-             kio_smb_internal.cpp \
-	     kio_smb_mount.cpp
+kde_module_LTLIBRARIES = tdeio_smb.la
+tdeio_smb_la_SOURCES = tdeio_smb.cpp \
+             tdeio_smb_auth.cpp \
+             tdeio_smb_browse.cpp \
+             tdeio_smb_config.cpp \
+             tdeio_smb_dir.cpp \
+             tdeio_smb_file.cpp \
+             tdeio_smb_internal.cpp \
+	     tdeio_smb_mount.cpp
 
-kio_smb_la_LIBADD = -lkio -lsmbclient $(SMBCLIENT_EXTRA_LIBS)
+tdeio_smb_la_LIBADD = -ltdeio -lsmbclient $(SMBCLIENT_EXTRA_LIBS)
 
-kio_smb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_smb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
-noinst_HEADERS = kio_smb.h kio_smb_internal.h
+noinst_HEADERS = tdeio_smb.h tdeio_smb_internal.h
 
 kdelnk_DATA = smb.protocol
 
diff --git a/tdeioslave/smb/smb.protocol b/tdeioslave/smb/smb.protocol
index 2c0bda020..06ac69a10 100644
--- a/tdeioslave/smb/smb.protocol
+++ b/tdeioslave/smb/smb.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_smb
+exec=tdeio_smb
 protocol=smb
 input=none
 output=filesystem
diff --git a/tdeioslave/smb/kio_smb.cpp b/tdeioslave/smb/tdeio_smb.cpp
index 193df965f..8ee270256 100644
--- a/tdeioslave/smb/kio_smb.cpp
+++ b/tdeioslave/smb/tdeio_smb.cpp
@@ -2,7 +2,7 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        Top level implementation file for kio_smb.cpp
+// File:        Top level implementation file for tdeio_smb.cpp
 //
 // Abstract:    member function implementations for SMBSlave
 //
@@ -28,8 +28,8 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#include "kio_smb.h"
-#include "kio_smb_internal.h"
+#include "tdeio_smb.h"
+#include "tdeio_smb_internal.h"
 
 //===========================================================================
 SMBSlave::SMBSlave(const TQCString& pool, const TQCString& app)
@@ -59,10 +59,10 @@ SMBSlave* G_TheSlave;
 int KDE_EXPORT kdemain( int argc, char **argv )
 {
 
-    TDEInstance instance( "kio_smb" );
+    TDEInstance instance( "tdeio_smb" );
     if( argc != 4 )
     {
-        kdDebug(KIO_SMB) << "Usage: kio_smb protocol domain-socket1 domain-socket2"
+        kdDebug(KIO_SMB) << "Usage: tdeio_smb protocol domain-socket1 domain-socket2"
                   << endl;
         return -1;
     }
diff --git a/tdeioslave/smb/kio_smb.h b/tdeioslave/smb/tdeio_smb.h
index 34ad0200a..0c89eae95 100644
--- a/tdeioslave/smb/kio_smb.h
+++ b/tdeioslave/smb/tdeio_smb.h
@@ -2,9 +2,9 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        kio_smb.h
+// File:        tdeio_smb.h
 //
-// Abstract:    The main kio slave class declaration.  For convenience,
+// Abstract:    The main tdeio slave class declaration.  For convenience,
 //              in concurrent devlopment, the implementation for this class
 //              is separated into several .cpp files -- the file containing
 //              the implementation should be noted in the comments for each
@@ -79,9 +79,9 @@ extern "C"
 }
 
 //---------------------------
-// kio_smb internal includes
+// tdeio_smb internal includes
 //---------------------------
-#include "kio_smb_internal.h"
+#include "tdeio_smb_internal.h"
 
 #define MAX_XFER_BUF_SIZE           16348
 #define KIO_SMB                     7106
@@ -129,7 +129,7 @@ private:
     struct stat st;
 protected:
     //---------------------------------------------
-    // Authentication functions (kio_smb_auth.cpp)
+    // Authentication functions (tdeio_smb_auth.cpp)
     //---------------------------------------------
     // (please prefix functions with auth)
 
@@ -144,13 +144,13 @@ protected:
 
 
     //---------------------------------------------
-    // Cache functions (kio_smb_auth.cpp)
+    // Cache functions (tdeio_smb_auth.cpp)
     //---------------------------------------------
 
     //Stat methods
 
     //-----------------------------------------
-    // Browsing functions (kio_smb_browse.cpp)
+    // Browsing functions (tdeio_smb_browse.cpp)
     //-----------------------------------------
     // (please prefix functions with browse)
 
@@ -175,19 +175,19 @@ protected:
     int cache_stat( const SMBUrl& url, struct stat* st );
 
     //---------------------------------------------
-    // Configuration functions (kio_smb_config.cpp)
+    // Configuration functions (tdeio_smb_config.cpp)
     //---------------------------------------------
     // (please prefix functions with config)
 
 
     //---------------------------------------
-    // Directory functions (kio_smb_dir.cpp)
+    // Directory functions (tdeio_smb_dir.cpp)
     //---------------------------------------
     // (please prefix functions with dir)
 
 
     //--------------------------------------
-    // File IO functions (kio_smb_file.cpp)
+    // File IO functions (tdeio_smb_file.cpp)
     //--------------------------------------
     // (please prefix functions with file)
 
@@ -233,24 +233,24 @@ public:
     // details)
     //-----------------------------------------------------------------------
 
-    // Functions overwritten in kio_smb.cpp
+    // Functions overwritten in tdeio_smb.cpp
     SMBSlave(const TQCString& pool, const TQCString& app);
     virtual ~SMBSlave();
 
-    // Functions overwritten in kio_smb_browse.cpp
+    // Functions overwritten in tdeio_smb_browse.cpp
     virtual void listDir( const KURL& url );
     virtual void stat( const KURL& url );
 
-    // Functions overwritten in kio_smb_config.cpp
+    // Functions overwritten in tdeio_smb_config.cpp
     virtual void reparseConfiguration();
 
-    // Functions overwritten in kio_smb_dir.cpp
+    // Functions overwritten in tdeio_smb_dir.cpp
     virtual void copy( const KURL& src, const KURL &dest, int permissions, bool overwrite );
     virtual void del( const KURL& kurl, bool isfile);
     virtual void mkdir( const KURL& kurl, int permissions );
     virtual void rename( const KURL& src, const KURL& dest, bool overwrite );
 
-    // Functions overwritten in kio_smb_file.cpp
+    // Functions overwritten in tdeio_smb_file.cpp
     virtual void get( const KURL& kurl );
     virtual void put( const KURL& kurl, int permissions, bool overwrite, bool resume );
 
@@ -289,7 +289,7 @@ void auth_smbc_get_data(const char *server,const char *share,
 
 
 //===========================================================================
-// Main slave entrypoint (see kio_smb.cpp)
+// Main slave entrypoint (see tdeio_smb.cpp)
 extern "C"
 {
 
diff --git a/tdeioslave/smb/kio_smb_auth.cpp b/tdeioslave/smb/tdeio_smb_auth.cpp
index f11d80b3a..ebc15c1c6 100644
--- a/tdeioslave/smb/kio_smb_auth.cpp
+++ b/tdeioslave/smb/tdeio_smb_auth.cpp
@@ -2,7 +2,7 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        kio_smb_auth.cpp
+// File:        tdeio_smb_auth.cpp
 //
 // Abstract:    member function implementations for SMBSlave that deal with
 //              SMB directory access
@@ -29,8 +29,8 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#include "kio_smb.h"
-#include "kio_smb_internal.h"
+#include "tdeio_smb.h"
+#include "tdeio_smb_internal.h"
 
 #include <ksimpleconfig.h>
 #include <tqdir.h>
diff --git a/tdeioslave/smb/kio_smb_browse.cpp b/tdeioslave/smb/tdeio_smb_browse.cpp
index 26c379bde..e06bb81d1 100644
--- a/tdeioslave/smb/kio_smb_browse.cpp
+++ b/tdeioslave/smb/tdeio_smb_browse.cpp
@@ -3,7 +3,7 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        kio_smb_browse.cpp
+// File:        tdeio_smb_browse.cpp
 //
 // Abstract:    member function implementations for SMBSlave that deal with
 //              SMB browsing
@@ -38,8 +38,8 @@
 
 #include <kglobal.h>
 
-#include "kio_smb.h"
-#include "kio_smb_internal.h"
+#include "tdeio_smb.h"
+#include "tdeio_smb_internal.h"
 
 using namespace TDEIO;
 
diff --git a/tdeioslave/smb/kio_smb_config.cpp b/tdeioslave/smb/tdeio_smb_config.cpp
index 8179371e7..f2f1ce562 100644
--- a/tdeioslave/smb/kio_smb_config.cpp
+++ b/tdeioslave/smb/tdeio_smb_config.cpp
@@ -2,7 +2,7 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        kio_smb_config.cpp
+// File:        tdeio_smb_config.cpp
 //
 // Abstract:    member function implementations for SMBSlave that deal with
 //              KDE/SMB slave configuration
@@ -29,8 +29,8 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#include "kio_smb.h"
-#include "kio_smb_internal.h"
+#include "tdeio_smb.h"
+#include "tdeio_smb_internal.h"
 #include <tdeconfig.h>
 
 #include <tqtextcodec.h>
diff --git a/tdeioslave/smb/kio_smb_dir.cpp b/tdeioslave/smb/tdeio_smb_dir.cpp
index 02dfc8100..e27420336 100644
--- a/tdeioslave/smb/kio_smb_dir.cpp
+++ b/tdeioslave/smb/tdeio_smb_dir.cpp
@@ -2,7 +2,7 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        kio_smb_dir.cpp
+// File:        tdeio_smb_dir.cpp
 //
 // Abstract:    member function implementations for SMBSlave that deal with
 //              SMB directory access
@@ -29,8 +29,8 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#include "kio_smb.h"
-#include "kio_smb_internal.h"
+#include "tdeio_smb.h"
+#include "tdeio_smb_internal.h"
 
 
 //===========================================================================
diff --git a/tdeioslave/smb/kio_smb_file.cpp b/tdeioslave/smb/tdeio_smb_file.cpp
index b65f79f42..a6c010526 100644
--- a/tdeioslave/smb/kio_smb_file.cpp
+++ b/tdeioslave/smb/tdeio_smb_file.cpp
@@ -2,7 +2,7 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        kio_smb_file.cpp
+// File:        tdeio_smb_file.cpp
 //
 // Abstract:    member function implementations for SMBSlave that deal with
 //              SMB file access
@@ -30,8 +30,8 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-#include "kio_smb.h"
-#include "kio_smb_internal.h"
+#include "tdeio_smb.h"
+#include "tdeio_smb_internal.h"
 
 #include <kmimetype.h>
 
diff --git a/tdeioslave/smb/kio_smb_internal.cpp b/tdeioslave/smb/tdeio_smb_internal.cpp
index 8f56a8f62..de3f98127 100644
--- a/tdeioslave/smb/kio_smb_internal.cpp
+++ b/tdeioslave/smb/tdeio_smb_internal.cpp
@@ -2,7 +2,7 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        kio_smb_internal.cpp
+// File:        tdeio_smb_internal.cpp
 //
 // Abstract:    Utility class implementation used by SMBSlave
 //
@@ -28,8 +28,8 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#include "kio_smb.h"
-#include "kio_smb_internal.h"
+#include "tdeio_smb.h"
+#include "tdeio_smb_internal.h"
 
 #include <tqtextcodec.h>
 
diff --git a/tdeioslave/smb/kio_smb_internal.h b/tdeioslave/smb/tdeio_smb_internal.h
index 2d97aee31..3eeae43a7 100644
--- a/tdeioslave/smb/kio_smb_internal.h
+++ b/tdeioslave/smb/tdeio_smb_internal.h
@@ -2,7 +2,7 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        kio_smb_internal.h
+// File:        tdeio_smb_internal.h
 //
 // Abstract:    Utility classes used by SMBSlave
 //
diff --git a/tdeioslave/smb/kio_smb_mount.cpp b/tdeioslave/smb/tdeio_smb_mount.cpp
index ad421f631..1cda7f5f4 100644
--- a/tdeioslave/smb/kio_smb_mount.cpp
+++ b/tdeioslave/smb/tdeio_smb_mount.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kio_smb.h"
+#include "tdeio_smb.h"
 #include <kstandarddirs.h>
 #include <tqcstring.h>
 #include <unistd.h>
@@ -208,4 +208,4 @@ void SMBSlave::special( const TQByteArray & data)
    finished();
 }
 
-#include "kio_smb.moc"
+#include "tdeio_smb.moc"
diff --git a/tdeioslave/smtp/CMakeLists.txt b/tdeioslave/smtp/CMakeLists.txt
index 57095a364..f9171e665 100644
--- a/tdeioslave/smtp/CMakeLists.txt
+++ b/tdeioslave/smtp/CMakeLists.txt
@@ -26,9 +26,9 @@ link_directories(
 install( FILES smtp.protocol smtps.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_smtp (module) #########################
+##### tdeio_smtp (module) #########################
 
-set( target kio_smtp )
+set( target tdeio_smtp )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc
diff --git a/tdeioslave/smtp/Makefile.am b/tdeioslave/smtp/Makefile.am
index 7808a24db..e6db9885c 100644
--- a/tdeioslave/smtp/Makefile.am
+++ b/tdeioslave/smtp/Makefile.am
@@ -1,11 +1,11 @@
 
 INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes)
 
-kde_module_LTLIBRARIES = kio_smtp.la
+kde_module_LTLIBRARIES = tdeio_smtp.la
 
-kio_smtp_la_SOURCES = smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc
-kio_smtp_la_LIBADD  = $(LIB_KIO) $(SASL2_LIBS)
-kio_smtp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_smtp_la_SOURCES = smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc
+tdeio_smtp_la_LIBADD  = $(LIB_KIO) $(SASL2_LIBS)
+tdeio_smtp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = smtp.h request.h response.h capabilities.h command.h transactionstate.h
 
@@ -25,7 +25,7 @@ test_responseparser_LDADD =  $(LIB_TDECORE)
 test_responseparser_LDFLAGS = $(all_libraries)
 
 test_commands_SOURCES = test_commands.cc
-test_commands_LDADD =  $(kio_smtp_la_LIBADD)
+test_commands_LDADD =  $(tdeio_smtp_la_LIBADD)
 test_commands_LDFLAGS = $(all_libraries)
 
 interactivesmtpserver_SOURCES = interactivesmtpserver.cc
diff --git a/tdeioslave/smtp/capabilities.cc b/tdeioslave/smtp/capabilities.cc
index bf91071b3..f4f20fa7a 100644
--- a/tdeioslave/smtp/capabilities.cc
+++ b/tdeioslave/smtp/capabilities.cc
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     capabilities.cc
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <[email protected]>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/tdeioslave/smtp/capabilities.h b/tdeioslave/smtp/capabilities.h
index 5004cbaac..1af13e365 100644
--- a/tdeioslave/smtp/capabilities.h
+++ b/tdeioslave/smtp/capabilities.h
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     capabilities.h
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <[email protected]>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/tdeioslave/smtp/command.cc b/tdeioslave/smtp/command.cc
index 3817d5fd6..8543f6c03 100644
--- a/tdeioslave/smtp/command.cc
+++ b/tdeioslave/smtp/command.cc
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     command.cc
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <[email protected]>
 
     This program is free software; you can redistribute it and/or modify it
@@ -239,7 +239,7 @@ static sasl_callback_t callbacks[] = {
     kdDebug(7112) << "Mechanism: " << mMechusing << " one step: " << mOneStep << endl;
 #else
   mSMTP->error(TDEIO::ERR_COULD_NOT_AUTHENTICATE,
-      i18n("Authentication support is not compiled into kio_smtp."));
+      i18n("Authentication support is not compiled into tdeio_smtp."));
 #endif
   }
 
diff --git a/tdeioslave/smtp/command.h b/tdeioslave/smtp/command.h
index 48d08df22..c634d1a86 100644
--- a/tdeioslave/smtp/command.h
+++ b/tdeioslave/smtp/command.h
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     command.h
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <[email protected]>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/tdeioslave/smtp/interactivesmtpserver.cc b/tdeioslave/smtp/interactivesmtpserver.cc
index 7e84b8d3e..5f25ca1ca 100644
--- a/tdeioslave/smtp/interactivesmtpserver.cc
+++ b/tdeioslave/smtp/interactivesmtpserver.cc
@@ -3,7 +3,7 @@
 
     Code based on the serverSocket example by Jesper Pedersen.
 
-    This file is part of the testsuite of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of the testsuite of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2004 Marc Mutz <[email protected]>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/tdeioslave/smtp/interactivesmtpserver.h b/tdeioslave/smtp/interactivesmtpserver.h
index 3e4b4b29d..b4731d44c 100644
--- a/tdeioslave/smtp/interactivesmtpserver.h
+++ b/tdeioslave/smtp/interactivesmtpserver.h
@@ -6,7 +6,7 @@
 
     Code based on the serverSocket example by Jesper Pedersen.
 
-    This file is part of the testsuite of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of the testsuite of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2004 Marc Mutz <[email protected]>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/tdeioslave/smtp/request.cc b/tdeioslave/smtp/request.cc
index 8019a04f7..4e3cde0e1 100644
--- a/tdeioslave/smtp/request.cc
+++ b/tdeioslave/smtp/request.cc
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     request.cc
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <[email protected]>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/tdeioslave/smtp/request.h b/tdeioslave/smtp/request.h
index 21e2067fb..37d74d2de 100644
--- a/tdeioslave/smtp/request.h
+++ b/tdeioslave/smtp/request.h
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     request.h
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <[email protected]>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/tdeioslave/smtp/response.cc b/tdeioslave/smtp/response.cc
index da5569cf7..6c29d31bf 100644
--- a/tdeioslave/smtp/response.cc
+++ b/tdeioslave/smtp/response.cc
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     response.cc
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <[email protected]>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/tdeioslave/smtp/response.h b/tdeioslave/smtp/response.h
index 6c749b9e4..f2caf62e0 100644
--- a/tdeioslave/smtp/response.h
+++ b/tdeioslave/smtp/response.h
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     response.h
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <[email protected]>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/tdeioslave/smtp/smtp.cc b/tdeioslave/smtp/smtp.cc
index aa3ebfe75..3dfb8a053 100644
--- a/tdeioslave/smtp/smtp.cc
+++ b/tdeioslave/smtp/smtp.cc
@@ -95,11 +95,11 @@ extern "C" {
 
 int kdemain(int argc, char **argv)
 {
-  TDEInstance instance("kio_smtp");
+  TDEInstance instance("tdeio_smtp");
 
   if (argc != 4) {
     fprintf(stderr,
-            "Usage: kio_smtp protocol domain-socket1 domain-socket2\n");
+            "Usage: tdeio_smtp protocol domain-socket1 domain-socket2\n");
     exit(-1);
   }
 
@@ -199,7 +199,7 @@ void SMTPProtocol::put(const KURL & url, int /*permissions */ ,
   KEMailSettings mset;
   KURL open_url = url;
   if ( !request.hasProfile() ) {
-    //kdDebug(7112) << "kio_smtp: Profile is null" << endl;
+    //kdDebug(7112) << "tdeio_smtp: Profile is null" << endl;
     bool hasProfile = mset.profiles().contains( open_url.host() );
     if ( hasProfile ) {
       mset.setProfile(open_url.host());
diff --git a/tdeioslave/smtp/smtp.protocol b/tdeioslave/smtp/smtp.protocol
index 9a90cc397..4e757c7bd 100644
--- a/tdeioslave/smtp/smtp.protocol
+++ b/tdeioslave/smtp/smtp.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_smtp
+exec=tdeio_smtp
 protocol=smtp
 Capabilities=SASL
 input=none
diff --git a/tdeioslave/smtp/smtps.protocol b/tdeioslave/smtp/smtps.protocol
index 2087845f2..177458777 100644
--- a/tdeioslave/smtp/smtps.protocol
+++ b/tdeioslave/smtp/smtps.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_smtp
+exec=tdeio_smtp
 protocol=smtps
 Capabilities=SASL
 input=none
diff --git a/tdeioslave/smtp/transactionstate.cc b/tdeioslave/smtp/transactionstate.cc
index 886fe35b5..71a3e682c 100644
--- a/tdeioslave/smtp/transactionstate.cc
+++ b/tdeioslave/smtp/transactionstate.cc
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     transactionstate.cc
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <[email protected]>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/tdeioslave/smtp/transactionstate.h b/tdeioslave/smtp/transactionstate.h
index c62f52ae0..a5a78f49c 100644
--- a/tdeioslave/smtp/transactionstate.h
+++ b/tdeioslave/smtp/transactionstate.h
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     transactionstate.h
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <[email protected]>
 
     This program is free software; you can redistribute it and/or modify it
diff --git a/tdeioslave/system/CMakeLists.txt b/tdeioslave/system/CMakeLists.txt
index b9fea814d..113f9bfc3 100644
--- a/tdeioslave/system/CMakeLists.txt
+++ b/tdeioslave/system/CMakeLists.txt
@@ -29,22 +29,22 @@ link_directories(
 install( FILES system.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kiosystem (static) ########################
+##### tdeiosystem (static) ########################
 
-set( target kiosystem )
+set( target tdeiosystem )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
-  SOURCES kio_system.cpp systemimpl.cpp
+  SOURCES tdeio_system.cpp systemimpl.cpp
 )
 
 
-##### kio_system (module) #######################
+##### tdeio_system (module) #######################
 
-set( target kio_system )
+set( target tdeio_system )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES dummy.cpp
-  EMBED kiosystem-static
+  EMBED tdeiosystem-static
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/system/Makefile.am b/tdeioslave/system/Makefile.am
index 5fc63eb5c..58d779a9b 100644
--- a/tdeioslave/system/Makefile.am
+++ b/tdeioslave/system/Makefile.am
@@ -3,11 +3,11 @@ SUBDIRS= . kdedmodule entries mimetypes
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
-kde_module_LTLIBRARIES = kio_system.la
+kde_module_LTLIBRARIES = tdeio_system.la
 
-kio_system_la_SOURCES = dummy.cpp
-kio_system_la_LIBADD  = libtdeiosystem.la $(LIB_KIO)
-kio_system_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
+tdeio_system_la_SOURCES = dummy.cpp
+tdeio_system_la_LIBADD  = libtdeiosystem.la $(LIB_KIO)
+tdeio_system_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
 dummy.cpp:
 	echo > dummy.cpp
@@ -15,7 +15,7 @@ dummy.cpp:
 kde_services_DATA = system.protocol
 
 noinst_LTLIBRARIES = libtdeiosystem.la
-libtdeiosystem_la_SOURCES = kio_system.cpp systemimpl.cpp
+libtdeiosystem_la_SOURCES = tdeio_system.cpp systemimpl.cpp
 
 check_PROGRAMS = testsystem
 testsystem_SOURCES = testsystem.cpp
diff --git a/tdeioslave/system/kdedmodule/systemdirnotify.desktop b/tdeioslave/system/kdedmodule/systemdirnotify.desktop
index 31379df76..e319717eb 100644
--- a/tdeioslave/system/kdedmodule/systemdirnotify.desktop
+++ b/tdeioslave/system/kdedmodule/systemdirnotify.desktop
@@ -56,7 +56,7 @@ Name[vi]=Trình thông báo URL hệ thống KDED
 Name[wa]=Notifiaedje KDED d' URL sistinme di båze
 Name[zh_CN]=KDED 系统基 URL 通知器
 Name[zh_TW]=KDED 系統基礎 URL 通知程式
-Comment=Provides change notification for folders monitored by the system:/ kio plugin
+Comment=Provides change notification for folders monitored by the system:/ tdeio plugin
 ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=systemdirnotify
diff --git a/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp b/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp
index 64e8c8d62..9f9b422bd 100644
--- a/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp
+++ b/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp
@@ -30,7 +30,7 @@ SystemDirNotifyModule::SystemDirNotifyModule(const TQCString &obj)
 extern "C" {
 	KDE_EXPORT KDEDModule *create_systemdirnotify(const TQCString &obj)
 	{
-		TDEGlobal::locale()->insertCatalogue("kio_system");
+		TDEGlobal::locale()->insertCatalogue("tdeio_system");
 		return new SystemDirNotifyModule(obj);
 	}
 }
diff --git a/tdeioslave/system/system.protocol b/tdeioslave/system/system.protocol
index 9aa6fbd6c..12f6c5351 100644
--- a/tdeioslave/system/system.protocol
+++ b/tdeioslave/system/system.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_system
+exec=tdeio_system
 protocol=system
 input=none
 output=filesystem
diff --git a/tdeioslave/system/kio_system.cpp b/tdeioslave/system/tdeio_system.cpp
index 61f724093..3e48e85f5 100644
--- a/tdeioslave/system/kio_system.cpp
+++ b/tdeioslave/system/tdeio_system.cpp
@@ -27,7 +27,7 @@
 
 #include <tqeventloop.h>
 
-#include "kio_system.h"
+#include "tdeio_system.h"
 
 
 static const KCmdLineOptions options[] =
@@ -43,7 +43,7 @@ extern "C" {
 	{
 		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
-		TDECmdLineArgs::init(argc, argv, "kio_system", 0, 0, 0, 0);
+		TDECmdLineArgs::init(argc, argv, "tdeio_system", 0, 0, 0, 0);
 		TDECmdLineArgs::addCmdLineOptions( options );
 		TDEApplication app( false, false );
 		// We want to be anonymous even if we use DCOP
@@ -186,4 +186,4 @@ void SystemProtocol::listRoot()
 }
 
 
-//#include "kio_system.moc"
+//#include "tdeio_system.moc"
diff --git a/tdeioslave/system/kio_system.h b/tdeioslave/system/tdeio_system.h
index fb3423889..fb3423889 100644
--- a/tdeioslave/system/kio_system.h
+++ b/tdeioslave/system/tdeio_system.h
diff --git a/tdeioslave/system/testsystem.cpp b/tdeioslave/system/testsystem.cpp
index 7be993ff8..9310a49b4 100644
--- a/tdeioslave/system/testsystem.cpp
+++ b/tdeioslave/system/testsystem.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kio_system.h"
+#include "tdeio_system.h"
 #include "testsystem.h"
 
 #include <config.h>
diff --git a/tdeioslave/tar/CMakeLists.txt b/tdeioslave/tar/CMakeLists.txt
index 0e5ce7684..99b655ece 100644
--- a/tdeioslave/tar/CMakeLists.txt
+++ b/tdeioslave/tar/CMakeLists.txt
@@ -26,9 +26,9 @@ link_directories(
 install( FILES tar.protocol ar.protocol zip.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_tar (module) #######################
+##### tdeio_tar (module) #######################
 
-set( target kio_tar )
+set( target tdeio_tar )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES tar.cc
diff --git a/tdeioslave/tar/Makefile.am b/tdeioslave/tar/Makefile.am
index 31fd98ebf..caec5236d 100644
--- a/tdeioslave/tar/Makefile.am
+++ b/tdeioslave/tar/Makefile.am
@@ -4,11 +4,11 @@ INCLUDES = $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 METASOURCES = AUTO
 
-kde_module_LTLIBRARIES = kio_tar.la
+kde_module_LTLIBRARIES = tdeio_tar.la
 
-kio_tar_la_SOURCES = tar.cc
-kio_tar_la_LIBADD = $(LIB_KSYCOCA)
-kio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_tar_la_SOURCES = tar.cc
+tdeio_tar_la_LIBADD = $(LIB_KSYCOCA)
+tdeio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 check_PROGRAMS = ktartest
 
diff --git a/tdeioslave/tar/ar.protocol b/tdeioslave/tar/ar.protocol
index 31e765a7a..61779dbcb 100644
--- a/tdeioslave/tar/ar.protocol
+++ b/tdeioslave/tar/ar.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_tar
+exec=tdeio_tar
 protocol=ar
 mimetype=application/x-archive
 input=filesystem
diff --git a/tdeioslave/tar/tar.cc b/tdeioslave/tar/tar.cc
index bce89644d..1cc8dcfec 100644
--- a/tdeioslave/tar/tar.cc
+++ b/tdeioslave/tar/tar.cc
@@ -32,13 +32,13 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
-  TDEInstance instance( "kio_tar" );
+  TDEInstance instance( "tdeio_tar" );
 
   kdDebug(7109) << "Starting " << getpid() << endl;
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_tar protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_tar protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
 
diff --git a/tdeioslave/tar/tar.protocol b/tdeioslave/tar/tar.protocol
index bd97ba6bb..83d5fa667 100644
--- a/tdeioslave/tar/tar.protocol
+++ b/tdeioslave/tar/tar.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_tar
+exec=tdeio_tar
 protocol=tar
 mimetype=application/x-tar
 input=filesystem
diff --git a/tdeioslave/tar/zip.protocol b/tdeioslave/tar/zip.protocol
index d67d5b2ff..b16f820aa 100644
--- a/tdeioslave/tar/zip.protocol
+++ b/tdeioslave/tar/zip.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_tar
+exec=tdeio_tar
 protocol=zip
 mimetype=application/x-zip
 input=filesystem
diff --git a/tdeioslave/thumbnail/CMakeLists.txt b/tdeioslave/thumbnail/CMakeLists.txt
index 9836c76af..98664b32a 100644
--- a/tdeioslave/thumbnail/CMakeLists.txt
+++ b/tdeioslave/thumbnail/CMakeLists.txt
@@ -46,9 +46,9 @@ install( FILES
 install( FILES thumbcreator.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-##### kio_thumbnail (module) ####################
+##### tdeio_thumbnail (module) ####################
 
-set( target kio_thumbnail )
+set( target tdeio_thumbnail )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES thumbnail.cpp
diff --git a/tdeioslave/thumbnail/Makefile.am b/tdeioslave/thumbnail/Makefile.am
index 93697f148..178a0b186 100644
--- a/tdeioslave/thumbnail/Makefile.am
+++ b/tdeioslave/thumbnail/Makefile.am
@@ -14,14 +14,14 @@ EXR_MODULE = exrthumbnail.la
 EXR_DATAFILE = exrthumbnail.desktop
 endif
 
-kde_module_LTLIBRARIES = kio_thumbnail.la imagethumbnail.la \
+kde_module_LTLIBRARIES = tdeio_thumbnail.la imagethumbnail.la \
 	textthumbnail.la htmlthumbnail.la \
 	djvuthumbnail.la $(CURSOR_MODULE) \
 	$(EXR_MODULE)
 
-kio_thumbnail_la_SOURCES = thumbnail.cpp
-kio_thumbnail_la_LIBADD = $(LIB_KIO)
-kio_thumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_thumbnail_la_SOURCES = thumbnail.cpp
+tdeio_thumbnail_la_LIBADD = $(LIB_KIO)
+tdeio_thumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 imagethumbnail_la_SOURCES = imagecreator.cpp
 imagethumbnail_la_LIBADD = $(LIB_KIO) # for kimageio
diff --git a/tdeioslave/thumbnail/thumbnail.cpp b/tdeioslave/thumbnail/thumbnail.cpp
index 1d5d4c929..27180f14d 100644
--- a/tdeioslave/thumbnail/thumbnail.cpp
+++ b/tdeioslave/thumbnail/thumbnail.cpp
@@ -96,7 +96,7 @@ int kdemain(int argc, char **argv)
 #endif
 
 #ifdef USE_KINSTANCE
-    TDEInstance instance("kio_thumbnail");
+    TDEInstance instance("tdeio_thumbnail");
 #else
     // creating TDEApplication in a slave in not a very good idea,
     // as dispatchLoop() doesn't allow it to process its messages,
@@ -107,12 +107,12 @@ int kdemain(int argc, char **argv)
     putenv(strdup("SESSION_MANAGER="));
     TDEApplication::disableAutoDcopRegistration();
 
-    TDEApplication app(argc, argv, "kio_thumbnail", false, true);
+    TDEApplication app(argc, argv, "tdeio_thumbnail", false, true);
 #endif
 
     if (argc != 4)
     {
-        kdError(7115) << "Usage: kio_thumbnail protocol domain-socket1 domain-socket2" << endl;
+        kdError(7115) << "Usage: tdeio_thumbnail protocol domain-socket1 domain-socket2" << endl;
         exit(-1);
     }
 
diff --git a/tdeioslave/thumbnail/thumbnail.protocol b/tdeioslave/thumbnail/thumbnail.protocol
index b1426c893..fb5f2136e 100644
--- a/tdeioslave/thumbnail/thumbnail.protocol
+++ b/tdeioslave/thumbnail/thumbnail.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_thumbnail
+exec=tdeio_thumbnail
 protocol=thumbnail
 input=stream
 output=stream
diff --git a/tdeioslave/trash/CMakeLists.txt b/tdeioslave/trash/CMakeLists.txt
index e54fba381..1569d07ca 100644
--- a/tdeioslave/trash/CMakeLists.txt
+++ b/tdeioslave/trash/CMakeLists.txt
@@ -37,12 +37,12 @@ tde_add_library( ${target} STATIC_PIC AUTOMOC
 )
 
 
-##### kio_trash (module) ########################
+##### tdeio_trash (module) ########################
 
-set( target kio_trash )
+set( target tdeio_trash )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES kio_trash.cpp
+  SOURCES tdeio_trash.cpp
   LINK trashcommon-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/trash/DESIGN b/tdeioslave/trash/DESIGN
index 63179da08..2bb6f19df 100644
--- a/tdeioslave/trash/DESIGN
+++ b/tdeioslave/trash/DESIGN
@@ -1,10 +1,10 @@
 DESIGN
 ======
-kio_trash implements the XDG trash standard currently at http://www.ramendik.ru/docs/trashspec.html
+tdeio_trash implements the XDG trash standard currently at http://www.ramendik.ru/docs/trashspec.html
 
-In case race conditions between the various instances of kio_trash
+In case race conditions between the various instances of tdeio_trash
 are a problem, trashimpl could be moved to a kded module, and
-kio_trash would use DCOP to talk to it. It's a bit hard to come up
+tdeio_trash would use DCOP to talk to it. It's a bit hard to come up
 with use cases where the race conditions would matter though.
 
 BUGS
@@ -31,7 +31,7 @@ TODO
 
 * Deleting oldest files when size is bigger than a certain configurable amount (#79553)
 
-Bugs closed by kio_trash
+Bugs closed by tdeio_trash
 ========================
 #79826 (3.3 only)
 #62848 (configurable trash location)
diff --git a/tdeioslave/trash/Makefile.am b/tdeioslave/trash/Makefile.am
index dae7debd5..f2ad65d28 100644
--- a/tdeioslave/trash/Makefile.am
+++ b/tdeioslave/trash/Makefile.am
@@ -3,11 +3,11 @@ METASOURCES = AUTO
 
 SUBDIRS = . tdefile-plugin
 
-kde_module_LTLIBRARIES = kio_trash.la
+kde_module_LTLIBRARIES = tdeio_trash.la
 
-kio_trash_la_SOURCES = kio_trash.cpp
-kio_trash_la_LIBADD  = libtrashcommon.la $(LIB_KIO)
-kio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
+tdeio_trash_la_SOURCES = tdeio_trash.cpp
+tdeio_trash_la_LIBADD  = libtrashcommon.la $(LIB_KIO)
+tdeio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
 bin_PROGRAMS = ktrash
 ktrash_SOURCES = ktrash.cpp
diff --git a/tdeioslave/trash/ktrash.cpp b/tdeioslave/trash/ktrash.cpp
index 395aabb6b..b899e7947 100644
--- a/tdeioslave/trash/ktrash.cpp
+++ b/tdeioslave/trash/ktrash.cpp
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     if ( args->isSet( "empty" ) ) {
-        // We use a kio job instead of linking to TrashImpl, for a smaller binary
+        // We use a tdeio job instead of linking to TrashImpl, for a smaller binary
         // (and the possibility of a central service at some point)
         TQByteArray packedArgs;
         TQDataStream stream( packedArgs, IO_WriteOnly );
diff --git a/tdeioslave/trash/tdefile-plugin/tdefile_trash.cpp b/tdeioslave/trash/tdefile-plugin/tdefile_trash.cpp
index cf4487d06..983a09db2 100644
--- a/tdeioslave/trash/tdefile-plugin/tdefile_trash.cpp
+++ b/tdeioslave/trash/tdefile-plugin/tdefile_trash.cpp
@@ -34,7 +34,7 @@ K_EXPORT_COMPONENT_FACTORY(tdefile_trash, TrashFactory("tdefile_trash"))
 KTrashPlugin::KTrashPlugin(TQObject *parent, const char *name,
         const TQStringList &args) : KFilePlugin(parent, name, args)
 {
-    TDEGlobal::locale()->insertCatalogue( "kio_trash" );
+    TDEGlobal::locale()->insertCatalogue( "tdeio_trash" );
 
     kdDebug(7034) << "Trash file meta info plugin\n";
 
diff --git a/tdeioslave/trash/kio_trash.cpp b/tdeioslave/trash/tdeio_trash.cpp
index 26cfb4c6b..29fbfa778 100644
--- a/tdeioslave/trash/kio_trash.cpp
+++ b/tdeioslave/trash/tdeio_trash.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kio_trash.h"
+#include "tdeio_trash.h"
 #include <tdeio/job.h>
 
 #include <kapplication.h>
@@ -52,11 +52,11 @@ static const KCmdLineOptions options[] =
 extern "C" {
     int KDE_EXPORT kdemain( int argc, char **argv )
     {
-        //TDEInstance instance( "kio_trash" );
-        // TDEApplication is necessary to use kio_file
+        //TDEInstance instance( "tdeio_trash" );
+        // TDEApplication is necessary to use tdeio_file
         putenv(strdup("SESSION_MANAGER="));
         TDEApplication::disableAutoDcopRegistration();
-        TDECmdLineArgs::init(argc, argv, "kio_trash", 0, 0, 0, 0);
+        TDECmdLineArgs::init(argc, argv, "tdeio_trash", 0, 0, 0, 0);
         TDECmdLineArgs::addCmdLineOptions( options );
         TDEApplication app( false, false );
 
@@ -364,7 +364,7 @@ void TrashProtocol::listDir(const KURL& url)
         info.physicalPath += relativePath;
     }
 
-    // List subdir. Can't use kio_file here since we provide our own info...
+    // List subdir. Can't use tdeio_file here since we provide our own info...
     kdDebug() << k_funcinfo << "listing " << info.physicalPath << endl;
     TQStrList entryNames = impl.listDir( info.physicalPath );
     totalSize( entryNames.count() );
@@ -407,7 +407,7 @@ bool TrashProtocol::createUDSEntry( const TQString& physicalPath, const TQString
 
         addAtom( entry, TDEIO::UDS_LINK_DEST, 0, TQFile::decodeName( buffer2 ) );
         // Follow symlink
-        // That makes sense in kio_file, but not in the trash, especially for the size
+        // That makes sense in tdeio_file, but not in the trash, especially for the size
         // #136876
 #if 0
         if ( KDE_stat( physicalPath_c, &buff ) == -1 ) {
@@ -593,4 +593,4 @@ void TrashProtocol::mkdir( const KURL& url, int /*permissions*/ )
 }
 #endif
 
-#include "kio_trash.moc"
+#include "tdeio_trash.moc"
diff --git a/tdeioslave/trash/kio_trash.h b/tdeioslave/trash/tdeio_trash.h
index ceaa27cfb..ceaa27cfb 100644
--- a/tdeioslave/trash/kio_trash.h
+++ b/tdeioslave/trash/tdeio_trash.h
diff --git a/tdeioslave/trash/testtrash.cpp b/tdeioslave/trash/testtrash.cpp
index 519de964c..12b1b939d 100644
--- a/tdeioslave/trash/testtrash.cpp
+++ b/tdeioslave/trash/testtrash.cpp
@@ -21,7 +21,7 @@
 #undef NDEBUG
 #undef NO_DEBUG
 
-#include "kio_trash.h"
+#include "tdeio_trash.h"
 #include "testtrash.h"
 
 #include <config.h>
diff --git a/tdeioslave/trash/trash.protocol b/tdeioslave/trash/trash.protocol
index 8387fdcb7..43da5baa2 100644
--- a/tdeioslave/trash/trash.protocol
+++ b/tdeioslave/trash/trash.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_trash
+exec=tdeio_trash
 protocol=trash
 input=none
 output=filesystem
diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp
index a31ee1122..b78427d12 100644
--- a/tdeioslave/trash/trashimpl.cpp
+++ b/tdeioslave/trash/trashimpl.cpp
@@ -57,7 +57,7 @@ TrashImpl::TrashImpl() :
     m_homeDevice( 0 ),
     m_trashDirectoriesScanned( false ),
     m_mibEnum( TDEGlobal::locale()->fileEncodingMib() ),
-    // not using kio_trashrc since KIO uses that one already for kio_trash
+    // not using tdeio_trashrc since KIO uses that one already for tdeio_trash
     // so better have a separate one, for faster parsing by e.g. kmimetype.cpp
     m_config( "trashrc" )
 {
@@ -406,7 +406,7 @@ bool TrashImpl::copyFromTrash( const TQString& dest, int trashId, const TQString
 
 bool TrashImpl::copy( const TQString& src, const TQString& dest )
 {
-    // kio_file's copy() method is quite complex (in order to be fast), let's just call it...
+    // tdeio_file's copy() method is quite complex (in order to be fast), let's just call it...
     m_lastErrorCode = 0;
     KURL urlSrc;
     urlSrc.setPath( src );
@@ -561,7 +561,7 @@ TrashImpl::TrashedFileInfoList TrashImpl::list()
         const int trashId = it.key();
         TQString infoPath = it.data();
         infoPath += "/info";
-        // Code taken from kio_file
+        // Code taken from tdeio_file
         TQStrList entryNames = listDir( infoPath );
         //char path_buffer[PATH_MAX];
         //getcwd(path_buffer, PATH_MAX - 1);
@@ -725,7 +725,7 @@ int TrashImpl::findTrashDirectory( const TQString& origPath )
     }
     // new trash dir found, register it
     // but we need stability in the trash IDs, so that restoring or asking
-    // for properties works even kio_trash gets killed because idle.
+    // for properties works even tdeio_trash gets killed because idle.
 #if 0
     kdDebug() << k_funcinfo << "found " << trashDir << endl;
     m_trashDirectories.insert( ++m_lastId, trashDir );
@@ -894,7 +894,7 @@ bool TrashImpl::checkTrashSubdirs( const TQCString& trashDir_c ) const
 
 TQString TrashImpl::trashDirectoryPath( int trashId ) const
 {
-    // Never scanned for trash dirs? (This can happen after killing kio_trash
+    // Never scanned for trash dirs? (This can happen after killing tdeio_trash
     // and reusing a directory listing from the earlier instance.)
     if ( !m_trashDirectoriesScanned )
         scanTrashDirectories();
diff --git a/tdeioslave/trash/trashimpl.h b/tdeioslave/trash/trashimpl.h
index 6aa941013..34308a712 100644
--- a/tdeioslave/trash/trashimpl.h
+++ b/tdeioslave/trash/trashimpl.h
@@ -31,7 +31,7 @@
 #include <assert.h>
 
 /**
- * Implementation of all low-level operations done by kio_trash
+ * Implementation of all low-level operations done by tdeio_trash
  * The structure of the trash directory follows the freedesktop.org standard <TODO URL>
  */
 class TrashImpl : public TQObject
diff --git a/tdeprint/slave/CMakeLists.txt b/tdeprint/slave/CMakeLists.txt
index fd042657e..820cc7222 100644
--- a/tdeprint/slave/CMakeLists.txt
+++ b/tdeprint/slave/CMakeLists.txt
@@ -30,10 +30,10 @@ link_directories(
 install( FILES print.protocol printdb.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_print (module) ########################
+##### tdeio_print (module) ########################
 
-tde_add_kpart( kio_print AUTOMOC
-  SOURCES kio_print.cpp
+tde_add_kpart( tdeio_print AUTOMOC
+  SOURCES tdeio_print.cpp
   LINK tdeprint-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeprint/slave/Makefile.am b/tdeprint/slave/Makefile.am
index 8cfba4dd7..5da6a536a 100644
--- a/tdeprint/slave/Makefile.am
+++ b/tdeprint/slave/Makefile.am
@@ -4,15 +4,15 @@ SUBDIRS = mimetypes templates
 
 INCLUDES= $(all_includes)
 
-kde_module_LTLIBRARIES = kio_print.la
+kde_module_LTLIBRARIES = tdeio_print.la
 
-kio_print_la_SOURCES = kio_print.cpp
-kio_print_la_LIBADD = $(LIB_KIO) -ltdeprint
-kio_print_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_print_la_SOURCES = tdeio_print.cpp
+tdeio_print_la_LIBADD = $(LIB_KIO) -ltdeprint
+tdeio_print_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 METASOURCES = AUTO
 
-noinst_HEADERS = kio_print.h
+noinst_HEADERS = tdeio_print.h
 
 # Services
 servicesdir = $(kde_servicesdir)
diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp
index 844934137..37b7ed63d 100644
--- a/tdeprint/slave/kio_print.cpp
+++ b/tdeprint/slave/kio_print.cpp
@@ -17,7 +17,7 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include "kio_print.h"
+#include "tdeio_print.h"
 #include <tdeprint/kmprinter.h>
 #include <tdeprint/kmmanager.h>
 #include <tdeprint/kmjobmanager.h>
@@ -46,7 +46,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#define	PRINT_DEBUG	kdDebug(7019) << "kio_print: "
+#define	PRINT_DEBUG	kdDebug(7019) << "tdeio_print: "
 
 extern "C"
 {
@@ -135,17 +135,17 @@ TQString buildGroupTable(DrGroup *grp, bool showHeader = true)
 
 int kdemain(int argc, char **argv)
 {
-	TDEInstance  instance("kio_print");
+	TDEInstance  instance("tdeio_print");
 
 	PRINT_DEBUG << "starting ioslave" << endl;
 	if (argc != 4)
 	{
-		fprintf(stderr, "Usage: kio_print protocol domain-socket1 domain-socket2\n");
+		fprintf(stderr, "Usage: tdeio_print protocol domain-socket1 domain-socket2\n");
 		exit(-1);
 	}
 
 	/* create fake KApplicatiom object, needed for job stuffs */
-	TDEAboutData about( "kio_print", "kio_print", "fake_version", 
+	TDEAboutData about( "tdeio_print", "tdeio_print", "fake_version", 
 			"TDEPrint IO slave", TDEAboutData::License_GPL, "(c) 2003, Michael Goffioul" );
 	TDECmdLineArgs::init( &about );
 	TDEApplication app;
@@ -917,4 +917,4 @@ void KIO_Print::showDriver(KMPrinter *prt)
 	finished();
 }
 
-#include "kio_print.moc"
+#include "tdeio_print.moc"
diff --git a/tdeprint/slave/print.protocol b/tdeprint/slave/print.protocol
index 7fe7c7fd0..2517c9ebe 100644
--- a/tdeprint/slave/print.protocol
+++ b/tdeprint/slave/print.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_print
+exec=tdeio_print
 protocol=print
 input=none
 output=filesystem
diff --git a/tdeprint/slave/printdb.protocol b/tdeprint/slave/printdb.protocol
index 539edd596..73418f302 100644
--- a/tdeprint/slave/printdb.protocol
+++ b/tdeprint/slave/printdb.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_print
+exec=tdeio_print
 protocol=printdb
 input=none
 output=filesystem