Update Debian and Ubuntu packaging to match recent renaming

168 files changed, 889 insertions, 889 deletions

diff --git a/ubuntu/maverick/applications/kaffeine/debian/changelog b/ubuntu/maverick/applications/kaffeine/debian/changelog
index ae8921760..3f11ad0ae 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/changelog
+++ b/ubuntu/maverick/applications/kaffeine/debian/changelog
@@ -302,7 +302,7 @@ kaffeine (0.8.4-0ubuntu1) gutsy; urgency=low
   * Added libxcb builddep.
   * Added back kaffeine-gstreamer package
   * Removed obsolete kubuntu_05_restore_contrast.diff
-  * Add kubuntu_06_kparts_mimetype_checking.diff:
+  * Add kubuntu_06_tdeparts_mimetype_checking.diff:
     - Makes it possible to select the engine to use.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 05 Mai 2007 11:02:23 +0100
diff --git a/ubuntu/maverick/applications/kaffeine/debian/copyright b/ubuntu/maverick/applications/kaffeine/debian/copyright
index 8b7ddae56..e1f37677a 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/copyright
+++ b/ubuntu/maverick/applications/kaffeine/debian/copyright
@@ -8,7 +8,7 @@ Upstream authors:
    Christoph Pfister <christophpfister@gmail.com>
    Jurgen Kofler <kaffeine@gmx.net>
 
-Copyright for kmultitabbar:
+Copyright for tdemultitabbar:
    (C) 2001-2003 Joseph Wenninger <jowenn@kde.org>
 
 Copyright for kaffeine_export copied from kat:
diff --git a/ubuntu/maverick/applications/kmplayer/debian/changelog b/ubuntu/maverick/applications/kmplayer/debian/changelog
index 26a6aed53..233e1f465 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/changelog
+++ b/ubuntu/maverick/applications/kmplayer/debian/changelog
@@ -52,7 +52,7 @@ kmplayer (1:0.10.0b-1) unstable; urgency=low
 kmplayer (1:0.10.0b-0ubuntu1) hardy; urgency=low
 
   * New upstream release.
-  * Dropped kubuntu_02_use_default_config_with_kparts_.diff - applied upstream.
+  * Dropped kubuntu_02_use_default_config_with_tdeparts_.diff - applied upstream.
   * Updated email in kmplayer.1.docbook.
   * Updated Standards-Version to 3.7.3.0.
 
@@ -335,7 +335,7 @@ kmplayer (0.9.1.99+0.9.2-pre3-0ubuntu1) dapper; urgency=low
   [Anthony Mercatante]
   * Package polishing (debian/copyright, debian/rules...)
   * Added kubuntu_01_use_xine_by_default.patch to make usage of wine by default
-  * Added kubuntu_02_use_default_config_with_kparts_.patch to enable default
+  * Added kubuntu_02_use_default_config_with_tdeparts_.patch to enable default
     config in the konqueror plugin
   * Tarball rebuilt to remove obsolete debian/ folder in it
 
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/changelog b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/changelog
index ed0d32a81..d430a6b1e 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/changelog
+++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/changelog
@@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low
     - debian/patches/07-overlay_icon_vpn.patch
       + Show overlay icon (lock) for active VPN connections.
     - debian/patches/08-disable_sm.patch
-      + Disable session management to avoid a deadlock when accessing kwallet.
+      + Disable session management to avoid a deadlock when accessing tdewallet.
         Install an autostart file into /usr/share/autostart/ instead.
         Closes: #406162
     - debian/patches/09-dbus_bool_t.patch
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control
index 988450b51..6650a2b73 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control
+++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control
@@ -27,7 +27,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
 Replaces: network-manager-kde (<< 4:14.0.0)
 Breaks: network-manager-kde (<< 4:14.0.0)
-Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
+Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
 Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
 Description: KDE systray applet for controlling NetworkManager [Trinity]
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control.in b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control.in
index 9a213de18..6ec9fbbd7 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control.in
+++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control.in
@@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
 Package: network-manager-kde-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
-Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
+Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
 Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
 Description: KDE systray applet for controlling NetworkManager [Trinity]
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/changelog b/ubuntu/maverick/applications/knetworkmanager8/debian/changelog
index 04405984c..b68efdcf7 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/changelog
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/changelog
@@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low
     - debian/patches/07-overlay_icon_vpn.patch
       + Show overlay icon (lock) for active VPN connections.
     - debian/patches/08-disable_sm.patch
-      + Disable session management to avoid a deadlock when accessing kwallet.
+      + Disable session management to avoid a deadlock when accessing tdewallet.
         Install an autostart file into /usr/share/autostart/ instead.
         Closes: #406162
     - debian/patches/09-dbus_bool_t.patch
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/control b/ubuntu/maverick/applications/knetworkmanager8/debian/control
index 711f2e99d..2f3d45694 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/control
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control
@@ -28,7 +28,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9)
 Replaces: network-manager-kde-trinity (<< 4:14.0.0)
 Breaks: network-manager-kde-trinity (<< 4:14.0.0)
-Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
+Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
 Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
 Description: KDE systray applet for controlling NetworkManager [Trinity]
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/control.in b/ubuntu/maverick/applications/knetworkmanager8/debian/control.in
index 9a213de18..6ec9fbbd7 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/control.in
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control.in
@@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
 Package: network-manager-kde-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
-Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
+Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
 Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
 Description: KDE systray applet for controlling NetworkManager [Trinity]
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/control b/ubuntu/maverick/applications/knetworkmanager9/debian/control
index c32604bbf..efd256a36 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/control
+++ b/ubuntu/maverick/applications/knetworkmanager9/debian/control
@@ -16,7 +16,7 @@ Homepage: http://www.trinitydesktop.org/
 Package: network-manager-tde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: kwalletmanager-trinity
+Recommends: tdewalletmanager-trinity
 Provides: tdenetworkmanager-trinity
 Description: TDE systray applet for controlling networking [Trinity]
  Systray applet for controlling network connections managed by 
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/control.in b/ubuntu/maverick/applications/knetworkmanager9/debian/control.in
index e54418ea6..a5cefc2bb 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/control.in
+++ b/ubuntu/maverick/applications/knetworkmanager9/debian/control.in
@@ -18,7 +18,7 @@ Homepage: http://www.trinitydesktop.org/
 Package: network-manager-tde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: kwalletmanager-trinity
+Recommends: tdewalletmanager-trinity
 Provides: tdenetworkmanager-trinity
 Description: TDE systray applet for controlling networking [Trinity]
  Systray applet for controlling network connections managed by
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install
index 7bed60e6c..a0e03ae3b 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install
@@ -352,7 +352,7 @@ debian/tmp/opt/trinity/share/services/chalk_rgb_u16_plugin.desktop
 debian/tmp/opt/trinity/share/services/chalkrotateimage.desktop
 debian/tmp/opt/trinity/share/services/chalkroundcornersfilter.desktop
 debian/tmp/opt/trinity/share/services/chalkscreenshot.desktop
-debian/tmp/opt/trinity/share/services/chalkscripting.desktop
+debian/tmp/opt/trinity/share/services/chaltdescripting.desktop
 debian/tmp/opt/trinity/share/services/chalkselectiontools.desktop
 debian/tmp/opt/trinity/share/services/chalkselectopaque.desktop
 debian/tmp/opt/trinity/share/services/chalkseparatechannels.desktop
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install
index 4df24b77e..66afcfbba 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install
@@ -73,8 +73,8 @@ debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.la
 debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.so
-debian/tmp/opt/trinity/lib/trinity/chalkscripting.la
-debian/tmp/opt/trinity/lib/trinity/chalkscripting.so
+debian/tmp/opt/trinity/lib/trinity/chaltdescripting.la
+debian/tmp/opt/trinity/lib/trinity/chaltdescripting.so
 debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.la
 debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.so
 debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.la
@@ -152,6 +152,6 @@ debian/tmp/opt/trinity/lib/libchalkimage.so.*
 debian/tmp/opt/trinity/lib/libchalk_lms_*.so.*
 debian/tmp/opt/trinity/lib/libchalk_rgb_*.so.*
 debian/tmp/opt/trinity/lib/libchalkrgb.so.*
-debian/tmp/opt/trinity/lib/libchalkscripting.so.*
+debian/tmp/opt/trinity/lib/libchaltdescripting.so.*
 debian/tmp/opt/trinity/lib/libchalkui.so.*
 debian/tmp/opt/trinity/lib/libchalk_ycbcr_*.so.*
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
index 08adc5291..cdf64af56 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
 chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
 chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
+chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchaltdescripting0 libchalkui1
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install b/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install
index 4b80b83ec..f28ee3bef 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install
@@ -79,8 +79,8 @@ debian/tmp/opt/trinity/lib/libchalkimage.la
 debian/tmp/opt/trinity/lib/libchalkimage.so
 debian/tmp/opt/trinity/lib/libchalkrgb.la
 debian/tmp/opt/trinity/lib/libchalkrgb.so
-debian/tmp/opt/trinity/lib/libchalkscripting.la
-debian/tmp/opt/trinity/lib/libchalkscripting.so
+debian/tmp/opt/trinity/lib/libchaltdescripting.la
+debian/tmp/opt/trinity/lib/libchaltdescripting.so
 debian/tmp/opt/trinity/lib/libchalkui.la
 debian/tmp/opt/trinity/lib/libchalkui.so
 debian/tmp/opt/trinity/lib/libkrossapi.la
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/changelog b/ubuntu/maverick/applications/kpowersave.cmake/debian/changelog
index c23417124..2d09c1e65 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/changelog
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/changelog
@@ -162,7 +162,7 @@ kpowersave (0.6.2-5) unstable; urgency=low
 
   * Prepend a sequence number to all patches.
   * debian/patches/03-reset_blankonly_to_default.patch
-    - Added. Reset kscreensaver settings to correct default values on scheme 
+    - Added. Reset tdescreensaver settings to correct default values on scheme 
       changes and on application shutdown.
       Patch by Modestas Vainius, thanks! Closes: #399473
 
diff --git a/ubuntu/maverick/applications/kpowersave/debian/changelog b/ubuntu/maverick/applications/kpowersave/debian/changelog
index c23417124..2d09c1e65 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/changelog
+++ b/ubuntu/maverick/applications/kpowersave/debian/changelog
@@ -162,7 +162,7 @@ kpowersave (0.6.2-5) unstable; urgency=low
 
   * Prepend a sequence number to all patches.
   * debian/patches/03-reset_blankonly_to_default.patch
-    - Added. Reset kscreensaver settings to correct default values on scheme 
+    - Added. Reset tdescreensaver settings to correct default values on scheme 
       changes and on application shutdown.
       Patch by Modestas Vainius, thanks! Closes: #399473
 
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/changelog b/ubuntu/maverick/applications/tde-style-qtcurve/debian/changelog
index 3ff72d99c..f7612d81f 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/changelog
+++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/changelog
@@ -83,8 +83,8 @@ tde-style-qtcurve (0.52.3-1) unstable; urgency=low
 
   * Don't lighten border of disabled check/radio buttons.
   * Lighten trough of disabled slider.
-  * Modify khtml check to also check to see if widget name == "__khtml"
-  * Store khtml widgets in a map, to speed up checking.
+  * Modify tdehtml check to also check to see if widget name == "__tdehtml"
+  * Store tdehtml widgets in a map, to speed up checking.
   * Fix shadow on comboboxes.
   * Draw background of checked menuitem icons as per KDE4. 
 
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile
index fa069e33a..9cb53d701 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile
@@ -136,8 +136,8 @@ install:
 	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"

 	install -m644 kpart-rc-files/ksvgplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"

 

-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/khtml/"

-	install -m644 kpart-rc-files/khtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/khtml/"

+	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"

+	install -m644 kpart-rc-files/tdehtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"

 

 	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"

 	install -m644 mimelnk/x-tar.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"

@@ -149,8 +149,8 @@ install:
 	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"

 	install -m644 kpart-plugins/dirfilterplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"

 

-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwallet/"

-	install -m644 kwallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwallet/"

+	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"

+	install -m644 tdewallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"

 

 	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"

 	install -m644 artwork/window-decoration-gradient.png "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"

diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog
index a44775158..7504e67fc 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog
@@ -240,7 +240,7 @@ kubuntu-default-settings (1:7.10-27) gutsy; urgency=low
 
 kubuntu-default-settings (1:7.10-26) gutsy; urgency=low
 
-  * Fixed khtmlrc, now uses easylist instead of filterset.g. Fixes LP:
+  * Fixed tdehtmlrc, now uses easylist instead of filterset.g. Fixes LP:
     #99535
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 29 Sep 2007 11:41:52 +0200
@@ -1110,7 +1110,7 @@ kubuntu-default-settings (1:6.10-13) edgy; urgency=low
 
 kubuntu-default-settings (1:6.10-12) edgy; urgency=low
 
-  * Improved khtmlrc for better adblock filters
+  * Improved tdehtmlrc for better adblock filters
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 20 Aug 2006 20:55:01 +0200
 
@@ -1423,7 +1423,7 @@ kubuntu-default-settings (1:6.04-12) dapper; urgency=low
 
 kubuntu-default-settings (1:6.04-11) dapper; urgency=low
 
-  * Added khtmlrc with a disabled list of filters for adblock
+  * Added tdehtmlrc with a disabled list of filters for adblock
   * Changed log directory for konversation, from $HOME to
     $HOME/.kde/share/apps/konversation/logs
   * knemorc improved with different iconsets depending the kind of connection.
@@ -1444,7 +1444,7 @@ kubuntu-default-settings (1:6.04-10) dapper; urgency=low
     konversation and keep tabs arround the focus
   * Added dirfilterplugin.rc to make usage of dirfilter in konqueror's filemanagement
     profile by default
-  * Added kwalletrc and kdewallet.kwl for confortable default config on new profiles
+  * Added tdewalletrc and kdewallet.kwl for confortable default config on new profiles
   * Changed kdeprintrc to use localhost as default CUPS server
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 28 Feb 2006 15:38:52 +0000
@@ -1507,10 +1507,10 @@ kubuntu-default-settings (1:6.04-5) dapper; urgency=low
   * Added ark_part.rc, ark_part_readonly.rc, gvimagepart.rc, part.rc in folder
     kpart-rc-files, with integration set to "contextToolBar"
   * Updated konquerorrc, setting contextToolBar's "NewLine" value to "true"
