Use new tdeio names on Debian and Ubuntu

39 files changed, 196 insertions, 196 deletions

diff --git a/ubuntu/maverick/applications/digikam/debian/copyright b/ubuntu/maverick/applications/digikam/debian/copyright
index bc06dd076..f46c77c80 100644
--- a/ubuntu/maverick/applications/digikam/debian/copyright
+++ b/ubuntu/maverick/applications/digikam/debian/copyright
@@ -139,7 +139,7 @@ digikam/
 	o from tdefiletip source copies (tdebase, konqueror)
 	    © 1998, 1999 Torben Weis <weis@kde.org>
 	    © 2000, 2001, 2002 David Faure <david@mandrakesoft.com>
-	o Concept copied from tdelibs/kio/kio/netaccess.h/cpp
+	o Concept copied from tdelibs/tdeio/tdeio/netaccess.h/cpp
 	    © 1997 Torben Weis (weis@kde.org)
 	    © 1998 Matthias Ettrich (ettrich@kde.org)
 	    © 1999 David Faure (faure@kde.org)
diff --git a/ubuntu/maverick/applications/k3b/debian/libk3b3-trinity.install b/ubuntu/maverick/applications/k3b/debian/libk3b3-trinity.install
index e18a34c1c..b316f577e 100644
--- a/ubuntu/maverick/applications/k3b/debian/libk3b3-trinity.install
+++ b/ubuntu/maverick/applications/k3b/debian/libk3b3-trinity.install
@@ -23,5 +23,5 @@ debian/tmp/opt/trinity/lib/trinity/libk3baudioprojectcddbplugin.so
 debian/tmp/opt/trinity/lib/trinity/libk3baudioprojectcddbplugin.la
 debian/tmp/opt/trinity/lib/trinity/libk3baudiometainforenamerplugin.so
 debian/tmp/opt/trinity/lib/trinity/libk3baudiometainforenamerplugin.la
-debian/tmp/opt/trinity/lib/trinity/kio_videodvd.so
-debian/tmp/opt/trinity/lib/trinity/kio_videodvd.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_videodvd.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_videodvd.la
diff --git a/ubuntu/maverick/applications/k3b/debian/libk3b3.install b/ubuntu/maverick/applications/k3b/debian/libk3b3.install
index f5c557815..69b7f7909 100644
--- a/ubuntu/maverick/applications/k3b/debian/libk3b3.install
+++ b/ubuntu/maverick/applications/k3b/debian/libk3b3.install
@@ -21,5 +21,5 @@ debian/tmp/usr/lib/trinity/libk3baudioprojectcddbplugin.so
 debian/tmp/usr/lib/trinity/libk3baudioprojectcddbplugin.la
 debian/tmp/usr/lib/trinity/libk3baudiometainforenamerplugin.so
 debian/tmp/usr/lib/trinity/libk3baudiometainforenamerplugin.la
-debian/tmp/usr/lib/trinity/kio_videodvd.so
-debian/tmp/usr/lib/trinity/kio_videodvd.la
+debian/tmp/usr/lib/trinity/tdeio_videodvd.so
+debian/tmp/usr/lib/trinity/tdeio_videodvd.la
diff --git a/ubuntu/maverick/applications/kio-apt/debian/rules b/ubuntu/maverick/applications/kio-apt/debian/rules
index 93f63f8ee..f9ce7782e 100755
--- a/ubuntu/maverick/applications/kio-apt/debian/rules
+++ b/ubuntu/maverick/applications/kio-apt/debian/rules
@@ -29,10 +29,10 @@ debian/stamp-bootstrap:
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-configure/kio-apt-trinity::
+configure/tdeio-apt-trinity::
 	#fix rpath issue
 	# -chmod +x debian/fixrpath
 	# debian/fixrpath $(DEB_BUILDDIR)
 
-install/kio-apt-trinity::
-	uudecode debian/kdedeb_logo.png.uu -o $(DEB_DESTDIR)/opt/trinity/share/apps/kio_apt/kdedeb_logo.png
+install/tdeio-apt-trinity::
+	uudecode debian/kdedeb_logo.png.uu -o $(DEB_DESTDIR)/opt/trinity/share/apps/tdeio_apt/kdedeb_logo.png
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/control b/ubuntu/maverick/applications/kio-umountwrapper/debian/control
index cbd222b49..af0b21f42 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/control
+++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/control
@@ -14,4 +14,4 @@ Description: progress dialog for safely removing devices in Trinity.
  Wrapper around kio_media_mountwrapper.
  Provides a progress dialog for Safely Removing of devices in Trinity.
  .
-  Homepage: http://frode.kde.no/misc/kio_umountwrapper/
+  Homepage: http://frode.kde.no/misc/tdeio_umountwrapper/
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/rules b/ubuntu/maverick/applications/kio-umountwrapper/debian/rules
index 6672eae5b..ddfd17b35 100755
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/rules
+++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/rules
@@ -31,19 +31,19 @@ debian/stamp-bootstrap:
 common-post-build-arch::
 	XGETTEXT=/usr/bin/kde-xgettext sh admin/cvs.sh extract-messages
 
-install/kio-umountwrapper-trinity::
-	mkdir -p $(CURDIR)/debian/kio-umountwrapper-trinity/opt/trinity/share/apps/konqueror/servicemenus/
+install/tdeio-umountwrapper-trinity::
+	mkdir -p $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/konqueror/servicemenus/
 	cp $(CURDIR)/debian/media_safelyremove.desktop \
