diff --git a/po/pl-utf.po b/po/pl-utf.po
index 0bc2f49..04fb376 100644
--- a/po/pl-utf.po
+++ b/po/pl-utf.po
@@ -37,8 +37,8 @@ msgid "List the files of a package"
 msgstr "Lista plików pakietu"
 
 #: apt.cpp:177 apt.cpp:178
-msgid "Page generated by kio_apt."
-msgstr "Strona wygenerowana przez kio_apt."
+msgid "Page generated by tdeio_apt."
+msgstr "Strona wygenerowana przez tdeio_apt."
 
 #: apt.cpp:323
 msgid "AptCache"
diff --git a/po/sv.po b/po/sv.po
index bf865ae..cb0c78d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: apt.cpp:134 apt.cpp:135
-msgid "Page generated by kio_apt."
-msgstr "Sidan genererades av kio_apt."
+msgid "Page generated by tdeio_apt."
+msgstr "Sidan genererades av tdeio_apt."
 
 #: apt.cpp:167
 msgid "Hide extended form"
diff --git a/src/Makefile.am b/src/Makefile.am
index 28261f8..5fd4edb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,19 +1,19 @@
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = kio_apt.la
+kde_module_LTLIBRARIES = tdeio_apt.la
 
 METASOURCES = AUTO
 
-kio_apt_la_SOURCES = aptcache.cpp apt.cpp regexps.cpp packagemanager.cpp dpkg.cpp
+tdeio_apt_la_SOURCES = aptcache.cpp apt.cpp regexps.cpp packagemanager.cpp dpkg.cpp
 
-kio_apt_la_LIBADD = $(top_builddir)/src/parsers/libparsers.la -ltdeio
-kio_apt_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KURL)
+tdeio_apt_la_LIBADD = $(top_builddir)/src/parsers/libparsers.la -ltdeio
+tdeio_apt_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KURL)
 
 protocoldir = $(kde_servicesdir)
 protocol_DATA = apt.protocol apt+http.protocol
 
 appdatadir = $(kde_datadir)/tdeio_apt/
-appdata_DATA = kio_apt.css kdedeb_logo.png
+appdata_DATA = tdeio_apt.css kdedeb_logo.png
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/tdeio_apt.pot
diff --git a/src/apt+http.protocol b/src/apt+http.protocol
index 604cb7b..e91509c 100644
--- a/src/apt+http.protocol
+++ b/src/apt+http.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_apt
+exec=tdeio_apt
 protocol=apt+http
 input=none
 output=stream
@@ -8,4 +8,4 @@ defaultMimetype=text/html
 Icon=remote
 Description=A tdeioslave for using apt-cache functionalities inside konqueror
 determineMimetypeFromExtension=false
-DocPath=kio_apt/index.html
+DocPath=tdeio_apt/index.html
diff --git a/src/apt.cpp b/src/apt.cpp
index f3799b4..6eac3f3 100644
--- a/src/apt.cpp
+++ b/src/apt.cpp
@@ -132,8 +132,8 @@ TQString AptProtocol::make_html_tail(const TQString& note, bool with_form)
     ret = "<hr>\n" + make_html_form();
 
   if (!note.isEmpty())
-    ret += html_tail.arg(note + ". " + i18n("Page generated by kio_apt."));
-  else ret += html_tail.arg(i18n("Page generated by kio_apt."));
+    ret += html_tail.arg(note + ". " + i18n("Page generated by tdeio_apt."));
+  else ret += html_tail.arg(i18n("Page generated by tdeio_apt."));
 
   return ret;
 }
@@ -221,17 +221,17 @@ TQString AptProtocol::make_html_form() const
 /****************************************************************************************/
 
 AptProtocol::AptProtocol( const TQCString &pool_socket, const TQCString &app_socket )
-    : SlaveBase( "kio_apt", pool_socket, app_socket ),
+    : SlaveBase( "tdeio_apt", pool_socket, app_socket ),
       m_adept_batch(0), m_parser(0)
 
 {
   KStandardDirs* dirs = TDEGlobal::dirs();
-  m_stylesheet = dirs->findResource( "data", "kio_apt/tdeio_apt.css" );
+  m_stylesheet = dirs->findResource( "data", "tdeio_apt/tdeio_apt.css" );
 
-  m_logo = dirs->findResource( "data", "kio_apt/" 
+  m_logo = dirs->findResource( "data", "tdeio_apt/" 
           + TDEGlobal::config() -> readEntryUntranslated("logo", "kdedeb_logo.png" ) );
 
-  m_header_background = dirs->findResource( "data", "kio_apt/" 
+  m_header_background = dirs->findResource( "data", "tdeio_apt/" 
           + TDEGlobal::config() -> readEntryUntranslated("background", "headerbg.png" ) );
 
   m_logo_alt = TDEGlobal::config() -> readEntryUntranslated("alt_tag", i18n("KDE on Debian") );
@@ -929,10 +929,10 @@ KURL AptProtocol::buildURL( const KURL& query ) const
 
 extern "C" {
   int kdemain( int argc, char **argv ) {
-    TDEInstance instance( "kio_apt" );
+    TDEInstance instance( "tdeio_apt" );
 
     if ( argc != 4 ) {
-      kdDebug( DEBUG_ZONE ) << "Usage: kio_apt  protocol domain-socket1 domain-socket2" << endl;
+      kdDebug( DEBUG_ZONE ) << "Usage: tdeio_apt  protocol domain-socket1 domain-socket2" << endl;
       exit ( -1 );
     }
 
diff --git a/src/apt.protocol b/src/apt.protocol
index 8d68e4c..f4f8adb 100644
--- a/src/apt.protocol
+++ b/src/apt.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_apt
+exec=tdeio_apt
 protocol=apt
 input=none
 output=stream
@@ -8,4 +8,4 @@ defaultMimetype=text/html
 Icon=kioapt
 Description=A tdeioslave for using apt-cache functionalities inside konqueror
 determineMimetypeFromExtension=false
-DocPath=kio_apt/index.html
+DocPath=tdeio_apt/index.html