Rename *-kio-* packages on Debian and Ubuntu

90 files changed, 135 insertions, 135 deletions

diff --git a/debian/lenny/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/lenny/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
index db5399106..447fe40dc 100644
--- a/debian/lenny/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/lenny/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -10,5 +10,5 @@ make watch file actually work
 
 #### due to removal of KDE 3 packages ####
 remove tdemultimedia-dev, tdebase-dev from Build-Depends
-remove amarok-konqsidebar, tdemultimedia-kio-plugins from Recommends
+remove amarok-konqsidebar, tdemultimedia-tdeio-plugins from Recommends
 remove complete amarok-konqsidebar package
diff --git a/debian/lenny/applications/amarok.cmake/debian/README.Debian b/debian/lenny/applications/amarok.cmake/debian/README.Debian
index d696b9696..185627147 100644
--- a/debian/lenny/applications/amarok.cmake/debian/README.Debian
+++ b/debian/lenny/applications/amarok.cmake/debian/README.Debian
@@ -10,7 +10,7 @@ Amarok packages for Debian
       script.
 
     - if you want amarok to be able to play CDs, you need to install the
-      tdemultimedia-kio-plugins package.
+      tdemultimedia-tdeio-plugins package.
 
     - the scripts available in the 'Scripts' menu need that you install
       some other packages for them to work. Those packages are listed in
diff --git a/debian/lenny/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/lenny/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
index db5399106..447fe40dc 100644
--- a/debian/lenny/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/lenny/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -10,5 +10,5 @@ make watch file actually work
 
 #### due to removal of KDE 3 packages ####
 remove tdemultimedia-dev, tdebase-dev from Build-Depends
-remove amarok-konqsidebar, tdemultimedia-kio-plugins from Recommends
+remove amarok-konqsidebar, tdemultimedia-tdeio-plugins from Recommends
 remove complete amarok-konqsidebar package
diff --git a/debian/lenny/applications/amarok/debian/README.Debian b/debian/lenny/applications/amarok/debian/README.Debian
index d696b9696..185627147 100644
--- a/debian/lenny/applications/amarok/debian/README.Debian
+++ b/debian/lenny/applications/amarok/debian/README.Debian
@@ -10,7 +10,7 @@ Amarok packages for Debian
       script.
 
     - if you want amarok to be able to play CDs, you need to install the
-      tdemultimedia-kio-plugins package.
+      tdemultimedia-tdeio-plugins package.
 
     - the scripts available in the 'Scripts' menu need that you install
       some other packages for them to work. Those packages are listed in
diff --git a/debian/lenny/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/lenny/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 58d2a725a..7b99dabec 100644
--- a/debian/lenny/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/lenny/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -3,6 +3,6 @@ remove build-dep on libdvdread-dev
 libk3b3-extracodecs conflicts libk3b2-extracodecs
 transitional libk3b2-extracodecs package
 
-Do not recommend on tdebase-kio-plugins, kcontrol, 
+Do not recommend on tdebase-tdeio-plugins, kcontrol, 
 Change recommend to suggest for vcdimager
 
diff --git a/debian/lenny/applications/knights/debian/control b/debian/lenny/applications/knights/debian/control
index 8c281d27e..611c600ce 100644
--- a/debian/lenny/applications/knights/debian/control
+++ b/debian/lenny/applications/knights/debian/control
@@ -10,7 +10,7 @@ Homepage: http://knights.sourceforge.net/
 
 Package: knights-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, tdebase-kio-plugins-trinity
+Depends: ${shlibs:Depends}, tdebase-tdeio-plugins-trinity
 Replaces: knights-trinity (<< 4:14.0.0)
 Breaks: knights-trinity (<< 4:14.0.0)
 Suggests: gnuchess | crafty | sjeng, knights-themepack-trinity
diff --git a/debian/lenny/applications/krusader/debian/control b/debian/lenny/applications/krusader/debian/control
index 25beb8352..cf06f9ab8 100644
--- a/debian/lenny/applications/krusader/debian/control
+++ b/debian/lenny/applications/krusader/debian/control
@@ -15,7 +15,7 @@ Breaks: krusader-trinity (<< 4:14.0.0)
 Suggests: md5deep | cfv, kedit-trinity, khexedit-trinity, konsole-trinity, kmail-trinity,
  krename-trinity, kdiff3-trinity | kompare-trinity | xxdiff, ark-trinity, arj, bzip2, cpio, lha,
  unrar | unrar-free | rar, rpm, unace, unzip, zip, p7zip, tdebase-trinity-bin,
- tdebase-kio-plugins-trinity
+ tdebase-tdeio-plugins-trinity
 Description: twin-panel (commander-style) file manager for KDE (and other desktops)
  Krusader is a simple, easy, powerful, twin-panel (commander-style) file
  manager for KDE and other desktops, similar to Midnight Commander (C) or Total
diff --git a/debian/lenny/applications/ktorrent/debian/control b/debian/lenny/applications/ktorrent/debian/control
index 3918b6093..cd9220c47 100644
--- a/debian/lenny/applications/ktorrent/debian/control
+++ b/debian/lenny/applications/ktorrent/debian/control
@@ -11,7 +11,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: ktorrent-trinity (<< 4:14.0.0)
 Breaks: ktorrent-trinity (<< 4:14.0.0)
 Suggests: php5-cli
-Recommends: tdebase-kio-plugins-trinity
+Recommends: tdebase-tdeio-plugins-trinity
 Description: BitTorrent client for Trinity
  KTorrent is a BitTorrent program for Trinity. Its features include speed capping
  (both down and up), integrated searching, UDP tracker support, preview of
diff --git a/debian/lenny/applications/ktorrent/debian/control.in b/debian/lenny/applications/ktorrent/debian/control.in
index 0c48fcdd7..4529848dd 100644
--- a/debian/lenny/applications/ktorrent/debian/control.in
+++ b/debian/lenny/applications/ktorrent/debian/control.in
@@ -11,7 +11,7 @@ Package: ktorrent-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: php5-cli
-Recommends: tdebase-kio-plugins-trinity
+Recommends: tdebase-tdeio-plugins-trinity
 Description: BitTorrent client for Trinity
  KTorrent is a BitTorrent program for Trinity. Its features include speed capping
  (both down and up), integrated searching, UDP tracker support, preview of
diff --git a/debian/lenny/applications/soundkonverter/debian/control b/debian/lenny/applications/soundkonverter/debian/control
index e836533e0..7d72a263c 100644
--- a/debian/lenny/applications/soundkonverter/debian/control
+++ b/debian/lenny/applications/soundkonverter/debian/control
@@ -12,7 +12,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: soundkonverter-trinity (<< 4:14.0.0)
 Breaks: soundkonverter-trinity (<< 4:14.0.0)
-Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac, tdemultimedia-kio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack
+Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac, tdemultimedia-tdeio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack
 Suggests: soundkonverter-amarok-trinity
 Description: audio converter frontend for Trinity
  soundKonverter is a frontend to various audio converters.
diff --git a/debian/lenny/applications/tdesvn/debian/control b/debian/lenny/applications/tdesvn/debian/control
index 0c1f99451..faaeb13f8 100644
--- a/debian/lenny/applications/tdesvn/debian/control
+++ b/debian/lenny/applications/tdesvn/debian/control
@@ -34,7 +34,7 @@ Section: devel
 Architecture: any
 Replaces: kdesvn-trinity (<< 4:14.0.0)
 Breaks: kdesvn-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-kio-plugins-trinity (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})
 Recommends: kompare-trinity, graphviz
 Suggests: khelpcenter-trinity, kdiff3-trinity
 Description: subversion client with tight KDE integration [Trinity]
@@ -45,13 +45,13 @@ Description: subversion client with tight KDE integration [Trinity]
  a tight integration into KDE and can be embedded into other KDE 
  applications like konqueror via the KDE component technology KParts.
 
-Package: tdesvn-kio-plugins-trinity
+Package: tdesvn-tdeio-plugins-trinity
 Section: devel
 Architecture: any
 Replaces: kdesvn-kio-plugins-trinity (<< 4:14.0.0)
 Breaks: kdesvn-kio-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: tdesdk-kio-plugins-trinity
+Conflicts: tdesdk-tdeio-plugins-trinity
 Description: subversion I/O slaves for Trinity
  This packages includes KIO slaves for svn, svn+file, svn+http, 
  svn+https, svn+ssh. This allows you to access subversion repositories 
diff --git a/debian/lenny/applications/tdesvn/debian/control.in b/debian/lenny/applications/tdesvn/debian/control.in
index dc185ccef..c0d254fad 100644
--- a/debian/lenny/applications/tdesvn/debian/control.in
+++ b/debian/lenny/applications/tdesvn/debian/control.in
@@ -35,7 +35,7 @@ Section: devel
 Architecture: any
 Replaces: tdesvn-kde3 (<< 4:3.5.13)
 Breaks: tdesvn-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-kio-plugins-trinity (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})
 Recommends: kompare-trinity, graphviz
 Suggests: khelpcenter-trinity, kdiff3-trinity
 Description: subversion client with tight KDE integration [Trinity]
@@ -46,13 +46,13 @@ Description: subversion client with tight KDE integration [Trinity]
  a tight integration into KDE and can be embedded into other KDE 
  applications like konqueror via the KDE component technology KParts.
 
-Package: tdesvn-kio-plugins-trinity
+Package: tdesvn-tdeio-plugins-trinity
 Section: devel
 Architecture: any
 Replaces: tdesvn-kio-plugins-kde3 (<< 4:3.5.13)
 Breaks: tdesvn-kio-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: tdesdk-kio-plugins-trinity
+Conflicts: tdesdk-tdeio-plugins-trinity
 Description: subversion I/O slaves for Trinity
  This packages includes KIO slaves for svn, svn+file, svn+http, 
  svn+https, svn+ssh. This allows you to access subversion repositories 
diff --git a/debian/lenny/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install b/debian/lenny/applications/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install
index 79f9eff3d..79f9eff3d 100644
--- a/debian/lenny/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
+++ b/debian/lenny/applications/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install
diff --git a/debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
index 042ffdb21..f5a54d259 100644
--- a/debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
@@ -36,7 +36,7 @@ in konsole.README.Debian s/fontconfig/fontconfig-config
 
 in tdm.postinst install at s/99/13/
 
