Update Debian and Ubuntu packaging with the latest renaming in GIT

188 files changed, 907 insertions, 907 deletions

diff --git a/ubuntu/precise/applications/amarok.cmake/debian/control b/ubuntu/precise/applications/amarok.cmake/debian/control
index 7407748f8..49bfcb1c5 100644
--- a/ubuntu/precise/applications/amarok.cmake/debian/control
+++ b/ubuntu/precise/applications/amarok.cmake/debian/control
@@ -31,7 +31,7 @@ Description: versatile and easy to use audio player for Trinity
    - rapid playlist creation, with drag and drop from a directory view
    - nice playlist browser for your existing playlists (PLS or M3U formats)
    - collection-indexing support, for smart browsing and playlist creation
-   - possibility of accessing media via kioslaves, allowing you to play
+   - possibility of accessing media via tdeioslaves, allowing you to play
      via smb:// or fish:// (normal streams are of course supported)
    - inline ID3 tag editing, capable of retrieving tags via MusicBrainz
    - album cover support: automatically displays album covers from the
diff --git a/ubuntu/precise/applications/amarok.cmake/debian/control.in b/ubuntu/precise/applications/amarok.cmake/debian/control.in
index dc0f8621a..8ff2b1c0b 100644
--- a/ubuntu/precise/applications/amarok.cmake/debian/control.in
+++ b/ubuntu/precise/applications/amarok.cmake/debian/control.in
@@ -28,7 +28,7 @@ Description: versatile and easy to use audio player for Trinity
    - rapid playlist creation, with drag and drop from a directory view
    - nice playlist browser for your existing playlists (PLS or M3U formats)
    - collection-indexing support, for smart browsing and playlist creation
-   - possibility of accessing media via kioslaves, allowing you to play
+   - possibility of accessing media via tdeioslaves, allowing you to play
      via smb:// or fish:// (normal streams are of course supported)
    - inline ID3 tag editing, capable of retrieving tags via MusicBrainz
    - album cover support: automatically displays album covers from the
diff --git a/ubuntu/precise/applications/amarok/debian/control b/ubuntu/precise/applications/amarok/debian/control
index 2b28b68d1..982e981ec 100644
--- a/ubuntu/precise/applications/amarok/debian/control
+++ b/ubuntu/precise/applications/amarok/debian/control
@@ -31,7 +31,7 @@ Description: versatile and easy to use audio player for Trinity
    - rapid playlist creation, with drag and drop from a directory view
    - nice playlist browser for your existing playlists (PLS or M3U formats)
    - collection-indexing support, for smart browsing and playlist creation
-   - possibility of accessing media via kioslaves, allowing you to play
+   - possibility of accessing media via tdeioslaves, allowing you to play
      via smb:// or fish:// (normal streams are of course supported)
    - inline ID3 tag editing, capable of retrieving tags via MusicBrainz
    - album cover support: automatically displays album covers from the
diff --git a/ubuntu/precise/applications/amarok/debian/control.in b/ubuntu/precise/applications/amarok/debian/control.in
index dc0f8621a..8ff2b1c0b 100644
--- a/ubuntu/precise/applications/amarok/debian/control.in
+++ b/ubuntu/precise/applications/amarok/debian/control.in
@@ -28,7 +28,7 @@ Description: versatile and easy to use audio player for Trinity
    - rapid playlist creation, with drag and drop from a directory view
    - nice playlist browser for your existing playlists (PLS or M3U formats)
    - collection-indexing support, for smart browsing and playlist creation
-   - possibility of accessing media via kioslaves, allowing you to play
+   - possibility of accessing media via tdeioslaves, allowing you to play
      via smb:// or fish:// (normal streams are of course supported)
    - inline ID3 tag editing, capable of retrieving tags via MusicBrainz
    - album cover support: automatically displays album covers from the
diff --git a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/cdbs/buildvars.mk b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/cdbs/buildvars.mk
+++ b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/cdbs/buildvars.mk
diff --git a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
index 311dc059d..311dc059d 100644
--- a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
index 765560c89..765560c89 100644
--- a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
+++ b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
diff --git a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/cdbs/team-members b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/cdbs/team-members
+++ b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/cdbs/team-members
diff --git a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/cdbs/uploaders.mk b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/cdbs/uploaders.mk
+++ b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/cdbs/uploaders.mk
diff --git a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl
+++ b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
diff --git a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/changelog b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/changelog
index 3483239b4..cabaf6e87 100644
--- a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/changelog
+++ b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/changelog
@@ -1,41 +1,41 @@
-compizconfig-backend-kconfig-trinity (0.8.4-0ubuntu1) lucid; urgency=low
+compizconfig-backend-tdeconfig-trinity (0.8.4-0ubuntu1) lucid; urgency=low
 
   * Lucid rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 05 March 2010 12:31:00 -0600
 
-compizconfig-backend-kconfig-trinity (0.7.4-0ubuntu5) karmic; urgency=low
+compizconfig-backend-tdeconfig-trinity (0.7.4-0ubuntu5) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-compizconfig-backend-kconfig-trinity (0.7.4-0ubuntu3) intrepid; urgency=low
+compizconfig-backend-tdeconfig-trinity (0.7.4-0ubuntu3) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
 
-compizconfig-backend-kconfig-trinity (0.7.4-0ubuntu2) intrepid; urgency=low
+compizconfig-backend-tdeconfig-trinity (0.7.4-0ubuntu2) intrepid; urgency=low
 
   * Added -trinity prefix
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 01 Dec 2008 08:30:00 -0600
 
-compizconfig-backend-kconfig (0.7.4-0ubuntu1) hardy; urgency=low
+compizconfig-backend-tdeconfig (0.7.4-0ubuntu1) hardy; urgency=low
 
   * new upstream release
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Sat, 05 Apr 2008 12:56:08 +0200
 
-compizconfig-backend-kconfig (0.7.2-0ubuntu1) hardy; urgency=low
+compizconfig-backend-tdeconfig (0.7.2-0ubuntu1) hardy; urgency=low
 
   * new upstream release
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 07 Mar 2008 15:06:14 +0100
 
-compizconfig-backend-kconfig (0.6.99+git20071127-0ubuntu1) hardy; urgency=low
+compizconfig-backend-tdeconfig (0.6.99+git20071127-0ubuntu1) hardy; urgency=low
 
   * renamed to match debian name
   * new git HEAD snapshot
@@ -43,13 +43,13 @@ compizconfig-backend-kconfig (0.6.99+git20071127-0ubuntu1) hardy; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 27 Nov 2007 20:03:35 +0100
 
-libcompizconfig-backend-kconfig (0.0+git20070912-0ubuntu1) gutsy; urgency=low
+libcompizconfig-backend-tdeconfig (0.0+git20070912-0ubuntu1) gutsy; urgency=low
 
   * new git snapshot based on 0.6 branch
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 10 Aug 2007 16:25:52 +0200
 
-libcompizconfig-backend-kconfig (0.0+git20070703-0ubuntu1) gutsy; urgency=low
+libcompizconfig-backend-tdeconfig (0.0+git20070703-0ubuntu1) gutsy; urgency=low
 
   * initial git snapshot
 
diff --git a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/compat b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/compat
+++ b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/compat
diff --git a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/control b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/control
index 57cfdd8b3..4cf6183e2 100644
--- a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/control
+++ b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/control
@@ -1,16 +1,16 @@
-Source: compizconfig-backend-kconfig-trinity
+Source: compizconfig-backend-tdeconfig-trinity
 Section: libs
 Priority: extra
 Maintainer: Timothy Pearosn <kb9vqf@pearsoncomputing.net>
 Build-Depends: cdbs, debhelper (>= 5), compiz-trinity-dev, pkg-config, intltool, tdelibs4-trinity-dev, libcompizconfig0-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: compizconfig-backend-kconfig-trinity
+Package: compizconfig-backend-tdeconfig-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: compizconfig-backend-kconfig-trinity (<< 4:14.0.0)
-Breaks: compizconfig-backend-kconfig-trinity (<< 4:14.0.0)
-Conflicts: libcompizconfig-backend-kconfig-trinity
+Replaces: compizconfig-backend-tdeconfig-trinity (<< 4:14.0.0)
+Breaks: compizconfig-backend-tdeconfig-trinity (<< 4:14.0.0)
+Conflicts: libcompizconfig-backend-tdeconfig-trinity
 Description: KConfig [Trinity] Settings library for plugins - OpenCompositing Project
  The OpenCompositing Project brings 3D desktop visual effects that improve
  usability of the X Window System and provide increased productivity
diff --git a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/copyright b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/copyright
index 68f70d9c0..61d8f8195 100644
--- a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/copyright
+++ b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Michael Vogt <michael.vogt@ubuntu.com> on
 Mon,  28 Jun 2007 09:53:13 +0200.
 
-It was downloaded from git://anongit.opencompositing.org/fusion/compizconfig/compizconfig-backend-kconfig
+It was downloaded from git://anongit.opencompositing.org/fusion/compizconfig/compizconfig-backend-tdeconfig
 
 Upstream Authors: 
 Dennis Kasprzyk <onestone@beryl-project.org>
diff --git a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/patches/.gitignore b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/patches/.gitignore
+++ b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/patches/.gitignore
diff --git a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/rules b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/rules
index 85efaa2fa..85efaa2fa 100755
--- a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/rules
+++ b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/rules
diff --git a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/source/format b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/source/format
+++ b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/source/format
diff --git a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/source/options b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/precise/applications/compizconfig-backend-kconfig/debian/source/options
+++ b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/source/options
diff --git a/ubuntu/precise/applications/digikam/debian/copyright b/ubuntu/precise/applications/digikam/debian/copyright
index 637b1fa8d..bc06dd076 100644
--- a/ubuntu/precise/applications/digikam/debian/copyright
+++ b/ubuntu/precise/applications/digikam/debian/copyright
@@ -136,7 +136,7 @@ digikam/
 
 	o digikam/digikam_export.h
             © 2005 Laurent Montel <montel@kde.org>
-	o from kfiletip source copies (tdebase, konqueror)
+	o from tdefiletip source copies (tdebase, konqueror)
 	    © 1998, 1999 Torben Weis <weis@kde.org>
 	    © 2000, 2001, 2002 David Faure <david@mandrakesoft.com>
 	o Concept copied from tdelibs/kio/kio/netaccess.h/cpp
@@ -148,7 +148,7 @@ imageplugins/
 	© 2004-2005 by Gilles Caulier <caulier dot gilles at gmail dot com>
 	© 2004-2005 by Renchi Raju
 
-kioslave/
+tdeioslave/
 	© 2003, 2004 by Renchi Raju
 
 libs/