-		$(CURDIR)/debian/kio-umountwrapper-trinity/opt/trinity/share/apps/konqueror/servicemenus/
+		$(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/konqueror/servicemenus/
 
-	mkdir -p $(CURDIR)/debian/kio-umountwrapper-trinity/opt/trinity/share/apps/dolphin/servicemenus/
+	mkdir -p $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/dolphin/servicemenus/
 	cp $(CURDIR)/debian/media_safelyremove.desktop \
-		$(CURDIR)/debian/kio-umountwrapper-trinity/opt/trinity/share/apps/dolphin/servicemenus/
+		$(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/dolphin/servicemenus/
 
-	mkdir -p $(CURDIR)/debian/kio-umountwrapper-trinity/opt/trinity/share/apps/d3lphin/servicemenus/
+	mkdir -p $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/d3lphin/servicemenus/
 	cp $(CURDIR)/debian/media_safelyremove.desktop \
-		$(CURDIR)/debian/kio-umountwrapper-trinity/opt/trinity/share/apps/d3lphin/servicemenus/
+		$(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/d3lphin/servicemenus/
 clean::
-	rm -rf $(CURDIR)/debian/kio-umountwrapper-trinity/opt/trinity/share/apps/
+	rm -rf $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/
 	rm -f po/*.pot
 
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1
index e44c4cd99..773b098d6 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1
+++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1
@@ -136,9 +136,9 @@ mirrors the whole layout of widgets.
 
 .SH SEE ALSO
 Full user documentation is available through the KDE Help Center.  You can also enter the URL
-.BR help:/kiosktool\-tdedirs/
+.BR help:/tdeiosktool\-tdedirs/
 directly into konqueror or you can run 
-.BR "`khelpcenter help:/kiosktool\-tdedirs/'"
+.BR "`khelpcenter help:/tdeiosktool\-tdedirs/'"
 from the command\-line.
 .br
 .SH AUTHORS
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1
index 08ba2ec80..d510c0d6b 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1
+++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1
@@ -138,9 +138,9 @@ mirrors the whole layout of widgets.
 
 .SH SEE ALSO
 Full user documentation is available through the KDE Help Center.  You can also enter the URL
-.BR help:/kiosktool/
+.BR help:/tdeiosktool/
 directly into konqueror or you can run 
-.BR "`khelpcenter help:/kiosktool/'"
+.BR "`khelpcenter help:/tdeiosktool/'"
 from the command\-line.
 .br
 .SH AUTHORS
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages
index 43bd4d1b8..62e420c43 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages
+++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages
@@ -1,2 +1,2 @@
-debian/kiosktool-trinity.1
-debian/kiosktool-tdedirs-trinity.1
+debian/tdeiosktool-trinity.1
+debian/tdeiosktool-tdedirs-trinity.1
diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
index 77f7d912f..b1e39b1d4 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
+++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
@@ -1,5 +1,5 @@
---- kiosktool/kiosktool/menueditComponent.cpp	2005-04-25 09:46:33.000000000 +0000
-+++ kiosktool/kiosktool/menueditComponent.cpp	2005-12-18 14:45:26.000000000 +0000
+--- kiosktool/tdeiosktool/menueditComponent.cpp	2005-04-25 09:46:33.000000000 +0000
++++ kiosktool/tdeiosktool/menueditComponent.cpp	2005-12-18 14:45:26.000000000 +0000
 @@ -104,8 +104,8 @@
  {
     bool result;
diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
index eb8ca9a1b..e7b9121ef 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
+++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
@@ -1,5 +1,5 @@
---- kiosktool/kiosktool/kioskrun.h	2005-04-25 10:46:33.000000000 +0100
-+++ kiosktool/kiosktool/kioskrun.h	2007-07-18 17:47:04.000000000 +0100
+--- kiosktool/tdeiosktool/tdeioskrun.h	2005-04-25 10:46:33.000000000 +0100
++++ kiosktool/tdeiosktool/tdeioskrun.h	2007-07-18 17:47:04.000000000 +0100
 @@ -37,6 +37,18 @@
  
  class KioskGui;
@@ -19,8 +19,8 @@
  class KioskRun : public TQObject
  {
    friend class KioskGui;
---- kiosktool/kiosktool/kioskrun.cpp	2005-04-25 10:46:33.000000000 +0100
-+++ kiosktool/kiosktool/kioskrun.cpp	2007-07-20 16:56:07.000000000 +0100
+--- kiosktool/tdeiosktool/tdeioskrun.cpp	2005-04-25 10:46:33.000000000 +0100
++++ kiosktool/tdeiosktool/tdeioskrun.cpp	2007-07-20 16:56:07.000000000 +0100
 @@ -28,6 +28,7 @@
  
  #include <tqdir.h>
@@ -32,7 +32,7 @@
 @@ -45,10 +46,124 @@
  #include "kiosksync.h"
  
- #include <kio/netaccess.h>
+ #include <tdeio/netaccess.h>
 -#define NETACCESS	KIO::NetAccess
 +// Kiosktool wants to use fish://root@localhost/... which won't work on Kubuntu because we don't run ssh by default, we don't allow ssh to do root logins and root doesn't even have a password, so implement the functions here for local copies using tdesu instead
 +// #define NETACCESS	KIO::NetAccess
diff --git a/ubuntu/maverick/applications/krusader/debian/rules b/ubuntu/maverick/applications/krusader/debian/rules
index b19073807..f2fc8f971 100755
--- a/ubuntu/maverick/applications/krusader/debian/rules
+++ b/ubuntu/maverick/applications/krusader/debian/rules
@@ -44,8 +44,8 @@ install/krusader-trinity::
 	install -D -p -m0644 pics/cr32-app-krusader_user.xpm \
 		$(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_user.xpm
 	# install properly kio_isorc
-	install -D -p -m0644 iso/kio_isorc \
-		$(DEB_DESTDIR)/opt/trinity/share/config/kio_isorc
+	install -D -p -m0644 iso/tdeio_isorc \
+		$(DEB_DESTDIR)/opt/trinity/share/config/tdeio_isorc
 	# install lintian override
 	install -D -p -m0644 debian/krusader.lintian-overrides \
 		$(DEB_DESTDIR)/opt/trinity/share/lintian/overrides/krusader
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/README.debian b/ubuntu/maverick/applications/ksquirrel/debian/README.debian
index c580229d7..5e7bd078a 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/README.debian
+++ b/ubuntu/maverick/applications/ksquirrel/debian/README.debian
@@ -4,7 +4,7 @@ exif support is disabled. That library depends on tdelibs3.
 MT is enabled because configure seems not smart enough.
 
 Qt version coded in configure.in.in
-Hard-coded dependency on libkio.la (in tdelibs4-dev)
+Hard-coded dependency on libtdeio.la (in tdelibs4-dev)
 Hard-coded dependency on dcopidl
 
  -- Paul Gevers <paul@climbing.nl>  Sun, 14 Sep 2008 10:17:50 -0500
diff --git a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
index edba29129..79f9eff3d 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
+++ b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/share/services/*.protocol
-debian/tmp/opt/trinity/lib/trinity/kio*
+debian/tmp/opt/trinity/lib/trinity/tdeio*
 debian/tmp/opt/trinity/lib/trinity/kded_tdesvnd.*
 debian/tmp/opt/trinity/share/services/kded/
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kamera-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kamera-trinity.install
index e8bf34e59..f50af25f4 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kamera-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kamera-trinity.install
@@ -1,8 +1,8 @@
 
 debian/tmp/opt/trinity/lib/trinity/kcm_kamera.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kamera.so
-debian/tmp/opt/trinity/lib/trinity/kio_kamera.la
-debian/tmp/opt/trinity/lib/trinity/kio_kamera.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_kamera.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_kamera.so
 debian/tmp/opt/trinity/share/applications/tde/kamera.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kamera/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kamera/index.cache.bz2
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.install
index 306bec393..f5de1ad92 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.install
@@ -3,8 +3,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_kmrml.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kmrml.so
 debian/tmp/opt/trinity/lib/trinity/kded_daemonwatcher.la
 debian/tmp/opt/trinity/lib/trinity/kded_daemonwatcher.so
-debian/tmp/opt/trinity/lib/trinity/kio_mrml.la
-debian/tmp/opt/trinity/lib/trinity/kio_mrml.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_mrml.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_mrml.so
 debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.la
 debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.so
 debian/tmp/opt/trinity/lib/trinity/mrmlsearch.la
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-data-trinity.lintian b/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-data-trinity.lintian
index 7fae2cfa6..a28be4e14 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-data-trinity.lintian
+++ b/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-data-trinity.lintian
@@ -6,6 +6,6 @@ kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/L
 # This file is a template, not a script.
 kdevelop-data: script-not-executable ./usr/share/apps/kdevfilecreate/file-templates/pl
 # This file is used internally by kio_pydoc.la and invoked explicitly with python.
-kdevelop-data: script-not-executable ./usr/share/apps/kio_pydoc/kde_pydoc.py
+kdevelop-data: script-not-executable ./usr/share/apps/tdeio_pydoc/kde_pydoc.py
 # This file is used internally by libkdevcvsservice.la and invoked explicitly with sh.
 kdevelop-data: script-not-executable ./usr/share/apps/kdevcvsservice/buildcvs.sh
diff --git a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install b/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install
index 15ec8f99e..22bc62c71 100644
--- a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install
+++ b/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/etc/trinity/translaterc
 debian/tmp/opt/trinity/bin/fsview
 debian/tmp/opt/trinity/bin/jpegorient
-debian/tmp/opt/trinity/bin/kio_media_realfolder
+debian/tmp/opt/trinity/bin/tdeio_media_realfolder
 debian/tmp/opt/trinity/lib/trinity/konq_sidebarnews.la
 debian/tmp/opt/trinity/lib/trinity/konq_sidebarnews.so
 debian/tmp/opt/trinity/lib/trinity/konqsidebar_delicious.la
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
index 80f1c2f68..b3d5bfbc6 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
@@ -112,8 +112,8 @@ debian/tmp/opt/trinity/lib/trinity/kcontrol.la
 debian/tmp/opt/trinity/lib/trinity/kcontrol.so
 debian/tmp/opt/trinity/lib/trinity/tdefile_font.la
 debian/tmp/opt/trinity/lib/trinity/tdefile_font.so
-debian/tmp/opt/trinity/lib/trinity/kio_fonts.la
-debian/tmp/opt/trinity/lib/trinity/kio_fonts.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.so
 debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.la
 debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.so
 debian/tmp/opt/trinity/lib/trinity/libkfontviewpart.la
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.install
index d374eb0bc..47f0abc0c 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/bin/kio_media_mounthelper
+debian/tmp/opt/trinity/bin/tdeio_media_mounthelper
 debian/tmp/opt/trinity/bin/ktrash
 debian/tmp/opt/trinity/lib/trinity/cursorthumbnail.la
 debian/tmp/opt/trinity/lib/trinity/cursorthumbnail.so
@@ -28,54 +28,54 @@ debian/tmp/opt/trinity/lib/trinity/tdefile_media.la
 debian/tmp/opt/trinity/lib/trinity/tdefile_media.so
 debian/tmp/opt/trinity/lib/trinity/tdefile_trash.la
 debian/tmp/opt/trinity/lib/trinity/tdefile_trash.so
-debian/tmp/opt/trinity/lib/trinity/kio_about.la
-debian/tmp/opt/trinity/lib/trinity/kio_about.so
-debian/tmp/opt/trinity/lib/trinity/kio_cgi.la
-debian/tmp/opt/trinity/lib/trinity/kio_cgi.so
-debian/tmp/opt/trinity/lib/trinity/kio_filter.la
-debian/tmp/opt/trinity/lib/trinity/kio_filter.so
-debian/tmp/opt/trinity/lib/trinity/kio_finger.la
-debian/tmp/opt/trinity/lib/trinity/kio_finger.so
-debian/tmp/opt/trinity/lib/trinity/kio_fish.la
-debian/tmp/opt/trinity/lib/trinity/kio_fish.so
-debian/tmp/opt/trinity/lib/trinity/kio_floppy.la
-debian/tmp/opt/trinity/lib/trinity/kio_floppy.so
-debian/tmp/opt/trinity/lib/trinity/kio_home.la
-debian/tmp/opt/trinity/lib/trinity/kio_home.so
-debian/tmp/opt/trinity/lib/trinity/kio_info.la
-debian/tmp/opt/trinity/lib/trinity/kio_info.so
-debian/tmp/opt/trinity/lib/trinity/kio_ldap.la
-debian/tmp/opt/trinity/lib/trinity/kio_ldap.so
-debian/tmp/opt/trinity/lib/trinity/kio_mac.la
-debian/tmp/opt/trinity/lib/trinity/kio_mac.so
-debian/tmp/opt/trinity/lib/trinity/kio_man.la
-debian/tmp/opt/trinity/lib/trinity/kio_man.so
-debian/tmp/opt/trinity/lib/trinity/kio_media.la
-debian/tmp/opt/trinity/lib/trinity/kio_media.so
-debian/tmp/opt/trinity/lib/trinity/kio_nfs.la
-debian/tmp/opt/trinity/lib/trinity/kio_nfs.so
-debian/tmp/opt/trinity/lib/trinity/kio_nntp.la
-debian/tmp/opt/trinity/lib/trinity/kio_nntp.so
-debian/tmp/opt/trinity/lib/trinity/kio_pop3.la
-debian/tmp/opt/trinity/lib/trinity/kio_pop3.so
-debian/tmp/opt/trinity/lib/trinity/kio_remote.la
-debian/tmp/opt/trinity/lib/trinity/kio_remote.so
-debian/tmp/opt/trinity/lib/trinity/kio_settings.la
-debian/tmp/opt/trinity/lib/trinity/kio_settings.so
-debian/tmp/opt/trinity/lib/trinity/kio_sftp.la
-debian/tmp/opt/trinity/lib/trinity/kio_sftp.so
-debian/tmp/opt/trinity/lib/trinity/kio_smb.la
-debian/tmp/opt/trinity/lib/trinity/kio_smb.so
-debian/tmp/opt/trinity/lib/trinity/kio_smtp.la
-debian/tmp/opt/trinity/lib/trinity/kio_smtp.so
-debian/tmp/opt/trinity/lib/trinity/kio_system.la
-debian/tmp/opt/trinity/lib/trinity/kio_system.so
-debian/tmp/opt/trinity/lib/trinity/kio_tar.la
-debian/tmp/opt/trinity/lib/trinity/kio_tar.so
-debian/tmp/opt/trinity/lib/trinity/kio_thumbnail.la
-debian/tmp/opt/trinity/lib/trinity/kio_thumbnail.so
-debian/tmp/opt/trinity/lib/trinity/kio_trash.la
-debian/tmp/opt/trinity/lib/trinity/kio_trash.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_about.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_about.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_cgi.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_cgi.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_filter.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_filter.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_finger.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_finger.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_fish.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_fish.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_floppy.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_floppy.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_home.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_home.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_info.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_info.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_ldap.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_ldap.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_mac.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_mac.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_man.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_man.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_media.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_media.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_nfs.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_nfs.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_nntp.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_nntp.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_pop3.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_pop3.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_remote.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_remote.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_settings.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_settings.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_sftp.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_sftp.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_smb.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_smb.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_smtp.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_smtp.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_system.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_system.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_tar.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_tar.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_thumbnail.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_thumbnail.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_trash.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_trash.so
 debian/tmp/opt/trinity/lib/trinity/libkmanpart.la
 debian/tmp/opt/trinity/lib/trinity/libkmanpart.so
 debian/tmp/opt/trinity/lib/trinity/media_propsdlgplugin.la
@@ -83,11 +83,11 @@ debian/tmp/opt/trinity/lib/trinity/media_propsdlgplugin.so
 debian/tmp/opt/trinity/lib/trinity/textthumbnail.la
 debian/tmp/opt/trinity/lib/trinity/textthumbnail.so
 debian/tmp/opt/trinity/share/applications/tde/kcmcgi.desktop
-debian/tmp/opt/trinity/share/apps/kio_finger/kio_finger.css
-debian/tmp/opt/trinity/share/apps/kio_finger/kio_finger.pl
-debian/tmp/opt/trinity/share/apps/kio_info/kde-info2html
-debian/tmp/opt/trinity/share/apps/kio_info/kde-info2html.conf
-debian/tmp/opt/trinity/share/apps/kio_man/kio_man.css
+debian/tmp/opt/trinity/share/apps/tdeio_finger/tdeio_finger.css
+debian/tmp/opt/trinity/share/apps/tdeio_finger/tdeio_finger.pl
+debian/tmp/opt/trinity/share/apps/tdeio_info/kde-info2html
+debian/tmp/opt/trinity/share/apps/tdeio_info/kde-info2html.conf
+debian/tmp/opt/trinity/share/apps/tdeio_man/tdeio_man.css
 debian/tmp/opt/trinity/share/apps/konqueror/dirtree/remote/smb-network.desktop
 debian/tmp/opt/trinity/share/apps/remoteview/smb-network.desktop
 debian/tmp/opt/trinity/share/apps/systemview/documents.desktop
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.manpages b/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.manpages
index 41ee5f29a..249292ad7 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.manpages
+++ b/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.manpages
@@ -1,2 +1,2 @@
-debian/man/kio_media_mounthelper-trinity.1
+debian/man/tdeio_media_mounthelper-trinity.1
 debian/man/ktrash-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages
index ebb07daf7..d7be462a6 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages
@@ -7,7 +7,7 @@ debian/man/kdebugdialog-trinity.1
 debian/man/tdesu-trinity.1
 debian/man/kdialog-trinity.1
 debian/man/khotkeys-trinity.1
-debian/man/kio_system_documenthelper-trinity.1
+debian/man/tdeio_system_documenthelper-trinity.1
 debian/man/knetattach-trinity.1
 debian/man/krandom.kss-trinity.1
 debian/man/kreadconfig-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install
index 64628abc9..48bfe8565 100644
--- a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install
@@ -3,8 +3,8 @@ debian/tmp/opt/trinity/bin/kjobviewer
 debian/tmp/opt/trinity/bin/kprinter
 debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.la
 debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.so
-debian/tmp/opt/trinity/lib/trinity/kio_print.la
-debian/tmp/opt/trinity/lib/trinity/kio_print.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_print.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_print.so
 debian/tmp/opt/trinity/lib/trinity/kjobviewer.la
 debian/tmp/opt/trinity/lib/trinity/kjobviewer.so
 debian/tmp/opt/trinity/lib/trinity/kprinter.la
diff --git a/ubuntu/maverick/tdegames/debian/atlantik-trinity.install b/ubuntu/maverick/tdegames/debian/atlantik-trinity.install
index fffdeb69c..69d8dbc9a 100644
--- a/ubuntu/maverick/tdegames/debian/atlantik-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/atlantik-trinity.install
@@ -5,8 +5,8 @@
 /opt/trinity/lib/libatlantikclient.so.*
 /opt/trinity/lib/libatlantikui.la
 /opt/trinity/lib/libatlantikui.so.*
-/opt/trinity/lib/trinity/kio_atlantik.la
-/opt/trinity/lib/trinity/kio_atlantik.so
+/opt/trinity/lib/trinity/tdeio_atlantik.la
+/opt/trinity/lib/trinity/tdeio_atlantik.so
 /opt/trinity/share/services/atlantik.protocol
 /opt/trinity/share/doc/tde/HTML/en/atlantik/*
 /opt/trinity/share/applications/tde/atlantik.desktop
diff --git a/ubuntu/maverick/tdegraphics/debian/kamera-trinity.install b/ubuntu/maverick/tdegraphics/debian/kamera-trinity.install
index e8bf34e59..f50af25f4 100644
--- a/ubuntu/maverick/tdegraphics/debian/kamera-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kamera-trinity.install
@@ -1,8 +1,8 @@
 
 debian/tmp/opt/trinity/lib/trinity/kcm_kamera.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kamera.so
-debian/tmp/opt/trinity/lib/trinity/kio_kamera.la
-debian/tmp/opt/trinity/lib/trinity/kio_kamera.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_kamera.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_kamera.so
 debian/tmp/opt/trinity/share/applications/tde/kamera.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kamera/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kamera/index.cache.bz2
diff --git a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install b/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install
index 306bec393..f5de1ad92 100644
--- a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install
@@ -3,8 +3,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_kmrml.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kmrml.so
 debian/tmp/opt/trinity/lib/trinity/kded_daemonwatcher.la
 debian/tmp/opt/trinity/lib/trinity/kded_daemonwatcher.so
-debian/tmp/opt/trinity/lib/trinity/kio_mrml.la
-debian/tmp/opt/trinity/lib/trinity/kio_mrml.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_mrml.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_mrml.so
 debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.la
 debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.so
 debian/tmp/opt/trinity/lib/trinity/mrmlsearch.la
diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog
index 1cffd2663..15ecc465c 100644
--- a/ubuntu/maverick/tdelibs/debian/changelog
+++ b/ubuntu/maverick/tdelibs/debian/changelog
@@ -2394,7 +2394,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low
     - usr/share/apps/ksgmltools2/customization/cs/entities/underLGPL.docbook
 
   * New entries in debian/tdelibs4-dev.install:
-    - usr/include/kiobuffer.h
+    - usr/include/tdeiobuffer.h
     - usr/include/tdewallettypes.h
 
   * debian/control:
@@ -2443,9 +2443,9 @@ tdelibs (4:3.3.1-2) unstable; urgency=medium
 
     - post-3.3.1-tdelibs-kio.diff: the patch as given in the KDE Advisory
       can't be used, since tdelibs 3.3.1-1 includes a KDE_3_3_BRANCH pull that
-      already modifies kio/kio/job.cpp and makes the supplied patch unusable.
+      already modifies tdeio/tdeio/job.cpp and makes the supplied patch unusable.
 
-      Regenerated patch from CVS: Diff for /tdelibs/kio/kio/job.cpp between
+      Regenerated patch from CVS: Diff for /tdelibs/tdeio/tdeio/job.cpp between
       version 1.397.2.7 and 1.397.2.8.
 
  -- Adeodato Simó <asp16@alu.ua.es>  Sat, 11 Dec 2004 00:23:09 +0100
diff --git a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
index 715b2bd22..faa57c5ba 100644
--- a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
+++ b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
@@ -1,5 +1,5 @@
---- a/kio/kio/kprotocolmanager.cpp
-+++ b/kio/kio/kprotocolmanager.cpp
+--- a/tdeio/tdeio/kprotocolmanager.cpp
++++ b/tdeio/tdeio/kprotocolmanager.cpp
 @@ -450,14 +450,19 @@
       return d->useragent;
  
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index 98ccf5d11..bdf9bb4f7 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -9,7 +9,7 @@ debian/tmp/etc/trinity/katesyntaxhighlightingrc
 debian/tmp/etc/trinity/kdebug.areas
 debian/tmp/etc/trinity/kdebugrc
 debian/tmp/etc/trinity/tdeprintrc
-debian/tmp/etc/trinity/kio_isorc
+debian/tmp/etc/trinity/tdeio_isorc
 debian/tmp/etc/trinity/ksslcalist
 debian/tmp/etc/trinity/kthemestylerc
 debian/tmp/etc/trinity/language.codes
@@ -41,7 +41,7 @@ debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_tdetexteditor.desktop
 debian/tmp/opt/trinity/share/apps/tdeconf_update/kcookiescfg.upd
 debian/tmp/opt/trinity/share/apps/tdeconf_update/kded.upd
 debian/tmp/opt/trinity/share/apps/tdeconf_update/tdeprintrc.upd
-debian/tmp/opt/trinity/share/apps/tdeconf_update/kio_help.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/tdeio_help.upd
 debian/tmp/opt/trinity/share/apps/tdeconf_update/tdeioslave.upd
 debian/tmp/opt/trinity/share/apps/tdeconf_update/move_kio_help_cache.sh
 debian/tmp/opt/trinity/share/apps/tdeconf_update/proxytype.pl
@@ -3594,7 +3594,7 @@ debian/tmp/opt/trinity/share/services/http_cache_cleaner.desktop
 debian/tmp/opt/trinity/share/services/http.protocol
 debian/tmp/opt/trinity/share/services/https.protocol
 debian/tmp/opt/trinity/share/services/iso.protocol
-debian/tmp/opt/trinity/share/applnk/kio_iso.desktop
+debian/tmp/opt/trinity/share/applnk/tdeio_iso.desktop
 debian/tmp/opt/trinity/share/services/ico.kimgio
 debian/tmp/opt/trinity/share/services/jp2.kimgio
 debian/tmp/opt/trinity/share/services/jpeg.kimgio
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
index 267909be7..503e1c360 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -312,44 +312,44 @@ debian/tmp/opt/trinity/include/tdeimproxy.h
 debian/tmp/opt/trinity/include/tdeimproxyiface.h
 debian/tmp/opt/trinity/include/kinputdialog.h
 debian/tmp/opt/trinity/include/kinstance.h
-debian/tmp/opt/trinity/include/kio/authinfo.h
-debian/tmp/opt/trinity/include/kiobuffer.h
-debian/tmp/opt/trinity/include/kio/chmodjob.h
-debian/tmp/opt/trinity/include/kio/connection.h
-debian/tmp/opt/trinity/include/kio/davjob.h
-debian/tmp/opt/trinity/include/kio/defaultprogress.h
-debian/tmp/opt/trinity/include/kio/file.h
-debian/tmp/opt/trinity/include/kio/forwardingslavebase.h
-debian/tmp/opt/trinity/include/kio/global.h
-debian/tmp/opt/trinity/include/kio/http.h
-debian/tmp/opt/trinity/include/kio/http_slave_defaults.h
-debian/tmp/opt/trinity/include/kio/ioslave_defaults.h
-debian/tmp/opt/trinity/include/kio/jobclasses.h
-debian/tmp/opt/trinity/include/kio/job.h
-debian/tmp/opt/trinity/include/kio/tdesasl.h
-debian/tmp/opt/trinity/include/kio/kmdbase.h
-debian/tmp/opt/trinity/include/kio/kmdcodec.h
-debian/tmp/opt/trinity/include/kio/tdentlm.h
-debian/tmp/opt/trinity/include/kio/metainfojob.h
-debian/tmp/opt/trinity/include/kio/netaccess.h
-debian/tmp/opt/trinity/include/kio/observer.h
-debian/tmp/opt/trinity/include/kio/passdlg.h
-debian/tmp/opt/trinity/include/kio/paste.h
-debian/tmp/opt/trinity/include/kio/previewjob.h
-debian/tmp/opt/trinity/include/kio/progressbase.h
-debian/tmp/opt/trinity/include/kio/renamedlg.h
-debian/tmp/opt/trinity/include/kio/scheduler.h
-debian/tmp/opt/trinity/include/kio/sessiondata.h
-debian/tmp/opt/trinity/include/kio/skipdlg.h
-debian/tmp/opt/trinity/include/kio/slavebase.h
-debian/tmp/opt/trinity/include/kio/slaveconfig.h
-debian/tmp/opt/trinity/include/kio/slave.h
-debian/tmp/opt/trinity/include/kio/slaveinterface.h
-debian/tmp/opt/trinity/include/kio/statusbarprogress.h
-debian/tmp/opt/trinity/include/kio/tcpslavebase.h
-debian/tmp/opt/trinity/include/kio/thumbcreator.h
-debian/tmp/opt/trinity/include/kio/uiserver.h
-debian/tmp/opt/trinity/include/kio/uiserver_stub.h
+debian/tmp/opt/trinity/include/tdeio/authinfo.h
+debian/tmp/opt/trinity/include/tdeiobuffer.h
+debian/tmp/opt/trinity/include/tdeio/chmodjob.h
+debian/tmp/opt/trinity/include/tdeio/connection.h
+debian/tmp/opt/trinity/include/tdeio/davjob.h
+debian/tmp/opt/trinity/include/tdeio/defaultprogress.h
+debian/tmp/opt/trinity/include/tdeio/file.h
+debian/tmp/opt/trinity/include/tdeio/forwardingslavebase.h
+debian/tmp/opt/trinity/include/tdeio/global.h
+debian/tmp/opt/trinity/include/tdeio/http.h
+debian/tmp/opt/trinity/include/tdeio/http_slave_defaults.h
+debian/tmp/opt/trinity/include/tdeio/ioslave_defaults.h
+debian/tmp/opt/trinity/include/tdeio/jobclasses.h
+debian/tmp/opt/trinity/include/tdeio/job.h
+debian/tmp/opt/trinity/include/tdeio/tdesasl.h
+debian/tmp/opt/trinity/include/tdeio/kmdbase.h
+debian/tmp/opt/trinity/include/tdeio/kmdcodec.h
+debian/tmp/opt/trinity/include/tdeio/tdentlm.h
+debian/tmp/opt/trinity/include/tdeio/metainfojob.h
+debian/tmp/opt/trinity/include/tdeio/netaccess.h
+debian/tmp/opt/trinity/include/tdeio/observer.h
+debian/tmp/opt/trinity/include/tdeio/passdlg.h
+debian/tmp/opt/trinity/include/tdeio/paste.h
+debian/tmp/opt/trinity/include/tdeio/previewjob.h
+debian/tmp/opt/trinity/include/tdeio/progressbase.h
+debian/tmp/opt/trinity/include/tdeio/renamedlg.h
+debian/tmp/opt/trinity/include/tdeio/scheduler.h
+debian/tmp/opt/trinity/include/tdeio/sessiondata.h
+debian/tmp/opt/trinity/include/tdeio/skipdlg.h
+debian/tmp/opt/trinity/include/tdeio/slavebase.h
+debian/tmp/opt/trinity/include/tdeio/slaveconfig.h
+debian/tmp/opt/trinity/include/tdeio/slave.h
+debian/tmp/opt/trinity/include/tdeio/slaveinterface.h
+debian/tmp/opt/trinity/include/tdeio/statusbarprogress.h
+debian/tmp/opt/trinity/include/tdeio/tcpslavebase.h
+debian/tmp/opt/trinity/include/tdeio/thumbcreator.h
+debian/tmp/opt/trinity/include/tdeio/uiserver.h
+debian/tmp/opt/trinity/include/tdeio/uiserver_stub.h
 debian/tmp/opt/trinity/include/kipc.h
 debian/tmp/opt/trinity/include/kjanuswidget.h
 debian/tmp/opt/trinity/include/kjs/completion.h
@@ -780,8 +780,8 @@ debian/tmp/opt/trinity/lib/libtdehtml.la
 debian/tmp/opt/trinity/lib/libtdehtml.so
 debian/tmp/opt/trinity/lib/libtdeimproxy.la
 debian/tmp/opt/trinity/lib/libtdeimproxy.so
-debian/tmp/opt/trinity/lib/libkio.la
-debian/tmp/opt/trinity/lib/libkio.so
+debian/tmp/opt/trinity/lib/libtdeio.la
+debian/tmp/opt/trinity/lib/libtdeio.so
 debian/tmp/opt/trinity/lib/libkjava.la
 debian/tmp/opt/trinity/lib/libkjava.so
 debian/tmp/opt/trinity/lib/libkjs.la
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
index 182f67f3e..5d8c4e3aa 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -35,7 +35,7 @@ debian/tmp/opt/trinity/bin/kgrantpty
 debian/tmp/opt/trinity/bin/tdehotnewstuff
 debian/tmp/opt/trinity/bin/kinstalltheme
 debian/tmp/opt/trinity/bin/tdeioexec
-debian/tmp/opt/trinity/bin/kio_http_cache_cleaner
+debian/tmp/opt/trinity/bin/tdeio_http_cache_cleaner
 debian/tmp/opt/trinity/bin/tdeioslave
 debian/tmp/opt/trinity/bin/tdeio_uiserver
 debian/tmp/opt/trinity/bin/tdelauncher
@@ -143,22 +143,22 @@ debian/tmp/opt/trinity/lib/trinity/kimg_xcf.la
 debian/tmp/opt/trinity/lib/trinity/kimg_xcf.so
 debian/tmp/opt/trinity/lib/trinity/kimg_xview.la
 debian/tmp/opt/trinity/lib/trinity/kimg_xview.so
-debian/tmp/opt/trinity/lib/trinity/kio_file.la
-debian/tmp/opt/trinity/lib/trinity/kio_file.so
-debian/tmp/opt/trinity/lib/trinity/kio_ftp.la
-debian/tmp/opt/trinity/lib/trinity/kio_ftp.so
-debian/tmp/opt/trinity/lib/trinity/kio_ghelp.la
-debian/tmp/opt/trinity/lib/trinity/kio_ghelp.so
-debian/tmp/opt/trinity/lib/trinity/kio_help.la
-debian/tmp/opt/trinity/lib/trinity/kio_help.so
-debian/tmp/opt/trinity/lib/trinity/kio_http_cache_cleaner.la
-debian/tmp/opt/trinity/lib/trinity/kio_http_cache_cleaner.so
-debian/tmp/opt/trinity/lib/trinity/kio_http.la
-debian/tmp/opt/trinity/lib/trinity/kio_http.so
-debian/tmp/opt/trinity/lib/trinity/kio_iso.la
-debian/tmp/opt/trinity/lib/trinity/kio_iso.so
-debian/tmp/opt/trinity/lib/trinity/kio_metainfo.la
-debian/tmp/opt/trinity/lib/trinity/kio_metainfo.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_file.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_file.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_ftp.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_ftp.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_ghelp.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_ghelp.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_help.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_help.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_http_cache_cleaner.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_http_cache_cleaner.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_http.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_http.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_iso.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_iso.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_metainfo.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_metainfo.so
 debian/tmp/opt/trinity/lib/trinity/tdeio_uiserver.la
 debian/tmp/opt/trinity/lib/trinity/tdeio_uiserver.so
 debian/tmp/opt/trinity/lib/trinity/kjavaappletviewer.la
@@ -270,8 +270,8 @@ debian/tmp/opt/trinity/lib/libtdehtml.so.4
 debian/tmp/opt/trinity/lib/libtdehtml.so.4.2.0
 debian/tmp/opt/trinity/lib/libtdeimproxy.so.0
 debian/tmp/opt/trinity/lib/libtdeimproxy.so.0.0.0
-debian/tmp/opt/trinity/lib/libkio.so.4
-debian/tmp/opt/trinity/lib/libkio.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeio.so.4
+debian/tmp/opt/trinity/lib/libtdeio.so.4.2.0
 debian/tmp/opt/trinity/lib/libkjava.so.1
 debian/tmp/opt/trinity/lib/libkjava.so.1.0.0
 debian/tmp/opt/trinity/lib/libkjs.so.1
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
index 505fcc7c9..7c2d23170 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
@@ -13,7 +13,7 @@ debian/man/out/kded-trinity.1
 debian/man/out/kdontchangethehostname-trinity.1
 debian/man/out/tdefile-trinity.1
 debian/man/out/kinstalltheme-trinity.1
-debian/man/out/kio_http_cache_cleaner-trinity.1
+debian/man/out/tdeio_http_cache_cleaner-trinity.1
 debian/man/out/tdeio_uiserver-trinity.1
 debian/man/out/tdemailservice-trinity.1
 debian/man/out/tdesendbugmail-trinity.1
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
index 1cb78ea91..b45ea389e 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/lib/trinity/kcm_audiocd.la
 debian/tmp/opt/trinity/lib/trinity/kcm_audiocd.so
-debian/tmp/opt/trinity/lib/trinity/kio_audiocd.la
-debian/tmp/opt/trinity/lib/trinity/kio_audiocd.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_audiocd.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_audiocd.so
 debian/tmp/opt/trinity/lib/trinity/libaudiocd_encoder_flac.la
 debian/tmp/opt/trinity/lib/trinity/libaudiocd_encoder_flac.so
 debian/tmp/opt/trinity/lib/trinity/libaudiocd_encoder_lame.la
diff --git a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install b/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install
index 8f133483d..d54671ac9 100644
--- a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install
@@ -43,8 +43,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_kopete_translator.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kopete_translator.so
 debian/tmp/opt/trinity/lib/trinity/kcm_kopete_webpresence.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kopete_webpresence.so
-debian/tmp/opt/trinity/lib/trinity/kio_jabberdisco.la
-debian/tmp/opt/trinity/lib/trinity/kio_jabberdisco.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_jabberdisco.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_jabberdisco.so
 debian/tmp/opt/trinity/lib/trinity/kopete_addbookmarks.la
 debian/tmp/opt/trinity/lib/trinity/kopete_addbookmarks.so
 debian/tmp/opt/trinity/lib/trinity/kopete_aim.la
diff --git a/ubuntu/maverick/tdenetwork/debian/lisa-trinity.install b/ubuntu/maverick/tdenetwork/debian/lisa-trinity.install
index 1a75e64db..8142981d7 100644
--- a/ubuntu/maverick/tdenetwork/debian/lisa-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/lisa-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/lib/trinity/kcm_lanbrowser.la
 debian/tmp/opt/trinity/lib/trinity/kcm_lanbrowser.so
-debian/tmp/opt/trinity/lib/trinity/kio_lan.la
-debian/tmp/opt/trinity/lib/trinity/kio_lan.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_lan.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_lan.so
 debian/tmp/opt/trinity/share/applnk/.hidden/kcmkiolan.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kcmlisa.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kcmreslisa.desktop
diff --git a/ubuntu/maverick/tdenetwork/debian/tdednssd-trinity.install b/ubuntu/maverick/tdenetwork/debian/tdednssd-trinity.install
index 8d6a52c6b..46b3c424c 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdednssd-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/tdednssd-trinity.install
@@ -9,7 +9,7 @@ debian/tmp/opt/trinity/share/apps/zeroconf/_webdav._tcp
 debian/tmp/opt/trinity/share/apps/zeroconf/_nfs._tcp
 debian/tmp/opt/trinity/share/apps/zeroconf/_ssh._tcp
 debian/tmp/opt/trinity/share/apps/zeroconf/_rfb._tcp
-debian/tmp/opt/trinity/lib/trinity/kio_zeroconf.so
-debian/tmp/opt/trinity/lib/trinity/kio_zeroconf.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_zeroconf.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_zeroconf.la
 debian/tmp/opt/trinity/lib/trinity/kded_dnssdwatcher.so
 debian/tmp/opt/trinity/lib/trinity/kded_dnssdwatcher.la
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-kio-plugins-trinity.install b/ubuntu/maverick/tdepim/debian/tdepim-kio-plugins-trinity.install
index f9cc8ca27..b04ea7b6d 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-kio-plugins-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/tdepim-kio-plugins-trinity.install
@@ -1,13 +1,13 @@
-/opt/trinity/lib/trinity/kio_groupwise.la
-/opt/trinity/lib/trinity/kio_groupwise.so
-/opt/trinity/lib/trinity/kio_imap4.la
-/opt/trinity/lib/trinity/kio_imap4.so
-/opt/trinity/lib/trinity/kio_mbox.la
-/opt/trinity/lib/trinity/kio_mbox.so
-/opt/trinity/lib/trinity/kio_scalix.la
-/opt/trinity/lib/trinity/kio_scalix.so
-/opt/trinity/lib/trinity/kio_sieve.la
-/opt/trinity/lib/trinity/kio_sieve.so
+/opt/trinity/lib/trinity/tdeio_groupwise.la
+/opt/trinity/lib/trinity/tdeio_groupwise.so
+/opt/trinity/lib/trinity/tdeio_imap4.la
+/opt/trinity/lib/trinity/tdeio_imap4.so
+/opt/trinity/lib/trinity/tdeio_mbox.la
+/opt/trinity/lib/trinity/tdeio_mbox.so
+/opt/trinity/lib/trinity/tdeio_scalix.la
+/opt/trinity/lib/trinity/tdeio_scalix.so
+/opt/trinity/lib/trinity/tdeio_sieve.la
+/opt/trinity/lib/trinity/tdeio_sieve.so
 /opt/trinity/share/services/groupwise.protocol
 /opt/trinity/share/services/groupwises.protocol
 /opt/trinity/share/services/imap4.protocol
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-kio-plugins-trinity.install b/ubuntu/maverick/tdesdk/debian/tdesdk-kio-plugins-trinity.install
index f3f70394c..ef4f3a473 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-kio-plugins-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-kio-plugins-trinity.install
@@ -1,8 +1,8 @@
-debian/tmp/opt/trinity/bin/kio_svn_helper
+debian/tmp/opt/trinity/bin/tdeio_svn_helper
 debian/tmp/opt/trinity/lib/trinity/kded_ksvnd.la
 debian/tmp/opt/trinity/lib/trinity/kded_ksvnd.so
-debian/tmp/opt/trinity/lib/trinity/kio_svn.la
-debian/tmp/opt/trinity/lib/trinity/kio_svn.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_svn.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_svn.so
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/subversion_toplevel.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/subversion.desktop
 debian/tmp/opt/trinity/share/services/kded/ksvnd.desktop
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian b/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian
index 876c972e5..9f3b99d47 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian
@@ -6,6 +6,6 @@ tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/L
 # This file is a template, not a script.
 tdevelop-data: script-not-executable ./usr/share/apps/kdevfilecreate/file-templates/pl
 # This file is used internally by kio_pydoc.la and invoked explicitly with python.
-tdevelop-data: script-not-executable ./usr/share/apps/kio_pydoc/kde_pydoc.py
+tdevelop-data: script-not-executable ./usr/share/apps/tdeio_pydoc/kde_pydoc.py
 # This file is used internally by libkdevcvsservice.la and invoked explicitly with sh.
 tdevelop-data: script-not-executable ./usr/share/apps/kdevcvsservice/buildcvs.sh