-from tdebase-kio-plugins.install remove debian/tmp/usr/share/services/tdefile_trash.desktop (that's to remove the trash from the "system applet")
+from tdebase-tdeio-plugins.install remove debian/tmp/usr/share/services/tdefile_trash.desktop (that's to remove the trash from the "system applet")
 
 add debian/ubuntu.xmodmap  debian/80ubuntu-xmodmap and add install rules to binary-install/tdebase-bin::
 
diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control
index 43ce86fa0..acdd12499 100644
--- a/debian/lenny/tdebase/debian/control
+++ b/debian/lenny/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-trinity (<< 4:14.0.0)
 Breaks: kdebase-trinity (<< 4:14.0.0)
-Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
+Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
 Recommends: tdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -180,13 +180,13 @@ Description: KDE base documentation in HTML format
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: tdebase-kio-plugins-trinity
+Package: tdebase-tdeio-plugins-trinity
 Section: tde
 Architecture: any
 Replaces: kdebase-kio-plugins-trinity (<< 4:14.0.0)
 Breaks: kdebase-kio-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, cryptsetup, man-db (>= 2.5.1-1)
-Recommends: hal-trinity, pmount, kamera-trinity, tdemultimedia-kio-plugins-trinity
+Recommends: hal-trinity, pmount, kamera-trinity, tdemultimedia-tdeio-plugins-trinity
 Suggests: khelpcenter-trinity, mtools
 Conflicts: tdebase-libs-trinity (<< 4:3.0.0), mediamanager
 Description: core I/O slaves for KDE
@@ -360,7 +360,7 @@ Architecture: any
 Replaces: konqueror-trinity (<< 4:14.0.0)
 Breaks: konqueror-trinity (<< 4:14.0.0)
 Provides: info-browser, man-browser, www-browser, konqueror
-Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-kio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity
+Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-tdeio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity
 Suggests: khelpcenter-trinity, konq-plugins-trinity, ksvg-trinity, gij-4.1, libgcj7-awt, libjessie-java
 Conflicts: tdebase-audiolibs-trinity (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0)
 Description: KDE's advanced file manager, web browser and document viewer
diff --git a/debian/lenny/tdebase/debian/control.in b/debian/lenny/tdebase/debian/control.in
index 387728c4e..c20726136 100644
--- a/debian/lenny/tdebase/debian/control.in
+++ b/debian/lenny/tdebase/debian/control.in
@@ -12,7 +12,7 @@ Standards-Version: 3.8.4
 Package: tdebase
 Section: tde
 Architecture: all
-Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), twin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
+Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-tdeio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), twin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
 Recommends: tdm (>= ${Source-Version})
 Suggests: tdebase-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -158,11 +158,11 @@ Description: KDE base documentation in HTML format
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde' and 'tdebase' packages for more information.
 
-Package: tdebase-kio-plugins
+Package: tdebase-tdeio-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}, kdesktop, libsasl2-modules, psmisc, cryptsetup, man-db (>= 2.5.1-1)
-Recommends: hal, pmount, kamera, tdemultimedia-kio-plugins
+Recommends: hal, pmount, kamera, tdemultimedia-tdeio-plugins
 Suggests: khelpcenter, mtools
 Conflicts: tdebase-libs (<< 4:3.0.0)
 Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0), tdebase-bin (<< 4:3.5.5a.dfsg.1-1ubuntu18)
@@ -323,7 +323,7 @@ Package: konqueror
 Section: web
 Architecture: any
 Provides: info-browser, man-browser, www-browser
-Depends: ${shlibs:Depends}, kcontrol (= ${Source-Version}), tdebase-kio-plugins (= ${Source-Version}), kdesktop (= ${Source-Version}), kfind (= ${Source-Version})
+Depends: ${shlibs:Depends}, kcontrol (= ${Source-Version}), tdebase-tdeio-plugins (= ${Source-Version}), kdesktop (= ${Source-Version}), kfind (= ${Source-Version})
 Suggests: khelpcenter, konq-plugins, ksvg, gij-4.1, libgcj7-awt, libjessie-java
 Conflicts: tdebase-audiolibs (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0)
 Replaces: tdebase (<< 4:3.0.0), tdebase-audiolibs (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0)
diff --git a/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules
index 2e12a8d03..e7256ba3a 100755
--- a/debian/lenny/tdebase/debian/rules
+++ b/debian/lenny/tdebase/debian/rules
@@ -203,11 +203,11 @@ makebuilddir::
 common-install-prehook-arch::
 	grep -v -e joystick -e view1394  debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-i386
 	grep -v -e joystick -e view1394  debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-amd64
-	grep -v -e media_propsdlgplugin  debian/tdebase-kio-plugins-trinity.install > debian/tdebase-kio-plugins-trinity.install.kfreebsd-i386
-	grep -v -e media_propsdlgplugin  debian/tdebase-kio-plugins-trinity.install > debian/tdebase-kio-plugins-trinity.install.kfreebsd-amd64
+	grep -v -e media_propsdlgplugin  debian/tdebase-tdeio-plugins-trinity.install > debian/tdebase-tdeio-plugins-trinity.install.kfreebsd-i386
+	grep -v -e media_propsdlgplugin  debian/tdebase-tdeio-plugins-trinity.install > debian/tdebase-tdeio-plugins-trinity.install.kfreebsd-amd64
 
 clean::
-	rm -f debian/kcontrol-trinity.install.kfreebsd* debian/tdebase-kio-plugins-trinity.install.kfreebs*
+	rm -f debian/kcontrol-trinity.install.kfreebsd* debian/tdebase-tdeio-plugins-trinity.install.kfreebs*
 	rm -f kcontrol/pics/cr*-app-energy_star.png kcontrol/energy/pics/energybig.png kcontrol/energy/pics/lo-energy.png
 	# KIO Media LUKS Icons
 	rm -f pics/crystalsvg/cr*decrypt.png pics/crystalsvg/cr*encrypt.png
diff --git a/debian/squeeze/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian b/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.README.Debian
index 404b60f67..37f0e0986 100644
--- a/debian/squeeze/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian
+++ b/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.README.Debian
@@ -8,7 +8,7 @@ cameras, and many other types of equipment.
 While some functionality is available without the use of HAL, media works
 best with HAL (and therefore udev), in combination with pmount. Media
 also extends the functionality of many other tdeioslaves. Check which
-packages are recommended by the tdebase-kio-plugins package, and install
+packages are recommended by the tdebase-tdeio-plugins package, and install
 accordingly.
 
 Note that for regular users to use media in conjunction with HAL, they must
diff --git a/debian/lenny/tdebase/debian/tdebase-kio-plugins-trinity.install b/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index 47f0abc0c..47f0abc0c 100644
--- a/debian/lenny/tdebase/debian/tdebase-kio-plugins-trinity.install
+++ b/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.install
diff --git a/debian/lenny/tdebase/debian/tdebase-kio-plugins-trinity.manpages b/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
index 249292ad7..249292ad7 100644
--- a/debian/lenny/tdebase/debian/tdebase-kio-plugins-trinity.manpages
+++ b/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity.README.Debian b/debian/lenny/tdebase/debian/tdebase-trinity.README.Debian
index e7a871ce9..9944d8af8 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity.README.Debian
+++ b/debian/lenny/tdebase/debian/tdebase-trinity.README.Debian
@@ -14,7 +14,7 @@ cameras, and many other types of equipment.
 While some functionality is available without the use of HAL, media works
 best with HAL (and therefore udev), in combination with pmount. Media
 also extends the functionality of many other tdeioslaves. Check which
-packages are recommended by the tdebase-kio-plugins package, and install
+packages are recommended by the tdebase-tdeio-plugins package, and install
 accordingly.
 
 Note that for regular users to use media in conjunction with HAL, they must
diff --git a/debian/lenny/tdemultimedia/debian/control b/debian/lenny/tdemultimedia/debian/control
index 866ee43eb..7fb812019 100644
--- a/debian/lenny/tdemultimedia/debian/control
+++ b/debian/lenny/tdemultimedia/debian/control
@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdemultimedia-trinity (<< 4:14.0.0)
 Breaks: kdemultimedia-trinity (<< 4:14.0.0)
-Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-tdefile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), tdemid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version})
+Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-tdefile-plugins-trinity (>= ${Source-Version}), tdemultimedia-tdeio-plugins-trinity (>= ${Source-Version}), tdemid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version})
 Suggests: tdemultimedia-trinity-doc-html (>= ${Source-Version})
 Description: multimedia apps from the official Trinity release 
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -31,7 +31,7 @@ Section: devel
 Architecture: any
 Replaces: kdemultimedia-trinity-dev (<< 4:14.0.0)
 Breaks: kdemultimedia-trinity-dev (<< 4:14.0.0)
-Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), tdemid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
+Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-tdeio-plugins-trinity (= ${Source-Version}), tdemid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
 Conflicts: libmpeg-trinity-dev
 Description: development files for the Trinity multimedia module
  Development files and headers for the Trinity multimedia module.
@@ -120,7 +120,7 @@ Section: sound
 Architecture: any
 Replaces: kaudiocreator-trinity (<< 4:14.0.0)
 Breaks: kaudiocreator-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, tdemultimedia-kio-plugins-trinity (= ${Source-Version})
+Depends: ${shlibs:Depends}, tdemultimedia-tdeio-plugins-trinity (= ${Source-Version})
 Recommends: vorbis-tools, flac
 Suggests: lame
 Description: CD ripper and audio encoder frontend for Trinity
@@ -155,7 +155,7 @@ Description: multimedia data for kappfinder-trinity
  This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
-Package: tdemultimedia-kio-plugins-trinity
+Package: tdemultimedia-tdeio-plugins-trinity
 Section: tde
 Architecture: any
 Replaces: kdemultimedia-kio-plugins-trinity (<< 4:14.0.0)
diff --git a/debian/lenny/tdemultimedia/debian/rules b/debian/lenny/tdemultimedia/debian/rules
index 58e944e5d..4dcb0d43d 100755
--- a/debian/lenny/tdemultimedia/debian/rules
+++ b/debian/lenny/tdemultimedia/debian/rules
@@ -26,7 +26,7 @@ DEB_DH_STRIP_ARGS  := --dbg-package=tdemultimedia-trinity-dbg
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity tdemid-trinity kmix-trinity krec-trinity \
+PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-tdeio-plugins-trinity tdemid-trinity kmix-trinity krec-trinity \
 	libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \
 	libkcddb1-trinity mpeglib-trinity noatun-trinity
 
