11 files changed, 47 insertions, 47 deletions
diff --git a/ubuntu/maverick_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/maverick_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES
index ab3d75478..bad62816c 100644
--- a/ubuntu/maverick_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/maverick_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES
@@ -20,7 +20,7 @@ install/klipper::
 
 binary-install/kdebase-bin::
 	install -p -D -m644 debian/kcheckpass.pam debian/kdebase-bin/etc/pam.d/kcheckpass
-	install -p -D -m644 debian/kscreensaver.pam debian/kdebase-bin/etc/pam.d/kscreensaver
+	install -p -D -m644 debian/tdescreensaver.pam debian/kdebase-bin/etc/pam.d/tdescreensaver
 	install -p -D -m644 debian/ubuntu.xmodmap debian/kdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap
 	install -p -D -m644 debian/80ubuntu-xmodmap debian/kdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap
 
diff --git a/ubuntu/maverick_automake/kdebase/debian/changelog b/ubuntu/maverick_automake/kdebase/debian/changelog
index 48d83199c..fe73757c3 100644
--- a/ubuntu/maverick_automake/kdebase/debian/changelog
+++ b/ubuntu/maverick_automake/kdebase/debian/changelog
@@ -1,7 +1,7 @@
 kdebase-kde3 (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 @@ kdebase-kde3 (4:3.5.10-2ubuntu2) karmic; urgency=low
 kdebase-kde3 (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 @@ kdebase (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 @@ kdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low
 kdebase (4:3.5.7-1ubuntu23) gutsy; urgency=low
 
   * Fixed kubuntu_52_gtk_qt_engine_config.diff and
-    kubuntu_53_kwallet_config.diff as $kdehome=$HOME/.kde so we should use
+    kubuntu_53_tdewallet_config.diff as $kdehome=$HOME/.kde so we should use
     $kdehome instead of $HOME/$kdehome
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 19 Sep 2007 12:22:46 +0200
@@ -781,7 +781,7 @@ kdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low
 kdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low
 
   * Changed (again) $TDEHOME to $kdehome 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 @@ kdebase (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 $kdehome 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
 
 kdebase (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 @@ kdebase (4:3.5.6-0ubuntu13) feisty; urgency=low
 
 kdebase (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 @@ kdebase (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 @@ kdebase (4:3.5.2-0ubuntu26) dapper; urgency=low
 
 kdebase (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 @@ kdebase (4:3.5.1-0ubuntu13) dapper; urgency=low
 kdebase (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 @@ kdebase (4:3.5.0-0ubuntu16) dapper; urgency=low
 
 kdebase (4:3.5.0-0ubuntu15) dapper; urgency=low
 
-  * kcontrol replaces old kdebase-bin for kcm_kdnssd.desktop
+  * kcontrol replaces old kdebase-bin for kcm_tdednssd.desktop
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 17 Jan 2006 15:20:42 +0000
 
@@ -2550,7 +2550,7 @@ kdebase (4:3.5.0-0ubuntu10) dapper; urgency=low
 kdebase (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 @@ kdebase (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_automake/kdebase/debian/control b/ubuntu/maverick_automake/kdebase/debian/control
index dfae80fa1..9705d7db1 100644
--- a/ubuntu/maverick_automake/kdebase/debian/control
+++ b/ubuntu/maverick_automake/kdebase/debian/control
@@ -106,7 +106,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
 Suggests: khelpcenter-kde3, gdb
 Conflicts: kdebase-libs-kde3 (<< 4:3.0.0), tdm-kde3 (<< 4:3.4.1-2), kdebase-workspace-data-kde3 (<< 7:3.5.0)
-Replaces: kcontrol-kde3 (<< 4:3.3.0), kdebase-kde3 (<< 4:3.0.0), kdebase-kde3-doc (<< 4:3.0.0), kdebase-libs-kde3 (<< 4:3.0.0), kscreensaver-kde3 (<< 4:3.0.0), tdm-kde3 (= 4:3.3.2-1b)
+Replaces: kcontrol-kde3 (<< 4:3.3.0), kdebase-kde3 (<< 4:3.0.0), kdebase-kde3-doc (<< 4:3.0.0), kdebase-libs-kde3 (<< 4:3.0.0), tdescreensaver-kde3 (<< 4:3.0.0), tdm-kde3 (= 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_automake/kdebase/debian/control.in b/ubuntu/maverick_automake/kdebase/debian/control.in
index 61d7197f8..8566b8000 100644
--- a/ubuntu/maverick_automake/kdebase/debian/control.in
+++ b/ubuntu/maverick_automake/kdebase/debian/control.in
@@ -98,7 +98,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
 Suggests: khelpcenter, gdb
 Conflicts: kdebase-libs (<< 4:3.0.0), tdm (<< 4:3.4.1-2)
-Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b)
+Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-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_automake/kdebase/debian/kcontrol-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install
index cb7900105..6e080d0ee 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install
@@ -6,7 +6,7 @@ debian/tmp/opt/kde3/bin/kfontinst
 debian/tmp/opt/kde3/bin/kfontview
 debian/tmp/opt/kde3/bin/kinfocenter
 debian/tmp/opt/kde3/bin/klocaldomainurifilterhelper
-debian/tmp/opt/kde3/bin/krandrtray
+debian/tmp/opt/kde3/bin/tderandrtray
 debian/tmp/opt/kde3/bin/krdb
 debian/tmp/opt/kde3/lib/kde3/fontthumbnail.la
 debian/tmp/opt/kde3/lib/kde3/fontthumbnail.so
@@ -54,8 +54,8 @@ debian/tmp/opt/kde3/lib/kde3/kcm_kded.la
 debian/tmp/opt/kde3/lib/kde3/kcm_kded.so
 debian/tmp/opt/kde3/lib/kde3/kcm_tdm.la
 debian/tmp/opt/kde3/lib/kde3/kcm_tdm.so
-debian/tmp/opt/kde3/lib/kde3/kcm_kdnssd.so
-debian/tmp/opt/kde3/lib/kde3/kcm_kdnssd.la
+debian/tmp/opt/kde3/lib/kde3/kcm_tdednssd.so
+debian/tmp/opt/kde3/lib/kde3/kcm_tdednssd.la
 debian/tmp/opt/kde3/lib/kde3/kcm_keys.la
 debian/tmp/opt/kde3/lib/kde3/kcm_keys.so
 debian/tmp/opt/kde3/lib/kde3/kcm_kicker.la
@@ -152,7 +152,7 @@ debian/tmp/opt/kde3/share/applications/kde/interrupts.desktop
 debian/tmp/opt/kde3/share/applications/kde/ioports.desktop
 debian/tmp/opt/kde3/share/applications/kde/ioslaveinfo.desktop
 debian/tmp/opt/kde3/share/applications/kde/joystick.desktop
-debian/tmp/opt/kde3/share/applications/kde/kcm_kdnssd.desktop
+debian/tmp/opt/kde3/share/applications/kde/kcm_tdednssd.desktop
 debian/tmp/opt/kde3/share/applications/kde/kcmaccess.desktop
 debian/tmp/opt/kde3/share/applications/kde/kcmcss.desktop
 debian/tmp/opt/kde3/share/applications/kde/kcmfontinst.desktop
@@ -168,11 +168,11 @@ debian/tmp/opt/kde3/share/applications/kde/KControl.desktop
 debian/tmp/opt/kde3/share/applications/kde/tdm.desktop
 debian/tmp/opt/kde3/share/applications/kde/keys.desktop
 debian/tmp/opt/kde3/share/applications/kde/kfontview.desktop
-debian/tmp/opt/kde3/share/applications/kde/khtml_behavior.desktop
-debian/tmp/opt/kde3/share/applications/kde/khtml_fonts.desktop
-debian/tmp/opt/kde3/share/applications/kde/khtml_java_js.desktop
-debian/tmp/opt/kde3/share/applications/kde/krandrtray.desktop
-debian/tmp/opt/kde3/share/autostart/krandrtray-autostart.desktop
+debian/tmp/opt/kde3/share/applications/kde/tdehtml_behavior.desktop
+debian/tmp/opt/kde3/share/applications/kde/tdehtml_fonts.desktop
+debian/tmp/opt/kde3/share/applications/kde/tdehtml_java_js.desktop
+debian/tmp/opt/kde3/share/applications/kde/tderandrtray.desktop
+debian/tmp/opt/kde3/share/autostart/tderandrtray-autostart.desktop
 debian/tmp/opt/kde3/share/applications/kde/kthememanager.desktop
 debian/tmp/opt/kde3/share/applications/kde/iccconfig.desktop
 debian/tmp/opt/kde3/share/applications/kde/lanbrowser.desktop
@@ -212,7 +212,7 @@ debian/tmp/opt/kde3/share/applnk/Settings/LookNFeel/kcmtaskbar.desktop
 debian/tmp/opt/kde3/share/applnk/Settings/LookNFeel/panel_appearance.desktop
 debian/tmp/opt/kde3/share/applnk/Settings/LookNFeel/panel.desktop
 debian/tmp/opt/kde3/share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop
-debian/tmp/opt/kde3/share/applnk/Settings/WebBrowsing/khtml_appearance.desktop
+debian/tmp/opt/kde3/share/applnk/Settings/WebBrowsing/tdehtml_appearance.desktop
 debian/tmp/opt/kde3/share/applnk/Settings/WebBrowsing/nsplugin.desktop
 debian/tmp/opt/kde3/share/applnk/Settings/WebBrowsing/smb.desktop
 debian/tmp/opt/kde3/share/apps/kcm_componentchooser/kcm_browser.desktop
diff --git a/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.lintian b/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.lintian
index 3c7f407c6..f8b102033 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.lintian
+++ b/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.lintian
@@ -1,3 +1,3 @@
 kcontrol: shlib-missing-in-control-file libkdeinit_kaccess.so usr/lib/libkdeinit_kaccess.so
 kcontrol: shlib-missing-in-control-file libkdeinit_kcontrol.so usr/lib/libkdeinit_kcontrol.so
-kcontrol: shlib-missing-in-control-file libkdeinit_krandrinithack.so usr/lib/libkdeinit_krandrinithack.so
+kcontrol: shlib-missing-in-control-file libkdeinit_tderandrinithack.so usr/lib/libkdeinit_tderandrinithack.so
diff --git a/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install
index d6dc0841f..1fca22e59 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install
@@ -211,10 +211,10 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keyboard/index.docbook
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keys/common
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keys/index.cache.bz2
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keys/index.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/khtml/common
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/khtml/index.cache.bz2
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/khtml/index.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/khtml/nsplugin.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdehtml/common
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdehtml/index.cache.bz2
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdehtml/index.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdehtml/nsplugin.docbook
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kwindecoration/common
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kwindecoration/index.cache.bz2
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kwindecoration/index.docbook
@@ -345,7 +345,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kcontrol.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/tdmconfig.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/key_bindings.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kfm_home.png
-debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kscreensaver.png
+debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/tdescreensaver.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kthememgr.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/licq.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/linuxconf.png
@@ -449,7 +449,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/keyboard_layout.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/keyboard.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kfm_home.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/knotify.png
-debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kscreensaver.png
+debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/tdescreensaver.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kthememgr.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kvirc.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/licq.png
@@ -551,7 +551,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kcmx.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/tdmconfig.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/key_bindings.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/keyboard.png
-debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kscreensaver.png
+debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/tdescreensaver.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kthememgr.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kvirc.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/locale.png
@@ -636,7 +636,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/keyboard_layout.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/keyboard.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kfm_home.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/knotify.png
-debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kscreensaver.png
+debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/tdescreensaver.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kthememgr.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kvirc.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/licq.png
@@ -780,7 +780,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/keyboard_layout.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/keyboard.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kfm_home.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/knotify.png
-debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kscreensaver.png
+debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/tdescreensaver.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kthememgr.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kvirc.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/licq.png
@@ -876,7 +876,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/tdmconfig.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/key_bindings.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kfm_home.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/knotify.png
-debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kscreensaver.png
+debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/tdescreensaver.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kthememgr.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kvirc.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/licq.png
diff --git a/ubuntu/maverick_automake/kdebase/debian/konqueror-kde3.install b/ubuntu/maverick_automake/kdebase/debian/konqueror-kde3.install
index 6e81691f0..815c0fb8d 100644
--- a/ubuntu/maverick_automake/kdebase/debian/konqueror-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/konqueror-kde3.install
@@ -35,8 +35,8 @@ debian/tmp/opt/kde3/lib/kde3/konqsidebar_web.la
 debian/tmp/opt/kde3/lib/kde3/konqsidebar_web.so
 debian/tmp/opt/kde3/lib/kde3/konqueror.la
 debian/tmp/opt/kde3/lib/kde3/konqueror.so
-debian/tmp/opt/kde3/lib/kde3/libkhtmlkttsdplugin.la
-debian/tmp/opt/kde3/lib/kde3/libkhtmlkttsdplugin.so
+debian/tmp/opt/kde3/lib/kde3/libtdehtmlkttsdplugin.la
+debian/tmp/opt/kde3/lib/kde3/libtdehtmlkttsdplugin.so
 debian/tmp/opt/kde3/lib/libkdeinit_keditbookmarks.so
 debian/tmp/opt/kde3/lib/libkdeinit_kfmclient.so
 debian/tmp/opt/kde3/lib/libkdeinit_konqueror.so
@@ -48,7 +48,7 @@ debian/tmp/opt/kde3/share/applications/kde/kfmclient.desktop
 debian/tmp/opt/kde3/share/applications/kde/kfmclient_dir.desktop
 debian/tmp/opt/kde3/share/applications/kde/kfmclient_html.desktop
 debian/tmp/opt/kde3/share/applications/kde/kfmclient_war.desktop
-debian/tmp/opt/kde3/share/applications/kde/khtml_filter.desktop
+debian/tmp/opt/kde3/share/applications/kde/tdehtml_filter.desktop
 debian/tmp/opt/kde3/share/applications/kde/konqbrowser.desktop
 debian/tmp/opt/kde3/share/applications/kde/konquerorsu.desktop
 debian/tmp/opt/kde3/share/applnk/.hidden/konqfilemgr.desktop
@@ -60,8 +60,8 @@ debian/tmp/opt/kde3/share/apps/kconf_update/konqsidebartng.upd
 debian/tmp/opt/kde3/share/apps/kconf_update/move_konqsidebartng_entries.sh
 debian/tmp/opt/kde3/share/apps/keditbookmarks/keditbookmarks-genui.rc
 debian/tmp/opt/kde3/share/apps/keditbookmarks/keditbookmarksui.rc
-debian/tmp/opt/kde3/share/apps/khtml/kpartplugins/khtmlkttsd.desktop
-debian/tmp/opt/kde3/share/apps/khtml/kpartplugins/khtmlkttsd.rc
+debian/tmp/opt/kde3/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.desktop
+debian/tmp/opt/kde3/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.rc
 debian/tmp/opt/kde3/share/apps/konqiconview/konq_iconview.rc
 debian/tmp/opt/kde3/share/apps/konqiconview/konq_multicolumnview.rc
 debian/tmp/opt/kde3/share/apps/konqiconview/kpartplugins/kremoteencodingplugin.desktop
diff --git a/ubuntu/maverick_automake/kdebase/debian/konqueror-nsplugins-kde3.install b/ubuntu/maverick_automake/kdebase/debian/konqueror-nsplugins-kde3.install
index 5da82a048..0dd136ca8 100644
--- a/ubuntu/maverick_automake/kdebase/debian/konqueror-nsplugins-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/konqueror-nsplugins-kde3.install
@@ -4,5 +4,5 @@ debian/tmp/opt/kde3/lib/kde3/kcm_nsplugins.la
 debian/tmp/opt/kde3/lib/kde3/kcm_nsplugins.so
 debian/tmp/opt/kde3/lib/kde3/libnsplugin.la
 debian/tmp/opt/kde3/lib/kde3/libnsplugin.so
-debian/tmp/opt/kde3/share/applications/kde/khtml_plugins.desktop
+debian/tmp/opt/kde3/share/applications/kde/tdehtml_plugins.desktop
 debian/tmp/opt/kde3/share/apps/plugin/nspluginpart.rc
diff --git a/ubuntu/maverick_automake/kdebase/debian/rules b/ubuntu/maverick_automake/kdebase/debian/rules
index 6a3938cba..814abbacf 100755
--- a/ubuntu/maverick_automake/kdebase/debian/rules
+++ b/ubuntu/maverick_automake/kdebase/debian/rules
@@ -17,7 +17,7 @@ DEB_KDE_APIDOX := yes
 CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
 
 DEB_CONFIGURE_EXTRA_FLAGS := --with-shadow --without-java --with-pam=kde-kde3 --prefix=/opt/kde3 \
-	--with-kcp-pam=kcheckpass-kde3 --with-tdm-pam=tdm-kde3 --with-kss-pam=kscreensaver-kde3 --with-extra-libs=/opt/kde3/lib \
+	--with-kcp-pam=kcheckpass-kde3 --with-tdm-pam=tdm-kde3 --with-kss-pam=tdescreensaver-kde3 --with-extra-libs=/opt/kde3/lib \
 	--with-extra-includes=/usr/include/sasl --with-usbids=/usr/share/misc/usb.ids --with-sudo-kdesu-backend \
 	--enable-closure
 
@@ -254,7 +254,7 @@ binary-install/klipper-kde3::
 
 binary-install/kdebase-kde3-bin::
 	install -p -D -m644 debian/kcheckpass-kde3.pam debian/kdebase-kde3-bin/etc/pam.d/kcheckpass-kde3
-	install -p -D -m644 debian/kscreensaver-kde3.pam debian/kdebase-kde3-bin/etc/pam.d/kscreensaver-kde3
+	install -p -D -m644 debian/tdescreensaver-kde3.pam debian/kdebase-kde3-bin/etc/pam.d/tdescreensaver-kde3
 	mkdir -p debian/kdebase-kde3-bin/opt/kde3/share/apps/kxkb/
 	install -p -D -m644 debian/ubuntu.xmodmap debian/kdebase-kde3-bin/opt/kde3/share/apps/kxkb/system.xmodmap
 	install -p -D -m644 debian/80ubuntu-xmodmap debian/kdebase-kde3-bin/etc/X11/Xsession.d/80ubuntu-kde3-xmodmap
diff --git a/ubuntu/maverick_automake/kdebase/debian/kscreensaver-kde3.pam b/ubuntu/maverick_automake/kdebase/debian/tdescreensaver-kde3.pam
index 088a00503..9a2c74519 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kscreensaver-kde3.pam
+++ b/ubuntu/maverick_automake/kdebase/debian/tdescreensaver-kde3.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