10 files changed, 20 insertions, 20 deletions
diff --git a/tderesources/groupwise/tdeioslave/CMakeLists.txt b/tderesources/groupwise/tdeioslave/CMakeLists.txt
index 23476fe0e..aec2c35d1 100644
--- a/tderesources/groupwise/tdeioslave/CMakeLists.txt
+++ b/tderesources/groupwise/tdeioslave/CMakeLists.txt
@@ -30,9 +30,9 @@ install( FILES
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_groupwise (module) ####################
+##### tdeio_groupwise (module) ####################
 
-tde_add_kpart( kio_groupwise AUTOMOC
+tde_add_kpart( tdeio_groupwise AUTOMOC
   SOURCES groupwise.cpp
   LINK gwsoap-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/tderesources/groupwise/tdeioslave/Makefile.am b/tderesources/groupwise/tdeioslave/Makefile.am
index e6da52837..8ae6220c0 100644
--- a/tderesources/groupwise/tdeioslave/Makefile.am
+++ b/tderesources/groupwise/tdeioslave/Makefile.am
@@ -8,12 +8,12 @@ METASOURCES = AUTO
 kdelnkdir = $(kde_servicesdir)
 kdelnk_DATA = groupwise.protocol groupwises.protocol
 
-kde_module_LTLIBRARIES =  kio_groupwise.la
+kde_module_LTLIBRARIES =  tdeio_groupwise.la
 
-kio_groupwise_la_SOURCES = groupwise.cpp
-kio_groupwise_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
+tdeio_groupwise_la_SOURCES = groupwise.cpp
+tdeio_groupwise_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
   ../soap/libgwsoap.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO)
-kio_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/tdeio_groupwise.pot
diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp
index bfa02156a..fb58643cb 100644
--- a/tderesources/groupwise/tdeioslave/groupwise.cpp
+++ b/tderesources/groupwise/tdeioslave/groupwise.cpp
@@ -69,12 +69,12 @@ KDE_EXPORT int kdemain( int argc, char **argv );
 
 int kdemain( int argc, char **argv )
 {
-  TDEInstance instance( "kio_groupwise" );
+  TDEInstance instance( "tdeio_groupwise" );
   
-  kdDebug(7000) << "Starting kio_groupwise(pid:  " << getpid() << ")" << endl;
+  kdDebug(7000) << "Starting tdeio_groupwise(pid:  " << getpid() << ")" << endl;
   
   if (argc != 4) {
-    fprintf( stderr, "Usage: kio_groupwise protocol domain-socket1 domain-socket2\n");
+    fprintf( stderr, "Usage: tdeio_groupwise protocol domain-socket1 domain-socket2\n");
     exit( -1 );
   }
   
diff --git a/tderesources/groupwise/tdeioslave/groupwise.protocol b/tderesources/groupwise/tdeioslave/groupwise.protocol
index a7c26b6e3..2550d5406 100644
--- a/tderesources/groupwise/tdeioslave/groupwise.protocol
+++ b/tderesources/groupwise/tdeioslave/groupwise.protocol
@@ -1,6 +1,6 @@
 [Protocol]
 DocPath=tdeioslave/groupwise.html
-exec=kio_groupwise
+exec=tdeio_groupwise
 input=none
 output=filesystem
 protocol=groupwise
diff --git a/tderesources/groupwise/tdeioslave/groupwises.protocol b/tderesources/groupwise/tdeioslave/groupwises.protocol
index 2666f1fd7..56a2c1ea5 100644
--- a/tderesources/groupwise/tdeioslave/groupwises.protocol
+++ b/tderesources/groupwise/tdeioslave/groupwises.protocol
@@ -1,6 +1,6 @@
 [Protocol]
 DocPath=tdeioslave/groupwise.html
-exec=kio_groupwise
+exec=tdeio_groupwise
 input=none
 output=filesystem
 protocol=groupwises
diff --git a/tderesources/scalix/tdeioslave/CMakeLists.txt b/tderesources/scalix/tdeioslave/CMakeLists.txt
index 7ba76f672..d1ae38444 100644
--- a/tderesources/scalix/tdeioslave/CMakeLists.txt
+++ b/tderesources/scalix/tdeioslave/CMakeLists.txt
@@ -28,9 +28,9 @@ install(
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_scalix (module) #######################
+##### tdeio_scalix (module) #######################
 
-tde_add_kpart( kio_scalix AUTOMOC
+tde_add_kpart( tdeio_scalix AUTOMOC
   SOURCES scalix.cpp
   LINK tdepim-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/tderesources/scalix/tdeioslave/Makefile.am b/tderesources/scalix/tdeioslave/Makefile.am
index 1e66f7091..70c0951b9 100644
--- a/tderesources/scalix/tdeioslave/Makefile.am
+++ b/tderesources/scalix/tdeioslave/Makefile.am
@@ -7,11 +7,11 @@ METASOURCES = AUTO
 kdelnkdir = $(kde_servicesdir)
 kdelnk_DATA = scalix.protocol scalixs.protocol
 
-kde_module_LTLIBRARIES =  kio_scalix.la
+kde_module_LTLIBRARIES =  tdeio_scalix.la
 
-kio_scalix_la_SOURCES = scalix.cpp
-kio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO)
-kio_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_scalix_la_SOURCES = scalix.cpp
+tdeio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO)
+tdeio_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/tdeio_scalix.pot
diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp
index 40084669d..f8b3ff3d1 100644
--- a/tderesources/scalix/tdeioslave/scalix.cpp
+++ b/tderesources/scalix/tdeioslave/scalix.cpp
@@ -51,7 +51,7 @@ int kdemain( int argc, char **argv )
   putenv( strdup( "SESSION_MANAGER=" ) );
   TDEApplication::disableAutoDcopRegistration();
 
-  TDECmdLineArgs::init( argc, argv, "kio_scalix", 0, 0, 0, 0 );
+  TDECmdLineArgs::init( argc, argv, "tdeio_scalix", 0, 0, 0, 0 );
   TDECmdLineArgs::addCmdLineOptions( options );
   TDEApplication app( false, false );
 
diff --git a/tderesources/scalix/tdeioslave/scalix.protocol b/tderesources/scalix/tdeioslave/scalix.protocol
index 91a213e87..08d961bd8 100644
--- a/tderesources/scalix/tdeioslave/scalix.protocol
+++ b/tderesources/scalix/tdeioslave/scalix.protocol
@@ -1,6 +1,6 @@
 [Protocol]
 DocPath=tdeioslave/scalix.html
-exec=kio_scalix
+exec=tdeio_scalix
 input=none
 output=filesystem
 protocol=scalix
diff --git a/tderesources/scalix/tdeioslave/scalixs.protocol b/tderesources/scalix/tdeioslave/scalixs.protocol
index 19defac56..62df48470 100644
--- a/tderesources/scalix/tdeioslave/scalixs.protocol
+++ b/tderesources/scalix/tdeioslave/scalixs.protocol
@@ -1,6 +1,6 @@
 [Protocol]
 DocPath=tdeioslave/scalix.html
-exec=kio_scalix
+exec=tdeio_scalix
 input=none
 output=filesystem
 protocol=scalixs