diff --git a/debian/lenny/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install b/debian/lenny/tdemultimedia/debian/tdemultimedia-tdeio-plugins-trinity.install
index b45ea389e..b45ea389e 100644
--- a/debian/lenny/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
+++ b/debian/lenny/tdemultimedia/debian/tdemultimedia-tdeio-plugins-trinity.install
diff --git a/debian/lenny/tdepim/debian/control b/debian/lenny/tdepim/debian/control
index c17259d5e..448a82a08 100644
--- a/debian/lenny/tdepim/debian/control
+++ b/debian/lenny/tdepim/debian/control
@@ -22,7 +22,7 @@ Section: tde
 Architecture: all
 Replaces: kdepim-trinity (<< 4:14.0.0)
 Breaks: kdepim-trinity (<< 4:14.0.0)
-Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-tdefile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-tderesources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version})
+Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-tdefile-plugins-trinity (>= ${Source-Version}), tdepim-tdeio-plugins-trinity (>= ${Source-Version}), tdepim-tderesources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version})
 Suggests: tdepim-trinity-doc-html
 Description: Personal Information Management apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -116,7 +116,7 @@ Architecture: any
 Replaces: kaddressbook-trinity (<< 4:14.0.0)
 Breaks: kaddressbook-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Suggests: tdepim-tderesources-trinity, tdebase-kio-plugins-trinity
+Suggests: tdepim-tderesources-trinity, tdebase-tdeio-plugins-trinity
 Description: KDE NG addressbook application
  KAddressBook is the main address book application for KDE; it enables you
  to manage your contacts efficiently and comfortably. It can load and save
@@ -193,7 +193,7 @@ Description: KDE File dialog plugins for palm and vcf files
  This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
-Package: tdepim-kio-plugins-trinity
+Package: tdepim-tdeio-plugins-trinity
 Section: tde
 Architecture: any
 Replaces: kdepim-kio-plugins-trinity (<< 4:14.0.0)
@@ -269,7 +269,7 @@ Section: mail
 Architecture: any
 Replaces: kmail-trinity (<< 4:14.0.0)
 Breaks: kmail-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11
+Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-tdeio-plugins-trinity, tdebase-tdeio-plugins-trinity, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11
 Recommends: procmail
 Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer
 Provides: imap-client, mail-reader
@@ -278,8 +278,8 @@ Description: Trinity Email client
  desktop. It has features such as support for IMAP, POP3, multiple accounts,
  mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
  .
- You need to install tdepim-kio-plugins if you want to use IMAP or
- mbox files, and/or tdebase-kio-plugins if you want to use POP3.
+ You need to install tdepim-tdeio-plugins if you want to use IMAP or
+ mbox files, and/or tdebase-tdeio-plugins if you want to use POP3.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
@@ -405,7 +405,7 @@ Section: tde
 Architecture: any
 Replaces: korn-trinity (<< 4:14.0.0)
 Breaks: korn-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity
+Depends: ${shlibs:Depends}, tdepim-tdeio-plugins-trinity, tdebase-tdeio-plugins-trinity
 Description: Trinity mail checker
  Korn is a KDE mail checker that can display a small summary in the Kicker
  tray.  It supports checking mbox, pop3, imap4, and nntp sources.
diff --git a/debian/lenny/tdepim/debian/tdepim-kio-plugins-trinity.install b/debian/lenny/tdepim/debian/tdepim-tdeio-plugins-trinity.install
index b04ea7b6d..b04ea7b6d 100644
--- a/debian/lenny/tdepim/debian/tdepim-kio-plugins-trinity.install
+++ b/debian/lenny/tdepim/debian/tdepim-tdeio-plugins-trinity.install
diff --git a/debian/lenny/tdesdk/debian/control b/debian/lenny/tdesdk/debian/control
index 57976b778..bfe83fa61 100644
--- a/debian/lenny/tdesdk/debian/control
+++ b/debian/lenny/tdesdk/debian/control
@@ -16,7 +16,7 @@ Architecture: all
 Section: tde
 Replaces: kdesdk-trinity (<< 4:14.0.0)
 Breaks: kdesdk-trinity (<< 4:14.0.0)
-Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-tdefile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), tdeunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
+Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-tdefile-plugins-trinity (>= ${Source-Version}), tdesdk-tdeio-plugins-trinity (>= ${Source-Version}) | tdesvn-tdeio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), tdeunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
 Suggests: tdecachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html
 Description: software development kit from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -392,7 +392,7 @@ Description: UML modelling tool and code generator
  This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: tdesdk-kio-plugins-trinity
+Package: tdesdk-tdeio-plugins-trinity
 Architecture: any
 Section: devel
 Replaces: kdesdk-kio-plugins-trinity (<< 4:14.0.0)
diff --git a/debian/lenny/tdesdk/debian/tdesdk-kio-plugins-trinity.docs b/debian/lenny/tdesdk/debian/tdesdk-tdeio-plugins-trinity.docs
index ce721bb5e..ce721bb5e 100644
--- a/debian/lenny/tdesdk/debian/tdesdk-kio-plugins-trinity.docs
+++ b/debian/lenny/tdesdk/debian/tdesdk-tdeio-plugins-trinity.docs
diff --git a/debian/lenny/tdesdk/debian/tdesdk-kio-plugins-trinity.install b/debian/lenny/tdesdk/debian/tdesdk-tdeio-plugins-trinity.install
index ef4f3a473..ef4f3a473 100644
--- a/debian/lenny/tdesdk/debian/tdesdk-kio-plugins-trinity.install
+++ b/debian/lenny/tdesdk/debian/tdesdk-tdeio-plugins-trinity.install
diff --git a/debian/lenny/tdevelop/debian/control b/debian/lenny/tdevelop/debian/control
index ba0e5814b..e3baf874d 100644
--- a/debian/lenny/tdevelop/debian/control
+++ b/debian/lenny/tdevelop/debian/control
@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas
 Replaces: kdevelop-trinity (<< 4:14.0.0)
 Breaks: kdevelop-trinity (<< 4:14.0.0)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs4-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-kio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs4-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
+Suggests: libtqtinterface-dev, tdelibs4-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs4-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
 Description: An IDE for Unix/X11
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
diff --git a/debian/squeeze/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/squeeze/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
index db5399106..447fe40dc 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/squeeze/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -10,5 +10,5 @@ make watch file actually work
 
 #### due to removal of KDE 3 packages ####
 remove tdemultimedia-dev, tdebase-dev from Build-Depends
-remove amarok-konqsidebar, tdemultimedia-kio-plugins from Recommends
+remove amarok-konqsidebar, tdemultimedia-tdeio-plugins from Recommends
 remove complete amarok-konqsidebar package
diff --git a/debian/squeeze/applications/amarok.cmake/debian/README.Debian b/debian/squeeze/applications/amarok.cmake/debian/README.Debian
index d696b9696..185627147 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/README.Debian
+++ b/debian/squeeze/applications/amarok.cmake/debian/README.Debian
@@ -10,7 +10,7 @@ Amarok packages for Debian
       script.
 
     - if you want amarok to be able to play CDs, you need to install the
-      tdemultimedia-kio-plugins package.
+      tdemultimedia-tdeio-plugins package.
 
     - the scripts available in the 'Scripts' menu need that you install
       some other packages for them to work. Those packages are listed in
diff --git a/debian/squeeze/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/squeeze/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
index db5399106..447fe40dc 100644
--- a/debian/squeeze/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/squeeze/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -10,5 +10,5 @@ make watch file actually work
 
 #### due to removal of KDE 3 packages ####
 remove tdemultimedia-dev, tdebase-dev from Build-Depends
-remove amarok-konqsidebar, tdemultimedia-kio-plugins from Recommends
+remove amarok-konqsidebar, tdemultimedia-tdeio-plugins from Recommends
 remove complete amarok-konqsidebar package
diff --git a/debian/squeeze/applications/amarok/debian/README.Debian b/debian/squeeze/applications/amarok/debian/README.Debian
index d696b9696..185627147 100644
--- a/debian/squeeze/applications/amarok/debian/README.Debian
+++ b/debian/squeeze/applications/amarok/debian/README.Debian
@@ -10,7 +10,7 @@ Amarok packages for Debian
       script.
 
     - if you want amarok to be able to play CDs, you need to install the
-      tdemultimedia-kio-plugins package.
+      tdemultimedia-tdeio-plugins package.
 
     - the scripts available in the 'Scripts' menu need that you install
       some other packages for them to work. Those packages are listed in
diff --git a/debian/squeeze/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/squeeze/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 58d2a725a..7b99dabec 100644
--- a/debian/squeeze/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/squeeze/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -3,6 +3,6 @@ remove build-dep on libdvdread-dev
 libk3b3-extracodecs conflicts libk3b2-extracodecs
 transitional libk3b2-extracodecs package
 
-Do not recommend on tdebase-kio-plugins, kcontrol, 
+Do not recommend on tdebase-tdeio-plugins, kcontrol, 
 Change recommend to suggest for vcdimager
 
diff --git a/debian/squeeze/applications/knights/debian/control b/debian/squeeze/applications/knights/debian/control
index 8c281d27e..611c600ce 100644
--- a/debian/squeeze/applications/knights/debian/control
+++ b/debian/squeeze/applications/knights/debian/control
@@ -10,7 +10,7 @@ Homepage: http://knights.sourceforge.net/
 
 Package: knights-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, tdebase-kio-plugins-trinity
+Depends: ${shlibs:Depends}, tdebase-tdeio-plugins-trinity
 Replaces: knights-trinity (<< 4:14.0.0)
 Breaks: knights-trinity (<< 4:14.0.0)
 Suggests: gnuchess | crafty | sjeng, knights-themepack-trinity
