88 files changed, 60 insertions, 60 deletions

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 <neundorf@kde.org>
  *
@@ -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 <neundorf@kde.org>
  *
@@ -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