-    (doesn't work if set in kparts' configuration files while clicking another tab and
+    (doesn't work if set in tdeparts' configuration files while clicking another tab and
     coming back)
     MediumFontSize set to 10
-  * Added khtml_browser.rc, removing DOM entries in the konq's "view" menu
+  * Added tdehtml_browser.rc, removing DOM entries in the konq's "view" menu
   * Updated filemagement profile, adding Sidebar by default
   * Added x-tar.desktop, x-tarz.desktop, x-tbz.desktop, x-tgz.desktop, x-zip.desktop
     in folder mimelnk, with blanked "LocalProtocol" value, to remove tar and zip
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/katerc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/katerc
index 10fd37bab..f952dff62 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/katerc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/katerc
@@ -6,4 +6,4 @@ Session Exit=discard
 Startup Session=new
 
 [Kate Document Defaults]
-KTextEditor Plugin ktexteditor_isearch=true
+KTextEditor Plugin tdetexteditor_isearch=true
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/khtmlrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/khtmlrc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kwalletrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdewalletrc
index 326194cb6..d0dce217c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kwalletrc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdewalletrc
@@ -1,5 +1,5 @@
 [Auto Allow]
-kdewallet=kwalletmanager
+kdewallet=tdewalletmanager
 
 [Auto Deny]
 kdewallet=
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/khtmlrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/khtmlrc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kwalletrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdewalletrc
index 326194cb6..d0dce217c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kwalletrc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdewalletrc
@@ -1,5 +1,5 @@
 [Auto Allow]
-kdewallet=kwalletmanager
+kdewallet=tdewalletmanager
 
 [Auto Deny]
 kdewallet=
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part.rc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part.rc
index da8f97f73..a45167843 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part.rc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ark_kparts" version="8">
+<kpartgui name="ark_tdeparts" version="8">
 <ActionProperties>
     <Action name="select_all" icon="ark_selectall"/>
 </ActionProperties>
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc
index 888d12e8d..df2c4f29f 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ark_kparts" version="7">
+<kpartgui name="ark_tdeparts" version="7">
 <ActionProperties>
     <Action name="select_all" icon="ark_selectall"/>
 </ActionProperties>
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/khtml_browser.rc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/tdehtml_browser.rc
index 2eab2a321..069870b55 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/khtml_browser.rc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/tdehtml_browser.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="khtmlpart" version="19">
+<kpartgui name="tdehtmlpart" version="19">
 <MenuBar>
  <Menu name="file"><text>&amp;File</text>
   <Action name="saveBackground" />
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kwallet-default-wallet/kdewallet.kwl b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tdewallet-default-wallet/kdewallet.kwl
index 485b2e683..485b2e683 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kwallet-default-wallet/kdewallet.kwl
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tdewallet-default-wallet/kdewallet.kwl
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile
index d10e3ae5f..ce104d8b2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile
@@ -276,8 +276,8 @@ install:
 	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"

 	install -m644 kpart-rc-files/ksvgplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"

 

-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/khtml/"

-	install -m644 kpart-rc-files/khtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/khtml/"

+	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"

+	install -m644 kpart-rc-files/tdehtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"

 

 	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"

 	install -m644 mimelnk/x-tar.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"

@@ -289,8 +289,8 @@ install:
 	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"

 	install -m644 kpart-plugins/dirfilterplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"

 

-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwallet/"

-	install -m644 kwallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwallet/"

+	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"

+	install -m644 tdewallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"

 

 	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"

 	install -m644 artwork/window-decoration-gradient.png "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"

diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control
index fc6c05a4f..324b8502f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control
@@ -7,8 +7,8 @@ Standards-Version: 3.8.4
 
 Package: redmond-default-settings-ii-trinity
 Architecture: all
-Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine, 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, kdnssd-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, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity
-Recommends: firefox, thunderbird, synaptic, kio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-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, kscreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, kwalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-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, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, x-ttcidfont-conf
+Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine, 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, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity
+Recommends: firefox, thunderbird, synaptic, kio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-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, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-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, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, x-ttcidfont-conf
 Suggests: apport-gtk, hplip-gui
 Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings
 Description: Redmond II default settings and artwork for the Kubuntu Trinity desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk_qt_engine_rc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk_qt_engine_rc
index aae3f8a04..ac761b181 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk_qt_engine_rc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk_qt_engine_rc
@@ -148,13 +148,13 @@ stock["gtk-dnd"]={
 	{ "22x22/mimetypes/empty.png" }
 }
 stock["gtk-dnd-multiple"]={
-	{ "22x22/mimetypes/kmultiple.png", *, *, "gtk-large-toolbar" },
-	{ "32x32/mimetypes/kmultiple.png", *, *, "gtk-dnd" },
-	{ "32x32/mimetypes/kmultiple.png", *, *, "gtk-dialog" },
-	{ "16x16/mimetypes/kmultiple.png", *, *, "gtk-button" },
-	{ "16x16/mimetypes/kmultiple.png", *, *, "gtk-menu" },
-	{ "16x16/mimetypes/kmultiple.png", *, *, "gtk-small-toolbar" },
-	{ "22x22/mimetypes/kmultiple.png" }
+	{ "22x22/mimetypes/tdemultiple.png", *, *, "gtk-large-toolbar" },
+	{ "32x32/mimetypes/tdemultiple.png", *, *, "gtk-dnd" },
+	{ "32x32/mimetypes/tdemultiple.png", *, *, "gtk-dialog" },
+	{ "16x16/mimetypes/tdemultiple.png", *, *, "gtk-button" },
+	{ "16x16/mimetypes/tdemultiple.png", *, *, "gtk-menu" },
+	{ "16x16/mimetypes/tdemultiple.png", *, *, "gtk-small-toolbar" },
+	{ "22x22/mimetypes/tdemultiple.png" }
 }
 stock["gtk-execute"]={
 	{ "22x22/actions/exec.png", *, *, "gtk-large-toolbar" },
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/katerc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/katerc
index 10fd37bab..f952dff62 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/katerc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/katerc
@@ -6,4 +6,4 @@ Session Exit=discard
 Startup Session=new
 
 [Kate Document Defaults]
-KTextEditor Plugin ktexteditor_isearch=true
+KTextEditor Plugin tdetexteditor_isearch=true
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/khtmlrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/khtmlrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kwalletrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdewalletrc
index 326194cb6..d0dce217c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kwalletrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdewalletrc
@@ -1,5 +1,5 @@
 [Auto Allow]
-kdewallet=kwalletmanager
+kdewallet=tdewalletmanager
 
 [Auto Deny]
 kdewallet=
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/khtmlrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/khtmlrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kwalletrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdewalletrc
index 326194cb6..d0dce217c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kwalletrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdewalletrc
@@ -1,5 +1,5 @@
 [Auto Allow]
-kdewallet=kwalletmanager
+kdewallet=tdewalletmanager
 
 [Auto Deny]
 kdewallet=
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part.rc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part.rc
index da8f97f73..a45167843 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part.rc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ark_kparts" version="8">
+<kpartgui name="ark_tdeparts" version="8">
 <ActionProperties>
     <Action name="select_all" icon="ark_selectall"/>
 </ActionProperties>
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part_readonly.rc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part_readonly.rc
index 888d12e8d..df2c4f29f 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part_readonly.rc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part_readonly.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ark_kparts" version="7">
+<kpartgui name="ark_tdeparts" version="7">
 <ActionProperties>
     <Action name="select_all" icon="ark_selectall"/>
 </ActionProperties>
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/khtml_browser.rc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/tdehtml_browser.rc
index 2eab2a321..069870b55 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/khtml_browser.rc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/tdehtml_browser.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="khtmlpart" version="19">
+<kpartgui name="tdehtmlpart" version="19">
 <MenuBar>
  <Menu name="file"><text>&amp;File</text>
   <Action name="saveBackground" />
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kwallet-default-wallet/kdewallet.kwl b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdewallet-default-wallet/kdewallet.kwl
index 485b2e683..485b2e683 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kwallet-default-wallet/kdewallet.kwl
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdewallet-default-wallet/kdewallet.kwl
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile b/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile
index 54be145df..482b9e6fc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile
@@ -275,8 +275,8 @@ install:
 	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"

 	install -m644 kpart-rc-files/ksvgplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"

 

-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/khtml/"

-	install -m644 kpart-rc-files/khtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/khtml/"

+	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"

+	install -m644 kpart-rc-files/tdehtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"

 

 	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"

 	install -m644 mimelnk/x-tar.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"

@@ -288,8 +288,8 @@ install:
 	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"

 	install -m644 kpart-plugins/dirfilterplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"

 

-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwallet/"

-	install -m644 kwallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwallet/"

+	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"

+	install -m644 tdewallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"

 

 	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"

 	install -m644 artwork/window-decoration-gradient.png "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"

diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control
index ecd25e6b0..428413a12 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control
@@ -7,8 +7,8 @@ Standards-Version: 3.8.4
 
 Package: redmond-default-settings-trinity
 Architecture: all
-Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine, 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, kdnssd-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, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity
-Recommends: firefox, thunderbird, synaptic, kio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-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, kscreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, kwalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-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, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, x-ttcidfont-conf
+Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine, 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, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity
+Recommends: firefox, thunderbird, synaptic, kio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-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, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-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, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, x-ttcidfont-conf
 Suggests: apport-gtk, hplip-gui
 Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings
 Description: Redmond default settings and artwork for the Kubuntu Trinity desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtk_qt_engine_rc b/ubuntu/maverick/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtk_qt_engine_rc
index aae3f8a04..ac761b181 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtk_qt_engine_rc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtk_qt_engine_rc
@@ -148,13 +148,13 @@ stock["gtk-dnd"]={
 	{ "22x22/mimetypes/empty.png" }
 }
 stock["gtk-dnd-multiple"]={
-	{ "22x22/mimetypes/kmultiple.png", *, *, "gtk-large-toolbar" },
-	{ "32x32/mimetypes/kmultiple.png", *, *, "gtk-dnd" },
-	{ "32x32/mimetypes/kmultiple.png", *, *, "gtk-dialog" },
-	{ "16x16/mimetypes/kmultiple.png", *, *, "gtk-button" },
-	{ "16x16/mimetypes/kmultiple.png", *, *, "gtk-menu" },
-	{ "16x16/mimetypes/kmultiple.png", *, *, "gtk-small-toolbar" },
-	{ "22x22/mimetypes/kmultiple.png" }
+	{ "22x22/mimetypes/tdemultiple.png", *, *, "gtk-large-toolbar" },
+	{ "32x32/mimetypes/tdemultiple.png", *, *, "gtk-dnd" },
+	{ "32x32/mimetypes/tdemultiple.png", *, *, "gtk-dialog" },
+	{ "16x16/mimetypes/tdemultiple.png", *, *, "gtk-button" },
+	{ "16x16/mimetypes/tdemultiple.png", *, *, "gtk-menu" },
+	{ "16x16/mimetypes/tdemultiple.png", *, *, "gtk-small-toolbar" },
+	{ "22x22/mimetypes/tdemultiple.png" }
 }
 stock["gtk-execute"]={
 	{ "22x22/actions/exec.png", *, *, "gtk-large-toolbar" },
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/katerc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/katerc
index 10fd37bab..f952dff62 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/katerc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/katerc
@@ -6,4 +6,4 @@ Session Exit=discard
 Startup Session=new
 
 [Kate Document Defaults]
-KTextEditor Plugin ktexteditor_isearch=true
+KTextEditor Plugin tdetexteditor_isearch=true
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kwalletrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kwalletrc
deleted file mode 100644
index 326194cb6..000000000
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kwalletrc
+++ /dev/null
@@ -1,18 +0,0 @@
-[Auto Allow]
-kdewallet=kwalletmanager
-
-[Auto Deny]
-kdewallet=
-
-[Wallet]
-Close When Idle=false
-Close on Screensaver=false
-Default Wallet=kdewallet
-Enabled=true
-First Use=false
-Idle Timeout=10
-Launch Manager=true
-Leave Manager Open=false
-Leave Open=true
-Prompt on Open=true
-Use One Wallet=true
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/khtmlrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/khtmlrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdewalletrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdewalletrc
new file mode 100644
index 000000000..d0dce217c
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdewalletrc
@@ -0,0 +1,18 @@
+[Auto Allow]
+kdewallet=tdewalletmanager
+
+[Auto Deny]
+kdewallet=
+
+[Wallet]
+Close When Idle=false
+Close on Screensaver=false
+Default Wallet=kdewallet
+Enabled=true
+First Use=false
+Idle Timeout=10
+Launch Manager=true
+Leave Manager Open=false
+Leave Open=true
+Prompt on Open=true
+Use One Wallet=true
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kwalletrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kwalletrc
deleted file mode 100644
index 326194cb6..000000000
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kwalletrc
+++ /dev/null
@@ -1,18 +0,0 @@
-[Auto Allow]
-kdewallet=kwalletmanager
-
-[Auto Deny]
-kdewallet=
-
-[Wallet]
-Close When Idle=false
-Close on Screensaver=false
-Default Wallet=kdewallet
-Enabled=true
-First Use=false
-Idle Timeout=10
-Launch Manager=true
-Leave Manager Open=false
-Leave Open=true
-Prompt on Open=true
-Use One Wallet=true
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/khtmlrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/khtmlrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdewalletrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdewalletrc
new file mode 100644
index 000000000..d0dce217c
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdewalletrc
@@ -0,0 +1,18 @@
+[Auto Allow]
+kdewallet=tdewalletmanager
+
+[Auto Deny]
+kdewallet=
+
+[Wallet]
+Close When Idle=false
+Close on Screensaver=false
+Default Wallet=kdewallet
+Enabled=true
+First Use=false
+Idle Timeout=10
+Launch Manager=true
+Leave Manager Open=false
+Leave Open=true
+Prompt on Open=true
+Use One Wallet=true
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part.rc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part.rc
index da8f97f73..a45167843 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part.rc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ark_kparts" version="8">
+<kpartgui name="ark_tdeparts" version="8">
 <ActionProperties>
     <Action name="select_all" icon="ark_selectall"/>
 </ActionProperties>
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part_readonly.rc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part_readonly.rc
index 888d12e8d..df2c4f29f 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part_readonly.rc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part_readonly.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ark_kparts" version="7">
+<kpartgui name="ark_tdeparts" version="7">
 <ActionProperties>
     <Action name="select_all" icon="ark_selectall"/>
 </ActionProperties>
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/khtml_browser.rc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/tdehtml_browser.rc
index 2eab2a321..069870b55 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/khtml_browser.rc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/tdehtml_browser.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="khtmlpart" version="19">
+<kpartgui name="tdehtmlpart" version="19">
 <MenuBar>
  <Menu name="file"><text>&amp;File</text>
   <Action name="saveBackground" />
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kwallet-default-wallet/kdewallet.kwl b/ubuntu/maverick/defaultsettings/redmond-default-settings/tdewallet-default-wallet/kdewallet.kwl
index 485b2e683..485b2e683 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kwallet-default-wallet/kdewallet.kwl
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/tdewallet-default-wallet/kdewallet.kwl
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install
index 4d50b4fc5..c851101bf 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install
@@ -149,7 +149,7 @@ debian/tmp/opt/trinity/include/tde/dom/SVGWindow.h
 debian/tmp/opt/trinity/include/tde/dom/SVGZoomAndPan.h
 debian/tmp/opt/trinity/include/tde/dom/SVGZoomEvent.h
 debian/tmp/opt/trinity/include/tde/kfaximage.h
-debian/tmp/opt/trinity/include/tde/kmultipageInterface.h
+debian/tmp/opt/trinity/include/tde/tdemultipageInterface.h
 debian/tmp/opt/trinity/include/tde/ksvg/CanvasFactory.h
 debian/tmp/opt/trinity/include/tde/ksvg/CanvasItem.h
 debian/tmp/opt/trinity/include/tde/ksvg/CanvasItems.h
@@ -164,7 +164,7 @@ debian/tmp/opt/trinity/include/tde/kviewshell/documentRenderer.h
 debian/tmp/opt/trinity/include/tde/kviewshell/documentWidget.h
 debian/tmp/opt/trinity/include/tde/kviewshell/history.h
 debian/tmp/opt/trinity/include/tde/kviewshell/hyperlink.h
-debian/tmp/opt/trinity/include/tde/kviewshell/kmultipage.h
+debian/tmp/opt/trinity/include/tde/kviewshell/tdemultipage.h
 debian/tmp/opt/trinity/include/tde/kviewshell/length.h
 debian/tmp/opt/trinity/include/tde/kviewshell/pageNumber.h
 debian/tmp/opt/trinity/include/tde/kviewshell/pageSize.h
@@ -185,8 +185,8 @@ debian/tmp/opt/trinity/lib/libkghostviewlib.la
 debian/tmp/opt/trinity/lib/libkghostviewlib.so
 debian/tmp/opt/trinity/lib/libkimageviewer.la
 debian/tmp/opt/trinity/lib/libkimageviewer.so
-debian/tmp/opt/trinity/lib/libkmultipage.la
-debian/tmp/opt/trinity/lib/libkmultipage.so
+debian/tmp/opt/trinity/lib/libtdemultipage.la
+debian/tmp/opt/trinity/lib/libtdemultipage.so
 debian/tmp/opt/trinity/lib/libkpovmodeler.la
 debian/tmp/opt/trinity/lib/libkpovmodeler.so
 debian/tmp/opt/trinity/lib/libksvg.la
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.install
index 2d4ea669a..78a5947e3 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.install
@@ -7,8 +7,8 @@ debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.la
 debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.so
 debian/tmp/opt/trinity/lib/trinity/kviewerpart.la
 debian/tmp/opt/trinity/lib/trinity/kviewerpart.so
-debian/tmp/opt/trinity/lib/libkmultipage.so.0
-debian/tmp/opt/trinity/lib/libkmultipage.so.0.0.0
+debian/tmp/opt/trinity/lib/libtdemultipage.so.0
+debian/tmp/opt/trinity/lib/libtdemultipage.so.0.0.0
 debian/tmp/opt/trinity/share/apps/djvumultipage.rc
 debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png
 debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png
@@ -25,4 +25,4 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kviewshell.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kviewshell.png
 debian/tmp/opt/trinity/share/services/emptymultipage.desktop
 debian/tmp/opt/trinity/share/services/djvumultipage.desktop
-debian/tmp/opt/trinity/share/servicetypes/kmultipage.desktop
+debian/tmp/opt/trinity/share/servicetypes/tdemultipage.desktop
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.lintian b/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.lintian
index 4a0571207..6ed9b4a4e 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.lintian
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.lintian
@@ -1,2 +1,2 @@
 kviewshell: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so
-kviewshell: package-name-doesnt-match-sonames libkmultipage0 libdjvu
+kviewshell: package-name-doesnt-match-sonames libtdemultipage0 libdjvu
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/control b/ubuntu/maverick/libraries/python-trinity/debian/control
index afacf68ee..cad02055c 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/control
+++ b/ubuntu/maverick/libraries/python-trinity/debian/control
@@ -20,7 +20,7 @@ Conflicts: python-trinity-trinity
 Description: Trinity bindings for Python [Trinity]
  Python binding module that provides wide access to the Trinity API,
  also known as PyKDE. Using this, you'll get (for example) classes
- from kio, kjs, khtml and kprint.
+ from kio, kjs, tdehtml and kprint.
 
 Package: python-trinity-trinity-dbg
 Priority: extra
@@ -32,7 +32,7 @@ XB-Python-Version: ${python:Versions}
 Description: Trinity bindings for Python (debug extensions) [Trinity]
  Python binding module that provides wide access to the Trinity API,
  also known as PyKDE. Using this, you'll get (for example) classes
- from kio, kjs, khtml and kprint.
+ from kio, kjs, tdehtml and kprint.
  .
  This package contains the extension built for the Python debug interpreter.
 
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog b/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog
index 0a3dc07a4..6c963f3b9 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog
@@ -836,7 +836,7 @@ kubuntu-meta (1.30) feisty; urgency=low
   * Added kubuntu-konqueror-shortcuts to desktop-recommends-i386,
     desktop-recommends-amd64, desktop-recommends-powerpc, desktop-
     recommends-ia64, desktop-recommends-sparc, desktop-recommends-hppa
-  * Added kwalletmanager to desktop-recommends-i386, desktop-recommends-
+  * Added tdewalletmanager to desktop-recommends-i386, desktop-recommends-
     amd64, desktop-recommends-powerpc, desktop-recommends-ia64, desktop-
     recommends-sparc, desktop-recommends-hppa
   * Added landscape-client to desktop-recommends-i386, desktop-
@@ -889,7 +889,7 @@ kubuntu-meta (1.30) feisty; urgency=low
     powerpc, desktop-ia64, desktop-sparc, desktop-hppa
   * Removed kubuntu-konqueror-shortcuts from desktop-i386, desktop-
     amd64, desktop-powerpc, desktop-ia64, desktop-sparc, desktop-hppa
-  * Removed kwalletmanager from desktop-i386, desktop-amd64, desktop-
+  * Removed tdewalletmanager from desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc, desktop-hppa
   * Removed landscape-client from desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc, desktop-hppa
@@ -1212,7 +1212,7 @@ kubuntu-meta (1.10) edgy; urgency=low
     desktop-ia64, desktop-sparc, desktop-hppa
   * Removed kmousetool from desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc, desktop-hppa
-  * Removed kscreensaver from desktop-i386, desktop-amd64, desktop-
+  * Removed tdescreensaver from desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc, desktop-hppa
   * Removed linux-headers-686 from desktop-i386
   * Removed linux-headers-amd64-generic from desktop-amd64
@@ -2162,7 +2162,7 @@ kubuntu-meta (0.63) dapper; urgency=low
   * Added cupsys-driver-gutenprint to desktop-ia64
   * Added ttf-arphic-ukai to desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc, desktop-hppa
-  * Added kdnssd to desktop-ia64, desktop-hppa
+  * Added tdednssd to desktop-ia64, desktop-hppa
   * Added ttf-arphic-uming to desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc, desktop-hppa
   * Removed python-musicbrainz from desktop-i386, desktop-amd64,
@@ -2173,7 +2173,7 @@ kubuntu-meta (0.63) dapper; urgency=low
 kubuntu-meta (0.62) dapper; urgency=low
 
   * Refreshed dependencies
-  * Added kdnssd to desktop-i386, desktop-amd64, desktop-powerpc,
+  * Added tdednssd to desktop-i386, desktop-amd64, desktop-powerpc,
     desktop-sparc
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 13 Jan 2006 01:00:35 +0000
@@ -2285,7 +2285,7 @@ kubuntu-meta (0.56) dapper; urgency=low
   * Refreshed dependencies
   * Added knetworkconf to desktop-hppa
   * Added krita to desktop-hppa
-  * Added kwalletmanager 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
@@ -2441,7 +2441,7 @@ kubuntu-meta (0.53) breezy; urgency=low
   * Added gstreamer0.8-musepack to desktop-hppa
   * Added gtk2-engines-gtk-qt to desktop-sparc, desktop-hppa
   * Added gstreamer0.8-theora to desktop-hppa
-  * Added kscreensaver to desktop-hppa
+  * Added tdescreensaver to desktop-hppa
   * Added kdesktop to desktop-hppa
   * Added klipper to desktop-hppa
   * Added konsole to desktop-hppa
@@ -3092,7 +3092,7 @@ kubuntu-meta (0.45) breezy; urgency=low
 kubuntu-meta (0.44) breezy; urgency=low
 
   * Refreshed dependencies
-  * Added kwalletmanager to desktop-i386, desktop-amd64, desktop-
+  * Added tdewalletmanager to desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  9 Jun 2005 23:32:00 +0000
@@ -3282,7 +3282,7 @@ kubuntu-meta (0.39) hoary; urgency=low
 kubuntu-meta (0.38) hoary; urgency=low
 
   * Refreshed dependencies
-  * Added kscreensaver to desktop-i386, desktop-amd64, desktop-powerpc,
+  * Added tdescreensaver to desktop-i386, desktop-amd64, desktop-powerpc,
     desktop-ia64, desktop-sparc
   * Removed python-glade2 from desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
index f5f9134d4..b10c8b527 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
@@ -7,8 +7,8 @@ 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, kdnssd-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
-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, kscreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, kwalletmanager-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
+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
+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
  This package depends on all of the packages in the Kubuntu TDE desktop system
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop b/ubuntu/maverick/metapackages/kubuntu-meta/desktop
index bfdaff332..732491954 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop
@@ -172,7 +172,7 @@ We've chosen KDE as our desktop user interface of choice
 == kdenetwork-trinity ==
 
  * kdenetwork-filesharing-trinity
- * kdnssd-trinity
+ * tdednssd-trinity
  * (kopete-trinity)
  * (kpf-trinity)
  * (kppp-trinity)
@@ -196,7 +196,7 @@ We've chosen KDE as our desktop user interface of choice
  * ark-trinity
  * (speedcrunch-trinity)
  * (kmilo-trinity)
- * (kwalletmanager-trinity)
+ * (tdewalletmanager-trinity)
 
 == koffice-trinity ==
 
@@ -273,7 +273,7 @@ Accessibility tools:
  * (openoffice.org-draw) [i386 powerpc amd64]
  * (openoffice.org-math) [i386 powerpc amd64]
  * (openoffice.org-java-common) [i386 powerpc amd64]
- * (kscreensaver-trinity)
+ * (tdescreensaver-trinity)
 
 = Games =
 
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64
index d04f55409..b9a6a4c6e 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64
@@ -37,7 +37,7 @@ kdepasswd-trinity
 tdeprint-trinity
 kdesktop-trinity
 tdm-trinity
-kdnssd-trinity
+tdednssd-trinity
 kghostview-trinity
 khelpcenter-trinity
 kicker-trinity
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa
index aa6d84396..4e0775054 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa
@@ -34,7 +34,7 @@ kdepasswd
 kdeprint
 kdesktop
 kdm
-kdnssd
+tdednssd
 kghostview
 khelpcenter
 kicker
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386
index 9873a7dba..2c8b6b5f3 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386
@@ -38,7 +38,7 @@ kdepasswd-trinity
 tdeprint-trinity
 kdesktop-trinity
 tdm-trinity
-kdnssd-trinity
+tdednssd-trinity
 kghostview-trinity
 khelpcenter-trinity
 kicker-trinity
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64
index c28064c75..b8458e4b6 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64
@@ -37,7 +37,7 @@ kdepasswd
 kdeprint
 kdesktop
 kdm
-kdnssd
+tdednssd
 kghostview
 khelpcenter
 kicker
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia
index a1666b456..0b09fc611 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia
@@ -37,7 +37,7 @@ kdepasswd-trinity
 tdeprint-trinity
 kdesktop-trinity
 tdm-trinity
-kdnssd-trinity
+tdednssd-trinity
 kghostview-trinity
 khelpcenter-trinity
 kicker-trinity
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc
index 4f36cc499..cbaae6a43 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc
@@ -34,7 +34,7 @@ kdepasswd
 kdeprint
 kdesktop
 kdm
-kdnssd
+tdednssd
 kghostview
 khelpcenter
 kicker
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-amd64 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-amd64
index f39f1dabd..6c811d42d 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-amd64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-amd64
@@ -63,14 +63,14 @@ kpf-trinity
 kppp-trinity
 krdc-trinity
 krfb-trinity
-kscreensaver-trinity
+tdescreensaver-trinity
 ksysguard-trinity
 ktorrent-trinity
 kubuntu-default-settings-trinity
 kubuntu-trinity-docs
 kubuntu-konqueror-shortcuts-trinity
 kvkbd-trinity
-kwalletmanager-trinity
+tdewalletmanager-trinity
 landscape-client
 laptop-detect
 libgl1-mesa-dri
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-hppa b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-hppa
index 5a4bea656..a3e27e409 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-hppa
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-hppa
@@ -62,14 +62,14 @@ kpf
 kppp
 krdc
 krfb
-kscreensaver
+tdescreensaver
 ksysguard
 ktorrent
 kubuntu-default-settings
 kubuntu-docs
 kubuntu-konqueror-shortcuts
 kvkbd
-kwalletmanager
+tdewalletmanager
 landscape-client
 laptop-detect
 libgl1-mesa-dri
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-i386 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-i386
index bb1c0df3f..9e1c7797d 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-i386
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-i386
@@ -64,14 +64,14 @@ kpf-trinity
 kppp-trinity
 krdc-trinity
 krfb-trinity
-kscreensaver-trinity
+tdescreensaver-trinity
 ksysguard-trinity
 ktorrent-trinity
 kubuntu-default-settings-trinity
 kubuntu-trinity-docs
 kubuntu-konqueror-shortcuts-trinity
 kvkbd-trinity
-kwalletmanager-trinity
+tdewalletmanager-trinity
 landscape-client
 laptop-detect
 libgl1-mesa-dri
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-ia64 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-ia64
index dda138ee3..7d6e29a60 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-ia64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-ia64
@@ -62,14 +62,14 @@ kpf
 kppp
 krdc
 krfb
-kscreensaver
+tdescreensaver
 ksysguard
 ktorrent
 kubuntu-default-settings
 kubuntu-docs
 kubuntu-konqueror-shortcuts
 kvkbd
-kwalletmanager
+tdewalletmanager
 landscape-client
 laptop-detect
 libgl1-mesa-dri
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-lpia b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-lpia
index e0de83e1b..07a6d8a79 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-lpia
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-lpia
@@ -64,14 +64,14 @@ kpf-trinity
 kppp-trinity
 krdc-trinity
 krfb-trinity
-kscreensaver-trinity
+tdescreensaver-trinity
 ksysguard-trinity
 ktorrent-trinity
 kubuntu-default-settings-trinity
 kubuntu-trinity-docs
 kubuntu-konqueror-shortcuts-trinity
 kvkbd-trinity
-kwalletmanager-trinity
+tdewalletmanager-trinity
 landscape-client
 laptop-detect
 libgl1-mesa-dri
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-powerpc b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-powerpc
index caf564463..14de9515e 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-powerpc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-powerpc
@@ -62,14 +62,14 @@ kpf
 kppp
 krdc
 krfb
-kscreensaver
+tdescreensaver
 ksysguard
 ktorrent
 kubuntu-default-settings
 kubuntu-docs
 kubuntu-konqueror-shortcuts
 kvkbd
-kwalletmanager
+tdewalletmanager
 landscape-client
 laptop-detect
 libgl1-mesa-dri
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-sparc b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-sparc
index 0aa3a1fb1..6d67f9eac 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-sparc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-sparc
@@ -62,14 +62,14 @@ kpf
 kppp
 krdc
 krfb
-kscreensaver
+tdescreensaver
 ksysguard
 ktorrent
 kubuntu-default-settings
 kubuntu-docs
 kubuntu-konqueror-shortcuts
 kvkbd
-kwalletmanager
+tdewalletmanager
 landscape-client
 laptop-detect
 libgl1-mesa-dri
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc
index aa6d84396..4e0775054 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc
@@ -34,7 +34,7 @@ kdepasswd
 kdeprint
 kdesktop
 kdm
-kdnssd
+tdednssd
 kghostview
 khelpcenter
 kicker
diff --git a/ubuntu/maverick/metapackages/trinity-livecd/debian/control b/ubuntu/maverick/metapackages/trinity-livecd/debian/control
index 318c6ee15..2805f756f 100644
--- a/ubuntu/maverick/metapackages/trinity-livecd/debian/control
+++ b/ubuntu/maverick/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, kscreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, kwalletmanager-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-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
 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/maverick/tdeaccessibility/debian/kttsd-trinity.install b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install
index cd7b93d85..2ad412a7f 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install
+++ b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install
@@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd
 debian/tmp/opt/trinity/bin/kttsmgr
 debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so
 debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la
 debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so
 debian/tmp/opt/trinity/lib/trinity/libkttsd_alsaplugin.la
@@ -34,7 +34,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1
 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0
 debian/tmp/opt/trinity/share/applications/tde/kcmkttsd.desktop
 debian/tmp/opt/trinity/share/applications/tde/kttsmgr.desktop
-debian/tmp/opt/trinity/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc
+debian/tmp/opt/trinity/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc
 debian/tmp/opt/trinity/share/apps/kttsd/festivalint/sabletowave.scm
 debian/tmp/opt/trinity/share/apps/kttsd/festivalint/voices
 debian/tmp/opt/trinity/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl
@@ -72,7 +72,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/female.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/male.png
-debian/tmp/opt/trinity/share/services/ktexteditor_kttsd.desktop
+debian/tmp/opt/trinity/share/services/tdetexteditor_kttsd.desktop
 debian/tmp/opt/trinity/share/services/kttsd.desktop
 debian/tmp/opt/trinity/share/services/kttsd_akodeplugin.desktop
 debian/tmp/opt/trinity/share/services/kttsd_alsaplugin.desktop
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
index 3ebc7a7a8..3e0bd4dc3 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
+++ b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
@@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd
 debian/tmp/opt/trinity/bin/kttsmgr
 debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so
 debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la
 debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so
 debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.la
@@ -32,7 +32,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1
 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0
 debian/tmp/usr/share/applications/tde/kcmkttsd.desktop
 debian/tmp/usr/share/applications/tde/kttsmgr.desktop
-debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc
+debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc
 debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm
 debian/tmp/usr/share/apps/kttsd/festivalint/voices
 debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl
@@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png
 debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png
 debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png
-debian/tmp/usr/share/services/ktexteditor_kttsd.desktop
+debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop
 debian/tmp/usr/share/services/kttsd.desktop
 debian/tmp/usr/share/services/kttsd_akodeplugin.desktop
 debian/tmp/usr/share/services/kttsd_artsplugin.desktop
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
index 3ebc7a7a8..3e0bd4dc3 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
+++ b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
@@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd
 debian/tmp/opt/trinity/bin/kttsmgr
 debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so
 debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la
 debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so
 debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.la
@@ -32,7 +32,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1
 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0
 debian/tmp/usr/share/applications/tde/kcmkttsd.desktop
 debian/tmp/usr/share/applications/tde/kttsmgr.desktop
-debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc
+debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc
 debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm
 debian/tmp/usr/share/apps/kttsd/festivalint/voices
 debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl
@@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png
 debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png
 debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png
-debian/tmp/usr/share/services/ktexteditor_kttsd.desktop
+debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop
 debian/tmp/usr/share/services/kttsd.desktop
 debian/tmp/usr/share/services/kttsd_akodeplugin.desktop
 debian/tmp/usr/share/services/kttsd_artsplugin.desktop
diff --git a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install b/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install
index c74edf4ce..15ec8f99e 100644
--- a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install
+++ b/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install
@@ -30,8 +30,8 @@ debian/tmp/opt/trinity/lib/trinity/libdomtreeviewerplugin.la
 debian/tmp/opt/trinity/lib/trinity/libdomtreeviewerplugin.so
 debian/tmp/opt/trinity/lib/trinity/libfsviewpart.la
 debian/tmp/opt/trinity/lib/trinity/libfsviewpart.so
-debian/tmp/opt/trinity/lib/trinity/libkhtmlsettingsplugin.la
-debian/tmp/opt/trinity/lib/trinity/libkhtmlsettingsplugin.so
+debian/tmp/opt/trinity/lib/trinity/libtdehtmlsettingsplugin.la
+debian/tmp/opt/trinity/lib/trinity/libtdehtmlsettingsplugin.so
 debian/tmp/opt/trinity/lib/trinity/kcm_kuick.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kuick.so
 debian/tmp/opt/trinity/lib/trinity/libkimgallery.la
@@ -62,7 +62,7 @@ debian/tmp/opt/trinity/share/applnk/.hidden/crashesplugin.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/dirfilterplugin.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/rsyncplugin.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/fsview.desktop
-debian/tmp/opt/trinity/share/applnk/.hidden/khtmlsettingsplugin.desktop
+debian/tmp/opt/trinity/share/applnk/.hidden/tdehtmlsettingsplugin.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kimgalleryplugin.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/plugin_babelfish.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/plugin_domtreeviewer.desktop
@@ -74,7 +74,7 @@ debian/tmp/opt/trinity/share/apps/domtreeviewer
 debian/tmp/opt/trinity/share/apps/fsview
 debian/tmp/opt/trinity/share/apps/imagerotation/orient.py
 debian/tmp/opt/trinity/share/apps/imagerotation/exif.py
-debian/tmp/opt/trinity/share/apps/khtml/kpartplugins
+debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins
 debian/tmp/opt/trinity/share/apps/konqiconview
 debian/tmp/opt/trinity/share/apps/konqlistview
 debian/tmp/opt/trinity/share/apps/konqsidebartng
@@ -108,9 +108,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/imgallery/index.docboo
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/imgallery/*.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/index.docbook
diff --git a/ubuntu/maverick/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 6208667e9..7d7396e71 100644
--- a/ubuntu/maverick/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/maverick/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -1,7 +1,7 @@
-kscreensaver-xsavers depends on xscreensaver-data not xscreensaver
+tdescreensaver-xsavers depends on xscreensaver-data not xscreensaver
 build-dep on xscreensaver-data
-add package kscreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra
+add package tdescreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra
 -webcollage depends on -extra not just xsavers
-  * Edit kscreensaver-xsaver-webcollage.install to use the file
+  * Edit tdescreensaver-xsaver-webcollage.install to use the file
     from sources, since it does not get installed during build.
 
diff --git a/ubuntu/maverick/tdeartwork/debian/changelog b/ubuntu/maverick/tdeartwork/debian/changelog
index a3043310e..ddf857174 100644
--- a/ubuntu/maverick/tdeartwork/debian/changelog
+++ b/ubuntu/maverick/tdeartwork/debian/changelog
@@ -33,13 +33,13 @@ tdeartwork (4:3.5.9-0ubuntu1) hardy; urgency=low
 
 tdeartwork (4:3.5.8-1ubuntu4) hardy; urgency=low
 
-  * Fix kscreensaver-xsavers-webcollage.install
+  * Fix tdescreensaver-xsavers-webcollage.install
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 10 Dec 2007 16:06:47 +0000
 
 tdeartwork (4:3.5.8-1ubuntu3) hardy; urgency=low
 
-  * Edit kscreensaver-xsaver-webcollage.install to use the file
+  * Edit tdescreensaver-xsaver-webcollage.install to use the file
     from sources, since it does not get installed during build.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 23:36:57 +0000
@@ -53,7 +53,7 @@ tdeartwork (4:3.5.8-1ubuntu2) hardy; urgency=low
 tdeartwork (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining change:
-   - Add package kscreensaver-xsavers-extra
+   - Add package tdescreensaver-xsavers-extra
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:44 +0000
 
@@ -68,7 +68,7 @@ tdeartwork (4:3.5.8-1) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
-  * Only make tdeartwork recommend kscreensaver-xsavers, not depend. It pulls
+  * Only make tdeartwork recommend tdescreensaver-xsavers, not depend. It pulls
     all sorts of weird gtk-stuff in.
   * Fix spelling error in control file.
 
@@ -106,7 +106,7 @@ tdeartwork (4:3.5.7-1ubuntu3) gutsy; urgency=low
 tdeartwork (4:3.5.7-1ubuntu2) gutsy; urgency=low
  .
    * Removed TryExec=xscreensaver from all the
-     kscreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be
+     tdescreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be
      controlled in the KDE screensavers control panel.  Closes LP: #49228
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Mon, 02 Jul 2007 17:13:01 +1000
@@ -149,7 +149,7 @@ tdeartwork (4:3.5.6-2) experimental; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
   
-  * Add kscreensaver-xsavers-webcollage.README.Debian.
+  * Add tdescreensaver-xsavers-webcollage.README.Debian.
   * Remade screensaver-xsavers-webcollage description in debian/control.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 31 Jan 2007 06:01:40 +0100
@@ -210,7 +210,7 @@ tdeartwork (4:3.5.4-0ubuntu1) edgy; urgency=low
 
 tdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low
 
-  * Removed kpartsaver.desktop from debian/kscreensavers-xsaver.install.  
+  * Removed tdepartsaver.desktop from debian/tdescreensavers-xsaver.install.  
     Closes bug #53065
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Fri, 21 Jul 2006 23:10:26 +1000
@@ -218,7 +218,7 @@ tdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low
 tdeartwork (4:3.5.3-1ubuntu1) edgy; urgency=low
 
   * Sync with Debian
-  * Create kscreensaver-xsavers-extra with the universe xscreensavers
+  * Create tdescreensaver-xsavers-extra with the universe xscreensavers
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Jul 2006 12:39:40 +0000
 
@@ -315,7 +315,7 @@ tdeartwork (4:3.4.3-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Remove ant.desktop from kscreensaver-xsavers, as the xscreensaver package
+  * Remove ant.desktop from tdescreensaver-xsavers, as the xscreensaver package
     has itself dropped this 'saver. (Closes: #338011)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  1 Dec 2005 15:58:30 +0100
@@ -329,8 +329,8 @@ tdeartwork (4:3.5.2-0ubuntu4) dapper; urgency=low
 tdeartwork (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Reverse previous change and list screensavers explicity, can't use
-    wildcard as some .desktop files should go into kscreensavers 
-    and not kscreensavers-xsaver
+    wildcard as some .desktop files should go into tdescreensavers 
+    and not tdescreensavers-xsaver
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 30 Mar 2006 16:54:24 +0100
 
@@ -437,7 +437,7 @@ tdeartwork (4:3.4.0-0pre2) alioth; urgency=low
     Kopete emoticons, now usable by everyone).
   * Forward port a patch from KDE 3.3 that fixes the building of the
     KFireSaver screensaver.
-  * Lower kscreensaver-xsavers's dependency on xscreensaver-gl to a Recommends.
+  * Lower tdescreensaver-xsavers's dependency on xscreensaver-gl to a Recommends.
     (Closes: #278263)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 25 Mar 2005 08:48:21 -0500
@@ -468,7 +468,7 @@ tdeartwork (4:3.3.0-1) unstable; urgency=low
   * New upstream release (closes: #267571).
   * The previous versioned libqt3-mt-dev build-depends is no longer
     necessary, since tdelibs4-dev already forces Qt 3.3.
-  * Split xscreensaver hooks into a separate package kscreensaver-xsavers,
+  * Split xscreensaver hooks into a separate package tdescreensaver-xsavers,
     along with kxsconfig and kxsrun (closes: #208769, #244538).  Two years
     of confusion is enough.
   * Build-depends on both xscreensaver and xscreensaver-gl, which are
@@ -524,7 +524,7 @@ tdeartwork (4:3.2.0-1) unstable; urgency=low
 
 tdeartwork (4:3.1.5-2) unstable; urgency=low
 
-  * Made kscreensaver depend on tdebase-bin (closes: #203185).
+  * Made tdescreensaver depend on tdebase-bin (closes: #203185).
 
  -- Ben Burton <bab@debian.org>  Mon, 19 Jan 2004 11:08:45 +1100
 
@@ -573,7 +573,7 @@ tdeartwork (4:3.1.2-1) unstable; urgency=low
 tdeartwork (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.
-  * Package kscreensaver recommends xscreensaver-gl.
+  * Package tdescreensaver recommends xscreensaver-gl.
   * Removed alpha compile flags.
 
  -- Ben Burton <bab@debian.org>  Sun, 23 Mar 2003 15:23:23 +1100
@@ -595,8 +595,8 @@ tdeartwork (4:3.1.0-2) unstable; urgency=low
 tdeartwork (4:3.1.0-1) unstable; urgency=low
 
   * New upstream release.
-  * Renamed tdeartwork-screensaver to kscreensaver.
-  * Shifted epoch to 4: since tdebase used to provide kscreensaver 4:3.0.x.
+  * Renamed tdeartwork-screensaver to tdescreensaver.
+  * Shifted epoch to 4: since tdebase used to provide tdescreensaver 4:3.0.x.
 
  -- Ben Burton <bab@debian.org>  Sat,  4 Jan 2003 20:06:44 +1100
 
diff --git a/ubuntu/maverick/tdeartwork/debian/control b/ubuntu/maverick/tdeartwork/debian/control
index ee0ae9ba5..b0100a04c 100644
--- a/ubuntu/maverick/tdeartwork/debian/control
+++ b/ubuntu/maverick/tdeartwork/debian/control
@@ -13,8 +13,8 @@ Architecture: all
 Section: tde
 Replaces: kdeartwork-trinity (<< 4:14.0.0)
 Breaks: kdeartwork-trinity (<< 4:14.0.0)
-Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), kscreensaver-trinity (>= ${Source-Version})
-Recommends: kscreensaver-xsavers-trinity
+Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
+Recommends: tdescreensaver-xsavers-trinity
 Description: themes, styles and more from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -110,13 +110,13 @@ Description: wallpapers released with Trinity
  This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kscreensaver-trinity
+Package: tdescreensaver-trinity
 Architecture: any
 Section: tde
-Replaces: kscreensaver-trinity (<< 4:14.0.0)
-Breaks: kscreensaver-trinity (<< 4:14.0.0)
+Replaces: tdescreensaver-trinity (<< 4:14.0.0)
+Breaks: tdescreensaver-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, tdebase-trinity-bin
-Recommends: twin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version})
+Recommends: twin-trinity, tdescreensaver-xsavers-trinity (= ${Source-Version})
 Description: additional screen savers released with Trinity
  This package contains the screen savers for Trinity. They can be tested and
  selected within the Appearance and Themes section of the Trinity Control
@@ -124,19 +124,19 @@ Description: additional screen savers released with Trinity
  .
  The hooks for the standard xscreensavers are no longer part of this
  package. To select and/or configure the standard xscreensavers through
- the KDE Control Center, install the separate package kscreensaver-xsavers.
+ the KDE Control Center, install the separate package tdescreensaver-xsavers.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kscreensaver-xsavers-trinity
+Package: tdescreensaver-xsavers-trinity
 Architecture: any
 Section: tde
-Replaces: kscreensaver-xsavers-trinity (<< 4:14.0.0)
-Breaks: kscreensaver-xsavers-trinity (<< 4:14.0.0)
+Replaces: tdescreensaver-xsavers-trinity (<< 4:14.0.0)
+Breaks: tdescreensaver-xsavers-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data
-Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl
-Suggests: kscreensaver-xsavers-webcollage-trinity
+Recommends: twin-trinity, tdescreensaver-trinity (= ${Source-Version}), xscreensaver-gl
+Suggests: tdescreensaver-xsavers-webcollage-trinity
 Description: Trinity hooks for standard xscreensavers
  This package allows a smooth integration of the standard xscreensavers
  into Trinity. With this package installed you can select and/or configure
@@ -145,19 +145,19 @@ Description: Trinity hooks for standard xscreensavers
  .
  Note that this package does not actually contain any screensavers itself.
  For the additional screensavers shipped with Trinity, see the separate package
- kscreensaver-trinity. This package does depend on the xscreensaver package, and
+ tdescreensaver-trinity. This package does depend on the xscreensaver package, and
  recommend the xscreensaver-gl package, as well as contain the necessary
  files to integrate these packages into Trinity.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kscreensaver-xsavers-webcollage-trinity
+Package: tdescreensaver-xsavers-webcollage-trinity
 Architecture: all
 Section: tde
-Replaces: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0)
-Breaks: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0)
-Depends: kscreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm
+Replaces: tdescreensaver-xsavers-webcollage-trinity (<< 4:14.0.0)
+Breaks: tdescreensaver-xsavers-webcollage-trinity (<< 4:14.0.0)
+Depends: tdescreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm
 Description: webcollage screensaver Trinity hook
  This package give access to the webcollage screensaver through the Trinity
  screensaver configuration.
@@ -171,19 +171,19 @@ Description: webcollage screensaver Trinity hook
  your computer in a working environment or in an environment with children.
  .
  If you still want to install this package, please read the file
- /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the 
+ /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the 
  installation.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kscreensaver-xsavers-extra-trinity
+Package: tdescreensaver-xsavers-extra-trinity
 Architecture: all
 Section: tde
-Replaces: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0)
-Breaks: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies
-Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version})
+Replaces: tdescreensaver-xsavers-extra-trinity (<< 4:14.0.0)
+Breaks: tdescreensaver-xsavers-extra-trinity (<< 4:14.0.0)
+Depends: ${shlibs:Depends}, tdescreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies
+Recommends: twin-trinity, tdescreensaver-trinity (= ${Source-Version})
 Description: Trinity hooks for standard xscreensavers
  This package allows a smooth integration of the universe xscreensavers
  into Trinity. With this package installed you can select and/or configure
@@ -192,7 +192,7 @@ Description: Trinity hooks for standard xscreensavers
  .
  Note that this package does not actually contain any screensavers itself.
  For the additional screensavers shipped with KDE, see the separate package
- kscreensaver.
+ tdescreensaver.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
diff --git a/ubuntu/maverick/tdeartwork/debian/control.in b/ubuntu/maverick/tdeartwork/debian/control.in
index 1721be0bf..4b914794e 100644
--- a/ubuntu/maverick/tdeartwork/debian/control.in
+++ b/ubuntu/maverick/tdeartwork/debian/control.in
@@ -11,8 +11,8 @@ Standards-Version: 3.7.2
 Package: tdeartwork
 Architecture: all
 Section: tde
-Depends: tdeartwork-misc (>= ${Source-Version}), tdeartwork-emoticons (>= ${Source-Version}), tdeartwork-style (>= ${Source-Version}), tdeartwork-theme-icon (>= ${Source-Version}), tdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), kscreensaver (>= ${Source-Version})
-Recommends: kscreensaver-xsavers
+Depends: tdeartwork-misc (>= ${Source-Version}), tdeartwork-emoticons (>= ${Source-Version}), tdeartwork-style (>= ${Source-Version}), tdeartwork-theme-icon (>= ${Source-Version}), tdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), tdescreensaver (>= ${Source-Version})
+Recommends: tdescreensaver-xsavers
 Description: themes, styles and more from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -98,11 +98,11 @@ Description: wallpapers released with KDE
  This package is part of KDE, and a component of the KDE artwork module.
  See the 'kde' and 'tdeartwork' packages for more information.
 
-Package: kscreensaver
+Package: tdescreensaver
 Architecture: any
 Section: tde
 Depends: ${shlibs:Depends}, tdebase-bin
-Recommends: twin, kscreensaver-xsavers (= ${Source-Version})
+Recommends: twin, tdescreensaver-xsavers (= ${Source-Version})
 Description: additional screen savers released with KDE
  This package contains the screen savers for KDE. They can be tested and
  selected within the Appearance and Themes section of the KDE Control
@@ -110,17 +110,17 @@ Description: additional screen savers released with KDE
  .
  The hooks for the standard xscreensavers are no longer part of this
  package. To select and/or configure the standard xscreensavers through
- the KDE Control Center, install the separate package kscreensaver-xsavers.
+ the KDE Control Center, install the separate package tdescreensaver-xsavers.
  .
  This package is part of KDE, and a component of the KDE artwork module.
  See the 'kde' and 'tdeartwork' packages for more information.
 
-Package: kscreensaver-xsavers
+Package: tdescreensaver-xsavers
 Architecture: any
 Section: tde
 Depends: ${shlibs:Depends}, tdebase-bin, xscreensaver
-Recommends: twin, kscreensaver (= ${Source-Version}), xscreensaver-gl
-Suggests: kscreensaver-xsavers-webcollage
+Recommends: twin, tdescreensaver (= ${Source-Version}), xscreensaver-gl
+Suggests: tdescreensaver-xsavers-webcollage
 Description: KDE hooks for standard xscreensavers
  This package allows a smooth integration of the standard xscreensavers
  into KDE. With this package installed you can select and/or configure
@@ -129,17 +129,17 @@ Description: KDE hooks for standard xscreensavers
  .
  Note that this package does not actually contain any screensavers itself.
  For the additional screensavers shipped with KDE, see the separate package
- kscreensaver. This package does depend on the xscreensaver package, and
+ tdescreensaver. This package does depend on the xscreensaver package, and
  recommend the xscreensaver-gl package, as well as contain the necessary
  files to integrate these packages into KDE.
  .
  This package is part of KDE, and a component of the KDE artwork module.
  See the 'kde' and 'tdeartwork' packages for more information.
 
-Package: kscreensaver-xsavers-webcollage
+Package: tdescreensaver-xsavers-webcollage
 Architecture: all
 Section: tde
-Depends: kscreensaver-xsavers, miscfiles | wordlist, netpbm
+Depends: tdescreensaver-xsavers, miscfiles | wordlist, netpbm
 Description: webcollage screensaver KDE hook
  This package give access to the webcollage screensaver through the KDE
  screensaver configuration.
@@ -153,7 +153,7 @@ Description: webcollage screensaver KDE hook
  your computer in a working environment or in an environment with children.
  .
  If you still want to install this package, please read the file
- /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the 
+ /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the 
  installation.
  .
  This package is part of KDE, and a component of the KDE artwork module.
diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install b/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install
deleted file mode 100644
index f58d9f076..000000000
--- a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-kscreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/
diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install b/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install
deleted file mode 100644
index f11cf310b..000000000
--- a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kpartsaver-trinity.kss.1 b/ubuntu/maverick/tdeartwork/debian/man/tdepartsaver-trinity.kss.1
index 64a0a5c45..73456139b 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kpartsaver-trinity.kss.1
+++ b/ubuntu/maverick/tdeartwork/debian/man/tdepartsaver-trinity.kss.1
@@ -16,9 +16,9 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kpartsaver.kss \- Media screen saver for KDE
+tdepartsaver.kss \- Media screen saver for KDE
 .SH SYNOPSIS
-.B kpartsaver.kss
+.B tdepartsaver.kss
 .RI "[ " generic-options " ]"
 [ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
 \fB\-\-demo\fP ]
@@ -28,7 +28,7 @@ kpartsaver.kss \- Media screen saver for KDE
 This program is part of the official KDE artwork module.
 .SH OPTIONS
 Below are the screen saver-specific options.
-For a full summary of options, run \fIkpartsaver.kss \-\-help\fP.
+For a full summary of options, run \fItdepartsaver.kss \-\-help\fP.
 .TP
 \fB\-\-setup\fP
 Set up the screen saver.
diff --git a/ubuntu/maverick/tdeartwork/debian/rules b/ubuntu/maverick/tdeartwork/debian/rules
index 4e236c044..963f996bc 100755
--- a/ubuntu/maverick/tdeartwork/debian/rules
+++ b/ubuntu/maverick/tdeartwork/debian/rules
@@ -34,7 +34,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 clean::
 	rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png
 	rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png
-	cd kscreensaver/kxsconfig/ && ./update_hacks.sh
+	cd tdescreensaver/kxsconfig/ && ./update_hacks.sh
 
-binary-install/kscreensaver-xsavers-extra-trinity::
-	rm -f debian/kscreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop
+binary-install/tdescreensaver-xsavers-extra-trinity::
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop
diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-trinity.install
index d65c099dc..012466480 100644
--- a/ubuntu/maverick/tdeartwork/debian/kscreensaver-trinity.install
+++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-trinity.install
@@ -14,7 +14,7 @@ debian/tmp/opt/trinity/bin/kclock.kss
 debian/tmp/opt/trinity/bin/kswarm.kss
 debian/tmp/opt/trinity/bin/kfountain.kss
 debian/tmp/opt/trinity/bin/kgravity.kss
-debian/tmp/opt/trinity/bin/kpartsaver.kss
+debian/tmp/opt/trinity/bin/tdepartsaver.kss
 debian/tmp/opt/trinity/bin/kpendulum.kss
 debian/tmp/opt/trinity/bin/kblob.kss
 debian/tmp/opt/trinity/bin/klines.kss
@@ -39,6 +39,6 @@ debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSpace.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSwarm.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KVm.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KWave.desktop
-debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/kpartsaver.desktop
+debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/tdepartsaver.desktop
 debian/tmp/opt/trinity/share/apps/kfiresaver
-debian/tmp/opt/trinity/share/apps/kscreensaver
+debian/tmp/opt/trinity/share/apps/tdescreensaver
diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver-trinity.manpages b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-trinity.manpages
index 839491dbc..294e72dd8 100644
--- a/ubuntu/maverick/tdeartwork/debian/kscreensaver-trinity.manpages
+++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-trinity.manpages
@@ -8,7 +8,7 @@ debian/man/kfountain-trinity.kss.1
 debian/man/kgravity-trinity.kss.1
 debian/man/klines-trinity.kss.1
 debian/man/klorenz-trinity.kss.1
-debian/man/kpartsaver-trinity.kss.1
+debian/man/tdepartsaver-trinity.kss.1
 debian/man/kpendulum-trinity.kss.1
 debian/man/kpolygon-trinity.kss.1
 debian/man/krotation-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
new file mode 100644
index 000000000..65da0bfe4
--- /dev/null
+++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
@@ -0,0 +1 @@
+tdescreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/
diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
index 296f023e9..296f023e9 100644
--- a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-trinity.install
+++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-trinity.manpages b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages
index 356af4f32..356af4f32 100644
--- a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-trinity.manpages
+++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages
diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install
new file mode 100644
index 000000000..74d362927
--- /dev/null
+++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install
@@ -0,0 +1 @@
+tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/
diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian
index c3dd2d9d5..c3dd2d9d5 100644
--- a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian
+++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian
diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers.README.Debian b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers.README.Debian
index 828861775..a41c9ad57 100644
--- a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers.README.Debian
+++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers.README.Debian
@@ -1,11 +1,11 @@
 KDE Screensavers for Debian
 ===========================
 
-This package (kscreensaver-xsavers) only contains hooks for the standard
+This package (tdescreensaver-xsavers) only contains hooks for the standard
 xscreensavers, so that they can be selected and/or configured through
 the KDE Control Centre.
 
 For the additional screensavers that are specifically shipped with KDE,
-see the separate package kscreensaver.
+see the separate package tdescreensaver.
 
  -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000
diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver.README.Debian b/ubuntu/maverick/tdeartwork/debian/tdescreensaver.README.Debian
index 68584d330..57a145f54 100644
--- a/ubuntu/maverick/tdeartwork/debian/kscreensaver.README.Debian
+++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver.README.Debian
@@ -1,11 +1,11 @@
 KDE Screensavers for Debian
 ===========================
 
-This package (kscreensaver) no longer contains the hooks for the standard
+This package (tdescreensaver) no longer contains the hooks for the standard
 xscreensavers.  It only contains the additional screensavers that are
 specifically shipped with KDE.
 
 To select and/or configure the standard xscreensavers through the KDE Control
-Centre, install the separate package kscreensaver-xsavers.
+Centre, install the separate package tdescreensaver-xsavers.
 
  -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000
diff --git a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
index 6abff5d30..2fbbb9969 100644
--- a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
@@ -20,7 +20,7 @@ install/klipper::
 
 binary-install/tdebase-bin::
 	install -p -D -m644 debian/kcheckpass.pam debian/tdebase-bin/etc/pam.d/kcheckpass
-	install -p -D -m644 debian/kscreensaver.pam debian/tdebase-bin/etc/pam.d/kscreensaver
+	install -p -D -m644 debian/tdescreensaver.pam debian/tdebase-bin/etc/pam.d/tdescreensaver
 	install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap
 	install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap
 
diff --git a/ubuntu/maverick/tdebase/debian/changelog b/ubuntu/maverick/tdebase/debian/changelog
index fc2c45054..450f25f23 100644
--- a/ubuntu/maverick/tdebase/debian/changelog
+++ b/ubuntu/maverick/tdebase/debian/changelog
@@ -1,7 +1,7 @@
 tdebase-trinity (4:3.5.10-2ubuntu12) karmic; urgency=low
 
   * Repaired kdesktop crash on load
-  * Fixed krandrtray crash when randr X extension is unavailable
+  * Fixed tderandrtray crash when randr X extension is unavailable
   * Added option to keys config dialog to alter Win key from modifier status
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 07 Dec 2009 13:24:00 -0600
@@ -67,7 +67,7 @@ tdebase-trinity (4:3.5.10-2ubuntu2) karmic; urgency=low
 tdebase-trinity (4:3.5.10-1ubuntu5) karmic; urgency=low
 
   * Added new ICC loading functionality to kcontrol and tdm
-  * Added new display output switching functionality to krandrtray
+  * Added new display output switching functionality to tderandrtray
   * Beginnings of customizable K menu icon
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 15 Oct 2009 10:46:00 -0600
@@ -750,7 +750,7 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low
   [ Sarah Hobbs ]
   * Added kubuntu_17_check_for_prelinking.diff. (Closes LP: #107694)
   * Added konqueror dependancy for konqueror-nsplugins. (LP: #139893)
-  * Added kubuntu_fix_kscreensaver_with_compiz_fixed_in_3.5.8.diff (LP:
+  * Added kubuntu_fix_tdescreensaver_with_compiz_fixed_in_3.5.8.diff (LP:
     #141628)
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Fri, 28 Sep 2007 18:56:10 +1000
@@ -758,7 +758,7 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low
 tdebase (4:3.5.7-1ubuntu23) gutsy; urgency=low
 
   * Fixed kubuntu_52_gtk_qt_engine_config.diff and
-    kubuntu_53_kwallet_config.diff as $tdehome=$HOME/.kde so we should use
+    kubuntu_53_tdewallet_config.diff as $tdehome=$HOME/.kde so we should use
     $tdehome instead of $HOME/$tdehome
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 19 Sep 2007 12:22:46 +0200
@@ -781,7 +781,7 @@ tdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low
 tdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low
 
   * Changed (again) $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and 
-    kubuntu_53_kwallet_config.diff . (LP: #136560)
+    kubuntu_53_tdewallet_config.diff . (LP: #136560)
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 15 Sep 2007 23:12:26 +0100
 
@@ -800,14 +800,14 @@ tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low
   * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk
     build-dep as they are no longer needed
   * Changed $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and 
-    kubuntu_53_kwallet_config.diff . (LP: #136560)
+    kubuntu_53_tdewallet_config.diff . (LP: #136560)
 
  -- Ryan Kavanagh <ryanakca@kubuntu.org>  Mon, 03 Sep 2007 10:26:36 -0400
 
 tdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low
 
   * Edit kubuntu_52_gtk_qt_engine_config.diff and
-    kubuntu_53_kwallet_config.diff to use $TDEHOME instead of .kde
+    kubuntu_53_tdewallet_config.diff to use $TDEHOME instead of .kde
   * Remove kubuntu_77_kiosystem.diff, home:/ better than /home now
   * Edit kubuntu_27_aboutscreen_searchbar.diff to work with strigi
   * Add kubuntu_9903_api_docs_move.diff for new API website
@@ -1154,7 +1154,7 @@ tdebase (4:3.5.6-0ubuntu13) feisty; urgency=low
 
 tdebase (4:3.5.6-0ubuntu12) feisty; urgency=low
 
-  * Add kubuntu_92_krandrtray_config.diff, krandrtray now uses guidance
+  * Add kubuntu_92_tderandrtray_config.diff, tderandrtray now uses guidance
     display configuration module in the first place.
     Closes Malone #46877
 
@@ -2148,7 +2148,7 @@ tdebase (4:3.5.0-4) unstable; urgency=low
 
   +++ Changes by Isaac Clerencia
 
-  * Add kdnssd kcontrol module files to kcontrol package
+  * Add tdednssd kcontrol module files to kcontrol package
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 11 Jan 2006 23:05:12 +0100
 
@@ -2210,7 +2210,7 @@ tdebase (4:3.5.2-0ubuntu26) dapper; urgency=low
 
 tdebase (4:3.5.2-0ubuntu25) dapper; urgency=low
 
-  * Fix kubuntu_53_kwallet_config.diff to not install kwallet 
+  * Fix kubuntu_53_tdewallet_config.diff to not install tdewallet 
     file in wrong directory, closes Malone #45999
   * Install filemanagement and webbrowsing konqueror profiles, 
     closes Malone #45004
@@ -2408,7 +2408,7 @@ tdebase (4:3.5.1-0ubuntu13) dapper; urgency=low
 tdebase (4:3.5.1-0ubuntu12) dapper; urgency=low
 
   [ Anthony Mercatante ]
-  * Add kubuntu_53_kwallet_config.diff copy a default 
+  * Add kubuntu_53_tdewallet_config.diff copy a default 
     KWallet config for new users
   * Add kubuntu_54_system_protocol_home_dir.diff make
     system:/ use /home/foo not system:/home/foo keep 
@@ -2511,7 +2511,7 @@ tdebase (4:3.5.0-0ubuntu16) dapper; urgency=low
 
 tdebase (4:3.5.0-0ubuntu15) dapper; urgency=low
 
-  * kcontrol replaces old tdebase-bin for kcm_kdnssd.desktop
+  * kcontrol replaces old tdebase-bin for kcm_tdednssd.desktop
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 17 Jan 2006 15:20:42 +0000
 
@@ -2550,7 +2550,7 @@ tdebase (4:3.5.0-0ubuntu10) dapper; urgency=low
 tdebase (4:3.5.0-0ubuntu9) dapper; urgency=low
 
   * Add kubuntu_40_xmkmf.diff for new imake/xmkmf path
-  * Install kcm_kdnssd in kcontrol
+  * Install kcm_tdednssd in kcontrol
   * Add kubuntu_41_kcmdnssd_name_icon.diff to make kcontrol module
     more recognisable
 
@@ -4332,7 +4332,7 @@ tdebase (4:2.1-20010115-1) unstable; urgency=low
   * More upstream fixes
   * ask where the mozilla bookmarks are (Closes: #81710)
   * tip that was annoying to some seems to be gone (Closes: #82253)
-  * Adding in kscreensaver pam file
+  * Adding in tdescreensaver pam file
   * Updating tdmrc to match current features and all
   * Add a link in /etc/X11/tdm to tdmrc (Closes: #82643)
   * Updated kde2 start script that fixes overwriting of gtk confs
diff --git a/ubuntu/maverick/tdebase/debian/control.in b/ubuntu/maverick/tdebase/debian/control.in
index 8194486c3..136828a50 100644
--- a/ubuntu/maverick/tdebase/debian/control.in
+++ b/ubuntu/maverick/tdebase/debian/control.in
@@ -97,7 +97,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
 Suggests: khelpcenter, gdb
 Conflicts: tdebase-libs (<< 4:3.0.0), tdm (<< 4:3.4.1-2)
-Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b)
+Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), tdescreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b)
 Description: core binaries for the KDE base module
  This package contains miscellaneous programs needed by other
  KDE applications, particularly those in the KDE base module.
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
index e8df7c819..f18eaea23 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/kfontinst
 debian/tmp/opt/trinity/bin/kfontview
 debian/tmp/opt/trinity/bin/kinfocenter
 debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper
-debian/tmp/opt/trinity/bin/krandrtray
+debian/tmp/opt/trinity/bin/tderandrtray
 debian/tmp/opt/trinity/bin/krdb
 debian/tmp/opt/trinity/lib/trinity/fontthumbnail.la
 debian/tmp/opt/trinity/lib/trinity/fontthumbnail.so
@@ -58,8 +58,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_kded.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kded.so
 debian/tmp/opt/trinity/lib/trinity/kcm_tdm.la
 debian/tmp/opt/trinity/lib/trinity/kcm_tdm.so
-debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.so
-debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.la
+debian/tmp/opt/trinity/lib/trinity/kcm_tdednssd.so
+debian/tmp/opt/trinity/lib/trinity/kcm_tdednssd.la
 debian/tmp/opt/trinity/lib/trinity/kcm_keys.la
 debian/tmp/opt/trinity/lib/trinity/kcm_keys.so
 debian/tmp/opt/trinity/lib/trinity/kcm_kicker.la
@@ -158,7 +158,7 @@ debian/tmp/opt/trinity/share/applications/tde/interrupts.desktop
 debian/tmp/opt/trinity/share/applications/tde/ioports.desktop
 debian/tmp/opt/trinity/share/applications/tde/ioslaveinfo.desktop
 debian/tmp/opt/trinity/share/applications/tde/joystick.desktop
-debian/tmp/opt/trinity/share/applications/tde/kcm_kdnssd.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcm_tdednssd.desktop
 debian/tmp/opt/trinity/share/applications/tde/kcmaccess.desktop
 debian/tmp/opt/trinity/share/applications/tde/kcmcss.desktop
 debian/tmp/opt/trinity/share/applications/tde/kcmfontinst.desktop
@@ -174,11 +174,11 @@ debian/tmp/opt/trinity/share/applications/tde/KControl.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdm.desktop
 debian/tmp/opt/trinity/share/applications/tde/keys.desktop
 debian/tmp/opt/trinity/share/applications/tde/kfontview.desktop
-debian/tmp/opt/trinity/share/applications/tde/khtml_behavior.desktop
-debian/tmp/opt/trinity/share/applications/tde/khtml_fonts.desktop
-debian/tmp/opt/trinity/share/applications/tde/khtml_java_js.desktop
-debian/tmp/opt/trinity/share/applications/tde/krandrtray.desktop
-debian/tmp/opt/trinity/share/autostart/krandrtray-autostart.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdehtml_behavior.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdehtml_fonts.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdehtml_java_js.desktop
+debian/tmp/opt/trinity/share/applications/tde/tderandrtray.desktop
+debian/tmp/opt/trinity/share/autostart/tderandrtray-autostart.desktop
 debian/tmp/opt/trinity/share/applications/tde/kthememanager.desktop
 debian/tmp/opt/trinity/share/applications/tde/iccconfig.desktop
 debian/tmp/opt/trinity/share/applications/tde/lanbrowser.desktop
@@ -218,7 +218,7 @@ debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/kcmtaskbar.desktop
 debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/panel_appearance.desktop
 debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/panel.desktop
 debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop
-debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/khtml_appearance.desktop
+debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/tdehtml_appearance.desktop
 debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/nsplugin.desktop
 debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/smb.desktop
 debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_browser.desktop
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian
index d18964b2d..a1120501f 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian
@@ -1,3 +1,3 @@
 kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so
 kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so
-kcontrol: shlib-missing-in-control-file libtdeinit_krandrinithack.so usr/lib/libtdeinit_krandrinithack.so
+kcontrol: shlib-missing-in-control-file libtdeinit_tderandrinithack.so usr/lib/libtdeinit_tderandrinithack.so
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-nsplugins-trinity.install b/ubuntu/maverick/tdebase/debian/konqueror-nsplugins-trinity.install
index 923c93227..d916322bc 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-nsplugins-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/konqueror-nsplugins-trinity.install
@@ -4,5 +4,5 @@ debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.la
 debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.so
 debian/tmp/opt/trinity/lib/trinity/libnsplugin.la
 debian/tmp/opt/trinity/lib/trinity/libnsplugin.so
-debian/tmp/opt/trinity/share/applications/tde/khtml_plugins.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdehtml_plugins.desktop
 debian/tmp/opt/trinity/share/apps/plugin/nspluginpart.rc
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.install b/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
index 71c1d7215..029f25bb6 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
@@ -35,8 +35,8 @@ debian/tmp/opt/trinity/lib/trinity/konqsidebar_web.la
 debian/tmp/opt/trinity/lib/trinity/konqsidebar_web.so
 debian/tmp/opt/trinity/lib/trinity/konqueror.la
 debian/tmp/opt/trinity/lib/trinity/konqueror.so
-debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.la
-debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.so
+debian/tmp/opt/trinity/lib/trinity/libtdehtmlkttsdplugin.la
+debian/tmp/opt/trinity/lib/trinity/libtdehtmlkttsdplugin.so
 debian/tmp/opt/trinity/lib/libtdeinit_keditbookmarks.so
 debian/tmp/opt/trinity/lib/libtdeinit_kfmclient.so
 debian/tmp/opt/trinity/lib/libtdeinit_konqueror.so
@@ -48,7 +48,7 @@ debian/tmp/opt/trinity/share/applications/tde/kfmclient.desktop
 debian/tmp/opt/trinity/share/applications/tde/kfmclient_dir.desktop
 debian/tmp/opt/trinity/share/applications/tde/kfmclient_html.desktop
 debian/tmp/opt/trinity/share/applications/tde/kfmclient_war.desktop
-debian/tmp/opt/trinity/share/applications/tde/khtml_filter.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdehtml_filter.desktop
 debian/tmp/opt/trinity/share/applications/tde/konqbrowser.desktop
 debian/tmp/opt/trinity/share/applications/tde/konquerorsu.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/konqfilemgr.desktop
@@ -60,8 +60,8 @@ 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/keditbookmarks/keditbookmarks-genui.rc
 debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarksui.rc
-debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/khtmlkttsd.desktop
-debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/khtmlkttsd.rc
+debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.desktop
+debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.rc
 debian/tmp/opt/trinity/share/apps/konqiconview/konq_iconview.rc
 debian/tmp/opt/trinity/share/apps/konqiconview/konq_multicolumnview.rc
 debian/tmp/opt/trinity/share/apps/konqiconview/kpartplugins/kremoteencodingplugin.desktop
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index a1e9c65f7..bbcbdc032 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes
 CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
 
 DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \
--DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
+-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
 -DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="OFF" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="OFF" -DWITH_TDEHWLIB="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_XSCREENSAVER="ON" -DWITH_UPOWER="ON" -DWITH_LIBART="ON" \
 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
@@ -254,7 +254,7 @@ binary-install/klipper-trinity::
 
 binary-install/tdebase-trinity-bin::
 	install -p -D -m644 debian/kcheckpass-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kcheckpass-trinity
-	install -p -D -m644 debian/kscreensaver-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kscreensaver-trinity
+	install -p -D -m644 debian/tdescreensaver-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/tdescreensaver-trinity
 	mkdir -p debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/
 	install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/system.xmodmap
 	install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-trinity-bin/etc/X11/Xsession.d/80ubuntu-trinity-xmodmap
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
index 9ac6769ea..7f06b6d76 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
@@ -223,10 +223,10 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/nsplugin.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook
@@ -357,7 +357,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kcontrol.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/tdmconfig.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/key_bindings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kfm_home.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kscreensaver.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/tdescreensaver.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kthememgr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/licq.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/linuxconf.png
@@ -461,7 +461,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard_layout.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kfm_home.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/knotify.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kscreensaver.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/tdescreensaver.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kthememgr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kvirc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/licq.png
@@ -563,7 +563,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmx.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/tdmconfig.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/key_bindings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/keyboard.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kscreensaver.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/tdescreensaver.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kthememgr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kvirc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/locale.png
@@ -648,7 +648,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard_layout.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kfm_home.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/knotify.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kscreensaver.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/tdescreensaver.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kthememgr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kvirc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/licq.png
@@ -792,7 +792,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard_layout.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kfm_home.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/knotify.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kscreensaver.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/tdescreensaver.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kthememgr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kvirc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/licq.png
@@ -888,7 +888,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/tdmconfig.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/key_bindings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kfm_home.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/knotify.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kscreensaver.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/tdescreensaver.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kthememgr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kvirc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/licq.png
diff --git a/ubuntu/maverick/tdebase/debian/kscreensaver-trinity.pam b/ubuntu/maverick/tdebase/debian/tdescreensaver-trinity.pam
index 088a00503..9a2c74519 100644
--- a/ubuntu/maverick/tdebase/debian/kscreensaver-trinity.pam
+++ b/ubuntu/maverick/tdebase/debian/tdescreensaver-trinity.pam
@@ -1,5 +1,5 @@
 #
-# /etc/pam.d/kscreensaver - specify the PAM behaviour of kscreensaver
+# /etc/pam.d/tdescreensaver - specify the PAM behaviour of tdescreensaver
 #
 @include common-auth
 @include common-account
diff --git a/ubuntu/maverick/tdebindings/debian/tde-xparts-extras-trinity.install b/ubuntu/maverick/tdebindings/debian/tde-xparts-extras-trinity.install
index e29ab016c..764c26e42 100644
--- a/ubuntu/maverick/tdebindings/debian/tde-xparts-extras-trinity.install
+++ b/ubuntu/maverick/tdebindings/debian/tde-xparts-extras-trinity.install
@@ -11,7 +11,7 @@
 #debian/tmp/opt/trinity/lib/libgtkxparts.so.0
 #debian/tmp/opt/trinity/lib/libgtkxparts.so
 #debian/tmp/opt/trinity/lib/libgtkxparts.la
-#debian/tmp/opt/trinity/include/xkparts
+#debian/tmp/opt/trinity/include/xtdeparts
 #debian/tmp/opt/trinity/lib/libkmozillapart.so.0.0.0
 #debian/tmp/opt/trinity/lib/libkmozillapart.so.0
 #debian/tmp/opt/trinity/lib/libkmozillapart.so
diff --git a/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.install b/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.install
index 2d4ea669a..78a5947e3 100644
--- a/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.install
@@ -7,8 +7,8 @@ debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.la
 debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.so
 debian/tmp/opt/trinity/lib/trinity/kviewerpart.la
 debian/tmp/opt/trinity/lib/trinity/kviewerpart.so
-debian/tmp/opt/trinity/lib/libkmultipage.so.0
-debian/tmp/opt/trinity/lib/libkmultipage.so.0.0.0
+debian/tmp/opt/trinity/lib/libtdemultipage.so.0
+debian/tmp/opt/trinity/lib/libtdemultipage.so.0.0.0
 debian/tmp/opt/trinity/share/apps/djvumultipage.rc
 debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png
 debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png
@@ -25,4 +25,4 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kviewshell.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kviewshell.png
 debian/tmp/opt/trinity/share/services/emptymultipage.desktop
 debian/tmp/opt/trinity/share/services/djvumultipage.desktop
-debian/tmp/opt/trinity/share/servicetypes/kmultipage.desktop
+debian/tmp/opt/trinity/share/servicetypes/tdemultipage.desktop
diff --git a/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.lintian
index 4a0571207..6ed9b4a4e 100644
--- a/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.lintian
+++ b/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.lintian
@@ -1,2 +1,2 @@
 kviewshell: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so
-kviewshell: package-name-doesnt-match-sonames libkmultipage0 libdjvu
+kviewshell: package-name-doesnt-match-sonames libtdemultipage0 libdjvu
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-trinity-dev.install b/ubuntu/maverick/tdegraphics/debian/tdegraphics-trinity-dev.install
index 80d007db5..26f6ba6ea 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-trinity-dev.install
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-trinity-dev.install
@@ -149,7 +149,7 @@ debian/tmp/opt/trinity/include/dom/SVGWindow.h
 debian/tmp/opt/trinity/include/dom/SVGZoomAndPan.h
 debian/tmp/opt/trinity/include/dom/SVGZoomEvent.h
 debian/tmp/opt/trinity/include/kfaximage.h
-debian/tmp/opt/trinity/include/kmultipageInterface.h
+debian/tmp/opt/trinity/include/tdemultipageInterface.h
 debian/tmp/opt/trinity/include/ksvg/CanvasFactory.h
 debian/tmp/opt/trinity/include/ksvg/CanvasItem.h
 debian/tmp/opt/trinity/include/ksvg/CanvasItems.h
@@ -164,7 +164,7 @@ debian/tmp/opt/trinity/include/kviewshell/documentRenderer.h
 debian/tmp/opt/trinity/include/kviewshell/documentWidget.h
 debian/tmp/opt/trinity/include/kviewshell/history.h
 debian/tmp/opt/trinity/include/kviewshell/hyperlink.h
-debian/tmp/opt/trinity/include/kviewshell/kmultipage.h
+debian/tmp/opt/trinity/include/kviewshell/tdemultipage.h
 debian/tmp/opt/trinity/include/kviewshell/length.h
 debian/tmp/opt/trinity/include/kviewshell/pageNumber.h
 debian/tmp/opt/trinity/include/kviewshell/pageSize.h
@@ -185,8 +185,8 @@ debian/tmp/opt/trinity/lib/libkghostviewlib.la
 debian/tmp/opt/trinity/lib/libkghostviewlib.so
 debian/tmp/opt/trinity/lib/libkimageviewer.la
 debian/tmp/opt/trinity/lib/libkimageviewer.so
-debian/tmp/opt/trinity/lib/libkmultipage.la
-debian/tmp/opt/trinity/lib/libkmultipage.so
+debian/tmp/opt/trinity/lib/libtdemultipage.la
+debian/tmp/opt/trinity/lib/libtdemultipage.so
 debian/tmp/opt/trinity/lib/libkpovmodeler.la
 debian/tmp/opt/trinity/lib/libkpovmodeler.so
 debian/tmp/opt/trinity/lib/libksvg.la
diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog
index 60b5c5d56..6a9f72874 100644
--- a/ubuntu/maverick/tdelibs/debian/changelog
+++ b/ubuntu/maverick/tdelibs/debian/changelog
@@ -388,7 +388,7 @@ tdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low
   +++ Changes by Fathi Boudra:
 
   * Move binaries to tdelibs4-dev: kconfig_compiler, ksvgtopng,
-    kunittestmodrunner, makekdewidgets, preparetips.
+    tdeunittestmodrunner, makekdewidgets, preparetips.
     Allow tdelibs5-dev co-installable alongside tdelibs4c2a.
 
   * Suggests perl-suid instead Recommends. (Closes: #437414)
@@ -602,7 +602,7 @@ tdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low
   * Resync debian/patches:
     - Remove, applied upstream: 
        22_konq_scroll2top_before_new_page_fix.diff,
-       25_khtml_non_existant_page_crash.diff,
+       25_tdehtml_non_existant_page_crash.diff,
        45_konqueror-CVE-2007-0537.diff,
        46_CVE-2007-1564-tdelibs-3.5.6.diff,
        47_tdelibs-kjs-utf8-parsing.diff.
@@ -731,7 +731,7 @@ tdelibs (4:3.5.6-0ubuntu3) feisty; urgency=low
 
 tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low
 
-  * Add kubuntu_67_kwallet_auto_save.diff
+  * Add kubuntu_67_tdewallet_auto_save.diff
     Kwallet auto-saves any modification.
     Closes Malone #67521
 
@@ -740,7 +740,7 @@ tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low
 tdelibs (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * Remove 02_kate_tdeprint_fixes_branch.diff
-  * Update 27_kdnssd_avahi.dif
+  * Update 27_tdednssd_avahi.dif
   * Remove 33_cups12_kprinter_fixes.diff
   * Remove 35_cups_unify_ipp_uri_assembling.diff
   * Remove 36_tdeprintd_64bit_fix.diff
@@ -823,8 +823,8 @@ tdelibs (4:3.5.6.r1.dfsg.1-3) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
-  * Add 44_sync_kwallet_changes to make kwallet write changes to disk
-    immediately, avoiding losing passwords if kwallet doesn't shutdown
+  * Add 44_sync_tdewallet_changes to make tdewallet write changes to disk
+    immediately, avoiding losing passwords if tdewallet doesn't shutdown
     cleanly. Patch by Josh Metzler. (Closes: #407272)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 18 Apr 2007 14:45:54 +0100
@@ -835,7 +835,7 @@ tdelibs (4:3.5.6.r1.dfsg.1-2) experimental; urgency=low
 
   * Fix the bug of KDE 3.5.6 - an annoying issue with konqueror scrolling to the top
     of the old page before loading a new one. Patch from upstream svn (22nd patch).
-  * New patch (No. 25) from KDE bug #128564. Fixes khtml crash on loading
+  * New patch (No. 25) from KDE bug #128564. Fixes tdehtml crash on loading
     some non existing pages when javascript is disabled (Closes: #408413).
     Probably fixes these KDE bugs too: #126812, #127137, #135117, #138449.
 
@@ -861,11 +861,11 @@ tdelibs (4:3.5.6.dfsg.1-1) experimental; urgency=low
 
   * New upstream release:
     * Fixes "Up arrow confused with PrintScrn on evdev keyboards". (Closes: #400887)
-    * Fixes infinite recursion in khtml when rendering combination of blocks
+    * Fixes infinite recursion in tdehtml when rendering combination of blocks
       with overflow:auto and float:right styles. (Closes: #392547)
     * Fixes "Fatal IO error: client killed" problem in knode. (Closes: #356142)
-    * Fixes non-standard rendering of floats (khtml). (Closes: #357017)
-    * Fixes konqueror (khtml) crash when resolving ns in a stylesheet
+    * Fixes non-standard rendering of floats (tdehtml). (Closes: #357017)
+    * Fixes konqueror (tdehtml) crash when resolving ns in a stylesheet
       @imported from external one. (Closes: #401937)
 
   +++ Changes by Modestas Vainius:
@@ -1016,7 +1016,7 @@ tdelibs (4:3.5.4-1) unstable; urgency=low
 
   * new upstreal release:
 
-    + Fixes null dereference in khtml, which could cause the browser to crash.
+    + Fixes null dereference in tdehtml, which could cause the browser to crash.
       This resolves CVE-2006-3672. Thankfully not every reproducible Konq crash
       bug gets a CVE number... (Closes: #378962)
 
@@ -1297,7 +1297,7 @@ tdelibs (4:3.5.3-1) unstable; urgency=low
 
 tdelibs (4:3.5.2-2) unstable; urgency=low
 
-  * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for khtml.
+  * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for tdehtml.
     Pages which, since the last upload, didn't render at all, or only showed
     headers, should be fixed.
 
@@ -1384,7 +1384,7 @@ tdelibs (4:3.5.1-1) unstable; urgency=low
 
   +++ Changes by Isaac Clerencia:
 
-  * Apply patch 27_kdnssd_avahi.diff to replace dummy tdelibs kdnssd
+  * Apply patch 27_tdednssd_avahi.diff to replace dummy tdelibs tdednssd
     implementation with a working avahi-based one.
 
   * Add Build-Depends on libavahi-client-dev and libavahi-qt3-dev to get
@@ -1432,7 +1432,7 @@ tdelibs (4:3.5.0-1) alioth; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Remove an old conffile from KDE 3.3, ktexteditor_autobookmarkerrc, on
+  * Remove an old conffile from KDE 3.3, tdetexteditor_autobookmarkerrc, on
     upgrade. (Closes: #339491)
 
   * Bump DH_COMPAT to 5. No changes, except tdelibs4c2a-dbg is replaced by
@@ -1607,20 +1607,20 @@ tdelibs (4:3.5.2-0ubuntu0) dapper; urgency=low
 tdelibs (4:3.5.1-0ubuntu11) dapper; urgency=low
 
   * Remove stray comma from configure.in.in in 
-    kubuntu_27_kdnssd_avahi.diff that stopped it picking up 
+    kubuntu_27_tdednssd_avahi.diff that stopped it picking up 
     -lavahi-common
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Mar 2006 17:35:07 +0000
 
 tdelibs (4:3.5.1-0ubuntu10) dapper; urgency=low
 
-  * Fix include path in kubuntu_27_kdnssd_avahi.diff patch
+  * Fix include path in kubuntu_27_tdednssd_avahi.diff patch
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 10 Mar 2006 15:34:38 +0000
 
 tdelibs (4:3.5.1-0ubuntu9) dapper; urgency=low
 
-  * Update 27_kdnssd_avahi.diff now called kubuntu_27_kdnssd_avahi.diff to 
+  * Update 27_tdednssd_avahi.diff now called kubuntu_27_tdednssd_avahi.diff to 
     fix crash when avahi is not installed
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  9 Mar 2006 09:59:35 +0000
@@ -1675,7 +1675,7 @@ tdelibs (4:3.5.1-0ubuntu2) dapper; urgency=low
 tdelibs (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
-  * Sync 27_kdnssd_avahi.diff with Debian
+  * Sync 27_tdednssd_avahi.diff with Debian
   * Use control-dapper and control-breezy for to allow for backports
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 15:04:54 +0000
@@ -1726,22 +1726,22 @@ tdelibs (4:3.5.0-0ubuntu7) dapper; urgency=low
 
 tdelibs (4:3.5.0-0ubuntu6) dapper; urgency=low
 
-  * Remove libkdnssd depend from tdelibs4-dev
+  * Remove libtdednssd depend from tdelibs4-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 09:09:29 +0000
 
 tdelibs (4:3.5.0-0ubuntu5) dapper; urgency=low
 
-  * Add kubuntu_27_kdnssd_avahi.diff for avahi support directly in
+  * Add kubuntu_27_tdednssd_avahi.diff for avahi support directly in
     tdelibs
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Jan 2006 21:14:20 +0000
 
 tdelibs (4:3.5.0-0ubuntu4) dapper; urgency=low
 
-  * Do not install kdnssd library files, they now come from
-    libkdnssd1-avahi package.  Development files stay in tdelibs4-dev.
-  * Add depends on libkdnssd1-avahi from tdelibs4-dev
+  * Do not install tdednssd library files, they now come from
+    libtdednssd1-avahi package.  Development files stay in tdelibs4-dev.
+  * Add depends on libtdednssd1-avahi from tdelibs4-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Jan 2006 01:25:52 +0000
 
@@ -1754,7 +1754,7 @@ tdelibs (4:3.5.0-0ubuntu3) dapper; urgency=low
 
 tdelibs (4:3.5.0-0ubuntu2) dapper; urgency=low
 
-  * Add back updated kubuntu_06_kwallet_simplify_string.diff
+  * Add back updated kubuntu_06_tdewallet_simplify_string.diff
     and kubuntu_03_applications_menu_entries_move.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Dec 2005 14:34:41 +0000
@@ -1849,7 +1849,7 @@ tdelibs (4:3.4.2-4) unstable; urgency=low
 
   +++ Changes by Adeodato Simó:
 
-  * Use khtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of
+  * Use tdehtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of
     whitespace around tags found inside <pre>. This was making konqueror
     sometimes ignore blank lines in pre mode, which made this friendly
     maintainer of yours terribly unhappy when visiting bts.turmzimmer.net.
@@ -2010,7 +2010,7 @@ tdelibs (4:3.4.1-0ubuntu9) breezy; urgency=low
 
 tdelibs (4:3.4.1-0ubuntu8) breezy; urgency=low
 
-  * Add kubuntu_06_kwallet_simplify_string.diff to simplify KWallet question
+  * Add kubuntu_06_tdewallet_simplify_string.diff to simplify KWallet question
   * Add kubuntu_07_rubberband.diff for pretty file manager selection
   * Add versioned build-dep on libxrender-dev and tighten version 
     build-dep of Qt to ensure libXrender.la changes
@@ -2374,7 +2374,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low
     for CAN-2004-1158. [CM]
 
   * Removed patches:
-    - post-3.3.1-tdelibs-khtml.diff and post-3.3.1-tdelibs-kio.diff since
+    - post-3.3.1-tdelibs-tdehtml.diff and post-3.3.1-tdelibs-kio.diff since
       these fixes are in KDE_3_3_BRANCH. [CM]
 
   * New patches:
@@ -2395,7 +2395,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low
 
   * New entries in debian/tdelibs4-dev.install:
     - usr/include/kiobuffer.h
-    - usr/include/kwallettypes.h
+    - usr/include/tdewallettypes.h
 
   * debian/control:
     - removed unneeded build-dependency on automake1.9. [CM]
@@ -2437,8 +2437,8 @@ tdelibs (4:3.3.1-2) unstable; urgency=medium
   * Include patch to fix CAN-2004-1171 ("plain text password exposure").
     Closes half of #285126. Notes about the patches:
 
-    - post-3.3.1-tdelibs-khtml.diff: dropped hunks #2 and #3 of patch to
-      khtml_part.cpp, since they were whitespace adjustments and were causing
+    - post-3.3.1-tdelibs-tdehtml.diff: dropped hunks #2 and #3 of patch to
+      tdehtml_part.cpp, since they were whitespace adjustments and were causing
       failures to apply.
 
     - post-3.3.1-tdelibs-kio.diff: the patch as given in the KDE Advisory
@@ -2838,7 +2838,7 @@ tdelibs (4:2.2.2-2) unstable; urgency=low
   * Remove recommends for libssl as I'm breaking policy by recommending
     something outside of main.  Will put this back once libssl goes into
     main.
-  * libkmid | libkmid-alsa to help users out a bit
+  * libtdemid | libtdemid-alsa to help users out a bit
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 22 Nov 2001 20:14:00 -0700
 
@@ -3027,7 +3027,7 @@ tdelibs (4:2.2.0-0.1beta1-1) unstable; urgency=low
  
   * synce with upstream
   * Drop optimization down for cross arch building
-  * Move libkscreensaver.so over to -dev package where it belongs
+  * Move libtdescreensaver.so over to -dev package where it belongs
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 25 Jul 2001 03:35:00 -0700
 
@@ -3106,7 +3106,7 @@ tdelibs (4:2.2.0-0beta1-1) unstable; urgency=low
   * Add Debian menu items: cupsdconf
   * New packages: tdelibs3-cups
   * Moving kdoc and qt-doc into Build-Depends-Indep
-  * Add Provides in for libarts-alsa/libkmid-alsa
+  * Add Provides in for libarts-alsa/libtdemid-alsa
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
 
@@ -3150,7 +3150,7 @@ tdelibs (4:2.1.1-4) unstable; urgency=low
 tdelibs (4:2.1.1-3) unstable; urgency=low
  
   * Sync with upstream.  
-    Includes several khtml fixes
+    Includes several tdehtml fixes
     Memory leak fix
     Proxy Authentication fix
   * Update pam file for kde, add more documentation in it and modify defaults
@@ -3198,7 +3198,7 @@ tdelibs (4:2.1.0.1-3) unstable; urgency=low
 tdelibs (4:2.1.0.1-2) unstable; urgency=low
  
   * More upstream fixes
-    several khtml fixes especially with css
+    several tdehtml fixes especially with css
     more font fixes
     more session fixes..hopefully solving some of the reports
   * built with new kdoc
@@ -3298,8 +3298,8 @@ tdelibs (4:2.1-20010118-1) unstable; urgency=low
      fix JS and onmouseovers
    * mimetype fixes (Closes: #76455)
    * fix build order for libarts-alsa
-   * breaking out libkmid to avoid unnessary depends (Closes: #82901, #82924)
-   * libarts and libkmid are Recommends of tdelibs3 and not dependant now
+   * breaking out libtdemid to avoid unnessary depends (Closes: #82901, #82924)
+   * libarts and libtdemid are Recommends of tdelibs3 and not dependant now
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 18 Jan 2001 13:00:00 -0700
 
diff --git a/ubuntu/maverick/tdelibs/debian/copyright b/ubuntu/maverick/tdelibs/debian/copyright
index 7c67eaede..945a09ca9 100644
--- a/ubuntu/maverick/tdelibs/debian/copyright
+++ b/ubuntu/maverick/tdelibs/debian/copyright
@@ -14,9 +14,9 @@ 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, kcert, kconf_update, tdecore, kded, tdefx,
-tdeprint, tdesu, tdeui, kdewidgets, khtml, kimgio, kinit, kio, kioslave, kjs,
-kparts, ksmartcard, kspell, kstyles, libkmid, libkscreensaver
+libartskde, interfaces, kabc, kate, tdecert, kconf_update, tdecore, kded, tdefx,
+tdeprint, tdesu, tdeui, kdewidgets, tdehtml, kimgio, kinit, kio, kioslave, kjs,
+tdeparts, ksmartcard, tdespell, kstyles, libtdemid, libtdescreensaver
 ------------------------------------------------------------------------------
 LGPL
 
diff --git a/ubuntu/maverick/tdelibs/debian/man/kunittestmodrunner-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/tdeunittestmodrunner-trinity.1
index b61b06654..56c4f3bc6 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kunittestmodrunner-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/tdeunittestmodrunner-trinity.1
@@ -1,18 +1,18 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KUNITTESTMODRUNNER 1 "Jun 2006" "K Desktop Environment" "KUnitTest modules runner"
 .SH NAME
-kunittestmodrunner
+tdeunittestmodrunner
 \- a KDE command\-line application to run KUnitTest modules
 .SH SYNOPSIS
-\fBkunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] 
+\fBtdeunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] 
 .SH DESCRIPTION
-\fBkunittestmodrunner\fP is a command\-line application to run KUnitTest modules.
-It loads all kunittest_*.la modules in the current directory. The exit code is the number of unexpected failures.
+\fBtdeunittestmodrunner\fP is a command\-line application to run KUnitTest modules.
+It loads all tdeunittest_*.la modules in the current directory. The exit code is the number of unexpected failures.
 .SH OPTIONS
 .SS Options:
 .TP
 .BR  \-\-query \ [ regexp ]
-Only run modules whose filenames match the regexp. [^kunittest_.*\.la$]
+Only run modules whose filenames match the regexp. [^tdeunittest_.*\.la$]
 .TP
 .BR  \-\-folder \ [ folder ]
 Only run tests modules which are found in the folder. Use the query option to select modules. [.]
@@ -141,7 +141,7 @@ sets the application GUI style
 sets the client geometry of the main widget \- see man X for the argument format
 .SS
 .SH SEE ALSO
-.BR kunittestguimodrunner (1)
+.BR tdeunittestguimodrunner (1)
 .sp 1
 .TP
 .BR http://developer.kde.org
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index 88bf85c86..9bcd52fc7 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -15,7 +15,7 @@ debian/tmp/etc/trinity/kthemestylerc
 debian/tmp/etc/trinity/language.codes
 debian/tmp/etc/trinity/ui/kprintpreviewui.rc
 debian/tmp/etc/trinity/ui/ui_standards.rc
-debian/tmp/opt/trinity/share/applications/tde/kresources.desktop
+debian/tmp/opt/trinity/share/applications/tde/tderesources.desktop
 debian/tmp/opt/trinity/share/apps/dcopidlng/Ast.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/Iter.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kalyptus
@@ -35,9 +35,9 @@ debian/tmp/opt/trinity/share/apps/katepart/scripts/script-indent-c-char.js
 debian/tmp/opt/trinity/share/apps/katepart/scripts/script-indent-c-newline.js
 debian/tmp/opt/trinity/share/apps/katepart/scripts/sort.js
 debian/tmp/opt/trinity/share/apps/katepart/syntax/*.xml
-debian/tmp/opt/trinity/share/apps/kcertpart/kcertpart.rc
+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_ktexteditor.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
@@ -229,22 +229,22 @@ debian/tmp/opt/trinity/share/apps/kdewidgets/pics/ktimewidget.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kurlcomborequester.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kurllabel.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kurlrequester.png
-debian/tmp/opt/trinity/share/apps/khtml/css/html4.css
-debian/tmp/opt/trinity/share/apps/khtml/css/quirks.css
-debian/tmp/opt/trinity/share/apps/khtml/domain_info
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/128x128/actions/bug.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/bug.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/images_display.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/wallet_open.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/22x22/actions/bug.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/22x22/actions/images_display.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/32x32/actions/bug.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/32x32/actions/images_display.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/48x48/actions/bug.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/64x64/actions/bug.png
-debian/tmp/opt/trinity/share/apps/khtml/khtml_browser.rc
-debian/tmp/opt/trinity/share/apps/khtml/khtml_popupmenu.rc
-debian/tmp/opt/trinity/share/apps/khtml/khtml.rc
+debian/tmp/opt/trinity/share/apps/tdehtml/css/html4.css
+debian/tmp/opt/trinity/share/apps/tdehtml/css/quirks.css
+debian/tmp/opt/trinity/share/apps/tdehtml/domain_info
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/128x128/actions/bug.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/bug.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/images_display.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/wallet_open.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/bug.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/images_display.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/bug.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/images_display.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/48x48/actions/bug.png
+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/kjava/icons/crystalsvg/16x16/actions/java.png
 debian/tmp/opt/trinity/share/apps/kjava/kjava.jar
@@ -1714,10 +1714,10 @@ debian/tmp/opt/trinity/share/apps/kstyle/themes/qtplatinum.themerc
 debian/tmp/opt/trinity/share/apps/kstyle/themes/qtsgi.themerc
 debian/tmp/opt/trinity/share/apps/kstyle/themes/qtwindows.themerc
 debian/tmp/opt/trinity/share/apps/kstyle/themes/riscos.themerc
-debian/tmp/opt/trinity/share/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc
-debian/tmp/opt/trinity/share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc
-debian/tmp/opt/trinity/share/apps/ktexteditor_isearch/ktexteditor_isearchui.rc
-debian/tmp/opt/trinity/share/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc
+debian/tmp/opt/trinity/share/apps/tdetexteditor_docwordcompletion/docwordcompletionui.rc
+debian/tmp/opt/trinity/share/apps/tdetexteditor_insertfile/tdetexteditor_insertfileui.rc
+debian/tmp/opt/trinity/share/apps/tdetexteditor_isearch/tdetexteditor_isearchui.rc
+debian/tmp/opt/trinity/share/apps/tdetexteditor_kdatatool/tdetexteditor_kdatatoolui.rc
 debian/tmp/opt/trinity/share/apps/LICENSES/ARTISTIC
 debian/tmp/opt/trinity/share/apps/LICENSES/BSD
 debian/tmp/opt/trinity/share/apps/LICENSES/GPL_V2
@@ -1780,9 +1780,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-docbottom.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-doctop.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/x11-license.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/xml.dcl
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/index.docbook
 debian/tmp/opt/trinity/share/emoticons/Default/angry.png
 debian/tmp/opt/trinity/share/emoticons/Default/bat.png
 debian/tmp/opt/trinity/share/emoticons/Default/beer.png
@@ -1922,7 +1922,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/image.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/info.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/karbon_karbon.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/kexi_kexi.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/kmultiple.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/tdemultiple.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/koffice.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/krita_kra.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/log.png
@@ -2354,7 +2354,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kchart_chrt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kexi_kexi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kformula_kfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kivio_flw.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kmultiple.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/tdemultiple.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kpresenter_kpr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/krita_kra.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kspread_ksp.png
@@ -2723,7 +2723,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kchart_chrt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kexi_kexi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kformula_kfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kivio_flw.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kmultiple.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/tdemultiple.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/koffice.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kpresenter_kpr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/krita_kra.png
@@ -3102,7 +3102,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kchart_chrt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kexi_kexi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kformula_kfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kivio_flw.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kmultiple.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/tdemultiple.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kpresenter_kpr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/krita_kra.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kspread_ksp.png
@@ -3332,7 +3332,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kchart_chrt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kexi_kexi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kformula_kfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kivio_flw.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kmultiple.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/tdemultiple.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/koffice.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kpresenter_kpr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/krita_kra.png
@@ -3517,7 +3517,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/karbon_karbon.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kchart_chrt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kformula_kfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kivio_flw.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kmultiple.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/tdemultiple.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/koffice.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kpresenter_kpr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/krita_kra.png
@@ -3600,35 +3600,35 @@ debian/tmp/opt/trinity/share/services/jp2.kimgio
 debian/tmp/opt/trinity/share/services/jpeg.kimgio
 debian/tmp/opt/trinity/share/services/katepart.desktop
 debian/tmp/opt/trinity/share/services/kbzip2filter.desktop
-debian/tmp/opt/trinity/share/services/kcertpart.desktop
+debian/tmp/opt/trinity/share/services/tdecertpart.desktop
 debian/tmp/opt/trinity/share/services/kded/kcookiejar.desktop
 debian/tmp/opt/trinity/share/services/kded/tdeprintd.desktop
 debian/tmp/opt/trinity/share/services/kded/kdetrayproxy.desktop
 debian/tmp/opt/trinity/share/services/kded/kpasswdserver.desktop
 debian/tmp/opt/trinity/share/services/kded/kssld.desktop
-debian/tmp/opt/trinity/share/services/kded/kwalletd.desktop
+debian/tmp/opt/trinity/share/services/kded/tdewalletd.desktop
 debian/tmp/opt/trinity/share/services/kded/proxyscout.desktop
 debian/tmp/opt/trinity/share/services/kgzipfilter.desktop
-debian/tmp/opt/trinity/share/services/khtml.desktop
-debian/tmp/opt/trinity/share/services/khtmlimage.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/kjavaappletviewer.desktop
 debian/tmp/opt/trinity/share/services/kmailservice.protocol
-debian/tmp/opt/trinity/share/services/kmultipart.desktop
+debian/tmp/opt/trinity/share/services/tdemultipart.desktop
 debian/tmp/opt/trinity/share/services/knotify.desktop
-debian/tmp/opt/trinity/share/services/kresources/kabc/dir.desktop
-debian/tmp/opt/trinity/share/services/kresources/kabc/file.desktop
-debian/tmp/opt/trinity/share/services/kresources/kabc/net.desktop
-debian/tmp/opt/trinity/share/services/kresources/kabc/ldapkio.desktop
-debian/tmp/opt/trinity/share/services/kresources/kabc_manager.desktop
+debian/tmp/opt/trinity/share/services/tderesources/kabc/dir.desktop
+debian/tmp/opt/trinity/share/services/tderesources/kabc/file.desktop
+debian/tmp/opt/trinity/share/services/tderesources/kabc/net.desktop
+debian/tmp/opt/trinity/share/services/tderesources/kabc/ldapkio.desktop
+debian/tmp/opt/trinity/share/services/tderesources/kabc_manager.desktop
 
-debian/tmp/opt/trinity/share/services/kspell_aspell.desktop
-debian/tmp/opt/trinity/share/services/kspell_hspell.desktop
-debian/tmp/opt/trinity/share/services/kspell_ispell.desktop
-debian/tmp/opt/trinity/share/services/ktexteditor_docwordcompletion.desktop
-debian/tmp/opt/trinity/share/services/ktexteditor_insertfile.desktop
-debian/tmp/opt/trinity/share/services/ktexteditor_isearch.desktop
-debian/tmp/opt/trinity/share/services/ktexteditor_kdatatool.desktop
+debian/tmp/opt/trinity/share/services/tdespell_aspell.desktop
+debian/tmp/opt/trinity/share/services/tdespell_hspell.desktop
+debian/tmp/opt/trinity/share/services/tdespell_ispell.desktop
+debian/tmp/opt/trinity/share/services/tdetexteditor_docwordcompletion.desktop
+debian/tmp/opt/trinity/share/services/tdetexteditor_insertfile.desktop
+debian/tmp/opt/trinity/share/services/tdetexteditor_isearch.desktop
+debian/tmp/opt/trinity/share/services/tdetexteditor_kdatatool.desktop
 debian/tmp/opt/trinity/share/services/metainfo.protocol
 debian/tmp/opt/trinity/share/services/mms.protocol
 debian/tmp/opt/trinity/share/services/mmst.protocol
@@ -3667,21 +3667,21 @@ 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/kmediaplayer.desktop
-debian/tmp/opt/trinity/share/servicetypes/kmediaplayerengine.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
 debian/tmp/opt/trinity/share/servicetypes/kplugininfo.desktop
 debian/tmp/opt/trinity/share/servicetypes/kpropsdlgplugin.desktop
 debian/tmp/opt/trinity/share/servicetypes/kregexpeditor.desktop
-debian/tmp/opt/trinity/share/servicetypes/kresources_manager.desktop
-debian/tmp/opt/trinity/share/servicetypes/kresources_plugin.desktop
+debian/tmp/opt/trinity/share/servicetypes/tderesources_manager.desktop
+debian/tmp/opt/trinity/share/servicetypes/tderesources_plugin.desktop
 debian/tmp/opt/trinity/share/servicetypes/krop.desktop
 debian/tmp/opt/trinity/share/servicetypes/krwp.desktop
 debian/tmp/opt/trinity/share/servicetypes/kscan.desktop
-debian/tmp/opt/trinity/share/servicetypes/kspellclient.desktop
-debian/tmp/opt/trinity/share/servicetypes/ktexteditor.desktop
-debian/tmp/opt/trinity/share/servicetypes/ktexteditoreditor.desktop
-debian/tmp/opt/trinity/share/servicetypes/ktexteditorplugin.desktop
+debian/tmp/opt/trinity/share/servicetypes/tdespellclient.desktop
+debian/tmp/opt/trinity/share/servicetypes/tdetexteditor.desktop
+debian/tmp/opt/trinity/share/servicetypes/tdetexteditoreditor.desktop
+debian/tmp/opt/trinity/share/servicetypes/tdetexteditorplugin.desktop
 debian/tmp/opt/trinity/share/servicetypes/kurifilterplugin.desktop
 debian/tmp/opt/trinity/share/servicetypes/renamedlgplugin.desktop
 debian/tmp/opt/trinity/share/servicetypes/scriptinterface.desktop
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.preinst b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.preinst
index 452b17bfc..c6c9c016f 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.preinst
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.preinst
@@ -10,7 +10,7 @@ case "$1" in
 	rm -f /etc/trinity/colors/40\ Colors
 	rm -f /etc/trinity/colors/Royal
 	rm -f /etc/trinity/colors/Web
-	rm -f /etc/trinity/ktexteditor_autobookmarkerrc
+	rm -f /etc/trinity/tdetexteditor_autobookmarkerrc
 	[ -f "$FILE" ] || exit 0
 	MD5SUMOLD=`md5sum $FILE | awk '{print $1}'`
 	if dpkg --compare-versions "$2" lt "4:3.4.0-0pre5"; then
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
index 30baf6aa3..6f7afbc0c 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/bin/dcopidl2cpp
 debian/tmp/opt/trinity/bin/dcopidlng
 debian/tmp/opt/trinity/bin/kconfig_compiler
 debian/tmp/opt/trinity/bin/ksvgtopng
-debian/tmp/opt/trinity/bin/kunittestmodrunner
+debian/tmp/opt/trinity/bin/tdeunittestmodrunner
 debian/tmp/opt/trinity/bin/makekdewidgets
 debian/tmp/opt/trinity/bin/preparetips
 
@@ -291,11 +291,11 @@ debian/tmp/opt/trinity/include/khexedit/charcolumninterface.h
 debian/tmp/opt/trinity/include/khexedit/clipboardinterface.h
 debian/tmp/opt/trinity/include/khexedit/valuecolumninterface.h
 debian/tmp/opt/trinity/include/khexedit/zoominterface.h
-debian/tmp/opt/trinity/include/khtmldefaults.h
-debian/tmp/opt/trinity/include/khtml_events.h
-debian/tmp/opt/trinity/include/khtml_part.h
-debian/tmp/opt/trinity/include/khtml_settings.h
-debian/tmp/opt/trinity/include/khtmlview.h
+debian/tmp/opt/trinity/include/tdehtmldefaults.h
+debian/tmp/opt/trinity/include/tdehtml_events.h
+debian/tmp/opt/trinity/include/tdehtml_part.h
+debian/tmp/opt/trinity/include/tdehtml_settings.h
+debian/tmp/opt/trinity/include/tdehtmlview.h
 debian/tmp/opt/trinity/include/khttpproxysocketdevice.h
 debian/tmp/opt/trinity/include/kicondialog.h
 debian/tmp/opt/trinity/include/kiconeffect.h
@@ -308,8 +308,8 @@ debian/tmp/opt/trinity/include/kimageeffect.h
 debian/tmp/opt/trinity/include/kimagefilepreview.h
 debian/tmp/opt/trinity/include/kimageio.h
 debian/tmp/opt/trinity/include/kimiface.h
-debian/tmp/opt/trinity/include/kimproxy.h
-debian/tmp/opt/trinity/include/kimproxyiface.h
+debian/tmp/opt/trinity/include/tdeimproxy.h
+debian/tmp/opt/trinity/include/tdeimproxyiface.h
 debian/tmp/opt/trinity/include/kinputdialog.h
 debian/tmp/opt/trinity/include/kinstance.h
 debian/tmp/opt/trinity/include/kio/authinfo.h
@@ -329,7 +329,7 @@ debian/tmp/opt/trinity/include/kio/job.h
 debian/tmp/opt/trinity/include/kio/tdesasl.h
 debian/tmp/opt/trinity/include/kio/kmdbase.h
 debian/tmp/opt/trinity/include/kio/kmdcodec.h
-debian/tmp/opt/trinity/include/kio/kntlm.h
+debian/tmp/opt/trinity/include/kio/tdentlm.h
 debian/tmp/opt/trinity/include/kio/metainfojob.h
 debian/tmp/opt/trinity/include/kio/netaccess.h
 debian/tmp/opt/trinity/include/kio/observer.h
@@ -388,24 +388,24 @@ debian/tmp/opt/trinity/include/kmainwindow.h
 debian/tmp/opt/trinity/include/kmainwindowiface.h
 debian/tmp/opt/trinity/include/kmanagerselection.h
 debian/tmp/opt/trinity/include/kmdcodec.h
-debian/tmp/opt/trinity/include/kmdichildarea.h
-debian/tmp/opt/trinity/include/kmdichildfrmcaption.h
-debian/tmp/opt/trinity/include/kmdichildfrm.h
-debian/tmp/opt/trinity/include/kmdichildview.h
-debian/tmp/opt/trinity/include/kmdidefines.h
-debian/tmp/opt/trinity/include/kmdi/global.h
-debian/tmp/opt/trinity/include/kmdiiterator.h
-debian/tmp/opt/trinity/include/kmdilistiterator.h
-debian/tmp/opt/trinity/include/kmdimainfrm.h
-debian/tmp/opt/trinity/include/kmdi/mainwindow.h
-debian/tmp/opt/trinity/include/kmdinulliterator.h
-debian/tmp/opt/trinity/include/kmdi/tabwidget.h
-debian/tmp/opt/trinity/include/kmditaskbar.h
-debian/tmp/opt/trinity/include/kmdi/toolviewaccessor.h
-debian/tmp/opt/trinity/include/kmditoolviewaccessor.h
-debian/tmp/opt/trinity/include/kmediaplayer/playerdcopobject.h
-debian/tmp/opt/trinity/include/kmediaplayer/player.h
-debian/tmp/opt/trinity/include/kmediaplayer/view.h
+debian/tmp/opt/trinity/include/tdemdichildarea.h
+debian/tmp/opt/trinity/include/tdemdichildfrmcaption.h
+debian/tmp/opt/trinity/include/tdemdichildfrm.h
+debian/tmp/opt/trinity/include/tdemdichildview.h
+debian/tmp/opt/trinity/include/tdemdidefines.h
+debian/tmp/opt/trinity/include/tdemdi/global.h
+debian/tmp/opt/trinity/include/tdemdiiterator.h
+debian/tmp/opt/trinity/include/tdemdilistiterator.h
+debian/tmp/opt/trinity/include/tdemdimainfrm.h
+debian/tmp/opt/trinity/include/tdemdi/mainwindow.h
+debian/tmp/opt/trinity/include/tdemdinulliterator.h
+debian/tmp/opt/trinity/include/tdemdi/tabwidget.h
+debian/tmp/opt/trinity/include/tdemditaskbar.h
+debian/tmp/opt/trinity/include/tdemdi/toolviewaccessor.h
+debian/tmp/opt/trinity/include/tdemditoolviewaccessor.h
+debian/tmp/opt/trinity/include/tdemediaplayer/playerdcopobject.h
+debian/tmp/opt/trinity/include/tdemediaplayer/player.h
+debian/tmp/opt/trinity/include/tdemediaplayer/view.h
 debian/tmp/opt/trinity/include/kmenubar.h
 debian/tmp/opt/trinity/include/kmessagebox.h
 debian/tmp/opt/trinity/include/kmimemagic.h
@@ -414,10 +414,10 @@ debian/tmp/opt/trinity/include/kmimetypechooser.h
 debian/tmp/opt/trinity/include/kmimetype.h
 debian/tmp/opt/trinity/include/kmimetyperesolver.h
 debian/tmp/opt/trinity/include/kmountpoint.h
-debian/tmp/opt/trinity/include/kmulticastsocketdevice.h
-debian/tmp/opt/trinity/include/kmulticastsocket.h
-debian/tmp/opt/trinity/include/kmultipledrag.h
-debian/tmp/opt/trinity/include/kmultitabbar.h
+debian/tmp/opt/trinity/include/tdemulticastsocketdevice.h
+debian/tmp/opt/trinity/include/tdemulticastsocket.h
+debian/tmp/opt/trinity/include/tdemultipledrag.h
+debian/tmp/opt/trinity/include/tdemultitabbar.h
 debian/tmp/opt/trinity/include/knetworkinterface.h
 debian/tmp/opt/trinity/include/knewstuff/downloaddialog.h
 debian/tmp/opt/trinity/include/knewstuff/engine.h
@@ -442,20 +442,20 @@ debian/tmp/opt/trinity/include/kpanelapplet.h
 debian/tmp/opt/trinity/include/kpanelappmenu.h
 debian/tmp/opt/trinity/include/kpanelextension.h
 debian/tmp/opt/trinity/include/kpanelmenu.h
-debian/tmp/opt/trinity/include/kparts/browserextension.h
-debian/tmp/opt/trinity/include/kparts/browserinterface.h
-debian/tmp/opt/trinity/include/kparts/browserrun.h
-debian/tmp/opt/trinity/include/kparts/componentfactory.h
-debian/tmp/opt/trinity/include/kparts/dockmainwindow.h
-debian/tmp/opt/trinity/include/kparts/event.h
-debian/tmp/opt/trinity/include/kparts/factory.h
-debian/tmp/opt/trinity/include/kparts/genericfactory.h
-debian/tmp/opt/trinity/include/kparts/historyprovider.h
-debian/tmp/opt/trinity/include/kparts/mainwindow.h
-debian/tmp/opt/trinity/include/kparts/part.h
-debian/tmp/opt/trinity/include/kparts/partmanager.h
-debian/tmp/opt/trinity/include/kparts/plugin.h
-debian/tmp/opt/trinity/include/kparts/statusbarextension.h
+debian/tmp/opt/trinity/include/tdeparts/browserextension.h
+debian/tmp/opt/trinity/include/tdeparts/browserinterface.h
+debian/tmp/opt/trinity/include/tdeparts/browserrun.h
+debian/tmp/opt/trinity/include/tdeparts/componentfactory.h
+debian/tmp/opt/trinity/include/tdeparts/dockmainwindow.h
+debian/tmp/opt/trinity/include/tdeparts/event.h
+debian/tmp/opt/trinity/include/tdeparts/factory.h
+debian/tmp/opt/trinity/include/tdeparts/genericfactory.h
+debian/tmp/opt/trinity/include/tdeparts/historyprovider.h
+debian/tmp/opt/trinity/include/tdeparts/mainwindow.h
+debian/tmp/opt/trinity/include/tdeparts/part.h
+debian/tmp/opt/trinity/include/tdeparts/partmanager.h
+debian/tmp/opt/trinity/include/tdeparts/plugin.h
+debian/tmp/opt/trinity/include/tdeparts/statusbarextension.h
 debian/tmp/opt/trinity/include/kpassdlg.h
 debian/tmp/opt/trinity/include/kpassivepopup.h
 debian/tmp/opt/trinity/include/kpixmapeffect.h
@@ -490,15 +490,15 @@ debian/tmp/opt/trinity/include/kremoteencoding.h
 debian/tmp/opt/trinity/include/kreplacedialog.h
 debian/tmp/opt/trinity/include/kreplace.h
 debian/tmp/opt/trinity/include/kresolver.h
-debian/tmp/opt/trinity/include/kresources/configdialog.h
-debian/tmp/opt/trinity/include/kresources/configpage.h
-debian/tmp/opt/trinity/include/kresources/configwidget.h
-debian/tmp/opt/trinity/include/kresources/factory.h
-debian/tmp/opt/trinity/include/kresources/manager.h
-debian/tmp/opt/trinity/include/kresources/manageriface.h
-debian/tmp/opt/trinity/include/kresources/managerimpl.h
-debian/tmp/opt/trinity/include/kresources/resource.h
-debian/tmp/opt/trinity/include/kresources/selectdialog.h
+debian/tmp/opt/trinity/include/tderesources/configdialog.h
+debian/tmp/opt/trinity/include/tderesources/configpage.h
+debian/tmp/opt/trinity/include/tderesources/configwidget.h
+debian/tmp/opt/trinity/include/tderesources/factory.h
+debian/tmp/opt/trinity/include/tderesources/manager.h
+debian/tmp/opt/trinity/include/tderesources/manageriface.h
+debian/tmp/opt/trinity/include/tderesources/managerimpl.h
+debian/tmp/opt/trinity/include/tderesources/resource.h
+debian/tmp/opt/trinity/include/tderesources/selectdialog.h
 debian/tmp/opt/trinity/include/krestrictedline.h
 debian/tmp/opt/trinity/include/kreverseresolver.h
 debian/tmp/opt/trinity/include/krfcdate.h
@@ -510,8 +510,8 @@ debian/tmp/opt/trinity/include/ksambashare.h
 debian/tmp/opt/trinity/include/ksavefile.h
 debian/tmp/opt/trinity/include/kscan.h
 debian/tmp/opt/trinity/include/ksconfig.h
-debian/tmp/opt/trinity/include/kscreensaver.h
-debian/tmp/opt/trinity/include/kscreensaver_vroot.h
+debian/tmp/opt/trinity/include/tdescreensaver.h
+debian/tmp/opt/trinity/include/tdescreensaver_vroot.h
 debian/tmp/opt/trinity/include/kscrollview.h
 debian/tmp/opt/trinity/include/kselect.h
 debian/tmp/opt/trinity/include/kseparator.h
@@ -543,18 +543,18 @@ debian/tmp/opt/trinity/include/ksockssocketdevice.h
 debian/tmp/opt/trinity/include/ksortablevaluelist.h
 debian/tmp/opt/trinity/include/kspeech.h
 debian/tmp/opt/trinity/include/kspeechsink.h
-debian/tmp/opt/trinity/include/kspell2/backgroundchecker.h
-debian/tmp/opt/trinity/include/kspell2/broker.h
-debian/tmp/opt/trinity/include/kspell2/configdialog.h
-debian/tmp/opt/trinity/include/kspell2/configwidget.h
-debian/tmp/opt/trinity/include/kspell2/defaultdictionary.h
-debian/tmp/opt/trinity/include/kspell2/dialog.h
-debian/tmp/opt/trinity/include/kspell2/dictionary.h
-debian/tmp/opt/trinity/include/kspell2/filter.h
-debian/tmp/opt/trinity/include/kspell2/highlighter.h
-debian/tmp/opt/trinity/include/kspell2/settings.h
-debian/tmp/opt/trinity/include/kspelldlg.h
-debian/tmp/opt/trinity/include/kspell.h
+debian/tmp/opt/trinity/include/tdespell2/backgroundchecker.h
+debian/tmp/opt/trinity/include/tdespell2/broker.h
+debian/tmp/opt/trinity/include/tdespell2/configdialog.h
+debian/tmp/opt/trinity/include/tdespell2/configwidget.h
+debian/tmp/opt/trinity/include/tdespell2/defaultdictionary.h
+debian/tmp/opt/trinity/include/tdespell2/dialog.h
+debian/tmp/opt/trinity/include/tdespell2/dictionary.h
+debian/tmp/opt/trinity/include/tdespell2/filter.h
+debian/tmp/opt/trinity/include/tdespell2/highlighter.h
+debian/tmp/opt/trinity/include/tdespell2/settings.h
+debian/tmp/opt/trinity/include/tdespelldlg.h
+debian/tmp/opt/trinity/include/tdespell.h
 debian/tmp/opt/trinity/include/ksplashscreen.h
 debian/tmp/opt/trinity/include/ksqueezedtextlabel.h
 debian/tmp/opt/trinity/include/ksslall.h
@@ -593,9 +593,9 @@ debian/tmp/opt/trinity/include/kstringvalidator.h
 debian/tmp/opt/trinity/include/kstyle.h
 debian/tmp/opt/trinity/include/ksvgiconengine.h
 debian/tmp/opt/trinity/include/kswitchlanguagedialog.h
-debian/tmp/opt/trinity/include/ksycocaentry.h
-debian/tmp/opt/trinity/include/ksycoca.h
-debian/tmp/opt/trinity/include/ksycocatype.h
+debian/tmp/opt/trinity/include/tdesycocaentry.h
+debian/tmp/opt/trinity/include/tdesycoca.h
+debian/tmp/opt/trinity/include/tdesycocatype.h
 debian/tmp/opt/trinity/include/ksyntaxhighlighter.h
 debian/tmp/opt/trinity/include/ksystemtray.h
 debian/tmp/opt/trinity/include/ktabbar.h
@@ -606,39 +606,39 @@ debian/tmp/opt/trinity/include/ktempdir.h
 debian/tmp/opt/trinity/include/ktempfile.h
 debian/tmp/opt/trinity/include/ktextbrowser.h
 debian/tmp/opt/trinity/include/ktextedit.h
-debian/tmp/opt/trinity/include/ktexteditor/blockselectioninterface.h
-debian/tmp/opt/trinity/include/ktexteditor/clipboardinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/codecompletioninterface.h
-debian/tmp/opt/trinity/include/ktexteditor/configinterfaceextension.h
-debian/tmp/opt/trinity/include/ktexteditor/configinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/cursorinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/document.h
-debian/tmp/opt/trinity/include/ktexteditor/documentinfo.h
-debian/tmp/opt/trinity/include/ktexteditor/dynwordwrapinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/editinterfaceext.h
-debian/tmp/opt/trinity/include/ktexteditor/editinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/editorchooser.h
-debian/tmp/opt/trinity/include/ktexteditor/editor.h
-debian/tmp/opt/trinity/include/ktexteditor/encodinginterface.h
-debian/tmp/opt/trinity/include/ktexteditor/highlightinginterface.h
-debian/tmp/opt/trinity/include/ktexteditor/markinterfaceextension.h
-debian/tmp/opt/trinity/include/ktexteditor/markinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/plugin.h
-debian/tmp/opt/trinity/include/ktexteditor/popupmenuinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/printinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/searchinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/selectionextdcopinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/selectioninterfaceext.h
-debian/tmp/opt/trinity/include/ktexteditor/selectioninterface.h
-debian/tmp/opt/trinity/include/ktexteditor/sessionconfiginterface.h
-debian/tmp/opt/trinity/include/ktexteditor/templateinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/texthintinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/undointerface.h
-debian/tmp/opt/trinity/include/ktexteditor/variableinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/viewcursorinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/view.h
-debian/tmp/opt/trinity/include/ktexteditor/viewstatusmsginterface.h
-debian/tmp/opt/trinity/include/ktexteditor/wordwrapinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/clipboardinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/codecompletioninterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/configinterfaceextension.h
+debian/tmp/opt/trinity/include/tdetexteditor/configinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/cursorinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/document.h
+debian/tmp/opt/trinity/include/tdetexteditor/documentinfo.h
+debian/tmp/opt/trinity/include/tdetexteditor/dynwordwrapinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/editinterfaceext.h
+debian/tmp/opt/trinity/include/tdetexteditor/editinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/editorchooser.h
+debian/tmp/opt/trinity/include/tdetexteditor/editor.h
+debian/tmp/opt/trinity/include/tdetexteditor/encodinginterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/highlightinginterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/markinterfaceextension.h
+debian/tmp/opt/trinity/include/tdetexteditor/markinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/plugin.h
+debian/tmp/opt/trinity/include/tdetexteditor/popupmenuinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/printinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/searchinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/selectionextdcopinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/selectioninterfaceext.h
+debian/tmp/opt/trinity/include/tdetexteditor/selectioninterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/sessionconfiginterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/templateinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/texthintinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/undointerface.h
+debian/tmp/opt/trinity/include/tdetexteditor/variableinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/viewcursorinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/view.h
+debian/tmp/opt/trinity/include/tdetexteditor/viewstatusmsginterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/wordwrapinterface.h
 debian/tmp/opt/trinity/include/ktimewidget.h
 debian/tmp/opt/trinity/include/ktimezones.h
 debian/tmp/opt/trinity/include/ktimezonewidget.h
@@ -651,9 +651,9 @@ debian/tmp/opt/trinity/include/ktrader.h
 debian/tmp/opt/trinity/include/ktypelist.h
 debian/tmp/opt/trinity/include/kuniqueapp.h
 debian/tmp/opt/trinity/include/kuniqueapplication.h
-debian/tmp/opt/trinity/include/kunittest/module.h
-debian/tmp/opt/trinity/include/kunittest/runner.h
-debian/tmp/opt/trinity/include/kunittest/tester.h
+debian/tmp/opt/trinity/include/tdeunittest/module.h
+debian/tmp/opt/trinity/include/tdeunittest/runner.h
+debian/tmp/opt/trinity/include/tdeunittest/tester.h
 debian/tmp/opt/trinity/include/kunload.h
 debian/tmp/opt/trinity/include/kurifilter.h
 debian/tmp/opt/trinity/include/kurlbar.h
@@ -668,8 +668,8 @@ debian/tmp/opt/trinity/include/kurlrequester.h
 debian/tmp/opt/trinity/include/kuser.h
 debian/tmp/opt/trinity/include/kuserprofile.h
 debian/tmp/opt/trinity/include/kvmallocator.h
-debian/tmp/opt/trinity/include/kwallet.h
-debian/tmp/opt/trinity/include/kwallettypes.h
+debian/tmp/opt/trinity/include/tdewallet.h
+debian/tmp/opt/trinity/include/tdewallettypes.h
 debian/tmp/opt/trinity/include/twindowinfo.h
 debian/tmp/opt/trinity/include/twindowlistmenu.h
 debian/tmp/opt/trinity/include/twin.h
@@ -683,28 +683,28 @@ debian/tmp/opt/trinity/include/kxmlguiclient.h
 debian/tmp/opt/trinity/include/kxmlguifactory.h
 debian/tmp/opt/trinity/include/kxmlgui.h
 debian/tmp/opt/trinity/include/kzip.h
-debian/tmp/opt/trinity/include/libkrandr/ktimerdialog.h
-debian/tmp/opt/trinity/include/libkrandr/libkrandr.h
-debian/tmp/opt/trinity/include/libkrandr/lowlevel_randr.h
-debian/tmp/opt/trinity/include/libkrandr/randr.h
-debian/tmp/opt/trinity/include/libkrsync/krsync.h
-debian/tmp/opt/trinity/include/libkmid/alsaout.h
-debian/tmp/opt/trinity/include/libkmid/dattypes.h
-debian/tmp/opt/trinity/include/libkmid/deviceman.h
-debian/tmp/opt/trinity/include/libkmid/fmout.h
-debian/tmp/opt/trinity/include/libkmid/gusout.h
-debian/tmp/opt/trinity/include/libkmid/libkmid.h
-debian/tmp/opt/trinity/include/libkmid/midfile.h
-debian/tmp/opt/trinity/include/libkmid/midimapper.h
-debian/tmp/opt/trinity/include/libkmid/midiout.h
-debian/tmp/opt/trinity/include/libkmid/midispec.h
-debian/tmp/opt/trinity/include/libkmid/midistat.h
-debian/tmp/opt/trinity/include/libkmid/mt32togm.h
-debian/tmp/opt/trinity/include/libkmid/notearray.h
-debian/tmp/opt/trinity/include/libkmid/player.h
-debian/tmp/opt/trinity/include/libkmid/synthout.h
-debian/tmp/opt/trinity/include/libkmid/track.h
-debian/tmp/opt/trinity/include/libkmid/voiceman.h
+debian/tmp/opt/trinity/include/libtderandr/ktimerdialog.h
+debian/tmp/opt/trinity/include/libtderandr/libtderandr.h
+debian/tmp/opt/trinity/include/libtderandr/lowlevel_randr.h
+debian/tmp/opt/trinity/include/libtderandr/randr.h
+debian/tmp/opt/trinity/include/libtdersync/tdersync.h
+debian/tmp/opt/trinity/include/libtdemid/alsaout.h
+debian/tmp/opt/trinity/include/libtdemid/dattypes.h
+debian/tmp/opt/trinity/include/libtdemid/deviceman.h
+debian/tmp/opt/trinity/include/libtdemid/fmout.h
+debian/tmp/opt/trinity/include/libtdemid/gusout.h
+debian/tmp/opt/trinity/include/libtdemid/libtdemid.h
+debian/tmp/opt/trinity/include/libtdemid/midfile.h
+debian/tmp/opt/trinity/include/libtdemid/midimapper.h
+debian/tmp/opt/trinity/include/libtdemid/midiout.h
+debian/tmp/opt/trinity/include/libtdemid/midispec.h
+debian/tmp/opt/trinity/include/libtdemid/midistat.h
+debian/tmp/opt/trinity/include/libtdemid/mt32togm.h
+debian/tmp/opt/trinity/include/libtdemid/notearray.h
+debian/tmp/opt/trinity/include/libtdemid/player.h
+debian/tmp/opt/trinity/include/libtdemid/synthout.h
+debian/tmp/opt/trinity/include/libtdemid/track.h
+debian/tmp/opt/trinity/include/libtdemid/voiceman.h
 debian/tmp/opt/trinity/include/netwm_def.h
 debian/tmp/opt/trinity/include/netwm.h
 debian/tmp/opt/trinity/include/qxembed.h
@@ -774,56 +774,56 @@ debian/tmp/opt/trinity/lib/libtdesu.la
 debian/tmp/opt/trinity/lib/libtdesu.so
 debian/tmp/opt/trinity/lib/libtdeui.la
 debian/tmp/opt/trinity/lib/libtdeui.so
-debian/tmp/opt/trinity/lib/libkdnssd.la
-debian/tmp/opt/trinity/lib/libkdnssd.so
-debian/tmp/opt/trinity/lib/libkhtml.la
-debian/tmp/opt/trinity/lib/libkhtml.so
-debian/tmp/opt/trinity/lib/libkimproxy.la
-debian/tmp/opt/trinity/lib/libkimproxy.so
+debian/tmp/opt/trinity/lib/libtdednssd.la
+debian/tmp/opt/trinity/lib/libtdednssd.so
+debian/tmp/opt/trinity/lib/libtdehtml.la
+debian/tmp/opt/trinity/lib/libtdehtml.so
+debian/tmp/opt/trinity/lib/libtdeimproxy.la
+debian/tmp/opt/trinity/lib/libtdeimproxy.so
 debian/tmp/opt/trinity/lib/libkio.la
 debian/tmp/opt/trinity/lib/libkio.so
 debian/tmp/opt/trinity/lib/libkjava.la
 debian/tmp/opt/trinity/lib/libkjava.so
 debian/tmp/opt/trinity/lib/libkjs.la
 debian/tmp/opt/trinity/lib/libkjs.so
-debian/tmp/opt/trinity/lib/libkmdi2.la
-debian/tmp/opt/trinity/lib/libkmdi2.so
-debian/tmp/opt/trinity/lib/libkmdi.la
-debian/tmp/opt/trinity/lib/libkmdi.so
-debian/tmp/opt/trinity/lib/libkmediaplayer.la
-debian/tmp/opt/trinity/lib/libkmediaplayer.so
-debian/tmp/opt/trinity/lib/libkmid.la
-debian/tmp/opt/trinity/lib/libkmid.so
+debian/tmp/opt/trinity/lib/libtdemdi2.la
+debian/tmp/opt/trinity/lib/libtdemdi2.so
+debian/tmp/opt/trinity/lib/libtdemdi.la
+debian/tmp/opt/trinity/lib/libtdemdi.so
+debian/tmp/opt/trinity/lib/libtdemediaplayer.la
+debian/tmp/opt/trinity/lib/libtdemediaplayer.so
+debian/tmp/opt/trinity/lib/libtdemid.la
+debian/tmp/opt/trinity/lib/libtdemid.so
 debian/tmp/opt/trinity/lib/libknewstuff.la
 debian/tmp/opt/trinity/lib/libknewstuff.so
-debian/tmp/opt/trinity/lib/libkntlm.la
-debian/tmp/opt/trinity/lib/libkntlm.so
-debian/tmp/opt/trinity/lib/libkparts.la
-debian/tmp/opt/trinity/lib/libkparts.so
-debian/tmp/opt/trinity/lib/libkrandr.la
-debian/tmp/opt/trinity/lib/libkrandr.so
-debian/tmp/opt/trinity/lib/libkrsync.la
-debian/tmp/opt/trinity/lib/libkrsync.so
-debian/tmp/opt/trinity/lib/libkresources.la
-debian/tmp/opt/trinity/lib/libkresources.so
-debian/tmp/opt/trinity/lib/libkscreensaver.la
-debian/tmp/opt/trinity/lib/libkscreensaver.so
-debian/tmp/opt/trinity/lib/libkscript.la
-debian/tmp/opt/trinity/lib/libkscript.so
-debian/tmp/opt/trinity/lib/libkspell2.la
-debian/tmp/opt/trinity/lib/libkspell2.so
-debian/tmp/opt/trinity/lib/libkspell.la
-debian/tmp/opt/trinity/lib/libkspell.so
-debian/tmp/opt/trinity/lib/libktexteditor.la
-debian/tmp/opt/trinity/lib/libktexteditor.so
-debian/tmp/opt/trinity/lib/libkunittest.la
-debian/tmp/opt/trinity/lib/libkunittest.so
-debian/tmp/opt/trinity/lib/libkutils.la
-debian/tmp/opt/trinity/lib/libkutils.so
-debian/tmp/opt/trinity/lib/libkwalletbackend.la
-debian/tmp/opt/trinity/lib/libkwalletbackend.so
-debian/tmp/opt/trinity/lib/libkwalletclient.la
-debian/tmp/opt/trinity/lib/libkwalletclient.so
+debian/tmp/opt/trinity/lib/libtdentlm.la
+debian/tmp/opt/trinity/lib/libtdentlm.so
+debian/tmp/opt/trinity/lib/libtdeparts.la
+debian/tmp/opt/trinity/lib/libtdeparts.so
+debian/tmp/opt/trinity/lib/libtderandr.la
+debian/tmp/opt/trinity/lib/libtderandr.so
+debian/tmp/opt/trinity/lib/libtdersync.la
+debian/tmp/opt/trinity/lib/libtdersync.so
+debian/tmp/opt/trinity/lib/libtderesources.la
+debian/tmp/opt/trinity/lib/libtderesources.so
+debian/tmp/opt/trinity/lib/libtdescreensaver.la
+debian/tmp/opt/trinity/lib/libtdescreensaver.so
+debian/tmp/opt/trinity/lib/libtdescript.la
+debian/tmp/opt/trinity/lib/libtdescript.so
+debian/tmp/opt/trinity/lib/libtdespell2.la
+debian/tmp/opt/trinity/lib/libtdespell2.so
+debian/tmp/opt/trinity/lib/libtdespell.la
+debian/tmp/opt/trinity/lib/libtdespell.so
+debian/tmp/opt/trinity/lib/libtdetexteditor.la
+debian/tmp/opt/trinity/lib/libtdetexteditor.so
+debian/tmp/opt/trinity/lib/libtdeunittest.la
+debian/tmp/opt/trinity/lib/libtdeunittest.so
+debian/tmp/opt/trinity/lib/libtdeutils.la
+debian/tmp/opt/trinity/lib/libtdeutils.so
+debian/tmp/opt/trinity/lib/libtdewalletbackend.la
+debian/tmp/opt/trinity/lib/libtdewalletbackend.so
+debian/tmp/opt/trinity/lib/libtdewalletclient.la
+debian/tmp/opt/trinity/lib/libtdewalletclient.so
 debian/tmp/opt/trinity/lib/libvcard.la
 debian/tmp/opt/trinity/lib/libvcard.so
 
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.manpages b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.manpages
index af14a7e71..e5756a2db 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.manpages
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.manpages
@@ -1,5 +1,5 @@
 ./debian/man/kconfig_compiler-trinity.1
 ./debian/man/ksvgtopng-trinity.1
-./debian/man/kunittestmodrunner-trinity.1
+./debian/man/tdeunittestmodrunner-trinity.1
 ./debian/man/makekdewidgets-trinity.1
 ./debian/man/preparetips-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
index 80a4b789c..4d1bb325b 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -75,8 +75,8 @@ debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.la
 debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.so
 debian/tmp/opt/trinity/lib/trinity/kbzip2filter.la
 debian/tmp/opt/trinity/lib/trinity/kbzip2filter.so
-debian/tmp/opt/trinity/lib/trinity/kcm_kresources.la
-debian/tmp/opt/trinity/lib/trinity/kcm_kresources.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
@@ -93,8 +93,8 @@ debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.la
 debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.so
 debian/tmp/opt/trinity/lib/trinity/kded_kssld.la
 debian/tmp/opt/trinity/lib/trinity/kded_kssld.so
-debian/tmp/opt/trinity/lib/trinity/kded_kwalletd.la
-debian/tmp/opt/trinity/lib/trinity/kded_kwalletd.so
+debian/tmp/opt/trinity/lib/trinity/kded_tdewalletd.la
+debian/tmp/opt/trinity/lib/trinity/kded_tdewalletd.so
 debian/tmp/opt/trinity/lib/trinity/kded.la
 debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.la
 debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.so
@@ -115,8 +115,8 @@ debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.la
 debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.so
 debian/tmp/opt/trinity/lib/trinity/kgzipfilter.la
 debian/tmp/opt/trinity/lib/trinity/kgzipfilter.so
-debian/tmp/opt/trinity/lib/trinity/khtmlimagepart.la
-debian/tmp/opt/trinity/lib/trinity/khtmlimagepart.so
+debian/tmp/opt/trinity/lib/trinity/tdehtmlimagepart.la
+debian/tmp/opt/trinity/lib/trinity/tdehtmlimagepart.so
 debian/tmp/opt/trinity/lib/trinity/kimg_dds.la
 debian/tmp/opt/trinity/lib/trinity/kimg_dds.so
 debian/tmp/opt/trinity/lib/trinity/kimg_eps.la
@@ -167,34 +167,34 @@ debian/tmp/opt/trinity/lib/trinity/klauncher.la
 debian/tmp/opt/trinity/lib/trinity/klauncher.so
 debian/tmp/opt/trinity/lib/trinity/knotify.la
 debian/tmp/opt/trinity/lib/trinity/knotify.so
-debian/tmp/opt/trinity/lib/trinity/kspell_aspell.la
-debian/tmp/opt/trinity/lib/trinity/kspell_aspell.so
-debian/tmp/opt/trinity/lib/trinity/kspell_hspell.la
-debian/tmp/opt/trinity/lib/trinity/kspell_hspell.so
-debian/tmp/opt/trinity/lib/trinity/kspell_ispell.la
-debian/tmp/opt/trinity/lib/trinity/kspell_ispell.so
+debian/tmp/opt/trinity/lib/trinity/tdespell_aspell.la
+debian/tmp/opt/trinity/lib/trinity/tdespell_aspell.so
+debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.la
+debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.so
+debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.la
+debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.so
 debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.la
 debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.so
 debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.la
 debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.so
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_docwordcompletion.la
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_docwordcompletion.so
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_insertfile.la
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_insertfile.so
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.la
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.so
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.la
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.so
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.la
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.so
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.la
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.so
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_isearch.la
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_isearch.so
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kdatatool.la
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kdatatool.so
 debian/tmp/opt/trinity/lib/trinity/libkatepart.la
 debian/tmp/opt/trinity/lib/trinity/libkatepart.so
-debian/tmp/opt/trinity/lib/trinity/libkcertpart.la
-debian/tmp/opt/trinity/lib/trinity/libkcertpart.so
+debian/tmp/opt/trinity/lib/trinity/libtdecertpart.la
+debian/tmp/opt/trinity/lib/trinity/libtdecertpart.so
 debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.la
 debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.so
-debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.la
-debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.so
-debian/tmp/opt/trinity/lib/trinity/libkmultipart.la
-debian/tmp/opt/trinity/lib/trinity/libkmultipart.so
+debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.la
+debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.so
+debian/tmp/opt/trinity/lib/trinity/libtdemultipart.la
+debian/tmp/opt/trinity/lib/trinity/libtdemultipart.so
 debian/tmp/opt/trinity/lib/trinity/libshellscript.la
 debian/tmp/opt/trinity/lib/trinity/libshellscript.so
 debian/tmp/opt/trinity/lib/trinity/plugins/designer/kdewidgets.la
@@ -264,56 +264,56 @@ debian/tmp/opt/trinity/lib/libtdesu.so.4
 debian/tmp/opt/trinity/lib/libtdesu.so.4.2.0
 debian/tmp/opt/trinity/lib/libtdeui.so.4
 debian/tmp/opt/trinity/lib/libtdeui.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdnssd.so.1
-debian/tmp/opt/trinity/lib/libkdnssd.so.1.0.0
-debian/tmp/opt/trinity/lib/libkhtml.so.4
-debian/tmp/opt/trinity/lib/libkhtml.so.4.2.0
-debian/tmp/opt/trinity/lib/libkimproxy.so.0
-debian/tmp/opt/trinity/lib/libkimproxy.so.0.0.0
+debian/tmp/opt/trinity/lib/libtdednssd.so.1
+debian/tmp/opt/trinity/lib/libtdednssd.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdehtml.so.4
+debian/tmp/opt/trinity/lib/libtdehtml.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeimproxy.so.0
+debian/tmp/opt/trinity/lib/libtdeimproxy.so.0.0.0
 debian/tmp/opt/trinity/lib/libkio.so.4
 debian/tmp/opt/trinity/lib/libkio.so.4.2.0
 debian/tmp/opt/trinity/lib/libkjava.so.1
 debian/tmp/opt/trinity/lib/libkjava.so.1.0.0
 debian/tmp/opt/trinity/lib/libkjs.so.1
 debian/tmp/opt/trinity/lib/libkjs.so.1.2.0
-debian/tmp/opt/trinity/lib/libkmdi2.so.1
-debian/tmp/opt/trinity/lib/libkmdi2.so.1.0.0
-debian/tmp/opt/trinity/lib/libkmdi.so.1
-debian/tmp/opt/trinity/lib/libkmdi.so.1.0.0
-debian/tmp/opt/trinity/lib/libkmediaplayer.so.0
-debian/tmp/opt/trinity/lib/libkmediaplayer.so.0.0.0
-debian/tmp/opt/trinity/lib/libkmid.so.0
-debian/tmp/opt/trinity/lib/libkmid.so.0.0.95
+debian/tmp/opt/trinity/lib/libtdemdi2.so.1
+debian/tmp/opt/trinity/lib/libtdemdi2.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdemdi.so.1
+debian/tmp/opt/trinity/lib/libtdemdi.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0
+debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0.0.0
+debian/tmp/opt/trinity/lib/libtdemid.so.0
+debian/tmp/opt/trinity/lib/libtdemid.so.0.0.95
 debian/tmp/opt/trinity/lib/libknewstuff.so.1
 debian/tmp/opt/trinity/lib/libknewstuff.so.1.0.0
-debian/tmp/opt/trinity/lib/libkntlm.so.0
-debian/tmp/opt/trinity/lib/libkntlm.so.0.0.0
-debian/tmp/opt/trinity/lib/libkparts.so.2
-debian/tmp/opt/trinity/lib/libkparts.so.2.1.0
-debian/tmp/opt/trinity/lib/libkrandr.so.0
-debian/tmp/opt/trinity/lib/libkrandr.so.0.0.95
-debian/tmp/opt/trinity/lib/libkrsync.so.0
-debian/tmp/opt/trinity/lib/libkrsync.so.0.0.1
-debian/tmp/opt/trinity/lib/libkresources.so.1
-debian/tmp/opt/trinity/lib/libkresources.so.1.2.0
-debian/tmp/opt/trinity/lib/libkscreensaver.so.4
-debian/tmp/opt/trinity/lib/libkscreensaver.so.4.2.0
-debian/tmp/opt/trinity/lib/libkscript.so.0
-debian/tmp/opt/trinity/lib/libkscript.so.0.0.0
-debian/tmp/opt/trinity/lib/libkspell2.so.1
-debian/tmp/opt/trinity/lib/libkspell2.so.1.0.0
-debian/tmp/opt/trinity/lib/libkspell.so.4
-debian/tmp/opt/trinity/lib/libkspell.so.4.2.0
-debian/tmp/opt/trinity/lib/libktexteditor.so.0
-debian/tmp/opt/trinity/lib/libktexteditor.so.0.0.0
-debian/tmp/opt/trinity/lib/libkunittest.so.1
-debian/tmp/opt/trinity/lib/libkunittest.so.1.0.0
-debian/tmp/opt/trinity/lib/libkutils.so.1
-debian/tmp/opt/trinity/lib/libkutils.so.1.2.0
-debian/tmp/opt/trinity/lib/libkwalletbackend.so.1
-debian/tmp/opt/trinity/lib/libkwalletbackend.so.1.0.0
-debian/tmp/opt/trinity/lib/libkwalletclient.so.1
-debian/tmp/opt/trinity/lib/libkwalletclient.so.1.0.1
+debian/tmp/opt/trinity/lib/libtdentlm.so.0
+debian/tmp/opt/trinity/lib/libtdentlm.so.0.0.0
+debian/tmp/opt/trinity/lib/libtdeparts.so.2
+debian/tmp/opt/trinity/lib/libtdeparts.so.2.1.0
+debian/tmp/opt/trinity/lib/libtderandr.so.0
+debian/tmp/opt/trinity/lib/libtderandr.so.0.0.95
+debian/tmp/opt/trinity/lib/libtdersync.so.0
+debian/tmp/opt/trinity/lib/libtdersync.so.0.0.1
+debian/tmp/opt/trinity/lib/libtderesources.so.1
+debian/tmp/opt/trinity/lib/libtderesources.so.1.2.0
+debian/tmp/opt/trinity/lib/libtdescreensaver.so.4
+debian/tmp/opt/trinity/lib/libtdescreensaver.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdescript.so.0
+debian/tmp/opt/trinity/lib/libtdescript.so.0.0.0
+debian/tmp/opt/trinity/lib/libtdespell2.so.1
+debian/tmp/opt/trinity/lib/libtdespell2.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdespell.so.4
+debian/tmp/opt/trinity/lib/libtdespell.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdetexteditor.so.0
+debian/tmp/opt/trinity/lib/libtdetexteditor.so.0.0.0
+debian/tmp/opt/trinity/lib/libtdeunittest.so.1
+debian/tmp/opt/trinity/lib/libtdeunittest.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdeutils.so.1
+debian/tmp/opt/trinity/lib/libtdeutils.so.1.2.0
+debian/tmp/opt/trinity/lib/libtdewalletbackend.so.1
+debian/tmp/opt/trinity/lib/libtdewalletbackend.so.1.0.0
+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
diff --git a/ubuntu/maverick/tdemultimedia/debian/changelog b/ubuntu/maverick/tdemultimedia/debian/changelog
index 37b689f66..70dc106df 100644
--- a/ubuntu/maverick/tdemultimedia/debian/changelog
+++ b/ubuntu/maverick/tdemultimedia/debian/changelog
@@ -584,7 +584,7 @@ tdemultimedia (4:3.4.0-0ubuntu3) hoary; urgency=low
 
 tdemultimedia (4:3.4.0-0ubuntu2) hoary; urgency=low
 
-  * Remove artsbuilder, kmid, krec depends from tdemultimedia meta-package.
+  * Remove artsbuilder, tdemid, krec depends from tdemultimedia meta-package.
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 22:37:33 +0000
 
@@ -784,7 +784,7 @@ tdemultimedia (4:3.1.5-1) unstable; urgency=low
 tdemultimedia (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
-  * Document how to use timidity with kmid. (Closes: #195019)
+  * Document how to use timidity with tdemid. (Closes: #195019)
   * kaudiocreator Depends tdemultimedia-kio-plugins. (Closes: #196686)
   * kaboodle Recommends libarts1-xine. (Closes: #214118)
 
@@ -1013,10 +1013,10 @@ tdemultimedia (4:2.2-cvs20010622-1) unstable; urgency=low
     is the proper name for it.
   * rename timidity to ktimidity and provide timidity yet we don't conflict
     with it. Move timidity.cfg to /etc/kde2/ktimidity.cfg and move conf files
-    for timidity/kmidi to /etc/kde2/kmidi and conffile them all.  kmidi and
+    for timidity/tdemidi to /etc/kde2/tdemidi and conffile them all.  tdemidi and
     ktimidity both seem to work find for me here now...hopefully it will do
     the same for you folks.
-  * Build kmidi/ktimidity with support for most of it's different interfaces. 
+  * Build tdemidi/ktimidity with support for most of it's different interfaces. 
     Not sure if this is how it'll end up being in the end.  This includes the
     default Xaw, Ncurses, and Slang.
   * Fixes these problems: 
@@ -1030,7 +1030,7 @@ tdemultimedia (4:2.1.1-2) unstable; urgency=low
   * Update menu bits to include new kde menu removal tag
   * a few upstream fixes
   * Update build-depends to recognize real | virtual
-  * Adding menu entry for kmid...oops
+  * Adding menu entry for tdemid...oops
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Apr 2001 15:34:00 -0700
 
@@ -1160,7 +1160,7 @@ tdemultimedia (4:2.0-final-6) unstable; urgency=low
 
 tdemultimedia (4:2.0-final-5) unstable; urgency=low
  
-  * building with --enable-debug as it seems kmidi croaks if built without
+  * building with --enable-debug as it seems tdemidi croaks if built without
     debug
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 16 Nov 2000 01:10:00 -0700
@@ -1189,7 +1189,7 @@ tdemultimedia (4:2.0-final-4) unstable; urgency=low
 tdemultimedia (4:2.0-final-3.1) unstable; urgency=low
  
   * minor upstream fixes
-  * more work on kmidi, kmid, and kaiman
+  * more work on tdemidi, tdemid, and kaiman
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 07 Nov 2000 00:30:00 -0700
                                                                                 
@@ -1216,7 +1216,7 @@ tdemultimedia (4:2.0-final-0) unstable; urgency=low
 
 tdemultimedia (4:2.0-20001011-2) unstable; urgency=low
  
-  * Trying to fix up kmidi
+  * Trying to fix up tdemidi
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 13 Oct 2000 19:30:00 -0700
                                                                                 
@@ -1248,7 +1248,7 @@ tdemultimedia (4:2.0-20001002-0) unstable; urgency=low
 tdemultimedia (4:2.0-20000925-2) unstable; urgency=low
  
   * More upstream fixes
-  * More work on kmidi - Moving timidity patches into the proper dir
+  * More work on tdemidi - Moving timidity patches into the proper dir
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 28 Sep 2000 06:00:00 -0700
 
@@ -1283,7 +1283,7 @@ tdemultimedia (4:2.0-20000911-1) unstable; urgency=low
 tdemultimedia (4:2.0-20000911-0) unstable; urgency=low
  
   * more upstream fixes
-  * More kmidi fixes
+  * More tdemidi fixes
   * Breaking tdemultimedia down
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 11 Sep 2000 04:30:00 -0700
diff --git a/ubuntu/maverick/tdemultimedia/debian/control b/ubuntu/maverick/tdemultimedia/debian/control
index cf85ef6b0..42f607611 100644
--- a/ubuntu/maverick/tdemultimedia/debian/control
+++ b/ubuntu/maverick/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}), kmid-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-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})
 Suggests: tdemultimedia-trinity-doc-html (>= ${Source-Version})
 Description: multimedia apps from the official Trinity release 
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -31,7 +31,7 @@ Section: devel
 Architecture: any
 Replaces: kdemultimedia-trinity-dev (<< 4:14.0.0)
 Breaks: kdemultimedia-trinity-dev (<< 4:14.0.0)
-Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
+Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), tdemid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
 Conflicts: libmpeg-trinity-dev
 Description: development files for the Trinity multimedia module
  Development files and headers for the Trinity multimedia module.
@@ -169,11 +169,11 @@ Description: enables the browsing of audio CDs under Konqueror
  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: kmid-trinity
+Package: tdemid-trinity
 Section: sound
 Architecture: any
-Replaces: kmid-trinity (<< 4:14.0.0)
-Breaks: kmid-trinity (<< 4:14.0.0)
+Replaces: tdemid-trinity (<< 4:14.0.0)
+Breaks: tdemid-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Description: MIDI/karaoke player for Trinity
diff --git a/ubuntu/maverick/tdemultimedia/debian/control.in b/ubuntu/maverick/tdemultimedia/debian/control.in
index 7b20cca6d..4bf762241 100644
--- a/ubuntu/maverick/tdemultimedia/debian/control.in
+++ b/ubuntu/maverick/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}), kmid (>= ${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-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})
 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
@@ -27,7 +27,7 @@ Description: multimedia apps from the official KDE release
 Package: tdemultimedia-dev
 Section: devel
 Architecture: any
-Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version})
+Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), tdemid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version})
 Conflicts: libmpeg-dev
 Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0)
 Description: development files for the KDE multimedia module
@@ -154,7 +154,7 @@ Description: enables the browsing of audio CDs under Konqueror
  This package is part of KDE, as a component of the KDE multimedia module.
  See the 'kde' and 'tdemultimedia' packages for more information.
 
-Package: kmid
+Package: tdemid
 Section: sound
 Architecture: any
 Depends: ${shlibs:Depends}
diff --git a/ubuntu/maverick/tdemultimedia/debian/copyright b/ubuntu/maverick/tdemultimedia/debian/copyright
index 8957d914a..f85e02329 100644
--- a/ubuntu/maverick/tdemultimedia/debian/copyright
+++ b/ubuntu/maverick/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, kmid, kmidi, koncd, kscd
+kfile-plugins, tdemid, tdemidi, koncd, kscd
 -----------------------------------------------
 GPL
 
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/kmid-16.xpm b/ubuntu/maverick/tdemultimedia/debian/icons/tdemid-16.xpm
index 0a510090a..64ad03b59 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/kmid-16.xpm
+++ b/ubuntu/maverick/tdemultimedia/debian/icons/tdemid-16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kmid-16[] = {
+static char *tdemid-16[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 104 2",
 "   c black",
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/kmid.xpm b/ubuntu/maverick/tdemultimedia/debian/icons/tdemid.xpm
index fb669aa72..c4cbb3bf1 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/kmid.xpm
+++ b/ubuntu/maverick/tdemultimedia/debian/icons/tdemid.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kmid[] = {
+static char *tdemid[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 213 2",
 "   c black",
diff --git a/ubuntu/maverick/tdemultimedia/debian/kmid-trinity.install b/ubuntu/maverick/tdemultimedia/debian/kmid-trinity.install
deleted file mode 100644
index e77e1784a..000000000
--- a/ubuntu/maverick/tdemultimedia/debian/kmid-trinity.install
+++ /dev/null
@@ -1,40 +0,0 @@
-debian/tmp/opt/trinity/bin/kmid
-debian/tmp/opt/trinity/lib/trinity/libkmidpart.la
-debian/tmp/opt/trinity/lib/trinity/libkmidpart.so
-debian/tmp/opt/trinity/lib/libkmidlib.so.0
-debian/tmp/opt/trinity/lib/libkmidlib.so.0.0.0
-debian/tmp/opt/trinity/share/applications/tde/kmid.desktop
-debian/tmp/opt/trinity/share/apps/kmid/DiesIrae.kar
-debian/tmp/opt/trinity/share/apps/kmid/Guantanamera.kar
-debian/tmp/opt/trinity/share/apps/kmid/MariaDeLasMercedes.kar
-debian/tmp/opt/trinity/share/apps/kmid/OFortuna.kar
-debian/tmp/opt/trinity/share/apps/kmid/fm/drums.o3
-debian/tmp/opt/trinity/share/apps/kmid/fm/drums.sb
-debian/tmp/opt/trinity/share/apps/kmid/fm/std.o3
-debian/tmp/opt/trinity/share/apps/kmid/fm/std.sb
-debian/tmp/opt/trinity/share/apps/kmid/icons/button1.xpm
-debian/tmp/opt/trinity/share/apps/kmid/icons/button2.xpm
-debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/16x16/actions/piano.png
-debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/16x16/actions/volume.png
-debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/22x22/actions/piano.png
-debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/22x22/actions/volume.png
-debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/32x32/actions/piano.png
-debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/32x32/actions/volume.png
-debian/tmp/opt/trinity/share/apps/kmid/icons/keyboard.xpm
-debian/tmp/opt/trinity/share/apps/kmid/kmid_partui.rc
-debian/tmp/opt/trinity/share/apps/kmid/kmidui.rc
-debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaPSR500.map
-debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaPSS790.map
-debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaQY10.map
-debian/tmp/opt/trinity/share/apps/kmid/maps/gm.map
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/index.docbook
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmid.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmid.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kmid.png
-debian/tmp/opt/trinity/share/mimelnk/audio/x-karaoke.desktop
-debian/tmp/opt/trinity/share/servicetypes/audiomidi.desktop
-
-debian/icons/kmid.xpm		/opt/trinity/share/pixmaps
-debian/icons/kmid-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdemultimedia/debian/kmid-trinity.menu b/ubuntu/maverick/tdemultimedia/debian/kmid-trinity.menu
deleted file mode 100644
index ca828ea94..000000000
--- a/ubuntu/maverick/tdemultimedia/debian/kmid-trinity.menu
+++ /dev/null
@@ -1,11 +0,0 @@
-?package(kmid):\
-	needs="X11"\
-	section="Apps/Sound"\
-	hints="TDE"\
-	title="KMid"\
-	icon32x32="/opt/trinity/share/pixmaps/kmid.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kmid-16.xpm"\
-	command="/opt/trinity/bin/kmid"
-
-# Icon 32x32 kmid/cr32-app-kmid.png kmid.xpm
-# Icon 16x16 kmid/cr16-app-kmid.png kmid-16.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 b/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1
index 76f29a181..2e9e5704d 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1
+++ b/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1
@@ -14,7 +14,7 @@ because the original program does not have a manual page.
 .PP
 .B Kaboodle
 is a simple KMedia (aRts) player for KDE, which can play standalone,
-or embedded in Konqueror. The embedded player should work for media embedded in khtml, too.
+or embedded in Konqueror. The embedded player should work for media embedded in tdehtml, too.
 It is meant for simple stuff like playing a quick video or sound file. 
 .B Kaboodle
 does not accept plugins, does not have a playlist or volume control and other such features.
@@ -205,10 +205,10 @@ shared over more than one screen.
 Specifies the X display to run KDE on.
 .IP KDESYCOCA
 Specifies and alternative path for the 
-.I ksycoca
+.I tdesycoca
 KDE system configuration cache file.
 The default path is
-/tmp/kde-$USER/ksycoca
+/tmp/kde-$USER/tdesycoca
 .IP DCOPSERVER
 Specifies an alternative path for the DCOP server file. The default
 file is
diff --git a/ubuntu/maverick/tdemultimedia/debian/rules b/ubuntu/maverick/tdemultimedia/debian/rules
index 1e7e0647c..58e944e5d 100755
--- a/ubuntu/maverick/tdemultimedia/debian/rules
+++ b/ubuntu/maverick/tdemultimedia/debian/rules
@@ -26,7 +26,7 @@ DEB_DH_STRIP_ARGS  := --dbg-package=tdemultimedia-trinity-dbg
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity kmid-trinity kmix-trinity krec-trinity \
+PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity tdemid-trinity kmix-trinity krec-trinity \
 	libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \
 	libkcddb1-trinity mpeglib-trinity noatun-trinity
 
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.install b/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.install
new file mode 100644
index 000000000..c36f2d16a
--- /dev/null
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.install
@@ -0,0 +1,40 @@
+debian/tmp/opt/trinity/bin/tdemid
+debian/tmp/opt/trinity/lib/trinity/libtdemidpart.la
+debian/tmp/opt/trinity/lib/trinity/libtdemidpart.so
+debian/tmp/opt/trinity/lib/libtdemidlib.so.0
+debian/tmp/opt/trinity/lib/libtdemidlib.so.0.0.0
+debian/tmp/opt/trinity/share/applications/tde/tdemid.desktop
+debian/tmp/opt/trinity/share/apps/tdemid/DiesIrae.kar
+debian/tmp/opt/trinity/share/apps/tdemid/Guantanamera.kar
+debian/tmp/opt/trinity/share/apps/tdemid/MariaDeLasMercedes.kar
+debian/tmp/opt/trinity/share/apps/tdemid/OFortuna.kar
+debian/tmp/opt/trinity/share/apps/tdemid/fm/drums.o3
+debian/tmp/opt/trinity/share/apps/tdemid/fm/drums.sb
+debian/tmp/opt/trinity/share/apps/tdemid/fm/std.o3
+debian/tmp/opt/trinity/share/apps/tdemid/fm/std.sb
+debian/tmp/opt/trinity/share/apps/tdemid/icons/button1.xpm
+debian/tmp/opt/trinity/share/apps/tdemid/icons/button2.xpm
+debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/16x16/actions/piano.png
+debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/16x16/actions/volume.png
+debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/22x22/actions/piano.png
+debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/22x22/actions/volume.png
+debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/32x32/actions/piano.png
+debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/32x32/actions/volume.png
+debian/tmp/opt/trinity/share/apps/tdemid/icons/keyboard.xpm
+debian/tmp/opt/trinity/share/apps/tdemid/tdemid_partui.rc
+debian/tmp/opt/trinity/share/apps/tdemid/tdemidui.rc
+debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaPSR500.map
+debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaPSS790.map
+debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaQY10.map
+debian/tmp/opt/trinity/share/apps/tdemid/maps/gm.map
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/index.docbook
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdemid.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdemid.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdemid.png
+debian/tmp/opt/trinity/share/mimelnk/audio/x-karaoke.desktop
+debian/tmp/opt/trinity/share/servicetypes/audiomidi.desktop
+
+debian/icons/tdemid.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdemid-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.menu b/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.menu
new file mode 100644
index 000000000..5f3ec9248
--- /dev/null
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.menu
@@ -0,0 +1,11 @@
+?package(tdemid):\
+	needs="X11"\
+	section="Apps/Sound"\
+	hints="TDE"\
+	title="KMid"\
+	icon32x32="/opt/trinity/share/pixmaps/tdemid.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdemid-16.xpm"\
+	command="/opt/trinity/bin/tdemid"
+
+# Icon 32x32 tdemid/cr32-app-tdemid.png tdemid.xpm
+# Icon 16x16 tdemid/cr16-app-tdemid.png tdemid-16.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid
deleted file mode 100644
index 0d5dc5893..000000000
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: tdemultimedia-doc-html-kmid
-Title: KMid Handbook
-Author: Antonio Larrosa Jimenez
-Abstract: KMid is a midi/karaoke multimedia player for KDE.
-Section: Apps/Music
-
-Format: HTML
-Index: /opt/trinity/share/doc/tde/HTML/en/kmid/index.html
-Files: /opt/trinity/share/doc/tde/HTML/en/kmid/*.html
-
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid
new file mode 100644
index 000000000..e4d54da22
--- /dev/null
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid
@@ -0,0 +1,10 @@
+Document: tdemultimedia-doc-html-tdemid
+Title: KMid Handbook
+Author: Antonio Larrosa Jimenez
+Abstract: KMid is a midi/karaoke multimedia player for KDE.
+Section: Apps/Music
+
+Format: HTML
+Index: /opt/trinity/share/doc/tde/HTML/en/tdemid/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/tdemid/*.html
+
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install
index 4edb170bf..97d3eb309 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install
@@ -155,8 +155,8 @@ debian/tmp/opt/trinity/lib/libtdeinit_kmix.la
 debian/tmp/opt/trinity/lib/libtdeinit_kmixctrl.la
 debian/tmp/opt/trinity/lib/libtdeinit_krec.la
 debian/tmp/opt/trinity/lib/libtdeinit_noatun.la
-debian/tmp/opt/trinity/lib/libkmidlib.la
-debian/tmp/opt/trinity/lib/libkmidlib.so
+debian/tmp/opt/trinity/lib/libtdemidlib.la
+debian/tmp/opt/trinity/lib/libtdemidlib.so
 debian/tmp/opt/trinity/lib/libmpeg.la
 debian/tmp/opt/trinity/lib/libmpeg.so
 debian/tmp/opt/trinity/lib/libnoatun.la
diff --git a/ubuntu/maverick/tdenetwork/debian/changelog b/ubuntu/maverick/tdenetwork/debian/changelog
index 43b1aadd7..4510420ac 100644
--- a/ubuntu/maverick/tdenetwork/debian/changelog
+++ b/ubuntu/maverick/tdenetwork/debian/changelog
@@ -173,10 +173,10 @@ tdenetwork (4:3.5.7-2) unstable; urgency=low
   * Don't do anything if lisa is already running. (Closes: #407892)
   * Pull patch from upstream to fix issue with format toolbar. (Closes: #392019)
   * Pull patch from upstream to fix webcam issues. (Closes: #414424)
-  * Remove libnss-mdns from kdnssd-depends. (Closes: 412084)
+  * Remove libnss-mdns from tdednssd-depends. (Closes: 412084)
   * Increase maximum count of lines in ksirc (Closes: 291968)
   * Don't build kwifimanager on s390 - they don't have wifi hardware.
-  * Don't build kwifimanager and kdnssd on !linux archs - tt doesn't built there.
+  * Don't build kwifimanager and tdednssd on !linux archs - tt doesn't built there.
   * Patch to fix builds on kfreebsd archs. (Closes: 398909)
   * Make ktalkd depend on update-inetd - we use it in maint scripts.
 
@@ -483,7 +483,7 @@ tdenetwork (4:3.5.3-1ubuntu5) edgy; urgency=low
 tdenetwork (4:3.5.3-1ubuntu4) edgy; urgency=low
 
   * Add debian/kubuntu_zeroconf/_{fish,sftp}._tcp to add FISH and sFTP support
-    to kdnssd (Closes: Malone 33034).
+    to tdednssd (Closes: Malone 33034).
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Thu, 20 Jul 2006 12:13:01 +0200
 
@@ -558,7 +558,7 @@ tdenetwork (4:3.5.1-1) unstable; urgency=low
 
   +++ Changes by Isaac Clerencia:
 
-  * Put zeroconf kioslave and other kdnssd stuff in a new package, kdnssd.
+  * Put zeroconf kioslave and other tdednssd stuff in a new package, tdednssd.
 
   +++ Changes by Christopher Martin:
 
@@ -637,13 +637,13 @@ tdenetwork (4:3.5.2-0ubuntu5) dapper; urgency=low
 
   * Move libnss-mdns and avahi-daemon to Recommends since we don't want avahi
     installed by default.
-  * Add sftp, fish and ipp protocols to kdnssd in debian/zeroconf/.
+  * Add sftp, fish and ipp protocols to tdednssd in debian/zeroconf/.
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Thu, 11 May 2006 19:09:40 +0200
 
 tdenetwork (4:3.5.2-0ubuntu4) dapper; urgency=low
 
-  * Add libnss-mdns and avahi-daemon to dependencies for kdnssd package.
+  * Add libnss-mdns and avahi-daemon to dependencies for tdednssd package.
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Thu, 11 May 2006 18:52:54 +0200
 
@@ -707,14 +707,14 @@ tdenetwork (4:3.5.0-0ubuntu4) dapper; urgency=low
 
 tdenetwork (4:3.5.0-0ubuntu3) dapper; urgency=low
 
-  * Add kdnssd to tdenetwork meta package
-  * Remove libkdnssd dependency from kdnssd (now in tdelibs)
+  * Add tdednssd to tdenetwork meta package
+  * Remove libtdednssd dependency from tdednssd (now in tdelibs)
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 09:51:13 +0000
 
 tdenetwork (4:3.5.0-0ubuntu2) dapper; urgency=low
 
-  * Add package kdnssd with zeroconf:/ ioslave
+  * Add package tdednssd with zeroconf:/ ioslave
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Jan 2006 02:22:49 +0000
 
diff --git a/ubuntu/maverick/tdenetwork/debian/control b/ubuntu/maverick/tdenetwork/debian/control
index a1a2dcb2b..a95cc81a7 100644
--- a/ubuntu/maverick/tdenetwork/debian/control
+++ b/ubuntu/maverick/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}), kdnssd-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-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})
 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
@@ -331,11 +331,11 @@ Description: LAN information server for Trinity
  This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
-Package: kdnssd-trinity
+Package: tdednssd-trinity
 Section: net
 Architecture: any
-Replaces: kdnssd-trinity (<< 4:14.0.0)
-Breaks: kdnssd-trinity (<< 4:14.0.0)
+Replaces: tdednssd-trinity (<< 4:14.0.0)
+Breaks: tdednssd-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Recommends: avahi-daemon
 Suggests: avahi-autoipd | zeroconf
diff --git a/ubuntu/maverick/tdenetwork/debian/control.in b/ubuntu/maverick/tdenetwork/debian/control.in
index 1c7fc62f9..7c7dfdc41 100644
--- a/ubuntu/maverick/tdenetwork/debian/control.in
+++ b/ubuntu/maverick/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}), kdnssd (>= ${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-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})
 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
@@ -299,7 +299,7 @@ Description: LAN information server for KDE
  This package is part of KDE, as a component of the KDE network module.
  See the 'kde' and 'tdenetwork' packages for more information.
 
-Package: kdnssd
+Package: tdednssd
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}
diff --git a/ubuntu/maverick/tdenetwork/debian/kget-trinity.install b/ubuntu/maverick/tdenetwork/debian/kget-trinity.install
index 9a1ac79f5..d2a0707c9 100644
--- a/ubuntu/maverick/tdenetwork/debian/kget-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/kget-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/bin/kget
-debian/tmp/opt/trinity/lib/trinity/khtml_kget.la
-debian/tmp/opt/trinity/lib/trinity/khtml_kget.so
+debian/tmp/opt/trinity/lib/trinity/tdehtml_kget.la
+debian/tmp/opt/trinity/lib/trinity/tdehtml_kget.so
 debian/tmp/opt/trinity/share/applications/tde/kget.desktop
 debian/tmp/opt/trinity/share/apps/kget/eventsrc
 debian/tmp/opt/trinity/share/apps/kget/icons/crystalsvg/22x22/actions/bar0.png
@@ -52,8 +52,8 @@ debian/tmp/opt/trinity/share/apps/kget/pics/try4.png
 debian/tmp/opt/trinity/share/apps/kget/pics/try5.png
 debian/tmp/opt/trinity/share/apps/kget/pics/try6.png
 debian/tmp/opt/trinity/share/apps/kget/pics/try7.png
-debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/kget_plug_in.desktop
-debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/kget_plug_in.rc
+debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/kget_plug_in.desktop
+debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/kget_plug_in.rc
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kget_download.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/fileopen.png
@@ -66,7 +66,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget4.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget5.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kget.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kget_list.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/khtml_kget.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/tdehtml_kget.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kget.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kget_list.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kget.png
diff --git a/ubuntu/maverick/tdenetwork/debian/rules b/ubuntu/maverick/tdenetwork/debian/rules
index 2579d07e3..0ee562691 100755
--- a/ubuntu/maverick/tdenetwork/debian/rules
+++ b/ubuntu/maverick/tdenetwork/debian/rules
@@ -7,7 +7,7 @@ ifeq ($(DEB_HOST_ARCH),s390)
 DONT_BUILD+= kwifimanager
 endif
 ifneq ($(DEB_HOST_ARCH_OS),linux)
-DONT_BUILD+= kwifimanager kdnssd
+DONT_BUILD+= kwifimanager tdednssd
 endif
 export DH_OPTIONS
 
diff --git a/ubuntu/maverick/tdenetwork/debian/kdnssd-trinity.install b/ubuntu/maverick/tdenetwork/debian/tdednssd-trinity.install
index 8d6a52c6b..8d6a52c6b 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdnssd-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/tdednssd-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/changelog b/ubuntu/maverick/tdepim/debian/changelog
index 09dc0dfc3..268556215 100644
--- a/ubuntu/maverick/tdepim/debian/changelog
+++ b/ubuntu/maverick/tdepim/debian/changelog
@@ -1035,7 +1035,7 @@ tdepim (4:3.5.0-0ubuntu4) dapper; urgency=low
 
 tdepim (4:3.5.0-0ubuntu3) dapper; urgency=low
 
-  * Increase version number on Replaces for tdepim-kresources
+  * Increase version number on Replaces for tdepim-tderesources
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  6 Jan 2006 18:42:44 +0000
 
@@ -1127,7 +1127,7 @@ tdepim (4:3.4.1-2) UNRELEASED; urgency=low
 tdepim (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.
-  * Split kresources into new package tdepim-kresources.
+  * Split tderesources into new package tdepim-tderesources.
   * Split tdepimmacros.h into new package libtdepim1-dev, and make all
     the other -dev packages depend on it.
 
diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control
index 6a2e4385d..1c544b5f5 100644
--- a/ubuntu/maverick/tdepim/debian/control
+++ b/ubuntu/maverick/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-kresources-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-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})
 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
@@ -52,7 +52,7 @@ Section: devel
 Architecture: any
 Replaces: kdepim-trinity-dev (<< 4:14.0.0)
 Breaks: kdepim-trinity-dev (<< 4:14.0.0)
-Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-kresources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version})
+Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-tderesources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version})
 Description: KDE Personal Information Management [development]
  This package contains development files needed to compile tdepim applications.
  .
@@ -116,7 +116,7 @@ Architecture: any
 Replaces: kaddressbook-trinity (<< 4:14.0.0)
 Breaks: kaddressbook-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Suggests: tdepim-kresources-trinity, tdebase-kio-plugins-trinity
+Suggests: tdepim-tderesources-trinity, tdebase-kio-plugins-trinity
 Description: KDE NG addressbook application
  KAddressBook is the main address book application for KDE; it enables you
  to manage your contacts efficiently and comfortably. It can load and save
@@ -206,11 +206,11 @@ Description: Trinity pim I/O Slaves
  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-kresources-trinity
+Package: tdepim-tderesources-trinity
 Section: tde
 Architecture: any
-Replaces: kdepim-kresources-trinity (<< 4:14.0.0)
-Breaks: kdepim-kresources-trinity (<< 4:14.0.0)
+Replaces: kdepim-tderesources-trinity (<< 4:14.0.0)
+Breaks: kdepim-tderesources-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}, korganizer-trinity
 Suggests: knotes-trinity
@@ -321,7 +321,7 @@ Architecture: any
 Replaces: knotes-trinity (<< 4:14.0.0)
 Breaks: knotes-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Suggests: tdepim-kresources-trinity
+Suggests: tdepim-tderesources-trinity
 Description: Trinity sticky notes
  KNotes is a program that lets you write sticky notes. The notes are saved
  automatically when you exit the program, and they display when you open the
@@ -470,7 +470,7 @@ Breaks: libkcal2b-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}
 Conflicts: libkcal2-trinity, libkcal2a-trinity
-Suggests: tdepim-kresources-trinity
+Suggests: tdepim-tderesources-trinity
 Description: Trinity calendaring library
  This library provides a C++ API for handling the vCalendar and iCalendar
  formats.
diff --git a/ubuntu/maverick/tdepim/debian/control.in b/ubuntu/maverick/tdepim/debian/control.in
index 3b45c48d0..4c48dcbef 100644
--- a/ubuntu/maverick/tdepim/debian/control.in
+++ b/ubuntu/maverick/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-kresources (>= ${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-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})
 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
@@ -45,7 +45,7 @@ Description: debugging symbols for tdepim
 Package: tdepim-dev
 Section: devel
 Architecture: any
-Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), tdepim-kresources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libtdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version})
+Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), tdepim-tderesources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libtdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version})
 Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2)
 Description: KDE Personal Information Management [development]
  This package contains development files needed to compile tdepim applications.
@@ -102,7 +102,7 @@ Package: kaddressbook
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: tdepim-kresources, tdebase-kio-plugins
+Suggests: tdepim-tderesources, tdebase-kio-plugins
 Description: KDE NG addressbook application
  KAddressBook is the main address book application for KDE; it enables you
  to manage your contacts efficiently and comfortably. It can load and save
@@ -183,7 +183,7 @@ Description: KDE pim I/O Slaves
  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-kresources
+Package: tdepim-tderesources
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -286,7 +286,7 @@ Package: knotes
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: tdepim-kresources
+Suggests: tdepim-tderesources
 Description: KDE sticky notes
  KNotes is a program that lets you write sticky notes. The notes are saved
  automatically when you exit the program, and they display when you open the
@@ -441,7 +441,7 @@ Depends: ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}
 Conflicts: libkcal2, libkcal2a
 Replaces: libkcal2a
-Suggests: tdepim-kresources
+Suggests: tdepim-tderesources
 Description: KDE calendaring library
  This library provides a C++ API for handling the vCalendar and iCalendar
  formats.
diff --git a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install
index 748b6e9a7..eac493c1b 100644
--- a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install
@@ -29,7 +29,7 @@
 /opt/trinity/share/services/kabldapconfig.desktop
 /opt/trinity/share/services/kaddressbook
 /opt/trinity/share/services/kontact/kaddressbookplugin.desktop
-/opt/trinity/share/services/kresources/kabc/imap.desktop
+/opt/trinity/share/services/tderesources/kabc/imap.desktop
 /opt/trinity/share/services/ldifvcardthumbnail.desktop
 /opt/trinity/share/servicetypes/dcopaddressbook.desktop
 /opt/trinity/share/servicetypes/kaddressbook_contacteditorwidget.desktop
diff --git a/ubuntu/maverick/tdepim/debian/knotes-trinity.install b/ubuntu/maverick/tdepim/debian/knotes-trinity.install
index 97956b197..8f65af5e3 100644
--- a/ubuntu/maverick/tdepim/debian/knotes-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/knotes-trinity.install
@@ -15,9 +15,9 @@
 /opt/trinity/share/icons/hicolor/32x32/apps/knotes.png
 /opt/trinity/share/icons/hicolor/48x48/apps/knotes.png
 /opt/trinity/share/icons/hicolor/64x64/apps/knotes.png
-/opt/trinity/share/services/kresources/knotes/imap.desktop
-/opt/trinity/share/services/kresources/knotes/local.desktop
-/opt/trinity/share/services/kresources/knotes_manager.desktop
+/opt/trinity/share/services/tderesources/knotes/imap.desktop
+/opt/trinity/share/services/tderesources/knotes/local.desktop
+/opt/trinity/share/services/tderesources/knotes_manager.desktop
 ../icons/knotes.xpm /opt/trinity/share/pixmaps
 ../icons/knotes-16.xpm /opt/trinity/share/pixmaps
 
diff --git a/ubuntu/maverick/tdepim/debian/libkcal2b-trinity.install b/ubuntu/maverick/tdepim/debian/libkcal2b-trinity.install
index ca6e71652..211c15b4d 100644
--- a/ubuntu/maverick/tdepim/debian/libkcal2b-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/libkcal2b-trinity.install
@@ -13,9 +13,9 @@
 /opt/trinity/lib/libkholidays.so.1
 /opt/trinity/lib/libkholidays.so.1.0.0
 /opt/trinity/share/apps/libkholidays
-/opt/trinity/share/services/kresources/kcal/imap.desktop
-/opt/trinity/share/services/kresources/kcal/kabc.desktop
-/opt/trinity/share/services/kresources/kcal/local.desktop
-/opt/trinity/share/services/kresources/kcal/localdir.desktop
-/opt/trinity/share/services/kresources/kcal/remote.desktop
-/opt/trinity/share/services/kresources/kcal_manager.desktop
+/opt/trinity/share/services/tderesources/kcal/imap.desktop
+/opt/trinity/share/services/tderesources/kcal/kabc.desktop
+/opt/trinity/share/services/tderesources/kcal/local.desktop
+/opt/trinity/share/services/tderesources/kcal/localdir.desktop
+/opt/trinity/share/services/tderesources/kcal/remote.desktop
+/opt/trinity/share/services/tderesources/kcal_manager.desktop
diff --git a/ubuntu/maverick/tdepim/debian/libtdepim1a-trinity.install b/ubuntu/maverick/tdepim/debian/libtdepim1a-trinity.install
index 6a17101ae..e018f4bdf 100644
--- a/ubuntu/maverick/tdepim/debian/libtdepim1a-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/libtdepim1a-trinity.install
@@ -1,7 +1,7 @@
 /opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.la
 /opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.so
-/opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.la
-/opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.so
+/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.la
+/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.so
 /opt/trinity/lib/libtdepim.so.1
 /opt/trinity/lib/libtdepim.so.1.0.0
 /opt/trinity/share/apps/tdepimwidgets
diff --git a/ubuntu/maverick/tdepim/debian/rules b/ubuntu/maverick/tdepim/debian/rules
index 0e1c5356b..96073e510 100755
--- a/ubuntu/maverick/tdepim/debian/rules
+++ b/ubuntu/maverick/tdepim/debian/rules
@@ -63,10 +63,10 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
 	-dDepends	# Since -u args go first in dpkg-shlibdeps call
 
 ## Move kaddressbook-trinity dependency (from libkabc_xmlrpc.so) to Recommends
-#DEB_DH_SHLIBDEPS_ARGS_tdepim-kresources-trinity := \
+#DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \
 #	-Xopt/lib/trinity/libkabc_xmlrpc.so.1 \
 #	-- -dRecommends \
-#	debian/tdepim-kresources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \
+#	debian/tdepim-tderesources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \
 #	-dDepends
 #
 ## Move kaddressbook dependency of libkcal2b-trinity to Recommends
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-kresources-trinity.install b/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install
index 588b690b1..bcf0991b5 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-kresources-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install
@@ -74,31 +74,31 @@
 /opt/trinity/lib/libkslox.so.0.0.0
 /opt/trinity/lib/libgwsoap.so.0
 /opt/trinity/lib/libgwsoap.so.0.0.0
-/opt/trinity/share/services/kresources/kabc/kabc_groupdav.desktop
-/opt/trinity/share/services/kresources/kabc/kabc_groupwise.desktop
-/opt/trinity/share/services/kresources/kabc/kabc_newexchange.desktop
-/opt/trinity/share/services/kresources/kabc/kabc_opengroupware.desktop
-/opt/trinity/share/services/kresources/kabc/kabc_ox.desktop
-/opt/trinity/share/services/kresources/kabc/kabc_slox.desktop
-/opt/trinity/share/services/kresources/kabc/kabc_xmlrpc.desktop
-/opt/trinity/share/services/kresources/kabc/kolab.desktop
-/opt/trinity/share/services/kresources/kabc/scalix.desktop
-/opt/trinity/share/services/kresources/kcal/exchange.desktop
-/opt/trinity/share/services/kresources/kcal/kcal_caldav.desktop
-/opt/trinity/share/services/kresources/kabc/kabc_carddav.desktop
-/opt/trinity/share/services/kresources/kcal/kcal_groupdav.desktop
-/opt/trinity/share/services/kresources/kcal/kcal_groupwise.desktop
-/opt/trinity/share/services/kresources/kcal/kcal_newexchange.desktop
-/opt/trinity/share/services/kresources/kcal/kcal_opengroupware.desktop
-/opt/trinity/share/services/kresources/kcal/kcal_ox.desktop
-/opt/trinity/share/services/kresources/kcal/kcal_resourcefeatureplan.desktop
-/opt/trinity/share/services/kresources/kcal/kcal_slox.desktop
-/opt/trinity/share/services/kresources/kcal/kcal_xmlrpc.desktop
-/opt/trinity/share/services/kresources/kcal/kolab.desktop
-/opt/trinity/share/services/kresources/kcal/scalix.desktop
-/opt/trinity/share/services/kresources/knotes/knotes_xmlrpc.desktop
-/opt/trinity/share/services/kresources/knotes/kolabresource.desktop
-/opt/trinity/share/services/kresources/knotes/scalix.desktop
+/opt/trinity/share/services/tderesources/kabc/kabc_groupdav.desktop
+/opt/trinity/share/services/tderesources/kabc/kabc_groupwise.desktop
+/opt/trinity/share/services/tderesources/kabc/kabc_newexchange.desktop
+/opt/trinity/share/services/tderesources/kabc/kabc_opengroupware.desktop
+/opt/trinity/share/services/tderesources/kabc/kabc_ox.desktop
+/opt/trinity/share/services/tderesources/kabc/kabc_slox.desktop
+/opt/trinity/share/services/tderesources/kabc/kabc_xmlrpc.desktop
+/opt/trinity/share/services/tderesources/kabc/kolab.desktop
+/opt/trinity/share/services/tderesources/kabc/scalix.desktop
+/opt/trinity/share/services/tderesources/kcal/exchange.desktop
+/opt/trinity/share/services/tderesources/kcal/kcal_caldav.desktop
+/opt/trinity/share/services/tderesources/kabc/kabc_carddav.desktop
+/opt/trinity/share/services/tderesources/kcal/kcal_groupdav.desktop
+/opt/trinity/share/services/tderesources/kcal/kcal_groupwise.desktop
+/opt/trinity/share/services/tderesources/kcal/kcal_newexchange.desktop
+/opt/trinity/share/services/tderesources/kcal/kcal_opengroupware.desktop
+/opt/trinity/share/services/tderesources/kcal/kcal_ox.desktop
+/opt/trinity/share/services/tderesources/kcal/kcal_resourcefeatureplan.desktop
+/opt/trinity/share/services/tderesources/kcal/kcal_slox.desktop
+/opt/trinity/share/services/tderesources/kcal/kcal_xmlrpc.desktop
+/opt/trinity/share/services/tderesources/kcal/kolab.desktop
+/opt/trinity/share/services/tderesources/kcal/scalix.desktop
+/opt/trinity/share/services/tderesources/knotes/knotes_xmlrpc.desktop
+/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
diff --git a/ubuntu/maverick/tdesdk/debian/changelog b/ubuntu/maverick/tdesdk/debian/changelog
index 1bbe6e2e4..2480854bc 100644
--- a/ubuntu/maverick/tdesdk/debian/changelog
+++ b/ubuntu/maverick/tdesdk/debian/changelog
@@ -222,9 +222,9 @@ tdesdk (4:3.5.5-2) unstable; urgency=low
   +++ Changes by Sune Vuorela:
 
   * Add support for automake 1.10 to kapptemplate. (Closes: #396985)
-  * Add Suggests: tdelibs4-doc to kunittest. tdelibs4-doc contains kunittest
+  * Add Suggests: tdelibs4-doc to tdeunittest. tdelibs4-doc contains tdeunittest
     documentation. (Closes: #386040)
-  * Don't install /usr/bin/kunittest and /usr/bin/kunittest_debughelper. These
+  * Don't install /usr/bin/tdeunittest and /usr/bin/tdeunittest_debughelper. These
     are not useful without the dcopperl bindings which are not built in the
     Debian tdebindings packages. (Closes: #386039)
 
@@ -427,7 +427,7 @@ tdesdk (4:3.5.0-1) alioth; urgency=low
 
   * Add a tdesdk-dbg package for helping to trace problems.
 
-  * New packages: kunittest, and tdesdk-kio-plugins, which splits
+  * New packages: tdeunittest, and tdesdk-kio-plugins, which splits
     out the svn ioslave from tdesdk-misc.
 
   * Re-libtoolize. This fixes GNU/kFreeBSD, and prunes poxml's
diff --git a/ubuntu/maverick/tdesdk/debian/control b/ubuntu/maverick/tdesdk/debian/control
index 5305f7b08..935dbf0bf 100644
--- a/ubuntu/maverick/tdesdk/debian/control
+++ b/ubuntu/maverick/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}), kunittest-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-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})
 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
@@ -407,19 +407,19 @@ Description: subversion ioslave for Trinity
  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: kunittest-trinity
+Package: tdeunittest-trinity
 Architecture: any
 Section: devel
-Replaces: kunittest-trinity (<< 4:14.0.0)
-Breaks: kunittest-trinity (<< 4:14.0.0)
+Replaces: tdeunittest-trinity (<< 4:14.0.0)
+Breaks: tdeunittest-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Conflicts: kunittest
+Conflicts: tdeunittest
 Suggests: tdelibs4-trinity-doc
 Description: unit testing library for Trinity
  KUnitTest is a small library that facilitates the writing of tests for
  KDE developers. There are two ways to use the KUnitTest library. One is
- to create dynamically loadable modules and use the kunittestmodrunner or
- kunittestguimodrunner programs to run the tests. The other is to use the
+ to create dynamically loadable modules and use the tdeunittestmodrunner or
+ tdeunittestguimodrunner programs to run the tests. The other is to use the
  libraries to create your own testing application.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
diff --git a/ubuntu/maverick/tdesdk/debian/control.in b/ubuntu/maverick/tdesdk/debian/control.in
index 6aaa2bce3..d791b8ee8 100644
--- a/ubuntu/maverick/tdesdk/debian/control.in
+++ b/ubuntu/maverick/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}), kunittest (>= ${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-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})
 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
@@ -356,7 +356,7 @@ Description: subversion ioslave for KDE
  This package is part of KDE, and a component of the KDE SDK module.
  See the 'kde' and 'tdesdk' packages for more information.
 
-Package: kunittest
+Package: tdeunittest
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
@@ -364,8 +364,8 @@ Suggests: tdelibs4-doc
 Description: unit testing library for KDE
  KUnitTest is a small library that facilitates the writing of tests for
  KDE developers. There are two ways to use the KUnitTest library. One is
- to create dynamically loadable modules and use the kunittestmodrunner or
- kunittestguimodrunner programs to run the tests. The other is to use the
+ to create dynamically loadable modules and use the tdeunittestmodrunner or
+ tdeunittestguimodrunner programs to run the tests. The other is to use the
  libraries to create your own testing application.
  .
  This package is part of KDE, and a component of the KDE SDK module.
diff --git a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.install b/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.install
index ca24935e3..50b9c1fe5 100644
--- a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.install
@@ -18,5 +18,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kbugbuster.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kbugbuster.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbugbuster.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbugbuster.png
-debian/tmp/opt/trinity/share/services/kresources/kcal/bugzilla.desktop
+debian/tmp/opt/trinity/share/services/tderesources/kcal/bugzilla.desktop
 debian/icons/kbugbuster.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdesdk/debian/kunittest-trinity.docs b/ubuntu/maverick/tdesdk/debian/kunittest-trinity.docs
deleted file mode 100644
index 029481923..000000000
--- a/ubuntu/maverick/tdesdk/debian/kunittest-trinity.docs
+++ /dev/null
@@ -1 +0,0 @@
-kunittest/example
diff --git a/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install b/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install
deleted file mode 100644
index bf4cf0b5a..000000000
--- a/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install
+++ /dev/null
@@ -1,7 +0,0 @@
-debian/tmp/opt/trinity/bin/kunittestmod
-debian/tmp/opt/trinity/bin/kunittestguimodrunner
-debian/tmp/opt/trinity/lib/libkunittestgui.la
-debian/tmp/opt/trinity/lib/libkunittestgui.so
-debian/tmp/opt/trinity/lib/libkunittestgui.so.0
-debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0
-debian/tmp/opt/trinity/include/kunittest/runnergui.h
diff --git a/ubuntu/maverick/tdesdk/debian/not-installed.list b/ubuntu/maverick/tdesdk/debian/not-installed.list
index 77ec5e17d..179532c87 100644
--- a/ubuntu/maverick/tdesdk/debian/not-installed.list
+++ b/ubuntu/maverick/tdesdk/debian/not-installed.list
@@ -4,8 +4,8 @@ This is deliberate.
 /usr/share/man/man1/cvscheck.1
  - This manpage is junk, so we don't ship it, and include our own instead.
 
-/usr/bin/kunittest
-/usr/bin/kunittest_debughelper
+/usr/bin/tdeunittest
+/usr/bin/tdeunittest_debughelper
  - These are not useful without the dcopperl bindings which are not built
    in the Debian tdebindings packages.
 
diff --git a/ubuntu/maverick/tdesdk/debian/rules b/ubuntu/maverick/tdesdk/debian/rules
index 36d49b7c7..2e37f4326 100755
--- a/ubuntu/maverick/tdesdk/debian/rules
+++ b/ubuntu/maverick/tdesdk/debian/rules
@@ -32,7 +32,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DWITH_DBSEARCHENGINE="ON" \
  -DWITH_KCAL="ON"
 
-PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity kunittest-trinity libcvsservice0-trinity umbrello-trinity
+PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity tdeunittest-trinity libcvsservice0-trinity umbrello-trinity
 
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
diff --git a/ubuntu/maverick/tdesdk/debian/tdeunittest-trinity.docs b/ubuntu/maverick/tdesdk/debian/tdeunittest-trinity.docs
new file mode 100644
index 000000000..dfb20154e
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/tdeunittest-trinity.docs
@@ -0,0 +1 @@
+tdeunittest/example
diff --git a/ubuntu/maverick/tdesdk/debian/tdeunittest-trinity.install b/ubuntu/maverick/tdesdk/debian/tdeunittest-trinity.install
new file mode 100644
index 000000000..efefebac3
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/tdeunittest-trinity.install
@@ -0,0 +1,7 @@
+debian/tmp/opt/trinity/bin/tdeunittestmod
+debian/tmp/opt/trinity/bin/tdeunittestguimodrunner
+debian/tmp/opt/trinity/lib/libtdeunittestgui.la
+debian/tmp/opt/trinity/lib/libtdeunittestgui.so
+debian/tmp/opt/trinity/lib/libtdeunittestgui.so.0
+debian/tmp/opt/trinity/lib/libtdeunittestgui.so.0.0.0
+debian/tmp/opt/trinity/include/tdeunittest/runnergui.h
diff --git a/ubuntu/maverick/tdeutils/debian/changelog b/ubuntu/maverick/tdeutils/debian/changelog
index b3d3af82b..71992aefe 100644
--- a/ubuntu/maverick/tdeutils/debian/changelog
+++ b/ubuntu/maverick/tdeutils/debian/changelog
@@ -268,7 +268,7 @@ tdeutils (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
     + Fixes kcalc: Alt-H does not select hex. (Closes: #272026)
-    + Fixes kwalletmanager does not appear in kde system tray.
+    + Fixes tdewalletmanager does not appear in kde system tray.
       (Closes: #372258)
     + Fixes kgpg: Kgpg editor crashes on decrypting. (Closes: #372767)
 
@@ -287,7 +287,7 @@ tdeutils (4:3.5.4-1) unstable; urgency=low
   * New upstream release.
 
   * KDE_3_5_BRANCH update (up to r567761).
-    + Fixes kwalletmanager crashes on logout. (Closes: #372564, #377001)
+    + Fixes tdewalletmanager crashes on logout. (Closes: #372564, #377001)
 
   +++ Changes by Christopher Martin:
 
@@ -312,7 +312,7 @@ tdeutils (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
   * kubuntu_12_kmilo_actions.diff updated
-  * Remove kubuntu_13_downgrade_kwallet.diff
+  * Remove kubuntu_13_downgrade_tdewallet.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:05 +0000
 
@@ -325,8 +325,8 @@ tdeutils (4:3.5.4-0ubuntu5) edgy; urgency=low
 
 tdeutils (4:3.5.4-0ubuntu4) edgy; urgency=low
 
-  * Added kubuntu_13_downgrade_kwallet to avoid bug #57696, downgrading
-    kwalletmanager to 3.5.2, This bug has been reported on KDE 2 month
+  * Added kubuntu_13_downgrade_tdewallet to avoid bug #57696, downgrading
+    tdewalletmanager to 3.5.2, This bug has been reported on KDE 2 month
     ago (http://bugs.kde.org/show_bug.cgi?id=129161) and 3.5.4 has been
     released without any correction. 
     Because most apps' authentication system is based on this, the issue
diff --git a/ubuntu/maverick/tdeutils/debian/control b/ubuntu/maverick/tdeutils/debian/control
index 23132b0e0..956b68ea3 100644
--- a/ubuntu/maverick/tdeutils/debian/control
+++ b/ubuntu/maverick/tdeutils/debian/control
@@ -13,7 +13,7 @@ Section: tde
 Architecture: all
 Replaces: kdeutils-trinity (<< 4:14.0.0)
 Breaks: kdeutils-trinity (<< 4:14.0.0)
-Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), kwalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
+Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
 Suggests: tdeutils-trinity-doc-html (>= ${Source-Version})
 Description: general purpose utilities from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -343,11 +343,11 @@ Description: timer utility for Trinity
  This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
-Package: kwalletmanager-trinity
+Package: tdewalletmanager-trinity
 Section: utils
 Architecture: any
-Replaces: kwalletmanager-trinity (<< 4:14.0.0)
-Breaks: kwalletmanager-trinity (<< 4:14.0.0)
+Replaces: tdewalletmanager-trinity (<< 4:14.0.0)
+Breaks: tdewalletmanager-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Description: wallet manager for Trinity
diff --git a/ubuntu/maverick/tdeutils/debian/control.in b/ubuntu/maverick/tdeutils/debian/control.in
index f1d64bd00..f86496f4d 100644
--- a/ubuntu/maverick/tdeutils/debian/control.in
+++ b/ubuntu/maverick/tdeutils/debian/control.in
@@ -11,7 +11,7 @@ Standards-Version: 3.7.2
 Package: tdeutils
 Section: tde
 Architecture: all
-Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), kwalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version})
+Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), tdewalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version})
 Suggests: tdeutils-doc-html (>= ${Source-Version})
 Description: general purpose utilities from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -287,7 +287,7 @@ Description: timer utility for KDE
  This package is part of KDE, as a component of the KDE utilities module.
  See the 'kde' and 'tdeutils' packages for more information.
 
-Package: kwalletmanager
+Package: tdewalletmanager
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
diff --git a/ubuntu/maverick/tdeutils/debian/kwalletmanager-trinity.install b/ubuntu/maverick/tdeutils/debian/kwalletmanager-trinity.install
deleted file mode 100644
index 1ba37d2e3..000000000
--- a/ubuntu/maverick/tdeutils/debian/kwalletmanager-trinity.install
+++ /dev/null
@@ -1,31 +0,0 @@
-debian/tmp/opt/trinity/bin/kwalletmanager
-debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.la
-debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.so
-debian/tmp/opt/trinity/share/applications/tde/kwalletconfig.desktop
-debian/tmp/opt/trinity/share/applications/tde/kwalletmanager.desktop
-debian/tmp/opt/trinity/share/applications/tde/kwalletmanager-kwalletd.desktop
-debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png
-debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png
-debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png
-debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png
-debian/tmp/opt/trinity/share/apps/kwalletmanager/kwalleteditor.rc
-debian/tmp/opt/trinity/share/apps/kwalletmanager/kwalletmanager.rc
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/cr22-action-wallet_closed.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/cr22-action-wallet_open.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit1.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit2.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit3.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/kwalletmanager.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/password1.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/password2.png
-debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kwalletmanager.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kwalletmanager.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kwalletmanager.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kwalletmanager.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kwalletmanager.png
-debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kwalletmanager.png
-debian/tmp/opt/trinity/share/services/kwallet_config.desktop
-debian/tmp/opt/trinity/share/services/kwalletmanager_show.desktop
diff --git a/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1
index 15d1c35d9..d6ba31cf5 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1
+++ b/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1
@@ -204,10 +204,10 @@ shared over more than one screen.
 Specifies the X display to run KDE on.
 .IP KDESYCOCA
 Specifies and alternative path for the 
-.I ksycoca
+.I tdesycoca
 KDE system configuration cache file.
 The default path is
-/tmp/kde-$USER/ksycoca
+/tmp/kde-$USER/tdesycoca
 .IP DCOPSERVER
 Specifies an alternative path for the DCOP server file. The default
 file is
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet
index 6331a925f..d87ba35e0 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet
@@ -1,10 +1,10 @@
-Document: tdeutils-doc-html-kwallet
+Document: tdeutils-doc-html-tdewallet
 Title: KWallet Handbook
 Author: George Staikos, Lauri Watts
 Abstract: The wallet subsytem provides a convenient and secure way to manage all your passwords.
 Section: Tools
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kwallet/index.html
-Files: /usr/share/doc/tde/HTML/en/kwallet/*.html
+Index: /usr/share/doc/tde/HTML/en/tdewallet/index.html
+Files: /usr/share/doc/tde/HTML/en/tdewallet/*.html
 
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install
index 17d66276d..a04353048 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/include/kmultiformlistbox.h
-debian/tmp/opt/trinity/include/kmultiformlistboxentry.h
-debian/tmp/opt/trinity/include/kmultiformlistboxfactory.h
+debian/tmp/opt/trinity/include/tdemultiformlistbox.h
+debian/tmp/opt/trinity/include/tdemultiformlistboxentry.h
+debian/tmp/opt/trinity/include/tdemultiformlistboxfactory.h
 debian/tmp/opt/trinity/include/ksim/chart.h
 debian/tmp/opt/trinity/include/ksim/common.h
 debian/tmp/opt/trinity/include/ksim/ksimconfig.h
diff --git a/ubuntu/maverick/tdeutils/debian/tdewalletmanager-trinity.install b/ubuntu/maverick/tdeutils/debian/tdewalletmanager-trinity.install
new file mode 100644
index 000000000..6e75bf792
--- /dev/null
+++ b/ubuntu/maverick/tdeutils/debian/tdewalletmanager-trinity.install
@@ -0,0 +1,31 @@
+debian/tmp/opt/trinity/bin/tdewalletmanager
+debian/tmp/opt/trinity/lib/trinity/kcm_tdewallet.la
+debian/tmp/opt/trinity/lib/trinity/kcm_tdewallet.so
+debian/tmp/opt/trinity/share/applications/tde/tdewalletconfig.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdewalletmanager.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdewalletmanager-tdewalletd.desktop
+debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png
+debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_open.png
+debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png
+debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png
+debian/tmp/opt/trinity/share/apps/tdewalletmanager/tdewalleteditor.rc
+debian/tmp/opt/trinity/share/apps/tdewalletmanager/tdewalletmanager.rc
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/cr22-action-wallet_closed.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/cr22-action-wallet_open.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/tdewalletmanager.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/password1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/password2.png
+debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdewalletmanager.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdewalletmanager.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdewalletmanager.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdewalletmanager.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdewalletmanager.png
+debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/tdewalletmanager.png
+debian/tmp/opt/trinity/share/services/tdewallet_config.desktop
+debian/tmp/opt/trinity/share/services/tdewalletmanager_show.desktop