diff --git a/debian/squeeze/applications/krusader/debian/control b/debian/squeeze/applications/krusader/debian/control
index 25beb8352..cf06f9ab8 100644
--- a/debian/squeeze/applications/krusader/debian/control
+++ b/debian/squeeze/applications/krusader/debian/control
@@ -15,7 +15,7 @@ Breaks: krusader-trinity (<< 4:14.0.0)
 Suggests: md5deep | cfv, kedit-trinity, khexedit-trinity, konsole-trinity, kmail-trinity,
  krename-trinity, kdiff3-trinity | kompare-trinity | xxdiff, ark-trinity, arj, bzip2, cpio, lha,
  unrar | unrar-free | rar, rpm, unace, unzip, zip, p7zip, tdebase-trinity-bin,
- tdebase-kio-plugins-trinity
+ tdebase-tdeio-plugins-trinity
 Description: twin-panel (commander-style) file manager for KDE (and other desktops)
  Krusader is a simple, easy, powerful, twin-panel (commander-style) file
  manager for KDE and other desktops, similar to Midnight Commander (C) or Total
diff --git a/debian/squeeze/applications/ktorrent/debian/control b/debian/squeeze/applications/ktorrent/debian/control
index 3918b6093..cd9220c47 100644
--- a/debian/squeeze/applications/ktorrent/debian/control
+++ b/debian/squeeze/applications/ktorrent/debian/control
@@ -11,7 +11,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: ktorrent-trinity (<< 4:14.0.0)
 Breaks: ktorrent-trinity (<< 4:14.0.0)
 Suggests: php5-cli
-Recommends: tdebase-kio-plugins-trinity
+Recommends: tdebase-tdeio-plugins-trinity
 Description: BitTorrent client for Trinity
  KTorrent is a BitTorrent program for Trinity. Its features include speed capping
  (both down and up), integrated searching, UDP tracker support, preview of
diff --git a/debian/squeeze/applications/ktorrent/debian/control.in b/debian/squeeze/applications/ktorrent/debian/control.in
index 0c48fcdd7..4529848dd 100644
--- a/debian/squeeze/applications/ktorrent/debian/control.in
+++ b/debian/squeeze/applications/ktorrent/debian/control.in
@@ -11,7 +11,7 @@ Package: ktorrent-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: php5-cli
-Recommends: tdebase-kio-plugins-trinity
+Recommends: tdebase-tdeio-plugins-trinity
 Description: BitTorrent client for Trinity
  KTorrent is a BitTorrent program for Trinity. Its features include speed capping
  (both down and up), integrated searching, UDP tracker support, preview of
diff --git a/debian/squeeze/applications/soundkonverter/debian/control b/debian/squeeze/applications/soundkonverter/debian/control
index e836533e0..7d72a263c 100644
--- a/debian/squeeze/applications/soundkonverter/debian/control
+++ b/debian/squeeze/applications/soundkonverter/debian/control
@@ -12,7 +12,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: soundkonverter-trinity (<< 4:14.0.0)
 Breaks: soundkonverter-trinity (<< 4:14.0.0)
-Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac, tdemultimedia-kio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack
+Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac, tdemultimedia-tdeio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack
 Suggests: soundkonverter-amarok-trinity
 Description: audio converter frontend for Trinity
  soundKonverter is a frontend to various audio converters.
diff --git a/debian/squeeze/applications/tdesvn/debian/control b/debian/squeeze/applications/tdesvn/debian/control
index 0c1f99451..faaeb13f8 100644
--- a/debian/squeeze/applications/tdesvn/debian/control
+++ b/debian/squeeze/applications/tdesvn/debian/control
@@ -34,7 +34,7 @@ Section: devel
 Architecture: any
 Replaces: kdesvn-trinity (<< 4:14.0.0)
 Breaks: kdesvn-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-kio-plugins-trinity (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})
 Recommends: kompare-trinity, graphviz
 Suggests: khelpcenter-trinity, kdiff3-trinity
 Description: subversion client with tight KDE integration [Trinity]
@@ -45,13 +45,13 @@ Description: subversion client with tight KDE integration [Trinity]
  a tight integration into KDE and can be embedded into other KDE 
  applications like konqueror via the KDE component technology KParts.
 
-Package: tdesvn-kio-plugins-trinity
+Package: tdesvn-tdeio-plugins-trinity
 Section: devel
 Architecture: any
 Replaces: kdesvn-kio-plugins-trinity (<< 4:14.0.0)
 Breaks: kdesvn-kio-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: tdesdk-kio-plugins-trinity
+Conflicts: tdesdk-tdeio-plugins-trinity
 Description: subversion I/O slaves for Trinity
  This packages includes KIO slaves for svn, svn+file, svn+http, 
  svn+https, svn+ssh. This allows you to access subversion repositories 
diff --git a/debian/squeeze/applications/tdesvn/debian/control.in b/debian/squeeze/applications/tdesvn/debian/control.in
index dc185ccef..c0d254fad 100644
--- a/debian/squeeze/applications/tdesvn/debian/control.in
+++ b/debian/squeeze/applications/tdesvn/debian/control.in
@@ -35,7 +35,7 @@ Section: devel
 Architecture: any
 Replaces: tdesvn-kde3 (<< 4:3.5.13)
 Breaks: tdesvn-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-kio-plugins-trinity (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})
 Recommends: kompare-trinity, graphviz
 Suggests: khelpcenter-trinity, kdiff3-trinity
 Description: subversion client with tight KDE integration [Trinity]
@@ -46,13 +46,13 @@ Description: subversion client with tight KDE integration [Trinity]
  a tight integration into KDE and can be embedded into other KDE 
  applications like konqueror via the KDE component technology KParts.
 
-Package: tdesvn-kio-plugins-trinity
+Package: tdesvn-tdeio-plugins-trinity
 Section: devel
 Architecture: any
 Replaces: tdesvn-kio-plugins-kde3 (<< 4:3.5.13)
 Breaks: tdesvn-kio-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: tdesdk-kio-plugins-trinity
+Conflicts: tdesdk-tdeio-plugins-trinity
 Description: subversion I/O slaves for Trinity
  This packages includes KIO slaves for svn, svn+file, svn+http, 
  svn+https, svn+ssh. This allows you to access subversion repositories 
diff --git a/debian/squeeze/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install b/debian/squeeze/applications/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install
index 79f9eff3d..79f9eff3d 100644
--- a/debian/squeeze/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
+++ b/debian/squeeze/applications/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install
diff --git a/debian/squeeze/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/debian/squeeze/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
index 042ffdb21..f5a54d259 100644
--- a/debian/squeeze/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/debian/squeeze/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
@@ -36,7 +36,7 @@ in konsole.README.Debian s/fontconfig/fontconfig-config
 
 in tdm.postinst install at s/99/13/
 
-from tdebase-kio-plugins.install remove debian/tmp/usr/share/services/tdefile_trash.desktop (that's to remove the trash from the "system applet")
+from tdebase-tdeio-plugins.install remove debian/tmp/usr/share/services/tdefile_trash.desktop (that's to remove the trash from the "system applet")
 
 add debian/ubuntu.xmodmap  debian/80ubuntu-xmodmap and add install rules to binary-install/tdebase-bin::
 
diff --git a/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control
index 8bcd4d05e..5f88a23c4 100644
--- a/debian/squeeze/tdebase/debian/control
+++ b/debian/squeeze/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-trinity (<< 4:14.0.0)
 Breaks: kdebase-trinity (<< 4:14.0.0)
-Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
+Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
 Recommends: tdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -180,13 +180,13 @@ Description: KDE base documentation in HTML format
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: tdebase-kio-plugins-trinity
+Package: tdebase-tdeio-plugins-trinity
 Section: tde
 Architecture: any
 Replaces: kdebase-kio-plugins-trinity (<< 4:14.0.0)
 Breaks: kdebase-kio-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, cryptsetup, man-db (>= 2.5.1-1)
-Recommends: hal-trinity, pmount, kamera-trinity, tdemultimedia-kio-plugins-trinity
+Recommends: hal-trinity, pmount, kamera-trinity, tdemultimedia-tdeio-plugins-trinity
 Suggests: khelpcenter-trinity, mtools
 Conflicts: tdebase-libs-trinity (<< 4:3.0.0), mediamanager
 Description: core I/O slaves for KDE
@@ -360,7 +360,7 @@ Architecture: any
 Replaces: konqueror-trinity (<< 4:14.0.0)
 Breaks: konqueror-trinity (<< 4:14.0.0)
 Provides: info-browser, man-browser, www-browser, konqueror
-Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-kio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity
+Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-tdeio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity
 Suggests: khelpcenter-trinity, konq-plugins-trinity, ksvg-trinity, gij-4.1, libgcj7-awt, libjessie-java
 Conflicts: tdebase-audiolibs-trinity (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0)
 Description: KDE's advanced file manager, web browser and document viewer
diff --git a/debian/squeeze/tdebase/debian/control.in b/debian/squeeze/tdebase/debian/control.in
index 387728c4e..c20726136 100644
--- a/debian/squeeze/tdebase/debian/control.in
+++ b/debian/squeeze/tdebase/debian/control.in
@@ -12,7 +12,7 @@ Standards-Version: 3.8.4
 Package: tdebase
 Section: tde
 Architecture: all
-Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), twin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
+Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-tdeio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), twin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
 Recommends: tdm (>= ${Source-Version})
 Suggests: tdebase-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -158,11 +158,11 @@ Description: KDE base documentation in HTML format
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde' and 'tdebase' packages for more information.
 
-Package: tdebase-kio-plugins
+Package: tdebase-tdeio-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}, kdesktop, libsasl2-modules, psmisc, cryptsetup, man-db (>= 2.5.1-1)
-Recommends: hal, pmount, kamera, tdemultimedia-kio-plugins
+Recommends: hal, pmount, kamera, tdemultimedia-tdeio-plugins
 Suggests: khelpcenter, mtools
 Conflicts: tdebase-libs (<< 4:3.0.0)
 Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0), tdebase-bin (<< 4:3.5.5a.dfsg.1-1ubuntu18)
@@ -323,7 +323,7 @@ Package: konqueror
 Section: web
 Architecture: any
 Provides: info-browser, man-browser, www-browser
-Depends: ${shlibs:Depends}, kcontrol (= ${Source-Version}), tdebase-kio-plugins (= ${Source-Version}), kdesktop (= ${Source-Version}), kfind (= ${Source-Version})
+Depends: ${shlibs:Depends}, kcontrol (= ${Source-Version}), tdebase-tdeio-plugins (= ${Source-Version}), kdesktop (= ${Source-Version}), kfind (= ${Source-Version})
 Suggests: khelpcenter, konq-plugins, ksvg, gij-4.1, libgcj7-awt, libjessie-java
 Conflicts: tdebase-audiolibs (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0)
 Replaces: tdebase (<< 4:3.0.0), tdebase-audiolibs (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0)
