37 files changed, 88 insertions, 88 deletions
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 <[email protected]>  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 <[email protected]>  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 <[email protected]>  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