diff --git a/ubuntu/precise/applications/gwenview/debian/changelog b/ubuntu/precise/applications/gwenview/debian/changelog
index 25741414f..e78f7be52 100644
--- a/ubuntu/precise/applications/gwenview/debian/changelog
+++ b/ubuntu/precise/applications/gwenview/debian/changelog
@@ -85,7 +85,7 @@ gwenview (1.4.0~debian.1-1) unstable; urgency=low
     + Fixes focus switching. (Closes: #301812)
 
   * Clarify the package description, as displaying EXIF tags don't require
-    kdegaphics-kfile-plugins (but other features still do). (Closes: #368809)
+    kdegaphics-tdefile-plugins (but other features still do). (Closes: #368809)
 
   * This rebuild eliminates all references to obsolete libX*.la files.
     (Closes: #381323)
@@ -95,7 +95,7 @@ gwenview (1.4.0~debian.1-1) unstable; urgency=low
 gwenview (1.3.1-3) unstable; urgency=low
 
   * Clarify the package description, as merely editing EXIF comments doesn't
-    strictly require tdegraphics-kfile-plugins. (Closes: #368809)
+    strictly require tdegraphics-tdefile-plugins. (Closes: #368809)
 
  -- Christopher Martin <chrsmrtn@debian.org>  Sun, 28 May 2006 11:37:27 -0400
 
@@ -198,7 +198,7 @@ gwenview (1.1.4-1) unstable; urgency=low
   * New upstream release.
   * Rebuild against Qt 3.3, fixing the failure to exit properly from
     fullscreen mode.
-  * Added a recommends on tdegraphics-kfile-plugins, which enables the use of
+  * Added a recommends on tdegraphics-tdefile-plugins, which enables the use of
     EXIF comments.
 
  -- Christopher Martin <chrsmrtn@freeshell.org>  Tue, 10 Aug 2004 18:37:33 -0400
diff --git a/ubuntu/precise/applications/gwenview/debian/control b/ubuntu/precise/applications/gwenview/debian/control
index 781aec00d..a28fbdb19 100644
--- a/ubuntu/precise/applications/gwenview/debian/control
+++ b/ubuntu/precise/applications/gwenview/debian/control
@@ -11,7 +11,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: gwenview-trinity (<< 4:14.0.0)
 Breaks: gwenview-trinity (<< 4:14.0.0)
-Recommends: tdegraphics-kfile-plugins-trinity, kipi-plugins-trinity
+Recommends: tdegraphics-tdefile-plugins-trinity, kipi-plugins-trinity
 Suggests: gwenview-i18n
 Description: image viewer for TDE
  Gwenview is an image viewer for the K Desktop Environment. It features a
@@ -23,7 +23,7 @@ Description: image viewer for TDE
  Image loading is handled by the Qt library, so Gwenview supports all image
  formats your Qt installation supports. Gwenview correctly displays images
  with an alpha channel. Gwenview supports the displaying and editing of EXIF
- comments, and, if the tdegraphics-kfile-plugins package is installed, other
+ comments, and, if the tdegraphics-tdefile-plugins package is installed, other
  image meta-information as well. Also supported is KIPI, the KDE Image Plugin
  Interface, a collection of helpful tools provided by the kipi-plugins
  package. The ability to perform lossless JPEG transforms is built in.
diff --git a/ubuntu/precise/applications/k3b/debian/changelog b/ubuntu/precise/applications/k3b/debian/changelog
index 77f899f3c..61061c0a5 100644
--- a/ubuntu/precise/applications/k3b/debian/changelog
+++ b/ubuntu/precise/applications/k3b/debian/changelog
@@ -85,7 +85,7 @@ k3b (1.0.5-2) unstable; urgency=low
 
   [ Francois Marier ]
   * Sync with Ubuntu
-    - Add kfile_k3b.so to k3b.install
+    - Add tdefile_k3b.so to k3b.install
     - libk3b3-extracodecs replaces libk3b2-extracodecs
   * Bump Standards-Version up to 3.8.0 (no changes)
   * Remove the KUBUNTU difference file
@@ -133,7 +133,7 @@ k3b (1.0.5-1ubuntu1) intrepid; urgency=low
      kubuntu_111_advice_kubuntu_restricted_extras.diff and add "or
      kubuntu-restricted-extras."), -
   * Add libk3bffmpegdecoder.so to libk3b3.install
-  * Add kfile_k3b.so to k3b.install
+  * Add tdefile_k3b.so to k3b.install
   * libk3b3-extracodecs replaces libk3b2-extracodecs
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Jun 2008 17:32:09 +0000
@@ -776,7 +776,7 @@ k3b (0.12.14-0ubuntu2) dapper; urgency=low
 
   * Remove kubuntu_01_hide_k3bsetup.diff patch and replace it with
     kubuntu_06_hide_k3bsetup.diff:
-     - Remove NoDisplay=true to prevent hiding k3bsetup in kcmshell
+     - Remove NoDisplay=true to prevent hiding k3bsetup in tdecmshell
        (Closes: Malone #23007, KDE Bug #117455, Debian #353826)
      - Change the Category field so k3bsetup doesn't appear in the KDE menu
        (Was the goal of the original patch)
diff --git a/ubuntu/precise/applications/k3b/debian/k3b-trinity.install b/ubuntu/precise/applications/k3b/debian/k3b-trinity.install
index 8e0b27b98..a72c0b374 100644
--- a/ubuntu/precise/applications/k3b/debian/k3b-trinity.install
+++ b/ubuntu/precise/applications/k3b/debian/k3b-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/*
 debian/tmp/opt/trinity/share/applications/*
 debian/k3b.xpm /opt/trinity/share/pixmaps/
-debian/tmp/opt/trinity/lib/trinity/kfile_k3b.so
-debian/tmp/opt/trinity/lib/trinity/kfile_k3b.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_k3b.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_k3b.la
diff --git a/ubuntu/precise/applications/k3b/debian/k3b.install b/ubuntu/precise/applications/k3b/debian/k3b.install
index 72cf96bb3..134bb0bf2 100644
--- a/ubuntu/precise/applications/k3b/debian/k3b.install
+++ b/ubuntu/precise/applications/k3b/debian/k3b.install
@@ -1,5 +1,5 @@
 debian/tmp/usr/bin/*
 debian/tmp/usr/share/applications/*
 debian/k3b.xpm usr/share/pixmaps/
-debian/tmp/usr/lib/trinity/kfile_k3b.so
-debian/tmp/usr/lib/trinity/kfile_k3b.la
+debian/tmp/usr/lib/trinity/tdefile_k3b.so
+debian/tmp/usr/lib/trinity/tdefile_k3b.la
diff --git a/ubuntu/precise/applications/kile/debian/kile-trinity.install b/ubuntu/precise/applications/kile/debian/kile-trinity.install
index 52d706863..eb1b59da1 100644
--- a/ubuntu/precise/applications/kile/debian/kile-trinity.install
+++ b/ubuntu/precise/applications/kile/debian/kile-trinity.install
@@ -1,6 +1,6 @@
 opt/trinity/bin/kile
 /opt/trinity/share/applications/tde/kile.desktop
-/opt/trinity/share/apps/kconf_update
+/opt/trinity/share/apps/tdeconf_update
 /opt/trinity/share/apps/kile
 /opt/trinity/share/config.kcfg/kile.kcfg
 /opt/trinity/share/doc/tde/HTML/en/kile
diff --git a/ubuntu/precise/applications/knemo/debian/changelog b/ubuntu/precise/applications/knemo/debian/changelog
index 884cc039e..7d52a6a0b 100644
--- a/ubuntu/precise/applications/knemo/debian/changelog
+++ b/ubuntu/precise/applications/knemo/debian/changelog
@@ -240,7 +240,7 @@ knemo (0.1.9-1) unstable; urgency=low
     for i[fw]config (instead of hardcoded path in *.cpp files)
   * added home page on kde-apps to control
   * Add to depends: tdelibs-bin (contains kded), kicker
-  * Add to recommends: kcontrol  (contains kcmshell, kcontrol)
+  * Add to recommends: kcontrol  (contains tdecmshell, kcontrol)
   * fixed version in VERSION file s/0.1.8/0.1.9/
   * README: s/&lt;/</
 
diff --git a/ubuntu/precise/applications/koffice/debian/README.MimeType b/ubuntu/precise/applications/koffice/debian/README.MimeType
index 7d9888658..2e1b8cc4c 100644
--- a/ubuntu/precise/applications/koffice/debian/README.MimeType
+++ b/ubuntu/precise/applications/koffice/debian/README.MimeType
@@ -8,10 +8,10 @@ similar to the following:
   kword's desktop file. Check your installation !
 
 This is often caused by an out-of-date KDE system configuration cache.
-If you experience this error, try running "kbuildsycoca" and see if it
+If you experience this error, try running "tdebuildsycoca" and see if it
 fixes the problem.
 
-Note that you can run "kbuildsycoca" as an ordinary user; there is no
+Note that you can run "tdebuildsycoca" as an ordinary user; there is no
 need to become root.
 
  -- Ben Burton <bab@debian.org>, Mon, 17 Jan 2005 20:57:22 +1100
diff --git a/ubuntu/precise/applications/koffice/debian/changelog b/ubuntu/precise/applications/koffice/debian/changelog
index f68f16811..8cbb6f1dc 100644
--- a/ubuntu/precise/applications/koffice/debian/changelog
+++ b/ubuntu/precise/applications/koffice/debian/changelog
@@ -228,7 +228,7 @@ koffice (1:1.6.3-3) unstable; urgency=high
     (Closes: #443673)
   * Add not-installed.list file to keep track of not installed files.
   * Add a missing dependency on kcontrol to kformula, in order to provide the
-    fonts kioslave. Thanks to Eike Hein for reporting.
+    fonts tdeioslave. Thanks to Eike Hein for reporting.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 26 Sep 2007 23:29:24 +0200
 
@@ -748,7 +748,7 @@ koffice (1:1.3.5-1) unstable; urgency=high
     - http://kde.org/info/security/advisory-20041223-1.txt
     References: CAN-2004-1125, DSA-619
   * Added README.MimeType to most binary packages to explain how to fix
-    the missing MimeType error by running kbuildsycoca (closes: #288950).
+    the missing MimeType error by running tdebuildsycoca (closes: #288950).
 
  -- Ben Burton <bab@debian.org>  Mon, 17 Jan 2005 20:57:22 +1100
 
diff --git a/ubuntu/precise/applications/koffice/debian/koffice-data-trinity.install b/ubuntu/precise/applications/koffice/debian/koffice-data-trinity.install
index cc7cbb4ac..4532ce445 100644
--- a/ubuntu/precise/applications/koffice/debian/koffice-data-trinity.install
+++ b/ubuntu/precise/applications/koffice/debian/koffice-data-trinity.install
@@ -69,10 +69,10 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/sqrt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/sum.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/under.png
 debian/tmp/opt/trinity/share/services/clipartthumbnail.desktop
-debian/tmp/opt/trinity/share/services/kfile_abiword.desktop
-debian/tmp/opt/trinity/share/services/kfile_gnumeric.desktop
-debian/tmp/opt/trinity/share/services/kfile_koffice.desktop
-debian/tmp/opt/trinity/share/services/kfile_ooo.desktop
+debian/tmp/opt/trinity/share/services/tdefile_abiword.desktop
+debian/tmp/opt/trinity/share/services/tdefile_gnumeric.desktop
+debian/tmp/opt/trinity/share/services/tdefile_koffice.desktop
+debian/tmp/opt/trinity/share/services/tdefile_ooo.desktop
 debian/tmp/opt/trinity/share/services/kformula_latex_export.desktop
 debian/tmp/opt/trinity/share/services/kformula_mathml_export.desktop
 debian/tmp/opt/trinity/share/services/kformula_mathml_import.desktop
diff --git a/ubuntu/precise/applications/koffice/debian/koffice-libs-trinity.install b/ubuntu/precise/applications/koffice/debian/koffice-libs-trinity.install
index 8d1ecc1d3..4be4f26eb 100644
--- a/ubuntu/precise/applications/koffice/debian/koffice-libs-trinity.install
+++ b/ubuntu/precise/applications/koffice/debian/koffice-libs-trinity.install
@@ -2,14 +2,14 @@ debian/tmp/opt/trinity/bin/koconverter
 debian/tmp/opt/trinity/bin/krossrunner
 debian/tmp/opt/trinity/lib/trinity/clipartthumbnail.la
 debian/tmp/opt/trinity/lib/trinity/clipartthumbnail.so
-debian/tmp/opt/trinity/lib/trinity/kfile_abiword.la
-debian/tmp/opt/trinity/lib/trinity/kfile_abiword.so
-debian/tmp/opt/trinity/lib/trinity/kfile_gnumeric.la
-debian/tmp/opt/trinity/lib/trinity/kfile_gnumeric.so
-debian/tmp/opt/trinity/lib/trinity/kfile_koffice.la
-debian/tmp/opt/trinity/lib/trinity/kfile_koffice.so
-debian/tmp/opt/trinity/lib/trinity/kfile_ooo.la
-debian/tmp/opt/trinity/lib/trinity/kfile_ooo.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_abiword.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_abiword.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_gnumeric.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_gnumeric.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_koffice.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_koffice.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_ooo.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_ooo.so
 debian/tmp/opt/trinity/lib/trinity/kodocinfopropspage.la
 debian/tmp/opt/trinity/lib/trinity/kodocinfopropspage.so
 debian/tmp/opt/trinity/lib/trinity/kofficescan.la
diff --git a/ubuntu/precise/applications/konversation/debian/changelog b/ubuntu/precise/applications/konversation/debian/changelog
index 69aa8c22f..dc4235d2d 100644
--- a/ubuntu/precise/applications/konversation/debian/changelog
+++ b/ubuntu/precise/applications/konversation/debian/changelog
@@ -1079,7 +1079,7 @@ konversation (0.13+20031123-1) experimental; urgency=low
   * debian/rules:
     + install examples/dcop-away.sh executable, as linda does not like it
       otherwise, and some other packages also do this (exim4, autotools, ...)
-    + make usr/share/apps/kconf_update/*.pl executable as well, for a similar
+    + make usr/share/apps/tdeconf_update/*.pl executable as well, for a similar
       reason (quiets lintian, and there is precedent for either way)
 
  -- Nathaniel W. Turner <nate@houseofnate.net>  Sun, 23 Nov 2003 18:22:31 -0500
diff --git a/ubuntu/precise/applications/konversation/debian/konversation-trinity.install b/ubuntu/precise/applications/konversation/debian/konversation-trinity.install
index 8a6cf218e..6b5aef496 100644
--- a/ubuntu/precise/applications/konversation/debian/konversation-trinity.install
+++ b/ubuntu/precise/applications/konversation/debian/konversation-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/bin/konversation
 debian/tmp/opt/trinity/share/applications/tde/konversation.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/*
+debian/tmp/opt/trinity/share/apps/tdeconf_update/*
 debian/tmp/opt/trinity/share/apps/konversation/eventsrc
 debian/tmp/opt/trinity/share/apps/konversation/konversationui.rc
 debian/tmp/opt/trinity/share/apps/konversation/scripts/*
diff --git a/ubuntu/precise/applications/tde-style-lipstik/debian/changelog b/ubuntu/precise/applications/tde-style-lipstik/debian/changelog
index 2010b4b10..ef19564bc 100644
--- a/ubuntu/precise/applications/tde-style-lipstik/debian/changelog
+++ b/ubuntu/precise/applications/tde-style-lipstik/debian/changelog
@@ -28,7 +28,7 @@ tde-style-lipstik (2.2.2-1) unstable; urgency=low
 
   * New upstream version
     - Added new automake1.9 dependency
-    - Created style/lipstik.moc and style/config/listikconf.moc 
+    - Created style/lipstik.moc and style/config/listitdeconf.moc 
 
  -- Bastian Venthur <venthur@debian.org>  Thu, 24 May 2007 23:32:09 +0200
 
diff --git a/ubuntu/precise/applications/tde-systemsettings/debian/changelog b/ubuntu/precise/applications/tde-systemsettings/debian/changelog
index 49bc830e9..3bcceb6ea 100644
--- a/ubuntu/precise/applications/tde-systemsettings/debian/changelog
+++ b/ubuntu/precise/applications/tde-systemsettings/debian/changelog
@@ -191,7 +191,7 @@ tde-systemsettings (0.0svn20060314-0ubuntu3) dapper; urgency=low
 
 tde-systemsettings (0.0svn20060314-0ubuntu2) dapper; urgency=low
 
-  * Add kubuntu_03_no_kbuildsycoca.diff, stop it running kbuildsycocoa 
+  * Add kubuntu_03_no_tdebuildsycoca.diff, stop it running kbuildsycocoa 
     during 'make install'
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Mar 2006 01:12:43 +0000
diff --git a/ubuntu/precise/applications/tdesvn/debian/changelog b/ubuntu/precise/applications/tdesvn/debian/changelog
index 07180f154..9d928278f 100644
--- a/ubuntu/precise/applications/tdesvn/debian/changelog
+++ b/ubuntu/precise/applications/tdesvn/debian/changelog
@@ -54,7 +54,7 @@ tdesvn (1.0.2-1) unstable; urgency=low
 tdesvn (1.0.1-1) experimental; urgency=low
 
   * New upstream release.
-  * debian/patches/01-bashisms_kconf_update.patch
+  * debian/patches/01-bashisms_tdeconf_update.patch
     - Removed, merged upstream. 
   * debian/patches/02-docimages.patch
     - Removed, fixed upstream. 
@@ -138,14 +138,14 @@ tdesvn (0.14.0-1) unstable; urgency=low
   * debian/tdesvn.menu
     - Change section to "Applications/Programming" to comply with the new menu
       spec.
-  * debian/patches/01-bashisms_kconf_update.patch
-    - Fix a bashism in the kconf_update script.
+  * debian/patches/01-bashisms_tdeconf_update.patch
+    - Fix a bashism in the tdeconf_update script.
   * debian/control
     - Use the new "Homepage:" field to specify the upstream URL.
     - SONAME bump, rename the libsvnqt3 package to libsvnqt4.
   * Rename libsvnqt3.install to libsvnqt4.install.
   * debian/tdesvn.install
-    - Install the kconf_update files.
+    - Install the tdeconf_update files.
   * debian/libsvnqt-dev.install
     - No longer install the libtool *.la files for libsvnqt.
 
diff --git a/ubuntu/precise/applications/tdesvn/debian/tdesvn-trinity.install b/ubuntu/precise/applications/tdesvn/debian/tdesvn-trinity.install
index fe0936b26..8903355a2 100644
--- a/ubuntu/precise/applications/tdesvn/debian/tdesvn-trinity.install
+++ b/ubuntu/precise/applications/tdesvn/debian/tdesvn-trinity.install
@@ -5,7 +5,7 @@ debian/tmp/opt/trinity/lib/trinity/tdesvnpart*
 debian/tmp/opt/trinity/share/apps/tdesvn/
 debian/tmp/opt/trinity/share/apps/tdesvnpart/
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/
-debian/tmp/opt/trinity/share/apps/kconf_update/
+debian/tmp/opt/trinity/share/apps/tdeconf_update/
 debian/tmp/opt/trinity/share/icons/
 debian/tmp/opt/trinity/share/locale/*/LC_MESSAGES/*.mo
 debian/tmp/opt/trinity/share/config.kcfg/
diff --git a/ubuntu/precise/applications/tdmtheme/debian/tdmtheme.lintian-overrides b/ubuntu/precise/applications/tdmtheme/debian/tdmtheme.lintian-overrides
index 5ad21ad51..f1c2df0c2 100644
--- a/ubuntu/precise/applications/tdmtheme/debian/tdmtheme.lintian-overrides
+++ b/ubuntu/precise/applications/tdmtheme/debian/tdmtheme.lintian-overrides
@@ -1,5 +1,5 @@
 # provided by tdelibs
-tdmtheme: desktop-command-not-in-package ./usr/share/applications/tde/tdmtheme.desktop kcmshell
+tdmtheme: desktop-command-not-in-package ./usr/share/applications/tde/tdmtheme.desktop tdecmshell
 # kcontrol module
 tdmtheme: desktop-entry-invalid-category X-TDE-settings-system ./usr/share/applications/tde/tdmtheme.desktop
 tdmtheme: desktop-entry-lacks-main-category ./usr/share/applications/tde/tdmtheme.desktop
diff --git a/ubuntu/precise/kdegraphics.automake/debian/changelog b/ubuntu/precise/kdegraphics.automake/debian/changelog
index 38be59fe0..970ec4d7f 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/changelog
+++ b/ubuntu/precise/kdegraphics.automake/debian/changelog
@@ -593,7 +593,7 @@ kdegraphics (4:3.5.0-1) alioth; urgency=low
 
   * Add the new kfaxview package.
 
-  * Add build-depends on libpoppler-qt-dev to build the kfile_pdf info plugin.
+  * Add build-depends on libpoppler-qt-dev to build the tdefile_pdf info plugin.
 
   * Remove obsolete replaces against package versions not
     present in Sarge.
@@ -716,7 +716,7 @@ kdegraphics (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number due to KDE 3.4.1 release
   * Move remove xpdf-utils depend on kpdf, add as 
-    suggests on kdegraphics-kfile-plugins
+    suggests on kdegraphics-tdefile-plugins
   * Add all packages back to meta package
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue, 31 May 2005 16:33:00 +0000
@@ -1143,7 +1143,7 @@ kdegraphics (4:2.2.2-6) unstable; urgency=low
     Alternately, the "I'm-under-peer-pressure-to-give-this-a-name" release,
     or the "no-notice-NMUs-suck-donkey-balls" release (hi lamont!).
   * Acknowledge lamont's NMU. (closes: #125871, #125956)
-  * kamera/kioslave/kamera.cpp:
+  * kamera/tdeioslave/kamera.cpp:
     - Apply patch to fix dodgy Canon camera drivers. (closes: #125873).
   * debian/rules:
     - Build with a different builddir to srcdir, thanks to Eray Ozkural.
diff --git a/ubuntu/precise/kdegraphics.automake/debian/control b/ubuntu/precise/kdegraphics.automake/debian/control
index 9b2fe98a7..f1c7e1a79 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/control
+++ b/ubuntu/precise/kdegraphics.automake/debian/control
@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdegraphics-trinity (<< 4:14.0.0)
 Breaks: kdegraphics-trinity (<< 4:14.0.0)
-Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), kdegraphics-kfile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
+Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), kdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
 Suggests: kdegraphics-trinity-doc-html (>= ${source:Version})
 Description: graphics apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -84,11 +84,11 @@ Description: development files for the KDE graphics module
  This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
-Package: kdegraphics-kfile-plugins-trinity
+Package: kdegraphics-tdefile-plugins-trinity
 Section: tde
 Architecture: any
-Replaces: kdegraphics-kfile-plugins-trinity (<< 4:14.0.0)
-Breaks: kdegraphics-kfile-plugins-trinity (<< 4:14.0.0)
+Replaces: kdegraphics-tdefile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdegraphics-tdefile-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Description: KDE metainfo plugins for graphic files
  This packages provides meta information for graphic files (file sizes,
diff --git a/ubuntu/precise/kdegraphics.automake/debian/control.in b/ubuntu/precise/kdegraphics.automake/debian/control.in
index af6d981bb..e28272337 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/control.in
+++ b/ubuntu/precise/kdegraphics.automake/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: kdegraphics
 Section: tde
 Architecture: all
-Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), kdegraphics-kfile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
+Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), kdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
 Suggests: kdegraphics-doc-html (>= ${source:Version})
 Description: graphics apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -74,7 +74,7 @@ Description: development files for the KDE graphics module
  This package is part of KDE, as a component of the KDE graphics module.
  See the 'kde' and 'kdegraphics' packages for more information.
 
-Package: kdegraphics-kfile-plugins
+Package: kdegraphics-tdefile-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install b/ubuntu/precise/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install
deleted file mode 100644
index d7a77267e..000000000
--- a/ubuntu/precise/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install
+++ /dev/null
@@ -1,57 +0,0 @@
-debian/tmp/opt/trinity/lib/trinity/gsthumbnail.la
-debian/tmp/opt/trinity/lib/trinity/gsthumbnail.so
-debian/tmp/opt/trinity/lib/trinity/kfile_bmp.la
-debian/tmp/opt/trinity/lib/trinity/kfile_bmp.so
-debian/tmp/opt/trinity/lib/trinity/kfile_dds.la
-debian/tmp/opt/trinity/lib/trinity/kfile_dds.so
-debian/tmp/opt/trinity/lib/trinity/kfile_dvi.la
-debian/tmp/opt/trinity/lib/trinity/kfile_dvi.so
-debian/tmp/opt/trinity/lib/trinity/kfile_exr.la
-debian/tmp/opt/trinity/lib/trinity/kfile_exr.so
-debian/tmp/opt/trinity/lib/trinity/kfile_gif.la
-debian/tmp/opt/trinity/lib/trinity/kfile_gif.so
-debian/tmp/opt/trinity/lib/trinity/kfile_ico.la
-debian/tmp/opt/trinity/lib/trinity/kfile_ico.so
-debian/tmp/opt/trinity/lib/trinity/kfile_jpeg.la
-debian/tmp/opt/trinity/lib/trinity/kfile_jpeg.so
-debian/tmp/opt/trinity/lib/trinity/kfile_pcx.la
-debian/tmp/opt/trinity/lib/trinity/kfile_pcx.so
-debian/tmp/opt/trinity/lib/trinity/kfile_pdf.la
-debian/tmp/opt/trinity/lib/trinity/kfile_pdf.so
-debian/tmp/opt/trinity/lib/trinity/kfile_png.la
-debian/tmp/opt/trinity/lib/trinity/kfile_png.so
-debian/tmp/opt/trinity/lib/trinity/kfile_pnm.la
-debian/tmp/opt/trinity/lib/trinity/kfile_pnm.so
-debian/tmp/opt/trinity/lib/trinity/kfile_ps.la
-debian/tmp/opt/trinity/lib/trinity/kfile_ps.so
-debian/tmp/opt/trinity/lib/trinity/kfile_raw.la
-debian/tmp/opt/trinity/lib/trinity/kfile_raw.so
-debian/tmp/opt/trinity/lib/trinity/kfile_rgb.la
-debian/tmp/opt/trinity/lib/trinity/kfile_rgb.so
-debian/tmp/opt/trinity/lib/trinity/kfile_tga.la
-debian/tmp/opt/trinity/lib/trinity/kfile_tga.so
-debian/tmp/opt/trinity/lib/trinity/kfile_tiff.la
-debian/tmp/opt/trinity/lib/trinity/kfile_tiff.so
-debian/tmp/opt/trinity/lib/trinity/kfile_xbm.la
-debian/tmp/opt/trinity/lib/trinity/kfile_xbm.so
-debian/tmp/opt/trinity/lib/trinity/kfile_xpm.la
-debian/tmp/opt/trinity/lib/trinity/kfile_xpm.so
-debian/tmp/opt/trinity/share/services/gsthumbnail.desktop
-debian/tmp/opt/trinity/share/services/kfile_bmp.desktop
-debian/tmp/opt/trinity/share/services/kfile_dds.desktop
-debian/tmp/opt/trinity/share/services/kfile_dvi.desktop
-debian/tmp/opt/trinity/share/services/kfile_exr.desktop
-debian/tmp/opt/trinity/share/services/kfile_gif.desktop
-debian/tmp/opt/trinity/share/services/kfile_ico.desktop
-debian/tmp/opt/trinity/share/services/kfile_jpeg.desktop
-debian/tmp/opt/trinity/share/services/kfile_pcx.desktop
-debian/tmp/opt/trinity/share/services/kfile_pdf.desktop
-debian/tmp/opt/trinity/share/services/kfile_png.desktop
-debian/tmp/opt/trinity/share/services/kfile_pnm.desktop
-debian/tmp/opt/trinity/share/services/kfile_ps.desktop
-debian/tmp/opt/trinity/share/services/kfile_raw.desktop
-debian/tmp/opt/trinity/share/services/kfile_rgb.desktop
-debian/tmp/opt/trinity/share/services/kfile_tga.desktop
-debian/tmp/opt/trinity/share/services/kfile_tiff.desktop
-debian/tmp/opt/trinity/share/services/kfile_xbm.desktop
-debian/tmp/opt/trinity/share/services/kfile_xpm.desktop
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kdegraphics-tdefile-plugins-trinity.install b/ubuntu/precise/kdegraphics.automake/debian/kdegraphics-tdefile-plugins-trinity.install
new file mode 100644
index 000000000..02ffc23c6
--- /dev/null
+++ b/ubuntu/precise/kdegraphics.automake/debian/kdegraphics-tdefile-plugins-trinity.install
@@ -0,0 +1,57 @@
+debian/tmp/opt/trinity/lib/trinity/gsthumbnail.la
+debian/tmp/opt/trinity/lib/trinity/gsthumbnail.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_bmp.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_bmp.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_dds.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_dds.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_dvi.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_dvi.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_exr.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_exr.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_gif.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_gif.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_ico.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_ico.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_jpeg.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_jpeg.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_pcx.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_pcx.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_pdf.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_pdf.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_png.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_png.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_pnm.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_pnm.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_ps.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_ps.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_raw.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_raw.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_rgb.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_rgb.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_tga.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_tga.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_tiff.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_tiff.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_xbm.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_xbm.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_xpm.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_xpm.so
+debian/tmp/opt/trinity/share/services/gsthumbnail.desktop
+debian/tmp/opt/trinity/share/services/tdefile_bmp.desktop
+debian/tmp/opt/trinity/share/services/tdefile_dds.desktop
+debian/tmp/opt/trinity/share/services/tdefile_dvi.desktop
+debian/tmp/opt/trinity/share/services/tdefile_exr.desktop
+debian/tmp/opt/trinity/share/services/tdefile_gif.desktop
+debian/tmp/opt/trinity/share/services/tdefile_ico.desktop
+debian/tmp/opt/trinity/share/services/tdefile_jpeg.desktop
+debian/tmp/opt/trinity/share/services/tdefile_pcx.desktop
+debian/tmp/opt/trinity/share/services/tdefile_pdf.desktop
+debian/tmp/opt/trinity/share/services/tdefile_png.desktop
+debian/tmp/opt/trinity/share/services/tdefile_pnm.desktop
+debian/tmp/opt/trinity/share/services/tdefile_ps.desktop
+debian/tmp/opt/trinity/share/services/tdefile_raw.desktop
+debian/tmp/opt/trinity/share/services/tdefile_rgb.desktop
+debian/tmp/opt/trinity/share/services/tdefile_tga.desktop
+debian/tmp/opt/trinity/share/services/tdefile_tiff.desktop
+debian/tmp/opt/trinity/share/services/tdefile_xbm.desktop
+debian/tmp/opt/trinity/share/services/tdefile_xpm.desktop
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kghostview-trinity.install b/ubuntu/precise/kdegraphics.automake/debian/kghostview-trinity.install
index 59cf101cf..d19c5d2c9 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kghostview-trinity.install
+++ b/ubuntu/precise/kdegraphics.automake/debian/kghostview-trinity.install
@@ -4,8 +4,8 @@ debian/tmp/opt/trinity/lib/trinity/libkghostviewpart.so
 debian/tmp/opt/trinity/lib/libkghostviewlib.so.0
 debian/tmp/opt/trinity/lib/libkghostviewlib.so.0.0.0
 debian/tmp/opt/trinity/share/applications/tde/kghostview.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/kghostview.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/update-to-xt-names.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kghostview.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/update-to-xt-names.pl
 debian/tmp/opt/trinity/share/apps/kghostview/kghostviewui.rc
 debian/tmp/opt/trinity/share/apps/kghostview/kgv_part.rc
 debian/tmp/opt/trinity/share/apps/kghostview/pdf_sec.ps
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kview-trinity.install b/ubuntu/precise/kdegraphics.automake/debian/kview-trinity.install
index dac3ba875..6a8052e6d 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kview-trinity.install
+++ b/ubuntu/precise/kdegraphics.automake/debian/kview-trinity.install
@@ -52,10 +52,10 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kview.png
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kviewcanvasconfig.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kviewgeneralconfig.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kviewpluginsconfig.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kviewviewerpluginsconfig.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewcanvasconfig.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewgeneralconfig.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewpluginsconfig.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewviewerpluginsconfig.desktop
 debian/tmp/opt/trinity/share/services/kviewcanvas.desktop
 debian/tmp/opt/trinity/share/services/kviewviewer.desktop
 debian/tmp/opt/trinity/share/services/photobook.desktop
diff --git a/ubuntu/precise/kdevelop.cmake/debian/kdevelop-trinity.install b/ubuntu/precise/kdevelop.cmake/debian/kdevelop-trinity.install
index 0c92940b2..19bb73577 100644
--- a/ubuntu/precise/kdevelop.cmake/debian/kdevelop-trinity.install
+++ b/ubuntu/precise/kdevelop.cmake/debian/kdevelop-trinity.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/kdevprofileeditor
 debian/tmp/opt/trinity/bin/kdevassistant
 debian/tmp/opt/trinity/bin/kdevprj2kdevelop
 debian/tmp/opt/trinity/bin/kdevelop
-debian/tmp/opt/trinity/lib/kconf_update_bin/kdev-gen-settings-kconf_update
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
 debian/tmp/opt/trinity/share/services
 debian/tmp/opt/trinity/share/servicetypes
 debian/tmp/opt/trinity/lib/trinity
diff --git a/ubuntu/precise/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides b/ubuntu/precise/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
index bf93b96ee..17743dd31 100644
--- a/ubuntu/precise/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
+++ b/ubuntu/precise/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
@@ -1,5 +1,5 @@
 pytdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB]
-pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell
+pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop tdecmshell
 pytdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
 pytdeextensions: desktop-entry-invalid-category X-TDE-settings-system ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
 pytdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/debian/changelog b/ubuntu/precise/metapackages/kubuntu-meta/debian/changelog
index 6c963f3b9..7a4ef34be 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/changelog
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/changelog
@@ -2283,14 +2283,14 @@ kubuntu-meta (0.56) dapper; urgency=low
     - Turn off HTTP caching while fetching seed lists.
 
   * Refreshed dependencies
-  * Added knetworkconf to desktop-hppa
+  * Added knetwortdeconf to desktop-hppa
   * Added krita to desktop-hppa
   * Added tdewalletmanager to desktop-hppa
   * Added knotes to desktop-hppa
   * Added kdepim-kio-plugins to desktop-hppa
   * Added kdepim-wizards to desktop-hppa
   * Added ark to desktop-hppa
-  * Added kdemultimedia-kfile-plugins to desktop-hppa
+  * Added kdemultimedia-tdefile-plugins to desktop-hppa
   * Added karm to desktop-hppa
   * Added kaffeine-gstreamer to desktop-hppa
   * Added konversation to desktop-hppa
@@ -2418,7 +2418,7 @@ kubuntu-meta (0.53) breezy; urgency=low
   * Added kcontrol to desktop-hppa
   * Added gstreamer0.8-vorbis to desktop-hppa
   * Added kwin to desktop-hppa
-  * Added kdeadmin-kfile-plugins to desktop-hppa
+  * Added kdeadmin-tdefile-plugins to desktop-hppa
   * Added usplash to desktop-sparc
   * Added ttf-dejavu to desktop-i386, desktop-amd64, desktop-powerpc,
     desktop-ia64, desktop-sparc, desktop-hppa
@@ -2759,7 +2759,7 @@ kubuntu-meta (0.47) breezy; urgency=low
   * Added alsa-utils to minimal-i386, minimal-amd64, minimal-powerpc,
     minimal-ia64, minimal-sparc, minimal-hppa
   * Added ksvg to desktop-hppa
-  * Added kdegraphics-kfile-plugins to desktop-hppa
+  * Added kdegraphics-tdefile-plugins to desktop-hppa
   * Added laptop-detect to live-i386, live-amd64, live-powerpc, live-
     ia64, live-sparc, live-hppa
   * Added xkeyboard-config to desktop-i386, desktop-amd64, desktop-
@@ -2789,7 +2789,7 @@ kubuntu-meta (0.47) breezy; urgency=low
   * Added krdc to desktop-hppa
   * Added kubuntu-konqueror-shortcuts to desktop-i386, desktop-amd64,
     desktop-powerpc, desktop-ia64, desktop-sparc, desktop-hppa
-  * Added kdenetwork-kfile-plugins to desktop-hppa
+  * Added kdenetwork-tdefile-plugins to desktop-hppa
   * Added ivman to desktop-hppa
   * Added dbus-1-utils to desktop-hppa
   * Added cupsys to desktop-hppa
@@ -3102,7 +3102,7 @@ kubuntu-meta (0.43) breezy; urgency=low
   * Sync update script with ubuntu-meta
   * Add hppa as a port architecture on request of lamont
   * Refreshed dependencies
-  * Added kdegraphics-kfile-plugins to desktop-i386, desktop-amd64,
+  * Added kdegraphics-tdefile-plugins to desktop-i386, desktop-amd64,
     desktop-powerpc, desktop-ia64, desktop-sparc
   * Added konqueror-nsplugins to desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc
@@ -3114,7 +3114,7 @@ kubuntu-meta (0.43) breezy; urgency=low
     desktop-ia64, desktop-sparc
   * Added kwin to desktop-i386, desktop-amd64, desktop-powerpc, desktop-
     ia64, desktop-sparc
-  * Added kdeadmin-kfile-plugins to desktop-i386, desktop-amd64,
+  * Added kdeadmin-tdefile-plugins to desktop-i386, desktop-amd64,
     desktop-powerpc, desktop-ia64, desktop-sparc
   * Added kuser to desktop-i386, desktop-amd64, desktop-powerpc,
     desktop-ia64, desktop-sparc
@@ -3132,7 +3132,7 @@ kubuntu-meta (0.43) breezy; urgency=low
     powerpc, desktop-ia64, desktop-sparc
   * Added ark to desktop-i386, desktop-amd64, desktop-powerpc, desktop-
     ia64, desktop-sparc
-  * Added kdemultimedia-kfile-plugins to desktop-i386, desktop-amd64,
+  * Added kdemultimedia-tdefile-plugins to desktop-i386, desktop-amd64,
     desktop-powerpc, desktop-ia64, desktop-sparc
   * Added readahead-list to desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc
@@ -3178,7 +3178,7 @@ kubuntu-meta (0.43) breezy; urgency=low
     desktop-ia64, desktop-sparc
   * Added kaddressbook to desktop-i386, desktop-amd64, desktop-powerpc,
     desktop-ia64, desktop-sparc
-  * Added kdenetwork-kfile-plugins to desktop-i386, desktop-amd64,
+  * Added kdenetwork-tdefile-plugins to desktop-i386, desktop-amd64,
     desktop-powerpc, desktop-ia64, desktop-sparc
   * Added kppp to desktop-i386, desktop-amd64, desktop-powerpc, desktop-
     ia64, desktop-sparc
@@ -3270,7 +3270,7 @@ kubuntu-meta (0.40) hoary; urgency=low
 kubuntu-meta (0.39) hoary; urgency=low
 
   * Refreshed dependencies
-  * Added knetworkconf to desktop-sparc
+  * Added knetwortdeconf to desktop-sparc
   * Added konq-plugins to desktop-i386, desktop-amd64, desktop-powerpc,
     desktop-ia64, desktop-sparc
   * Added openoffice.org-kde to desktop-sparc
@@ -3303,7 +3303,7 @@ kubuntu-meta (0.37) hoary; urgency=low
 
   * Refreshed dependencies
   * Added kdm to desktop-sparc
-  * Added knetworkconf to desktop-i386, desktop-amd64, desktop-powerpc,
+  * Added knetwortdeconf to desktop-i386, desktop-amd64, desktop-powerpc,
     desktop-ia64
   * Added konserve to desktop-sparc
   * Added konversation to desktop-sparc
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/debian/control b/ubuntu/precise/metapackages/kubuntu-meta/debian/control
index b10c8b527..769c94396 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/control
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 4), germinate (>= 0.38)
 
 Package: kubuntu-desktop-trinity
 Architecture: any
-Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-kfile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-kfile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, x-ttcidfont-conf, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine
+Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetwortdeconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, x-ttcidfont-conf, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine
 Recommends: kio-apt-trinity, tde-guidance-powermanager-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, desktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepim-kio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, kio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus-trinity, openoffice.org-calc, openoffice.org-impress, openoffice.org-trinity, openoffice.org-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity
 Suggests: apport-gtk, hplip-gui
 Description: Kubuntu desktop system, TDE version
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop b/ubuntu/precise/metapackages/kubuntu-meta/desktop
index 732491954..0ef26f0fd 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop
@@ -147,15 +147,15 @@ We've chosen KDE as our desktop user interface of choice
 == kdeadmin-trinity ==
 
  * kcron-trinity
- * kdeadmin-kfile-plugins-trinity
- * knetworkconf-trinity
+ * kdeadmin-tdefile-plugins-trinity
+ * knetwortdeconf-trinity
 
 == kdegraphics-trinity ==
 
  * (gwenview-trinity)
  * (kipi-plugins-trinity) [i386 amd64]		# set of plugins for digikam and gwenview
  * (kamera-trinity)
- * kdegraphics-kfile-plugins-trinity
+ * kdegraphics-tdefile-plugins-trinity
  * (kooka-trinity)
  * kpdf-trinity
  * ksnapshot-trinity
@@ -165,7 +165,7 @@ We've chosen KDE as our desktop user interface of choice
 == kdemultimedia-trinity ==
 
  * libarts1-akode-trinity
- * kdemultimedia-kfile-plugins-trinity
+ * kdemultimedia-tdefile-plugins-trinity
  * kdemultimedia-kio-plugins-trinity
  * kmix-trinity
 
@@ -178,7 +178,7 @@ We've chosen KDE as our desktop user interface of choice
  * (kppp-trinity)
  * (krdc-trinity)
  * (krfb-trinity)
- * kdenetwork-kfile-plugins-trinity
+ * kdenetwork-tdefile-plugins-trinity
 
 == kdepim-trinity ==
 
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64
index b9a6a4c6e..38ab45844 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64
@@ -26,13 +26,13 @@ kcontrol-trinity
 kcron-trinity
 tde-guidance-trinity
 tde-style-qtcurve-trinity
-tdeadmin-kfile-plugins-trinity
+tdeadmin-tdefile-plugins-trinity
 tdebase-kio-plugins-trinity
-tdegraphics-kfile-plugins-trinity
-tdemultimedia-kfile-plugins-trinity
+tdegraphics-tdefile-plugins-trinity
+tdemultimedia-tdefile-plugins-trinity
 tdemultimedia-kio-plugins-trinity
 tdenetwork-filesharing-trinity
-tdenetwork-kfile-plugins-trinity
+tdenetwork-tdefile-plugins-trinity
 kdepasswd-trinity
 tdeprint-trinity
 kdesktop-trinity
@@ -44,7 +44,7 @@ kicker-trinity
 kio-locate-trinity
 kmenuedit-trinity
 kmix-trinity
-knetworkconf-trinity
+knetwortdeconf-trinity
 konq-plugins-trinity
 konsole-trinity
 kpdf-trinity
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa b/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa
index 4e0775054..2eb22465c 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa
@@ -23,13 +23,13 @@ kcron
 kde-guidance
 kde-style-qtcurve
 kde-systemsettings
-kdeadmin-kfile-plugins
+kdeadmin-tdefile-plugins
 kdebase-kio-plugins
-kdegraphics-kfile-plugins
-kdemultimedia-kfile-plugins
+kdegraphics-tdefile-plugins
+kdemultimedia-tdefile-plugins
 kdemultimedia-kio-plugins
 kdenetwork-filesharing
-kdenetwork-kfile-plugins
+kdenetwork-tdefile-plugins
 kdepasswd
 kdeprint
 kdesktop
@@ -42,7 +42,7 @@ kio-apt
 kio-locate
 kmenuedit
 kmix
-knetworkconf
+knetwortdeconf
 konq-plugins
 konsole
 kpdf
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386
index 2c8b6b5f3..933f1c6a2 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386
@@ -27,13 +27,13 @@ kcontrol-trinity
 kcron-trinity
 tde-guidance-trinity
 tde-style-qtcurve-trinity
-tdeadmin-kfile-plugins-trinity
+tdeadmin-tdefile-plugins-trinity
 tdebase-kio-plugins-trinity
-tdegraphics-kfile-plugins-trinity
-tdemultimedia-kfile-plugins-trinity
+tdegraphics-tdefile-plugins-trinity
+tdemultimedia-tdefile-plugins-trinity
 tdemultimedia-kio-plugins-trinity
 tdenetwork-filesharing-trinity
-tdenetwork-kfile-plugins-trinity
+tdenetwork-tdefile-plugins-trinity
 kdepasswd-trinity
 tdeprint-trinity
 kdesktop-trinity
@@ -45,7 +45,7 @@ kicker-trinity
 kio-locate-trinity
 kmenuedit-trinity
 kmix-trinity
-knetworkconf-trinity
+knetwortdeconf-trinity
 konq-plugins-trinity
 konsole-trinity
 kpdf-trinity
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64
index b8458e4b6..df57ea09e 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64
@@ -26,13 +26,13 @@ kcron
 kde-guidance
 kde-style-qtcurve
 kde-systemsettings
-kdeadmin-kfile-plugins
+kdeadmin-tdefile-plugins
 kdebase-kio-plugins
-kdegraphics-kfile-plugins
-kdemultimedia-kfile-plugins
+kdegraphics-tdefile-plugins
+kdemultimedia-tdefile-plugins
 kdemultimedia-kio-plugins
 kdenetwork-filesharing
-kdenetwork-kfile-plugins
+kdenetwork-tdefile-plugins
 kdepasswd
 kdeprint
 kdesktop
@@ -45,7 +45,7 @@ kio-apt
 kio-locate
 kmenuedit
 kmix
-knetworkconf
+knetwortdeconf
 konq-plugins
 konsole
 kpdf
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia b/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia
index 0b09fc611..b754eea75 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia
@@ -26,13 +26,13 @@ kcontrol-trinity
 kcron-trinity
 tde-guidance-trinity
 tde-style-qtcurve-trinity
-tdeadmin-kfile-plugins-trinity
+tdeadmin-tdefile-plugins-trinity
 tdebase-kio-plugins-trinity
-tdegraphics-kfile-plugins-trinity
-tdemultimedia-kfile-plugins-trinity
+tdegraphics-tdefile-plugins-trinity
+tdemultimedia-tdefile-plugins-trinity
 tdemultimedia-kio-plugins-trinity
 tdenetwork-filesharing-trinity
-tdenetwork-kfile-plugins-trinity
+tdenetwork-tdefile-plugins-trinity
 kdepasswd-trinity
 tdeprint-trinity
 kdesktop-trinity
@@ -44,7 +44,7 @@ kicker-trinity
 kio-locate-trinity
 kmenuedit-trinity
 kmix-trinity
-knetworkconf-trinity
+knetwortdeconf-trinity
 konq-plugins-trinity
 konsole-trinity
 kpdf-trinity
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc b/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc
index cbaae6a43..d1ac9dd36 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc
@@ -23,13 +23,13 @@ kcron
 kde-guidance
 kde-style-qtcurve
 kde-systemsettings
-kdeadmin-kfile-plugins
+kdeadmin-tdefile-plugins
 kdebase-kio-plugins
-kdegraphics-kfile-plugins
-kdemultimedia-kfile-plugins
+kdegraphics-tdefile-plugins
+kdemultimedia-tdefile-plugins
 kdemultimedia-kio-plugins
 kdenetwork-filesharing
-kdenetwork-kfile-plugins
+kdenetwork-tdefile-plugins
 kdepasswd
 kdeprint
 kdesktop
@@ -42,7 +42,7 @@ kio-apt
 kio-locate
 kmenuedit
 kmix
-knetworkconf
+knetwortdeconf
 konq-plugins
 konsole
 kpdf
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc b/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc
index 4e0775054..2eb22465c 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc
@@ -23,13 +23,13 @@ kcron
 kde-guidance
 kde-style-qtcurve
 kde-systemsettings
-kdeadmin-kfile-plugins
+kdeadmin-tdefile-plugins
 kdebase-kio-plugins
-kdegraphics-kfile-plugins
-kdemultimedia-kfile-plugins
+kdegraphics-tdefile-plugins
+kdemultimedia-tdefile-plugins
 kdemultimedia-kio-plugins
 kdenetwork-filesharing
-kdenetwork-kfile-plugins
+kdenetwork-tdefile-plugins
 kdepasswd
 kdeprint
 kdesktop
@@ -42,7 +42,7 @@ kio-apt
 kio-locate
 kmenuedit
 kmix
-knetworkconf
+knetwortdeconf
 konq-plugins
 konsole
 kpdf
diff --git a/ubuntu/precise/metapackages/trinity-livecd/debian/control b/ubuntu/precise/metapackages/trinity-livecd/debian/control
index 2805f756f..26821839e 100644
--- a/ubuntu/precise/metapackages/trinity-livecd/debian/control
+++ b/ubuntu/precise/metapackages/trinity-livecd/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5)
 
 Package: trinity-livecd
 Architecture: all
-Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-kfile-plugins-trinity, tdeadmin-kfile-plugins-trinity, tdegames-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdenetwork-kfile-plugins-trinity, tdepim-kfile-plugins-trinity, tdesdk-kfile-plugins-trinity, kdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring
+Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, kdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring
 Recommends:
  kpresenter-trinity, kspread-trinity, kword-trinity,
  tde-i18n-cs-trinity, tde-i18n-de-trinity, tde-i18n-es-trinity, tde-i18n-fr-trinity, tde-i18n-it-trinity, tde-i18n-ru-trinity,
diff --git a/ubuntu/precise/tdeaddons/debian/changelog b/ubuntu/precise/tdeaddons/debian/changelog
index 8094804b6..95f287317 100644
--- a/ubuntu/precise/tdeaddons/debian/changelog
+++ b/ubuntu/precise/tdeaddons/debian/changelog
@@ -592,7 +592,7 @@ tdeaddons (4:3.3.2-1) unstable; urgency=low
 tdeaddons (4:3.3.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.
-  * Patched .lnk kfile plugin and /usr/bin/lnkforward so that they can
+  * Patched .lnk tdefile plugin and /usr/bin/lnkforward so that they can
     distinguish between drive and path information.  Previously, lnkforward
     would lose path information altogether (and thus fail to work).
   * Removed the rellinks plugin, which is terribly broken at this stage
@@ -668,7 +668,7 @@ tdeaddons (4:3.2.0-1) unstable; urgency=low
   * New binary packages kaddressbook-plugins, kontact-plugins, ksig and
     vimpart.
   * Note that the rename dialog plugins have been merged into the
-    tdeaddons-kfile-plugins package.
+    tdeaddons-tdefile-plugins package.
 
  -- Ben Burton <bab@debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
 
diff --git a/ubuntu/precise/tdeaddons/debian/control b/ubuntu/precise/tdeaddons/debian/control
index 52e496189..fc3e0e96b 100644
--- a/ubuntu/precise/tdeaddons/debian/control
+++ b/ubuntu/precise/tdeaddons/debian/control
@@ -12,7 +12,7 @@ Architecture: all
 Section: tde
 Replaces: kdeaddons-trinity (<< 4:14.0.0)
 Breaks: kdeaddons-trinity (<< 4:14.0.0)
-Depends: atlantikdesigner-trinity (>= ${Source-Version}), kaddressbook-plugins-trinity (>= ${Source-Version}), kate-plugins-trinity (>= ${Source-Version}), tdeaddons-kfile-plugins-trinity (>= ${Source-Version}), kicker-applets-trinity (>= ${Source-Version}), konq-plugins-trinity (>= ${Source-Version}), ksig-trinity (>= ${Source-Version}), noatun-plugins-trinity (>= ${Source-Version})
+Depends: atlantikdesigner-trinity (>= ${Source-Version}), kaddressbook-plugins-trinity (>= ${Source-Version}), kate-plugins-trinity (>= ${Source-Version}), tdeaddons-tdefile-plugins-trinity (>= ${Source-Version}), kicker-applets-trinity (>= ${Source-Version}), konq-plugins-trinity (>= ${Source-Version}), ksig-trinity (>= ${Source-Version}), noatun-plugins-trinity (>= ${Source-Version})
 Suggests: tdeaddons-trinity-doc-html
 Description: add-on plugins and applets provided with Trinity
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -102,11 +102,11 @@ Description: plugins for Kate, the KDE Advanced Text Editor
  This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
-Package: tdeaddons-kfile-plugins-trinity
+Package: tdeaddons-tdefile-plugins-trinity
 Architecture: any
 Section: tde
-Replaces: kdeaddons-kfile-plugins-trinity (<< 4:14.0.0)
-Breaks: kdeaddons-kfile-plugins-trinity (<< 4:14.0.0)
+Replaces: kdeaddons-tdefile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdeaddons-tdefile-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Provides: renamedlg-plugins-trinity
 Description: Trinity file dialog plugins for text files and folders
diff --git a/ubuntu/precise/tdeaddons/debian/control.in b/ubuntu/precise/tdeaddons/debian/control.in
index 86eedbb08..9b7f2b6f7 100644
--- a/ubuntu/precise/tdeaddons/debian/control.in
+++ b/ubuntu/precise/tdeaddons/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdeaddons
 Architecture: all
 Section: tde
-Depends: atlantikdesigner (>= ${Source-Version}), kaddressbook-plugins (>= ${Source-Version}), kate-plugins (>= ${Source-Version}), tdeaddons-kfile-plugins (>= ${Source-Version}), kicker-applets (>= ${Source-Version}), knewsticker-scripts (>= ${Source-Version}), konq-plugins (>= ${Source-Version}), ksig (>= ${Source-Version}), noatun-plugins (>= ${Source-Version})
+Depends: atlantikdesigner (>= ${Source-Version}), kaddressbook-plugins (>= ${Source-Version}), kate-plugins (>= ${Source-Version}), tdeaddons-tdefile-plugins (>= ${Source-Version}), kicker-applets (>= ${Source-Version}), knewsticker-scripts (>= ${Source-Version}), konq-plugins (>= ${Source-Version}), ksig (>= ${Source-Version}), noatun-plugins (>= ${Source-Version})
 Suggests: tdeaddons-doc-html
 Description: add-on plugins and applets provided with KDE
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -92,7 +92,7 @@ Description: plugins for Kate, the KDE Advanced Text Editor
  This package is part of KDE, as a component of the KDE addons module.
  See the 'kde' and 'tdeaddons' packages for more information.
 
-Package: tdeaddons-kfile-plugins
+Package: tdeaddons-tdefile-plugins
 Architecture: any
 Section: tde
 Depends: ${shlibs:Depends}
diff --git a/ubuntu/precise/tdeaddons/debian/man/lnkforward-trinity.1 b/ubuntu/precise/tdeaddons/debian/man/lnkforward-trinity.1
index ea3010dd8..c3ebeb34d 100644
--- a/ubuntu/precise/tdeaddons/debian/man/lnkforward-trinity.1
+++ b/ubuntu/precise/tdeaddons/debian/man/lnkforward-trinity.1
@@ -34,7 +34,7 @@ file on the local filesystem, it must be given in the form
 Drive mappings must be supplied (via \-\-map) for any Windows drive
 referred to in the .lnk file.  See the OPTIONS section below for details.
 .PP
-This utility is used by the .lnk kfile plugin, and is
+This utility is used by the .lnk tdefile plugin, and is
 part of the official KDE add-ons module.
 .SH OPTIONS
 Below are the lnkforward-specific options.
diff --git a/ubuntu/precise/tdeaddons/debian/rules b/ubuntu/precise/tdeaddons/debian/rules
index e2158a506..8e8bb53a9 100755
--- a/ubuntu/precise/tdeaddons/debian/rules
+++ b/ubuntu/precise/tdeaddons/debian/rules
@@ -31,9 +31,9 @@ binary-install/konq-plugins-trinity::
 #		debian/konq-plugins-trinity/opt/trinity/share/man/man1/orient.py.1; \
 #	rm -rf debian/konq-plugins-trinity/opt/trinity/share/man/py;
 
-binary-install/tdeaddons-kfile-plugins-trinity::
+binary-install/tdeaddons-tdefile-plugins-trinity::
 	install -p -D -m644 renamedlgplugins/README \
-		debian/tdeaddons-kfile-plugins-trinity/opt/trinity/share/doc/tdeaddons-kfile-plugins/README.renamedlgplugins
+		debian/tdeaddons-tdefile-plugins-trinity/opt/trinity/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins
 
 binary-install/knewsticker-scripts-trinity::
 	chmod 755 debian/knewsticker-scripts-trinity/opt/trinity/share/apps/knewsticker/scripts/*.pl
diff --git a/ubuntu/precise/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.install b/ubuntu/precise/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.install
deleted file mode 100644
index 0350b2f3e..000000000
--- a/ubuntu/precise/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.install
+++ /dev/null
@@ -1,31 +0,0 @@
-debian/tmp/opt/trinity/bin/lnkforward
-debian/tmp/opt/trinity/lib/trinity/kfile_cert.la
-debian/tmp/opt/trinity/lib/trinity/kfile_cert.so
-debian/tmp/opt/trinity/lib/trinity/kfile_desktop.la
-debian/tmp/opt/trinity/lib/trinity/kfile_desktop.so
-debian/tmp/opt/trinity/lib/trinity/kfile_folder.la
-debian/tmp/opt/trinity/lib/trinity/kfile_folder.so
-debian/tmp/opt/trinity/lib/trinity/kfile_html.la
-debian/tmp/opt/trinity/lib/trinity/kfile_html.so
-debian/tmp/opt/trinity/lib/trinity/kfile_lnk.la
-debian/tmp/opt/trinity/lib/trinity/kfile_lnk.so
-debian/tmp/opt/trinity/lib/trinity/kfile_mhtml.la
-debian/tmp/opt/trinity/lib/trinity/kfile_mhtml.so
-debian/tmp/opt/trinity/lib/trinity/kfile_txt.la
-debian/tmp/opt/trinity/lib/trinity/kfile_txt.so
-debian/tmp/opt/trinity/lib/trinity/librenaudioplugin.la
-debian/tmp/opt/trinity/lib/trinity/librenaudioplugin.so
-debian/tmp/opt/trinity/lib/trinity/librenimageplugin.la
-debian/tmp/opt/trinity/lib/trinity/librenimageplugin.so
-debian/tmp/opt/trinity/share/applnk/.hidden/lnkforward.desktop
-debian/tmp/opt/trinity/share/mimelnk/application/x-win-lnk.desktop
-debian/tmp/opt/trinity/share/services/kfile_cert.desktop
-debian/tmp/opt/trinity/share/services/kfile_desktop.desktop
-debian/tmp/opt/trinity/share/services/kfile_folder.desktop
-debian/tmp/opt/trinity/share/services/kfile_html.desktop
-debian/tmp/opt/trinity/share/services/kfile_lnk.desktop
-debian/tmp/opt/trinity/share/services/kfile_mhtml.desktop
-debian/tmp/opt/trinity/share/services/kfile_txt.desktop
-debian/tmp/opt/trinity/share/services/renaudiodlg.desktop
-debian/tmp/opt/trinity/share/services/renimagedlg.desktop
-kfile-plugins/lnk/README /opt/trinity/share/doc/tdeaddons-kfile-plugins/lnk
diff --git a/ubuntu/precise/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install b/ubuntu/precise/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
new file mode 100644
index 000000000..70f735948
--- /dev/null
+++ b/ubuntu/precise/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
@@ -0,0 +1,31 @@
+debian/tmp/opt/trinity/bin/lnkforward
+debian/tmp/opt/trinity/lib/trinity/tdefile_cert.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_cert.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_desktop.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_desktop.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_folder.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_folder.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_html.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_html.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_lnk.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_lnk.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_mhtml.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_mhtml.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_txt.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_txt.so
+debian/tmp/opt/trinity/lib/trinity/librenaudioplugin.la
+debian/tmp/opt/trinity/lib/trinity/librenaudioplugin.so
+debian/tmp/opt/trinity/lib/trinity/librenimageplugin.la
+debian/tmp/opt/trinity/lib/trinity/librenimageplugin.so
+debian/tmp/opt/trinity/share/applnk/.hidden/lnkforward.desktop
+debian/tmp/opt/trinity/share/mimelnk/application/x-win-lnk.desktop
+debian/tmp/opt/trinity/share/services/tdefile_cert.desktop
+debian/tmp/opt/trinity/share/services/tdefile_desktop.desktop
+debian/tmp/opt/trinity/share/services/tdefile_folder.desktop
+debian/tmp/opt/trinity/share/services/tdefile_html.desktop
+debian/tmp/opt/trinity/share/services/tdefile_lnk.desktop
+debian/tmp/opt/trinity/share/services/tdefile_mhtml.desktop
+debian/tmp/opt/trinity/share/services/tdefile_txt.desktop
+debian/tmp/opt/trinity/share/services/renaudiodlg.desktop
+debian/tmp/opt/trinity/share/services/renimagedlg.desktop
+tdefile-plugins/lnk/README /opt/trinity/share/doc/tdeaddons-tdefile-plugins/lnk
diff --git a/ubuntu/precise/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.manpages b/ubuntu/precise/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages
index eda9949fb..eda9949fb 100644
--- a/ubuntu/precise/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.manpages
+++ b/ubuntu/precise/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages
diff --git a/ubuntu/precise/tdeadmin/debian/changelog b/ubuntu/precise/tdeadmin/debian/changelog
index 4fca9af79..2a7c44e06 100644
--- a/ubuntu/precise/tdeadmin/debian/changelog
+++ b/ubuntu/precise/tdeadmin/debian/changelog
@@ -44,9 +44,9 @@ tdeadmin (4:3.5.9-0ubuntu5) hardy; urgency=low
 tdeadmin (4:3.5.9-0ubuntu4) hardy; urgency=low
 
   * Added kubuntu_13_no_samba_tweak.diff.
-    Knetworkconf reads smb.conf parameters but doesn't write them
+    Knetwortdeconf reads smb.conf parameters but doesn't write them
     causing the parameters to be removed from the config file.
-    Knetworkconf doesn't allow changing those, so there is no reason
+    Knetwortdeconf doesn't allow changing those, so there is no reason
     to let it read them.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 03 Apr 2008 15:30:44 +0200
@@ -60,7 +60,7 @@ tdeadmin (4:3.5.9-0ubuntu3) hardy; urgency=low
 
 tdeadmin (4:3.5.9-0ubuntu2) hardy; urgency=low
 
-  * Add kubuntu_11_knetworkconf_icons.diff from Adam Spain, 
+  * Add kubuntu_11_knetwortdeconf_icons.diff from Adam Spain, 
     closes LP: #93878  "low quality icons"
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 03 Mar 2008 14:20:34 +0000
@@ -81,8 +81,8 @@ tdeadmin (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining changes
    - kubuntu_08_kpackage_sudo.diff, sudo support
-   - kubuntu_10_knetworkconf_localhost.diff, LP #66813
-  * Add kubuntu_11_knetworkconf_8.04.diff for 8.04 detection in knetworkconf
+   - kubuntu_10_knetwortdeconf_localhost.diff, LP #66813
+  * Add kubuntu_11_knetwortdeconf_8.04.diff for 8.04 detection in knetwortdeconf
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:38 +0000
 
@@ -135,7 +135,7 @@ tdeadmin (4:3.5.6-2) unstable; urgency=low
 
   +++ Changes by Modestas Vainius:
 
-  * knetworkconf RC bug fix: recognize allow-* statements in
+  * knetwortdeconf RC bug fix: recognize allow-* statements in
     /etc/network/interfaces as stanzas, not as ordinary options. This
     misrecognition led to corruption of the interfaces file in case allow-*
     stanza followed the iface stanza that new options were added to. Patch
@@ -179,7 +179,7 @@ tdeadmin (4:3.5.5-2) unstable; urgency=low
 tdeadmin (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
-  * Remove kubuntu_12_knetworkconf_feisty.diff, applied upstream
+  * Remove kubuntu_12_knetwortdeconf_feisty.diff, applied upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:29 +0000
 
@@ -192,8 +192,8 @@ tdeadmin (4:3.5.5-1ubuntu4) feisty; urgency=low
 
 tdeadmin (4:3.5.5-1ubuntu3) feisty; urgency=low
 
-  * Added kubuntu_12_knetworkconf_feisty.diff to properly autodetect
-    feisty as knetworkconf backend.
+  * Added kubuntu_12_knetwortdeconf_feisty.diff to properly autodetect
+    feisty as knetwortdeconf backend.
 
  -- Luka Renko <lure@ubuntu.com>  Sun, 10 Dec 2006 16:16:12 +0100
 
@@ -235,7 +235,7 @@ tdeadmin (4:3.5.4-1) unstable; urgency=low
 
 tdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low
 
-  * kubuntu_10_knetworkconf_localhost.diff added, hostname should not 
+  * kubuntu_10_knetwortdeconf_localhost.diff added, hostname should not 
     be appended as alias to localhost in /etc/hosts
     Closes Malone #66813
 
@@ -244,7 +244,7 @@ tdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low
 tdeadmin (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
-  * kubuntu_09_networkconf_edgy.diff removed, merged upstream
+  * kubuntu_09_networtdeconf_edgy.diff removed, merged upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:07 +0000
 
@@ -257,7 +257,7 @@ tdeadmin (4:3.5.4-0ubuntu3) edgy; urgency=low
 
 tdeadmin (4:3.5.4-0ubuntu2) edgy; urgency=low
 
-  * Add kubuntu_09_networkconf_edgy.diff to support Edgy in knetworkconf
+  * Add kubuntu_09_networtdeconf_edgy.diff to support Edgy in knetwortdeconf
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  7 Aug 2006 09:08:39 -0400
 
@@ -315,7 +315,7 @@ tdeadmin (4:3.5.1-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Drop system-tools-backends.pc from knetworkconf, since it conflicts with
+  * Drop system-tools-backends.pc from knetwortdeconf, since it conflicts with
     gnome-system-tools. (Closes: #353321)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 19 Feb 2006 14:30:28 -0500
@@ -416,9 +416,9 @@ tdeadmin (4:3.5.1-0ubuntu1) dapper; urgency=low
 
 tdeadmin (4:3.5.0-0ubuntu2) dapper; urgency=low
 
-  * Add kubuntu_01_knetworkconf_branch_fixes.diff fixes
-    - http://bugzilla.ubuntu.com/9871 knetworkconf doesn't save gateway
-    - http://bugzilla.ubuntu.com/16921 knetworkconf too big for 1024x768
+  * Add kubuntu_01_knetwortdeconf_branch_fixes.diff fixes
+    - http://bugzilla.ubuntu.com/9871 knetwortdeconf doesn't save gateway
+    - http://bugzilla.ubuntu.com/16921 knetwortdeconf too big for 1024x768
     - Ensure changes are applied when clicking OK and don't leave zombie
     processes around
 
@@ -449,7 +449,7 @@ tdeadmin (4:3.5.0-2) alioth; urgency=low
 
   +++ Changes by Josh Metzler:
 
-  * Create the new knetworkconf package.
+  * Create the new knetwortdeconf package.
 
   +++ Changes by Christopher Martin:
 
diff --git a/ubuntu/precise/tdeadmin/debian/control b/ubuntu/precise/tdeadmin/debian/control
index ec538087d..0042d0d8d 100644
--- a/ubuntu/precise/tdeadmin/debian/control
+++ b/ubuntu/precise/tdeadmin/debian/control
@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdeadmin-trinity (<< 4:14.0.0)
 Breaks: kdeadmin-trinity (<< 4:14.0.0)
-Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-kfile-plugins-trinity (>= ${Source-Version}), knetworkconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version})
+Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-tdefile-plugins-trinity (>= ${Source-Version}), knetwortdeconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version})
 Recommends: lilo-config-trinity (>= ${Source-Version})
 Suggests: tdeadmin-trinity-doc-html (>= ${Source-Version})
 Description: system administration tools from the official Trinity release
@@ -79,11 +79,11 @@ Description: a Trinity tape backup tool
  This package is part of Trinity, as a component of the KDE administration module.
  See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
-Package: tdeadmin-kfile-plugins-trinity
+Package: tdeadmin-tdefile-plugins-trinity
 Section: tde
 Architecture: any
-Replaces: kdeadmin-kfile-plugins-trinity (<< 4:14.0.0)
-Breaks: kdeadmin-kfile-plugins-trinity (<< 4:14.0.0)
+Replaces: kdeadmin-tdefile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdeadmin-tdefile-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Description: Trinity file metainfo plugins for deb and rpm files
  File metainfo plugins for deb and rpm package files.
@@ -91,11 +91,11 @@ Description: Trinity file metainfo plugins for deb and rpm files
  This package is part of Trinity, as a component of the KDE administration module.
  See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
-Package: knetworkconf-trinity
+Package: knetwortdeconf-trinity
 Section: tde
 Architecture: any
-Replaces: knetworkconf-trinity (<< 4:14.0.0)
-Breaks: knetworkconf-trinity (<< 4:14.0.0)
+Replaces: knetwortdeconf-trinity (<< 4:14.0.0)
+Breaks: knetwortdeconf-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Description: Trinity network configuration tool
  This is a KDE control center module to configure TCP/IP settings.  It
diff --git a/ubuntu/precise/tdeadmin/debian/control.in b/ubuntu/precise/tdeadmin/debian/control.in
index 59b842cd2..b56d4e54c 100644
--- a/ubuntu/precise/tdeadmin/debian/control.in
+++ b/ubuntu/precise/tdeadmin/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdeadmin
 Section: tde
 Architecture: all
-Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-kfile-plugins (>= ${Source-Version}), knetworkconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version})
+Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-tdefile-plugins (>= ${Source-Version}), knetwortdeconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version})
 Recommends: lilo-config (>= ${Source-Version})
 Suggests: tdeadmin-doc-html (>= ${Source-Version})
 Description: system administration tools from the official KDE release
@@ -71,7 +71,7 @@ Description: a KDE tape backup tool
  This package is part of KDE, as a component of the KDE administration module.
  See the 'kde' and 'tdeadmin' packages for more information.
 
-Package: tdeadmin-kfile-plugins
+Package: tdeadmin-tdefile-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -81,7 +81,7 @@ Description: KDE file metainfo plugins for deb and rpm files
  This package is part of KDE, as a component of the KDE administration module.
  See the 'kde' and 'tdeadmin' packages for more information.
 
-Package: knetworkconf
+Package: knetwortdeconf
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
diff --git a/ubuntu/precise/tdeadmin/debian/knetworkconf-trinity.install b/ubuntu/precise/tdeadmin/debian/knetworkconf-trinity.install
deleted file mode 100644
index ec0333100..000000000
--- a/ubuntu/precise/tdeadmin/debian/knetworkconf-trinity.install
+++ /dev/null
@@ -1,56 +0,0 @@
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/01.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/02.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/11.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/03.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/04.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/05.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/06.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/07.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/about1.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/08.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/09.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/common
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/knetworkconf.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/knetworkconf.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/knetworkconf.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_lan.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_traffic_wlan.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/network-conf
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/debug.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/file.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/general.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/network.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/parse.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/platform.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/process.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/replace.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/report.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/service.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/service-list.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/util.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/xml.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/ark.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/debian.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/blackpanther.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/mandriva.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/pld.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/redhat.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/suse.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/turbolinux.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/conectiva.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/fedora.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/openna.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/slackware.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/freebsd.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/gentoo.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/vine.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/rpath.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/kubuntu.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/yoper.png
-debian/tmp/opt/trinity/share/applications/tde/kcm_knetworkconfmodule.desktop
-debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.so
-debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.la
diff --git a/ubuntu/precise/tdeadmin/debian/knetwortdeconf-trinity.install b/ubuntu/precise/tdeadmin/debian/knetwortdeconf-trinity.install
new file mode 100644
index 000000000..dbe573132
--- /dev/null
+++ b/ubuntu/precise/tdeadmin/debian/knetwortdeconf-trinity.install
@@ -0,0 +1,56 @@
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/01.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/02.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/11.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/03.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/04.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/05.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/06.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/07.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/about1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/08.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/09.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/common
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/knetwortdeconf.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/knetwortdeconf.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/knetwortdeconf.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_lan.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_traffic_wlan.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/network-conf
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/debug.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/file.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/general.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/network.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/parse.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/platform.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/process.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/replace.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/report.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/service.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/service-list.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/util.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/xml.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/ark.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/debian.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/blackpanther.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/mandriva.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/pld.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/redhat.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/suse.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/turbolinux.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/conectiva.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/fedora.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/openna.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/slackware.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/freebsd.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/gentoo.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/vine.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/rpath.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/kubuntu.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/yoper.png
+debian/tmp/opt/trinity/share/applications/tde/kcm_knetwortdeconfmodule.desktop
+debian/tmp/opt/trinity/lib/trinity/kcm_knetwortdeconfmodule.so
+debian/tmp/opt/trinity/lib/trinity/kcm_knetwortdeconfmodule.la
diff --git a/ubuntu/precise/tdeadmin/debian/knetworkconf-trinity.postinst b/ubuntu/precise/tdeadmin/debian/knetwortdeconf-trinity.postinst
index bcb12994d..b32c2fb00 100644
--- a/ubuntu/precise/tdeadmin/debian/knetworkconf-trinity.postinst
+++ b/ubuntu/precise/tdeadmin/debian/knetwortdeconf-trinity.postinst
@@ -3,9 +3,9 @@
 case "$1" in
 
     configure)
-	dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetworkconf.png
-	dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetworkconf.png
-	dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetworkconf.png
+	dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetwortdeconf.png
+	dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetwortdeconf.png
+	dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetwortdeconf.png
 	dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png
 	dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_lan.png
 	dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png
diff --git a/ubuntu/precise/tdeadmin/debian/lilo-config-trinity.menu b/ubuntu/precise/tdeadmin/debian/lilo-config-trinity.menu
index c7234f5b2..a0e9dc661 100644
--- a/ubuntu/precise/tdeadmin/debian/lilo-config-trinity.menu
+++ b/ubuntu/precise/tdeadmin/debian/lilo-config-trinity.menu
@@ -3,4 +3,4 @@
 	section="Applications/System/Administration"\
 	hints="TDE"\
 	title="lilo-config"\
-	command="/opt/trinity/bin/tdesu kcmshell lilo"
+	command="/opt/trinity/bin/tdesu tdecmshell lilo"
diff --git a/ubuntu/precise/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf b/ubuntu/precise/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetwortdeconf
index 134b08805..59e475dd7 100644
--- a/ubuntu/precise/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf
+++ b/ubuntu/precise/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetwortdeconf
@@ -1,10 +1,10 @@
-Document: tdeadmin-doc-html-knetworkconf
+Document: tdeadmin-doc-html-knetwortdeconf
 Title: KNetworkConf Handbook
 Author: Sean Wheller, Christoph Eckert
 Abstract: KNetworkConf is a graphical manager for network devices and settings.
 Section: Admin
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/knetworkconf/index.html
-Files: /usr/share/doc/tde/HTML/en/knetworkconf/*.html
+Index: /usr/share/doc/tde/HTML/en/knetwortdeconf/index.html
+Files: /usr/share/doc/tde/HTML/en/knetwortdeconf/*.html
 
diff --git a/ubuntu/precise/tdeadmin/debian/tdeadmin-kfile-plugins-trinity.install b/ubuntu/precise/tdeadmin/debian/tdeadmin-kfile-plugins-trinity.install
deleted file mode 100644
index e3b00f7da..000000000
--- a/ubuntu/precise/tdeadmin/debian/tdeadmin-kfile-plugins-trinity.install
+++ /dev/null
@@ -1,6 +0,0 @@
-debian/tmp/opt/trinity/lib/trinity/kfile_deb.la
-debian/tmp/opt/trinity/lib/trinity/kfile_deb.so
-debian/tmp/opt/trinity/lib/trinity/kfile_rpm.la
-debian/tmp/opt/trinity/lib/trinity/kfile_rpm.so
-debian/tmp/opt/trinity/share/services/kfile_deb.desktop
-debian/tmp/opt/trinity/share/services/kfile_rpm.desktop
diff --git a/ubuntu/precise/tdeadmin/debian/tdeadmin-tdefile-plugins-trinity.install b/ubuntu/precise/tdeadmin/debian/tdeadmin-tdefile-plugins-trinity.install
new file mode 100644
index 000000000..0e6977ee8
--- /dev/null
+++ b/ubuntu/precise/tdeadmin/debian/tdeadmin-tdefile-plugins-trinity.install
@@ -0,0 +1,6 @@
+debian/tmp/opt/trinity/lib/trinity/tdefile_deb.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_deb.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_rpm.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_rpm.so
+debian/tmp/opt/trinity/share/services/tdefile_deb.desktop
+debian/tmp/opt/trinity/share/services/tdefile_rpm.desktop
diff --git a/ubuntu/precise/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/precise/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
index 2fbbb9969..042ffdb21 100644
--- a/ubuntu/precise/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/precise/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/kfile_trash.desktop (that's to remove the trash from the "system applet")
+from tdebase-kio-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/ubuntu/precise/tdebase/debian/changelog b/ubuntu/precise/tdebase/debian/changelog
index 450f25f23..1a4cbbd7d 100644
--- a/ubuntu/precise/tdebase/debian/changelog
+++ b/ubuntu/precise/tdebase/debian/changelog
@@ -228,7 +228,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid8) intrepid; urgency=low
 
 tdebase-trinity (4:3.5.10-0ubuntu3~intrepid5) intrepid; urgency=low
 
-  * Fixed kioslave fish
+  * Fixed tdeioslave fish
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 07 Dec 2008 21:58:00 -0600
 
@@ -1340,7 +1340,7 @@ tdebase (4:3.5.5a.dfsg.1-1ubuntu8) feisty; urgency=low
 
 tdebase (4:3.5.5a.dfsg.1-1ubuntu7) feisty; urgency=low
 
-  * Removed debian/tmp/usr/share/services/kfile_trash.desktop
+  * Removed debian/tmp/usr/share/services/tdefile_trash.desktop
     from tdebase-kio-plugins.install
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 21 Nov 2006 00:01:43 +0200
@@ -3052,7 +3052,7 @@ tdebase (4:3.4.0-0pre4) alioth; urgency=low
 
   * Added README.Debian files for kcontrol and tdebase-kio-plugins, explaining
     how to setup Logitech mouse advanced configuration, and the media
-    kioslave.
+    tdeioslave.
 
   * New tdebase-doc-html package, containing doc-base registered HTML versions
     of application handbooks, for users without Konqueror or KHelpCenter.
@@ -4264,7 +4264,7 @@ tdebase (4:2.1-final-1) unstable; urgency=low
   * Fixes for khelpcenter hangs (Closes: #81683)
   * konq provides ftp-client as well
   * Update /usr/bin/kde2 script
-  * Compile ldap kioslave
+  * Compile ldap tdeioslave
   * Updated tdm init.d script
   * Fix these rendering issues (Closes: #87183)
  
diff --git a/ubuntu/precise/tdebase/debian/control b/ubuntu/precise/tdebase/debian/control
index f91722b8f..a1b152959 100644
--- a/ubuntu/precise/tdebase/debian/control
+++ b/ubuntu/precise/tdebase/debian/control
@@ -190,12 +190,12 @@ Recommends: hal-trinity, pmount, kamera-trinity, tdemultimedia-kio-plugins-trini
 Suggests: khelpcenter-trinity, mtools
 Conflicts: tdebase-libs-trinity (<< 4:3.0.0), mediamanager
 Description: core I/O slaves for KDE
- This package includes the base kioslaves. They include, amongst many
+ This package includes the base tdeioslaves. They include, amongst many
  others, file, http, ftp, smtp, pop and imap.
  .
- It also includes the media kioslave, which handles removable devices,
+ It also includes the media tdeioslave, which handles removable devices,
  and which works best with hal (and therefore udev) and pmount. Media
- also extends the functionality of many other kioslaves. To use this
+ also extends the functionality of many other tdeioslaves. To use this
  service, please make sure that your user is a member of the plugdev
  group.
  .
diff --git a/ubuntu/precise/tdebase/debian/control.in b/ubuntu/precise/tdebase/debian/control.in
index 136828a50..387728c4e 100644
--- a/ubuntu/precise/tdebase/debian/control.in
+++ b/ubuntu/precise/tdebase/debian/control.in
@@ -167,12 +167,12 @@ 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)
 Description: core I/O slaves for KDE
- This package includes the base kioslaves. They include, amongst many
+ This package includes the base tdeioslaves. They include, amongst many
  others, file, http, ftp, smtp, pop and imap.
  .
- It also includes the media kioslave, which handles removable devices,
+ It also includes the media tdeioslave, which handles removable devices,
  and which works best with hal (and therefore udev) and pmount. Media
- also extends the functionality of many other kioslaves. To use this
+ also extends the functionality of many other tdeioslaves. To use this
  service, please make sure that your user is a member of the plugdev
  group.
  .
diff --git a/ubuntu/precise/tdebase/debian/kate-trinity.install b/ubuntu/precise/tdebase/debian/kate-trinity.install
index 74c56bca5..a49c50f54 100644
--- a/ubuntu/precise/tdebase/debian/kate-trinity.install
+++ b/ubuntu/precise/tdebase/debian/kate-trinity.install
@@ -33,7 +33,7 @@ debian/tmp/opt/trinity/share/apps/kate/icons/locolor/22x22/actions/unindent.png
 debian/tmp/opt/trinity/share/apps/kate/kateui.rc
 debian/tmp/opt/trinity/share/apps/kate/pics/sessionchooser.png
 debian/tmp/opt/trinity/share/apps/kate/tips
-debian/tmp/opt/trinity/share/apps/kconf_update/kate-2.4.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kate-2.4.upd
 debian/tmp/opt/trinity/share/apps/kwrite/kwriteui.rc
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/advanced.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/common
diff --git a/ubuntu/precise/tdebase/debian/kcontrol-trinity.install b/ubuntu/precise/tdebase/debian/kcontrol-trinity.install
index f18eaea23..80f1c2f68 100644
--- a/ubuntu/precise/tdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/precise/tdebase/debian/kcontrol-trinity.install
@@ -110,8 +110,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_xinerama.la
 debian/tmp/opt/trinity/lib/trinity/kcm_xinerama.so
 debian/tmp/opt/trinity/lib/trinity/kcontrol.la
 debian/tmp/opt/trinity/lib/trinity/kcontrol.so
-debian/tmp/opt/trinity/lib/trinity/kfile_font.la
-debian/tmp/opt/trinity/lib/trinity/kfile_font.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_font.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_font.so
 debian/tmp/opt/trinity/lib/trinity/kio_fonts.la
 debian/tmp/opt/trinity/lib/trinity/kio_fonts.so
 debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.la
@@ -233,7 +233,7 @@ debian/tmp/opt/trinity/share/mimelnk/fonts/system-folder.desktop
 debian/tmp/opt/trinity/share/services/fonts.protocol
 debian/tmp/opt/trinity/share/services/fontthumbnail.desktop
 debian/tmp/opt/trinity/share/services/kaccess.desktop
-debian/tmp/opt/trinity/share/services/kfile_font.desktop
+debian/tmp/opt/trinity/share/services/tdefile_font.desktop
 debian/tmp/opt/trinity/share/services/kfontviewpart.desktop
 debian/tmp/opt/trinity/share/services/kshorturifilter.desktop
 debian/tmp/opt/trinity/share/services/kuriikwsfilter.desktop
diff --git a/ubuntu/precise/tdebase/debian/khelpcenter-trinity.install b/ubuntu/precise/tdebase/debian/khelpcenter-trinity.install
index 85c02dbd0..163430379 100644
--- a/ubuntu/precise/tdebase/debian/khelpcenter-trinity.install
+++ b/ubuntu/precise/tdebase/debian/khelpcenter-trinity.install
@@ -19,7 +19,7 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/contact.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/faq.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/info.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/kcontrolmodules.desktop
-debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/kioslaves.desktop
+debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/tdeioslaves.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/konqplugins.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/links.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/Manpages/.directory
diff --git a/ubuntu/precise/tdebase/debian/kicker-trinity.install b/ubuntu/precise/tdebase/debian/kicker-trinity.install
index 65f0e8861..8e17b2639 100644
--- a/ubuntu/precise/tdebase/debian/kicker-trinity.install
+++ b/ubuntu/precise/tdebase/debian/kicker-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/appletproxy
 debian/tmp/opt/trinity/bin/extensionproxy
 debian/tmp/opt/trinity/bin/kasbar
 debian/tmp/opt/trinity/bin/kicker
-debian/tmp/opt/trinity/lib/kconf_update_bin/kicker-3.4-reverseLayout
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/kicker-3.4-reverseLayout
 debian/tmp/opt/trinity/lib/trinity/appletproxy.la
 debian/tmp/opt/trinity/lib/trinity/appletproxy.so
 debian/tmp/opt/trinity/lib/trinity/clock_panelapplet.la
@@ -75,17 +75,17 @@ debian/tmp/opt/trinity/share/applnk/.hidden/kicker_config_arrangement.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kicker_config_hiding.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kicker_config_menus.desktop
 debian/tmp/opt/trinity/share/apps/clockapplet/pics/lcd.png
-debian/tmp/opt/trinity/share/apps/kconf_update/kicker-3.1-properSizeSetting.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/kicker-3.5-kconfigXTize.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/kicker-3.5-taskbarEnums.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/kickerrc.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kicker-3.1-properSizeSetting.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kicker-3.5-tdeconfigXTize.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kicker-3.5-taskbarEnums.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kickerrc.upd
 debian/tmp/opt/trinity/share/apps/kicker/applets/clockapplet.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/lockout.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/mediaapplet.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/menuapplet.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/minipagerapplet.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/naughtyapplet.desktop
-debian/tmp/opt/trinity/share/apps/kicker/applets/quicklauncher.desktop
+debian/tmp/opt/trinity/share/apps/kicker/applets/quictdelauncher.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/runapplet.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/systemtrayapplet.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/taskbarapplet.desktop
diff --git a/ubuntu/precise/tdebase/debian/klipper-trinity.install b/ubuntu/precise/tdebase/debian/klipper-trinity.install
index 67026d9b2..862d1d49b 100644
--- a/ubuntu/precise/tdebase/debian/klipper-trinity.install
+++ b/ubuntu/precise/tdebase/debian/klipper-trinity.install
@@ -6,10 +6,10 @@ debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.so
 debian/tmp/opt/trinity/lib/trinity/klipper.so
 debian/tmp/opt/trinity/lib/libtdeinit_klipper.so
 debian/tmp/opt/trinity/share/applications/tde/klipper.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/klipper-1-2.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/klipper-trinity1.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/klipperrc.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/klippershortcuts.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/klipper-1-2.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/klipper-trinity1.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/klipperrc.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/klippershortcuts.upd
 debian/tmp/opt/trinity/share/apps/kicker/applets/klipper.desktop
 debian/tmp/opt/trinity/share/autostart/klipper.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/klipper/common
diff --git a/ubuntu/precise/tdebase/debian/konqueror-trinity.install b/ubuntu/precise/tdebase/debian/konqueror-trinity.install
index 029f25bb6..72260cdb6 100644
--- a/ubuntu/precise/tdebase/debian/konqueror-trinity.install
+++ b/ubuntu/precise/tdebase/debian/konqueror-trinity.install
@@ -54,10 +54,10 @@ debian/tmp/opt/trinity/share/applications/tde/konquerorsu.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/konqfilemgr.desktop
 debian/tmp/opt/trinity/share/applnk/Internet/keditbookmarks.desktop
 debian/tmp/opt/trinity/share/applnk/konqueror.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/kfmclient_3_2.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kfmclient_3_2_update.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/konqsidebartng.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/move_konqsidebartng_entries.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kfmclient_3_2.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kfmclient_3_2_update.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/konqsidebartng.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/move_konqsidebartng_entries.sh
 debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarks-genui.rc
 debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarksui.rc
 debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.desktop
diff --git a/ubuntu/precise/tdebase/debian/konsole-trinity.install b/ubuntu/precise/tdebase/debian/konsole-trinity.install
index 410f512c3..44838760c 100644
--- a/ubuntu/precise/tdebase/debian/konsole-trinity.install
+++ b/ubuntu/precise/tdebase/debian/konsole-trinity.install
@@ -11,8 +11,8 @@ debian/tmp/opt/trinity/lib/libtdeinit_konsole.so
 debian/tmp/opt/trinity/share/applications/tde/konsole.desktop
 debian/tmp/opt/trinity/share/applications/tde/konsolesu.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kcmkonsole.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/konsole.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/schemaStrip.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/konsole.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/schemaStrip.pl
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/konsolehere.desktop
 debian/tmp/opt/trinity/share/apps/konsole/BlackOnLightColor.schema
 debian/tmp/opt/trinity/share/apps/konsole/BlackOnLightYellow.schema
diff --git a/ubuntu/precise/tdebase/debian/ksmserver-trinity.install b/ubuntu/precise/tdebase/debian/ksmserver-trinity.install
index f8c0aa867..de918ea69 100644
--- a/ubuntu/precise/tdebase/debian/ksmserver-trinity.install
+++ b/ubuntu/precise/tdebase/debian/ksmserver-trinity.install
@@ -3,6 +3,6 @@ debian/tmp/opt/trinity/bin/starttde
 debian/tmp/opt/trinity/lib/trinity/ksmserver.la
 debian/tmp/opt/trinity/lib/trinity/ksmserver.so
 debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.so
-debian/tmp/opt/trinity/share/apps/kconf_update/ksmserver.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/move_session_config.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/ksmserver.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/move_session_config.sh
 debian/tmp/opt/trinity/share/apps/ksmserver/pics/shutdownkonq.png
diff --git a/ubuntu/precise/tdebase/debian/libkonq4-trinity-dev.install b/ubuntu/precise/tdebase/debian/libkonq4-trinity-dev.install
index 7eb2c120e..499963483 100644
--- a/ubuntu/precise/tdebase/debian/libkonq4-trinity-dev.install
+++ b/ubuntu/precise/tdebase/debian/libkonq4-trinity-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include//kfileivi.h
+debian/tmp/opt/trinity/include//tdefileivi.h
 debian/tmp/opt/trinity/include//kivdirectoryoverlay.h
 debian/tmp/opt/trinity/include//knewmenu.h
 debian/tmp/opt/trinity/include//konqbookmarkmanager.h
diff --git a/ubuntu/precise/tdebase/debian/libkonq4-trinity.install b/ubuntu/precise/tdebase/debian/libkonq4-trinity.install
index 77ea07f1a..15ee2a8d3 100644
--- a/ubuntu/precise/tdebase/debian/libkonq4-trinity.install
+++ b/ubuntu/precise/tdebase/debian/libkonq4-trinity.install
@@ -5,8 +5,8 @@ debian/tmp/opt/trinity/lib/trinity/konq_sound.so
 debian/tmp/opt/trinity/lib/libkonq.so.4
 debian/tmp/opt/trinity/lib/libkonq.so.4.2.0
 debian/tmp/opt/trinity/share/apps/kbookmark/directory_bookmarkbar.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/favicons.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/move_favicons.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/favicons.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/move_favicons.sh
 debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_bottomleft.png
 debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_bottomright.png
 debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_topleft.png
diff --git a/ubuntu/precise/tdebase/debian/man/kxkb-trinity.1 b/ubuntu/precise/tdebase/debian/man/kxkb-trinity.1
index 38a1a2a08..e06426a1b 100644
--- a/ubuntu/precise/tdebase/debian/man/kxkb-trinity.1
+++ b/ubuntu/precise/tdebase/debian/man/kxkb-trinity.1
@@ -12,7 +12,7 @@ kxkb
 .sp 1
 When \fBKxkb\fP is running you can change layouts clicking on its tray icon with the mouse or pressing its keyboard shortcut. Keyboard shortcut or mouse click will switch to next layout or alternatively you can right mouse button click the \fBKxkb\fP icon and select layout from the list.
 .sp 1
-Right mouse button clicking on the \fBKxkb\fP icon you can start its configuration by selecting Configure... or by opening \fBControl Center\fP and selecting Localization/Keyboard Layout. Alternatively, you can start it by typing \fBkcmshell keyboard_layout\fP in a terminal.
+Right mouse button clicking on the \fBKxkb\fP icon you can start its configuration by selecting Configure... or by opening \fBControl Center\fP and selecting Localization/Keyboard Layout. Alternatively, you can start it by typing \fBtdecmshell keyboard_layout\fP in a terminal.
 .SH OPTIONS
 .SS Generic options:
 .TP
diff --git a/ubuntu/precise/tdebase/debian/rules b/ubuntu/precise/tdebase/debian/rules
index 93596b397..374542a38 100755
--- a/ubuntu/precise/tdebase/debian/rules
+++ b/ubuntu/precise/tdebase/debian/rules
@@ -37,7 +37,7 @@ DEB_DH_STRIP_ARGS  := --dbg-package=tdebase-trinity-dbg
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach kioslave kxkb kdebugdialog kdcop
+DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb kdebugdialog kdcop
 
 PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
 			ksysguard-trinity twin-trinity libkonq4-trinity
diff --git a/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install b/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install
index 7f06b6d76..ae518054b 100644
--- a/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install
@@ -27,12 +27,12 @@ debian/tmp/opt/trinity/share/apps/kcmkeys/win3.kksrc
 debian/tmp/opt/trinity/share/apps/kcmkeys/win4.kksrc
 debian/tmp/opt/trinity/share/apps/kcmkeys/wm3.kksrc
 debian/tmp/opt/trinity/share/apps/kcmlocale/pics/background.png
-debian/tmp/opt/trinity/share/apps/kconf_update/convertShortcuts.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/kaccel.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kcmdisplayrc.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kuriikwsfilter.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/mouse_cursor_theme.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/socks.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/convertShortcuts.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kaccel.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kcmdisplayrc.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kuriikwsfilter.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/mouse_cursor_theme.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/socks.upd
 debian/tmp/opt/trinity/share/apps/kcontrol/about/kcontrol.css
 debian/tmp/opt/trinity/share/apps/kcontrol/about/main.html
 debian/tmp/opt/trinity/share/apps/kcontrol/about/top-right-kcontrol.png
@@ -174,8 +174,8 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/kfileman1.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/kfileman2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/tdefileman1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/tdefileman2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filetypes/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filetypes/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filetypes/index.docbook
diff --git a/ubuntu/precise/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian b/ubuntu/precise/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian
index 711a00289..404b60f67 100644
--- a/ubuntu/precise/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian
+++ b/ubuntu/precise/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian
@@ -1,13 +1,13 @@
-KDE and media kioslave support
+KDE and media tdeioslave support
 ==============================
 
-The media kioslave, new in KDE 3.4, supports the automatic mounting of
+The media tdeioslave, new in KDE 3.4, supports the automatic mounting of
 removable devices, such as CD-ROM and DVD drives, USB pen drives, digital
 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 kioslaves. Check which
+also extends the functionality of many other tdeioslaves. Check which
 packages are recommended by the tdebase-kio-plugins package, and install
 accordingly.
 
diff --git a/ubuntu/precise/tdebase/debian/tdebase-kio-plugins-trinity.install b/ubuntu/precise/tdebase/debian/tdebase-kio-plugins-trinity.install
index f2b452126..d374eb0bc 100644
--- a/ubuntu/precise/tdebase/debian/tdebase-kio-plugins-trinity.install
+++ b/ubuntu/precise/tdebase/debian/tdebase-kio-plugins-trinity.install
@@ -24,10 +24,10 @@ debian/tmp/opt/trinity/lib/trinity/kded_remotedirnotify.la
 debian/tmp/opt/trinity/lib/trinity/kded_remotedirnotify.so
 debian/tmp/opt/trinity/lib/trinity/kded_systemdirnotify.la
 debian/tmp/opt/trinity/lib/trinity/kded_systemdirnotify.so
-debian/tmp/opt/trinity/lib/trinity/kfile_media.la
-debian/tmp/opt/trinity/lib/trinity/kfile_media.so
-debian/tmp/opt/trinity/lib/trinity/kfile_trash.la
-debian/tmp/opt/trinity/lib/trinity/kfile_trash.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_media.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_media.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_trash.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_trash.so
 debian/tmp/opt/trinity/lib/trinity/kio_about.la
 debian/tmp/opt/trinity/lib/trinity/kio_about.so
 debian/tmp/opt/trinity/lib/trinity/kio_cgi.la
@@ -96,48 +96,48 @@ debian/tmp/opt/trinity/share/apps/systemview/media.desktop
 debian/tmp/opt/trinity/share/apps/systemview/remote.desktop
 debian/tmp/opt/trinity/share/apps/systemview/users.desktop
 debian/tmp/opt/trinity/share/config.kcfg/mediamanagersettings.kcfg
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/bzip.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/bzip2.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/cgi.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/data.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/file.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/finger.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/fish.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/floppy.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/ftp.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/gopher.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/gzip.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/help.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/http.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/https.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/imap.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/imaps.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/info.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/lan.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/ldap.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/mac.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/mailto.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/man.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/mrml.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/news.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/nfs.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/nntp.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/pop3.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/pop3s.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/print.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/rlan.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/rlogin.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/sftp.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/smb.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/smtp.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/tar.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/telnet.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/thumbnail.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/webdav.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/webdavs.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/bzip.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/bzip2.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/cgi.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/data.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/file.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/finger.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/fish.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/floppy.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/ftp.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/gopher.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/gzip.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/help.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/http.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/https.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/imap.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/imaps.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/info.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/lan.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/ldap.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/mac.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/mailto.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/man.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/mrml.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/news.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/nfs.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/nntp.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/pop3.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/pop3s.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/print.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/rlan.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/rlogin.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/sftp.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/smb.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/smtp.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/tar.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/telnet.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/thumbnail.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/webdav.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/webdavs.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/compact_flash_mount_decrypt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/compact_flash_unmount_decrypt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/compact_flash_unmount_encrypt.png
@@ -359,8 +359,8 @@ debian/tmp/opt/trinity/share/services/kded/mediamanager.desktop
 debian/tmp/opt/trinity/share/services/kded/medianotifier.desktop
 debian/tmp/opt/trinity/share/services/kded/remotedirnotify.desktop
 debian/tmp/opt/trinity/share/services/kded/systemdirnotify.desktop
-debian/tmp/opt/trinity/share/services/kfile_media.desktop
-debian/tmp/opt/trinity/share/services/kfile_trash_system.desktop
+debian/tmp/opt/trinity/share/services/tdefile_media.desktop
+debian/tmp/opt/trinity/share/services/tdefile_trash_system.desktop
 debian/tmp/opt/trinity/share/services/kmanpart.desktop
 debian/tmp/opt/trinity/share/services/ldap.protocol
 debian/tmp/opt/trinity/share/services/ldaps.protocol
diff --git a/ubuntu/precise/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/precise/tdebase/debian/tdebase-trinity-bin.install
index 78e1c95fb..85d0e5a33 100644
--- a/ubuntu/precise/tdebase/debian/tdebase-trinity-bin.install
+++ b/ubuntu/precise/tdebase/debian/tdebase-trinity-bin.install
@@ -25,7 +25,7 @@ debian/tmp/opt/trinity/bin/knetattach
 debian/tmp/opt/trinity/bin/krandom.kss
 debian/tmp/opt/trinity/bin/ksystraycmd
 debian/tmp/opt/trinity/bin/kxkb
-debian/tmp/opt/trinity/lib/kconf_update_bin/khotkeys_update
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/khotkeys_update
 debian/tmp/opt/trinity/lib/trinity/kcminit.la
 debian/tmp/opt/trinity/lib/trinity/kcminit.so
 debian/tmp/opt/trinity/lib/trinity/kcminit_startup.la
@@ -65,9 +65,9 @@ debian/tmp/opt/trinity/share/apps/drkonqi/debuggers/gdbrc
 debian/tmp/opt/trinity/share/apps/drkonqi/pics/konqi.png
 debian/tmp/opt/trinity/share/apps/drkonqi/presets/developerrc
 debian/tmp/opt/trinity/share/apps/drkonqi/presets/enduserrc
-debian/tmp/opt/trinity/share/apps/kconf_update/khotkeys_32b1_update.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/khotkeys_printscreen.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/konqueror_gestures_trinity21_update.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/khotkeys_32b1_update.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/khotkeys_printscreen.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/konqueror_gestures_trinity21_update.upd
 debian/tmp/opt/trinity/share/apps/kdcop/kdcopui.rc
 debian/tmp/opt/trinity/share/apps/khotkeys/trinity2b1.khotkeys
 debian/tmp/opt/trinity/share/apps/khotkeys/konqueror_gestures_trinity21.khotkeys
diff --git a/ubuntu/precise/tdebase/debian/tdebase-trinity.README.Debian b/ubuntu/precise/tdebase/debian/tdebase-trinity.README.Debian
index f3189b2c5..e7a871ce9 100644
--- a/ubuntu/precise/tdebase/debian/tdebase-trinity.README.Debian
+++ b/ubuntu/precise/tdebase/debian/tdebase-trinity.README.Debian
@@ -4,16 +4,16 @@ Kdm
 For notes on tdm, read: /opt/trinity/share/doc/tdm/README.Debian
 
 
-KDE and media kioslave support
+KDE and media tdeioslave support
 ==============================
 
-The media kioslave, new in KDE 3.4, supports the automatic mounting of
+The media tdeioslave, new in KDE 3.4, supports the automatic mounting of
 removable devices, such as CD-ROM and DVD drives, USB pen drives, digital
 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 kioslaves. Check which
+also extends the functionality of many other tdeioslaves. Check which
 packages are recommended by the tdebase-kio-plugins package, and install
 accordingly.
 
diff --git a/ubuntu/precise/tdebase/debian/twin-trinity.install b/ubuntu/precise/tdebase/debian/twin-trinity.install
index 2bf0dec5a..93fedda6f 100644
--- a/ubuntu/precise/tdebase/debian/twin-trinity.install
+++ b/ubuntu/precise/tdebase/debian/twin-trinity.install
@@ -3,8 +3,8 @@ debian/tmp/opt/trinity/bin/twin
 debian/tmp/opt/trinity/bin/twin_killer_helper
 debian/tmp/opt/trinity/bin/twin_resumer_helper
 debian/tmp/opt/trinity/bin/twin_rules_dialog
-debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_default_rules
-debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_window_settings
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/twin_update_default_rules
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/twin_update_window_settings
 debian/tmp/opt/trinity/lib/trinity/kcm_twindecoration.la
 debian/tmp/opt/trinity/lib/trinity/kcm_twindecoration.so
 debian/tmp/opt/trinity/lib/trinity/kcm_twinoptions.la
@@ -58,18 +58,18 @@ debian/tmp/opt/trinity/share/applnk/.hidden/twinadvanced.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/twinfocus.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/twinmoving.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/twintranslucency.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/twin3_plugin.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/twin3_plugin.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus1.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus1.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus2.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus2.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/twin_fsp_workarounds_1.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/twiniconify.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/twinsticky.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/twin.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/twinupdatewindowsettings.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/pluginlibFix.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twin3_plugin.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twin3_plugin.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus1.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus1.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus2.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus2.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_fsp_workarounds_1.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twiniconify.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twinsticky.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twin.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twinupdatewindowsettings.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/pluginlibFix.pl
 debian/tmp/opt/trinity/share/apps/twin/b2.desktop
 debian/tmp/opt/trinity/share/apps/twin/eventsrc
 debian/tmp/opt/trinity/share/apps/twin/keramik.desktop
diff --git a/ubuntu/precise/tdebindings/debian/libkjsembed1-trinity.install b/ubuntu/precise/tdebindings/debian/libkjsembed1-trinity.install
index c0fe0bc67..0061252bb 100644
--- a/ubuntu/precise/tdebindings/debian/libkjsembed1-trinity.install
+++ b/ubuntu/precise/tdebindings/debian/libkjsembed1-trinity.install
@@ -11,7 +11,7 @@ debian/tmp/opt/trinity/share/services/qprocess_plugin.desktop
 
 debian/tmp/opt/trinity/lib/trinity/libfileitemplugin.la
 debian/tmp/opt/trinity/lib/trinity/libfileitemplugin.so
-debian/tmp/opt/trinity/share/services/kfileitem_plugin.desktop
+debian/tmp/opt/trinity/share/services/tdefileitem_plugin.desktop
 
 debian/tmp/opt/trinity/share/apps/kjsembed/cmdline.js
 debian/tmp/opt/trinity/share/servicetypes/binding_type.desktop
diff --git a/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.install b/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
index d3349b15b..c250f2beb 100644
--- a/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
+++ b/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/rbkdesh
 debian/tmp/opt/trinity/bin/rbkdeapi
 debian/tmp/opt/trinity/bin/krubyinit
-debian/tmp/opt/trinity/bin/rbkconfig_compiler
+debian/tmp/opt/trinity/bin/rbtdeconfig_compiler
 
 debian/tmp/opt/trinity/lib/ruby/1.9.1/Korundum.rb
 debian/tmp/opt/trinity/lib/ruby/1.9.1/KDE/korundum.rb
diff --git a/ubuntu/precise/tdeedu/debian/kig-trinity.install b/ubuntu/precise/tdeedu/debian/kig-trinity.install
index be8552b20..18ec111ff 100644
--- a/ubuntu/precise/tdeedu/debian/kig-trinity.install
+++ b/ubuntu/precise/tdeedu/debian/kig-trinity.install
@@ -2,10 +2,10 @@ etc/trinity/magic/cabri.magic
 etc/trinity/magic/drgeo.magic
 opt/trinity/bin/kig
 opt/trinity/bin/pykig.py
-opt/trinity/lib/trinity/kfile_drgeo.la
-opt/trinity/lib/trinity/kfile_drgeo.so
-opt/trinity/lib/trinity/kfile_kig.la
-opt/trinity/lib/trinity/kfile_kig.so
+opt/trinity/lib/trinity/tdefile_drgeo.la
+opt/trinity/lib/trinity/tdefile_drgeo.so
+opt/trinity/lib/trinity/tdefile_kig.la
+opt/trinity/lib/trinity/tdefile_kig.so
 opt/trinity/lib/trinity/libkigpart.la
 opt/trinity/lib/trinity/libkigpart.so
 /opt/trinity/share/applications/tde/kig.desktop
@@ -35,7 +35,7 @@ opt/trinity/lib/trinity/libkigpart.so
 /opt/trinity/share/mimelnk/application/x-kig.desktop
 /opt/trinity/share/mimelnk/application/x-kgeo.desktop
 /opt/trinity/share/mimelnk/application/x-kseg.desktop
-/opt/trinity/share/services/kfile_drgeo.desktop
-/opt/trinity/share/services/kfile_kig.desktop
+/opt/trinity/share/services/tdefile_drgeo.desktop
+/opt/trinity/share/services/tdefile_kig.desktop
 /opt/trinity/share/services/kig_part.desktop
 ../icons/kig.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/precise/tdegraphics/debian/changelog b/ubuntu/precise/tdegraphics/debian/changelog
index 37c948bdf..64541bd36 100644
--- a/ubuntu/precise/tdegraphics/debian/changelog
+++ b/ubuntu/precise/tdegraphics/debian/changelog
@@ -593,7 +593,7 @@ tdegraphics (4:3.5.0-1) alioth; urgency=low
 
   * Add the new kfaxview package.
 
-  * Add build-depends on libpoppler-qt-dev to build the kfile_pdf info plugin.
+  * Add build-depends on libpoppler-qt-dev to build the tdefile_pdf info plugin.
 
   * Remove obsolete replaces against package versions not
     present in Sarge.
@@ -716,7 +716,7 @@ tdegraphics (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number due to KDE 3.4.1 release
   * Move remove xpdf-utils depend on kpdf, add as 
-    suggests on tdegraphics-kfile-plugins
+    suggests on tdegraphics-tdefile-plugins
   * Add all packages back to meta package
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue, 31 May 2005 16:33:00 +0000
@@ -1143,7 +1143,7 @@ tdegraphics (4:2.2.2-6) unstable; urgency=low
     Alternately, the "I'm-under-peer-pressure-to-give-this-a-name" release,
     or the "no-notice-NMUs-suck-donkey-balls" release (hi lamont!).
   * Acknowledge lamont's NMU. (closes: #125871, #125956)
-  * kamera/kioslave/kamera.cpp:
+  * kamera/tdeioslave/kamera.cpp:
     - Apply patch to fix dodgy Canon camera drivers. (closes: #125873).
   * debian/rules:
     - Build with a different builddir to srcdir, thanks to Eray Ozkural.
diff --git a/ubuntu/precise/tdegraphics/debian/control b/ubuntu/precise/tdegraphics/debian/control
index 169fb486a..54be5d6af 100644
--- a/ubuntu/precise/tdegraphics/debian/control
+++ b/ubuntu/precise/tdegraphics/debian/control
@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdegraphics-trinity (<< 4:14.0.0)
 Breaks: kdegraphics-trinity (<< 4:14.0.0)
-Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-kfile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
+Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
 Suggests: tdegraphics-trinity-doc-html (>= ${source:Version})
 Description: graphics apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -84,11 +84,11 @@ Description: development files for the KDE graphics module
  This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
-Package: tdegraphics-kfile-plugins-trinity
+Package: tdegraphics-tdefile-plugins-trinity
 Section: tde
 Architecture: any
-Replaces: kdegraphics-kfile-plugins-trinity (<< 4:14.0.0)
-Breaks: kdegraphics-kfile-plugins-trinity (<< 4:14.0.0)
+Replaces: kdegraphics-tdefile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdegraphics-tdefile-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Description: KDE metainfo plugins for graphic files
  This packages provides meta information for graphic files (file sizes,
diff --git a/ubuntu/precise/tdegraphics/debian/control.in b/ubuntu/precise/tdegraphics/debian/control.in
index 64adbce40..4e94d5081 100644
--- a/ubuntu/precise/tdegraphics/debian/control.in
+++ b/ubuntu/precise/tdegraphics/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdegraphics
 Section: tde
 Architecture: all
-Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-kfile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
+Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
 Suggests: tdegraphics-doc-html (>= ${source:Version})
 Description: graphics apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -74,7 +74,7 @@ Description: development files for the KDE graphics module
  This package is part of KDE, as a component of the KDE graphics module.
  See the 'kde' and 'tdegraphics' packages for more information.
 
-Package: tdegraphics-kfile-plugins
+Package: tdegraphics-tdefile-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
diff --git a/ubuntu/precise/tdegraphics/debian/kghostview-trinity.install b/ubuntu/precise/tdegraphics/debian/kghostview-trinity.install
index 276a7bced..add2d1e01 100644
--- a/ubuntu/precise/tdegraphics/debian/kghostview-trinity.install
+++ b/ubuntu/precise/tdegraphics/debian/kghostview-trinity.install
@@ -4,8 +4,8 @@ debian/tmp/opt/trinity/lib/trinity/libkghostviewpart.so
 debian/tmp/opt/trinity/lib/libkghostviewlib.so.0
 debian/tmp/opt/trinity/lib/libkghostviewlib.so.0.0.0
 debian/tmp/opt/trinity/share/applications/tde/kghostview.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/kghostview.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/update-to-xt-names.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kghostview.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/update-to-xt-names.pl
 debian/tmp/opt/trinity/share/apps/kghostview/kghostviewui.rc
 debian/tmp/opt/trinity/share/apps/kghostview/kgv_part.rc
 debian/tmp/opt/trinity/share/apps/kghostview/pdf_sec.ps
diff --git a/ubuntu/precise/tdegraphics/debian/kview-trinity.install b/ubuntu/precise/tdegraphics/debian/kview-trinity.install
index b8094a7d7..ea22868e9 100644
--- a/ubuntu/precise/tdegraphics/debian/kview-trinity.install
+++ b/ubuntu/precise/tdegraphics/debian/kview-trinity.install
@@ -52,10 +52,10 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kview.png
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kviewcanvasconfig.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kviewgeneralconfig.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kviewpluginsconfig.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kviewviewerpluginsconfig.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewcanvasconfig.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewgeneralconfig.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewpluginsconfig.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewviewerpluginsconfig.desktop
 debian/tmp/opt/trinity/share/services/kviewcanvas.desktop
 debian/tmp/opt/trinity/share/services/kviewviewer.desktop
 debian/tmp/opt/trinity/share/services/photobook.desktop
diff --git a/ubuntu/precise/tdegraphics/debian/tdegraphics-kfile-plugins-trinity.install b/ubuntu/precise/tdegraphics/debian/tdegraphics-kfile-plugins-trinity.install
deleted file mode 100644
index d7a77267e..000000000
--- a/ubuntu/precise/tdegraphics/debian/tdegraphics-kfile-plugins-trinity.install
+++ /dev/null
@@ -1,57 +0,0 @@
-debian/tmp/opt/trinity/lib/trinity/gsthumbnail.la
-debian/tmp/opt/trinity/lib/trinity/gsthumbnail.so
-debian/tmp/opt/trinity/lib/trinity/kfile_bmp.la
-debian/tmp/opt/trinity/lib/trinity/kfile_bmp.so
-debian/tmp/opt/trinity/lib/trinity/kfile_dds.la
-debian/tmp/opt/trinity/lib/trinity/kfile_dds.so
-debian/tmp/opt/trinity/lib/trinity/kfile_dvi.la
-debian/tmp/opt/trinity/lib/trinity/kfile_dvi.so
-debian/tmp/opt/trinity/lib/trinity/kfile_exr.la
-debian/tmp/opt/trinity/lib/trinity/kfile_exr.so
-debian/tmp/opt/trinity/lib/trinity/kfile_gif.la
-debian/tmp/opt/trinity/lib/trinity/kfile_gif.so
-debian/tmp/opt/trinity/lib/trinity/kfile_ico.la
-debian/tmp/opt/trinity/lib/trinity/kfile_ico.so
-debian/tmp/opt/trinity/lib/trinity/kfile_jpeg.la
-debian/tmp/opt/trinity/lib/trinity/kfile_jpeg.so
-debian/tmp/opt/trinity/lib/trinity/kfile_pcx.la
-debian/tmp/opt/trinity/lib/trinity/kfile_pcx.so
-debian/tmp/opt/trinity/lib/trinity/kfile_pdf.la
-debian/tmp/opt/trinity/lib/trinity/kfile_pdf.so
-debian/tmp/opt/trinity/lib/trinity/kfile_png.la
-debian/tmp/opt/trinity/lib/trinity/kfile_png.so
-debian/tmp/opt/trinity/lib/trinity/kfile_pnm.la
-debian/tmp/opt/trinity/lib/trinity/kfile_pnm.so
-debian/tmp/opt/trinity/lib/trinity/kfile_ps.la
-debian/tmp/opt/trinity/lib/trinity/kfile_ps.so
-debian/tmp/opt/trinity/lib/trinity/kfile_raw.la
-debian/tmp/opt/trinity/lib/trinity/kfile_raw.so
-debian/tmp/opt/trinity/lib/trinity/kfile_rgb.la
-debian/tmp/opt/trinity/lib/trinity/kfile_rgb.so
-debian/tmp/opt/trinity/lib/trinity/kfile_tga.la
-debian/tmp/opt/trinity/lib/trinity/kfile_tga.so
-debian/tmp/opt/trinity/lib/trinity/kfile_tiff.la
-debian/tmp/opt/trinity/lib/trinity/kfile_tiff.so
-debian/tmp/opt/trinity/lib/trinity/kfile_xbm.la
-debian/tmp/opt/trinity/lib/trinity/kfile_xbm.so
-debian/tmp/opt/trinity/lib/trinity/kfile_xpm.la
-debian/tmp/opt/trinity/lib/trinity/kfile_xpm.so
-debian/tmp/opt/trinity/share/services/gsthumbnail.desktop
-debian/tmp/opt/trinity/share/services/kfile_bmp.desktop
-debian/tmp/opt/trinity/share/services/kfile_dds.desktop
-debian/tmp/opt/trinity/share/services/kfile_dvi.desktop
-debian/tmp/opt/trinity/share/services/kfile_exr.desktop
-debian/tmp/opt/trinity/share/services/kfile_gif.desktop
-debian/tmp/opt/trinity/share/services/kfile_ico.desktop
-debian/tmp/opt/trinity/share/services/kfile_jpeg.desktop
-debian/tmp/opt/trinity/share/services/kfile_pcx.desktop
-debian/tmp/opt/trinity/share/services/kfile_pdf.desktop
-debian/tmp/opt/trinity/share/services/kfile_png.desktop
-debian/tmp/opt/trinity/share/services/kfile_pnm.desktop
-debian/tmp/opt/trinity/share/services/kfile_ps.desktop
-debian/tmp/opt/trinity/share/services/kfile_raw.desktop
-debian/tmp/opt/trinity/share/services/kfile_rgb.desktop
-debian/tmp/opt/trinity/share/services/kfile_tga.desktop
-debian/tmp/opt/trinity/share/services/kfile_tiff.desktop
-debian/tmp/opt/trinity/share/services/kfile_xbm.desktop
-debian/tmp/opt/trinity/share/services/kfile_xpm.desktop
diff --git a/ubuntu/precise/tdegraphics/debian/tdegraphics-tdefile-plugins-trinity.install b/ubuntu/precise/tdegraphics/debian/tdegraphics-tdefile-plugins-trinity.install
new file mode 100644
index 000000000..02ffc23c6
--- /dev/null
+++ b/ubuntu/precise/tdegraphics/debian/tdegraphics-tdefile-plugins-trinity.install
@@ -0,0 +1,57 @@
+debian/tmp/opt/trinity/lib/trinity/gsthumbnail.la
+debian/tmp/opt/trinity/lib/trinity/gsthumbnail.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_bmp.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_bmp.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_dds.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_dds.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_dvi.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_dvi.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_exr.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_exr.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_gif.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_gif.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_ico.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_ico.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_jpeg.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_jpeg.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_pcx.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_pcx.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_pdf.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_pdf.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_png.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_png.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_pnm.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_pnm.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_ps.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_ps.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_raw.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_raw.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_rgb.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_rgb.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_tga.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_tga.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_tiff.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_tiff.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_xbm.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_xbm.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_xpm.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_xpm.so
+debian/tmp/opt/trinity/share/services/gsthumbnail.desktop
+debian/tmp/opt/trinity/share/services/tdefile_bmp.desktop
+debian/tmp/opt/trinity/share/services/tdefile_dds.desktop
+debian/tmp/opt/trinity/share/services/tdefile_dvi.desktop
+debian/tmp/opt/trinity/share/services/tdefile_exr.desktop
+debian/tmp/opt/trinity/share/services/tdefile_gif.desktop
+debian/tmp/opt/trinity/share/services/tdefile_ico.desktop
+debian/tmp/opt/trinity/share/services/tdefile_jpeg.desktop
+debian/tmp/opt/trinity/share/services/tdefile_pcx.desktop
+debian/tmp/opt/trinity/share/services/tdefile_pdf.desktop
+debian/tmp/opt/trinity/share/services/tdefile_png.desktop
+debian/tmp/opt/trinity/share/services/tdefile_pnm.desktop
+debian/tmp/opt/trinity/share/services/tdefile_ps.desktop
+debian/tmp/opt/trinity/share/services/tdefile_raw.desktop
+debian/tmp/opt/trinity/share/services/tdefile_rgb.desktop
+debian/tmp/opt/trinity/share/services/tdefile_tga.desktop
+debian/tmp/opt/trinity/share/services/tdefile_tiff.desktop
+debian/tmp/opt/trinity/share/services/tdefile_xbm.desktop
+debian/tmp/opt/trinity/share/services/tdefile_xpm.desktop
diff --git a/ubuntu/precise/tdelibs/debian/changelog b/ubuntu/precise/tdelibs/debian/changelog
index 6a9f72874..1cffd2663 100644
--- a/ubuntu/precise/tdelibs/debian/changelog
+++ b/ubuntu/precise/tdelibs/debian/changelog
@@ -73,13 +73,13 @@ tdelibs-trinity (4:3.5.10-0ubuntu3~intrepid5) intrepid; urgency=low
 
 tdelibs-trinity (4:3.5.10-0ubuntu3~intrepid4) intrepid; urgency=low
 
-  * Repaired kcmshell root environment default data directory
+  * Repaired tdecmshell root environment default data directory
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 20 Mar 2009 11:56:00 -0600
 
 tdelibs-trinity (4:3.5.10-0ubuntu3~intrepid1) intrepid; urgency=low
 
-  * Repaired kcmshell root environment
+  * Repaired tdecmshell root environment
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 09 Mar 2009 13:21:00 -0600
 
@@ -116,7 +116,7 @@ tdelibs-trinity (4:3.5.10-0ubuntu1~intrepid9) intrepid; urgency=low
 
 tdelibs-trinity (4:3.5.10-0ubuntu1~intrepid7) intrepid; urgency=low
 
-  * Changed kstartupconfig default HOME of /.kde to /.trinity
+  * Changed tdestartupconfig default HOME of /.kde to /.trinity
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 25 Nov 2008 09:45:00 -0600
 
@@ -372,7 +372,7 @@ tdelibs (4:3.5.7.dfsg.1-7) unstable; urgency=low
 
 tdelibs (4:3.5.7.dfsg.1-6) unstable; urgency=low
 
-  * Move back kstartupconfig to tdelibs4c2a. (Closes: #439411)
+  * Move back tdestartupconfig to tdelibs4c2a. (Closes: #439411)
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 25 Aug 2007 03:09:34 +0200
 
@@ -387,7 +387,7 @@ tdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low
   
   +++ Changes by Fathi Boudra:
 
-  * Move binaries to tdelibs4-dev: kconfig_compiler, ksvgtopng,
+  * Move binaries to tdelibs4-dev: tdeconfig_compiler, ksvgtopng,
     tdeunittestmodrunner, makekdewidgets, preparetips.
     Allow tdelibs5-dev co-installable alongside tdelibs4c2a.
 
@@ -419,7 +419,7 @@ tdelibs (4:3.5.7.dfsg.1-2) unstable; urgency=low
   * Add patch to fix issue with saving after redo in kate. (Closes: #431920)
   * Better error messages when opening a tty fails. Thanks to Robert Millan.
     (Closes: #334974)
-  * Don't refer to help:/kcmshell in kcmshell manpage. (Closes: #408470)
+  * Don't refer to help:/tdecmshell in tdecmshell manpage. (Closes: #408470)
   * Make sure tdeinit closes all files before terminating kde. (Closes: #425314)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 19 Jul 2007 22:52:17 +0200
@@ -479,7 +479,7 @@ tdelibs (4:3.5.7-1ubuntu13) gutsy; urgency=low
     causes building issues. We'll have to take care with the next
     version of the patch.
   * Droped kubuntu_57_nomediaioslave_fileio.diff and
-    kubuntu_59_nomediaioslave_kfile_speedbar.diff:
+    kubuntu_59_nomediaioslave_tdefile_speedbar.diff:
     -  it's been decided to switch back to the standard media:/
        protocol, as /media create as many problems as it resolves...
 
@@ -594,7 +594,7 @@ tdelibs (4:3.5.7-1ubuntu1) gutsy; urgency=low
 tdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low
 
   * New upstream release.
-    - Ability to have addressbook on remote kioslaves is disabled.
+    - Ability to have addressbook on remote tdeioslaves is disabled.
       It is quite broken. (Closes: #416366)
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
@@ -1126,7 +1126,7 @@ tdelibs (4:3.5.4-0ubuntu11) edgy; urgency=low
 tdelibs (4:3.5.4-0ubuntu10) edgy; urgency=low
 
   * Update kubuntu_52_xinerama.diff with improved patch by Lubos Lunak
-  * Add kubuntu_59_nomediaioslave_kfile_speedbar.diff from Simon Edwards
+  * Add kubuntu_59_nomediaioslave_tdefile_speedbar.diff from Simon Edwards
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  1 Sep 2006 17:20:58 +0000
 
@@ -1692,7 +1692,7 @@ tdelibs (4:3.5.0-0ubuntu10) dapper; urgency=low
   * Add kubuntu_28_fix_sudo.diff to set home directory when 
     run as root via sudo, stops KDE apps settings wrong permissions on 
     files in users home directory
-  * Add kubuntu_29_quiet_kbuildsycoca.diff stop kbuildsycoca complaining
+  * Add kubuntu_29_quiet_tdebuildsycoca.diff stop tdebuildsycoca complaining
     about unknown mimetypes
   * SECURITY UPDATE: kjs encodeuri/decodeuri heap overflow vulnerability
   * Add kubuntu_20_post_3.4.3_tdelibs_kjs.diff
@@ -1817,7 +1817,7 @@ tdelibs (4:3.5-rc1-0ubuntu1) dapper; urgency=low
   * Sync with Debian
   * Remove 16_default_fonts.diff, merged upstream
   * Remove 22_htmltokenizer_cpp_from_3_5.diff, already upstream
-  * Remove 23_kfiledialog.diff, merged upstream
+  * Remove 23_tdefiledialog.diff, merged upstream
   * tdelibs-data replaces old kttsd
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 10 Nov 2005 17:24:33 +0000
@@ -1965,7 +1965,7 @@ tdelibs (4:3.4.91-0ubuntu1) breezy; urgency=low
 
 tdelibs (4:3.4.2-0ubuntu4) breezy; urgency=low
 
-  * Add replaces on old knetworkconf for tdelibs-data
+  * Add replaces on old knetwortdeconf for tdelibs-data
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  3 Aug 2005 12:44:18 +0000
 
diff --git a/ubuntu/precise/tdelibs/debian/copyright b/ubuntu/precise/tdelibs/debian/copyright
index 945a09ca9..cd5bbe13c 100644
--- a/ubuntu/precise/tdelibs/debian/copyright
+++ b/ubuntu/precise/tdelibs/debian/copyright
@@ -14,8 +14,8 @@ systems, the complete text of the BSD, GPL and LGPL licenses can be found
 in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and
 /usr/share/common-licenses/LGPL files.
 
-libartskde, interfaces, kabc, kate, tdecert, kconf_update, tdecore, kded, tdefx,
-tdeprint, tdesu, tdeui, kdewidgets, tdehtml, kimgio, kinit, kio, kioslave, kjs,
+libartskde, interfaces, kabc, kate, tdecert, tdeconf_update, tdecore, kded, tdefx,
+tdeprint, tdesu, tdeui, kdewidgets, tdehtml, kimgio, kinit, kio, tdeioslave, kjs,
 tdeparts, ksmartcard, tdespell, kstyles, libtdemid, libtdescreensaver
 ------------------------------------------------------------------------------
 LGPL
diff --git a/ubuntu/precise/tdelibs/debian/kcmshell b/ubuntu/precise/tdelibs/debian/kcmshell
deleted file mode 100755
index f5b01f8f1..000000000
--- a/ubuntu/precise/tdelibs/debian/kcmshell
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-export TDEDIRS=/usr/:/opt/trinity/
-/opt/trinity/bin/kcmshell.real $1 $2 $3 $4 $5 $6 $7 $8
diff --git a/ubuntu/precise/tdelibs/debian/man/kde-menu-trinity.1 b/ubuntu/precise/tdelibs/debian/man/tde-menu-trinity.1
index 29d6191f4..29d6191f4 100644
--- a/ubuntu/precise/tdelibs/debian/man/kde-menu-trinity.1
+++ b/ubuntu/precise/tdelibs/debian/man/tde-menu-trinity.1
diff --git a/ubuntu/precise/tdelibs/debian/man/kab2kabc-trinity.1 b/ubuntu/precise/tdelibs/debian/man/tdeab2tdeabc-trinity.1
index cc7b69e98..91157f14f 100644
--- a/ubuntu/precise/tdelibs/debian/man/kab2kabc-trinity.1
+++ b/ubuntu/precise/tdelibs/debian/man/tdeab2tdeabc-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KAB2KABC 1 "Jun 2006" "K Desktop Environment" "Kab to Kabc converter"
 .SH NAME
-kab2kabc
+tdeab2tdeabc
 \- KDE address book converter
 .SH SYNOPSIS
-\fBkab2kabc\fP [Qt\-options] [KDE\-options] [options] 
+\fBtdeab2tdeabc\fP [Qt\-options] [KDE\-options] [options] 
 .SH DESCRIPTION
-\fBkab2kabc\fP converts a KDE address book from old Kab format to new Kabc format.
+\fBtdeab2tdeabc\fP converts a KDE address book from old Kab format to new Kabc format.
 .SH OPTIONS
 .SS Options:
 .TP
diff --git a/ubuntu/precise/tdelibs/debian/man/kbuildsycoca-trinity.sgml b/ubuntu/precise/tdelibs/debian/man/tdebuildsycoca-trinity.sgml
index 92749d8ad..d25422c50 100644
--- a/ubuntu/precise/tdelibs/debian/man/kbuildsycoca-trinity.sgml
+++ b/ubuntu/precise/tdelibs/debian/man/tdebuildsycoca-trinity.sgml
@@ -27,7 +27,7 @@ manpage.1: manpage.sgml
   <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
   <!ENTITY dhusername  "Chris Cheney">
   <!ENTITY dhucpackage "<refentrytitle>KBUILDSYCOCA</refentrytitle>">
-  <!ENTITY dhpackage   "kbuildsycoca">
+  <!ENTITY dhpackage   "tdebuildsycoca">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
diff --git a/ubuntu/precise/tdelibs/debian/man/kcmshell-trinity.1 b/ubuntu/precise/tdelibs/debian/man/tdecmshell-trinity.1
index f94a9a670..f2f10a3c0 100644
--- a/ubuntu/precise/tdelibs/debian/man/kcmshell-trinity.1
+++ b/ubuntu/precise/tdelibs/debian/man/tdecmshell-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KCMSHELL 1 "Jun 2006" "K Desktop Environment" "tool to start single KDE control modules"
 .SH NAME
-kcmshell
+tdecmshell
 \- tool to start single KDE control modules
 .SH SYNOPSIS
-kcmshell [Qt\-options] [KDE\-options] [options] module 
+tdecmshell [Qt\-options] [KDE\-options] [options] module 
 .SH DESCRIPTION
-\fBkcmshell\fP is a tool to start single KDE control modules.
+\fBtdecmshell\fP is a tool to start single KDE control modules.
 .SH OPTIONS
 .SS
 .SS Arguments:
diff --git a/ubuntu/precise/tdelibs/debian/man/kconf_update-trinity.sgml b/ubuntu/precise/tdelibs/debian/man/tdeconf_update-trinity.sgml
index e7f29733a..a6e913cd2 100644
--- a/ubuntu/precise/tdelibs/debian/man/kconf_update-trinity.sgml
+++ b/ubuntu/precise/tdelibs/debian/man/tdeconf_update-trinity.sgml
@@ -27,7 +27,7 @@ manpage.1: manpage.sgml
   <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
   <!ENTITY dhusername  "Chris Cheney">
   <!ENTITY dhucpackage "<refentrytitle>KCONF_UPDATE</refentrytitle>">
-  <!ENTITY dhpackage   "kconf_update">
+  <!ENTITY dhpackage   "tdeconf_update">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
diff --git a/ubuntu/precise/tdelibs/debian/man/kconfig_compiler-trinity.1 b/ubuntu/precise/tdelibs/debian/man/tdeconfig_compiler-trinity.1
index eab4596ed..cf8fa9f5c 100644
--- a/ubuntu/precise/tdelibs/debian/man/kconfig_compiler-trinity.1
+++ b/ubuntu/precise/tdelibs/debian/man/tdeconfig_compiler-trinity.1
@@ -1,13 +1,13 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KCONFIG_COMPILER 1 "Jun 2006" "K Desktop Environment" "programming tool"
 .SH NAME
-kconfig_compiler
+tdeconfig_compiler
 \- KDE configuration compiler
 .SH SYNOPSIS
-\fBkconfig_compiler\fP [Qt\-options] [KDE\-options] [options]
+\fBtdeconfig_compiler\fP [Qt\-options] [KDE\-options] [options]
 .I file.kcfg file.kcfgc 
 .SH DESCRIPTION
-\fBkconfig_compiler\fP generates C++ source code from two files. The first file (.kcfg) contains information about configuration options and the second file (.kcfgc) provides the code generation options.
+\fBtdeconfig_compiler\fP generates C++ source code from two files. The first file (.kcfg) contains information about configuration options and the second file (.kcfgc) provides the code generation options.
 .br
 The generated source code contains a class based on \fBKConfigSkeleton\fP that provides an API to access the applications configuration data.
 .SH OPTIONS
diff --git a/ubuntu/precise/tdelibs/debian/man/kfile-trinity.sgml b/ubuntu/precise/tdelibs/debian/man/tdefile-trinity.sgml
index d5239142d..fe0622ccd 100644
--- a/ubuntu/precise/tdelibs/debian/man/kfile-trinity.sgml
+++ b/ubuntu/precise/tdelibs/debian/man/tdefile-trinity.sgml
@@ -27,7 +27,7 @@ manpage.1: manpage.sgml
   <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
   <!ENTITY dhusername  "Chris Cheney">
   <!ENTITY dhucpackage "<refentrytitle>KFILE</refentrytitle>">
-  <!ENTITY dhpackage   "kfile">
+  <!ENTITY dhpackage   "tdefile">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
diff --git a/ubuntu/precise/tdelibs/debian/man/khotnewstuff-trinity.1 b/ubuntu/precise/tdelibs/debian/man/tdehotnewstuff-trinity.1
index 68421378d..a31f79e05 100644
--- a/ubuntu/precise/tdelibs/debian/man/khotnewstuff-trinity.1
+++ b/ubuntu/precise/tdelibs/debian/man/tdehotnewstuff-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KHOTNEWSTUFF 1 "Jun 2006" "K Desktop Environment" "KDE tool"
 .SH NAME
-khotnewstuff
+tdehotnewstuff
 \- KDE tool to test GHNS repositories
 .SH SYNOPSIS
-\fBkhotnewstuff\fP [Qt\-options] [KDE\-options] [options] [providerlist] 
+\fBtdehotnewstuff\fP [Qt\-options] [KDE\-options] [options] [providerlist] 
 .SH DESCRIPTION
-\fBkhotnewstuff\fP is a tool to test GHNS repositories. It calls the download dialog for arbitrary GHNS repositories and can apply filters given on the command line.
+\fBtdehotnewstuff\fP is a tool to test GHNS repositories. It calls the download dialog for arbitrary GHNS repositories and can apply filters given on the command line.
 .sp 1
 GHNS means "Get Hot New Stuff" and is a data sharing concept. It allows you to install new stuff like applets, plugins, data, sounds and wallpapers for instant use in your KDE applications.
 .sp 1
diff --git a/ubuntu/precise/tdelibs/debian/man/tdeinit-trinity.1 b/ubuntu/precise/tdelibs/debian/man/tdeinit-trinity.1
index 63c5935b6..9c5d49965 100644
--- a/ubuntu/precise/tdelibs/debian/man/tdeinit-trinity.1
+++ b/ubuntu/precise/tdelibs/debian/man/tdeinit-trinity.1
@@ -10,7 +10,7 @@ tdeinit
 .sp 1
 \fBtdeinit\fP is used to start all other KDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs).
 .sp 1
-When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstarttde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
+When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBtdelauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstarttde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
 .sp 1
 The \fBtdeinit\fP master process can be used to start additional KDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
 .sp 1
@@ -29,7 +29,7 @@ Terminate when no KDE applications are left running
 .I /usr/lib/trinity
 directory with KLMs (tdeinit loadable modules)
 .SH SEE ALSO
-.BR dcopserver (1),\  kded (1),\  kcminit (1),\  tdeinit_wrapper (1),\  klauncher (1),\  kshell (1),\  kwrapper (1),\  starttde (1)
+.BR dcopserver (1),\  kded (1),\  kcminit (1),\  tdeinit_wrapper (1),\  tdelauncher (1),\  kshell (1),\  kwrapper (1),\  starttde (1)
 .SH AUTHORS
 .nf
 Waldo Bastian <bastian@kde.org>
diff --git a/ubuntu/precise/tdelibs/debian/man/kio_uiserver-trinity.sgml b/ubuntu/precise/tdelibs/debian/man/tdeio_uiserver-trinity.sgml
index 753ca4f70..5582febc6 100644
--- a/ubuntu/precise/tdelibs/debian/man/kio_uiserver-trinity.sgml
+++ b/ubuntu/precise/tdelibs/debian/man/tdeio_uiserver-trinity.sgml
@@ -27,7 +27,7 @@ manpage.1: manpage.sgml
   <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
   <!ENTITY dhusername  "Chris Cheney">
   <!ENTITY dhucpackage "<refentrytitle>KIO_UISERVER</refentrytitle>">
-  <!ENTITY dhpackage   "kio_uiserver">
+  <!ENTITY dhpackage   "tdeio_uiserver">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
diff --git a/ubuntu/precise/tdelibs/debian/man/kioexec-trinity.1 b/ubuntu/precise/tdelibs/debian/man/tdeioexec-trinity.1
index d4e63ffad..f5c8a587d 100644
--- a/ubuntu/precise/tdelibs/debian/man/kioexec-trinity.1
+++ b/ubuntu/precise/tdelibs/debian/man/tdeioexec-trinity.1
@@ -1,14 +1,14 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KIOEXEC 1 "Jun 2006" "K Desktop Environment" "network transparency support"
 .SH NAME
-kioexec, kfmexec
+tdeioexec, kfmexec
 \- open remote files, watch modifications, ask for upload
 .SH SYNOPSIS
-\fBkioexec\fP [Qt\-options] [KDE\-options] [options] command [URLs] 
+\fBtdeioexec\fP [Qt\-options] [KDE\-options] [options] command [URLs] 
 .SH DESCRIPTION
-\fBkioexec\fP offers network transparency to applications that only support local files.
+\fBtdeioexec\fP offers network transparency to applications that only support local files.
 .sp 1
-\fBkioexec\fP downloads the remote file to a temporary location and starts a local application with the temporary file as argument. Then it  waits for the application to be exited and offers re\-uploading of the modified temporary file.
+\fBtdeioexec\fP downloads the remote file to a temporary location and starts a local application with the temporary file as argument. Then it  waits for the application to be exited and offers re\-uploading of the modified temporary file.
 .SH OPTIONS
 .SS
 .SS Arguments:
diff --git a/ubuntu/precise/tdelibs/debian/man/klauncher-trinity.1 b/ubuntu/precise/tdelibs/debian/man/tdelauncher-trinity.1
index 240dab5e3..9029a5ace 100644
--- a/ubuntu/precise/tdelibs/debian/man/klauncher-trinity.1
+++ b/ubuntu/precise/tdelibs/debian/man/tdelauncher-trinity.1
@@ -1,16 +1,16 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KLAUNCHER 1 "Jun 2006" "K Desktop Environment" "service activation daemon"
 .SH NAME
-klauncher
+tdelauncher
 \- daemon for service activation in KDE
 .SH DESCRIPTION
-!!! \fBklauncher\fP is started automatically by tdeinit. It is not supposed to be started manually. !!!
+!!! \fBtdelauncher\fP is started automatically by tdeinit. It is not supposed to be started manually. !!!
 .sp 1
-\fBklauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the tdeinit master process to start new processes. KDE applications communicate with \fBklauncher\fP via DCOP to start new applications or services.
+\fBtdelauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the tdeinit master process to start new processes. KDE applications communicate with \fBtdelauncher\fP via DCOP to start new applications or services.
 .sp 1
-The error message "KLauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBklauncher\fP crashed.
+The error message "KLauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
 .sp 1
-Note: \fBklauncher\fP is not the "run command" dialog (Alt+F2)!
+Note: \fBtdelauncher\fP is not the "run command" dialog (Alt+F2)!
 .SH SEE ALSO
 .BR dcopserver (1),\  tdeinit (1)
 .SH AUTHORS
diff --git a/ubuntu/precise/tdelibs/debian/man/kmailservice-trinity.sgml b/ubuntu/precise/tdelibs/debian/man/tdemailservice-trinity.sgml
index 506038dee..2ca9a311a 100644
--- a/ubuntu/precise/tdelibs/debian/man/kmailservice-trinity.sgml
+++ b/ubuntu/precise/tdelibs/debian/man/tdemailservice-trinity.sgml
@@ -27,7 +27,7 @@ manpage.1: manpage.sgml
   <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
   <!ENTITY dhusername  "Chris Cheney">
   <!ENTITY dhucpackage "<refentrytitle>KMAILSERVICE</refentrytitle>">
-  <!ENTITY dhpackage   "kmailservice">
+  <!ENTITY dhpackage   "tdemailservice">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
diff --git a/ubuntu/precise/tdelibs/debian/man/ksendbugmail-trinity.sgml b/ubuntu/precise/tdelibs/debian/man/tdesendbugmail-trinity.sgml
index 8276bf477..8276bf477 100644
--- a/ubuntu/precise/tdelibs/debian/man/ksendbugmail-trinity.sgml
+++ b/ubuntu/precise/tdelibs/debian/man/tdesendbugmail-trinity.sgml
diff --git a/ubuntu/precise/tdelibs/debian/man/kstartupconfig-trinity.1 b/ubuntu/precise/tdelibs/debian/man/tdestartupconfig-trinity.1
index 897dae97d..f9d0902f6 100644
--- a/ubuntu/precise/tdelibs/debian/man/kstartupconfig-trinity.1
+++ b/ubuntu/precise/tdelibs/debian/man/tdestartupconfig-trinity.1
@@ -1,22 +1,22 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KSTARTUPCONFIG 1 "Jun 2006" "K Desktop Environment" "configuration options loader"
 .SH NAME
-kstartupconfig, kdostartupconfig
+tdestartupconfig, tdedostartupconfig
 \- KDE configuration options loader
 .SH SYNOPSIS
-\fBkstartupconfig\fP [$TDEHOME]
+\fBtdestartupconfig\fP [$TDEHOME]
 .sp 1
-\fBkdostartupconfig\fP
+\fBtdedostartupconfig\fP
 .SH DESCRIPTION
-\fBkstartupconfig\fP loads configuration options for use in \fBstarttde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
+\fBtdestartupconfig\fP loads configuration options for use in \fBstarttde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBtdedostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
 .sp 1
 The configuration options to load are stored in \fIstartupconfigkeys\fP as one option per line. They follow the format <file> <group> <key> <default>. A complete group is addressed as <file> [<group>]. The configuration options are processed in the specified order so the missing default values for groups can be specified as single options after the group option.
 .sp 1
-\fBkstartupconfig\fP stores every line from \fIstartupconfigkeys\fP in \fIstartupconfigfiles\fP followed by the paths of all files relevant to the option. Lines with non\-existent files start with '!' in case they are created later. The list of files is terminated by a line starting with '*'.
+\fBtdestartupconfig\fP stores every line from \fIstartupconfigkeys\fP in \fIstartupconfigfiles\fP followed by the paths of all files relevant to the option. Lines with non\-existent files start with '!' in case they are created later. The list of files is terminated by a line starting with '*'.
 .sp 1
-If the timestamps of all relevant files are older than the timestamp of \fIstartupconfigfile\fP there is no need to update anything. Otherwise \fBkdostartupconfig\fP is launched to create or update the necessary files.
+If the timestamps of all relevant files are older than the timestamp of \fIstartupconfigfile\fP there is no need to update anything. Otherwise \fBtdedostartupconfig\fP is launched to create or update the necessary files.
 .sp 1
-\fBkdostartupconfig\fP writes values of the options to \fIstartupconfig\fP. \fIstartupconfig\fP is a shell script that sets the values to shell variables. The variables are named <file>_<group>_<key>.
+\fBtdedostartupconfig\fP writes values of the options to \fIstartupconfig\fP. \fIstartupconfig\fP is a shell script that sets the values to shell variables. The variables are named <file>_<group>_<key>.
 .sp 1
 \fBNotes:\fP
 .IP "     \-"
@@ -24,7 +24,7 @@ the \fIkdeglobals\fP config file is not used as a dependency for other config fi
 .IP "     \-"
 do not use frequently changed config files since the checking is timestamp\-based
 .IP "     \-"
-if \fBkconf_update\fP is used to update an option also touch the matching global config file to allow \fBkstartupconfig\fP to see changes
+if \fBtdeconf_update\fP is used to update an option also touch the matching global config file to allow \fBtdestartupconfig\fP to see changes
 .SH OPTIONS
 .TP
 .B $TDEHOME
@@ -42,7 +42,7 @@ configuration options and files they belong to
 .I $TDEHOME/share/config/startupconfigkeys
 configuration options to load
 .SH SEE ALSO
-.BR kconf_update (1),\  starttde (1)
+.BR tdeconf_update (1),\  starttde (1)
 .SH AUTHORS
 .nf
 Lubos Lunak <l.lunak@kde.org>
diff --git a/ubuntu/precise/tdelibs/debian/man/ktelnetservice-trinity.sgml b/ubuntu/precise/tdelibs/debian/man/tdetelnetservice-trinity.sgml
index 3f1ceebdc..31c82361f 100644
--- a/ubuntu/precise/tdelibs/debian/man/ktelnetservice-trinity.sgml
+++ b/ubuntu/precise/tdelibs/debian/man/tdetelnetservice-trinity.sgml
@@ -27,7 +27,7 @@ manpage.1: manpage.sgml
   <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
   <!ENTITY dhusername  "Chris Cheney">
   <!ENTITY dhucpackage "<refentrytitle>KTELNETSERVICE</refentrytitle>">
-  <!ENTITY dhpackage   "ktelnetservice">
+  <!ENTITY dhpackage   "tdetelnetservice">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
diff --git a/ubuntu/precise/tdelibs/debian/man/ktradertest-trinity.1 b/ubuntu/precise/tdelibs/debian/man/tdetradertest-trinity.1
index 62c5521ad..9311190be 100644
--- a/ubuntu/precise/tdelibs/debian/man/ktradertest-trinity.1
+++ b/ubuntu/precise/tdelibs/debian/man/tdetradertest-trinity.1
@@ -1,18 +1,18 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KTRADERTEST 1 "Jun 2006" "K Desktop Environment" "A KTrader testing tool"
 .SH NAME
-ktradertest
+tdetradertest
 \- A KTrader testing tool
 .SH SYNOPSIS
-\fBktradertest\fP [Qt\-options] [KDE\-options] query [genericServiceType] [constraint] [preference] 
+\fBtdetradertest\fP [Qt\-options] [KDE\-options] query [genericServiceType] [constraint] [preference] 
 .SH DESCRIPTION
-\fBktradertest\fP is a command line tool to run trader queries.
+\fBtdetradertest\fP is a command line tool to run trader queries.
 .sp 1
 KTrader uses .desktop files to store information on Servicetypes and services. It provides a way to query all KDE services (applications and components) that match a specific set of requirements.
 .sp 1
 A query to KTrader results in a list of services.
 .sp 1
-For example, \fBktradertest image/jpeg\fP shows a list of image manipulation programs.
+For example, \fBtdetradertest image/jpeg\fP shows a list of image manipulation programs.
 .SH OPTIONS
 .SS
 .SS Arguments:
diff --git a/ubuntu/precise/tdelibs/debian/prune-nonfree b/ubuntu/precise/tdelibs/debian/prune-nonfree
index cb24b5db4..c6121e836 100644
--- a/ubuntu/precise/tdelibs/debian/prune-nonfree
+++ b/ubuntu/precise/tdelibs/debian/prune-nonfree
@@ -9,7 +9,7 @@ if [ "$TOPLEVEL" = "" ]; then
 	echo "Please provide the toplevel directory as the argument."
 	exit 1
 else
-	rm -f $TOPLEVEL/kioslave/http/kcookiejar/rfc*
+	rm -f $TOPLEVEL/tdeioslave/http/kcookiejar/rfc*
 fi
 
 exit 0
diff --git a/ubuntu/precise/tdelibs/debian/rules b/ubuntu/precise/tdelibs/debian/rules
index 5f8394ae6..cacd6bbca 100755
--- a/ubuntu/precise/tdelibs/debian/rules
+++ b/ubuntu/precise/tdelibs/debian/rules
@@ -99,6 +99,6 @@ common-install-prehook-impl::
 	fi
 
 binary-install/tdelibs4c2a-trinity::
-	mv debian/tmp/opt/trinity/bin/kcmshell debian/tmp/opt/trinity/bin/kcmshell.real
-	install -p -D -m755 debian/tmp/opt/trinity/bin/kcmshell.real debian/tdelibs4c2a-trinity/opt/trinity/bin/kcmshell.real
-	install -p -D -m755 debian/kcmshell debian/tdelibs4c2a-trinity/opt/trinity/bin/kcmshell
+	mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real
+	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs4c2a-trinity/opt/trinity/bin/tdecmshell.real
+	install -p -D -m755 debian/tdecmshell debian/tdelibs4c2a-trinity/opt/trinity/bin/tdecmshell
diff --git a/ubuntu/precise/tdelibs/debian/tdecmshell b/ubuntu/precise/tdelibs/debian/tdecmshell
new file mode 100755
index 000000000..4e24cd356
--- /dev/null
+++ b/ubuntu/precise/tdelibs/debian/tdecmshell
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export TDEDIRS=/usr/:/opt/trinity/
+/opt/trinity/bin/tdecmshell.real $1 $2 $3 $4 $5 $6 $7 $8
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install
index 9bcd52fc7..98ccf5d11 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/etc/trinity/khotnewstuffrc
+debian/tmp/etc/trinity/tdehotnewstuffrc
 debian/tmp/etc/trinity/colors/40.colors
 debian/tmp/etc/trinity/colors/Rainbow.colors
 debian/tmp/etc/trinity/colors/Royal.colors
@@ -38,14 +38,14 @@ debian/tmp/opt/trinity/share/apps/katepart/syntax/*.xml
 debian/tmp/opt/trinity/share/apps/tdecertpart/tdecertpart.rc
 debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_instantmessenger.desktop
 debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_tdetexteditor.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/kcookiescfg.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kded.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/tdeprintrc.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kio_help.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kioslave.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/move_kio_help_cache.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/proxytype.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/useragent.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kcookiescfg.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kded.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/tdeprintrc.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kio_help.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/tdeioslave.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/move_kio_help_cache.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/proxytype.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/useragent.pl
 debian/tmp/opt/trinity/share/apps/tdeprint/apsdriver1
 debian/tmp/opt/trinity/share/apps/tdeprint/apsdriver2
 debian/tmp/opt/trinity/share/apps/tdeprint/cupsd.conf.template
@@ -245,7 +245,7 @@ debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/64x64/actions/bug.png
 debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_browser.rc
 debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_popupmenu.rc
 debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml.rc
-debian/tmp/opt/trinity/share/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png
+debian/tmp/opt/trinity/share/apps/tdeio_uiserver/icons/crystalsvg/16x16/apps/tdeio_uiserver.png
 debian/tmp/opt/trinity/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png
 debian/tmp/opt/trinity/share/apps/kjava/kjava.jar
 debian/tmp/opt/trinity/share/apps/kjava/kjava.policy
@@ -1724,7 +1724,7 @@ debian/tmp/opt/trinity/share/apps/LICENSES/GPL_V2
 debian/tmp/opt/trinity/share/apps/LICENSES/LGPL_V2
 debian/tmp/opt/trinity/share/apps/LICENSES/QPL_V1.0
 debian/tmp/opt/trinity/share/apps/proxyscout/eventsrc
-debian/tmp/opt/trinity/share/autostart/kab2kabc.desktop
+debian/tmp/opt/trinity/share/autostart/tdeab2tdeabc.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/10.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/2.png
@@ -3611,9 +3611,9 @@ debian/tmp/opt/trinity/share/services/kded/proxyscout.desktop
 debian/tmp/opt/trinity/share/services/kgzipfilter.desktop
 debian/tmp/opt/trinity/share/services/tdehtml.desktop
 debian/tmp/opt/trinity/share/services/tdehtmlimage.desktop
-debian/tmp/opt/trinity/share/services/kio_uiserver.desktop
+debian/tmp/opt/trinity/share/services/tdeio_uiserver.desktop
 debian/tmp/opt/trinity/share/services/kjavaappletviewer.desktop
-debian/tmp/opt/trinity/share/services/kmailservice.protocol
+debian/tmp/opt/trinity/share/services/tdemailservice.protocol
 debian/tmp/opt/trinity/share/services/tdemultipart.desktop
 debian/tmp/opt/trinity/share/services/knotify.desktop
 debian/tmp/opt/trinity/share/services/tderesources/kabc/dir.desktop
@@ -3666,7 +3666,7 @@ debian/tmp/opt/trinity/share/servicetypes/tdecmodule.desktop
 debian/tmp/opt/trinity/share/servicetypes/kcomprfilter.desktop
 debian/tmp/opt/trinity/share/servicetypes/kdatatool.desktop
 debian/tmp/opt/trinity/share/servicetypes/kdedmodule.desktop
-debian/tmp/opt/trinity/share/servicetypes/kfileplugin.desktop
+debian/tmp/opt/trinity/share/servicetypes/tdefileplugin.desktop
 debian/tmp/opt/trinity/share/servicetypes/tdemediaplayer.desktop
 debian/tmp/opt/trinity/share/servicetypes/tdemediaplayerengine.desktop
 debian/tmp/opt/trinity/share/servicetypes/kpart.desktop
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install
index 6f7afbc0c..267909be7 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/checkXML
 debian/tmp/opt/trinity/bin/dcopidl
 debian/tmp/opt/trinity/bin/dcopidl2cpp
 debian/tmp/opt/trinity/bin/dcopidlng
-debian/tmp/opt/trinity/bin/kconfig_compiler
+debian/tmp/opt/trinity/bin/tdeconfig_compiler
 debian/tmp/opt/trinity/bin/ksvgtopng
 debian/tmp/opt/trinity/bin/tdeunittestmodrunner
 debian/tmp/opt/trinity/bin/makekdewidgets
@@ -175,13 +175,13 @@ debian/tmp/opt/trinity/include/kcombobox.h
 debian/tmp/opt/trinity/include/kcommand.h
 debian/tmp/opt/trinity/include/kcompletionbox.h
 debian/tmp/opt/trinity/include/kcompletion.h
-debian/tmp/opt/trinity/include/kconfigbackend.h
-debian/tmp/opt/trinity/include/kconfigbase.h
-debian/tmp/opt/trinity/include/kconfigdata.h
-debian/tmp/opt/trinity/include/kconfigdialog.h
-debian/tmp/opt/trinity/include/kconfigdialogmanager.h
-debian/tmp/opt/trinity/include/kconfig.h
-debian/tmp/opt/trinity/include/kconfigskeleton.h
+debian/tmp/opt/trinity/include/tdeconfigbackend.h
+debian/tmp/opt/trinity/include/tdeconfigbase.h
+debian/tmp/opt/trinity/include/tdeconfigdata.h
+debian/tmp/opt/trinity/include/tdeconfigdialog.h
+debian/tmp/opt/trinity/include/tdeconfigdialogmanager.h
+debian/tmp/opt/trinity/include/tdeconfig.h
+debian/tmp/opt/trinity/include/tdeconfigskeleton.h
 debian/tmp/opt/trinity/include/kcpuinfo.h
 debian/tmp/opt/trinity/include/kcrash.h
 debian/tmp/opt/trinity/include/kcursor.h
@@ -257,21 +257,21 @@ debian/tmp/opt/trinity/include/kemailsettings.h
 debian/tmp/opt/trinity/include/kencodingfiledialog.h
 debian/tmp/opt/trinity/include/kextendedsocket.h
 debian/tmp/opt/trinity/include/kextsock.h
-debian/tmp/opt/trinity/include/kfiledetailview.h
-debian/tmp/opt/trinity/include/kfiledialog.h
-debian/tmp/opt/trinity/include/kfilefiltercombo.h
-debian/tmp/opt/trinity/include/kfilefilter.h
-debian/tmp/opt/trinity/include/kfile.h
-debian/tmp/opt/trinity/include/kfileiconview.h
-debian/tmp/opt/trinity/include/kfileitem.h
-debian/tmp/opt/trinity/include/kfilemetainfo.h
-debian/tmp/opt/trinity/include/kfilepreview.h
-debian/tmp/opt/trinity/include/kfilesharedlg.h
-debian/tmp/opt/trinity/include/kfileshare.h
-debian/tmp/opt/trinity/include/kfiletreebranch.h
-debian/tmp/opt/trinity/include/kfiletreeview.h
-debian/tmp/opt/trinity/include/kfiletreeviewitem.h
-debian/tmp/opt/trinity/include/kfileview.h
+debian/tmp/opt/trinity/include/tdefiledetailview.h
+debian/tmp/opt/trinity/include/tdefiledialog.h
+debian/tmp/opt/trinity/include/tdefilefiltercombo.h
+debian/tmp/opt/trinity/include/tdefilefilter.h
+debian/tmp/opt/trinity/include/tdefile.h
+debian/tmp/opt/trinity/include/tdefileiconview.h
+debian/tmp/opt/trinity/include/tdefileitem.h
+debian/tmp/opt/trinity/include/tdefilemetainfo.h
+debian/tmp/opt/trinity/include/tdefilepreview.h
+debian/tmp/opt/trinity/include/tdefilesharedlg.h
+debian/tmp/opt/trinity/include/tdefileshare.h
+debian/tmp/opt/trinity/include/tdefiletreebranch.h
+debian/tmp/opt/trinity/include/tdefiletreeview.h
+debian/tmp/opt/trinity/include/tdefiletreeviewitem.h
+debian/tmp/opt/trinity/include/tdefileview.h
 debian/tmp/opt/trinity/include/kfilterbase.h
 debian/tmp/opt/trinity/include/kfilterdev.h
 debian/tmp/opt/trinity/include/kfinddialog.h
@@ -756,14 +756,14 @@ debian/tmp/opt/trinity/lib/libtdefx.so
 debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.la
 debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.la
 debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.la
-debian/tmp/opt/trinity/lib/libtdeinit_kbuildsycoca.la
-debian/tmp/opt/trinity/lib/libtdeinit_kcmshell.la
-debian/tmp/opt/trinity/lib/libtdeinit_kconf_update.la
+debian/tmp/opt/trinity/lib/libtdeinit_tdebuildsycoca.la
+debian/tmp/opt/trinity/lib/libtdeinit_tdecmshell.la
+debian/tmp/opt/trinity/lib/libtdeinit_tdeconf_update.la
 debian/tmp/opt/trinity/lib/libtdeinit_kcookiejar.la
 debian/tmp/opt/trinity/lib/libtdeinit_kded.la
 debian/tmp/opt/trinity/lib/libtdeinit_kio_http_cache_cleaner.la
-debian/tmp/opt/trinity/lib/libtdeinit_kio_uiserver.la
-debian/tmp/opt/trinity/lib/libtdeinit_klauncher.la
+debian/tmp/opt/trinity/lib/libtdeinit_tdeio_uiserver.la
+debian/tmp/opt/trinity/lib/libtdeinit_tdelauncher.la
 debian/tmp/opt/trinity/lib/libtdeprint.la
 debian/tmp/opt/trinity/lib/libtdeprint_management.la
 debian/tmp/opt/trinity/lib/libtdeprint_management.so
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.manpages b/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.manpages
index e5756a2db..d85730422 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.manpages
+++ b/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.manpages
@@ -1,4 +1,4 @@
-./debian/man/kconfig_compiler-trinity.1
+./debian/man/tdeconfig_compiler-trinity.1
 ./debian/man/ksvgtopng-trinity.1
 ./debian/man/tdeunittestmodrunner-trinity.1
 ./debian/man/makekdewidgets-trinity.1
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.install
index 4d1bb325b..182f67f3e 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -13,10 +13,10 @@ debian/tmp/opt/trinity/bin/dcopstart
 debian/tmp/opt/trinity/bin/filesharelist
 debian/tmp/opt/trinity/bin/fileshareset
 debian/tmp/opt/trinity/bin/imagetops
-debian/tmp/opt/trinity/bin/kab2kabc
+debian/tmp/opt/trinity/bin/tdeab2tdeabc
 debian/tmp/opt/trinity/bin/kaddprinterwizard
-debian/tmp/opt/trinity/bin/kbuildsycoca
-debian/tmp/opt/trinity/bin/kconf_update
+debian/tmp/opt/trinity/bin/tdebuildsycoca
+debian/tmp/opt/trinity/bin/tdeconf_update
 debian/tmp/opt/trinity/bin/kcookiejar
 debian/tmp/opt/trinity/bin/tde-config
 debian/tmp/opt/trinity/bin/kded
@@ -25,27 +25,27 @@ debian/tmp/opt/trinity/bin/tdeinit_shutdown
 debian/tmp/opt/trinity/bin/tdeinit_wrapper
 debian/tmp/opt/trinity/bin/tde_dbus_hardwarecontrol
 debian/tmp/opt/trinity/bin/kdetcompmgr
-debian/tmp/opt/trinity/bin/kde-menu
+debian/tmp/opt/trinity/bin/tde-menu
 debian/tmp/opt/trinity/bin/tdesu_stub
 debian/tmp/opt/trinity/bin/kdontchangethehostname
-debian/tmp/opt/trinity/bin/kdostartupconfig
-debian/tmp/opt/trinity/bin/kfile
+debian/tmp/opt/trinity/bin/tdedostartupconfig
+debian/tmp/opt/trinity/bin/tdefile
 debian/tmp/opt/trinity/bin/kfmexec
 debian/tmp/opt/trinity/bin/kgrantpty
-debian/tmp/opt/trinity/bin/khotnewstuff
+debian/tmp/opt/trinity/bin/tdehotnewstuff
 debian/tmp/opt/trinity/bin/kinstalltheme
-debian/tmp/opt/trinity/bin/kioexec
+debian/tmp/opt/trinity/bin/tdeioexec
 debian/tmp/opt/trinity/bin/kio_http_cache_cleaner
-debian/tmp/opt/trinity/bin/kioslave
-debian/tmp/opt/trinity/bin/kio_uiserver
-debian/tmp/opt/trinity/bin/klauncher
-debian/tmp/opt/trinity/bin/kmailservice
+debian/tmp/opt/trinity/bin/tdeioslave
+debian/tmp/opt/trinity/bin/tdeio_uiserver
+debian/tmp/opt/trinity/bin/tdelauncher
+debian/tmp/opt/trinity/bin/tdemailservice
 debian/tmp/opt/trinity/bin/kpac_dhcp_helper
-debian/tmp/opt/trinity/bin/ksendbugmail
+debian/tmp/opt/trinity/bin/tdesendbugmail
 debian/tmp/opt/trinity/bin/kshell
-debian/tmp/opt/trinity/bin/kstartupconfig
-debian/tmp/opt/trinity/bin/ktelnetservice
-debian/tmp/opt/trinity/bin/ktradertest
+debian/tmp/opt/trinity/bin/tdestartupconfig
+debian/tmp/opt/trinity/bin/tdetelnetservice
+debian/tmp/opt/trinity/bin/tdetradertest
 debian/tmp/opt/trinity/bin/kwrapper
 debian/tmp/opt/trinity/bin/lnusertemp
 debian/tmp/opt/trinity/bin/make_driver_db_cups
@@ -71,16 +71,16 @@ debian/tmp/opt/trinity/lib/trinity/kabc_ldapkio.so
 
 debian/tmp/opt/trinity/lib/trinity/kaddprinterwizard.la
 debian/tmp/opt/trinity/lib/trinity/kaddprinterwizard.so
-debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.la
-debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.so
+debian/tmp/opt/trinity/lib/trinity/tdebuildsycoca.la
+debian/tmp/opt/trinity/lib/trinity/tdebuildsycoca.so
 debian/tmp/opt/trinity/lib/trinity/kbzip2filter.la
 debian/tmp/opt/trinity/lib/trinity/kbzip2filter.so
 debian/tmp/opt/trinity/lib/trinity/kcm_tderesources.la
 debian/tmp/opt/trinity/lib/trinity/kcm_tderesources.so
-debian/tmp/opt/trinity/lib/trinity/kcmshell.la
-debian/tmp/opt/trinity/lib/trinity/kcmshell.so
-debian/tmp/opt/trinity/lib/trinity/kconf_update.la
-debian/tmp/opt/trinity/lib/trinity/kconf_update.so
+debian/tmp/opt/trinity/lib/trinity/tdecmshell.la
+debian/tmp/opt/trinity/lib/trinity/tdecmshell.so
+debian/tmp/opt/trinity/lib/trinity/tdeconf_update.la
+debian/tmp/opt/trinity/lib/trinity/tdeconf_update.so
 debian/tmp/opt/trinity/lib/trinity/kcookiejar.la
 debian/tmp/opt/trinity/lib/trinity/kcookiejar.so
 debian/tmp/opt/trinity/lib/trinity/kded_kcookiejar.la
@@ -111,8 +111,8 @@ debian/tmp/opt/trinity/lib/trinity/tdeprint_rlpr.la
 debian/tmp/opt/trinity/lib/trinity/tdeprint_rlpr.so
 debian/tmp/opt/trinity/lib/trinity/tdeprint_tool_escputil.la
 debian/tmp/opt/trinity/lib/trinity/tdeprint_tool_escputil.so
-debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.la
-debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.so
+debian/tmp/opt/trinity/lib/trinity/tdefileaudiopreview.la
+debian/tmp/opt/trinity/lib/trinity/tdefileaudiopreview.so
 debian/tmp/opt/trinity/lib/trinity/kgzipfilter.la
 debian/tmp/opt/trinity/lib/trinity/kgzipfilter.so
 debian/tmp/opt/trinity/lib/trinity/tdehtmlimagepart.la
@@ -159,12 +159,12 @@ debian/tmp/opt/trinity/lib/trinity/kio_iso.la
 debian/tmp/opt/trinity/lib/trinity/kio_iso.so
 debian/tmp/opt/trinity/lib/trinity/kio_metainfo.la
 debian/tmp/opt/trinity/lib/trinity/kio_metainfo.so
-debian/tmp/opt/trinity/lib/trinity/kio_uiserver.la
-debian/tmp/opt/trinity/lib/trinity/kio_uiserver.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_uiserver.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_uiserver.so
 debian/tmp/opt/trinity/lib/trinity/kjavaappletviewer.la
 debian/tmp/opt/trinity/lib/trinity/kjavaappletviewer.so
-debian/tmp/opt/trinity/lib/trinity/klauncher.la
-debian/tmp/opt/trinity/lib/trinity/klauncher.so
+debian/tmp/opt/trinity/lib/trinity/tdelauncher.la
+debian/tmp/opt/trinity/lib/trinity/tdelauncher.so
 debian/tmp/opt/trinity/lib/trinity/knotify.la
 debian/tmp/opt/trinity/lib/trinity/knotify.so
 debian/tmp/opt/trinity/lib/trinity/tdespell_aspell.la
@@ -246,14 +246,14 @@ debian/tmp/opt/trinity/lib/libtdefx.so.4.2.0
 debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.so
 debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.so
 debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.so
-debian/tmp/opt/trinity/lib/libtdeinit_kbuildsycoca.so
-debian/tmp/opt/trinity/lib/libtdeinit_kcmshell.so
-debian/tmp/opt/trinity/lib/libtdeinit_kconf_update.so
+debian/tmp/opt/trinity/lib/libtdeinit_tdebuildsycoca.so
+debian/tmp/opt/trinity/lib/libtdeinit_tdecmshell.so
+debian/tmp/opt/trinity/lib/libtdeinit_tdeconf_update.so
 debian/tmp/opt/trinity/lib/libtdeinit_kcookiejar.so
 debian/tmp/opt/trinity/lib/libtdeinit_kded.so
 debian/tmp/opt/trinity/lib/libtdeinit_kio_http_cache_cleaner.so
-debian/tmp/opt/trinity/lib/libtdeinit_kio_uiserver.so
-debian/tmp/opt/trinity/lib/libtdeinit_klauncher.so
+debian/tmp/opt/trinity/lib/libtdeinit_tdeio_uiserver.so
+debian/tmp/opt/trinity/lib/libtdeinit_tdelauncher.so
 debian/tmp/opt/trinity/lib/libtdeprint_management.so.4
 debian/tmp/opt/trinity/lib/libtdeprint_management.so.4.2.0
 debian/tmp/opt/trinity/lib/libtdeprint.so.4
@@ -316,9 +316,9 @@ debian/tmp/opt/trinity/lib/libtdewalletclient.so.1
 debian/tmp/opt/trinity/lib/libtdewalletclient.so.1.0.1
 debian/tmp/opt/trinity/lib/libvcard.so.0
 debian/tmp/opt/trinity/lib/libvcard.so.0.0.0
-debian/tmp/opt/trinity/share/services/kfile_elf.desktop
-debian/tmp/opt/trinity/lib/trinity/kfile_elf.so
-debian/tmp/opt/trinity/lib/trinity/kfile_elf.la
+debian/tmp/opt/trinity/share/services/tdefile_elf.desktop
+debian/tmp/opt/trinity/lib/trinity/tdefile_elf.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_elf.la
 debian/tmp/opt/trinity/share/apps/tdehwlib/deviceclasses/*
 debian/tmp/opt/trinity/share/apps/tdehwlib/pnpdev/*
 
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.lintian b/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.lintian
index 593ec30ed..75982e4c1 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.lintian
+++ b/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.lintian
@@ -1,14 +1,14 @@
 tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
 tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
 tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcmshell.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
 tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kio_http_cache_cleaner.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kbuildsycoca.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
 tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
 tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_klauncher.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kconf_update.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kio_uiserver.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
 tdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
 tdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
 tdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.manpages b/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.manpages
index ef5a28c2f..505fcc7c9 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.manpages
+++ b/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.manpages
@@ -5,19 +5,19 @@ debian/man/out/dcopfind-trinity.1
 debian/man/out/dcopserver-trinity.1
 debian/man/out/dcopstart-trinity.1
 debian/man/out/kaddprinterwizard-trinity.1
-debian/man/out/kbuildsycoca-trinity.1
-debian/man/out/kconf_update-trinity.1
+debian/man/out/tdebuildsycoca-trinity.1
+debian/man/out/tdeconf_update-trinity.1
 debian/man/out/kcookiejar-trinity.1
 debian/man/out/tde-config-trinity.1
 debian/man/out/kded-trinity.1
 debian/man/out/kdontchangethehostname-trinity.1
-debian/man/out/kfile-trinity.1
+debian/man/out/tdefile-trinity.1
 debian/man/out/kinstalltheme-trinity.1
 debian/man/out/kio_http_cache_cleaner-trinity.1
-debian/man/out/kio_uiserver-trinity.1
-debian/man/out/kmailservice-trinity.1
-debian/man/out/ksendbugmail-trinity.1
-debian/man/out/ktelnetservice-trinity.1
+debian/man/out/tdeio_uiserver-trinity.1
+debian/man/out/tdemailservice-trinity.1
+debian/man/out/tdesendbugmail-trinity.1
+debian/man/out/tdetelnetservice-trinity.1
 debian/man/out/lnusertemp-trinity.1
 debian/man/out/meinproc-trinity.1
 ./debian/man/tdeinit-trinity.1
@@ -29,18 +29,18 @@ debian/man/out/meinproc-trinity.1
 ./debian/man/dcopserver_shutdown-trinity.1
 ./debian/man/fileshareset-trinity.1
 ./debian/man/imagetops-trinity.1
-./debian/man/kab2kabc-trinity.1
-./debian/man/kcmshell-trinity.1
+./debian/man/tdeab2tdeabc-trinity.1
+./debian/man/tdecmshell-trinity.1
 ./debian/man/tdeinit_shutdown-trinity.1
-./debian/man/kde-menu-trinity.1
+./debian/man/tde-menu-trinity.1
 ./debian/man/tdesu_stub-trinity.1
 ./debian/man/kgrantpty-trinity.1
-./debian/man/khotnewstuff-trinity.1
-./debian/man/kioexec-trinity.1
-./debian/man/klauncher-trinity.1
+./debian/man/tdehotnewstuff-trinity.1
+./debian/man/tdeioexec-trinity.1
+./debian/man/tdelauncher-trinity.1
 ./debian/man/kpac_dhcp_helper-trinity.1
 ./debian/man/kshell-trinity.1
-./debian/man/kstartupconfig-trinity.1
-./debian/man/ktradertest-trinity.1
+./debian/man/tdestartupconfig-trinity.1
+./debian/man/tdetradertest-trinity.1
 ./debian/man/make_driver_db_cups-trinity.1
 ./debian/man/make_driver_db_lpr-trinity.1
diff --git a/ubuntu/precise/tdemultimedia/debian/changelog b/ubuntu/precise/tdemultimedia/debian/changelog
index 70dc106df..f6c8c5527 100644
--- a/ubuntu/precise/tdemultimedia/debian/changelog
+++ b/ubuntu/precise/tdemultimedia/debian/changelog
@@ -404,7 +404,7 @@ tdemultimedia (4:3.5.1-0ubuntu1) dapper; urgency=low
 
 tdemultimedia (4:3.5.0-0ubuntu2) dapper; urgency=low
 
-  * Tighten version of Replaces on tdemultimedia-kfile-plugins
+  * Tighten version of Replaces on tdemultimedia-tdefile-plugins
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  6 Jan 2006 18:33:11 +0000
 
diff --git a/ubuntu/precise/tdemultimedia/debian/control b/ubuntu/precise/tdemultimedia/debian/control
index 42f607611..866ee43eb 100644
--- a/ubuntu/precise/tdemultimedia/debian/control
+++ b/ubuntu/precise/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-kfile-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-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})
 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
@@ -131,13 +131,13 @@ Description: CD ripper and audio encoder frontend for 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-kfile-plugins-trinity
+Package: tdemultimedia-tdefile-plugins-trinity
 Section: tde
 Architecture: any
-Replaces: kdemultimedia-kfile-plugins-trinity (<< 4:14.0.0)
-Breaks: kdemultimedia-kfile-plugins-trinity (<< 4:14.0.0)
+Replaces: kdemultimedia-tdefile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdemultimedia-tdefile-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Description: au/avi/m3u/mp3/ogg/wav plugins for kfile
+Description: au/avi/m3u/mp3/ogg/wav plugins for tdefile
  au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
diff --git a/ubuntu/precise/tdemultimedia/debian/control.in b/ubuntu/precise/tdemultimedia/debian/control.in
index 4bf762241..f79201647 100644
--- a/ubuntu/precise/tdemultimedia/debian/control.in
+++ b/ubuntu/precise/tdemultimedia/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdemultimedia
 Section: tde
 Architecture: all
-Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-kfile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), tdemid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version})
+Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-tdefile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), tdemid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version})
 Suggests: tdemultimedia-doc-html (>= ${Source-Version})
 Description: multimedia apps from the official KDE release 
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -119,12 +119,12 @@ Description: CD ripper and audio encoder frontend for KDE
  This package is part of KDE, as a component of the KDE multimedia module.
  See the 'kde' and 'tdemultimedia' packages for more information.
 
-Package: tdemultimedia-kfile-plugins
+Package: tdemultimedia-tdefile-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: tdemultimedia-kio-plugins (<< 4:3.4.1-1)
-Description: au/avi/m3u/mp3/ogg/wav plugins for kfile
+Description: au/avi/m3u/mp3/ogg/wav plugins for tdefile
  au/avi/m3u/mp3/ogg/wav file metainformation plugins for KDE.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
diff --git a/ubuntu/precise/tdemultimedia/debian/copyright b/ubuntu/precise/tdemultimedia/debian/copyright
index f85e02329..42b700d89 100644
--- a/ubuntu/precise/tdemultimedia/debian/copyright
+++ b/ubuntu/precise/tdemultimedia/debian/copyright
@@ -14,7 +14,7 @@ in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and
 
 
 aktion, arts/builder, arts/runtime, arts/tools,
-kfile-plugins, tdemid, tdemidi, koncd, kscd
+tdefile-plugins, tdemid, tdemidi, koncd, kscd
 -----------------------------------------------
 GPL
 
diff --git a/ubuntu/precise/tdemultimedia/debian/kaudiocreator-trinity.install b/ubuntu/precise/tdemultimedia/debian/kaudiocreator-trinity.install
index 136265d9c..4569bbf20 100644
--- a/ubuntu/precise/tdemultimedia/debian/kaudiocreator-trinity.install
+++ b/ubuntu/precise/tdemultimedia/debian/kaudiocreator-trinity.install
@@ -3,9 +3,9 @@ debian/tmp/opt/trinity/share/applications/tde/kaudiocreator.desktop
 debian/tmp/opt/trinity/share/apps/kaudiocreator/eventsrc
 debian/tmp/opt/trinity/share/apps/kaudiocreator/kaudiocreatorui.rc
 debian/tmp/opt/trinity/share/apps/kaudiocreator/pics/check.png
-debian/tmp/opt/trinity/share/apps/kconf_update/kaudiocreator-libkcddb.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kaudiocreator-meta.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/upgrade-kaudiocreator-metadata.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kaudiocreator-libkcddb.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kaudiocreator-meta.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/upgrade-kaudiocreator-metadata.sh
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/audiocd_extract.desktop
 debian/tmp/opt/trinity/share/config.kcfg/kaudiocreator.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/kaudiocreator_encoders.kcfg
diff --git a/ubuntu/precise/tdemultimedia/debian/libkcddb1-trinity.install b/ubuntu/precise/tdemultimedia/debian/libkcddb1-trinity.install
index d9858c0dc..b1ffb9a1c 100644
--- a/ubuntu/precise/tdemultimedia/debian/libkcddb1-trinity.install
+++ b/ubuntu/precise/tdemultimedia/debian/libkcddb1-trinity.install
@@ -3,5 +3,5 @@ debian/tmp/opt/trinity/lib/trinity/kcm_cddb.so
 debian/tmp/opt/trinity/lib/libkcddb.so.1
 debian/tmp/opt/trinity/lib/libkcddb.so.1.0.0
 debian/tmp/opt/trinity/share/applications/tde/libkcddb.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/kcmcddb-emailsettings.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kcmcddb-emailsettings.upd
 debian/tmp/opt/trinity/share/config.kcfg/libkcddb.kcfg
diff --git a/ubuntu/precise/tdemultimedia/debian/noatun-trinity.install b/ubuntu/precise/tdemultimedia/debian/noatun-trinity.install
index 554c5cf07..e5adf0383 100644
--- a/ubuntu/precise/tdemultimedia/debian/noatun-trinity.install
+++ b/ubuntu/precise/tdemultimedia/debian/noatun-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/noatun
-debian/tmp/opt/trinity/lib/kconf_update_bin/noatun20update
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/noatun20update
 debian/tmp/opt/trinity/lib/trinity/noatun.la
 debian/tmp/opt/trinity/lib/trinity/noatun.so
 debian/tmp/opt/trinity/lib/trinity/noatun_dcopiface.la
@@ -72,7 +72,7 @@ debian/tmp/opt/trinity/lib/mcop/noatunarts.mcoptype
 debian/tmp/opt/trinity/lib/mcop/winskinvis.mcopclass
 debian/tmp/opt/trinity/lib/mcop/winskinvis.mcoptype
 debian/tmp/opt/trinity/share/applications/tde/noatun.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/noatun.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/noatun.upd
 debian/tmp/opt/trinity/share/apps/noatun/dcopiface.plugin
 debian/tmp/opt/trinity/share/apps/noatun/eq.preset/preset.dance
 debian/tmp/opt/trinity/share/apps/noatun/eq.preset/preset.jazz
diff --git a/ubuntu/precise/tdemultimedia/debian/tdemultimedia-kfile-plugins-trinity.install b/ubuntu/precise/tdemultimedia/debian/tdemultimedia-kfile-plugins-trinity.install
deleted file mode 100644
index 422efd2a4..000000000
--- a/ubuntu/precise/tdemultimedia/debian/tdemultimedia-kfile-plugins-trinity.install
+++ /dev/null
@@ -1,33 +0,0 @@
-debian/tmp/opt/trinity/lib/trinity/kfile_au.la
-debian/tmp/opt/trinity/lib/trinity/kfile_au.so
-debian/tmp/opt/trinity/lib/trinity/kfile_avi.la
-debian/tmp/opt/trinity/lib/trinity/kfile_avi.so
-debian/tmp/opt/trinity/lib/trinity/kfile_flac.la
-debian/tmp/opt/trinity/lib/trinity/kfile_flac.so
-debian/tmp/opt/trinity/lib/trinity/kfile_m3u.la
-debian/tmp/opt/trinity/lib/trinity/kfile_m3u.so
-debian/tmp/opt/trinity/lib/trinity/kfile_mp3.la
-debian/tmp/opt/trinity/lib/trinity/kfile_mp3.so
-debian/tmp/opt/trinity/lib/trinity/kfile_mpc.la
-debian/tmp/opt/trinity/lib/trinity/kfile_mpc.so
-debian/tmp/opt/trinity/lib/trinity/kfile_mpeg.la
-debian/tmp/opt/trinity/lib/trinity/kfile_mpeg.so
-debian/tmp/opt/trinity/lib/trinity/kfile_ogg.la
-debian/tmp/opt/trinity/lib/trinity/kfile_ogg.so
-debian/tmp/opt/trinity/lib/trinity/kfile_sid.la
-debian/tmp/opt/trinity/lib/trinity/kfile_sid.so
-debian/tmp/opt/trinity/lib/trinity/kfile_theora.la
-debian/tmp/opt/trinity/lib/trinity/kfile_theora.so
-debian/tmp/opt/trinity/lib/trinity/kfile_wav.la
-debian/tmp/opt/trinity/lib/trinity/kfile_wav.so
-debian/tmp/opt/trinity/share/services/kfile_au.desktop
-debian/tmp/opt/trinity/share/services/kfile_avi.desktop
-debian/tmp/opt/trinity/share/services/kfile_flac.desktop
-debian/tmp/opt/trinity/share/services/kfile_m3u.desktop
-debian/tmp/opt/trinity/share/services/kfile_mp3.desktop
-debian/tmp/opt/trinity/share/services/kfile_mpc.desktop
-debian/tmp/opt/trinity/share/services/kfile_mpeg.desktop
-debian/tmp/opt/trinity/share/services/kfile_ogg.desktop
-debian/tmp/opt/trinity/share/services/kfile_sid.desktop
-debian/tmp/opt/trinity/share/services/kfile_theora.desktop
-debian/tmp/opt/trinity/share/services/kfile_wav.desktop
diff --git a/ubuntu/precise/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install b/ubuntu/precise/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
index 82b4ef2b4..1cb78ea91 100644
--- a/ubuntu/precise/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
+++ b/ubuntu/precise/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
@@ -13,9 +13,9 @@ debian/tmp/opt/trinity/lib/trinity/libaudiocd_encoder_wav.so
 debian/tmp/opt/trinity/lib/libaudiocdplugins.so.1
 debian/tmp/opt/trinity/lib/libaudiocdplugins.so.1.0.0
 debian/tmp/opt/trinity/share/applications/tde/audiocd.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/audiocd.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/upgrade-metadata.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/audiocd.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/upgrade-metadata.sh
 debian/tmp/opt/trinity/share/config.kcfg/audiocd_lame_encoder.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/audiocd_vorbis_encoder.kcfg
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/audiocd.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/audiocd.docbook
 debian/tmp/opt/trinity/share/services/audiocd.protocol
diff --git a/ubuntu/precise/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install b/ubuntu/precise/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install
new file mode 100644
index 000000000..13381df12
--- /dev/null
+++ b/ubuntu/precise/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install
@@ -0,0 +1,33 @@
+debian/tmp/opt/trinity/lib/trinity/tdefile_au.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_au.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_avi.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_avi.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_flac.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_flac.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_m3u.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_m3u.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_mp3.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_mp3.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_mpc.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_mpc.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_mpeg.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_mpeg.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_ogg.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_ogg.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_sid.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_sid.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_theora.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_theora.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_wav.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_wav.so
+debian/tmp/opt/trinity/share/services/tdefile_au.desktop
+debian/tmp/opt/trinity/share/services/tdefile_avi.desktop
+debian/tmp/opt/trinity/share/services/tdefile_flac.desktop
+debian/tmp/opt/trinity/share/services/tdefile_m3u.desktop
+debian/tmp/opt/trinity/share/services/tdefile_mp3.desktop
+debian/tmp/opt/trinity/share/services/tdefile_mpc.desktop
+debian/tmp/opt/trinity/share/services/tdefile_mpeg.desktop
+debian/tmp/opt/trinity/share/services/tdefile_ogg.desktop
+debian/tmp/opt/trinity/share/services/tdefile_sid.desktop
+debian/tmp/opt/trinity/share/services/tdefile_theora.desktop
+debian/tmp/opt/trinity/share/services/tdefile_wav.desktop
diff --git a/ubuntu/precise/tdenetwork/debian/changelog b/ubuntu/precise/tdenetwork/debian/changelog
index 4510420ac..9a3af2560 100644
--- a/ubuntu/precise/tdenetwork/debian/changelog
+++ b/ubuntu/precise/tdenetwork/debian/changelog
@@ -558,7 +558,7 @@ tdenetwork (4:3.5.1-1) unstable; urgency=low
 
   +++ Changes by Isaac Clerencia:
 
-  * Put zeroconf kioslave and other tdednssd stuff in a new package, tdednssd.
+  * Put zeroconf tdeioslave and other tdednssd stuff in a new package, tdednssd.
 
   +++ Changes by Christopher Martin:
 
@@ -928,7 +928,7 @@ tdenetwork (4:3.4.0-0ubuntu1) hoary; urgency=low
 
 tdenetwork (4:3.4.0-0pre1ubuntu2) hoary; urgency=low
 
-  * Add dependency on tdenetwork-kfile-plugins to tdenetwork meta-package.
+  * Add dependency on tdenetwork-tdefile-plugins to tdenetwork meta-package.
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue,  8 Mar 2005 13:09:19 +0000
 
@@ -951,7 +951,7 @@ tdenetwork (4:3.4.0-0pre2) alioth; urgency=low
 
   * Switch to CDBS for packaging.
 
-  * Added new package tdenetwork-kfile-plugins.
+  * Added new package tdenetwork-tdefile-plugins.
 
   * ksirc now recommends libio-socket-ssl-perl, needed for SSL IRC servers
    (Closes: #294331)
diff --git a/ubuntu/precise/tdenetwork/debian/control b/ubuntu/precise/tdenetwork/debian/control
index a95cc81a7..407a4224b 100644
--- a/ubuntu/precise/tdenetwork/debian/control
+++ b/ubuntu/precise/tdenetwork/debian/control
@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdenetwork-trinity (<< 4:14.0.0)
 Breaks: kdenetwork-trinity (<< 4:14.0.0)
-Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), tdednssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version})
+Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-tdefile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), tdednssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version})
 Recommends: tdenetwork-filesharing-trinity (>= ${Source-Version}), ktalkd-trinity (>= ${Source-Version}), lisa-trinity (>= ${Source-Version})
 Suggests: tdenetwork-trinity-doc-html (>= ${Source-Version})
 Description: network-related apps from the official Trinity release
@@ -61,17 +61,17 @@ Description: Trinity network documentation in HTML format
  This package is part of KDE, and a component of the KDE network module.
  See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
-Package: tdenetwork-kfile-plugins-trinity
+Package: tdenetwork-tdefile-plugins-trinity
 Section: tde
 Architecture: any
-Replaces: kdenetwork-kfile-plugins-trinity (<< 4:14.0.0)
-Breaks: kdenetwork-kfile-plugins-trinity (<< 4:14.0.0)
+Replaces: kdenetwork-tdefile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdenetwork-tdefile-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Enhances: konqueror-trinity
 Description: torrent metainfo plugin for Trinity
  This package provides a metainformation plugin for bittorrent files.
  .
- Kde uses kfile-plugins to provide metainfo tab in the files properties
+ Kde uses tdefile-plugins to provide metainfo tab in the files properties
  dialog in konqueror and other file-handling applications.
  .
  This package is part of Trinity, as a component of the KDE network module.
@@ -340,7 +340,7 @@ Depends: ${shlibs:Depends}
 Recommends: avahi-daemon
 Suggests: avahi-autoipd | zeroconf
 Description: Zeroconf support for KDE
- A kioslave and kded module that provide Zeroconf support. Try
+ A tdeioslave and kded module that provide Zeroconf support. Try
  "zeroconf:/" in Konqueror.
  .
  This package is part of KDE, as a component of the KDE network module.
diff --git a/ubuntu/precise/tdenetwork/debian/control.in b/ubuntu/precise/tdenetwork/debian/control.in
index 7c7dfdc41..3c9f904e6 100644
--- a/ubuntu/precise/tdenetwork/debian/control.in
+++ b/ubuntu/precise/tdenetwork/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdenetwork
 Section: tde
 Architecture: all
-Depends: dcoprss (>= ${Source-Version}), tdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), tdednssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version})
+Depends: dcoprss (>= ${Source-Version}), tdenetwork-tdefile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), tdednssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version})
 Recommends: tdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version})
 Suggests: tdenetwork-doc-html (>= ${Source-Version})
 Description: network-related apps from the official KDE release
@@ -55,7 +55,7 @@ Description: KDE network documentation in HTML format
  This package is part of KDE, and a component of the KDE network module.
  See the 'kde' and 'tdenetwork' packages for more information.
 
-Package: tdenetwork-kfile-plugins
+Package: tdenetwork-tdefile-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -63,7 +63,7 @@ Enhances: konqueror
 Description: torrent metainfo plugin for KDE
  This package provides a metainformation plugin for bittorrent files.
  .
- Kde uses kfile-plugins to provide metainfo tab in the files properties
+ Kde uses tdefile-plugins to provide metainfo tab in the files properties
  dialog in konqueror and other file-handling applications.
  .
  This package is part of KDE, as a component of the KDE network module.
@@ -306,7 +306,7 @@ Depends: ${shlibs:Depends}
 Recommends: avahi-daemon
 Suggests: avahi-autoipd | zeroconf
 Description: Zeroconf support for KDE
- A kioslave and kded module that provide Zeroconf support. Try
+ A tdeioslave and kded module that provide Zeroconf support. Try
  "zeroconf:/" in Konqueror.
  .
  This package is part of KDE, as a component of the KDE network module.
diff --git a/ubuntu/precise/tdenetwork/debian/knewsticker-trinity.install b/ubuntu/precise/tdenetwork/debian/knewsticker-trinity.install
index 43560f7e5..a424a10a5 100644
--- a/ubuntu/precise/tdenetwork/debian/knewsticker-trinity.install
+++ b/ubuntu/precise/tdenetwork/debian/knewsticker-trinity.install
@@ -5,8 +5,8 @@ debian/tmp/opt/trinity/lib/trinity/libkntsrcfilepropsdlg.la
 debian/tmp/opt/trinity/lib/trinity/libkntsrcfilepropsdlg.so
 debian/tmp/opt/trinity/share/applications/tde/knewsticker-standalone.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/knewstickerstub.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/knewsticker.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/knt-0.1-0.2.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/knewsticker.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/knt-0.1-0.2.pl
 debian/tmp/opt/trinity/share/apps/kicker/applets/knewsticker.desktop
 debian/tmp/opt/trinity/share/apps/knewsticker/eventsrc
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/about-icon.png
diff --git a/ubuntu/precise/tdenetwork/debian/kopete-trinity.install b/ubuntu/precise/tdenetwork/debian/kopete-trinity.install
index f6ad9caa2..8f133483d 100644
--- a/ubuntu/precise/tdenetwork/debian/kopete-trinity.install
+++ b/ubuntu/precise/tdenetwork/debian/kopete-trinity.install
@@ -4,9 +4,9 @@ debian/tmp/opt/trinity/include/kopete/kopetepicture.h
 debian/tmp/opt/trinity/include/kopete/kopeteprefs.h
 debian/tmp/opt/trinity/include/kopete/ui/addressbooklinkwidget.h
 debian/tmp/opt/trinity/include/kopete/webcamwidget.h
-debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-account-kconf_update
-debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-nameTracking-kconf_update
-debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-pluginloader2-kconf_update
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/kopete-account-tdeconf_update
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/kopete-nameTracking-tdeconf_update
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/kopete-pluginloader2-tdeconf_update
 debian/tmp/opt/trinity/lib/trinity/kcm_kopete_accountconfig.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kopete_accountconfig.so
 debian/tmp/opt/trinity/lib/trinity/kcm_kopete_addbookmarks.la
@@ -112,18 +112,18 @@ debian/tmp/opt/trinity/lib/libkopete.so.1.0.0
 debian/tmp/opt/trinity/lib/libkopete_videodevice.so.0
 debian/tmp/opt/trinity/lib/libkopete_videodevice.so.0.0.0
 debian/tmp/opt/trinity/share/applications/tde/kopete.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-account-0.10.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-account-kconf_update.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-account-kconf_update.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-jabberproxytype-kconf_update.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-jabberproxytype-kconf_update.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-nameTracking.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-pluginloader2.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-pluginloader2.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-pluginloader.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/kopete-pluginloader.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-account-0.10.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-account-tdeconf_update.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-account-tdeconf_update.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-jabberproxytype-tdeconf_update.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-jabberproxytype-tdeconf_update.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-nameTracking.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-pluginloader2.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-pluginloader2.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-pluginloader.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kopete-pluginloader.upd
 debian/tmp/opt/trinity/share/apps/kopete_contactnotes/contactnotesui.rc
 debian/tmp/opt/trinity/share/apps/kopete_cryptography/cryptographychatui.rc
 debian/tmp/opt/trinity/share/apps/kopete_cryptography/cryptographyui.rc
@@ -453,19 +453,19 @@ debian/tmp/opt/trinity/share/services/chatwindow.desktop
 debian/tmp/opt/trinity/share/services/emailwindow.desktop
 debian/tmp/opt/trinity/share/services/irc.protocol /opt/trinity/share/apps/kopete/
 debian/tmp/opt/trinity/share/services/jabberdisco.protocol
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_addbookmarks_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_alias_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_autoreplace_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_cryptography_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_highlight_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_history_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_latex_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_msn_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_netmeeting_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_nowlistening_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_texteffect_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_translator_config.desktop
-debian/tmp/opt/trinity/share/services/kconfiguredialog/kopete_webpresence_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_addbookmarks_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_alias_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_autoreplace_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_cryptography_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_highlight_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_history_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_latex_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_msn_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_netmeeting_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_nowlistening_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_texteffect_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_translator_config.desktop
+debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kopete_webpresence_config.desktop
 debian/tmp/opt/trinity/share/services/kopete_accountconfig.desktop
 debian/tmp/opt/trinity/share/services/kopete_addbookmarks.desktop
 debian/tmp/opt/trinity/share/services/kopete_aim.desktop
diff --git a/ubuntu/precise/tdenetwork/debian/tdenetwork-kfile-plugins-trinity.install b/ubuntu/precise/tdenetwork/debian/tdenetwork-kfile-plugins-trinity.install
deleted file mode 100644
index b32a36440..000000000
--- a/ubuntu/precise/tdenetwork/debian/tdenetwork-kfile-plugins-trinity.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/opt/trinity/lib/trinity/kfile_torrent.la
-debian/tmp/opt/trinity/lib/trinity/kfile_torrent.so
-debian/tmp/opt/trinity/share/services/kfile_torrent.desktop
diff --git a/ubuntu/precise/tdenetwork/debian/tdenetwork-tdefile-plugins-trinity.install b/ubuntu/precise/tdenetwork/debian/tdenetwork-tdefile-plugins-trinity.install
new file mode 100644
index 000000000..fef93a0b0
--- /dev/null
+++ b/ubuntu/precise/tdenetwork/debian/tdenetwork-tdefile-plugins-trinity.install
@@ -0,0 +1,3 @@
+debian/tmp/opt/trinity/lib/trinity/tdefile_torrent.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_torrent.so
+debian/tmp/opt/trinity/share/services/tdefile_torrent.desktop
diff --git a/ubuntu/precise/tdepim/debian/control b/ubuntu/precise/tdepim/debian/control
index 1c544b5f5..c17259d5e 100644
--- a/ubuntu/precise/tdepim/debian/control
+++ b/ubuntu/precise/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-kfile-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-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})
 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
@@ -181,11 +181,11 @@ Description: Trinity time tracker tool
  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-kfile-plugins-trinity
+Package: tdepim-tdefile-plugins-trinity
 Section: tde
 Architecture: any
-Replaces: kdepim-kfile-plugins-trinity (<< 4:14.0.0)
-Breaks: kdepim-kfile-plugins-trinity (<< 4:14.0.0)
+Replaces: kdepim-tdefile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdepim-tdefile-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Description: KDE File dialog plugins for palm and vcf files
  File dialog plugins for palm and vcf files.
@@ -200,7 +200,7 @@ Replaces: kdepim-kio-plugins-trinity (<< 4:14.0.0)
 Breaks: kdepim-kio-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Description: Trinity pim I/O Slaves
- This package includes the pim kioslaves. This includes imap4, sieve,
+ This package includes the pim tdeioslaves. This includes imap4, sieve,
  and mbox.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
diff --git a/ubuntu/precise/tdepim/debian/control.in b/ubuntu/precise/tdepim/debian/control.in
index 4c48dcbef..ab6e20fa4 100644
--- a/ubuntu/precise/tdepim/debian/control.in
+++ b/ubuntu/precise/tdepim/debian/control.in
@@ -19,7 +19,7 @@ Standards-Version: 3.7.2
 Package: tdepim
 Section: tde
 Architecture: all
-Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), tdepim-kfile-plugins (>= ${Source-Version}), tdepim-kio-plugins (>= ${Source-Version}), tdepim-tderesources (>= ${Source-Version}), tdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libtdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version})
+Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), tdepim-tdefile-plugins (>= ${Source-Version}), tdepim-kio-plugins (>= ${Source-Version}), tdepim-tderesources (>= ${Source-Version}), tdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libtdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version})
 Suggests: tdepim-doc-html
 Description: Personal Information Management apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -161,7 +161,7 @@ Description: KDE time tracker tool
  This package is part of KDE, and a component of the KDE PIM module.
  See the 'kde' and 'tdepim' packages for more information.
 
-Package: tdepim-kfile-plugins
+Package: tdepim-tdefile-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -177,7 +177,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: tdebase-kio-plugins (<< 4:3.4.0)
 Description: KDE pim I/O Slaves
- This package includes the pim kioslaves. This includes imap4, sieve,
+ This package includes the pim tdeioslaves. This includes imap4, sieve,
  and mbox.
  .
  This package is part of KDE, and a component of the KDE PIM module.
diff --git a/ubuntu/precise/tdepim/debian/copyright b/ubuntu/precise/tdepim/debian/copyright
index 29a13fa2b..340c4d607 100644
--- a/ubuntu/precise/tdepim/debian/copyright
+++ b/ubuntu/precise/tdepim/debian/copyright
@@ -25,7 +25,7 @@ When in doubt, check the individual file, they should all have license
 headings and other identifying marks.
 
 akregator, kaddressbook, kalarm, kalarmd, kandy, karm, kdgantt,
-kfile-plugins, kgantt, kioslaves, kitchensync, kleopatra, kmail,
+tdefile-plugins, kgantt, tdeioslaves, kitchensync, kleopatra, kmail,
 kmailcvt, knode, knotes, konsolekalendar, kontact, korganizer, kpilot,
 ksync, ktnef, libindex, libtdenetwork, libtdepim, libkleopatra,
 libkpimidentities, libksieve, mimelib, wizards
diff --git a/ubuntu/precise/tdepim/debian/kmail-trinity.install b/ubuntu/precise/tdepim/debian/kmail-trinity.install
index c9a6e8969..811623fe8 100644
--- a/ubuntu/precise/tdepim/debian/kmail-trinity.install
+++ b/ubuntu/precise/tdepim/debian/kmail-trinity.install
@@ -18,26 +18,26 @@
 /opt/trinity/lib/libkmailprivate.so
 /opt/trinity/share/applications/tde/KMail.desktop
 /opt/trinity/share/applications/tde/kmail_view.desktop
-/opt/trinity/share/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
-/opt/trinity/share/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
-/opt/trinity/share/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
-/opt/trinity/share/apps/kconf_update/kmail-3.2-misc.sh
-/opt/trinity/share/apps/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh
-/opt/trinity/share/apps/kconf_update/kmail-3.3-aegypten.pl
-/opt/trinity/share/apps/kconf_update/kmail-3.3-misc.pl
-/opt/trinity/share/apps/kconf_update/kmail-3.3-move-identities.pl
-/opt/trinity/share/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh
-/opt/trinity/share/apps/kconf_update/kmail-3.3-use-ID-for-accounts.pl
-/opt/trinity/share/apps/kconf_update/kmail-3.3b1-misc.pl
-/opt/trinity/share/apps/kconf_update/kmail-3.4-misc.pl
-/opt/trinity/share/apps/kconf_update/kmail-3.4.1-update-status-filters.pl
-/opt/trinity/share/apps/kconf_update/kmail-3.5-trigger-flag-migration.pl
-/opt/trinity/share/apps/kconf_update/kmail-3.5-filter-icons.pl
-/opt/trinity/share/apps/kconf_update/kmail-pgpidentity.pl
-/opt/trinity/share/apps/kconf_update/kmail-upd-identities.pl
-/opt/trinity/share/apps/kconf_update/kmail.upd
-/opt/trinity/share/apps/kconf_update/upgrade-signature.pl
-/opt/trinity/share/apps/kconf_update/upgrade-transport.pl
+/opt/trinity/share/apps/tdeconf_update/kmail-3.1-update-new-mail-notification-settings.pl
+/opt/trinity/share/apps/tdeconf_update/kmail-3.1-use-UOID-for-identities.pl
+/opt/trinity/share/apps/tdeconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
+/opt/trinity/share/apps/tdeconf_update/kmail-3.2-misc.sh
+/opt/trinity/share/apps/tdeconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh
+/opt/trinity/share/apps/tdeconf_update/kmail-3.3-aegypten.pl
+/opt/trinity/share/apps/tdeconf_update/kmail-3.3-misc.pl
+/opt/trinity/share/apps/tdeconf_update/kmail-3.3-move-identities.pl
+/opt/trinity/share/apps/tdeconf_update/kmail-3.3-split-sign-encr-keys.sh
+/opt/trinity/share/apps/tdeconf_update/kmail-3.3-use-ID-for-accounts.pl
+/opt/trinity/share/apps/tdeconf_update/kmail-3.3b1-misc.pl
+/opt/trinity/share/apps/tdeconf_update/kmail-3.4-misc.pl
+/opt/trinity/share/apps/tdeconf_update/kmail-3.4.1-update-status-filters.pl
+/opt/trinity/share/apps/tdeconf_update/kmail-3.5-trigger-flag-migration.pl
+/opt/trinity/share/apps/tdeconf_update/kmail-3.5-filter-icons.pl
+/opt/trinity/share/apps/tdeconf_update/kmail-pgpidentity.pl
+/opt/trinity/share/apps/tdeconf_update/kmail-upd-identities.pl
+/opt/trinity/share/apps/tdeconf_update/kmail.upd
+/opt/trinity/share/apps/tdeconf_update/upgrade-signature.pl
+/opt/trinity/share/apps/tdeconf_update/upgrade-transport.pl
 /opt/trinity/share/apps/kmail
 /opt/trinity/share/config.kcfg/custommimeheader.kcfg
 /opt/trinity/share/config.kcfg/kmail.kcfg
diff --git a/ubuntu/precise/tdepim/debian/korganizer-trinity.install b/ubuntu/precise/tdepim/debian/korganizer-trinity.install
index 72858377b..4444d98a5 100644
--- a/ubuntu/precise/tdepim/debian/korganizer-trinity.install
+++ b/ubuntu/precise/tdepim/debian/korganizer-trinity.install
@@ -18,7 +18,7 @@
 /opt/trinity/lib/libkorganizer_eventviewer.so.1
 /opt/trinity/lib/libkorganizer_eventviewer.so.1.0.0
 /opt/trinity/share/applications/tde/korganizer.desktop
-/opt/trinity/share/apps/kconf_update/korganizer.upd
+/opt/trinity/share/apps/tdeconf_update/korganizer.upd
 /opt/trinity/share/apps/korgac
 /opt/trinity/share/apps/korganizer
 /opt/trinity/share/autostart/korgac.desktop
diff --git a/ubuntu/precise/tdepim/debian/korn-trinity.install b/ubuntu/precise/tdepim/debian/korn-trinity.install
index 33c5538d2..324cc90d4 100644
--- a/ubuntu/precise/tdepim/debian/korn-trinity.install
+++ b/ubuntu/precise/tdepim/debian/korn-trinity.install
@@ -1,10 +1,10 @@
 /opt/trinity/bin/korn
-/opt/trinity/lib/kconf_update_bin/korn-3-4-config_change
+/opt/trinity/lib/tdeconf_update_bin/korn-3-4-config_change
 /opt/trinity/share/applications/tde/KOrn.desktop
-/opt/trinity/share/apps/kconf_update/korn-3-4-config_change.upd
-/opt/trinity/share/apps/kconf_update/korn-3-5-metadata-update.pl
-/opt/trinity/share/apps/kconf_update/korn-3-5-ssl-update.pl
-/opt/trinity/share/apps/kconf_update/korn-3-5-update.upd
+/opt/trinity/share/apps/tdeconf_update/korn-3-4-config_change.upd
+/opt/trinity/share/apps/tdeconf_update/korn-3-5-metadata-update.pl
+/opt/trinity/share/apps/tdeconf_update/korn-3-5-ssl-update.pl
+/opt/trinity/share/apps/tdeconf_update/korn-3-5-update.upd
 /opt/trinity/share/doc/tde/HTML/en/korn
 /opt/trinity/share/icons/hicolor/16x16/apps/korn.png
 /opt/trinity/share/icons/hicolor/32x32/apps/korn.png
diff --git a/ubuntu/precise/tdepim/debian/libkleopatra1-trinity.install b/ubuntu/precise/tdepim/debian/libkleopatra1-trinity.install
index 88ef2ab95..620891ad2 100644
--- a/ubuntu/precise/tdepim/debian/libkleopatra1-trinity.install
+++ b/ubuntu/precise/tdepim/debian/libkleopatra1-trinity.install
@@ -7,8 +7,8 @@
 /opt/trinity/lib/libkpgp.so.2.2.0
 /opt/trinity/lib/libqgpgme.so.0
 /opt/trinity/lib/libqgpgme.so.0.0.0
-/opt/trinity/share/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
-/opt/trinity/share/apps/kconf_update/kpgp.upd
+/opt/trinity/share/apps/tdeconf_update/kpgp-3.1-upgrade-address-data.pl
+/opt/trinity/share/apps/tdeconf_update/kpgp.upd
 /opt/trinity/share/apps/libkleopatra
 /opt/trinity/share/icons/crystalsvg/16x16/apps/gpg.png
 /opt/trinity/share/icons/crystalsvg/16x16/apps/gpgsm.png
diff --git a/ubuntu/precise/tdepim/debian/man/kode-trinity.man b/ubuntu/precise/tdepim/debian/man/kode-trinity.man
index 183fc77b5..e737f5c31 100644
--- a/ubuntu/precise/tdepim/debian/man/kode-trinity.man
+++ b/ubuntu/precise/tdepim/debian/man/kode-trinity.man
@@ -15,8 +15,8 @@ Create a class.
 .B -d, --create-dialog
 Create a dialog.
 .TP
-.B --create-kioslave
-Create a kioslave.
+.B --create-tdeioslave
+Create a tdeioslave.
 .TP
 .B -y, --codify
 Create generator code for the given source.
@@ -55,7 +55,7 @@ Add a QT exception to the GPL.
 Create a singleton class.
 .TP
 .B --protocol
-Specifies the kioslave protocol name.
+Specifies the tdeioslave protocol name.
 .TP
 .B filename
 Specifies the source code file name for output.
diff --git a/ubuntu/precise/tdepim/debian/tdepim-kfile-plugins-trinity.install b/ubuntu/precise/tdepim/debian/tdepim-kfile-plugins-trinity.install
deleted file mode 100644
index 3f39aaf87..000000000
--- a/ubuntu/precise/tdepim/debian/tdepim-kfile-plugins-trinity.install
+++ /dev/null
@@ -1,6 +0,0 @@
-/opt/trinity/lib/trinity/kfile_ics.la
-/opt/trinity/lib/trinity/kfile_ics.so
-/opt/trinity/lib/trinity/kfile_vcf.la
-/opt/trinity/lib/trinity/kfile_vcf.so
-/opt/trinity/share/services/kfile_ics.desktop
-/opt/trinity/share/services/kfile_vcf.desktop
diff --git a/ubuntu/precise/tdepim/debian/tdepim-tdefile-plugins-trinity.install b/ubuntu/precise/tdepim/debian/tdepim-tdefile-plugins-trinity.install
new file mode 100644
index 000000000..d6bd1f7a6
--- /dev/null
+++ b/ubuntu/precise/tdepim/debian/tdepim-tdefile-plugins-trinity.install
@@ -0,0 +1,6 @@
+/opt/trinity/lib/trinity/tdefile_ics.la
+/opt/trinity/lib/trinity/tdefile_ics.so
+/opt/trinity/lib/trinity/tdefile_vcf.la
+/opt/trinity/lib/trinity/tdefile_vcf.so
+/opt/trinity/share/services/tdefile_ics.desktop
+/opt/trinity/share/services/tdefile_vcf.desktop
diff --git a/ubuntu/precise/tdepim/debian/tdepim-tderesources-trinity.install b/ubuntu/precise/tdepim/debian/tdepim-tderesources-trinity.install
index bcf0991b5..1ad10b54a 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-tderesources-trinity.install
+++ b/ubuntu/precise/tdepim/debian/tdepim-tderesources-trinity.install
@@ -100,5 +100,5 @@
 /opt/trinity/share/services/tderesources/knotes/kolabresource.desktop
 /opt/trinity/share/services/tderesources/knotes/scalix.desktop
 
-/opt/trinity/share/apps/kconf_update/upgrade-resourcetype.pl
-/opt/trinity/share/apps/kconf_update/kolab-resource.upd
+/opt/trinity/share/apps/tdeconf_update/upgrade-resourcetype.pl
+/opt/trinity/share/apps/tdeconf_update/kolab-resource.upd
diff --git a/ubuntu/precise/tdesdk/debian/cervisia-trinity.install b/ubuntu/precise/tdesdk/debian/cervisia-trinity.install
index 6cee13ad2..653a67d6b 100644
--- a/ubuntu/precise/tdesdk/debian/cervisia-trinity.install
+++ b/ubuntu/precise/tdesdk/debian/cervisia-trinity.install
@@ -9,11 +9,11 @@ debian/tmp/opt/trinity/share/applications/tde/cervisia.desktop
 debian/tmp/opt/trinity/share/apps/cervisia/cervisiashellui.rc
 debian/tmp/opt/trinity/share/apps/cervisia/eventsrc
 debian/tmp/opt/trinity/share/apps/cervisiapart/cervisiaui.rc
-debian/tmp/opt/trinity/share/apps/kconf_update/cervisia.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/cervisia-change_repos_list.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/cervisia-normalize_cvsroot.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/move_repositories.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/change_colors.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/cervisia.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/cervisia-change_repos_list.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/cervisia-normalize_cvsroot.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/move_repositories.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/change_colors.pl
 debian/tmp/opt/trinity/share/config.kcfg/cervisiapart.kcfg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/cervisia/*.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/cervisia/common
diff --git a/ubuntu/precise/tdesdk/debian/cervisia-trinity.lintian b/ubuntu/precise/tdesdk/debian/cervisia-trinity.lintian
index 4e79c02c5..a7760d061 100644
--- a/ubuntu/precise/tdesdk/debian/cervisia-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/cervisia-trinity.lintian
@@ -1,6 +1,6 @@
-# kconf_update scripts don't need to be executable.
-cervisia: script-not-executable ./usr/share/apps/kconf_update/change_colors.pl
-cervisia: script-not-executable ./usr/share/apps/kconf_update/move_repositories.pl
+# tdeconf_update scripts don't need to be executable.
+cervisia: script-not-executable ./usr/share/apps/tdeconf_update/change_colors.pl
+cervisia: script-not-executable ./usr/share/apps/tdeconf_update/move_repositories.pl
 
 # This is from tdeinit black magic.
 cervisia: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
diff --git a/ubuntu/precise/tdesdk/debian/control b/ubuntu/precise/tdesdk/debian/control
index 935dbf0bf..57976b778 100644
--- a/ubuntu/precise/tdesdk/debian/control
+++ b/ubuntu/precise/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-kfile-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-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})
 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
@@ -186,13 +186,13 @@ Description: format converters for KCachegrind profiling visualisation tool
  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-kfile-plugins-trinity
+Package: tdesdk-tdefile-plugins-trinity
 Architecture: any
 Section: tde
-Replaces: kdesdk-kfile-plugins-trinity (<< 4:14.0.0)
-Breaks: kdesdk-kfile-plugins-trinity (<< 4:14.0.0)
+Replaces: kdesdk-tdefile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdesdk-tdefile-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Conflicts: tdesdk-kfile-plugins
+Conflicts: tdesdk-tdefile-plugins
 Description: Trinity file dialog plugins for software development files
  This is a collection of plugins for the KDE file dialog.  These plugins
  extend the file dialog to offer advanced meta-information for source files,
diff --git a/ubuntu/precise/tdesdk/debian/control.in b/ubuntu/precise/tdesdk/debian/control.in
index d791b8ee8..da3e8d50a 100644
--- a/ubuntu/precise/tdesdk/debian/control.in
+++ b/ubuntu/precise/tdesdk/debian/control.in
@@ -13,7 +13,7 @@ Standards-Version: 3.7.2
 Package: tdesdk
 Architecture: all
 Section: tde
-Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), tdeunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version})
+Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-tdefile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), tdeunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version})
 Suggests: tdecachegrind-converters, kbabel-dev, tdesdk-doc-html
 Description: software development kit from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -162,7 +162,7 @@ Description: format converters for KCachegrind profiling visualisation tool
  This package is part of KDE, and a component of the KDE SDK module.
  See the 'kde' and 'tdesdk' packages for more information.
 
-Package: tdesdk-kfile-plugins
+Package: tdesdk-tdefile-plugins
 Architecture: any
 Section: tde
 Depends: ${shlibs:Depends}
diff --git a/ubuntu/precise/tdesdk/debian/kbabel-trinity.install b/ubuntu/precise/tdesdk/debian/kbabel-trinity.install
index bfe62dc3a..72d23b29d 100644
--- a/ubuntu/precise/tdesdk/debian/kbabel-trinity.install
+++ b/ubuntu/precise/tdesdk/debian/kbabel-trinity.install
@@ -5,8 +5,8 @@ debian/tmp/opt/trinity/lib/libkbabelcommon.so.3
 debian/tmp/opt/trinity/lib/libkbabelcommon.so.3.2.0
 debian/tmp/opt/trinity/lib/libkbabeldictplugin.so.1
 debian/tmp/opt/trinity/lib/libkbabeldictplugin.so.1.2.0
-debian/tmp/opt/trinity/lib/trinity/kfile_po.la
-debian/tmp/opt/trinity/lib/trinity/kfile_po.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_po.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_po.so
 debian/tmp/opt/trinity/lib/trinity/pothumbnail.la
 debian/tmp/opt/trinity/lib/trinity/pothumbnail.so
 debian/tmp/opt/trinity/lib/trinity/kbabel_accelstool.la
@@ -61,9 +61,9 @@ debian/tmp/opt/trinity/share/apps/kbabel/kbabelui.rc
 debian/tmp/opt/trinity/share/apps/kbabel/regexplist.xml
 debian/tmp/opt/trinity/share/apps/kbabel/pics
 debian/tmp/opt/trinity/share/apps/kbabel/icons
-debian/tmp/opt/trinity/share/apps/kconf_update/kbabel-difftoproject.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kbabel-project.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kbabel-projectrename.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kbabel-difftoproject.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kbabel-project.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kbabel-projectrename.upd
 debian/tmp/opt/trinity/share/config.kcfg/kbabel.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/kbprojectsettings.kcfg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.bz2
@@ -88,7 +88,7 @@ debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/catalogmanager.png
 #debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabel.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabeldict.png
 debian/tmp/opt/trinity/share/services/dbsearchengine.desktop
-debian/tmp/opt/trinity/share/services/kfile_po.desktop
+debian/tmp/opt/trinity/share/services/tdefile_po.desktop
 debian/tmp/opt/trinity/share/services/pothumbnail.desktop
 debian/tmp/opt/trinity/share/services/kbabel_accelstool.desktop
 debian/tmp/opt/trinity/share/services/kbabel_argstool.desktop
diff --git a/ubuntu/precise/tdesdk/debian/rules b/ubuntu/precise/tdesdk/debian/rules
index 2e37f4326..15a2da318 100755
--- a/ubuntu/precise/tdesdk/debian/rules
+++ b/ubuntu/precise/tdesdk/debian/rules
@@ -70,10 +70,10 @@ binary-install/tdesdk-scripts-trinity::
 binary-install/tdesdk-misc-trinity::
 	install -p -D -m644 kdeaccounts-plugin/README \
 		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kdeaccounts-plugin
-	install -p -D -m644 kioslave/svn/AUTHORS \
-		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/AUTHORS.kioslave-svn
-	install -p -D -m644 kioslave/svn/README \
-		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kioslave-svn
+	install -p -D -m644 tdeioslave/svn/AUTHORS \
+		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/AUTHORS.tdeioslave-svn
+	install -p -D -m644 tdeioslave/svn/README \
+		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.tdeioslave-svn
 	install -p -D -m644 kprofilemethod/README \
 		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kprofilemethod
 	install -p -D -m644 scheck/README \
diff --git a/ubuntu/precise/tdesdk/debian/tdesdk-kfile-plugins-trinity.install b/ubuntu/precise/tdesdk/debian/tdesdk-kfile-plugins-trinity.install
deleted file mode 100644
index 1ffa48c57..000000000
--- a/ubuntu/precise/tdesdk/debian/tdesdk-kfile-plugins-trinity.install
+++ /dev/null
@@ -1,10 +0,0 @@
-debian/tmp/opt/trinity/lib/trinity/kfile_cpp.so
-debian/tmp/opt/trinity/lib/trinity/kfile_cpp.la
-debian/tmp/opt/trinity/lib/trinity/kfile_diff.so
-debian/tmp/opt/trinity/lib/trinity/kfile_diff.la
-debian/tmp/opt/trinity/lib/trinity/kfile_ts.so
-debian/tmp/opt/trinity/lib/trinity/kfile_ts.la
-debian/tmp/opt/trinity/share/services/kfile_cpp.desktop
-debian/tmp/opt/trinity/share/services/kfile_diff.desktop
-debian/tmp/opt/trinity/share/services/kfile_h.desktop
-debian/tmp/opt/trinity/share/services/kfile_ts.desktop
diff --git a/ubuntu/precise/tdesdk/debian/tdesdk-kio-plugins-trinity.docs b/ubuntu/precise/tdesdk/debian/tdesdk-kio-plugins-trinity.docs
index bd4b4c270..ce721bb5e 100644
--- a/ubuntu/precise/tdesdk/debian/tdesdk-kio-plugins-trinity.docs
+++ b/ubuntu/precise/tdesdk/debian/tdesdk-kio-plugins-trinity.docs
@@ -1 +1 @@
-kioslave/svn/README
+tdeioslave/svn/README
diff --git a/ubuntu/precise/tdesdk/debian/tdesdk-tdefile-plugins-trinity.install b/ubuntu/precise/tdesdk/debian/tdesdk-tdefile-plugins-trinity.install
new file mode 100644
index 000000000..3a1f0630d
--- /dev/null
+++ b/ubuntu/precise/tdesdk/debian/tdesdk-tdefile-plugins-trinity.install
@@ -0,0 +1,10 @@
+debian/tmp/opt/trinity/lib/trinity/tdefile_cpp.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_cpp.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_diff.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_diff.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_ts.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_ts.la
+debian/tmp/opt/trinity/share/services/tdefile_cpp.desktop
+debian/tmp/opt/trinity/share/services/tdefile_diff.desktop
+debian/tmp/opt/trinity/share/services/tdefile_h.desktop
+debian/tmp/opt/trinity/share/services/tdefile_ts.desktop
diff --git a/ubuntu/precise/tdeutils/debian/kcalc-trinity.install b/ubuntu/precise/tdeutils/debian/kcalc-trinity.install
index 4d245f543..e5c35395d 100644
--- a/ubuntu/precise/tdeutils/debian/kcalc-trinity.install
+++ b/ubuntu/precise/tdeutils/debian/kcalc-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/lib/trinity/kcalc.so
 debian/tmp/opt/trinity/lib/libtdeinit_kcalc.so
 debian/tmp/opt/trinity/share/applications/tde/kcalc.desktop
 debian/tmp/opt/trinity/share/apps/kcalc/kcalcui.rc
-debian/tmp/opt/trinity/share/apps/kconf_update/kcalcrc.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kcalcrc.upd
 debian/tmp/opt/trinity/share/config.kcfg/kcalc.kcfg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/index.cache.bz2
diff --git a/ubuntu/precise/tdeutils/debian/kcharselect-trinity.install b/ubuntu/precise/tdeutils/debian/kcharselect-trinity.install
index 417f215d6..46f690528 100644
--- a/ubuntu/precise/tdeutils/debian/kcharselect-trinity.install
+++ b/ubuntu/precise/tdeutils/debian/kcharselect-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/kcharselect_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/kcharselect_panelapplet.so
 debian/tmp/opt/trinity/share/applications/tde/KCharSelect.desktop
 debian/tmp/opt/trinity/share/apps/kcharselect/kcharselectui.rc
-debian/tmp/opt/trinity/share/apps/kconf_update/kcharselect.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kcharselect.upd
 debian/tmp/opt/trinity/share/apps/kicker/applets/kcharselectapplet.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcharselect/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcharselect/index.cache.bz2
diff --git a/ubuntu/precise/tdeutils/debian/kdelirc-trinity.install b/ubuntu/precise/tdeutils/debian/kdelirc-trinity.install
index 6f5c2b3bb..8570e2ffa 100644
--- a/ubuntu/precise/tdeutils/debian/kdelirc-trinity.install
+++ b/ubuntu/precise/tdeutils/debian/kdelirc-trinity.install
@@ -25,7 +25,7 @@ debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledorange.p
 debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledpurple.png
 debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledred.png
 debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledyellow.png
-debian/tmp/opt/trinity/share/apps/profiles/klauncher.profile.xml
+debian/tmp/opt/trinity/share/apps/profiles/tdelauncher.profile.xml
 debian/tmp/opt/trinity/share/apps/profiles/konqueror.profile.xml
 debian/tmp/opt/trinity/share/apps/profiles/noatun.profile.xml
 debian/tmp/opt/trinity/share/apps/profiles/profile.dtd
diff --git a/ubuntu/precise/tdevelop/debian/tdevelop-trinity.install b/ubuntu/precise/tdevelop/debian/tdevelop-trinity.install
index 95659c5bc..4f53c0795 100644
--- a/ubuntu/precise/tdevelop/debian/tdevelop-trinity.install
+++ b/ubuntu/precise/tdevelop/debian/tdevelop-trinity.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/kdevprofileeditor
 debian/tmp/opt/trinity/bin/kdevassistant
 debian/tmp/opt/trinity/bin/kdevprj2tdevelop
 debian/tmp/opt/trinity/bin/tdevelop
-debian/tmp/opt/trinity/lib/kconf_update_bin/kdev-gen-settings-kconf_update
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
 debian/tmp/opt/trinity/share/services
 debian/tmp/opt/trinity/share/servicetypes
 debian/tmp/opt/trinity/lib/trinity
diff --git a/ubuntu/precise/tdewebdev/debian/changelog b/ubuntu/precise/tdewebdev/debian/changelog
index 58f475bcf..bd707d270 100644
--- a/ubuntu/precise/tdewebdev/debian/changelog
+++ b/ubuntu/precise/tdewebdev/debian/changelog
@@ -156,7 +156,7 @@ tdewebdev (4:3.5.4-1) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Add kfilereplace manpage, thanks to Holger Hartmann. (Closes: #370237)
+  * Add tdefilereplace manpage, thanks to Holger Hartmann. (Closes: #370237)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 26 Aug 2006 14:11:51 -0400
 
@@ -437,7 +437,7 @@ tdewebdev (1:3.3.0-1) unstable; urgency=low
     fixing a FTBFS on sid (closes: #261629, #269340, #272767).
   * Pumped up the dependencies for quanta, which with each new release makes
     more use of external tools:
-      - kfilereplace and tidy have moved from recommends to depends;
+      - tdefilereplace and tidy have moved from recommends to depends;
       - cervisia and kompare have moved from suggests to recommends;
       - also added klinkstatus (depends), gnupg (recommends), gubed
         and kimagemapeditor (suggests).
diff --git a/ubuntu/precise/tdewebdev/debian/control b/ubuntu/precise/tdewebdev/debian/control
index f3c83ae1d..1ba182c43 100644
--- a/ubuntu/precise/tdewebdev/debian/control
+++ b/ubuntu/precise/tdewebdev/debian/control
@@ -13,7 +13,7 @@ Architecture: all
 Section: tde
 Replaces: kdewebdev-trinity (<< 4:14.0.0)
 Breaks: kdewebdev-trinity (<< 4:14.0.0)
-Depends: quanta-trinity (>= ${source:Version}), kfilereplace-trinity (>= ${source:Version}), kimagemapeditor-trinity (>= ${source:Version}), klinkstatus-trinity (>= ${source:Version}), kommander-trinity (>= ${source:Version}), kxsldbg-trinity (>= ${source:Version})
+Depends: quanta-trinity (>= ${source:Version}), tdefilereplace-trinity (>= ${source:Version}), kimagemapeditor-trinity (>= ${source:Version}), klinkstatus-trinity (>= ${source:Version}), kommander-trinity (>= ${source:Version}), kxsldbg-trinity (>= ${source:Version})
 Suggests: kommander-trinity-dev (>= ${source:Version}), tdewebdev-trinity-doc-html (>= ${source:Version})
 Description: web development apps from the official KDE release [Trinity]
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -49,7 +49,7 @@ Architecture: any
 Section: web
 Replaces: quanta-trinity (<< 4:14.0.0)
 Breaks: quanta-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, kfilereplace-trinity, klinkstatus-trinity, kommander-trinity, quanta-data-trinity, tidy
+Depends: ${shlibs:Depends}, tdefilereplace-trinity, klinkstatus-trinity, kommander-trinity, quanta-data-trinity, tidy
 Recommends: cervisia-trinity, gnupg, kompare-trinity, kxsldbg-trinity, docbook-defguide
 Suggests: gubed, kimagemapeditor-trinity, wget, khelpcenter-trinity, php-doc
 Description: web development environment for KDE [Trinity]
@@ -85,11 +85,11 @@ Description: data files for Quanta Plus web development environment [Trinity]
  This package is part of KDE, as a component of the KDE web development module.
  See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
 
-Package: kfilereplace-trinity
+Package: tdefilereplace-trinity
 Architecture: any
 Section: tde
-Replaces: kfilereplace-trinity (<< 4:14.0.0)
-Breaks: kfilereplace-trinity (<< 4:14.0.0)
+Replaces: tdefilereplace-trinity (<< 4:14.0.0)
+Breaks: tdefilereplace-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Suggests: quanta-trinity
 Description: batch search-and-replace component for KDE [Trinity]
diff --git a/ubuntu/precise/tdewebdev/debian/control.in b/ubuntu/precise/tdewebdev/debian/control.in
index aa1dcb562..0712c3cef 100644
--- a/ubuntu/precise/tdewebdev/debian/control.in
+++ b/ubuntu/precise/tdewebdev/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdewebdev
 Architecture: all
 Section: tde
-Depends: quanta (>= ${Source-Version}), kfilereplace (>= ${Source-Version}), kimagemapeditor (>= ${Source-Version}), klinkstatus (>= ${Source-Version}), kommander (>= ${Source-Version}), kxsldbg (>= ${Source-Version})
+Depends: quanta (>= ${Source-Version}), tdefilereplace (>= ${Source-Version}), kimagemapeditor (>= ${Source-Version}), klinkstatus (>= ${Source-Version}), kommander (>= ${Source-Version}), kxsldbg (>= ${Source-Version})
 Suggests: kommander-dev (>= ${Source-Version}), tdewebdev-doc-html (>= ${Source-Version})
 Description: web development apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -43,7 +43,7 @@ Description: KDE web development documentation in HTML format
 Package: quanta
 Architecture: any
 Section: web
-Depends: ${shlibs:Depends}, kfilereplace (= ${Source-Version}), klinkstatus (= ${Source-Version}), kommander (= ${Source-Version}), quanta-data (>> ${KDE-Version3}), quanta-data (<< ${KDE-Next-Version3}), tidy
+Depends: ${shlibs:Depends}, tdefilereplace (= ${Source-Version}), klinkstatus (= ${Source-Version}), kommander (= ${Source-Version}), quanta-data (>> ${KDE-Version3}), quanta-data (<< ${KDE-Next-Version3}), tidy
 Recommends: cervisia, gnupg, kompare, kxsldbg (= ${Source-Version}), docbook-defguide
 Suggests: gubed, kimagemapeditor (= ${Source-Version}), wget, khelpcenter, php-doc
 Description: web development environment for KDE
@@ -80,7 +80,7 @@ Description: data files for Quanta Plus web development environment
  This package is part of KDE, as a component of the KDE web development module.
  See the 'kde' and 'tdewebdev' packages for more information.
 
-Package: kfilereplace
+Package: tdefilereplace
 Architecture: any
 Section: tde
 Depends: ${shlibs:Depends}
diff --git a/ubuntu/precise/tdewebdev/debian/kfilereplace-trinity.install b/ubuntu/precise/tdewebdev/debian/kfilereplace-trinity.install
deleted file mode 100644
index ac762a2a5..000000000
--- a/ubuntu/precise/tdewebdev/debian/kfilereplace-trinity.install
+++ /dev/null
@@ -1,14 +0,0 @@
-debian/tmp/opt/trinity/bin/kfilereplace
-debian/tmp/opt/trinity/lib/trinity/libkfilereplacepart.la
-debian/tmp/opt/trinity/lib/trinity/libkfilereplacepart.so
-debian/tmp/opt/trinity/share/applications/tde/kfilereplace.desktop
-debian/tmp/opt/trinity/share/apps/kfilereplace/kfilereplaceui.rc
-debian/tmp/opt/trinity/share/apps/kfilereplacepart
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfilereplace/*.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfilereplace/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfilereplace/*.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfilereplace/*.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kfilereplace.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kfilereplace.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kfilereplace.png
-debian/tmp/opt/trinity/share/services/kfilereplacepart.desktop
diff --git a/ubuntu/precise/tdewebdev/debian/kfilereplace-trinity.manpages b/ubuntu/precise/tdewebdev/debian/kfilereplace-trinity.manpages
deleted file mode 100644
index cf8df22a1..000000000
--- a/ubuntu/precise/tdewebdev/debian/kfilereplace-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfilereplace-trinity.1
diff --git a/ubuntu/precise/tdewebdev/debian/man/kfilereplace-trinity.1 b/ubuntu/precise/tdewebdev/debian/man/tdefilereplace-trinity.1
index 2f8d0acd2..7c0c90a13 100644
--- a/ubuntu/precise/tdewebdev/debian/man/kfilereplace-trinity.1
+++ b/ubuntu/precise/tdewebdev/debian/man/tdefilereplace-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KFILEREPLACE 1 "June 2006" "K Desktop Environment" "Batch search and replace tool"
 .SH NAME
-kfilereplace
+tdefilereplace
 \- Batch search and replace tool
 .SH SYNOPSIS
-\fBkfilereplace\fP [Qt\-options] [KDE\-options] [PATH] 
+\fBtdefilereplace\fP [Qt\-options] [KDE\-options] [PATH] 
 .SH DESCRIPTION
 \fBKFileReplace\fP is an application used to search and replace a list of strings in a file tree. The strings may be literal or Qt\-like regular expressions. There are also other options to tune your search.
 .SH OPTIONS
@@ -137,9 +137,9 @@ mirrors the whole layout of widgets
 
 .SH SEE ALSO
 Full user documentation is available through the KDE Help Center.  You can also enter the URL
-.BR help:/kfilereplace/
+.BR help:/tdefilereplace/
 directly into konqueror or you can run 
-.BR "khelpcenter help:/kfilereplace/"
+.BR "khelpcenter help:/tdefilereplace/"
 from the command\-line.
 .br
 .SH AUTHORS
diff --git a/ubuntu/precise/tdewebdev/debian/rules b/ubuntu/precise/tdewebdev/debian/rules
index ad4eb9d85..1e601c5e2 100755
--- a/ubuntu/precise/tdewebdev/debian/rules
+++ b/ubuntu/precise/tdewebdev/debian/rules
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
-DEB_INSTALL_CHANGELOGS_kfilereplace-trinity    := kfilereplace/ChangeLog
+DEB_INSTALL_CHANGELOGS_tdefilereplace-trinity    := tdefilereplace/ChangeLog
 DEB_INSTALL_CHANGELOGS_kimagemapeditor-trinity := kimagemapeditor/ChangeLog
 DEB_INSTALL_CHANGELOGS_klinkstatus-trinity     := klinkstatus/ChangeLog
 DEB_INSTALL_CHANGELOGS_kommander-trinity       := kommander/ChangeLog
diff --git a/ubuntu/precise/tdewebdev/debian/kfilereplace-trinity.README.Debian b/ubuntu/precise/tdewebdev/debian/tdefilereplace-trinity.README.Debian
index 3d186fbcf..3d186fbcf 100644
--- a/ubuntu/precise/tdewebdev/debian/kfilereplace-trinity.README.Debian
+++ b/ubuntu/precise/tdewebdev/debian/tdefilereplace-trinity.README.Debian
diff --git a/ubuntu/precise/tdewebdev/debian/tdefilereplace-trinity.install b/ubuntu/precise/tdewebdev/debian/tdefilereplace-trinity.install
new file mode 100644
index 000000000..515142b40
--- /dev/null
+++ b/ubuntu/precise/tdewebdev/debian/tdefilereplace-trinity.install
@@ -0,0 +1,14 @@
+debian/tmp/opt/trinity/bin/tdefilereplace
+debian/tmp/opt/trinity/lib/trinity/libtdefilereplacepart.la
+debian/tmp/opt/trinity/lib/trinity/libtdefilereplacepart.so
+debian/tmp/opt/trinity/share/applications/tde/tdefilereplace.desktop
+debian/tmp/opt/trinity/share/apps/tdefilereplace/tdefilereplaceui.rc
+debian/tmp/opt/trinity/share/apps/tdefilereplacepart
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefilereplace/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefilereplace/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefilereplace/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefilereplace/*.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdefilereplace.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdefilereplace.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdefilereplace.png
+debian/tmp/opt/trinity/share/services/tdefilereplacepart.desktop
diff --git a/ubuntu/precise/tdewebdev/debian/tdefilereplace-trinity.manpages b/ubuntu/precise/tdewebdev/debian/tdefilereplace-trinity.manpages
new file mode 100644
index 000000000..694a538a0
--- /dev/null
+++ b/ubuntu/precise/tdewebdev/debian/tdefilereplace-trinity.manpages
@@ -0,0 +1 @@
+debian/man/tdefilereplace-trinity.1
diff --git a/ubuntu/precise/tdewebdev/debian/tdewebdev-doc-html.doc-base.kfilereplace b/ubuntu/precise/tdewebdev/debian/tdewebdev-doc-html.doc-base.tdefilereplace
index 8e685ddea..54489def9 100644
--- a/ubuntu/precise/tdewebdev/debian/tdewebdev-doc-html.doc-base.kfilereplace
+++ b/ubuntu/precise/tdewebdev/debian/tdewebdev-doc-html.doc-base.tdefilereplace
@@ -1,10 +1,10 @@
-Document: kfilereplace
+Document: tdefilereplace
 Title: KFileReplace Handbook
 Author: Emiliano Gulmini <emi_barbarossa@yahoo.it>
 Abstract: KFileReplace is an utility to search and replace strings.
 Section: Apps/Net
 
 Format: HTML
-Index: /opt/trinity/share/doc/tde/HTML/en/kfilereplace/index.html
-Files: /opt/trinity/share/doc/tde/HTML/en/kfilereplace/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/tdefilereplace/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/tdefilereplace/*.html