diff --git a/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules
index 2e12a8d03..e7256ba3a 100755
--- a/debian/squeeze/tdebase/debian/rules
+++ b/debian/squeeze/tdebase/debian/rules
@@ -203,11 +203,11 @@ makebuilddir::
 common-install-prehook-arch::
 	grep -v -e joystick -e view1394  debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-i386
 	grep -v -e joystick -e view1394  debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-amd64
-	grep -v -e media_propsdlgplugin  debian/tdebase-kio-plugins-trinity.install > debian/tdebase-kio-plugins-trinity.install.kfreebsd-i386
-	grep -v -e media_propsdlgplugin  debian/tdebase-kio-plugins-trinity.install > debian/tdebase-kio-plugins-trinity.install.kfreebsd-amd64
+	grep -v -e media_propsdlgplugin  debian/tdebase-tdeio-plugins-trinity.install > debian/tdebase-tdeio-plugins-trinity.install.kfreebsd-i386
+	grep -v -e media_propsdlgplugin  debian/tdebase-tdeio-plugins-trinity.install > debian/tdebase-tdeio-plugins-trinity.install.kfreebsd-amd64
 
 clean::
-	rm -f debian/kcontrol-trinity.install.kfreebsd* debian/tdebase-kio-plugins-trinity.install.kfreebs*
+	rm -f debian/kcontrol-trinity.install.kfreebsd* debian/tdebase-tdeio-plugins-trinity.install.kfreebs*
 	rm -f kcontrol/pics/cr*-app-energy_star.png kcontrol/energy/pics/energybig.png kcontrol/energy/pics/lo-energy.png
 	# KIO Media LUKS Icons
 	rm -f pics/crystalsvg/cr*decrypt.png pics/crystalsvg/cr*encrypt.png
diff --git a/debian/lenny/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian b/debian/squeeze/tdebase/debian/tdebase-tdeio-plugins-trinity.README.Debian
index 404b60f67..37f0e0986 100644
--- a/debian/lenny/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian
+++ b/debian/squeeze/tdebase/debian/tdebase-tdeio-plugins-trinity.README.Debian
@@ -8,7 +8,7 @@ cameras, and many other types of equipment.
 While some functionality is available without the use of HAL, media works
 best with HAL (and therefore udev), in combination with pmount. Media
 also extends the functionality of many other tdeioslaves. Check which
-packages are recommended by the tdebase-kio-plugins package, and install
+packages are recommended by the tdebase-tdeio-plugins package, and install
 accordingly.
 
 Note that for regular users to use media in conjunction with HAL, they must
diff --git a/debian/squeeze/tdebase/debian/tdebase-kio-plugins-trinity.install b/debian/squeeze/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index 47f0abc0c..47f0abc0c 100644
--- a/debian/squeeze/tdebase/debian/tdebase-kio-plugins-trinity.install
+++ b/debian/squeeze/tdebase/debian/tdebase-tdeio-plugins-trinity.install
diff --git a/debian/squeeze/tdebase/debian/tdebase-kio-plugins-trinity.manpages b/debian/squeeze/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
index 249292ad7..249292ad7 100644
--- a/debian/squeeze/tdebase/debian/tdebase-kio-plugins-trinity.manpages
+++ b/debian/squeeze/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
diff --git a/debian/squeeze/tdebase/debian/tdebase-trinity.README.Debian b/debian/squeeze/tdebase/debian/tdebase-trinity.README.Debian
index e7a871ce9..9944d8af8 100644
--- a/debian/squeeze/tdebase/debian/tdebase-trinity.README.Debian
+++ b/debian/squeeze/tdebase/debian/tdebase-trinity.README.Debian
@@ -14,7 +14,7 @@ cameras, and many other types of equipment.
 While some functionality is available without the use of HAL, media works
 best with HAL (and therefore udev), in combination with pmount. Media
 also extends the functionality of many other tdeioslaves. Check which
-packages are recommended by the tdebase-kio-plugins package, and install
+packages are recommended by the tdebase-tdeio-plugins package, and install
 accordingly.
 
 Note that for regular users to use media in conjunction with HAL, they must
diff --git a/debian/squeeze/tdemultimedia/debian/control b/debian/squeeze/tdemultimedia/debian/control
index 866ee43eb..7fb812019 100644
--- a/debian/squeeze/tdemultimedia/debian/control
+++ b/debian/squeeze/tdemultimedia/debian/control
@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdemultimedia-trinity (<< 4:14.0.0)
 Breaks: kdemultimedia-trinity (<< 4:14.0.0)
-Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-tdefile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), tdemid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version})
+Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-tdefile-plugins-trinity (>= ${Source-Version}), tdemultimedia-tdeio-plugins-trinity (>= ${Source-Version}), tdemid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version})
 Suggests: tdemultimedia-trinity-doc-html (>= ${Source-Version})
 Description: multimedia apps from the official Trinity release 
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -31,7 +31,7 @@ Section: devel
 Architecture: any
 Replaces: kdemultimedia-trinity-dev (<< 4:14.0.0)
 Breaks: kdemultimedia-trinity-dev (<< 4:14.0.0)
-Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), tdemid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
+Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-tdeio-plugins-trinity (= ${Source-Version}), tdemid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
 Conflicts: libmpeg-trinity-dev
 Description: development files for the Trinity multimedia module
  Development files and headers for the Trinity multimedia module.
@@ -120,7 +120,7 @@ Section: sound
 Architecture: any
 Replaces: kaudiocreator-trinity (<< 4:14.0.0)
 Breaks: kaudiocreator-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, tdemultimedia-kio-plugins-trinity (= ${Source-Version})
+Depends: ${shlibs:Depends}, tdemultimedia-tdeio-plugins-trinity (= ${Source-Version})
 Recommends: vorbis-tools, flac
 Suggests: lame
 Description: CD ripper and audio encoder frontend for Trinity
@@ -155,7 +155,7 @@ Description: multimedia data for kappfinder-trinity
  This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
-Package: tdemultimedia-kio-plugins-trinity
+Package: tdemultimedia-tdeio-plugins-trinity
 Section: tde
 Architecture: any
 Replaces: kdemultimedia-kio-plugins-trinity (<< 4:14.0.0)
diff --git a/debian/squeeze/tdemultimedia/debian/rules b/debian/squeeze/tdemultimedia/debian/rules
index 58e944e5d..4dcb0d43d 100755
--- a/debian/squeeze/tdemultimedia/debian/rules
+++ b/debian/squeeze/tdemultimedia/debian/rules
@@ -26,7 +26,7 @@ DEB_DH_STRIP_ARGS  := --dbg-package=tdemultimedia-trinity-dbg
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity tdemid-trinity kmix-trinity krec-trinity \
+PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-tdeio-plugins-trinity tdemid-trinity kmix-trinity krec-trinity \
 	libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \
 	libkcddb1-trinity mpeglib-trinity noatun-trinity
 
diff --git a/debian/squeeze/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install b/debian/squeeze/tdemultimedia/debian/tdemultimedia-tdeio-plugins-trinity.install
index b45ea389e..b45ea389e 100644
--- a/debian/squeeze/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
+++ b/debian/squeeze/tdemultimedia/debian/tdemultimedia-tdeio-plugins-trinity.install
diff --git a/debian/squeeze/tdepim/debian/control b/debian/squeeze/tdepim/debian/control
index c17259d5e..448a82a08 100644
--- a/debian/squeeze/tdepim/debian/control
+++ b/debian/squeeze/tdepim/debian/control
@@ -22,7 +22,7 @@ Section: tde
 Architecture: all
 Replaces: kdepim-trinity (<< 4:14.0.0)
 Breaks: kdepim-trinity (<< 4:14.0.0)
-Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-tdefile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-tderesources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version})
+Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-tdefile-plugins-trinity (>= ${Source-Version}), tdepim-tdeio-plugins-trinity (>= ${Source-Version}), tdepim-tderesources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version})
 Suggests: tdepim-trinity-doc-html
 Description: Personal Information Management apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -116,7 +116,7 @@ Architecture: any
 Replaces: kaddressbook-trinity (<< 4:14.0.0)
 Breaks: kaddressbook-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Suggests: tdepim-tderesources-trinity, tdebase-kio-plugins-trinity
+Suggests: tdepim-tderesources-trinity, tdebase-tdeio-plugins-trinity
 Description: KDE NG addressbook application
  KAddressBook is the main address book application for KDE; it enables you
  to manage your contacts efficiently and comfortably. It can load and save
@@ -193,7 +193,7 @@ Description: KDE File dialog plugins for palm and vcf files
  This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
-Package: tdepim-kio-plugins-trinity
+Package: tdepim-tdeio-plugins-trinity
 Section: tde
 Architecture: any
 Replaces: kdepim-kio-plugins-trinity (<< 4:14.0.0)
@@ -269,7 +269,7 @@ Section: mail
 Architecture: any
 Replaces: kmail-trinity (<< 4:14.0.0)
 Breaks: kmail-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11
+Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-tdeio-plugins-trinity, tdebase-tdeio-plugins-trinity, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11
 Recommends: procmail
 Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer
 Provides: imap-client, mail-reader
@@ -278,8 +278,8 @@ Description: Trinity Email client
  desktop. It has features such as support for IMAP, POP3, multiple accounts,
  mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
  .
- You need to install tdepim-kio-plugins if you want to use IMAP or
- mbox files, and/or tdebase-kio-plugins if you want to use POP3.
+ You need to install tdepim-tdeio-plugins if you want to use IMAP or
+ mbox files, and/or tdebase-tdeio-plugins if you want to use POP3.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
@@ -405,7 +405,7 @@ Section: tde
 Architecture: any
 Replaces: korn-trinity (<< 4:14.0.0)
 Breaks: korn-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity
+Depends: ${shlibs:Depends}, tdepim-tdeio-plugins-trinity, tdebase-tdeio-plugins-trinity
 Description: Trinity mail checker
  Korn is a KDE mail checker that can display a small summary in the Kicker
  tray.  It supports checking mbox, pop3, imap4, and nntp sources.
