9 files changed, 23 insertions, 23 deletions
diff --git a/atlantik/ChangeLog b/atlantik/ChangeLog
index a6b10b98..b16274aa 100644
--- a/atlantik/ChangeLog
+++ b/atlantik/ChangeLog
@@ -8,7 +8,7 @@
 0.7.2 (KDE 3.3.2)
 -----
 
-- Proper use of host and port in kio_atlantik: fixes problems with
+- Proper use of host and port in tdeio_atlantik: fixes problems with
   invitations sent by newer clients.
 - bugfix: scroll player views when they get too big. (#69043)
 - bugfix: show correct amount of players in trade widget.
@@ -106,7 +106,7 @@
 
 - fixed potential double initialization of gameboard
 - don't crash when removing money from a trade
-- properly quote arguments given to TDEProcess in kio_atlantik
+- properly quote arguments given to TDEProcess in tdeio_atlantik
 - valgrind leak and unitialised memory access fixes
 
 0.5.0
@@ -125,7 +125,7 @@
   - fix buttons, they have specific targets, not just the current widget
   - delete buttons in EstateDetails::newUpdate()
 - commandline parameters host, port and game supported (for auto-join)
-- kio_atlantik allows for easy connecting from other applications
+- tdeio_atlantik allows for easy connecting from other applications
   (kopete/kmail)
 - leave game and leave server options
 - pre-game configuration
diff --git a/atlantik/Makefile.am b/atlantik/Makefile.am
index d4389577..08d83768 100644
--- a/atlantik/Makefile.am
+++ b/atlantik/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS =  libatlantic libatlantikclient libatlantikui client \
-           kio_atlantik pics themes
+           tdeio_atlantik pics themes
 
 EXTRA_DIST = atlantik.desktop
 
diff --git a/atlantik/kio_atlantik/Makefile.am b/atlantik/kio_atlantik/Makefile.am
deleted file mode 100644
index 39579cd8..00000000
--- a/atlantik/kio_atlantik/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-INCLUDES = -I$(top_srcdir)/atlantik/libatlantic $(all_includes)
-METASOURCES = AUTO
-
-kde_module_LTLIBRARIES = kio_atlantik.la
-
-kio_atlantik_la_SOURCES = kio_atlantik.cpp
-kio_atlantik_la_LIBADD = $(LIB_KIO)
-kio_atlantik_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-noinst_HEADERS = kio_atlantik.h
-
-kdelnk_DATA = atlantik.protocol
-kdelnkdir = $(kde_servicesdir)
-
-messages:
-	$(XGETTEXT) *.cpp -o $(podir)/tdeio_atlantik.pot
diff --git a/atlantik/tdeio_atlantik/Makefile.am b/atlantik/tdeio_atlantik/Makefile.am
new file mode 100644
index 00000000..71939856
--- /dev/null
+++ b/atlantik/tdeio_atlantik/Makefile.am
@@ -0,0 +1,15 @@
+INCLUDES = -I$(top_srcdir)/atlantik/libatlantic $(all_includes)
+METASOURCES = AUTO
+
+kde_module_LTLIBRARIES = tdeio_atlantik.la
+
+tdeio_atlantik_la_SOURCES = tdeio_atlantik.cpp
+tdeio_atlantik_la_LIBADD = $(LIB_KIO)
+tdeio_atlantik_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+noinst_HEADERS = tdeio_atlantik.h
+
+kdelnk_DATA = atlantik.protocol
+kdelnkdir = $(kde_servicesdir)
+
+messages:
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_atlantik.pot
diff --git a/atlantik/kio_atlantik/atlantik.protocol b/atlantik/tdeio_atlantik/atlantik.protocol
index 6839c736..d9d95fd5 100644
--- a/atlantik/kio_atlantik/atlantik.protocol
+++ b/atlantik/tdeio_atlantik/atlantik.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_atlantik
+exec=tdeio_atlantik
 protocol=atlantik
 input=none
 output=none
diff --git a/atlantik/kio_atlantik/kio_atlantik.cpp b/atlantik/tdeio_atlantik/tdeio_atlantik.cpp
index 4305867b..9eb106f1 100644
--- a/atlantik/kio_atlantik/kio_atlantik.cpp
+++ b/atlantik/tdeio_atlantik/tdeio_atlantik.cpp
@@ -29,14 +29,14 @@
 #include <kinstance.h>
 #include <kprocess.h>
 
-#include "kio_atlantik.h"
+#include "tdeio_atlantik.h"
 #include "libatlantic_export.h"
 
 extern "C"
 {
 	int LIBATLANTIC_EXPORT kdemain( int, char **argv )
 	{
-		TDEInstance instance( "kio_atlantik" );
+		TDEInstance instance( "tdeio_atlantik" );
 		AtlantikProtocol slave(argv[2], argv[3]);
 		slave.dispatchLoop();
 		return 0;
diff --git a/atlantik/kio_atlantik/kio_atlantik.h b/atlantik/tdeio_atlantik/tdeio_atlantik.h
index 8c109ec2..8c109ec2 100644
--- a/atlantik/kio_atlantik/kio_atlantik.h
+++ b/atlantik/tdeio_atlantik/tdeio_atlantik.h
diff --git a/cmake b/cmake
-Subproject 9a217903f9fa35ca12213a6e9ee3d2cb87d1131
+Subproject 274366fb8b90704586d7beef216b765cc0688b0
diff --git a/knetwalk/src/SConscript b/knetwalk/src/SConscript
index a71252a5..58d61214 100644
--- a/knetwalk/src/SConscript
+++ b/knetwalk/src/SConscript
@@ -6,7 +6,7 @@ knetwalk_sources = [
 ]
 myenv.KDEprogram( "knetwalk", knetwalk_sources)
 myenv.KDEaddpaths_includes( ['./', '#./'])
-myenv.KDEaddlibs( ['qt-mt', 'kio', 'tdecore', 'tdegames'])
+myenv.KDEaddlibs( ['qt-mt', 'tdeio', 'tdecore', 'tdegames'])
 myenv.KDEinstall('KDEDATA', 'knetwalk', 'knetwalkui.rc')
 myenv.KDEinstall('KDEDATA', 'knetwalk', 'eventsrc')
 myenv.KDEinstall('KDEXDG', '', 'knetwalk.desktop')