diff --git a/debian/squeeze/tdepim/debian/tdepim-kio-plugins-trinity.install b/debian/squeeze/tdepim/debian/tdepim-tdeio-plugins-trinity.install
index b04ea7b6d..b04ea7b6d 100644
--- a/debian/squeeze/tdepim/debian/tdepim-kio-plugins-trinity.install
+++ b/debian/squeeze/tdepim/debian/tdepim-tdeio-plugins-trinity.install
diff --git a/debian/squeeze/tdesdk/debian/control b/debian/squeeze/tdesdk/debian/control
index 57976b778..bfe83fa61 100644
--- a/debian/squeeze/tdesdk/debian/control
+++ b/debian/squeeze/tdesdk/debian/control
@@ -16,7 +16,7 @@ Architecture: all
 Section: tde
 Replaces: kdesdk-trinity (<< 4:14.0.0)
 Breaks: kdesdk-trinity (<< 4:14.0.0)
-Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-tdefile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), tdeunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
+Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-tdefile-plugins-trinity (>= ${Source-Version}), tdesdk-tdeio-plugins-trinity (>= ${Source-Version}) | tdesvn-tdeio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), tdeunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
 Suggests: tdecachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html
 Description: software development kit from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -392,7 +392,7 @@ Description: UML modelling tool and code generator
  This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: tdesdk-kio-plugins-trinity
+Package: tdesdk-tdeio-plugins-trinity
 Architecture: any
 Section: devel
 Replaces: kdesdk-kio-plugins-trinity (<< 4:14.0.0)
diff --git a/debian/squeeze/tdesdk/debian/tdesdk-kio-plugins-trinity.docs b/debian/squeeze/tdesdk/debian/tdesdk-tdeio-plugins-trinity.docs
index ce721bb5e..ce721bb5e 100644
--- a/debian/squeeze/tdesdk/debian/tdesdk-kio-plugins-trinity.docs
+++ b/debian/squeeze/tdesdk/debian/tdesdk-tdeio-plugins-trinity.docs
diff --git a/debian/squeeze/tdesdk/debian/tdesdk-kio-plugins-trinity.install b/debian/squeeze/tdesdk/debian/tdesdk-tdeio-plugins-trinity.install
index ef4f3a473..ef4f3a473 100644
--- a/debian/squeeze/tdesdk/debian/tdesdk-kio-plugins-trinity.install
+++ b/debian/squeeze/tdesdk/debian/tdesdk-tdeio-plugins-trinity.install
diff --git a/debian/squeeze/tdevelop/debian/control b/debian/squeeze/tdevelop/debian/control
index ba0e5814b..e3baf874d 100644
--- a/debian/squeeze/tdevelop/debian/control
+++ b/debian/squeeze/tdevelop/debian/control
@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas
 Replaces: kdevelop-trinity (<< 4:14.0.0)
 Breaks: kdevelop-trinity (<< 4:14.0.0)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs4-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-kio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs4-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
+Suggests: libtqtinterface-dev, tdelibs4-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs4-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
 Description: An IDE for Unix/X11
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
diff --git a/debian/wheezy/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/wheezy/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
index db5399106..447fe40dc 100644
--- a/debian/wheezy/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/wheezy/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -10,5 +10,5 @@ make watch file actually work
 
 #### due to removal of KDE 3 packages ####
 remove tdemultimedia-dev, tdebase-dev from Build-Depends
-remove amarok-konqsidebar, tdemultimedia-kio-plugins from Recommends
+remove amarok-konqsidebar, tdemultimedia-tdeio-plugins from Recommends
 remove complete amarok-konqsidebar package
diff --git a/debian/wheezy/applications/amarok.cmake/debian/README.Debian b/debian/wheezy/applications/amarok.cmake/debian/README.Debian
index d696b9696..185627147 100644
--- a/debian/wheezy/applications/amarok.cmake/debian/README.Debian
+++ b/debian/wheezy/applications/amarok.cmake/debian/README.Debian
@@ -10,7 +10,7 @@ Amarok packages for Debian
       script.
 
     - if you want amarok to be able to play CDs, you need to install the
-      tdemultimedia-kio-plugins package.
+      tdemultimedia-tdeio-plugins package.
 
     - the scripts available in the 'Scripts' menu need that you install
       some other packages for them to work. Those packages are listed in
diff --git a/debian/wheezy/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/wheezy/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
index db5399106..447fe40dc 100644
--- a/debian/wheezy/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/wheezy/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -10,5 +10,5 @@ make watch file actually work
 
 #### due to removal of KDE 3 packages ####
 remove tdemultimedia-dev, tdebase-dev from Build-Depends
-remove amarok-konqsidebar, tdemultimedia-kio-plugins from Recommends
+remove amarok-konqsidebar, tdemultimedia-tdeio-plugins from Recommends
 remove complete amarok-konqsidebar package
diff --git a/debian/wheezy/applications/amarok/debian/README.Debian b/debian/wheezy/applications/amarok/debian/README.Debian
index d696b9696..185627147 100644
--- a/debian/wheezy/applications/amarok/debian/README.Debian
+++ b/debian/wheezy/applications/amarok/debian/README.Debian
@@ -10,7 +10,7 @@ Amarok packages for Debian
       script.
 
     - if you want amarok to be able to play CDs, you need to install the
-      tdemultimedia-kio-plugins package.
+      tdemultimedia-tdeio-plugins package.
 
     - the scripts available in the 'Scripts' menu need that you install
       some other packages for them to work. Those packages are listed in
diff --git a/debian/wheezy/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/wheezy/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 58d2a725a..7b99dabec 100644
--- a/debian/wheezy/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/wheezy/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -3,6 +3,6 @@ remove build-dep on libdvdread-dev
 libk3b3-extracodecs conflicts libk3b2-extracodecs
 transitional libk3b2-extracodecs package
 
-Do not recommend on tdebase-kio-plugins, kcontrol, 
+Do not recommend on tdebase-tdeio-plugins, kcontrol, 
 Change recommend to suggest for vcdimager
 
diff --git a/debian/wheezy/applications/knights/debian/control b/debian/wheezy/applications/knights/debian/control
index 8c281d27e..611c600ce 100644
--- a/debian/wheezy/applications/knights/debian/control
+++ b/debian/wheezy/applications/knights/debian/control
@@ -10,7 +10,7 @@ Homepage: http://knights.sourceforge.net/
 
 Package: knights-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, tdebase-kio-plugins-trinity
+Depends: ${shlibs:Depends}, tdebase-tdeio-plugins-trinity
 Replaces: knights-trinity (<< 4:14.0.0)
 Breaks: knights-trinity (<< 4:14.0.0)
 Suggests: gnuchess | crafty | sjeng, knights-themepack-trinity
diff --git a/debian/wheezy/applications/krusader/debian/control b/debian/wheezy/applications/krusader/debian/control
index 25beb8352..cf06f9ab8 100644
--- a/debian/wheezy/applications/krusader/debian/control
+++ b/debian/wheezy/applications/krusader/debian/control
@@ -15,7 +15,7 @@ Breaks: krusader-trinity (<< 4:14.0.0)
 Suggests: md5deep | cfv, kedit-trinity, khexedit-trinity, konsole-trinity, kmail-trinity,
  krename-trinity, kdiff3-trinity | kompare-trinity | xxdiff, ark-trinity, arj, bzip2, cpio, lha,
  unrar | unrar-free | rar, rpm, unace, unzip, zip, p7zip, tdebase-trinity-bin,
- tdebase-kio-plugins-trinity
+ tdebase-tdeio-plugins-trinity
 Description: twin-panel (commander-style) file manager for KDE (and other desktops)
  Krusader is a simple, easy, powerful, twin-panel (commander-style) file
  manager for KDE and other desktops, similar to Midnight Commander (C) or Total
diff --git a/debian/wheezy/applications/ktorrent/debian/control b/debian/wheezy/applications/ktorrent/debian/control
index 3918b6093..cd9220c47 100644
--- a/debian/wheezy/applications/ktorrent/debian/control
+++ b/debian/wheezy/applications/ktorrent/debian/control
@@ -11,7 +11,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: ktorrent-trinity (<< 4:14.0.0)
 Breaks: ktorrent-trinity (<< 4:14.0.0)
 Suggests: php5-cli
-Recommends: tdebase-kio-plugins-trinity
+Recommends: tdebase-tdeio-plugins-trinity
 Description: BitTorrent client for Trinity
  KTorrent is a BitTorrent program for Trinity. Its features include speed capping
  (both down and up), integrated searching, UDP tracker support, preview of
diff --git a/debian/wheezy/applications/ktorrent/debian/control.in b/debian/wheezy/applications/ktorrent/debian/control.in
index 0c48fcdd7..4529848dd 100644
--- a/debian/wheezy/applications/ktorrent/debian/control.in
+++ b/debian/wheezy/applications/ktorrent/debian/control.in
@@ -11,7 +11,7 @@ Package: ktorrent-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: php5-cli
-Recommends: tdebase-kio-plugins-trinity
+Recommends: tdebase-tdeio-plugins-trinity
 Description: BitTorrent client for Trinity
  KTorrent is a BitTorrent program for Trinity. Its features include speed capping
  (both down and up), integrated searching, UDP tracker support, preview of
diff --git a/debian/wheezy/applications/soundkonverter/debian/control b/debian/wheezy/applications/soundkonverter/debian/control
index e836533e0..7d72a263c 100644
--- a/debian/wheezy/applications/soundkonverter/debian/control
+++ b/debian/wheezy/applications/soundkonverter/debian/control
@@ -12,7 +12,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: soundkonverter-trinity (<< 4:14.0.0)
 Breaks: soundkonverter-trinity (<< 4:14.0.0)
-Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac, tdemultimedia-kio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack
+Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac, tdemultimedia-tdeio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack
 Suggests: soundkonverter-amarok-trinity
 Description: audio converter frontend for Trinity
  soundKonverter is a frontend to various audio converters.
diff --git a/debian/wheezy/applications/tdesvn/debian/control b/debian/wheezy/applications/tdesvn/debian/control
index 0c1f99451..faaeb13f8 100644
--- a/debian/wheezy/applications/tdesvn/debian/control
+++ b/debian/wheezy/applications/tdesvn/debian/control
@@ -34,7 +34,7 @@ Section: devel
 Architecture: any
 Replaces: kdesvn-trinity (<< 4:14.0.0)
 Breaks: kdesvn-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-kio-plugins-trinity (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})
 Recommends: kompare-trinity, graphviz
 Suggests: khelpcenter-trinity, kdiff3-trinity
 Description: subversion client with tight KDE integration [Trinity]
@@ -45,13 +45,13 @@ Description: subversion client with tight KDE integration [Trinity]
  a tight integration into KDE and can be embedded into other KDE 
  applications like konqueror via the KDE component technology KParts.
 
-Package: tdesvn-kio-plugins-trinity
+Package: tdesvn-tdeio-plugins-trinity
 Section: devel
 Architecture: any
 Replaces: kdesvn-kio-plugins-trinity (<< 4:14.0.0)
 Breaks: kdesvn-kio-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: tdesdk-kio-plugins-trinity
+Conflicts: tdesdk-tdeio-plugins-trinity
 Description: subversion I/O slaves for Trinity
  This packages includes KIO slaves for svn, svn+file, svn+http, 
  svn+https, svn+ssh. This allows you to access subversion repositories 
diff --git a/debian/wheezy/applications/tdesvn/debian/control.in b/debian/wheezy/applications/tdesvn/debian/control.in
index dc185ccef..c0d254fad 100644
--- a/debian/wheezy/applications/tdesvn/debian/control.in
+++ b/debian/wheezy/applications/tdesvn/debian/control.in
@@ -35,7 +35,7 @@ Section: devel
 Architecture: any
 Replaces: tdesvn-kde3 (<< 4:3.5.13)
 Breaks: tdesvn-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-kio-plugins-trinity (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})
 Recommends: kompare-trinity, graphviz
 Suggests: khelpcenter-trinity, kdiff3-trinity
 Description: subversion client with tight KDE integration [Trinity]
@@ -46,13 +46,13 @@ Description: subversion client with tight KDE integration [Trinity]
  a tight integration into KDE and can be embedded into other KDE 
  applications like konqueror via the KDE component technology KParts.
 
-Package: tdesvn-kio-plugins-trinity
+Package: tdesvn-tdeio-plugins-trinity
 Section: devel
 Architecture: any
 Replaces: tdesvn-kio-plugins-kde3 (<< 4:3.5.13)
 Breaks: tdesvn-kio-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: tdesdk-kio-plugins-trinity
+Conflicts: tdesdk-tdeio-plugins-trinity
 Description: subversion I/O slaves for Trinity
  This packages includes KIO slaves for svn, svn+file, svn+http, 
  svn+https, svn+ssh. This allows you to access subversion repositories 
diff --git a/debian/wheezy/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install b/debian/wheezy/applications/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install
index 79f9eff3d..79f9eff3d 100644
--- a/debian/wheezy/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
+++ b/debian/wheezy/applications/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install
diff --git a/debian/wheezy/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/debian/wheezy/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
index 042ffdb21..f5a54d259 100644
--- a/debian/wheezy/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/debian/wheezy/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
@@ -36,7 +36,7 @@ in konsole.README.Debian s/fontconfig/fontconfig-config
 
 in tdm.postinst install at s/99/13/
 
-from tdebase-kio-plugins.install remove debian/tmp/usr/share/services/tdefile_trash.desktop (that's to remove the trash from the "system applet")
+from tdebase-tdeio-plugins.install remove debian/tmp/usr/share/services/tdefile_trash.desktop (that's to remove the trash from the "system applet")
 
 add debian/ubuntu.xmodmap  debian/80ubuntu-xmodmap and add install rules to binary-install/tdebase-bin::
 
diff --git a/debian/wheezy/tdebase/debian/control b/debian/wheezy/tdebase/debian/control
index 8bcd4d05e..5f88a23c4 100644
--- a/debian/wheezy/tdebase/debian/control
+++ b/debian/wheezy/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-trinity (<< 4:14.0.0)
 Breaks: kdebase-trinity (<< 4:14.0.0)
-Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
+Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
 Recommends: tdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -180,13 +180,13 @@ Description: KDE base documentation in HTML format
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: tdebase-kio-plugins-trinity
+Package: tdebase-tdeio-plugins-trinity
 Section: tde
 Architecture: any
 Replaces: kdebase-kio-plugins-trinity (<< 4:14.0.0)
 Breaks: kdebase-kio-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, cryptsetup, man-db (>= 2.5.1-1)
-Recommends: hal-trinity, pmount, kamera-trinity, tdemultimedia-kio-plugins-trinity
+Recommends: hal-trinity, pmount, kamera-trinity, tdemultimedia-tdeio-plugins-trinity
 Suggests: khelpcenter-trinity, mtools
 Conflicts: tdebase-libs-trinity (<< 4:3.0.0), mediamanager
 Description: core I/O slaves for KDE
@@ -360,7 +360,7 @@ Architecture: any
 Replaces: konqueror-trinity (<< 4:14.0.0)
 Breaks: konqueror-trinity (<< 4:14.0.0)
 Provides: info-browser, man-browser, www-browser, konqueror
-Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-kio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity
+Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-tdeio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity
 Suggests: khelpcenter-trinity, konq-plugins-trinity, ksvg-trinity, gij-4.1, libgcj7-awt, libjessie-java
 Conflicts: tdebase-audiolibs-trinity (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0)
 Description: KDE's advanced file manager, web browser and document viewer
diff --git a/debian/wheezy/tdebase/debian/control.in b/debian/wheezy/tdebase/debian/control.in
index 387728c4e..c20726136 100644
--- a/debian/wheezy/tdebase/debian/control.in
+++ b/debian/wheezy/tdebase/debian/control.in
@@ -12,7 +12,7 @@ Standards-Version: 3.8.4
 Package: tdebase
 Section: tde
 Architecture: all
-Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), twin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
+Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-tdeio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), twin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
 Recommends: tdm (>= ${Source-Version})
 Suggests: tdebase-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -158,11 +158,11 @@ Description: KDE base documentation in HTML format
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde' and 'tdebase' packages for more information.
 
-Package: tdebase-kio-plugins
+Package: tdebase-tdeio-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}, kdesktop, libsasl2-modules, psmisc, cryptsetup, man-db (>= 2.5.1-1)
-Recommends: hal, pmount, kamera, tdemultimedia-kio-plugins
+Recommends: hal, pmount, kamera, tdemultimedia-tdeio-plugins
 Suggests: khelpcenter, mtools
 Conflicts: tdebase-libs (<< 4:3.0.0)
 Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0), tdebase-bin (<< 4:3.5.5a.dfsg.1-1ubuntu18)
@@ -323,7 +323,7 @@ Package: konqueror
 Section: web
 Architecture: any
 Provides: info-browser, man-browser, www-browser
-Depends: ${shlibs:Depends}, kcontrol (= ${Source-Version}), tdebase-kio-plugins (= ${Source-Version}), kdesktop (= ${Source-Version}), kfind (= ${Source-Version})
+Depends: ${shlibs:Depends}, kcontrol (= ${Source-Version}), tdebase-tdeio-plugins (= ${Source-Version}), kdesktop (= ${Source-Version}), kfind (= ${Source-Version})
 Suggests: khelpcenter, konq-plugins, ksvg, gij-4.1, libgcj7-awt, libjessie-java
 Conflicts: tdebase-audiolibs (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0)
 Replaces: tdebase (<< 4:3.0.0), tdebase-audiolibs (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0)
diff --git a/debian/wheezy/tdebase/debian/rules b/debian/wheezy/tdebase/debian/rules
index 2e12a8d03..e7256ba3a 100755
--- a/debian/wheezy/tdebase/debian/rules
+++ b/debian/wheezy/tdebase/debian/rules
@@ -203,11 +203,11 @@ makebuilddir::
 common-install-prehook-arch::
 	grep -v -e joystick -e view1394  debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-i386
 	grep -v -e joystick -e view1394  debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-amd64
-	grep -v -e media_propsdlgplugin  debian/tdebase-kio-plugins-trinity.install > debian/tdebase-kio-plugins-trinity.install.kfreebsd-i386
-	grep -v -e media_propsdlgplugin  debian/tdebase-kio-plugins-trinity.install > debian/tdebase-kio-plugins-trinity.install.kfreebsd-amd64
+	grep -v -e media_propsdlgplugin  debian/tdebase-tdeio-plugins-trinity.install > debian/tdebase-tdeio-plugins-trinity.install.kfreebsd-i386
+	grep -v -e media_propsdlgplugin  debian/tdebase-tdeio-plugins-trinity.install > debian/tdebase-tdeio-plugins-trinity.install.kfreebsd-amd64
 
 clean::
-	rm -f debian/kcontrol-trinity.install.kfreebsd* debian/tdebase-kio-plugins-trinity.install.kfreebs*
+	rm -f debian/kcontrol-trinity.install.kfreebsd* debian/tdebase-tdeio-plugins-trinity.install.kfreebs*
 	rm -f kcontrol/pics/cr*-app-energy_star.png kcontrol/energy/pics/energybig.png kcontrol/energy/pics/lo-energy.png
 	# KIO Media LUKS Icons
 	rm -f pics/crystalsvg/cr*decrypt.png pics/crystalsvg/cr*encrypt.png
diff --git a/debian/wheezy/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian b/debian/wheezy/tdebase/debian/tdebase-tdeio-plugins-trinity.README.Debian
index 404b60f67..37f0e0986 100644
--- a/debian/wheezy/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian
+++ b/debian/wheezy/tdebase/debian/tdebase-tdeio-plugins-trinity.README.Debian
@@ -8,7 +8,7 @@ cameras, and many other types of equipment.
 While some functionality is available without the use of HAL, media works
 best with HAL (and therefore udev), in combination with pmount. Media
 also extends the functionality of many other tdeioslaves. Check which
-packages are recommended by the tdebase-kio-plugins package, and install
+packages are recommended by the tdebase-tdeio-plugins package, and install
 accordingly.
 
 Note that for regular users to use media in conjunction with HAL, they must
diff --git a/debian/wheezy/tdebase/debian/tdebase-kio-plugins-trinity.install b/debian/wheezy/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index 47f0abc0c..47f0abc0c 100644
--- a/debian/wheezy/tdebase/debian/tdebase-kio-plugins-trinity.install
+++ b/debian/wheezy/tdebase/debian/tdebase-tdeio-plugins-trinity.install
diff --git a/debian/wheezy/tdebase/debian/tdebase-kio-plugins-trinity.manpages b/debian/wheezy/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
index 249292ad7..249292ad7 100644
--- a/debian/wheezy/tdebase/debian/tdebase-kio-plugins-trinity.manpages
+++ b/debian/wheezy/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
diff --git a/debian/wheezy/tdebase/debian/tdebase-trinity.README.Debian b/debian/wheezy/tdebase/debian/tdebase-trinity.README.Debian
index e7a871ce9..9944d8af8 100644
--- a/debian/wheezy/tdebase/debian/tdebase-trinity.README.Debian
+++ b/debian/wheezy/tdebase/debian/tdebase-trinity.README.Debian
@@ -14,7 +14,7 @@ cameras, and many other types of equipment.
 While some functionality is available without the use of HAL, media works
 best with HAL (and therefore udev), in combination with pmount. Media
 also extends the functionality of many other tdeioslaves. Check which
-packages are recommended by the tdebase-kio-plugins package, and install
+packages are recommended by the tdebase-tdeio-plugins package, and install
 accordingly.
 
 Note that for regular users to use media in conjunction with HAL, they must
diff --git a/debian/wheezy/tdemultimedia/debian/control b/debian/wheezy/tdemultimedia/debian/control
index 866ee43eb..7fb812019 100644
--- a/debian/wheezy/tdemultimedia/debian/control
+++ b/debian/wheezy/tdemultimedia/debian/control
@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdemultimedia-trinity (<< 4:14.0.0)
 Breaks: kdemultimedia-trinity (<< 4:14.0.0)
-Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-tdefile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), tdemid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version})
+Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-tdefile-plugins-trinity (>= ${Source-Version}), tdemultimedia-tdeio-plugins-trinity (>= ${Source-Version}), tdemid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version})
 Suggests: tdemultimedia-trinity-doc-html (>= ${Source-Version})
 Description: multimedia apps from the official Trinity release 
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -31,7 +31,7 @@ Section: devel
 Architecture: any
 Replaces: kdemultimedia-trinity-dev (<< 4:14.0.0)
 Breaks: kdemultimedia-trinity-dev (<< 4:14.0.0)
-Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), tdemid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
+Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-tdeio-plugins-trinity (= ${Source-Version}), tdemid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
 Conflicts: libmpeg-trinity-dev
 Description: development files for the Trinity multimedia module
  Development files and headers for the Trinity multimedia module.
@@ -120,7 +120,7 @@ Section: sound
 Architecture: any
 Replaces: kaudiocreator-trinity (<< 4:14.0.0)
 Breaks: kaudiocreator-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, tdemultimedia-kio-plugins-trinity (= ${Source-Version})
+Depends: ${shlibs:Depends}, tdemultimedia-tdeio-plugins-trinity (= ${Source-Version})
 Recommends: vorbis-tools, flac
 Suggests: lame
 Description: CD ripper and audio encoder frontend for Trinity
@@ -155,7 +155,7 @@ Description: multimedia data for kappfinder-trinity
  This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
-Package: tdemultimedia-kio-plugins-trinity
+Package: tdemultimedia-tdeio-plugins-trinity
 Section: tde
 Architecture: any
 Replaces: kdemultimedia-kio-plugins-trinity (<< 4:14.0.0)
diff --git a/debian/wheezy/tdemultimedia/debian/rules b/debian/wheezy/tdemultimedia/debian/rules
index 58e944e5d..4dcb0d43d 100755
--- a/debian/wheezy/tdemultimedia/debian/rules
+++ b/debian/wheezy/tdemultimedia/debian/rules
@@ -26,7 +26,7 @@ DEB_DH_STRIP_ARGS  := --dbg-package=tdemultimedia-trinity-dbg
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity tdemid-trinity kmix-trinity krec-trinity \
+PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-tdeio-plugins-trinity tdemid-trinity kmix-trinity krec-trinity \
 	libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \
 	libkcddb1-trinity mpeglib-trinity noatun-trinity
 
diff --git a/debian/wheezy/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install b/debian/wheezy/tdemultimedia/debian/tdemultimedia-tdeio-plugins-trinity.install
index b45ea389e..b45ea389e 100644
--- a/debian/wheezy/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
+++ b/debian/wheezy/tdemultimedia/debian/tdemultimedia-tdeio-plugins-trinity.install
diff --git a/debian/wheezy/tdepim/debian/control b/debian/wheezy/tdepim/debian/control
index c17259d5e..448a82a08 100644
--- a/debian/wheezy/tdepim/debian/control
+++ b/debian/wheezy/tdepim/debian/control
@@ -22,7 +22,7 @@ Section: tde
 Architecture: all
 Replaces: kdepim-trinity (<< 4:14.0.0)
 Breaks: kdepim-trinity (<< 4:14.0.0)
-Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-tdefile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-tderesources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version})
+Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-tdefile-plugins-trinity (>= ${Source-Version}), tdepim-tdeio-plugins-trinity (>= ${Source-Version}), tdepim-tderesources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version})
 Suggests: tdepim-trinity-doc-html
 Description: Personal Information Management apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -116,7 +116,7 @@ Architecture: any
 Replaces: kaddressbook-trinity (<< 4:14.0.0)
 Breaks: kaddressbook-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Suggests: tdepim-tderesources-trinity, tdebase-kio-plugins-trinity
+Suggests: tdepim-tderesources-trinity, tdebase-tdeio-plugins-trinity
 Description: KDE NG addressbook application
  KAddressBook is the main address book application for KDE; it enables you
  to manage your contacts efficiently and comfortably. It can load and save
@@ -193,7 +193,7 @@ Description: KDE File dialog plugins for palm and vcf files
  This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
-Package: tdepim-kio-plugins-trinity
+Package: tdepim-tdeio-plugins-trinity
 Section: tde
 Architecture: any
 Replaces: kdepim-kio-plugins-trinity (<< 4:14.0.0)
@@ -269,7 +269,7 @@ Section: mail
 Architecture: any
 Replaces: kmail-trinity (<< 4:14.0.0)
 Breaks: kmail-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11
+Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-tdeio-plugins-trinity, tdebase-tdeio-plugins-trinity, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11
 Recommends: procmail
 Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer
 Provides: imap-client, mail-reader
@@ -278,8 +278,8 @@ Description: Trinity Email client
  desktop. It has features such as support for IMAP, POP3, multiple accounts,
  mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
  .
- You need to install tdepim-kio-plugins if you want to use IMAP or
- mbox files, and/or tdebase-kio-plugins if you want to use POP3.
+ You need to install tdepim-tdeio-plugins if you want to use IMAP or
+ mbox files, and/or tdebase-tdeio-plugins if you want to use POP3.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
@@ -405,7 +405,7 @@ Section: tde
 Architecture: any
 Replaces: korn-trinity (<< 4:14.0.0)
 Breaks: korn-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity
+Depends: ${shlibs:Depends}, tdepim-tdeio-plugins-trinity, tdebase-tdeio-plugins-trinity
 Description: Trinity mail checker
  Korn is a KDE mail checker that can display a small summary in the Kicker
  tray.  It supports checking mbox, pop3, imap4, and nntp sources.
diff --git a/debian/wheezy/tdepim/debian/tdepim-kio-plugins-trinity.install b/debian/wheezy/tdepim/debian/tdepim-tdeio-plugins-trinity.install
index b04ea7b6d..b04ea7b6d 100644
--- a/debian/wheezy/tdepim/debian/tdepim-kio-plugins-trinity.install
+++ b/debian/wheezy/tdepim/debian/tdepim-tdeio-plugins-trinity.install
diff --git a/debian/wheezy/tdesdk/debian/control b/debian/wheezy/tdesdk/debian/control
index 57976b778..bfe83fa61 100644
--- a/debian/wheezy/tdesdk/debian/control
+++ b/debian/wheezy/tdesdk/debian/control
@@ -16,7 +16,7 @@ Architecture: all
 Section: tde
 Replaces: kdesdk-trinity (<< 4:14.0.0)
 Breaks: kdesdk-trinity (<< 4:14.0.0)
-Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-tdefile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), tdeunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
+Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-tdefile-plugins-trinity (>= ${Source-Version}), tdesdk-tdeio-plugins-trinity (>= ${Source-Version}) | tdesvn-tdeio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), tdeunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
 Suggests: tdecachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html
 Description: software development kit from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -392,7 +392,7 @@ Description: UML modelling tool and code generator
  This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: tdesdk-kio-plugins-trinity
+Package: tdesdk-tdeio-plugins-trinity
 Architecture: any
 Section: devel
 Replaces: kdesdk-kio-plugins-trinity (<< 4:14.0.0)
diff --git a/debian/wheezy/tdesdk/debian/tdesdk-kio-plugins-trinity.docs b/debian/wheezy/tdesdk/debian/tdesdk-tdeio-plugins-trinity.docs
index ce721bb5e..ce721bb5e 100644
--- a/debian/wheezy/tdesdk/debian/tdesdk-kio-plugins-trinity.docs
+++ b/debian/wheezy/tdesdk/debian/tdesdk-tdeio-plugins-trinity.docs
diff --git a/debian/wheezy/tdesdk/debian/tdesdk-kio-plugins-trinity.install b/debian/wheezy/tdesdk/debian/tdesdk-tdeio-plugins-trinity.install
index ef4f3a473..ef4f3a473 100644
--- a/debian/wheezy/tdesdk/debian/tdesdk-kio-plugins-trinity.install
+++ b/debian/wheezy/tdesdk/debian/tdesdk-tdeio-plugins-trinity.install
diff --git a/debian/wheezy/tdevelop/debian/control b/debian/wheezy/tdevelop/debian/control
index ba0e5814b..e3baf874d 100644
--- a/debian/wheezy/tdevelop/debian/control
+++ b/debian/wheezy/tdevelop/debian/control
@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas
 Replaces: kdevelop-trinity (<< 4:14.0.0)
 Breaks: kdevelop-trinity (<< 4:14.0.0)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs4-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-kio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs4-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
+Suggests: libtqtinterface-dev, tdelibs4-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs4-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
 Description: An IDE for Unix/X11
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features