Fix remaining instances of KDE3 in the Debian and Ubuntu packaging

157 files changed, 742 insertions, 743 deletions

diff --git a/debian/squeeze/applications/abakus/debian/changelog b/debian/squeeze/applications/abakus/debian/changelog
index 0a83274eb..53aea7442 100644
--- a/debian/squeeze/applications/abakus/debian/changelog
+++ b/debian/squeeze/applications/abakus/debian/changelog
@@ -6,7 +6,7 @@ abakus-trinity (0.91-0ubuntu3) karmic; urgency=low
 
 abakus-trinity (0.91-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 23:58:00 -0600
diff --git a/debian/squeeze/applications/adept/debian/changelog b/debian/squeeze/applications/adept/debian/changelog
index b4f4234f3..58496db32 100644
--- a/debian/squeeze/applications/adept/debian/changelog
+++ b/debian/squeeze/applications/adept/debian/changelog
@@ -18,7 +18,7 @@ adept-trinity (2.1.3ubuntu11) karmic; urgency=low
 
 adept-trinity (2.1.3ubuntu10) jaunty; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 04 March 2009 01:08:00 -0600
diff --git a/debian/squeeze/applications/adept/debian/control b/debian/squeeze/applications/adept/debian/control
index 407da25d0..64cc6d154 100644
--- a/debian/squeeze/applications/adept/debian/control
+++ b/debian/squeeze/applications/adept/debian/control
@@ -11,7 +11,7 @@ Package: adept-trinity
 Section: kde
 Depends: adept-manager-trinity, adept-installer-trinity, adept-updater-trinity, adept-notifier-trinity, adept-batch-trinity
 Architecture: all
-Description: package management suite for KDE3
+Description: package management suite for Trinity
  These packages belong to the adept suite:
   * adept-manager-trinity - package manager
   * adept-installer-trinity - application manager
@@ -22,7 +22,7 @@ Package: adept-common-trinity
 Section: kde
 Depends: debtags (>= 1.6.1), konsole-trinity (>= 3.5.0), ${shlibs:Depends}
 Architecture: all
-Description: package manager for KDE3 -- common files
+Description: package manager for Trinity -- common files
  Icons and other common files for all adept components.
 
 Package: adept-manager-trinity
@@ -30,7 +30,7 @@ Section: kde
 Depends: adept-common-trinity, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: package manager for KDE3
+Description: package manager for Trinity
  Adept Manager is a graphical user interface for package management.
  .
  Besides these basic functions the following features are provided:
@@ -47,7 +47,7 @@ Section: kde
 Depends: adept-common-trinity, app-install-data, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: simple user interface for application management (for KDE3)
+Description: simple user interface for application management (for Trinity)
  Adept Installer presents a list of applications available through the
  Advanced Package Tool (APT). An application is considered a package
  that contains a .desktop file for use with KDE, GNOME or other
@@ -61,7 +61,7 @@ Section: kde
 Depends: adept-common-trinity, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: system update tool for KDE3
+Description: system update tool for Trinity
  Adept Updater provides a simple wizard-style user interface to system
  upgrades. It uses same algorithms as apt-get dist-upgrade.
  .
diff --git a/debian/squeeze/applications/adept/debian/control.in b/debian/squeeze/applications/adept/debian/control.in
index df390b4e6..2c9a1ea70 100644
--- a/debian/squeeze/applications/adept/debian/control.in
+++ b/debian/squeeze/applications/adept/debian/control.in
@@ -11,7 +11,7 @@ Package: adept-trinity
 Section: kde
 Depends: adept-manager-trinity, adept-installer-trinity, adept-updater-trinity, adept-notifier-trinity, adept-batch-trinity
 Architecture: all
-Description: package management suite for KDE3
+Description: package management suite for Trinity
  These packages belong to the adept suite:
   * adept-manager-trinity - package manager
   * adept-installer-trinity - application manager
@@ -22,7 +22,7 @@ Package: adept-common-trinity
 Section: kde
 Depends: debtags (>= 1.6.1), konsole-trinity (>= 3.5.0), ${shlibs:Depends}
 Architecture: all
-Description: package manager for KDE3 -- common files
+Description: package manager for Trinity -- common files
  Icons and other common files for all adept components.
 
 Package: adept-manager-trinity
@@ -30,7 +30,7 @@ Section: kde
 Depends: adept-common-trinity, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: package manager for KDE3
+Description: package manager for Trinity
  Adept Manager is a graphical user interface for package management.
  .
  Besides these basic functions the following features are provided:
@@ -47,7 +47,7 @@ Section: kde
 Depends: adept-common-trinity, app-install-data, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: simple user interface for application management (for KDE3)
+Description: simple user interface for application management (for Trinity)
  Adept Installer presents a list of applications available through the
  Advanced Package Tool (APT). An application is considered a package
  that contains a .desktop file for use with KDE, GNOME or other
@@ -61,7 +61,7 @@ Section: kde
 Depends: adept-common-trinity, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: system update tool for KDE3
+Description: system update tool for Trinity
  Adept Updater provides a simple wizard-style user interface to system
  upgrades. It uses same algorithms as apt-get dist-upgrade.
  .
diff --git a/debian/squeeze/applications/amarok.cmake/debian/changelog b/debian/squeeze/applications/amarok.cmake/debian/changelog
index 7dc833d40..43671ac52 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/changelog
+++ b/debian/squeeze/applications/amarok.cmake/debian/changelog
@@ -12,7 +12,7 @@ amarok-trinity (2:1.4.10-0ubuntu5) jaunty; urgency=low
 
 amarok-trinity (2:1.4.10-0ubuntu4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 20:08:00 -0600
diff --git a/debian/squeeze/applications/amarok.cmake/debian/control b/debian/squeeze/applications/amarok.cmake/debian/control
index 7aa58f6d7..3f9f0a8d2 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/control
+++ b/debian/squeeze/applications/amarok.cmake/debian/control
@@ -21,7 +21,7 @@ Architecture: any
 Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
  python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins
-Description: versatile and easy to use audio player for KDE3
+Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
  .
diff --git a/debian/squeeze/applications/amarok.cmake/debian/control.in b/debian/squeeze/applications/amarok.cmake/debian/control.in
index 314cdab75..d57046d4c 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/control.in
+++ b/debian/squeeze/applications/amarok.cmake/debian/control.in
@@ -20,7 +20,7 @@ Architecture: any
 Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
  python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins
-Description: versatile and easy to use audio player for KDE3
+Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
  .
diff --git a/debian/squeeze/applications/amarok/debian/changelog b/debian/squeeze/applications/amarok/debian/changelog
index 7dc833d40..43671ac52 100644
--- a/debian/squeeze/applications/amarok/debian/changelog
+++ b/debian/squeeze/applications/amarok/debian/changelog
@@ -12,7 +12,7 @@ amarok-trinity (2:1.4.10-0ubuntu5) jaunty; urgency=low
 
 amarok-trinity (2:1.4.10-0ubuntu4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 20:08:00 -0600
diff --git a/debian/squeeze/applications/amarok/debian/control b/debian/squeeze/applications/amarok/debian/control
index a0c2c0ebf..dbb0f8232 100644
--- a/debian/squeeze/applications/amarok/debian/control
+++ b/debian/squeeze/applications/amarok/debian/control
@@ -21,7 +21,7 @@ Architecture: any
 Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
  python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins
-Description: versatile and easy to use audio player for KDE3
+Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
  .
diff --git a/debian/squeeze/applications/amarok/debian/control.in b/debian/squeeze/applications/amarok/debian/control.in
index 314cdab75..d57046d4c 100644
--- a/debian/squeeze/applications/amarok/debian/control.in
+++ b/debian/squeeze/applications/amarok/debian/control.in
@@ -20,7 +20,7 @@ Architecture: any
 Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
  python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins
-Description: versatile and easy to use audio player for KDE3
+Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
  .
diff --git a/debian/squeeze/applications/basket/debian/changelog b/debian/squeeze/applications/basket/debian/changelog
index 104f10865..e50268cd0 100644
--- a/debian/squeeze/applications/basket/debian/changelog
+++ b/debian/squeeze/applications/basket/debian/changelog
@@ -6,7 +6,7 @@ basket-trinity (1.0.2-0ubuntu4) karmic; urgency=low
 
 basket-trinity (1.0.2-0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 04 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/bibletime/debian/changelog b/debian/squeeze/applications/bibletime/debian/changelog
index 1271734ad..8ee32cf7c 100644
--- a/debian/squeeze/applications/bibletime/debian/changelog
+++ b/debian/squeeze/applications/bibletime/debian/changelog
@@ -92,7 +92,7 @@ bibletime (1.4.1-1) unstable; urgency=low
 
   * New upstream version
   * Exclude docbook from dh_compress, Closes: #220891
-  * Hebrew displays RTL with KDE3 so closing old bug, Closes: #158456
+  * Hebrew displays RTL with Trinity so closing old bug, Closes: #158456
   * Tried search dialog and it works fine now so, Closes: #145965
 
  -- Daniel Glassey <wdg@debian.org>  Thu, 29 Jan 2004 22:10:38 +0000
diff --git a/debian/squeeze/applications/bibletime/debian/control b/debian/squeeze/applications/bibletime/debian/control
index 304f5597f..594a28798 100644
--- a/debian/squeeze/applications/bibletime/debian/control
+++ b/debian/squeeze/applications/bibletime/debian/control
@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}
 Recommends: sword-text, sword-dict, sword-comm
 Suggests: bibletime-i18n-trinity
 Provides: sword-frontend
-Description: A bible study tool for KDE3
+Description: A bible study tool for Trinity
  BibleTime is a free and easy to use bible study tool for UNIX systems.
  It requires a working KDE environment and the SWORD library.
  BibleTime provides easy handling of digitized texts (Bibles, commentaries
diff --git a/debian/squeeze/applications/bibletime/debian/control.in b/debian/squeeze/applications/bibletime/debian/control.in
index 6d24a8f74..d1bcaa676 100644
--- a/debian/squeeze/applications/bibletime/debian/control.in
+++ b/debian/squeeze/applications/bibletime/debian/control.in
@@ -13,7 +13,7 @@ Depends: ${shlibs:Depends}
 Recommends: sword-text, sword-dict, sword-comm
 Suggests: bibletime-i18n-trinity
 Provides: sword-frontend
-Description: A bible study tool for KDE3
+Description: A bible study tool for Trinity
  BibleTime is a free and easy to use bible study tool for UNIX systems.
  It requires a working KDE environment and the SWORD library.
  BibleTime provides easy handling of digitized texts (Bibles, commentaries
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/changelog b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/changelog
index 5e1360642..3483239b4 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/changelog
+++ b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/changelog
@@ -12,7 +12,7 @@ compizconfig-backend-kconfig-trinity (0.7.4-0ubuntu5) karmic; urgency=low
 
 compizconfig-backend-kconfig-trinity (0.7.4-0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/control b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/control
index f80c35624..33a99eec5 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/control
+++ b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/control
@@ -15,5 +15,5 @@ Description: KConfig [Trinity] Settings library for plugins - OpenCompositing Pr
  through plugins and themes contributed by the community giving a
  rich desktop experience.
  .
- This package contains the KConfig (KDE3) settings backend for
+ This package contains the KConfig (Trinity) settings backend for
  libcompizconfig.
diff --git a/debian/squeeze/applications/desktop-effects-kde/debian/changelog b/debian/squeeze/applications/desktop-effects-kde/debian/changelog
index 463c72470..6ec99959d 100644
--- a/debian/squeeze/applications/desktop-effects-kde/debian/changelog
+++ b/debian/squeeze/applications/desktop-effects-kde/debian/changelog
@@ -6,7 +6,7 @@ desktop-effects-kde-trinity (0.4-7.4) karmic; urgency=low
 
 desktop-effects-kde-trinity (0.4-5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/desktop-effects-kde/debian/control b/debian/squeeze/applications/desktop-effects-kde/debian/control
index 5893f6684..80486a941 100644
--- a/debian/squeeze/applications/desktop-effects-kde/debian/control
+++ b/debian/squeeze/applications/desktop-effects-kde/debian/control
@@ -10,6 +10,6 @@ Package: desktop-effects-kde-trinity
 Architecture: all
 Depends: ${python:Depends}, python-qt4
 XB-Python-Version: ${python:Versions}
-Description: compiz setup tool for KDE3
- A simple Compiz configuration tool for KDE3.  Installs and sets Compiz
+Description: compiz setup tool for Trinity
+ A simple Compiz configuration tool for Trinity.  Installs and sets Compiz
  as the window manager.
diff --git a/debian/squeeze/applications/digikam/debian/changelog b/debian/squeeze/applications/digikam/debian/changelog
index 5e2c1f1e7..89c1b4e52 100644
--- a/debian/squeeze/applications/digikam/debian/changelog
+++ b/debian/squeeze/applications/digikam/debian/changelog
@@ -6,7 +6,7 @@ digikam-trinity (2:0.9.6-1ubuntu5) karmic; urgency=low
 
 digikam-trinity (2:0.9.4-1ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 04 March 2009 01:11:00 -0600
@@ -26,7 +26,7 @@ digikam (2:0.9.4-1ubuntu1) intrepid; urgency=low
 digikam (2:0.9.4-1) unstable; urgency=low
 
   * New upstream release
-    - digiKam 0.9.4 Release Plan (KDE3) ~ 13 July 08 (Closes: #490144)
+    - digiKam 0.9.4 Release Plan (Trinity) ~ 13 July 08 (Closes: #490144)
   * DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3
   * Debhelper compatibility level V7
   * Install pixmaps in debian/*.install
diff --git a/debian/squeeze/applications/dolphin/debian/changelog b/debian/squeeze/applications/dolphin/debian/changelog
index 7d1be436f..0c80abc8d 100644
--- a/debian/squeeze/applications/dolphin/debian/changelog
+++ b/debian/squeeze/applications/dolphin/debian/changelog
@@ -6,7 +6,7 @@ dolphin-trinity (0.9.2-1ubuntu0) karmic; urgency=low
 
 dolphin-trinity (0.9.2-0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 04 March 2009 08:18:00 -0600
diff --git a/debian/squeeze/applications/filelight-l10n/debian/changelog b/debian/squeeze/applications/filelight-l10n/debian/changelog
index c94aa81fb..1c4c5eee8 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/changelog
+++ b/debian/squeeze/applications/filelight-l10n/debian/changelog
@@ -6,7 +6,7 @@ filelight-l10n-trinity (1.0-4) karmic; urgency=low
 
 filelight-l10n-trinity (1.0-3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/filelight/debian/changelog b/debian/squeeze/applications/filelight/debian/changelog
index 25f4ec9f9..57ef19426 100644
--- a/debian/squeeze/applications/filelight/debian/changelog
+++ b/debian/squeeze/applications/filelight/debian/changelog
@@ -6,7 +6,7 @@ filelight-trinity (1.0-2ubuntu5) karmic; urgency=low
 
 filelight-trinity (1.0-2ubuntu4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 04 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/changelog b/debian/squeeze/applications/gtk-qt-engine/debian/changelog
index e93ade127..7bbe149b1 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/changelog
+++ b/debian/squeeze/applications/gtk-qt-engine/debian/changelog
@@ -6,7 +6,7 @@ gtk-qt-engine-trinity (1:0.8-1ubuntu3) karmic; urgency=low
 
 gtk-qt-engine-trinity (1:0.8-1ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 01 March 2009 23:14:00 -0600
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/control b/debian/squeeze/applications/gtk-qt-engine/debian/control
index 57cc7fd8f..5d4629ded 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/control
+++ b/debian/squeeze/applications/gtk-qt-engine/debian/control
@@ -10,11 +10,11 @@ Package: gtk-qt-engine-trinity
 Architecture: any
 Provides: gtk2-engines-gtk-qt-trinity
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: theme engine using Qt for GTK+ 2.x and KDE3
+Description: theme engine using Qt for GTK+ 2.x and Trinity
  The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine
  that calls Qt to do the actual drawing. This makes your GTK 2 applications
  look almost like real Qt applications and gives you a more unified desktop
  experience.
  .
- Please note that this package is targeted at KDE3 users and therefore provides
+ Please note that this package is targeted at Trinity users and therefore provides
  a way to configure it from within KControl.
diff --git a/debian/squeeze/applications/gwenview/debian/changelog b/debian/squeeze/applications/gwenview/debian/changelog
index 64d43936a..fde66b4ad 100644
--- a/debian/squeeze/applications/gwenview/debian/changelog
+++ b/debian/squeeze/applications/gwenview/debian/changelog
@@ -12,7 +12,7 @@ gwenview-trinity (4:1.4.2-6) jaunty; urgency=low
 
 gwenview-trinity (4:1.4.2-5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
@@ -279,7 +279,7 @@ gwenview (0.14.3-1) unstable; urgency=low
 gwenview (0.14.1-1) unstable; urgency=low
 
   * New upstream release
-  * first KDE3
+  * first Trinity
 
  -- Michael Spanier <mail@michael-spanier.de>  Wed, 19 Jun 2002 16:06:22 +0200
 
diff --git a/debian/squeeze/applications/k3b/debian/changelog b/debian/squeeze/applications/k3b/debian/changelog
index 46bd8c12e..37b58f616 100644
--- a/debian/squeeze/applications/k3b/debian/changelog
+++ b/debian/squeeze/applications/k3b/debian/changelog
@@ -6,7 +6,7 @@ k3b-trinity (1.0.5-4ubuntu2) karmic; urgency=low
 
 k3b-trinity (1.0.5-4ubuntu0) jaunty; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 16 June 2009 11:18:00 -0600
diff --git a/debian/squeeze/applications/k9copy/debian/control b/debian/squeeze/applications/k9copy/debian/control
index 4f7fbd18e..ef2576f9a 100644
--- a/debian/squeeze/applications/k9copy/debian/control
+++ b/debian/squeeze/applications/k9copy/debian/control
@@ -10,8 +10,8 @@ Homepage: http://k9copy.sourceforge.net/
 Package: k9copy-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, vamps, dvd+rw-tools, dvdauthor, mencoder, libdvdnav4
-Description: DVD backup tool for KDE3
+Description: DVD backup tool for Trinity
  k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
  to a DVD5, in the same way than DVDShrink for Microsoft Windows (R).
- This is the KDE3 version
+ This is the Trinity version
 
diff --git a/debian/squeeze/applications/kaffeine/debian/changelog b/debian/squeeze/applications/kaffeine/debian/changelog
index c2c2946e3..856250282 100644
--- a/debian/squeeze/applications/kaffeine/debian/changelog
+++ b/debian/squeeze/applications/kaffeine/debian/changelog
@@ -6,7 +6,7 @@ kaffeine-trinity (0.8.6-0ubuntu6) karmic; urgency=low
 
 kaffeine-trinity (0.8.6-0ubuntu5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 04 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/katapult/debian/changelog b/debian/squeeze/applications/katapult/debian/changelog
index bec1d29b8..cd8c2efb9 100644
--- a/debian/squeeze/applications/katapult/debian/changelog
+++ b/debian/squeeze/applications/katapult/debian/changelog
@@ -6,7 +6,7 @@ katapult-trinity (0.3.2.1~0ubuntu3) karmic; urgency=low
 
 katapult-trinity (0.3.2.1~0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/kbarcode/debian/changelog b/debian/squeeze/applications/kbarcode/debian/changelog
index 56f59d33d..1171bbbb6 100644
--- a/debian/squeeze/applications/kbarcode/debian/changelog
+++ b/debian/squeeze/applications/kbarcode/debian/changelog
@@ -6,7 +6,7 @@ kbarcode-trinity (2.0.6-0ubuntu3) karmic; urgency=low
 
 kbarcode-trinity (2.0.6-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 04 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/kbarcode/debian/control b/debian/squeeze/applications/kbarcode/debian/control
index 56e2ba19d..925429b87 100644
--- a/debian/squeeze/applications/kbarcode/debian/control
+++ b/debian/squeeze/applications/kbarcode/debian/control
@@ -11,8 +11,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, barcode, imagemagick
 Recommends: libqt3-mt-mysql | libqt3-mt-psql | libqt3-mt-odbc | libqt3-mt-sqlite |
  libqt3-mt-ibase
-Description: barcode and label printing application for KDE3
- KBarcode is a barcode and label printing application for KDE3. It can be used
+Description: barcode and label printing application for Trinity
+ KBarcode is a barcode and label printing application for Trinity. It can be used
  to print everything from simple business cards up to complex labels with
  several barcodes (e.g. article descriptions).
  .
diff --git a/debian/squeeze/applications/kchmviewer/debian/control b/debian/squeeze/applications/kchmviewer/debian/control
index 7d4846479..933c2f9d7 100644
--- a/debian/squeeze/applications/kchmviewer/debian/control
+++ b/debian/squeeze/applications/kchmviewer/debian/control
@@ -11,11 +11,11 @@ Package: kchmviewer-trinity
 Architecture: any
 Conflicts: kchmviewer-nokde-trinity
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: CHM viewer for KDE3
+Description: CHM viewer for Trinity
  KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
  Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget
  library, and does not depend on KDE or GNOME. However, it may be compiled
- with full KDE3 support, including KDE3 widgets and KIO/KHTML. 
+ with full Trinity support, including Trinity widgets and KIO/KHTML. 
  .
  The main advantage of KchmViewer is non-English language support. Unlike
  others, KchmViewer in most cases correctly detects help file encoding,
diff --git a/debian/squeeze/applications/kcpuload/debian/changelog b/debian/squeeze/applications/kcpuload/debian/changelog
index c693db202..574b5d91e 100644
--- a/debian/squeeze/applications/kcpuload/debian/changelog
+++ b/debian/squeeze/applications/kcpuload/debian/changelog
@@ -6,7 +6,7 @@ kcpuload-trinity (2.00-0ubuntu4) karmic; urgency=low
 
 kcpuload-trinity (2.00-0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 04 March 2009 01:11:00 -0600
@@ -120,7 +120,7 @@ kcpuload (1.99-3) unstable; urgency=low
 
 kcpuload (1.99-2) unstable; urgency=low
 
-  * First KDE3 upload to debian!
+  * First Trinity upload to debian!
   * Build-depends on debhelper v4.
 
  -- Ben Burton <bab@debian.org>  Mon,  3 Feb 2003 10:40:27 +1100
@@ -134,7 +134,7 @@ kcpuload (1.99-1) unstable; urgency=low
 
 kcpuload (1.90-trinity-1) unstable; urgency=low
 
-  * Ported to KDE3.
+  * Ported to Trinity.
 
  -- Ben Burton <benb@acm.org>  Mon,  2 Sep 2002 12:57:36 +1000
 
diff --git a/debian/squeeze/applications/kde-style-lipstik/debian/changelog b/debian/squeeze/applications/kde-style-lipstik/debian/changelog
index 6431dd0a3..4e603d7ed 100644
--- a/debian/squeeze/applications/kde-style-lipstik/debian/changelog
+++ b/debian/squeeze/applications/kde-style-lipstik/debian/changelog
@@ -6,7 +6,7 @@ kde-style-lipstik-trinity (2.2.3-4) karmic; urgency=low
 
 kde-style-lipstik-trinity (2.2.3-3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 02 March 2009 01:07:00 -0600
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/changelog b/debian/squeeze/applications/kde-style-qtcurve/debian/changelog
index bcf1dc384..b89b8bc90 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/changelog
+++ b/debian/squeeze/applications/kde-style-qtcurve/debian/changelog
@@ -12,7 +12,7 @@ kde-style-qtcurve-trinity (0.55.2-1ubuntu7) karmic; urgency=low
 
 kde-style-qtcurve-trinity (0.55.2-1ubuntu6) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 21:15:00 -0600
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/control b/debian/squeeze/applications/kde-style-qtcurve/debian/control
index b5c22af85..d6d163039 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/control
+++ b/debian/squeeze/applications/kde-style-qtcurve/debian/control
@@ -11,7 +11,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: gtk2-engines-qtcurve
 Provides: kde-style-qtcurve
-Description: This is a set of widget styles for KDE3 based apps
+Description: This is a set of widget styles for Trinity based apps
  This package together with gtk2-engines-qtcurve aim to provide a unified look
  and feel on the desktop when using KDE and Gnome applications.
  .
@@ -21,7 +21,7 @@ Description: This is a set of widget styles for KDE3 based apps
 Package: qtcurve-trinity
 Architecture: any
 Depends: kde-style-qtcurve-trinity, gtk2-engines-qtcurve
-Description: This is a set of widget styles for KDE3 and Gtk2 based apps
+Description: This is a set of widget styles for Trinity and Gtk2 based apps
  This is an empty dummy package which will drag the packages 
  kde-style-qtcurve and gtk2-engines-qtcurve in your system.
 
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/copyright b/debian/squeeze/applications/kde-style-qtcurve/debian/copyright
index 71042929a..055d8a659 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/copyright
+++ b/debian/squeeze/applications/kde-style-qtcurve/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Bastian Venthur <venthur@debian.org> on
 Fri, 25 May 2007 12:52:24 +0200.
 
-It was downloaded from <http://www.kde-look.org/content/show.php/QtCurve+%28KDE4%2C+KDE3%2C+%26+Gtk2+Theme%29?content=40492>
+It was downloaded from <http://www.kde-look.org/content/show.php/QtCurve+%28KDE4%2C+Trinity%2C+%26+Gtk2+Theme%29?content=40492>
 
 Upstream Author: 
 
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/changelog b/debian/squeeze/applications/kde-systemsettings/debian/changelog
index 107cbb181..7e97530ed 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/changelog
+++ b/debian/squeeze/applications/kde-systemsettings/debian/changelog
@@ -12,7 +12,7 @@ kde-systemsettings-trinity (0.0svn20070312-0ubuntu4) intrepid; urgency=low
 
 kde-systemsettings-trinity (0.0svn20070312-0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/kdesudo/debian/changelog b/debian/squeeze/applications/kdesudo/debian/changelog
index 2ed6afde1..3e01f5533 100644
--- a/debian/squeeze/applications/kdesudo/debian/changelog
+++ b/debian/squeeze/applications/kdesudo/debian/changelog
@@ -6,7 +6,7 @@ kdesudo-trinity (4:2.5.1-4ubuntu0) karmic; urgency=low
 
 kdesudo-trinity (4:2.5.1-3ubuntu8) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 01 March 2009 23:25:00 -0600
diff --git a/debian/squeeze/applications/kdesudo/debian/control b/debian/squeeze/applications/kdesudo/debian/control
index 3a65425ab..f14497994 100644
--- a/debian/squeeze/applications/kdesudo/debian/control
+++ b/debian/squeeze/applications/kdesudo/debian/control
@@ -8,6 +8,6 @@ Standards-Version: 3.8.4
 Package: kdesudo-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, sudo
-Description: sudo frontend for KDE3
+Description: sudo frontend for Trinity
  KdeSudo is a graphical frontend for the sudo utility.
  It allows you to run programs as another user by entering your password.
diff --git a/debian/squeeze/applications/kdesvn/debian/changelog b/debian/squeeze/applications/kdesvn/debian/changelog
index 0f022062e..55c73dd3c 100644
--- a/debian/squeeze/applications/kdesvn/debian/changelog
+++ b/debian/squeeze/applications/kdesvn/debian/changelog
@@ -6,7 +6,7 @@ kdesvn-trinity (1.0.4-2~2ubuntu4) karmic; urgency=low
 
 kdesvn-trinity (1.0.4-2~0ubuntu4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 10 March 2009 12:31:00 -0600
@@ -19,7 +19,7 @@ kdesvn-trinity (1.0.4-2~0ubuntu3) intrepid; urgency=low
 
 kdesvn (1.0.4-2~hardy1) hardy-backports; urgency=low
 
-  * Upload fixed KDE3 package from sid for compatibility with svn 1.5
+  * Upload fixed Trinity package from sid for compatibility with svn 1.5
     (LP: #283468)
     - Intrepid package is KDE4 and not a suitable solution for
       hardy-backports
diff --git a/debian/squeeze/applications/kdesvn/debian/control b/debian/squeeze/applications/kdesvn/debian/control
index 54e8db49d..c7849ea5e 100644
--- a/debian/squeeze/applications/kdesvn/debian/control
+++ b/debian/squeeze/applications/kdesvn/debian/control
@@ -44,7 +44,7 @@ Package: kdesvn-kio-plugins-trinity
 Section: devel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: subversion I/O slaves for KDE3
+Description: subversion I/O slaves for Trinity
  This packages includes KIO slaves for svn, svn+file, svn+http, 
  svn+https, svn+ssh. This allows you to access subversion repositories 
  inside any KIO enabled KDE application.
diff --git a/debian/squeeze/applications/kdiff3/debian/changelog b/debian/squeeze/applications/kdiff3/debian/changelog
index f2914a717..0fa5bd08b 100644
--- a/debian/squeeze/applications/kdiff3/debian/changelog
+++ b/debian/squeeze/applications/kdiff3/debian/changelog
@@ -6,7 +6,7 @@ kdiff3-trinity (0.9.92-3ubuntu0) karmic; urgency=low
 
 kdiff3-trinity (0.9.92-2ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kdirstat/debian/changelog b/debian/squeeze/applications/kdirstat/debian/changelog
index b00d4cf4a..32917f933 100644
--- a/debian/squeeze/applications/kdirstat/debian/changelog
+++ b/debian/squeeze/applications/kdirstat/debian/changelog
@@ -6,7 +6,7 @@ kdirstat-trinity (2.4.4-1ubuntu0) karmic; urgency=low
 
 kdirstat-trinity (2.4.4-0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/keep/debian/changelog b/debian/squeeze/applications/keep/debian/changelog
index ce08915b3..cc2e41955 100644
--- a/debian/squeeze/applications/keep/debian/changelog
+++ b/debian/squeeze/applications/keep/debian/changelog
@@ -6,7 +6,7 @@ keep-trinity (0.4.0-0ubuntu3) karmic; urgency=low
 
 keep-trinity (0.4.0-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kerry/debian/changelog b/debian/squeeze/applications/kerry/debian/changelog
index 5ad17f564..3f36fe40e 100644
--- a/debian/squeeze/applications/kerry/debian/changelog
+++ b/debian/squeeze/applications/kerry/debian/changelog
@@ -1,6 +1,6 @@
 kerry-trinity (1:0.2.1-0ubuntu6) lucid; urgency=low
 
-  * KDE3 Lucid rebuild
+  * Trinity Lucid rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 14 Aug 2010 10:00:00 -0600
 
diff --git a/debian/squeeze/applications/kerry/debian/control b/debian/squeeze/applications/kerry/debian/control
index 15efeb828..a88165323 100644
--- a/debian/squeeze/applications/kerry/debian/control
+++ b/debian/squeeze/applications/kerry/debian/control
@@ -10,7 +10,7 @@ Package: kerry-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, beagle (>= 0.2.3)
 Description: a KDE frontend for the Beagle desktop search daemon [Trinity]
- Kerry is a KDE3 frontend for the Beagle desktop search daemon.
+ Kerry is a Trinity frontend for the Beagle desktop search daemon.
  .
  A program for indexing and searching user's data. At the moment, it can index
  filesystems, chat logs, mail and data, RSS and other.
diff --git a/debian/squeeze/applications/kerry/debian/control.in b/debian/squeeze/applications/kerry/debian/control.in
index f59651723..38fbd9e47 100644
--- a/debian/squeeze/applications/kerry/debian/control.in
+++ b/debian/squeeze/applications/kerry/debian/control.in
@@ -12,7 +12,7 @@ Package: kerry-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, beagle (>= 0.2.3)
 Description: a KDE frontend for the Beagle desktop search daemon [Trinity]
- Kerry is a KDE3 frontend for the Beagle desktop search daemon.
+ Kerry is a Trinity frontend for the Beagle desktop search daemon.
  .
  A program for indexing and searching user's data. At the moment, it can index
  filesystems, chat logs, mail and data, RSS and other.
diff --git a/debian/squeeze/applications/kile/debian/changelog b/debian/squeeze/applications/kile/debian/changelog
index 6bfb44f63..f47c5878b 100644
--- a/debian/squeeze/applications/kile/debian/changelog
+++ b/debian/squeeze/applications/kile/debian/changelog
@@ -6,7 +6,7 @@ kile-trinity (1:2.0.2-1ubuntu0) karmic; urgency=low
 
 kile-trinity (1:2.0.2-0ubuntu5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
@@ -343,7 +343,7 @@ kile (1:1.3.2-2) unstable; urgency=low
 kile (1:1.3.2-1) unstable; urgency=low
 
   * New upstream release.
-  * First KDE3 upload to debian!
+  * First Trinity upload to debian!
   * Merged the dummy ktexmaker2 upgrade package into the kile sources.
   * Rolled the epoch to replace both the unofficial kile 1.32 packages and
     the old ktexmaker2 1.7 packages.
@@ -366,7 +366,7 @@ kile (1.2-1) unstable; urgency=low
 
   * Name change from ktexmaker2 to kile.
   * New upstream release.
-  * Built for KDE3.
+  * Built for Trinity.
 
  -- Ben Burton <benb@acm.org>  Mon,  2 Sep 2002 15:21:22 +1000
 
diff --git a/debian/squeeze/applications/kio-apt/debian/changelog b/debian/squeeze/applications/kio-apt/debian/changelog
index 4bbfd5b0d..53b1fa58e 100644
--- a/debian/squeeze/applications/kio-apt/debian/changelog
+++ b/debian/squeeze/applications/kio-apt/debian/changelog
@@ -6,7 +6,7 @@ kio-apt-trinity (0.13.2-5ubuntu0) karmic; urgency=low
 
 kio-apt-trinity (0.13.2-4ubuntu5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kio-apt/debian/control b/debian/squeeze/applications/kio-apt/debian/control
index 4ef2df209..793a97da7 100644
--- a/debian/squeeze/applications/kio-apt/debian/control
+++ b/debian/squeeze/applications/kio-apt/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.8.4
 Package: kio-apt-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, apt, adept-batch-trinity
-Description: an apt-cache ioslave for KDE3
+Description: an apt-cache ioslave for Trinity
  kio-apt is an ioslave which provides the apt:/ protocol. It
  integrates apt-cache functionalities into Konqueror, making
  browsing the packages easier. It provides:
diff --git a/debian/squeeze/applications/kio-locate/debian/changelog b/debian/squeeze/applications/kio-locate/debian/changelog
index 12dcfd8e9..6017937c1 100644
--- a/debian/squeeze/applications/kio-locate/debian/changelog
+++ b/debian/squeeze/applications/kio-locate/debian/changelog
@@ -6,7 +6,7 @@ kio-locate-trinity (0.4.5-1ubuntu4) karmic; urgency=low
 
 kio-locate-trinity (0.4.5-1ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/changelog b/debian/squeeze/applications/kio-umountwrapper/debian/changelog
index d293092dc..8c9c63417 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/changelog
+++ b/debian/squeeze/applications/kio-umountwrapper/debian/changelog
@@ -6,7 +6,7 @@ kio-umountwrapper-trinity (0.2-1ubuntu3) karmic; urgency=low
 
 kio-umountwrapper-trinity (0.2-1ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/control b/debian/squeeze/applications/kio-umountwrapper/debian/control
index 57cd9f817..8c760573e 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/control
+++ b/debian/squeeze/applications/kio-umountwrapper/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
 Package: kio-umountwrapper-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: progress dialog for safely removing devices in KDE3.
+Description: progress dialog for safely removing devices in Trinity.
  Wrapper around kio_media_mountwrapper.
- Provides a progress dialog for Safely Removing of devices in KDE3.
+ Provides a progress dialog for Safely Removing of devices in Trinity.
  .
   Homepage: http://frode.kde.no/misc/kio_umountwrapper/
diff --git a/debian/squeeze/applications/kmplayer/debian/changelog b/debian/squeeze/applications/kmplayer/debian/changelog
index 75eac522e..00d0559a0 100644
--- a/debian/squeeze/applications/kmplayer/debian/changelog
+++ b/debian/squeeze/applications/kmplayer/debian/changelog
@@ -6,7 +6,7 @@ kmplayer-trinity (1:0.10.0c-0ubuntu4) karmic; urgency=low
 
 kmplayer-trinity (1:0.10.0c-0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kmplayer/debian/control b/debian/squeeze/applications/kmplayer/debian/control
index 360ce4778..1b45021c4 100644
--- a/debian/squeeze/applications/kmplayer/debian/control
+++ b/debian/squeeze/applications/kmplayer/debian/control
@@ -16,8 +16,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), libxine1-x | libxine1 (<< 1.1.8-2)
 Recommends: kmplayer-plugin-trinity (= ${binary:Version})
 Suggests: ffmpeg, vdr, xawtv, mplayer
-Description: media player for KDE3
- A basic audio/video viewer application for KDE3.
+Description: media player for Trinity
+ A basic audio/video viewer application for Trinity.
  .
  KMPlayer can:
  * play DVD (DVDNav only with the Xine player)
diff --git a/debian/squeeze/applications/kmyfirewall/debian/changelog b/debian/squeeze/applications/kmyfirewall/debian/changelog
index ad0d00d57..7e048ee26 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/changelog
+++ b/debian/squeeze/applications/kmyfirewall/debian/changelog
@@ -6,7 +6,7 @@ kmyfirewall-trinity (1.1.1-1~1ubuntu1) karmic; urgency=low
 
 kmyfirewall-trinity (1.1.1-1~1ubuntu0) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kmymoney/debian/changelog b/debian/squeeze/applications/kmymoney/debian/changelog
index c5c1e9a62..9907ea10b 100644
--- a/debian/squeeze/applications/kmymoney/debian/changelog
+++ b/debian/squeeze/applications/kmymoney/debian/changelog
@@ -461,7 +461,7 @@ kmymoney2 (0.6.1-2) unstable; urgency=low
 
 kmymoney2 (0.6.1-0sarge1) testing-proposed-updates; urgency=high
 
-  * Rebuild for sarge (KDE3.2)
+  * Rebuild for sarge (Trinity.2)
   * configure   --mandir=\$${prefix}/share/man (Closes: Bug#267850)
   * Remove debian/kmymoney2.1, its included upstream
   * Remove depends-on-build-essential-package-without-using-version g++
diff --git a/debian/squeeze/applications/knemo/debian/changelog b/debian/squeeze/applications/knemo/debian/changelog
index b3709223c..31b53d817 100644
--- a/debian/squeeze/applications/knemo/debian/changelog
+++ b/debian/squeeze/applications/knemo/debian/changelog
@@ -6,7 +6,7 @@ knemo-trinity (0.4.8-3) karmic; urgency=low
 
 knemo-trinity (0.4.8-2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/knemo/debian/control b/debian/squeeze/applications/knemo/debian/control
index e5a79d896..500b81dfc 100644
--- a/debian/squeeze/applications/knemo/debian/control
+++ b/debian/squeeze/applications/knemo/debian/control
@@ -10,7 +10,7 @@ Package: knemo-trinity
 Architecture: any
 Depends: kicker-trinity, net-tools, ${shlibs:Depends}
 Recommends: kcontrol-trinity, wireless-tools
-Description: network interfaces monitor for the KDE3 systray
+Description: network interfaces monitor for the Trinity systray
  KNemo displays an icon in the systray for every network interface.
  Tooltips and an info dialog provide further information about the
  interface.  Passive popups inform about interface changes.
diff --git a/debian/squeeze/applications/knetload/debian/changelog b/debian/squeeze/applications/knetload/debian/changelog
index e2e2cdcf1..be58cc89a 100644
--- a/debian/squeeze/applications/knetload/debian/changelog
+++ b/debian/squeeze/applications/knetload/debian/changelog
@@ -6,7 +6,7 @@ knetload-trinity (2.3-3.1ubuntu0) karmic; urgency=low
 
 knetload-trinity (2.3-3.0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
@@ -119,7 +119,7 @@ knetload (1.99-3) unstable; urgency=low
 
 knetload (1.99-2) unstable; urgency=low
 
-  * First KDE3 upload to debian!
+  * First Trinity upload to debian!
   * Build-depends on debhelper v4.
 
  -- Ben Burton <bab@debian.org>  Mon,  3 Feb 2003 10:40:27 +1100
@@ -133,7 +133,7 @@ knetload (1.99-1) unstable; urgency=low
 
 knetload (1.91-trinity-1) unstable; urgency=low
 
-  * Ported to KDE3.
+  * Ported to Trinity.
 
  -- Ben Burton <benb@acm.org>  Mon,  2 Sep 2002 12:57:36 +1000
 
diff --git a/debian/squeeze/applications/knetstats/debian/control b/debian/squeeze/applications/knetstats/debian/control
index a836cb95d..c2f2f6429 100644
--- a/debian/squeeze/applications/knetstats/debian/control
+++ b/debian/squeeze/applications/knetstats/debian/control
@@ -9,6 +9,6 @@ Homepage: http://knetstats.sourceforge.net/
 Package: knetstats-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: network interfaces monitor for the KDE3 systray
+Description: network interfaces monitor for the Trinity systray
  A simple KDE network monitor that show rx/tx LEDs of any
  network interface on a system tray icon
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/control b/debian/squeeze/applications/knetworkmanager.cmake/debian/control
index d1389862e..73fa9be0d 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/control
+++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/control
@@ -30,5 +30,5 @@ Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
 Description: KDE systray applet for controlling NetworkManager [Trinity]
  Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for KDE3 but also works for 
+ NetworkManager. It is mainly written for Trinity but also works for 
  other desktop environments like GNOME or Xfce.
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/control.in b/debian/squeeze/applications/knetworkmanager.cmake/debian/control.in
index c31b9f8b1..43adf3e33 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/control.in
+++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/control.in
@@ -32,5 +32,5 @@ Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
 Description: KDE systray applet for controlling NetworkManager [Trinity]
  Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for KDE3 but also works for 
+ NetworkManager. It is mainly written for Trinity but also works for 
  other desktop environments like GNOME or Xfce.
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/watch b/debian/squeeze/applications/knetworkmanager.cmake/debian/watch
index 36d51ca53..ad7a7be91 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/watch
+++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/watch
@@ -1,2 +1,2 @@
 version=3
-ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/network/knetworkmanager-(.*)\.tar\.gz
+ftp://ftp.kde.org/pub/kde/stable/apps/Trinity.x/network/knetworkmanager-(.*)\.tar\.gz
diff --git a/debian/squeeze/applications/knetworkmanager/debian/control b/debian/squeeze/applications/knetworkmanager/debian/control
index 1f32d831d..c8875e68c 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/control
+++ b/debian/squeeze/applications/knetworkmanager/debian/control
@@ -30,5 +30,5 @@ Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
 Description: KDE systray applet for controlling NetworkManager [Trinity]
  Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for KDE3 but also works for 
+ NetworkManager. It is mainly written for Trinity but also works for 
  other desktop environments like GNOME or Xfce.
diff --git a/debian/squeeze/applications/knetworkmanager/debian/control.in b/debian/squeeze/applications/knetworkmanager/debian/control.in
index c31b9f8b1..43adf3e33 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/control.in
+++ b/debian/squeeze/applications/knetworkmanager/debian/control.in
@@ -32,5 +32,5 @@ Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
 Description: KDE systray applet for controlling NetworkManager [Trinity]
  Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for KDE3 but also works for 
+ NetworkManager. It is mainly written for Trinity but also works for 
  other desktop environments like GNOME or Xfce.
diff --git a/debian/squeeze/applications/knetworkmanager/debian/watch b/debian/squeeze/applications/knetworkmanager/debian/watch
index 36d51ca53..ad7a7be91 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/watch
+++ b/debian/squeeze/applications/knetworkmanager/debian/watch
@@ -1,2 +1,2 @@
 version=3
-ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/network/knetworkmanager-(.*)\.tar\.gz
+ftp://ftp.kde.org/pub/kde/stable/apps/Trinity.x/network/knetworkmanager-(.*)\.tar\.gz
diff --git a/debian/squeeze/applications/knights/debian/changelog b/debian/squeeze/applications/knights/debian/changelog
index 0d09733ee..cf45a8316 100644
--- a/debian/squeeze/applications/knights/debian/changelog
+++ b/debian/squeeze/applications/knights/debian/changelog
@@ -6,7 +6,7 @@ knights-trinity (0.6-8.3ubuntu0) karmic; urgency=low
 
 knights-trinity (0.6-8.2ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/knowit/debian/control b/debian/squeeze/applications/knowit/debian/control
index 0ee59ee1b..fef19e0c9 100644
--- a/debian/squeeze/applications/knowit/debian/control
+++ b/debian/squeeze/applications/knowit/debian/control
@@ -13,4 +13,4 @@ Depends: ${shlibs:Depends}
 Description: Tool for managing notes [Trinity]
  KnowIt is a tool for managing notes which are organized in
  tree-like hierarchy. It is similar to TuxCards,
- but KDE-based, and requires KDE3.
+ but KDE-based, and requires Trinity.
diff --git a/debian/squeeze/applications/koffice/debian/changelog b/debian/squeeze/applications/koffice/debian/changelog
index 18b0fce86..8ce61b75e 100644
--- a/debian/squeeze/applications/koffice/debian/changelog
+++ b/debian/squeeze/applications/koffice/debian/changelog
@@ -938,7 +938,7 @@ koffice (1:1.2.1-3) unstable; urgency=low
 
 koffice (1:1.2.1-2) unstable; urgency=low
 
-  * First KDE3 upload to debian (closes: #162433).
+  * First Trinity upload to debian (closes: #162433).
   * KSpread printing improved (closes: #106472).
   * Tables no longer crash kword (closes: #111356).
   * Better import filters for kword (closes: #113347, #143480, #148986).
diff --git a/debian/squeeze/applications/konversation/debian/changelog b/debian/squeeze/applications/konversation/debian/changelog
index 3ef8e51b1..5d44efa2e 100644
--- a/debian/squeeze/applications/konversation/debian/changelog
+++ b/debian/squeeze/applications/konversation/debian/changelog
@@ -6,7 +6,7 @@ konversation-trinity (1.1-0ubuntu3) karmic; urgency=low
 
 konversation-trinity (1.1-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/kopete-otr/debian/changelog b/debian/squeeze/applications/kopete-otr/debian/changelog
index 9545c589c..f7807fab8 100644
--- a/debian/squeeze/applications/kopete-otr/debian/changelog
+++ b/debian/squeeze/applications/kopete-otr/debian/changelog
@@ -6,7 +6,7 @@ kopete-otr-trinity (0.7-0ubuntu3) karmic; urgency=low
 
 kopete-otr-trinity (0.7-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/kpicosim/debian/changelog b/debian/squeeze/applications/kpicosim/debian/changelog
index a60f06145..da552500b 100644
--- a/debian/squeeze/applications/kpicosim/debian/changelog
+++ b/debian/squeeze/applications/kpicosim/debian/changelog
@@ -6,7 +6,7 @@ kpicosim-trinity (0.6a-4) karmic; urgency=low
 
 kpicosim-trinity (0.6a-3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/changelog b/debian/squeeze/applications/kpowersave.cmake/debian/changelog
index 206f5ef59..c23417124 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/changelog
+++ b/debian/squeeze/applications/kpowersave.cmake/debian/changelog
@@ -6,7 +6,7 @@ kpowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
 
 kpowersave-trinity (0.7.3-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kpowersave/debian/changelog b/debian/squeeze/applications/kpowersave/debian/changelog
index 206f5ef59..c23417124 100644
--- a/debian/squeeze/applications/kpowersave/debian/changelog
+++ b/debian/squeeze/applications/kpowersave/debian/changelog
@@ -6,7 +6,7 @@ kpowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
 
 kpowersave-trinity (0.7.3-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kpowersave/debian/control b/debian/squeeze/applications/kpowersave/debian/control
index 87738b5f0..faaac13d0 100644
--- a/debian/squeeze/applications/kpowersave/debian/control
+++ b/debian/squeeze/applications/kpowersave/debian/control
@@ -11,7 +11,7 @@ Homepage: http://sourceforge.net/projects/powersave/
 Package: kpowersave-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1)
-Description: HAL based power management applet for KDE3
+Description: HAL based power management applet for Trinity
  KPowersave is a KDE systray applet which allows to control the power 
  management settings and policies of your computer.
  It relies on HAL to do the heavy lifting.
diff --git a/debian/squeeze/applications/krename/debian/changelog b/debian/squeeze/applications/krename/debian/changelog
index 342ef4405..fb28d1f29 100644
--- a/debian/squeeze/applications/krename/debian/changelog
+++ b/debian/squeeze/applications/krename/debian/changelog
@@ -6,7 +6,7 @@ krename-trinity (3.0.14~1ubuntu0) karmic; urgency=low
 
 krename-trinity (3.0.14~0ubuntu6) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/krename/debian/control b/debian/squeeze/applications/krename/debian/control
index 85038feef..29e40ed70 100644
--- a/debian/squeeze/applications/krename/debian/control
+++ b/debian/squeeze/applications/krename/debian/control
@@ -10,7 +10,7 @@ Package: krename-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Powerful batch renamer for KDE 3.x [Trinity]
- This package contains a very powerful batch file renamer for KDE3 
+ This package contains a very powerful batch file renamer for Trinity 
  which can rename a list of files based on a set of expressions.
  It can copy/move the files to another directory or simply rename 
  the input files.
diff --git a/debian/squeeze/applications/krusader/debian/changelog b/debian/squeeze/applications/krusader/debian/changelog
index 52e516ddf..609286530 100644
--- a/debian/squeeze/applications/krusader/debian/changelog
+++ b/debian/squeeze/applications/krusader/debian/changelog
@@ -6,7 +6,7 @@ krusader-trinity (1.90.0-3) karmic; urgency=low
 
 krusader-trinity (1.90.0-2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/changelog b/debian/squeeze/applications/ksplash-engine-moodin/debian/changelog
index 989850120..57a1db1eb 100644
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/changelog
+++ b/debian/squeeze/applications/ksplash-engine-moodin/debian/changelog
@@ -6,7 +6,7 @@ ksplash-engine-moodin-trinity (0.4.2-1ubuntu4) karmic; urgency=low
 
 ksplash-engine-moodin-trinity (0.4.2-1ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 06 Mar 2009 13:36:00 -0600
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/control b/debian/squeeze/applications/ksplash-engine-moodin/debian/control
index 6a729f16f..589ccedb3 100644
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/control
+++ b/debian/squeeze/applications/ksplash-engine-moodin/debian/control
@@ -10,7 +10,7 @@ Standards-Version: 3.8.4
 Package: ksplash-engine-moodin-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: fading splash screen engine for KDE3
+Description: fading splash screen engine for Trinity
  Heavily customizable engine for various types of themes.
  .
  Features:
diff --git a/debian/squeeze/applications/ksquirrel/debian/README.debian b/debian/squeeze/applications/ksquirrel/debian/README.debian
index 17ed05957..7c478322f 100644
--- a/debian/squeeze/applications/ksquirrel/debian/README.debian
+++ b/debian/squeeze/applications/ksquirrel/debian/README.debian
@@ -1,4 +1,4 @@
-This program was initialy writen for KDE3. To compile it for KDE4 the
+This program was initialy writen for Trinity. To compile it for KDE4 the
 exif support is disabled. That library depends on kdelibs3.
 
 MT is enabled because configure seems not smart enough.
diff --git a/debian/squeeze/applications/ksquirrel/debian/control b/debian/squeeze/applications/ksquirrel/debian/control
index b46e561cd..8a7621b84 100644
--- a/debian/squeeze/applications/ksquirrel/debian/control
+++ b/debian/squeeze/applications/ksquirrel/debian/control
@@ -16,7 +16,7 @@ Standards-Version: 3.8.4
 Package: ksquirrel-trinity
 Architecture: any
 Depends: libksquirrel0-trinity, ${shlibs:Depends}, ${misc:Depends}
-Description: Powerful KDE3 image viewer
+Description: Powerful Trinity image viewer
  KSquirrel is an image viewer for KDE with disk navigator, file tree,
  multiple directory view, thumbnails, extended thumbnails, dynamic
  format support, DCOP interface, KEXIF and KIPI plugins support.
diff --git a/debian/squeeze/applications/ksystemlog/debian/changelog b/debian/squeeze/applications/ksystemlog/debian/changelog
index 28d17e92e..908baac01 100644
--- a/debian/squeeze/applications/ksystemlog/debian/changelog
+++ b/debian/squeeze/applications/ksystemlog/debian/changelog
@@ -6,7 +6,7 @@ ksystemlog-trinity (0.3.2-2ubuntu0) karmic; urgency=low
 
 ksystemlog-trinity (0.3.2-1ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/ksystemlog/debian/control b/debian/squeeze/applications/ksystemlog/debian/control
index 69489e2bf..d818029c1 100644
--- a/debian/squeeze/applications/ksystemlog/debian/control
+++ b/debian/squeeze/applications/ksystemlog/debian/control
@@ -10,8 +10,8 @@ Standards-Version: 3.8.4
 Package: ksystemlog-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: system log viewer tool for KDE3
- ksystemlog is a system log viewer tool for KDE3.
+Description: system log viewer tool for Trinity
+ ksystemlog is a system log viewer tool for Trinity.
  .
  This program is developed for being used by beginner users, which don't know
  how to find information about their Linux system, and how the log files are in
diff --git a/debian/squeeze/applications/ktechlab/debian/changelog b/debian/squeeze/applications/ktechlab/debian/changelog
index b970f36c7..eb84eb89e 100644
--- a/debian/squeeze/applications/ktechlab/debian/changelog
+++ b/debian/squeeze/applications/ktechlab/debian/changelog
@@ -6,7 +6,7 @@ ktechlab-trinity (0.3-9~1ubuntu0) karmic; urgency=low
 
 ktechlab-trinity (0.3-9~0ubuntu5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/ktorrent/debian/changelog b/debian/squeeze/applications/ktorrent/debian/changelog
index ad2282ecb..7d19f0f25 100644
--- a/debian/squeeze/applications/ktorrent/debian/changelog
+++ b/debian/squeeze/applications/ktorrent/debian/changelog
@@ -6,7 +6,7 @@ ktorrent-trinity (2.2.6-0ubuntu1) karmic; urgency=low
 
 ktorrent-trinity (2.2.5-0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/ktorrent/debian/control b/debian/squeeze/applications/ktorrent/debian/control
index c7afb4a94..059977a33 100644
--- a/debian/squeeze/applications/ktorrent/debian/control
+++ b/debian/squeeze/applications/ktorrent/debian/control
@@ -10,8 +10,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: php5-cli
 Recommends: kdebase-kio-plugins-trinity
-Description: BitTorrent client for KDE3
- KTorrent is a BitTorrent program for KDE3. Its features include speed capping
+Description: BitTorrent client for Trinity
+ KTorrent is a BitTorrent program for Trinity. Its features include speed capping
  (both down and up), integrated searching, UDP tracker support, preview of
  certain file types (video and audio) and integration into the KDE Panel
  enabling background downloading.
diff --git a/debian/squeeze/applications/ktorrent/debian/control.in b/debian/squeeze/applications/ktorrent/debian/control.in
index 94ad0fce4..f688d0c53 100644
--- a/debian/squeeze/applications/ktorrent/debian/control.in
+++ b/debian/squeeze/applications/ktorrent/debian/control.in
@@ -12,8 +12,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: php5-cli
 Recommends: kdebase-kio-plugins-trinity
-Description: BitTorrent client for KDE3
- KTorrent is a BitTorrent program for KDE3. Its features include speed capping
+Description: BitTorrent client for Trinity
+ KTorrent is a BitTorrent program for Trinity. Its features include speed capping
  (both down and up), integrated searching, UDP tracker support, preview of
  certain file types (video and audio) and integration into the KDE Panel
  enabling background downloading.
diff --git a/debian/squeeze/applications/kuickshow/debian/changelog b/debian/squeeze/applications/kuickshow/debian/changelog
index 081ce9dd7..6d94f0d4b 100644
--- a/debian/squeeze/applications/kuickshow/debian/changelog
+++ b/debian/squeeze/applications/kuickshow/debian/changelog
@@ -6,7 +6,7 @@ kuickshow-trinity (4:3.5.8-0ubuntu3) karmic; urgency=low
 
 kuickshow-trinity (4:3.5.8-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/kvirc/debian/control b/debian/squeeze/applications/kvirc/debian/control
index 850fac844..4dc24713a 100644
--- a/debian/squeeze/applications/kvirc/debian/control
+++ b/debian/squeeze/applications/kvirc/debian/control
@@ -11,7 +11,7 @@ Homepage: http://kvirc.net/
 Package: kvirc-trinity
 Architecture: any
 Depends: kvirc-data-trinity (= ${source:Version}), ${shlibs:Depends}
-Description:  KDE3 based next generation IRC client with module support
+Description:  Trinity based next generation IRC client with module support
  A highly configurable graphical IRC client with an MDI interface,
  built-in scripting language, support for IRC DCC, drag & drop file
  browsing, and much more. KVIrc uses the KDE widget set, can be extended
diff --git a/debian/squeeze/applications/kvkbd/debian/changelog b/debian/squeeze/applications/kvkbd/debian/changelog
index fc24ca85f..844587f33 100644
--- a/debian/squeeze/applications/kvkbd/debian/changelog
+++ b/debian/squeeze/applications/kvkbd/debian/changelog
@@ -6,7 +6,7 @@ kvkbd-trinity (0.4.8-0ubuntu3) karmic; urgency=low
 
 kvkbd-trinity (0.4.8-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/changelog b/debian/squeeze/applications/kwin-style-crystal/debian/changelog
index 8bc421e08..f330cbc5f 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/changelog
+++ b/debian/squeeze/applications/kwin-style-crystal/debian/changelog
@@ -6,7 +6,7 @@ kwin-style-crystal-trinity (1.0.5-0ubuntu3) karmic; urgency=low
 
 kwin-style-crystal-trinity (1.0.5-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/control b/debian/squeeze/applications/kwin-style-crystal/debian/control
index 0cb4c7c92..0f61547f5 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/control
+++ b/debian/squeeze/applications/kwin-style-crystal/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.8.4
 Package: kwin-style-crystal-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: semi transparant window decoration for KDE3
+Description: semi transparant window decoration for Trinity
  Crystal offers you pseudo transparent titlebar, buttons and borders
  transparent, so you can see more of your lovely background image
  Transparancy and buttons can be costumized to match your wishes.
diff --git a/debian/squeeze/applications/piklab/debian/changelog b/debian/squeeze/applications/piklab/debian/changelog
index 174dd3b8d..e6ae36e95 100644
--- a/debian/squeeze/applications/piklab/debian/changelog
+++ b/debian/squeeze/applications/piklab/debian/changelog
@@ -6,7 +6,7 @@ piklab-trinity (0.15.2-2ubuntu0) karmic; urgency=low
 
 piklab-trinity (0.15.2-1ubuntu4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/potracegui/debian/changelog b/debian/squeeze/applications/potracegui/debian/changelog
index 6f6f1bc51..87afc2863 100644
--- a/debian/squeeze/applications/potracegui/debian/changelog
+++ b/debian/squeeze/applications/potracegui/debian/changelog
@@ -1,6 +1,6 @@
 potracegui-trinity (1.3-2.0ubuntu1) karmic; urgency=low
 
-  * Karmic rebuild for KDE3
+  * Karmic rebuild for Trinity
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 06 Mar 2010 06:02:00 -0600
 
diff --git a/debian/squeeze/applications/rosegarden/debian/changelog b/debian/squeeze/applications/rosegarden/debian/changelog
index 9c7acc70a..1733e9ec5 100644
--- a/debian/squeeze/applications/rosegarden/debian/changelog
+++ b/debian/squeeze/applications/rosegarden/debian/changelog
@@ -6,7 +6,7 @@ rosegarden-trinity (1:1.7.0-1ubuntu0) karmic; urgency=low
 
 rosegarden-trinity (1:1.7.0-0ubuntu5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
@@ -427,7 +427,7 @@ rosegarden4 (0.8.5-2) unstable; urgency=low
 rosegarden4 (0.8.5-1) unstable; urgency=low
 
   * New upstream version.
-  * Moved to KDE3: Now using kdelibs4-dev, closes: #180365.
+  * Moved to Trinity: Now using kdelibs4-dev, closes: #180365.
   * Using automake1.6, which seems to be necessary for trinity build scripts.
   * Added build dependency on ladspa-sdk package (debian/control).
   * Updated package description and README.Debian. Latest releases are not
diff --git a/debian/squeeze/applications/smb4k/debian/changelog b/debian/squeeze/applications/smb4k/debian/changelog
index aa42ce16c..4bbfd4f98 100644
--- a/debian/squeeze/applications/smb4k/debian/changelog
+++ b/debian/squeeze/applications/smb4k/debian/changelog
@@ -6,7 +6,7 @@ smb4k-trinity (0.9.4-0ubuntu3) karmic; urgency=low
 
 smb4k-trinity (0.9.4-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/smb4k/debian/control b/debian/squeeze/applications/smb4k/debian/control
index c4fb618b7..921e4d04f 100644
--- a/debian/squeeze/applications/smb4k/debian/control
+++ b/debian/squeeze/applications/smb4k/debian/control
@@ -10,7 +10,7 @@ Package: smb4k-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, samba-common, smbclient, smbfs
 Recommends: super | sudo-trinity
-Description: A Samba (SMB) share advanced browser for KDE3
+Description: A Samba (SMB) share advanced browser for Trinity
  Smb4K is a SMB (Windows) share browser for KDE. It uses the Samba software 
  suite to access the SMB shares of the local network neighborhood. Its purpose
  is to provide a program that's easy to use and has as many features as 
diff --git a/debian/squeeze/applications/soundkonverter/debian/changelog b/debian/squeeze/applications/soundkonverter/debian/changelog
index d0ea5e796..c6820af5d 100644
--- a/debian/squeeze/applications/soundkonverter/debian/changelog
+++ b/debian/squeeze/applications/soundkonverter/debian/changelog
@@ -6,7 +6,7 @@ soundkonverter-trinity (0.3.8-5) karmic; urgency=low
 
 soundkonverter-trinity (0.3.8-3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 17 June 2009 22:08:00 -0600
diff --git a/debian/squeeze/applications/soundkonverter/debian/control b/debian/squeeze/applications/soundkonverter/debian/control
index 149614b2c..1d04a540a 100644
--- a/debian/squeeze/applications/soundkonverter/debian/control
+++ b/debian/squeeze/applications/soundkonverter/debian/control
@@ -12,7 +12,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac, kdemultimedia-kio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack
 Suggests: soundkonverter-amarok-trinity
-Description: audio converter frontend for KDE3
+Description: audio converter frontend for Trinity
  soundKonverter is a frontend to various audio converters.
  .
  The key features are:
@@ -32,7 +32,7 @@ Description: audio converter frontend for KDE3
 Package: soundkonverter-amarok-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8
-Description: audio converter frontend for KDE3 (Amarok script)
+Description: audio converter frontend for Trinity (Amarok script)
  Amarok script for soundKonverter. It allows you to easily transcode files when
  transferring them to your media device.
  .
diff --git a/debian/squeeze/applications/tellico/debian/changelog b/debian/squeeze/applications/tellico/debian/changelog
index 927869e82..01268f186 100644
--- a/debian/squeeze/applications/tellico/debian/changelog
+++ b/debian/squeeze/applications/tellico/debian/changelog
@@ -6,7 +6,7 @@ tellico-trinity (1.3.2.1-1ubuntu4) karmic; urgency=low
 
 tellico-trinity (1.3.2.1-1ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/yakuake/debian/changelog b/debian/squeeze/applications/yakuake/debian/changelog
index 2e7869e5a..281a3c25d 100644
--- a/debian/squeeze/applications/yakuake/debian/changelog
+++ b/debian/squeeze/applications/yakuake/debian/changelog
@@ -6,7 +6,7 @@ yakuake-trinity (2.8.1-2ubuntu1) karmic; urgency=low
 
 yakuake-trinity (2.8.1-2ubuntu0) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/dependencies/arts/debian/changelog b/debian/squeeze/dependencies/arts/debian/changelog
index 1ec6d7736..2fe0652db 100644
--- a/debian/squeeze/dependencies/arts/debian/changelog
+++ b/debian/squeeze/dependencies/arts/debian/changelog
@@ -6,7 +6,7 @@ arts-trinity (1.5.10-0ubuntu3) karmic; urgency=low
 
 arts-trinity (1.5.10-0ubuntu2~intrepid5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 25 Feb 2009 15:12:00 -0600
@@ -19,7 +19,7 @@ arts-trinity (1.5.10-0ubuntu2~intrepid4) intrepid; urgency=low
 
 arts-trinity (1.5.10-0ubuntu2~intrepid3) intrepid; urgency=low
 
-  * Altered prefix for KDE3.5
+  * Altered prefix for Trinity.5
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 20 Nov 2008 17:48:45 -0600
 
diff --git a/debian/squeeze/dependencies/arts/debian/control b/debian/squeeze/dependencies/arts/debian/control
index e29a6efd5..57a7a33a1 100644
--- a/debian/squeeze/dependencies/arts/debian/control
+++ b/debian/squeeze/dependencies/arts/debian/control
@@ -24,7 +24,7 @@ Description: sound system from the official KDE release
  technological superiority of the Unix operating system.
  .
  This metapackage includes the complete aRts sound system, without
- development packages. aRts is the core sound system for KDE3.
+ development packages. aRts is the core sound system for Trinity.
 
 Package: libarts1c2a-trinity
 Architecture: any
diff --git a/debian/squeeze/dependencies/qt3/debian/control b/debian/squeeze/dependencies/qt3/debian/control
index 168a336d3..104af1e46 100644
--- a/debian/squeeze/dependencies/qt3/debian/control
+++ b/debian/squeeze/dependencies/qt3/debian/control
@@ -28,7 +28,7 @@ Conflicts: libqt3c102-mt, libqui1-emb, libqt3c-mt
 Suggests: libqt3-mt-psql, libqt3-mt-mysql, libqt3-mt-odbc
 Description: Qt GUI Library (Threaded runtime version), Version 3
  This is the Trolltech Qt library, version 3. It's necessary for
- applications that link against the libqt-mt.so.3, e.g. all KDE3
+ applications that link against the libqt-mt.so.3, e.g. all Trinity
  applications.
 
 Package: libqt3-mt-mysql
diff --git a/debian/squeeze/kdeaccessibility/debian/changelog b/debian/squeeze/kdeaccessibility/debian/changelog
index ece9042b6..6e6b5f441 100644
--- a/debian/squeeze/kdeaccessibility/debian/changelog
+++ b/debian/squeeze/kdeaccessibility/debian/changelog
@@ -6,7 +6,7 @@ kdeaccessibility-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
 
 kdeaccessibility-trinity (4:3.5.10-0ubuntu1~intrepid4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 28 Feb 2009 16:19:00 -0600
diff --git a/debian/squeeze/kdeaccessibility/debian/control b/debian/squeeze/kdeaccessibility/debian/control
index 984578cf1..bd6a8b742 100644
--- a/debian/squeeze/kdeaccessibility/debian/control
+++ b/debian/squeeze/kdeaccessibility/debian/control
@@ -13,7 +13,7 @@ Architecture: all
 Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version})
 Recommends: kde-icons-mono-trinity (>= ${Source-Version})
 Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), kdeaccessibility-trinity-doc-html (>= ${Source-Version})
-Description: accessibility packages from the official KDE3 release
+Description: accessibility packages 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,
  contemporary functionality, and outstanding graphical design with the
@@ -39,7 +39,7 @@ Description: KDE accessibility documentation in HTML format
  /opt/trinity/share/doc/kde/HTML/en/kmag/. Documentation is provided for most
  KDE accessibility packages.
  .
- This package is part of KDE3, and a component of the KDE accessibility
+ This package is part of Trinity, and a component of the KDE accessibility
  module. See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
 
 Package: kde-icons-mono-trinity
@@ -48,7 +48,7 @@ Architecture: all
 Description: a monochromatic icons theme for KDE
  A monochromatic icon theme for KDE, designed for accessibility purposes.
  .
- This package is part of KDE3, as a component of the KDE accessibility module.
+ This package is part of Trinity, as a component of the KDE accessibility module.
  See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
 
 Package: kbstate-trinity
@@ -59,7 +59,7 @@ Suggests: khelpcenter-trinity
 Description: a keyboard status applet for KDE
  A panel applet that displays the keyboard status.
  .
- This package is part of KDE3, as a component of the KDE accessibility module.
+ This package is part of Trinity, as a component of the KDE accessibility module.
  See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
 
 Package: kmag-trinity
@@ -75,7 +75,7 @@ Description: a screen magnifier for KDE
  useful for a variety of people: from researchers to artists to web-designers to
  people with low vision.
  .
- This package is part of KDE3, as a component of the KDE accessibility module.
+ This package is part of Trinity, as a component of the KDE accessibility module.
  See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
 
 Package: kmousetool-trinity
@@ -88,7 +88,7 @@ Description: KDE mouse manipulation tool for the disabled
  designed to help those with repetitive strain injuries, for whom pressing
  buttons hurts.
  .
- This package is part of KDE3, as a component of the KDE accessibility module.
+ This package is part of Trinity, as a component of the KDE accessibility module.
  See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
 
 Package: kmouth-trinity
@@ -102,7 +102,7 @@ Description: a type-and-say KDE frontend for speech synthesizers
  It includes a history of spoken sentences from which the user can select
  sentences to be re-spoken.
  .
- This package is part of KDE3, as a component of the KDE accessibility module.
+ This package is part of Trinity, as a component of the KDE accessibility module.
  See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
 
 Package: ksayit-trinity
@@ -113,7 +113,7 @@ Suggests: khelpcenter-trinity
 Description: a frontend for the KDE Text-to-Speech system
  Text-to-speech front-end to kttsd.
  .
- This package is part of KDE3, as a component of the KDE accessibility module.
+ This package is part of Trinity, as a component of the KDE accessibility module.
  See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
 
 
@@ -130,7 +130,7 @@ Description: a Text-to-Speech system for KDE
  ksayit and kmouth are useful front-ends for this capability, while one of
  festival, flite, and epos are essential back-ends.
  .
- This package is part of KDE3, as a component of the KDE accessibility module.
+ This package is part of Trinity, as a component of the KDE accessibility module.
  See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
  .
   Homepage: http://accessibility.kde.org/developer/kttsd
@@ -146,7 +146,7 @@ Description: the KDE Text-to-Speech system
  Those plugins will require manual installation of third party,
  non free software to work.
  .
- This package is part of KDE3, as a component of the KDE accessibility module.
+ This package is part of Trinity, as a component of the KDE accessibility module.
  See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
 
 Package: kdeaccessibility-trinity-dbg
diff --git a/debian/squeeze/kdeaddons/debian/changelog b/debian/squeeze/kdeaddons/debian/changelog
index ac5bda18d..d7003caa9 100644
--- a/debian/squeeze/kdeaddons/debian/changelog
+++ b/debian/squeeze/kdeaddons/debian/changelog
@@ -12,7 +12,7 @@ kdeaddons-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
 kdeaddons-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 14:24:00 -0600
@@ -739,7 +739,7 @@ kdeaddons (4:3.1.0-3) unstable; urgency=low
 
 kdeaddons (4:3.1.0-2) unstable; urgency=low
 
-  * First KDE3 upload to debian!
+  * First Trinity upload to debian!
   * Applied Ewald Snel's patch for xine support.
   * Rolled the epoch to aid upgrades from the unofficial repository on
     ftp.kde.org.. *sigh*
diff --git a/debian/squeeze/kdeaddons/debian/control b/debian/squeeze/kdeaddons/debian/control
index e4043e5c2..9345f0b9b 100644
--- a/debian/squeeze/kdeaddons/debian/control
+++ b/debian/squeeze/kdeaddons/debian/control
@@ -12,14 +12,14 @@ Architecture: all
 Section: kde
 Depends: atlantikdesigner-trinity (>= ${Source-Version}), kaddressbook-plugins-trinity (>= ${Source-Version}), kate-plugins-trinity (>= ${Source-Version}), kdeaddons-kfile-plugins-trinity (>= ${Source-Version}), kicker-applets-trinity (>= ${Source-Version}), konq-plugins-trinity (>= ${Source-Version}), ksig-trinity (>= ${Source-Version}), noatun-plugins-trinity (>= ${Source-Version})
 Suggests: kdeaddons-trinity-doc-html
-Description: add-on plugins and applets provided with KDE3
+Description: add-on plugins and applets provided with Trinity
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
  This metapackage includes a collection of add-on plugins and applets
- provided with the official release of KDE3.
+ provided with the official release of Trinity.
 
 Package: kdeaddons-trinity-doc-html
 Architecture: all
@@ -36,7 +36,7 @@ Description: KDE add-ons documentation in HTML format
  /opt/trinity/share/doc/kde/HTML/en/kicker-applets/. Documentation is provided for
  most KDE addons packages.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: atlantikdesigner-trinity
@@ -53,7 +53,7 @@ Description: game board designer for Atlantik
  game in which the properties include several major cities in North
  America and Europe.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: kaddressbook-plugins-trinity
@@ -62,7 +62,7 @@ Section: kde
 Depends: ${shlibs:Depends}
 Suggests: kworldclock-trinity, khelpcenter-trinity, kdeaddons-trinity-doc-html
 Enhances: kaddressbook-trinity
-Description: plugins for KAddressBook, the KDE3 address book
+Description: plugins for KAddressBook, the Trinity address book
  This package contains a variety of useful plugins for the KDE address
  book.  These plugins can be loaded through the KDE address book settings.
  .
@@ -70,7 +70,7 @@ Description: plugins for KAddressBook, the KDE3 address book
  as well as importing and exporting contacts in the native format used
  by the German freemail provider GMX.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: kate-plugins-trinity
@@ -89,7 +89,7 @@ Description: plugins for Kate, the KDE Advanced Text Editor
  and text snippets, opening of C/C++ headers, extraction of C/C++ symbols,
  a tab bar, a Python browser and even more.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: kdeaddons-kfile-plugins-trinity
@@ -97,7 +97,7 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
 Provides: renamedlg-plugins-trinity
-Description: KDE3 file dialog plugins for text files and folders
+Description: Trinity file dialog plugins for text files and folders
  This is a collection of plugins for the KDE file dialog.  These plugins
  extend the file dialog to offer advanced meta-information for text,
  HTML and desktop files, as well as for folders, Windows .lnk files,
@@ -108,7 +108,7 @@ Description: KDE3 file dialog plugins for text files and folders
  decision regarding conflicting filenames.  Rename dialog plugins are
  provided for audio and image files.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: kicker-applets-trinity
@@ -118,7 +118,7 @@ Depends: ${shlibs:Depends}, kicker-trinity
 Suggests: xmms-kde-trinity, khelpcenter-trinity, kdeaddons-trinity-doc-html
 Provides: ktimemon-trinity
 Enhances: kicker-trinity
-Description: applets for Kicker, the KDE3 panel
+Description: applets for Kicker, the Trinity panel
  This package contains a variety of applets for Kicker, the KDE panel.
  These applets will appear in the panel's Add--Applet menu.
  .
@@ -129,7 +129,7 @@ Description: applets for Kicker, the KDE3 panel
  kicker-applets users to install XMMS. If you want a kicker applet that
  controls XMMS, install the xmms-kde-trinity package.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: knewsticker-scripts-trinity
@@ -138,7 +138,7 @@ Section: kde
 Depends: ${perl:Depends}, python, libfinance-quote-perl, libmime-perl, libnews-nntpclient-perl, libwww-perl
 Recommends: knewsticker-trinity
 Enhances: knewsticker-trinity
-Description: scripts for KNewsTicker, the KDE3 news ticker
+Description: scripts for KNewsTicker, the Trinity news ticker
  This package contains a variety of scripts that provide additional news
  sources for KNewsTicker, the news ticker applet for the KDE panel.  See
  /opt/trinity/share/doc/knewsticker-scripts/README.Debian for usage details.
@@ -146,7 +146,7 @@ Description: scripts for KNewsTicker, the KDE3 news ticker
  Highlights include newsgroup handling, stock data retrieval, sports scores
  and various local news sources.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: konq-plugins-trinity
@@ -157,7 +157,7 @@ Recommends: akregator-trinity, ark-trinity, imagemagick
 Suggests: khelpcenter-trinity, kdeaddons-trinity-doc-html
 Enhances: konqueror-trinity, akregator-trinity
 Provides: akregator-konq-plugin-trinity
-Description: plugins for Konqueror, the KDE3 file/web/doc browser
+Description: plugins for Konqueror, the Trinity file/web/doc browser
  This package contains a variety of useful plugins for Konqueror, the
  file manager, web browser and document viewer for KDE.  Many of these
  plugins will appear in Konqueror's Tools menu.
@@ -173,7 +173,7 @@ Description: plugins for Konqueror, the KDE3 file/web/doc browser
  media player, a file information metabar/sidebar, a media folder helper, a
  graphical disk usage viewer and image conversions and transformations.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: ksig-trinity
@@ -192,7 +192,7 @@ Description: graphical tool for managing multiple email signatures
  signatures in external mail clients such as KMail.  See
  /opt/trinity/share/doc/ksig/README.Debian for details on how this can be done.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: noatun-plugins-trinity
@@ -200,7 +200,7 @@ Architecture: any
 Section: sound
 Depends: ${shlibs:Depends}
 Enhances: noatun-trinity
-Description: plugins for Noatun, the KDE3 media player
+Description: plugins for Noatun, the Trinity media player
  This package contains a variety of useful plugins for Noatun, the audio and
  video media player for KDE.  These plugins can be loaded through the plugin
  manager in Noatun settings.
@@ -209,7 +209,7 @@ Description: plugins for Noatun, the KDE3 media player
  playback speed, capture to wave file and displaying lyrics, plus a variety
  of user interfaces, playlists and visualisation plugins.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: kdeaddons-trinity-dbg
diff --git a/debian/squeeze/kdeadmin/debian/changelog b/debian/squeeze/kdeadmin/debian/changelog
index fd61ea601..254472cd9 100644
--- a/debian/squeeze/kdeadmin/debian/changelog
+++ b/debian/squeeze/kdeadmin/debian/changelog
@@ -6,7 +6,7 @@ kdeadmin-trinity (4:3.5.10-0ubuntu4) karmic; urgency=low
 
 kdeadmin-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 01 March 2009 12:46:00 -0600
diff --git a/debian/squeeze/kdeadmin/debian/control b/debian/squeeze/kdeadmin/debian/control
index 5e600a44b..5258ab6e7 100644
--- a/debian/squeeze/kdeadmin/debian/control
+++ b/debian/squeeze/kdeadmin/debian/control
@@ -13,7 +13,7 @@ Architecture: all
 Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), kdeadmin-kfile-plugins-trinity (>= ${Source-Version}), knetworkconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version})
 Recommends: lilo-config-trinity (>= ${Source-Version})
 Suggests: kdeadmin-trinity-doc-html (>= ${Source-Version})
-Description: system administration tools from the official KDE3 release
+Description: system administration tools 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,
  contemporary functionality, and outstanding graphical design with the
@@ -37,7 +37,7 @@ Description: KDE administration documentation in HTML format
  /usr/share/doc/kde/HTML/en/kcron/. Documentation is provided for most
  KDE administration packages.
  .
- This package is part of KDE3, and a component of the KDE administration
+ This package is part of Trinity, and a component of the KDE administration
  module. See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
 
 Package: kcron-trinity
@@ -45,11 +45,11 @@ Section: admin
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: the KDE3 crontab editor
+Description: the Trinity crontab editor
  KCron is an application for scheduling programs to run in the background.
  It is a graphical user interface to cron, the UNIX system scheduler.
  .
- This package is part of KDE3, as a component of the KDE administration module.
+ This package is part of Trinity, as a component of the KDE administration module.
  See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
 
 Package: kdat-trinity
@@ -57,7 +57,7 @@ Section: admin
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: a KDE3 tape backup tool
+Description: a Trinity tape backup tool
  KDat is a tar-based tape archiver. It is designed to work with multiple
  archives on a single tape.
  .
@@ -68,28 +68,28 @@ Description: a KDE3 tape backup tool
   * Selective restore of files from an archive.
   * Backup profiles for frequently used backups.
  .
- This package is part of KDE3, as a component of the KDE administration module.
+ This package is part of Trinity, as a component of the KDE administration module.
  See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
 
 Package: kdeadmin-kfile-plugins-trinity
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 file metainfo plugins for deb and rpm files
+Description: Trinity file metainfo plugins for deb and rpm files
  File metainfo plugins for deb and rpm package files.
  .
- This package is part of KDE3, as a component of the KDE administration module.
+ This package is part of Trinity, as a component of the KDE administration module.
  See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
 
 Package: knetworkconf-trinity
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 network configuration tool
+Description: Trinity network configuration tool
  This is a KDE control center module to configure TCP/IP settings.  It
  can be used to manage network devices and settings for each device.
  .
- This package is part of KDE3, as a component of the KDE administration module.
+ This package is part of Trinity, as a component of the KDE administration module.
  See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
 
 Package: kpackage-trinity
@@ -98,12 +98,12 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: rpm
 Suggests: khelpcenter-trinity
-Description: KDE3 package management tool
+Description: Trinity package management tool
  This is a frontend to both .rpm and .deb package formats. It allows you
  to view currently installed packages, browse available packages, and
  install/remove them.
  .
- This package is part of KDE3, as a component of the KDE administration module.
+ This package is part of Trinity, as a component of the KDE administration module.
  See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
 
 Package: ksysv-trinity
@@ -111,11 +111,11 @@ Section: admin
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: KDE3 SysV-style init configuration editor
+Description: Trinity SysV-style init configuration editor
  This program allows you to edit your start and stop scripts using a
  drag and drop GUI.
  .
- This package is part of KDE3, as a component of the KDE administration module.
+ This package is part of Trinity, as a component of the KDE administration module.
  See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
 
 Package: kuser-trinity
@@ -123,10 +123,10 @@ Section: admin
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: KDE3 user/group administration tool
+Description: Trinity user/group administration tool
  A user/group administration tool for KDE.
  .
- This package is part of KDE3, as a component of the KDE administration module.
+ This package is part of Trinity, as a component of the KDE administration module.
  See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
 
 Package: lilo-config-trinity
@@ -135,14 +135,14 @@ Architecture: none
 Depends: ${shlibs:Depends}, kcontrol-trinity
 Recommends: kdebase-trinity-bin
 Suggests: lilo
-Description: KDE3 frontend for lilo configuration
+Description: Trinity frontend for lilo configuration
  lilo-config is a KDE based frontend to the lilo boot manager configuration.
  It runs out of the KDE Control Center.
  .
  If you want to use the menu entry to launch lilo-config, you need to install
  kdebase-bin since it uses the kdesu command to gain root privileges.
  .
- This package is part of KDE3, as a component of the KDE administration module.
+ This package is part of Trinity, as a component of the KDE administration module.
  See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
 
 Package: kdeadmin-trinity-dbg
diff --git a/debian/squeeze/kdeartwork/debian/changelog b/debian/squeeze/kdeartwork/debian/changelog
index d78974c5c..39c479ae0 100644
--- a/debian/squeeze/kdeartwork/debian/changelog
+++ b/debian/squeeze/kdeartwork/debian/changelog
@@ -6,7 +6,7 @@ kdeartwork-trinity (4:3.5.10-0ubuntu1) karmic; urgency=low
 
 kdeartwork-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 28 Feb 2009 14:52:00 -0600
@@ -587,7 +587,7 @@ kdeartwork (4:3.1.0-3) unstable; urgency=low
 
 kdeartwork (4:3.1.0-2) unstable; urgency=low
 
-  * First KDE3 upload to debian!
+  * First Trinity upload to debian!
   * Build-depends on xlibmesa-gl-dev and xlibmesa-glu-dev.
 
  -- Ben Burton <bab@debian.org>  Mon,  3 Feb 2003 08:53:03 +1100
diff --git a/debian/squeeze/kdeartwork/debian/control b/debian/squeeze/kdeartwork/debian/control
index 76adf5192..d83fa3d34 100644
--- a/debian/squeeze/kdeartwork/debian/control
+++ b/debian/squeeze/kdeartwork/debian/control
@@ -13,7 +13,7 @@ Architecture: all
 Section: kde
 Depends: kdeartwork-misc-trinity (>= ${Source-Version}), kdeartwork-emoticons-trinity (>= ${Source-Version}), kdeartwork-style-trinity (>= ${Source-Version}), kdeartwork-theme-icon-trinity (>= ${Source-Version}), kdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), kscreensaver-trinity (>= ${Source-Version})
 Recommends: kscreensaver-xsavers-trinity
-Description: themes, styles and more from the official KDE3 release
+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,
  contemporary functionality, and outstanding graphical design with the
@@ -44,20 +44,20 @@ Description: various multimedia goodies released with KDE
  This package contains miscellaneous multimedia goodies for KDE.
  Included are additional KDE sounds and kworldclock themes.
  .
- This package is part of KDE3, and a component of the KDE artwork module.
+ This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
 
 Package: kdeartwork-style-trinity
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
-Description: widget styles released with KDE3
- This package contains additional widget styles for KDE3. Widget styles
+Description: widget styles released with Trinity
+ This package contains additional widget styles for Trinity. Widget styles
  can be used to customise the look and feel of interface components such
  as buttons, scrollbars and so on.  They can be applied using the style
  manager in the KDE Control Centre.
  .
- This package is part of KDE3, and a component of the KDE artwork module.
+ This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
 
 Package: kdeartwork-theme-icon-trinity
@@ -65,25 +65,25 @@ Architecture: all
 Section: kde
 Recommends: kdesktop-trinity, kicker-trinity
 Replaces: kdelibs-data-trinity (<< 4:3.5)
-Description: icon themes released with KDE3
- This package contains additional icon themes for KDE3. Icon themes can be
+Description: icon themes released with Trinity
+ This package contains additional icon themes for Trinity. Icon themes can be
  used to customise the appearance of standard icons throughout KDE. They
- can be applied using the icon manager in the KDE3 Control Centre.
+ can be applied using the icon manager in the Trinity Control Centre.
  .
- This package is part of KDE3, and a component of the KDE artwork module.
+ This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
 
 Package: kdeartwork-theme-window-trinity
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
-Description: window decoration themes released with KDE3
- This package contains additional window decoration themes for KDE3. Window
+Description: window decoration themes released with Trinity
+ This package contains additional window decoration themes for Trinity. Window
  decoration themes can be used to customise the look of window borders and
- buttons, and can be applied using the window decoration manager in the KDE3
+ buttons, and can be applied using the window decoration manager in the Trinity
  Control Center.
  .
- This package is part of KDE3, and a component of the KDE artwork module.
+ This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
 
 Package: kdewallpapers-trinity
@@ -91,11 +91,11 @@ Architecture: all
 Section: kde
 Suggests: kwin-trinity | x-window-manager
 Replaces: kdebase-data-trinity (<< 4:3.5)
-Description: wallpapers released with KDE3
- This package contains additional wallpapers for KDE3. Wallpapers can be
+Description: wallpapers released with Trinity
+ This package contains additional wallpapers for Trinity. Wallpapers can be
  applied using the background manager in the KDE Control Centre.
  .
- This package is part of KDE3, and a component of the KDE artwork module.
+ This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
 
 Package: kscreensaver-trinity
@@ -103,16 +103,16 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, kdebase-trinity-bin
 Recommends: kwin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version})
-Description: additional screen savers released with KDE3
- This package contains the screen savers for KDE3. They can be tested and
- selected within the Appearance and Themes section of the KDE3 Control
+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
  Center.
  .
  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.
  .
- This package is part of KDE3, and a component of the KDE artwork module.
+ This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
 
 Package: kscreensaver-xsavers-trinity
@@ -121,27 +121,27 @@ Section: kde
 Depends: ${shlibs:Depends}, kdebase-trinity-bin, xscreensaver-data
 Recommends: kwin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl
 Suggests: kscreensaver-xsavers-webcollage-trinity
-Description: KDE3 hooks for standard xscreensavers
+Description: Trinity hooks for standard xscreensavers
  This package allows a smooth integration of the standard xscreensavers
- into KDE3. With this package installed you can select and/or configure
+ into Trinity. With this package installed you can select and/or configure
  the standard xscreensavers through the Appearances and Themes section of
- the KDE3 Control Centre.
+ the Trinity Control Centre.
  .
  Note that this package does not actually contain any screensavers itself.
- For the additional screensavers shipped with KDE3, see the separate package
+ For the additional screensavers shipped with Trinity, see the separate package
  kscreensaver-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 KDE3.
+ files to integrate these packages into Trinity.
  .
- This package is part of KDE3, and a component of the KDE artwork module.
+ This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
 
 Package: kscreensaver-xsavers-webcollage-trinity
 Architecture: all
 Section: kde
 Depends: kscreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm
-Description: webcollage screensaver KDE3 hook
- This package give access to the webcollage screensaver through the KDE3
+Description: webcollage screensaver Trinity hook
+ This package give access to the webcollage screensaver through the Trinity
  screensaver configuration.
  .
  This screensaver downloads random pictures from the internet and creates
@@ -156,7 +156,7 @@ Description: webcollage screensaver KDE3 hook
  /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the 
  installation.
  .
- This package is part of KDE3, and a component of the KDE artwork module.
+ This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
 
 Package: kscreensaver-xsavers-extra-trinity
@@ -164,17 +164,17 @@ Architecture: all
 Section: kde
 Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies
 Recommends: kwin-trinity, kscreensaver-trinity (= ${Source-Version})
-Description: KDE3 hooks for standard xscreensavers
+Description: Trinity hooks for standard xscreensavers
  This package allows a smooth integration of the universe xscreensavers
- into KDE3. With this package installed you can select and/or configure
+ into Trinity. With this package installed you can select and/or configure
  the universe xscreensavers through the Appearances and Themes section of
- the KDE3 Control Centre.
+ the Trinity Control Centre.
  .
  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 is part of KDE3, and a component of the KDE artwork module.
+ This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
 
 Package: kdeartwork-trinity-dbg
diff --git a/debian/squeeze/kdebase/debian/changelog b/debian/squeeze/kdebase/debian/changelog
index 5d6e57ac4..9742e6bde 100644
--- a/debian/squeeze/kdebase/debian/changelog
+++ b/debian/squeeze/kdebase/debian/changelog
@@ -152,7 +152,7 @@ kdebase-trinity (4:3.5.10-0ubuntu4~intrepid10) intrepid; urgency=low
 
 kdebase-trinity (4:3.5.10-0ubuntu4~intrepid8) intrepid; urgency=low
 
-  * Repaired plasma startup to autodetect KDE3/KDE4 and not run/run accordingly
+  * Repaired plasma startup to autodetect Trinity/KDE4 and not run/run accordingly
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 15 Apr 2009 11:37:00 -0600
 
@@ -202,7 +202,7 @@ kdebase-trinity (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low
 
 kdebase-trinity (4:3.5.10-0ubuntu3~intrepid15) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
   * Removed unbuilt libraries khotkeys_arts.la and khotkeys_arts.so
 
@@ -258,7 +258,7 @@ kdebase-trinity (4:3.5.10-0ubuntu2~intrepid11) intrepid; urgency=low
 
 kdebase-trinity (4:3.5.10-0ubuntu2~intrepid9) intrepid; urgency=low
 
-  * Fixed KDE3 games path
+  * Fixed Trinity games path
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 01 Dec 2008 00:34:00 -0600
 
@@ -574,7 +574,7 @@ kdebase (4:3.5.8.dfsg.1-2) unstable; urgency=low
   +++ Changes by Armin Berres:
 
   * Split off kdebase-bin-trinity which contains executables which can be provided by
-    KDE3 or KDE4.
+    Trinity or KDE4.
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
diff --git a/debian/squeeze/kdebase/debian/control b/debian/squeeze/kdebase/debian/control
index c28567d94..8681f7ea0 100644
--- a/debian/squeeze/kdebase/debian/control
+++ b/debian/squeeze/kdebase/debian/control
@@ -30,9 +30,9 @@ Package: kdebase-runtime-data-common-trinity
 Section: kde
 Architecture: all
 Depends: kdebase-trinity
-Description: Shared common files for KDE3 and KDE4
+Description: Shared common files for Trinity and KDE4
  .
- Shared common files for both KDE3 and KDE4
+ Shared common files for both Trinity and KDE4
  Such as the desktop right-click-"Create New" list
 
 Package: kappfinder-trinity
@@ -306,7 +306,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Replaces: kdebase-trinity (<< 4:3.0.0), kdebase-trinity-doc (<< 4:3.0.0)
-Description: clipboard utility for KDE3
+Description: clipboard utility for Trinity
  klipper provides standard clipboard functions (cut and paste, history
  saving) plus additional features, like the ability to offer actions to 
  take dependent on the clipboard contents. For example, it can launch a 
diff --git a/debian/squeeze/kdebase/debian/kdebase-data-trinity.install b/debian/squeeze/kdebase/debian/kdebase-data-trinity.install
index 1d0003595..c14dd7dcc 100644
--- a/debian/squeeze/kdebase/debian/kdebase-data-trinity.install
+++ b/debian/squeeze/kdebase/debian/kdebase-data-trinity.install
@@ -1172,8 +1172,8 @@ debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png
 debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png.desktop
 debian/tmp/opt/trinity/share/wallpapers/isadora.png
 debian/tmp/opt/trinity/share/wallpapers/isadora.png.desktop
-debian/tmp/opt/trinity/share/wallpapers/KDE34.png
-debian/tmp/opt/trinity/share/wallpapers/KDE34.png.desktop
+debian/tmp/opt/trinity/share/wallpapers/Trinity4.png
+debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop
 debian/tmp/opt/trinity/share/wallpapers/konqui.svgz
 debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop
 debian/tmp/opt/trinity/share/wallpapers/lineart.svgz
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.init b/debian/squeeze/kdebase/debian/kdm-trinity.init
index 28bca2f65..effad2fd6 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.init
+++ b/debian/squeeze/kdebase/debian/kdm-trinity.init
@@ -7,7 +7,7 @@
 # Should-Stop:       console-screen
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: X display manager for KDE3
+# Short-Description: X display manager for Trinity
 # Description:       KDM manages a collection of X servers, which may be on the local host or remote machines.
 ### END INIT INFO
 # /etc/init.d/kdm-trinity: start or stop the X display manager
diff --git a/debian/squeeze/kdebase/debian/plasma-desktop.autodetect b/debian/squeeze/kdebase/debian/plasma-desktop.autodetect
index 436ca7b45..b083cb277 100755
--- a/debian/squeeze/kdebase/debian/plasma-desktop.autodetect
+++ b/debian/squeeze/kdebase/debian/plasma-desktop.autodetect
@@ -5,8 +5,8 @@ echo "You are running $DESKTOP_SESSION"
 
 if [[ "$DESKTOP_SESSION" == "trinity" ]]
 then
-	# Do nothing, this is KDE3
-	echo "I detected KDE3"
+	# Do nothing, this is Trinity
+	echo "I detected Trinity"
 else
 	# This is KDE4, start plasma-desktop
 	echo "I detected KDE4"
diff --git a/debian/squeeze/kdebase/debian/plasma.autodetect b/debian/squeeze/kdebase/debian/plasma.autodetect
index 40e44f6cd..c23f68909 100755
--- a/debian/squeeze/kdebase/debian/plasma.autodetect
+++ b/debian/squeeze/kdebase/debian/plasma.autodetect
@@ -5,8 +5,8 @@ echo "You are running $DESKTOP_SESSION"
 
 if [[ "$DESKTOP_SESSION" == "trinity" ]]
 then
-	# Do nothing, this is KDE3
-	echo "I detected KDE3"
+	# Do nothing, this is Trinity
+	echo "I detected Trinity"
 else
 	# This is KDE4, start plasma
 	echo "I detected KDE4"
diff --git a/debian/squeeze/kdebase/debian/rules b/debian/squeeze/kdebase/debian/rules
index c621bf7d8..ac42efaf8 100755
--- a/debian/squeeze/kdebase/debian/rules
+++ b/debian/squeeze/kdebase/debian/rules
@@ -271,4 +271,3 @@ binary-install/ksmserver-trinity::
 	install -p -D -m644 debian/tmp/opt/trinity/share/apps/kdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop
 	install -p -D -m755 debian/plasma.autodetect debian/ksmserver-trinity/usr/bin/plasma.autodetect
 	install -p -D -m755 debian/plasma-desktop.autodetect debian/ksmserver-trinity/usr/bin/plasma-desktop.autodetect
-	sed -i 's/KDE3/Trinity/g' debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop
diff --git a/debian/squeeze/kdebindings/debian/changelog b/debian/squeeze/kdebindings/debian/changelog
index d0c50e74d..e1fe10439 100644
--- a/debian/squeeze/kdebindings/debian/changelog
+++ b/debian/squeeze/kdebindings/debian/changelog
@@ -6,7 +6,7 @@ kdebindings-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
 
 kdebindings-trinity (4:3.5.10-0ubuntu1~intrepid8) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/kdeedu/debian/changelog b/debian/squeeze/kdeedu/debian/changelog
index a00ec297a..c2bf5435e 100644
--- a/debian/squeeze/kdeedu/debian/changelog
+++ b/debian/squeeze/kdeedu/debian/changelog
@@ -12,7 +12,7 @@ kdeedu-trinity (4:3.5.10-0ubuntu4) karmic; urgency=low
 
 kdeedu-trinity (4:3.5.10-0ubuntu1~intrepid4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 17:24:00 -0600
@@ -767,7 +767,7 @@ kdeedu (4:3.1.0-3) unstable; urgency=low
 
 kdeedu (4:3.1.0-2) unstable; urgency=low
 
-  * First KDE3 upload to debian (closes: #119019).
+  * First Trinity upload to debian (closes: #119019).
   * Rolled the epoch to aid upgrades from the unofficial repository on
     ftp.kde.org.. *sigh*
 
diff --git a/debian/squeeze/kdeedu/debian/control b/debian/squeeze/kdeedu/debian/control
index 56160a893..85fee7dc0 100644
--- a/debian/squeeze/kdeedu/debian/control
+++ b/debian/squeeze/kdeedu/debian/control
@@ -12,24 +12,24 @@ Architecture: all
 Section: kde
 Depends: blinken-trinity (>= ${Source-Version}), kalzium-trinity (>= ${Source-Version}), kanagram-trinity (>= ${Source-Version}), kbruch-trinity (>= ${Source-Version}), kdeedu-data-trinity (>= ${Source-Version}), keduca-trinity (>= ${Source-Version}), kgeography-trinity (>= ${Source-Version}), khangman-trinity (>= ${Source-Version}), kig-trinity (>= ${Source-Version}), kiten-trinity (>= ${Source-Version}), klatin-trinity (>= ${Source-Version}), klettres-trinity (>= ${Source-Version}), kmplot-trinity (>= ${Source-Version}), kpercentage-trinity (>= ${Source-Version}), kstars-trinity (>= ${Source-Version}), ktouch-trinity (>= ${Source-Version}), kturtle-trinity (>= ${Source-Version}), kverbos-trinity (>= ${Source-Version}), kvoctrain-trinity (>= ${Source-Version}), kwordquiz-trinity (>= ${Source-Version}), indi-trinity (>= ${Source-Version})
 Suggests: kdeedu-trinity-doc-html
-Description: educational apps from the official KDE3 release
+Description: educational apps 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,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
  This metapackage includes educational applications provided with the
- official release of KDE3.
+ official release of Trinity.
 
 Package: kdeedu-data-trinity
 Architecture: all
 Section: kde
-Description: shared data for KDE3 educational applications
+Description: shared data for Trinity educational applications
  This package contains shared data necessary for running the
  educational applications provided with KDE (the K Desktop
  Environment).
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kdeedu-trinity-dbg
@@ -46,7 +46,7 @@ Package: kdeedu-trinity-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror-trinity | www-browser, kdeedu-trinity
-Description: KDE3 edutainment documentation in HTML format
+Description: Trinity edutainment documentation in HTML format
  By default the educational applications provided with KDE (the K
  Desktop Environment) only provide their documentation in KDE docbook
  format, which can only be read by Konqueror or KHelpCenter. This
@@ -58,7 +58,7 @@ Description: KDE3 edutainment documentation in HTML format
  /opt/trinity/share/doc/kde/HTML/en/kalzium/. Documentation is provided for
  most KDE educational packages.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: blinken-trinity
@@ -66,7 +66,7 @@ Architecture: any
 Section: games
 Depends: ${shlibs:Depends}, ttf-sjfonts, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
-Description: KDE3 version of the Simon Says electronic memory game
+Description: Trinity version of the Simon Says electronic memory game
  Blinken is based on an electronic game released in 1978, which
  challenges players to remember sequences of increasing length.  On
  the face of the device, there are 4 different color buttons, each
@@ -76,7 +76,7 @@ Description: KDE3 version of the Simon Says electronic memory game
  correct order, they advance to the next stage, where an identical
  sequence with one extra step is presented.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kalzium-trinity
@@ -84,7 +84,7 @@ Architecture: any
 Section: science
 Depends: ${shlibs:Depends}, kalzium-data-trinity (>> ${KDE-Version3}), kalzium-data-trinity (<< ${KDE-Next-Version3}), kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
-Description: chemistry teaching tool for KDE3
+Description: chemistry teaching tool for Trinity
  Kalzium is a program which shows you the Periodic System of Elements
  (PSE).  You can use Kalzium to search for information about the
  elements or to learn facts about the PSE.
@@ -101,7 +101,7 @@ Description: chemistry teaching tool for KDE3
  OCaml supports native code generation, Kalzium includes a chemical
  equation solver.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kalzium-data-trinity
@@ -115,7 +115,7 @@ Description: data files for Kalzium
  .
  See the kalzium package for further information.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kanagram-trinity
@@ -123,7 +123,7 @@ Architecture: any
 Section: games
 Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
-Description: letter order game for KDE3
+Description: letter order game for Trinity
  KAnagram is a game that is based on the word/letter puzzles that the
  author played as a child.  A word is picked at random and displayed
  with its letters in a messed order, with difficulty dependent on the
@@ -136,7 +136,7 @@ Description: letter order game for KDE3
  children aged 10+ because of the difficulty, but of course everyone
  is welcome to try.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kbruch-trinity
@@ -144,12 +144,12 @@ Architecture: any
 Section: math
 Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
-Description: fraction calculation teaching tool for KDE3
+Description: fraction calculation teaching tool for Trinity
  KBruch is a small program to practice calculating with fractions.
  Different exercises are provided for this purpose.  The program
  checks the user's input and gives feedback.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: keduca-trinity
@@ -157,11 +157,11 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
-Description: interactive form-based tests for KDE3
+Description: interactive form-based tests for Trinity
  KEduca is a flash-card application which allows you to make
  interactive form-based tests.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kgeography-trinity
@@ -169,13 +169,13 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, kgeography-data-trinity (>> ${KDE-Version3}), kgeography-data-trinity (<< ${KDE-Next-Version3}), kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
-Description: Geography learning tool for KDE3
+Description: Geography learning tool for Trinity
  KGeography contains maps allowing you to learn various countries or
  the political divisions of several countries.  It has several modes,
  including a map browser and games involving the names, capitals, or
  flags of the map divisions.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kgeography-data-trinity
@@ -188,7 +188,7 @@ Description: data files for KGeography
  .
  See the kgeography package for further information.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: khangman-trinity
@@ -196,7 +196,7 @@ Architecture: any
 Section: games
 Depends: ${shlibs:Depends}, ttf-dustin, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
-Description: the classical hangman game for KDE3
+Description: the classical hangman game for Trinity
  KHangMan is a game based on the well known hangman game.  It is aimed
  for children aged 6 and above.  It has four levels of difficulty:
  Animals (animals words), Easy, Medium and Hard.
@@ -206,7 +206,7 @@ Description: the classical hangman game for KDE3
  guess a wrong letter, a picture of a hangman is drawn.  You must
  guess the word before getting hanged!  You have 10 tries.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kig-trinity
@@ -232,7 +232,7 @@ Description: interactive geometry program for KDE
  and exports to/from foreign file formats including Cabri, Dr. Geo,
  KGeo, KSeg and XFig.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kiten-trinity
@@ -240,14 +240,14 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3}), ttf-kochi-gothic | ttf-kochi-mincho
 Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
-Description: Japanese reference/study tool for KDE3
+Description: Japanese reference/study tool for Trinity
  Kiten is a Japanese reference and study tool for KDE.  It is an
  application with multiple functions.  Firstly, it is a convenient
  English to Japanese and Japanese to English dictionary.  Secondly, it
  is a Kanji dictionary, with multiple ways to look up specific
  characters.  Thirdly, it is a tool to help you learn Kanji.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: klatin-trinity
@@ -270,7 +270,7 @@ Description: application to help revise/teach Latin
  a noun or a verb, such as the "ablative singular", or the "1st person
  indicative passive plural", and is not multiple choice.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: klettres-trinity
@@ -278,7 +278,7 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, klettres-data-trinity (>> ${KDE-Version3}), klettres-data-trinity (<< ${KDE-Next-Version3}), kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
-Description: foreign alphabet tutor for KDE3
+Description: foreign alphabet tutor for Trinity
  KLettres is an application specially designed to help the user to
  learn the alphabet in a new language and then to learn to read simple
  syllables.  The user can be a young child aged from two and a half or
@@ -287,7 +287,7 @@ Description: foreign alphabet tutor for KDE3
  Seven languages are currently available: Czech, Danish, Dutch,
  English, French, Italian and Slovak.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: klettres-data-trinity
@@ -301,7 +301,7 @@ Description: data files for KLettres foreign alphabet tutor
  .
  See the klettres package for further information.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kmplot-trinity
@@ -309,7 +309,7 @@ Architecture: any
 Section: math
 Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
-Description: mathematical function plotter for KDE3
+Description: mathematical function plotter for Trinity
  KmPlot is a mathematical function plotter for KDE.  It has a powerful
  built-in parser.  You can plot different functions simultaneously and
  combine them to build new functions.
@@ -323,7 +323,7 @@ Description: mathematical function plotter for KDE3
  maximum and minimum values, changing function parameters dynamically
  and plotting derivatives and integral functions.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kpercentage-trinity
@@ -331,7 +331,7 @@ Architecture: any
 Section: math
 Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
-Description: percentage calculation teaching tool for KDE3
+Description: percentage calculation teaching tool for Trinity
  KPercentage is a small math application that will help pupils to
  improve their skills in calculating percentages.
  .
@@ -339,7 +339,7 @@ Description: percentage calculation teaching tool for KDE3
  Finally the pupil can select a random mode, in which all three tasks
  are mixed randomly.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kstars-trinity
@@ -347,7 +347,7 @@ Architecture: any
 Section: science
 Depends: ${shlibs:Depends}, kstars-data-trinity (>> ${KDE-Version3}), kstars-data-trinity (<< ${KDE-Next-Version3}), kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3}), indi-trinity (= ${Source-Version})
 Suggests: konqueror-trinity, khelpcenter-trinity, kdeedu-trinity-doc-html
-Description: desktop planetarium for KDE3
+Description: desktop planetarium for Trinity
  KStars is a graphical desktop planetarium for KDE.  It depicts an
  accurate simulation of the night sky, including stars,
  constellations, star clusters, nebulae, galaxies, all planets, the
@@ -360,7 +360,7 @@ Description: desktop planetarium for KDE3
  powerful features, yet the interface is clean and simple and fun to
  use.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kstars-data-trinity
@@ -374,7 +374,7 @@ Description: data files for KStars desktop planetarium
  .
  See the kstars package for further information.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: ktouch-trinity
@@ -382,7 +382,7 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
-Description: touch typing tutor for KDE3
+Description: touch typing tutor for Trinity
  KTouch is a program for learning touch typing - it helps you learn to
  type on a keyboard quickly and correctly.  Every finger has its place
  on the keyboard with associated keys to press.
@@ -392,7 +392,7 @@ Description: touch typing tutor for KDE3
  are.  It can display which key to press next, and the correct finger
  to use.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kturtle-trinity
@@ -418,7 +418,7 @@ Description: educational Logo programming environment
  qualities of the programming language and will not try to suit
  professional programmers' needs.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kverbos-trinity
@@ -426,7 +426,7 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
-Description: Spanish verb form study application for KDE3
+Description: Spanish verb form study application for Trinity
  Kverbos allows the user to learn the forms of Spanish verbs.  The
  program suggests a verb and a time and the user enters the different
  verb forms.  The program corrects the user input and gives feedback.
@@ -435,7 +435,7 @@ Description: Spanish verb form study application for KDE3
  program can build regular verb forms by itself.  Irregular verb forms
  have to be entered by the user.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kvoctrain-trinity
@@ -443,7 +443,7 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
-Description: vocabulary trainer for KDE3
+Description: vocabulary trainer for Trinity
  KVocTrain is a little utility to help you train your vocabulary when
  you are trying to learn a foreign language.  You can create your own
  database with the words you need.  It is intended as a replacement
@@ -459,7 +459,7 @@ Description: vocabulary trainer for KDE3
  things.  This is and probably will stay beyond the scope of this
  application.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: kwordquiz-trinity
@@ -467,7 +467,7 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
-Description: flashcard and vocabulary learning program for KDE3
+Description: flashcard and vocabulary learning program for Trinity
  KWordQuiz is a flashcard-based tool that helps you to master new
  vocabularies. It may be a language or any other kind of terminology.
  .
@@ -476,33 +476,33 @@ Description: flashcard and vocabulary learning program for KDE3
  used by WordQuiz for Windows, csv files with comma-separated text,
  and xml.gz files created by Pauker (http://pauker.sourceforge.net).
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: libkdeedu3-trinity
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Description: library for use with KDE3 educational apps
+Description: library for use with Trinity educational apps
  The KDE-based library libkdeedu is used with educational
  applications.  It currently provides support for data plotting and
  vocabulary items (including a parser for kvtml vocabulary files).
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: libkdeedu-trinity-dev
 Architecture: any
 Section: libdevel
 Depends: libkdeedu3-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
-Description: development files for KDE3 educational library
+Description: development files for Trinity educational library
  The KDE-based library libkdeedu is used with educational
  applications.  It currently provides support for data plotting and
  vocabulary items (including a parser for kvtml vocabulary files).
  .
  Development files for libkdeedu are included in this package.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: libkiten1-trinity
@@ -521,7 +521,7 @@ Description: library for Kiten Japanese reference/study tool
  data, such as Japanese language data files and GUI resource files.
  For further information, see the kiten package.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: libkiten-trinity-dev
@@ -537,7 +537,7 @@ Description: development files for Kiten library
  Development files for libkiten are included in this package.  For
  further information, see the kiten package.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
 
 Package: indi-trinity
@@ -553,5 +553,5 @@ Description: Instrument Neutral Distributed Interface for astronomical devices
  communicate with the device drivers and build a completely dynamic GUI
  based on the services provided by the device.
  .
- This package is part of KDE3, as a component of the KDE education module.
+ This package is part of Trinity, as a component of the KDE education module.
  See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
diff --git a/debian/squeeze/kdegames/debian/changelog b/debian/squeeze/kdegames/debian/changelog
index efca8eb71..87bf8d4cb 100644
--- a/debian/squeeze/kdegames/debian/changelog
+++ b/debian/squeeze/kdegames/debian/changelog
@@ -6,7 +6,7 @@ kdegames-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
 
 kdegames-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 28 Feb 2009 16:19:00 -0600
diff --git a/debian/squeeze/kdegames/debian/control b/debian/squeeze/kdegames/debian/control
index 1ac335cae..f73fcc774 100644
--- a/debian/squeeze/kdegames/debian/control
+++ b/debian/squeeze/kdegames/debian/control
@@ -13,7 +13,7 @@ Architecture: all
 Section: kde
 Depends: atlantik-trinity (>= ${Source-Version}), kasteroids-trinity (>= ${Source-Version}), katomic-trinity (>= ${Source-Version}), kbackgammon-trinity (>= ${Source-Version}), kbattleship-trinity (>= ${Source-Version}), kblackbox-trinity (>= ${Source-Version}), kbounce-trinity (>= ${Source-Version}), kenolaba-trinity (>= ${Source-Version}), kfouleggs-trinity (>= ${Source-Version}), kgoldrunner-trinity (>= ${Source-Version}), kjumpingcube-trinity (>= ${Source-Version}), klickety-trinity (>= ${Source-Version}), klines-trinity (>= ${Source-Version}), kmahjongg-trinity (>= ${Source-Version}), kmines-trinity (>= ${Source-Version}), knetwalk-trinity (>= ${Source-Version}), kolf-trinity (>= ${Source-Version}), konquest-trinity (>= ${Source-Version}), kpat-trinity (>= ${Source-Version}), kpoker-trinity (>= ${Source-Version}), kreversi-trinity (>= ${Source-Version}), ksame-trinity (>= ${Source-Version}), kshisen-trinity (>= ${Source-Version}), ksirtet-trinity (>= ${Source-Version}), ksmiletris-trinity (>= ${Source-Version}), ksnake-trinity (>= ${Source-Version}), ksokoban-trinity (>= ${Source-Version}), kspaceduel-trinity (>= ${Source-Version}), ktron-trinity (>= ${Source-Version}), ktuberling-trinity (>= ${Source-Version}), kwin4-trinity (>= ${Source-Version}), lskat-trinity (>= ${Source-Version})
 Suggests: kdegames-trinity-doc-html (>= ${Source-Version}), khelpcenter-trinity
-Description: games from the official KDE3 release
+Description: games 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,
  contemporary functionality, and outstanding graphical design with the
@@ -44,7 +44,7 @@ Package: libkdegames1-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: KDE3 games library and common files
+Description: Trinity games library and common files
  This library provides a common infrastructure for several of the
  games in the KDE distribution. Features include standardized menu
  items, high score handling, card display, and network connections
@@ -67,11 +67,11 @@ Package: libkdegames-trinity-dev
 Architecture: any
 Section: libdevel
 Depends: kdelibs4-trinity-dev (>= 4:3.5.1), libkdegames1-trinity (= ${Source-Version})
-Description: KDE3 games library headers
+Description: Trinity games library headers
  This package is necessary if you want to develop your own games using
  the KDE games library.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: libkdegames-trinity-doc
@@ -79,20 +79,20 @@ Architecture: all
 Section: doc
 Recommends: kdelibs4-trinity-doc, qt3-doc
 Suggests: konqueror-trinity | www-browser, libkdegames-trinity-dev
-Description: API documentation for the KDE3 games library
+Description: API documentation for the Trinity games library
  This package contains the developers' documentation for libkdegames.
  You may want to install it if you wish to develop games for KDE.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kdegames-card-data-trinity
 Architecture: all
 Section: games
-Description: Card decks for KDE3 games
+Description: Card decks for Trinity games
  Several different collections of card images for use by KDE games.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: atlantik-trinity
@@ -107,7 +107,7 @@ Description: KDE client for Monopoly-like network games
  game in which the property includes several major cities in North
  America and Europe.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: atlantik-trinity-dev
@@ -119,14 +119,14 @@ Description: Development files for Atlantik
  This package contains header files for compiling programs against the
  libraries which come with Atlantik.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kasteroids-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: Asteroids for KDE3
+Description: Asteroids for Trinity
  You know this game.  It is based on Warwick Allison's QwSpriteField
  widget.
  .
@@ -134,20 +134,20 @@ Description: Asteroids for KDE3
  screen to advance to the next level. Your ship is destroyed if it
  makes contact with an asteroid.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: katomic-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: Atomic Entertainment game for KDE3
+Description: Atomic Entertainment game for Trinity
  This is a puzzle game, in which the object is to assemble a molecule
  from its atoms on a Sokoban-like board.  On each move, an atom goes
  as far as it can in a specified direction before being stopped by a
  wall or another atom.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kbackgammon-trinity
@@ -155,34 +155,34 @@ Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
 Suggests: gnubg
-Description: A Backgammon game for KDE3
- KBackgammon is a backgammon program for KDE3. It is based on the
+Description: A Backgammon game for Trinity
+ KBackgammon is a backgammon program for Trinity. It is based on the
  code, ideas and concepts of KFibs (which is a FIBS client for
  KDE1). For a short time, KBackgammon was called bacKgammon (if you
  know somebody who is still using bacKgammon, please force them to
  upgrade :-)).
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kbattleship-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: Battleship game for KDE3
+Description: Battleship game for Trinity
  This is an implementation of the Battleship game.  Each player tries
  to be the first to sink all the opponent's ships by firing "blindly"
  at them.  The game has options to play over a network connection or
  against the computer.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kblackbox-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: A simple logical game for the KDE3 project
+Description: A simple logical game for the Trinity project
  KBlackBox is a game of hide and seek played on an grid of boxes. Your
  opponent (Random number generator, in this case) has hidden several
  balls within this box. By shooting rays into the box and observing
@@ -190,7 +190,7 @@ Description: A simple logical game for the KDE3 project
  hidden balls. The fewer rays you use to find the balls, the lower
  your score.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kbounce-trinity
@@ -215,14 +215,14 @@ Description: Jezzball clone for the K Desktop Environment
  .
  This game was previously known as kjezz.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kenolaba-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: Enolaba board game for KDE3
+Description: Enolaba board game for Trinity
  kenolaba is a simple board strategy game that is played by two
  players. There are red and yellow pieces for each player. Beginning
  from a start position where each player has 14 pieces, moves are
@@ -232,7 +232,7 @@ Description: Enolaba board game for KDE3
  This game was previously known as kabalone, and was inspired by the
  board game Abalone by Abalone SA, France.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kfouleggs-trinity
@@ -245,14 +245,14 @@ Description: A KDE clone of the Japanese PuyoPuyo game
  play.  If you have played Tetris or one of its many clones, you will
  find KFouleggs easy to learn.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kgoldrunner-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: A KDE3 clone of the Loderunner arcade game
+Description: A Trinity clone of the Loderunner arcade game
  KGoldrunner, a game of action and puzzle solving.  Run through the
  maze, dodge your enemies, collect all the gold and climb up to the
  next level.
@@ -268,7 +268,7 @@ Description: A KDE3 clone of the Loderunner arcade game
  climbs out of his hole, but if it closes before that, he will die and
  reappear somewhere else.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kjumpingcube-trinity
@@ -283,25 +283,25 @@ Description: Tactical one or two player game
  the squares neighbours and take them over. Winner is the one, who
  owns all squares.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: klickety-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: A Clickomania-like game for KDE3
+Description: A Clickomania-like game for Trinity
  Klickety is an adaptation of the (perhaps) well-known Clickomania
  game; it is very similar to the "same" game.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: klines-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: Color lines for KDE3
+Description: Color lines for Trinity
  KLines is a simple game. It is played by one player, so there is only
  one winner :-). You play for fun and against the high score. It was
  inspired by a well known game - "Color lines", written for DOS by
@@ -314,26 +314,26 @@ Description: Color lines for KDE3
  are removed and your score grows. After each turn the computer drops
  three more marbles.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kmahjongg-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: the classic mahjongg game for KDE3 project
+Description: the classic mahjongg game for Trinity project
  Your mission in this game is to remove all tiles from the game board. A
  matching pair of tiles can be removed, if they are 'free', which means that
  no other tiles block them on the left or right side.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kmines-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: Minesweeper for KDE3
+Description: Minesweeper for Trinity
  KMines is the classic Minesweeper game. You must uncover all the
  empty cases without blowing on a mine.
  .
@@ -343,7 +343,7 @@ Description: Minesweeper for KDE3
  cases, it is very useful to put a flag on the cases which contain a
  mine.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: knetwalk-trinity
@@ -356,7 +356,7 @@ Description: A game for system administrators
  rotate these elements until every client is connected to the server,
  and no wires are left unconnected.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kolf-trinity
@@ -367,7 +367,7 @@ Description: Minigolf game for KDE
  This is a minigolf game for KDE that allows you to go through different
  golf courses and waste an exorbitant amount of time.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kolf-trinity-dev
@@ -379,7 +379,7 @@ Description: Development files for Kolf
  This package contains headers and development libraries for compiling
  Kolf plugins.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: konquest-trinity
@@ -391,36 +391,36 @@ Description: KDE based GNU-Lactic Konquest game
  game. The goal of the game is to expand your interstellar empire
  across the galaxy and, of course, crush your rivals in the process.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kpat-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}, kdebase-data-trinity, kdegames-card-data-trinity
-Description: KDE3 solitaire patience game
+Description: Trinity solitaire patience game
  KPatience is a collection of 14 card games. All the games are single
  player games.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kpoker-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}, kdegames-card-data-trinity
-Description: KDE3 based Poker clone
+Description: Trinity based Poker clone
  KPoker is a KDE compliant clone of those highly addictive pocket
  video poker games which are sometimes called "Videopoker" as well.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kreversi-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: Reversi for KDE3
+Description: Reversi for Trinity
  Reversi is a simple strategy game that is played by two
  players. There is only one type of piece - one side of it is black,
  the other white. If a player captures a piece on the board, that
@@ -428,40 +428,40 @@ Description: Reversi for KDE3
  that has more pieces of his own color on the board and if there are
  no more moves possible.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: ksame-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: SameGame for KDE3
+Description: SameGame for Trinity
  KSame is a simple game. It's played by one player, so there is only
  one winner :-) You play for fun and against the high score. It has
  been inspired by SameGame, that is only famous on the Macintosh
  platform.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kshisen-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: Shisen-Sho for KDE3
+Description: Shisen-Sho for Trinity
  KShisen-Sho is a single-player-game similar to Mahjongg and uses the
  same set of tiles as Mahjongg.
  .
  The object of the game is to remove all tiles from the field.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: ksirtet-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: Tetris and Puyo-Puyo games for KDE3
+Description: Tetris and Puyo-Puyo games for Trinity
  This program is a clone of the well known game Tetris. You must fit
  the falling pieces to form full lines. You can rotate and translate
  the falling piece. The game ends when no more piece can fall ie when
@@ -471,37 +471,37 @@ Description: Tetris and Puyo-Puyo games for KDE3
  pieces fall quicker (exactly the piece falls from a line each
  1/(1+level) second).
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: ksmiletris-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: Tetris like game for KDE3
+Description: Tetris like game for Trinity
  This is a game with falling blocks composed of different types of
  smilies. The object of the game is to "crack a smile" by guiding
  blocks so there are two or more of the same symbol vertically.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: ksnake-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: Snake Race for KDE3
+Description: Snake Race for Trinity
  Snake Race is a game of speed and agility. You are a hungry snake and
  are trying to eat all the apples in the room before getting out!
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: ksokoban-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: Sokoban game for KDE3
+Description: Sokoban game for Trinity
  The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
  the Japanese company Thinking Rabbit, Inc. "Sokoban" is japanese for
  "warehouse keeper". The idea is that you are a warehouse keeper
@@ -521,14 +521,14 @@ Description: Sokoban game for KDE3
  levels can be fun for adults too, for example if you don't want to
  expose yourself to too much mental strain.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kspaceduel-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: Arcade two-player space game for KDE3
+Description: Arcade two-player space game for Trinity
  KSpaceduel is an space arcade game for two players.
  .
  Each player controls a ship that flies around the sun and tries to
@@ -536,7 +536,7 @@ Description: Arcade two-player space game for KDE3
  against the computer, or you can have the computer control both ships
  and play each other.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: ktron-trinity
@@ -547,14 +547,14 @@ Description: Tron clone for the K Desktop Environment
  The object of the game is to avoid running into walls, your own tail,
  and that of your opponent.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: ktuberling-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: Potato Guy for KDE3
+Description: Potato Guy for Trinity
  KTuberling is a game intended for small children. Of course, it may
  be suitable for adults who have remained young at heart.
  .
@@ -571,14 +571,14 @@ Description: Potato Guy for KDE3
  send your own creations to the programmer, Eric Bischoff, who will
  include them in the museum if he gets some spare time.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: kwin4-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Description: Connect Four clone for KDE3
+Description: Connect Four clone for Trinity
  Four wins is a game for two players. Each player is represented by a
  colour (yellow and red). The goal of the game is to get four
  connected pieces of your colour into a row, column or any
@@ -590,14 +590,14 @@ Description: Connect Four clone for KDE3
  pieces in a row, column or diagonal or no more moves are possible
  because the board is filled.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
 
 Package: lskat-trinity
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}, kdegames-card-data-trinity
-Description: Lieutnant Skat card game for KDE3
+Description: Lieutnant Skat card game for Trinity
  Lieutnant Skat (from German Offiziersskat) is a card game for two
  players. It is roughly played according to the rules of Skat but with
  only two players and simplified rules.
@@ -607,5 +607,5 @@ Description: Lieutnant Skat card game for KDE3
  of the 120 possible points. After 16 moves all cards are played and
  the game ends.
  .
- This package is part of KDE3, and a component of the KDE games module.
+ This package is part of Trinity, and a component of the KDE games module.
  See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
diff --git a/debian/squeeze/kdegraphics.automake/debian/changelog b/debian/squeeze/kdegraphics.automake/debian/changelog
index b4a9d5ba0..38be59fe0 100644
--- a/debian/squeeze/kdegraphics.automake/debian/changelog
+++ b/debian/squeeze/kdegraphics.automake/debian/changelog
@@ -24,7 +24,7 @@ kdegraphics-trinity (4:3.5.10-0ubuntu1~intrepid6) intrepid; urgency=low
 
 kdegraphics-trinity (4:3.5.10-0ubuntu1~intrepid5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 27 Feb 2009 22:49:00 -0600
diff --git a/debian/squeeze/kdegraphics.automake/debian/control b/debian/squeeze/kdegraphics.automake/debian/control
index f96e97765..291488698 100644
--- a/debian/squeeze/kdegraphics.automake/debian/control
+++ b/debian/squeeze/kdegraphics.automake/debian/control
@@ -12,14 +12,14 @@ Section: kde
 Architecture: all
 Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), kdegraphics-kfile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
 Suggests: kdegraphics-trinity-doc-html (>= ${source:Version})
-Description: graphics apps from the official KDE3 release
+Description: graphics apps 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,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
  This metapackage includes a collection of graphics applications
- provided with the official release of KDE3.
+ provided with the official release of Trinity.
 
 Package: kdegraphics-trinity-doc-html
 Architecture: all
@@ -36,7 +36,7 @@ Description: KDE graphics documentation in HTML format
  /usr/share/doc/kde/HTML/en/kamera/. Documentation is provided for most
  KDE graphics packages.
  .
- This package is part of KDE3, and a component of the KDE graphics module.
+ This package is part of Trinity, and a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kamera-trinity
@@ -48,7 +48,7 @@ Description: digital camera io_slave for Konqueror
  This is a digital camera io_slave for KDE which uses gphoto2 and libgpio
  to allow access to your camera's pictures with the URL camera:/
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kcoloredit-trinity
@@ -60,7 +60,7 @@ Description: a color palette editor and color picker for KDE
  This package contains two programs, a color palette editor and also a color
  picker.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kdegraphics-trinity-dev
@@ -71,7 +71,7 @@ Description: development files for the KDE graphics module
  This package contains headers and other development files for the KDE
  graphics module.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kdegraphics-kfile-plugins-trinity
@@ -82,7 +82,7 @@ Description: KDE metainfo plugins for graphic files
  This packages provides meta information for graphic files (file sizes,
  tags, etc. all from within the file manager).
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kdvi-trinity
@@ -94,32 +94,32 @@ Replaces: kdebase-data-trinity (<< 4:3.3.91)
 Description: dvi viewer for KDE
  This program and KPart allow the user to display *.DVI files from TeX.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kfax-trinity
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}, libtiff-tools
-Description: G3/G4 fax viewer for KDE3
- A fax viewer for KDE3, supporting the display of raw and tiffed fax images
+Description: G3/G4 fax viewer for Trinity
+ A fax viewer for Trinity, supporting the display of raw and tiffed fax images
  (g3, g3-2d, g4).
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kfaxview-trinity
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: G3/G4 fax viewer for KDE3 using kviewshell
- A fax viewer for KDE3, supporting the display of raw and tiffed fax images
+Description: G3/G4 fax viewer for Trinity using kviewshell
+ A fax viewer for Trinity, supporting the display of raw and tiffed fax images
  (g3, g3-2d, g4).
  .
  This faxviewer uses kviewshell and is intended to replace the standalone
  kfax application once it reproduces all of kfax's features.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kgamma-trinity
@@ -127,12 +127,12 @@ Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: gamma correction module for the KDE3 Control Center
- KGamma is a KDE3 Control Center module for gamma calibration/correction
+Description: gamma correction module for the Trinity Control Center
+ KGamma is a Trinity Control Center module for gamma calibration/correction
  of XFree86. With proper gamma settings, your display (websites, images,
  etc.) will look the same on your monitor as on other monitors.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
  .
   Homepage: http://kgamma.berlios.de/index2.php
@@ -143,15 +143,15 @@ Architecture: any
 Depends: ${shlibs:Depends}, gs
 Suggests: khelpcenter-trinity
 Provides: postscript-viewer, pdf-viewer
-Description: PostScript viewer for KDE3
- KGhostview is KDE3's PostScript viewer. It is a port of Tim Theisen's
+Description: PostScript viewer for Trinity
+ KGhostview is Trinity's PostScript viewer. It is a port of Tim Theisen's
  Ghostview program which is used to view documents prepared in Adobe's
  PostScript page description language. PostScript is the major page
  description language for printing on UNIX systems, and this application is
  useful to preview material intended for printing, or for reading documents
  online.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kiconedit-trinity
@@ -159,10 +159,10 @@ Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: an icon editor for KDE3
+Description: an icon editor for Trinity
  KIconedit allows you easily to create and edit icons.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kmrml-trinity
@@ -176,7 +176,7 @@ Description: a Konqueror plugin for searching pictures
  http://www.mrml.net about MRML and the GNU Image Finding Tool (GIFT), an 
  MRML server.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kolourpaint-trinity
@@ -184,8 +184,8 @@ Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: a simple paint program for KDE3
- KolourPaint is a very simple paint program for KDE3. It aims to be
+Description: a simple paint program for Trinity
+ KolourPaint is a very simple paint program for Trinity. It aims to be
  conceptually simple to understand; providing a level of functionality
  targeted towards the average user. It's designed for daily tasks like:
  .
@@ -197,7 +197,7 @@ Description: a simple paint program for KDE3
  drawing lines become near impossible. Nor is it so simple that it lacks
  essential features like Undo/Redo.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
  .
   Homepage: http://kolourpaint.sourceforge.net
@@ -208,7 +208,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: ocrad | gocr
 Suggests: khelpcenter-trinity
-Description: scanner program for KDE3
+Description: scanner program for Trinity
  Kooka is an open source GNU/Linux scan program based on SANE and
  KScan library.
  .
@@ -221,7 +221,7 @@ Description: scanner program for KDE3
  Install ocrad or gocr if you wish to enable optical character recognition
  in kooka.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
  .
   Homepage: http://kooka.kde.org/
@@ -233,12 +233,12 @@ Depends: ${shlibs:Depends}
 Recommends: kghostview-trinity (= ${binary:Version})
 Suggests: khelpcenter-trinity
 Provides: pdf-viewer
-Description: PDF viewer for KDE3
+Description: PDF viewer for Trinity
  KPDF allows you to view PDF (Portable Document Format) files. This package
  includes kpdfpart so you can embed in konqueror or run as a standalone
  application.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kpovmodeler-trinity
@@ -259,7 +259,7 @@ Description: a graphical editor for povray scenes
  kpovmodeler uses the povray package, currently available only in Debian's
  non-free, unsupported repository.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
  .
   Homepage: http://www.kpovmodeler.org
@@ -269,10 +269,10 @@ Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: a screen ruler and color measurement tool for KDE3
+Description: a screen ruler and color measurement tool for Trinity
  Kruler is a screen ruler (using pixels) and color measurement tool for KDE.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: ksnapshot-trinity
@@ -281,24 +281,24 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Replaces: kdebase-data-trinity (<< 4:3.3.91)
-Description: screenshot utility for KDE3
+Description: screenshot utility for Trinity
  KSnapshot is a simple applet for taking screenshots. It is capable of 
  capturing images of either the whole desktop or just a single window. 
  The images can then be saved in a variety of formats.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: ksvg-trinity
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: SVG viewer for KDE3
+Description: SVG viewer for Trinity
  KSVG allows you view SVG (scalable vector graphics) files. This package
  includes kpart so you can embed it in konqueror and a standalone
  application.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kview-trinity
@@ -306,19 +306,19 @@ Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: simple image viewer/converter for KDE3
+Description: simple image viewer/converter for Trinity
  KView is a simple image viewer and converter application. It supports
  a number of plugins, which add an array of basic editing capabilities
  as well.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kviewshell-trinity
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: generic framework for viewer applications in KDE3
+Description: generic framework for viewer applications in Trinity
  KViewShell is a generic viewing framework that allows the graphical
  applications, such as the kview image viewer, to be embedded in other
  KDE applications, such as Konqueror.
@@ -326,29 +326,29 @@ Description: generic framework for viewer applications in KDE3
  KViewShell comes with a djvuviewpart plugin included, for viewing
  DjVu images.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: libkscan-trinity-dev
 Section: libdevel
 Architecture: any
 Depends: libkscan1-trinity (= ${binary:Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
-Description: development files for the KDE3 scanner library
- This package contains development files for KDE3's scanner library.
+Description: development files for the Trinity scanner library
+ This package contains development files for Trinity's scanner library.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: libkscan1-trinity
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: scanner library for KDE3
+Description: scanner library for Trinity
  KScan is KDE's scanner library. It's used by kooka and by koffice currently.
  It provides an easy-to-use library, which allows you to access your scanner
  (as long as it's sane compatible).
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: libpoppler-tqt
diff --git a/debian/squeeze/kdegraphics/debian/changelog b/debian/squeeze/kdegraphics/debian/changelog
index b4a9d5ba0..38be59fe0 100644
--- a/debian/squeeze/kdegraphics/debian/changelog
+++ b/debian/squeeze/kdegraphics/debian/changelog
@@ -24,7 +24,7 @@ kdegraphics-trinity (4:3.5.10-0ubuntu1~intrepid6) intrepid; urgency=low
 
 kdegraphics-trinity (4:3.5.10-0ubuntu1~intrepid5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 27 Feb 2009 22:49:00 -0600
diff --git a/debian/squeeze/kdegraphics/debian/control b/debian/squeeze/kdegraphics/debian/control
index cbae876fa..bdbf9fca8 100644
--- a/debian/squeeze/kdegraphics/debian/control
+++ b/debian/squeeze/kdegraphics/debian/control
@@ -12,14 +12,14 @@ Section: kde
 Architecture: all
 Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), kdegraphics-kfile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
 Suggests: kdegraphics-trinity-doc-html (>= ${source:Version})
-Description: graphics apps from the official KDE3 release
+Description: graphics apps 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,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
  This metapackage includes a collection of graphics applications
- provided with the official release of KDE3.
+ provided with the official release of Trinity.
 
 Package: kdegraphics-trinity-doc-html
 Architecture: all
@@ -36,7 +36,7 @@ Description: KDE graphics documentation in HTML format
  /usr/share/doc/kde/HTML/en/kamera/. Documentation is provided for most
  KDE graphics packages.
  .
- This package is part of KDE3, and a component of the KDE graphics module.
+ This package is part of Trinity, and a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kamera-trinity
@@ -48,7 +48,7 @@ Description: digital camera io_slave for Konqueror
  This is a digital camera io_slave for KDE which uses gphoto2 and libgpio
  to allow access to your camera's pictures with the URL camera:/
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kcoloredit-trinity
@@ -60,7 +60,7 @@ Description: a color palette editor and color picker for KDE
  This package contains two programs, a color palette editor and also a color
  picker.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kdegraphics-trinity-dev
@@ -71,7 +71,7 @@ Description: development files for the KDE graphics module
  This package contains headers and other development files for the KDE
  graphics module.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kdegraphics-kfile-plugins-trinity
@@ -82,7 +82,7 @@ Description: KDE metainfo plugins for graphic files
  This packages provides meta information for graphic files (file sizes,
  tags, etc. all from within the file manager).
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kdvi-trinity
@@ -94,32 +94,32 @@ Replaces: kdebase-data-trinity (<< 4:3.3.91)
 Description: dvi viewer for KDE
  This program and KPart allow the user to display *.DVI files from TeX.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kfax-trinity
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}, libtiff-tools
-Description: G3/G4 fax viewer for KDE3
- A fax viewer for KDE3, supporting the display of raw and tiffed fax images
+Description: G3/G4 fax viewer for Trinity
+ A fax viewer for Trinity, supporting the display of raw and tiffed fax images
  (g3, g3-2d, g4).
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kfaxview-trinity
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: G3/G4 fax viewer for KDE3 using kviewshell
- A fax viewer for KDE3, supporting the display of raw and tiffed fax images
+Description: G3/G4 fax viewer for Trinity using kviewshell
+ A fax viewer for Trinity, supporting the display of raw and tiffed fax images
  (g3, g3-2d, g4).
  .
  This faxviewer uses kviewshell and is intended to replace the standalone
  kfax application once it reproduces all of kfax's features.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kgamma-trinity
@@ -127,12 +127,12 @@ Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: gamma correction module for the KDE3 Control Center
- KGamma is a KDE3 Control Center module for gamma calibration/correction
+Description: gamma correction module for the Trinity Control Center
+ KGamma is a Trinity Control Center module for gamma calibration/correction
  of XFree86. With proper gamma settings, your display (websites, images,
  etc.) will look the same on your monitor as on other monitors.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
  .
   Homepage: http://kgamma.berlios.de/index2.php
@@ -143,15 +143,15 @@ Architecture: any
 Depends: ${shlibs:Depends}, gs
 Suggests: khelpcenter-trinity
 Provides: postscript-viewer, pdf-viewer
-Description: PostScript viewer for KDE3
- KGhostview is KDE3's PostScript viewer. It is a port of Tim Theisen's
+Description: PostScript viewer for Trinity
+ KGhostview is Trinity's PostScript viewer. It is a port of Tim Theisen's
  Ghostview program which is used to view documents prepared in Adobe's
  PostScript page description language. PostScript is the major page
  description language for printing on UNIX systems, and this application is
  useful to preview material intended for printing, or for reading documents
  online.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kiconedit-trinity
@@ -159,10 +159,10 @@ Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: an icon editor for KDE3
+Description: an icon editor for Trinity
  KIconedit allows you easily to create and edit icons.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kmrml-trinity
@@ -176,7 +176,7 @@ Description: a Konqueror plugin for searching pictures
  http://www.mrml.net about MRML and the GNU Image Finding Tool (GIFT), an 
  MRML server.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kolourpaint-trinity
@@ -184,8 +184,8 @@ Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: a simple paint program for KDE3
- KolourPaint is a very simple paint program for KDE3. It aims to be
+Description: a simple paint program for Trinity
+ KolourPaint is a very simple paint program for Trinity. It aims to be
  conceptually simple to understand; providing a level of functionality
  targeted towards the average user. It's designed for daily tasks like:
  .
@@ -197,7 +197,7 @@ Description: a simple paint program for KDE3
  drawing lines become near impossible. Nor is it so simple that it lacks
  essential features like Undo/Redo.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
  .
   Homepage: http://kolourpaint.sourceforge.net
@@ -208,7 +208,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: ocrad | gocr
 Suggests: khelpcenter-trinity
-Description: scanner program for KDE3
+Description: scanner program for Trinity
  Kooka is an open source GNU/Linux scan program based on SANE and
  KScan library.
  .
@@ -221,7 +221,7 @@ Description: scanner program for KDE3
  Install ocrad or gocr if you wish to enable optical character recognition
  in kooka.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
  .
   Homepage: http://kooka.kde.org/
@@ -233,12 +233,12 @@ Depends: ${shlibs:Depends}
 Recommends: kghostview-trinity (= ${binary:Version})
 Suggests: khelpcenter-trinity
 Provides: pdf-viewer
-Description: PDF viewer for KDE3
+Description: PDF viewer for Trinity
  KPDF allows you to view PDF (Portable Document Format) files. This package
  includes kpdfpart so you can embed in konqueror or run as a standalone
  application.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kpovmodeler-trinity
@@ -259,7 +259,7 @@ Description: a graphical editor for povray scenes
  kpovmodeler uses the povray package, currently available only in Debian's
  non-free, unsupported repository.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
  .
   Homepage: http://www.kpovmodeler.org
@@ -269,10 +269,10 @@ Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: a screen ruler and color measurement tool for KDE3
+Description: a screen ruler and color measurement tool for Trinity
  Kruler is a screen ruler (using pixels) and color measurement tool for KDE.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: ksnapshot-trinity
@@ -281,24 +281,24 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Replaces: kdebase-data-trinity (<< 4:3.3.91)
-Description: screenshot utility for KDE3
+Description: screenshot utility for Trinity
  KSnapshot is a simple applet for taking screenshots. It is capable of 
  capturing images of either the whole desktop or just a single window. 
  The images can then be saved in a variety of formats.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: ksvg-trinity
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: SVG viewer for KDE3
+Description: SVG viewer for Trinity
  KSVG allows you view SVG (scalable vector graphics) files. This package
  includes kpart so you can embed it in konqueror and a standalone
  application.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kview-trinity
@@ -306,19 +306,19 @@ Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: simple image viewer/converter for KDE3
+Description: simple image viewer/converter for Trinity
  KView is a simple image viewer and converter application. It supports
  a number of plugins, which add an array of basic editing capabilities
  as well.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: kviewshell-trinity
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: generic framework for viewer applications in KDE3
+Description: generic framework for viewer applications in Trinity
  KViewShell is a generic viewing framework that allows the graphical
  applications, such as the kview image viewer, to be embedded in other
  KDE applications, such as Konqueror.
@@ -326,29 +326,29 @@ Description: generic framework for viewer applications in KDE3
  KViewShell comes with a djvuviewpart plugin included, for viewing
  DjVu images.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: libkscan-trinity-dev
 Section: libdevel
 Architecture: any
 Depends: libkscan1-trinity (= ${binary:Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
-Description: development files for the KDE3 scanner library
- This package contains development files for KDE3's scanner library.
+Description: development files for the Trinity scanner library
+ This package contains development files for Trinity's scanner library.
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: libkscan1-trinity
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: scanner library for KDE3
+Description: scanner library for Trinity
  KScan is KDE's scanner library. It's used by kooka and by koffice currently.
  It provides an easy-to-use library, which allows you to access your scanner
  (as long as it's sane compatible).
  .
- This package is part of KDE3, as a component of the KDE graphics module.
+ This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
 
 Package: libpoppler-tqt
diff --git a/debian/squeeze/kdelibs/debian/changelog b/debian/squeeze/kdelibs/debian/changelog
index bd88839a3..f9979637d 100644
--- a/debian/squeeze/kdelibs/debian/changelog
+++ b/debian/squeeze/kdelibs/debian/changelog
@@ -61,7 +61,7 @@ kdelibs-trinity (4:3.5.10-0ubuntu3~intrepid7) intrepid; urgency=low
 
 kdelibs-trinity (4:3.5.10-0ubuntu3~intrepid6) intrepid; urgency=low
 
-  * Added proper KDE4 application labelling and starting to KDE3 menu
+  * Added proper KDE4 application labelling and starting to Trinity menu
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 27 Mar 2009 00:13:00 -0600
 
@@ -85,7 +85,7 @@ kdelibs-trinity (4:3.5.10-0ubuntu3~intrepid1) intrepid; urgency=low
 
 kdelibs-trinity (4:3.5.10-0ubuntu2~intrepid10) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 25 Feb 2009 15:12:00 -0600
diff --git a/debian/squeeze/kdemultimedia/debian/changelog b/debian/squeeze/kdemultimedia/debian/changelog
index 987069b44..4f4523eb0 100644
--- a/debian/squeeze/kdemultimedia/debian/changelog
+++ b/debian/squeeze/kdemultimedia/debian/changelog
@@ -12,7 +12,7 @@ kdemultimedia-trinity (4:3.5.10-0ubuntu1~intrepid6) intrepid; urgency=low
 
 kdemultimedia-trinity (4:3.5.10-0ubuntu1~intrepid5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 28 Feb 2009 16:19:00 -0600
diff --git a/debian/squeeze/kdemultimedia/debian/control b/debian/squeeze/kdemultimedia/debian/control
index 4e5af1dbd..a675b5e5a 100644
--- a/debian/squeeze/kdemultimedia/debian/control
+++ b/debian/squeeze/kdemultimedia/debian/control
@@ -12,7 +12,7 @@ Section: kde
 Architecture: all
 Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), kdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), kdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), kdemultimedia-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})
 Suggests: kdemultimedia-trinity-doc-html (>= ${Source-Version})
-Description: multimedia apps from the official KDE3 release 
+Description: multimedia apps 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,
  contemporary functionality, and outstanding graphical design with the
@@ -30,8 +30,8 @@ Architecture: any
 Depends: kdelibs4-trinity-dev (>= 4:3.5.7), artsbuilder-trinity (= ${Source-Version}), kdemultimedia-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})
 Conflicts: libmpeg-trinity-dev
 Replaces: artsbuilder-trinity (<< 4:3.0.0), mpeglib-trinity (<< 4:3.0.0), noatun-trinity (<< 4:3.0.0)
-Description: development files for the KDE3 multimedia module
- Development files and headers for the KDE3 multimedia module.
+Description: development files for the Trinity multimedia module
+ Development files and headers for the Trinity multimedia module.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
@@ -40,7 +40,7 @@ Package: kdemultimedia-trinity-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror-trinity | www-browser, kdebase-trinity
-Description: KDE3 multimedia documentation in HTML format
+Description: Trinity multimedia documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
  This package provides all of the KDE multimedia documentation converted to
@@ -51,7 +51,7 @@ Description: KDE3 multimedia documentation in HTML format
  /opt/trinity/share/doc/kde/HTML/en/juk/. Documentation is provided for most
  KDE multimedia packages.
  .
- This package is part of KDE3, and a component of the KDE multimedia module.
+ This package is part of Trinity, and a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: artsbuilder-trinity
@@ -63,7 +63,7 @@ Replaces: kdebase-data-trinity (<< 4:3.3.91), kdemultimedia-dev-trinity (<< 4:3.
 Description: synthesizer designer for aRts
  This is the analog Realtime synthesizer's graphical design tool.
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: juk-trinity
@@ -71,7 +71,7 @@ Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: music organizer and player for KDE3
+Description: music organizer and player for Trinity
  JuK (pronounced "jook") is a jukebox and music manager for the KDE
  desktop similar to jukebox software on other platforms such as
  iTunes or RealOne.
@@ -89,7 +89,7 @@ Description: music organizer and player for KDE3
   * Integration into KDE that allows drag-and-drop and clipboard usage
     with other KDE and X apps
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: kaboodle-trinity
@@ -98,11 +98,11 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: libarts1-xine-trinity
 Suggests: khelpcenter-trinity
-Description: light, embedded media player for KDE3
+Description: light, embedded media player for Trinity
  Kaboodle is a light, embedded media player, supporting both video and audio,
  for KDE. It uses the aRts framework for playing media files.
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: kaudiocreator-trinity
@@ -111,12 +111,12 @@ Architecture: any
 Depends: ${shlibs:Depends}, kdemultimedia-kio-plugins-trinity (= ${Source-Version})
 Recommends: vorbis-tools, flac
 Suggests: lame
-Description: CD ripper and audio encoder frontend for KDE3
+Description: CD ripper and audio encoder frontend for Trinity
  KAudioCreator is a tool for audio extraction (ripping) and encoding. It can
  keep your WAV files, or convert them to Ogg/Vorbis, MP3, or FLAC. It also
  searches CDDB to retrieve the information of the disk.
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: kdemultimedia-kfile-plugins-trinity
@@ -125,9 +125,9 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: kdemultimedia-kio-plugins (<< 4:3.4.1-1)
 Description: au/avi/m3u/mp3/ogg/wav plugins for kfile
- au/avi/m3u/mp3/ogg/wav file metainformation plugins for KDE3.
+ au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: kdemultimedia-kappfinder-data-trinity
@@ -137,7 +137,7 @@ Depends: kappfinder-trinity
 Description: multimedia data for kappfinder-trinity
  This package provides data on multimedia applications for kappfinder-trinity.
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: kdemultimedia-kio-plugins-trinity
@@ -150,7 +150,7 @@ Description: enables the browsing of audio CDs under Konqueror
  This package allow audio CDs to be browsed like a file system using
  Konqueror and the audiocd:/ URL.
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: kmid-trinity
@@ -158,10 +158,10 @@ Section: sound
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: MIDI/karaoke player for KDE3
+Description: MIDI/karaoke player for Trinity
  This package provides a MIDI and karaoke player for KDE.
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: kmix-trinity
@@ -170,10 +170,10 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Provides: x-audio-mixer
-Description: sound mixer applet for KDE3
+Description: sound mixer applet for Trinity
  This package includes KDE's dockable sound mixer applet.
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: krec-trinity
@@ -181,10 +181,10 @@ Section: sound
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: sound recorder utility for KDE3
- This is a sound recording utility for KDE3.
+Description: sound recorder utility for Trinity
+ This is a sound recording utility for Trinity.
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: kscd-trinity
@@ -192,10 +192,10 @@ Section: sound
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: audio CD player for KDE3
- This is KDE3's audio CD player.
+Description: audio CD player for Trinity
+ This is Trinity's audio CD player.
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: libarts1-akode-trinity
@@ -206,7 +206,7 @@ Replaces: libakode2-trinity (<< 2-beta3-2), akode-trinity
 Description: akode plugin for aRts
  This package contains akode plugins for aRts.
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information
 
 Package: libarts1-audiofile-trinity
@@ -216,7 +216,7 @@ Depends: ${shlibs:Depends}
 Description: audiofile plugin for aRts
  This package contains audiofile plugins for aRts.
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: libarts1-mpeglib-trinity
@@ -240,19 +240,19 @@ Description: aRts plugin enabling xine support
  This package contains aRts' xine plugin, allowing the use of the xine
  multimedia engine though aRts.
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: libkcddb1-trinity
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: CDDB library for KDE3
- The KDE3 native CDDB (CD Data Base) library, providing easy access to Audio
+Description: CDDB library for Trinity
+ The Trinity native CDDB (CD Data Base) library, providing easy access to Audio
  CD meta-information (track titles, artist information, etc.) from on-line
  databases, for KDE applications.
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: mpeglib-trinity
@@ -266,7 +266,7 @@ Description: MP3 and MPEG-1 audio and video library
  MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer,
  and WAV playback
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: noatun-trinity
@@ -274,11 +274,11 @@ Section: sound
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity, noatun-plugins-trinity
-Description: media player for KDE3
- Noatun is an aRts-based audio and video player for KDE3. It supports all
+Description: media player for Trinity
+ Noatun is an aRts-based audio and video player for Trinity. It supports all
  formats supported by your installation of aRts (including aRts plugins).
  .
- This package is part of KDE3, as a component of the KDE multimedia module.
+ This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
 
 Package: kdemultimedia-trinity-dbg
diff --git a/debian/squeeze/kdenetwork/debian/changelog b/debian/squeeze/kdenetwork/debian/changelog
index b4d662b87..f7b828757 100644
--- a/debian/squeeze/kdenetwork/debian/changelog
+++ b/debian/squeeze/kdenetwork/debian/changelog
@@ -20,7 +20,7 @@ kdenetwork-trinity (4:3.5.10-0ubuntu1) karmic; urgency=low
 
 kdenetwork-trinity (4:3.5.10-0ubuntu1~intrepid6) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 18:24:00 -0600
diff --git a/debian/squeeze/kdenetwork/debian/control b/debian/squeeze/kdenetwork/debian/control
index 1a56be5d0..dda16d833 100644
--- a/debian/squeeze/kdenetwork/debian/control
+++ b/debian/squeeze/kdenetwork/debian/control
@@ -13,20 +13,20 @@ Architecture: all
 Depends: dcoprss-trinity (>= ${Source-Version}), kdenetwork-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})
 Recommends: kdenetwork-filesharing-trinity (>= ${Source-Version}), ktalkd-trinity (>= ${Source-Version}), lisa-trinity (>= ${Source-Version})
 Suggests: kdenetwork-trinity-doc-html (>= ${Source-Version})
-Description: network-related apps from the official KDE3 release
+Description: network-related apps 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,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
  This metapackage includes a collection of network and networking related
- applications provided with the official release of KDE3.
+ applications provided with the official release of Trinity.
 
 Package: dcoprss-trinity
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: RSS utilities for KDE3
+Description: RSS utilities for Trinity
  kdenetwork-dcoprss is a RSS to DCOP bridge, allowing all
  DCOP aware applications to access RSS news feeds. There is also
  a few sample utilities provided.
@@ -34,14 +34,14 @@ Description: RSS utilities for KDE3
  RSS is a standard for publishing news headlines.
  DCOP is the KDE interprocess communication protocol.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
 
 Package: kdenetwork-trinity-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror-trinity | www-browser, kdebase-trinity
-Description: KDE3 network documentation in HTML format
+Description: Trinity network documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
  This package provides all of the KDE network documentation converted to
@@ -60,13 +60,13 @@ Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
 Enhances: konqueror-trinity
-Description: torrent metainfo plugin for KDE3
+Description: torrent metainfo plugin for Trinity
  This package provides a metainformation plugin for bittorrent files.
  .
  Kde uses kfile-plugins to provide metainfo tab in the files properties
  dialog in konqueror and other file-handling applications.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
 
 Package: kdenetwork-filesharing-trinity
@@ -74,11 +74,11 @@ Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, perl-suid
 Replaces: kcontrol-trinity (<< 4:3.3.0)
-Description: network filesharing configuration module for KDE3
+Description: network filesharing configuration module for Trinity
  This package provides a KDE Control Center module to configure
  NFS and Samba.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
 
 Package: kdict-trinity
@@ -88,13 +88,13 @@ Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Provides: dict-client-trinity
 Replaces: kdebase-data-trinity (<< 4:3.4.0)
-Description: dictionary client for KDE3
+Description: dictionary client for Trinity
  KDict is an advanced KDE graphical client for the DICT Protocol, with full
  Unicode support. It enables you to search through dictionary databases for a
  word or phrase, then displays suitable definitions. KDict tries to ease
  basic as well as advanced queries.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
 
 Package: kget-trinity
@@ -102,7 +102,7 @@ Section: net
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: download manager for KDE3
+Description: download manager for Trinity
  KGet is a a download manager similar to GetRight or Go!zilla. It keeps
  all your downloads in one dialog and you can add and remove transfers.
  Transfers can be paused, resumed, queued or scheduled.
@@ -110,7 +110,7 @@ Description: download manager for KDE3
  and remaining time. Program supports drag & drop from KDE
  applications and Netscape.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
 
 Package: knewsticker-trinity
@@ -118,14 +118,14 @@ Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, kicker-trinity
 Suggests: khelpcenter-trinity, knewsticker-scripts-trinity
-Description: news ticker applet for KDE3
- This is a news ticker applet for the KDE3 panel. It can scroll news from
+Description: news ticker applet for Trinity
+ This is a news ticker applet for the Trinity panel. It can scroll news from
  your favorite news sites, such as lwn.net, /. and freshmeat.net.
  To achieve this, KNewsTicker requires the news sites to provide a
  RSS feed to newsitems. KNewsTicker already comes with a selection of
  good news sources which provide such files.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
 
 Package: kopete-trinity
@@ -135,7 +135,7 @@ Depends: ${shlibs:Depends}
 Recommends: qca-tls
 Suggests: kdeartwork-emoticons-trinity, khelpcenter-trinity, imagemagick, gnupg, gnomemeeting
 Replaces: konversation-trinity (<= 0.14.0-4), sim (<= 0.9.3-2)
-Description: instant messenger for KDE3
+Description: instant messenger for Trinity
  Kopete is an instant messenger program which can communicate with a variety
  of IM systems, such as Yahoo, ICQ, MSN, IRC and Jabber.
  .
@@ -145,7 +145,7 @@ Description: instant messenger for KDE3
  .
  Support for more IM protocols can be added through a plugin system.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
  .
  Homepage: http://kopete.kde.org
@@ -155,13 +155,13 @@ Section: net
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: public fileserver for KDE3
+Description: public fileserver for Trinity
  kpf provides simple file sharing using HTTP. kpf is strictly a public
  fileserver, which means that there are no access restrictions to shared
  files. Whatever you select for sharing is available to anyone. kpf is
  designed to be used for sharing files with friends.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
 
 Package: kppp-trinity
@@ -169,7 +169,7 @@ Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, ppp
 Suggests: khelpcenter-trinity
-Description: modem dialer and ppp frontend for KDE3
+Description: modem dialer and ppp frontend for Trinity
  KPPP is a dialer and front end for pppd. It allows for interactive
  script generation and network setup. It will automate the dialing in
  process to your ISP while letting you conveniently monitor the entire
@@ -178,7 +178,7 @@ Description: modem dialer and ppp frontend for KDE3
  Once connected KPPP will provide a rich set of statistics and keep
  track of the time spent online for you.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
 
 Package: krdc-trinity
@@ -187,12 +187,12 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Recommends: rdesktop
-Description: Remote Desktop Connection for KDE3
+Description: Remote Desktop Connection for Trinity
  krdc is an KDE graphical client for the rfb protocol, used by VNC,
  and if rdesktop is installed, krdc can connect to Windows Terminal
  Servers using RDP.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
 
 Package: krfb-trinity
@@ -200,7 +200,7 @@ Section: net
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: Desktop Sharing for KDE3
+Description: Desktop Sharing for Trinity
  Desktop Sharing (krfb) is a server application that allows you to share
  your current session with a user on another machine, who can use a
  VNC client like krdc to view or even control the desktop. It doesn't
@@ -208,7 +208,7 @@ Description: Desktop Sharing for KDE3
  This makes it very useful when you want someone to help you perform a
  task.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
 
 Package: ksirc-trinity
@@ -217,14 +217,14 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}
 Recommends: libio-socket-ssl-perl
 Suggests: khelpcenter-trinity
-Description: IRC client for KDE3
+Description: IRC client for Trinity
  KSirc is an IRC chat client for KDE. It supports scripting with Perl and has a
  lot of compatibility with mIRC for general use.
  .
  If you want to connect to an IRC server via SSL, you will need to install the
  recommended package libio-socket-ssl-perl.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
 
 Package: ktalkd-trinity
@@ -236,13 +236,13 @@ Recommends: talk, ytalk
 Suggests: khelpcenter-trinity
 Provides: talkd-trinity
 Replaces: talkd-trinity
-Description: talk daemon for KDE3
+Description: talk daemon for Trinity
  KTalkd is an enhanced talk daemon - a program to handle incoming talk
  requests, announce them and allow you to respond to it using a talk
  client. Note that KTalkd is designed to run on a single-user workstation,
  and shouldn't be run on a multi-user machine.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
 
 Package: kwifimanager-trinity
@@ -250,25 +250,25 @@ Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, wireless-tools
 Suggests: khelpcenter-trinity
-Description: wireless lan manager for KDE3
+Description: wireless lan manager for Trinity
  KWiFiManager suite is a set of tools which allows you to manage your
  wireless LAN connection under the K Desktop Environment. It provides
  information about your current connection. KWiFiManager supports every
  wavelan card that uses the wireless extensions interface.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
 
 Package: librss1-trinity
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: RSS library for KDE3
+Description: RSS library for Trinity
  This is the runtime package for programs that use the KDE RSS library.
  End users should not need to install this, it should get installed
  automatically when needed.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
 
 Package: kdenetwork-trinity-dev
@@ -276,12 +276,12 @@ Section: devel
 Architecture: any
 Depends: kdict-trinity (= ${Source-Version}), kopete-trinity (= ${Source-Version}), ksirc-trinity (= ${Source-Version}), librss1-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
 Replaces: librss1-trinity-dev, kdict-trinity (<< 4:3.5.0-3)
-Description: development files for the KDE3 network module
+Description: development files for the Trinity network module
  This is the development package which contains the headers for the KDE RSS
  library as well as the Kopete chat client, as well as miscellaneous
  development-related files for the KDE network module.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
 
 Package: lisa-trinity
@@ -290,11 +290,11 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity, samba-common
 Replaces: konqueror-trinity (<< 4:3.3.0)
-Description: LAN information server for KDE3
+Description: LAN information server for Trinity
  LISa is intended to provide KDE with a kind of "network neighborhood"
  but relying only on the TCP/IP protocol.
  .
- This package is part of KDE3, as a component of the KDE network module.
+ This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
 
 Package: kdnssd-trinity
diff --git a/debian/squeeze/kdepim/debian/changelog b/debian/squeeze/kdepim/debian/changelog
index f4385d188..bb7a10821 100644
--- a/debian/squeeze/kdepim/debian/changelog
+++ b/debian/squeeze/kdepim/debian/changelog
@@ -12,7 +12,7 @@ kdepim-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
 
 kdepim-trinity (4:3.5.10-0ubuntu2~intrepid1) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 01 March 2009 20:46:00 -0600
diff --git a/debian/squeeze/kdepim/debian/control b/debian/squeeze/kdepim/debian/control
index d70c90998..f12445a70 100644
--- a/debian/squeeze/kdepim/debian/control
+++ b/debian/squeeze/kdepim/debian/control
@@ -22,14 +22,14 @@ Section: kde
 Architecture: all
 Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), kdepim-kfile-plugins-trinity (>= ${Source-Version}), kdepim-kio-plugins-trinity (>= ${Source-Version}), kdepim-kresources-trinity (>= ${Source-Version}), kdepim-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}), libkdepim1a-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: kdepim-trinity-doc-html
-Description: Personal Information Management apps from the official KDE3 release
+Description: Personal Information Management apps 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,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
  This metapackage includes a collection of Personal Information Management
- (PIM) applications provided with the official release of KDE3.
+ (PIM) applications provided with the official release of Trinity.
  .
   Homepage: http://pim.kde.org/
 
@@ -51,7 +51,7 @@ Replaces: libkcal2-trinity-dev (<< 4:3.4.1), libmimelib1-trinity-dev (<< 4:3.4.2
 Description: KDE Personal Information Management [development]
  This package contains development files needed to compile kdepim applications.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
  . 
   Homepage: http://pim.kde.org/
@@ -64,7 +64,7 @@ Description: KDE Personal Information Management library documentation
  KDE core library documentation. You need this documentation to develop KDE PIM
  applications.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
  . 
   Homepage: http://pim.kde.org/
@@ -80,7 +80,7 @@ Description: KDE PIM documentation in HTML format
  KDE PIM documentation converted to HTML format so it can be read with any
  web browser.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
  . 
   Homepage: http://pim.kde.org/
@@ -94,7 +94,7 @@ Description: RSS feed aggregator for KDE
  for KDE.  It allows you to quickly browse through hundreds of
  thousands of internet feeds in a quick, efficient, and familiar way.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
  .
   Homepage: http://akregator.kde.org/
@@ -112,7 +112,7 @@ Description: KDE NG addressbook application
  your contacts to many different locations, including the local file system,
  LDAP servers, and SQL databases.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kalarm-trinity
@@ -120,7 +120,7 @@ Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: kmix-trinity, kttsd-trinity
-Description: KDE3 alarm message, command and email scheduler
+Description: Trinity alarm message, command and email scheduler
  KAlarm provides a graphical interface to schedule personal timed events -
  pop-up alarm messages, command execution and sending emails. There is a
  range of options for configuring recurring events.
@@ -135,14 +135,14 @@ Description: KDE3 alarm message, command and email scheduler
  from the command line or via DCOP calls from other programs. KAlarm is
  KDE-based, but will also run on other desktops.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kandy-trinity
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 mobile phone utility
+Description: Trinity mobile phone utility
  At the moment Kandy is more or less a terminal program with some special
  features to store commands and their parameters, but is also has a simple GUI
  to access the phone book of a mobile phone and it is able to save this phone
@@ -150,7 +150,7 @@ Description: KDE3 mobile phone utility
  .
  Kandy is aimed at mobile phones with integrated (GSM) modems.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: karm-trinity
@@ -159,11 +159,11 @@ Architecture: any
 Replaces: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Depends: ${shlibs:Depends}
-Description: KDE3 time tracker tool
+Description: Trinity time tracker tool
  KArm is a time tracker for busy people who need to keep track of the amount of
  time they spend on various tasks.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kdepim-kfile-plugins-trinity
@@ -173,7 +173,7 @@ Depends: ${shlibs:Depends}
 Description: KDE File dialog plugins for palm and vcf files
  File dialog plugins for palm and vcf files.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kdepim-kio-plugins-trinity
@@ -181,11 +181,11 @@ Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: kdebase-kio-plugins-trinity (<< 4:3.4.0)
-Description: KDE3 pim I/O Slaves
+Description: Trinity pim I/O Slaves
  This package includes the pim kioslaves. This includes imap4, sieve,
  and mbox.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kdepim-kresources-trinity
@@ -195,12 +195,12 @@ Depends: ${shlibs:Depends}
 Replaces: libkcal2a-trinity (<< 4:3.4.1), kaddressbook-trinity (<< 4:3.4.1), knotes-trinity (<< 4:3.4.1)
 Recommends: ${shlibs:Recommends}, korganizer-trinity
 Suggests: knotes-trinity
-Description: KDE3 pim resource plugins
+Description: Trinity pim resource plugins
  This package includes several plugins needed to interface with groupware
  servers. It also includes plugins for features such as blogging and
  tracking feature plans.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kdepim-wizards-trinity
@@ -209,11 +209,11 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: kdepim-trinity-dev (<< 4:3.4.1-2)
 Suggests: egroupware
-Description: KDE3 server configuration wizards
+Description: Trinity server configuration wizards
  This package contains KDE-based wizards for configuring eGroupware,
  Kolab, and SUSE Linux Openexchange servers.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kitchensync-trinity
@@ -227,18 +227,18 @@ Description: Synchronization framework
  This package contains a synchronization framework, still under heavy
  development (?).  Kitchensync uses opensync.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kleopatra-trinity
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, gnupg-agent, gnupg2, gpgsm, dirmngr, pinentry-qt | pinentry-x11
-Description: KDE3 Certificate Manager
+Description: Trinity Certificate Manager
  Kleopatra is the KDE tool for managing X.509 certificates in the gpgsm
  keybox and for retrieving certificates from LDAP servers.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kmail-trinity
@@ -250,7 +250,7 @@ Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook-trinity,
 Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Replaces: kdepim-trinity-dev (<< 4:3.4.0), kdebase-trinity-data (<< 4:3.4.0), kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Provides: imap-client, mail-reader
-Description: KDE3 Email client
+Description: Trinity Email client
  KMail is a fully-featured email client that fits nicely into the KDE
  desktop. It has features such as support for IMAP, POP3, multiple accounts,
  mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
@@ -258,7 +258,7 @@ Description: KDE3 Email client
  You need to install kdepim-kio-plugins if you want to use IMAP or
  mbox files, and/or kdebase-kio-plugins if you want to use POP3.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
  .
   Homepage: http://kmail.kde.org/
@@ -267,11 +267,11 @@ Package: kmailcvt-trinity
 Section: mail
 Architecture: any
 Depends: ${shlibs:Depends}, kmail-trinity
-Description: KDE3 KMail mail folder converter
+Description: Trinity KMail mail folder converter
  Converts mail folders to KMail format.  Formats supported for import
  include Outlook Express, Evolution, and plain mbox.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: knode-trinity
@@ -280,13 +280,13 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: kdepim-trinity-dev (<< 4:3.4.0), kontact-trinity (<< 4:3.5.7-1ubuntu2)
 Provides: news-reader
-Description: KDE3 news reader
+Description: Trinity news reader
  KNode is an easy-to-use, convenient newsreader. It is intended to be usable
  by inexperienced users, but also includes support for such features as
  MIME attachments, article scoring, and creating and verifying GnuPG
  signatures.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: knotes-trinity
@@ -296,12 +296,12 @@ Depends: ${shlibs:Depends}
 Suggests: kdepim-kresources-trinity
 Replaces: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
-Description: KDE3 sticky notes
+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
  program.  The program supports printing and mailing your notes.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kode-trinity
@@ -313,19 +313,19 @@ Description: Helper library for programmatic generation of C++ code
  and kxml_compiler for generation of C++ classes representing XML data
  described by RelaxNG schemes.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: konsolekalendar-trinity
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 konsole personal organizer
+Description: Trinity konsole personal organizer
  KonsoleKalendar is a command-line interface to KDE calendars.
  Konsolekalendar complements the KDE KOrganizer by providing a console
  frontend to manage your calendars.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kontact-trinity
@@ -336,13 +336,13 @@ Recommends: ${shlibs:Recommends}, kmail-trinity, knode-trinity, knotes-trinity
 Suggests: ${shlibs:Suggests}, akregator-trinity, knewsticker-trinity, kweather-trinity, gnokii
 Replaces: akregator-trinity (<< 4:3.4.0), akregator-kontact-plugin-trinity
 Conflicts: akregator-kontact-plugin-trinity
-Description: KDE3 pim application
+Description: Trinity pim application
  Kontact is the integrated solution to your personal information management
  needs. It combines KDE applications like KMail, KOrganizer, and
  KAddressBook into a single interface to provide easy access to mail,
  scheduling, address book and other PIM functionality.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
  .
   Homepage: http://kontact.kde.org/
@@ -354,7 +354,7 @@ Depends: ${shlibs:Depends}, ${perl:Depends}
 Recommends: kghostview-trinity
 Replaces: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
-Description: KDE3 personal organizer
+Description: Trinity personal organizer
  This package contains KOrganizer, a calendar and scheduling program.
  .
  KOrganizer aims to be a complete program for organizing appointments,
@@ -366,14 +366,14 @@ Description: KDE3 personal organizer
  KOrganizer offers full synchronization with Palm Pilots, if kpilot is
  installed.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: korn-trinity
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, kdepim-kio-plugins-trinity, kdebase-kio-plugins-trinity
-Description: KDE3 mail checker
+Description: Trinity mail checker
  Korn is a KDE mail checker that can display a small summary in the Kicker
  tray.  It supports checking mbox, pop3, imap4, and nntp sources.
  .
@@ -381,46 +381,46 @@ Description: KDE3 mail checker
  the color/icon of the Kicker display.  In addition to this you can have
  Korn run a program once you click on the docked icon in Kicker.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: ktnef-trinity
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 TNEF viewer
+Description: Trinity TNEF viewer
  The TNEF File Viewer allows you to handle mail attachments using the TNEF
  format. These attachments are usually found in mails coming from Microsoft
  mail servers and embed the mail properties as well as the actual attachments.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libindex0-trinity
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 indexing library
+Description: Trinity indexing library
  This library provides text indexing and is currently used by KMail
  to implement fast searches in mail bodies.
  .
  This is the runtime package for programs that use the libindex-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libindex0-trinity-dev
 Section: libdevel
 Architecture: any
 Depends: libindex0-trinity (= ${Source-Version})
-Description: KDE3 indexing library [development]
+Description: Trinity indexing library [development]
  This library provides text indexing and is currently used by KMail
  to implement searching through mail text.
  .
  This is the development package which contains the headers for the libindex-trinity
  library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkcal2b-trinity
@@ -431,13 +431,13 @@ Recommends: ${shlibs:Recommends}
 Conflicts: libkcal2-trinity, libkcal2a-trinity
 Replaces: libkcal2a-trinity
 Suggests: kdepim-kresources-trinity
-Description: KDE3 calendaring library
+Description: Trinity calendaring library
  This library provides a C++ API for handling the vCalendar and iCalendar
  formats.
  .
  This is the runtime package for programs that use the libkcal-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkcal2-trinity-dev
@@ -445,14 +445,14 @@ Section: libdevel
 Architecture: any
 Depends: libkcal2b-trinity (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version})
 Replaces: kdepim-trinity-dev (<= 4:3.5.4-1)
-Description: KDE3 calendaring library [development]
+Description: Trinity calendaring library [development]
  This library provides a C++ API for handling the vCalendar and iCalendar
  formats.
  .
  This is the development package which contains the headers for the libkcal-trinity
  library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkdepim1a-trinity
@@ -460,10 +460,10 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: akregator-trinity (<< 4:3.4.0), libkdepim1-trinity, korganizer-trinity (<< 4:3.5.7-1ubuntu3)
-Description: KDE3 PIM library
+Description: Trinity PIM library
  This is the runtime package for programs that use the libkdepim-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkdepim1-trinity-dev
@@ -471,32 +471,32 @@ Section: libdevel
 Architecture: any
 Depends: libkdepim1a-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.7)
 Replaces: kdepim-trinity-dev (<< 4:3.4.1)
-Description: KDE3 PIM library [development]
+Description: Trinity PIM library [development]
  This is the development package which contains the headers for the libkdepim-trinity
  library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkgantt0-trinity
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 gantt charting library
+Description: Trinity gantt charting library
  This is the runtime package for programs that use the libkgantt-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkgantt0-trinity-dev
 Section: libdevel
 Architecture: any
 Depends: libkgantt0-trinity (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version})
-Description: KDE3 gantt charting library [development]
+Description: Trinity gantt charting library [development]
  This is the development package which contains the headers for the libkgantt-trinity
  library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkleopatra1-trinity
@@ -511,7 +511,7 @@ Description: KDE GnuPG interface libraries
  .
  This is the runtime package for programs that use the libkleopatra-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkleopatra1-trinity-dev
@@ -520,14 +520,14 @@ Architecture: any
 Depends: libkleopatra1-trinity (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version})
 Conflicts: libkleopatra0-trinity-dev
 Replaces: libkleopatra0-trinity-dev
-Description: KDE3 GnuPG interface libraries [development]
+Description: Trinity GnuPG interface libraries [development]
  This library is used by several KDE applications to interface to the
  GnuPG program.
  .
  This is the development package which contains the headers for the
  libkleopatra-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkmime2-trinity
@@ -536,68 +536,68 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libmimelib1a-trinity
 Replaces: libmimelib1a-trinity
-Description: KDE3 MIME interface library
+Description: Trinity MIME interface library
  This library provides a C++ interface to MIME messages, parsing them into
  an object tree.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkpimexchange1-trinity
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 PIM Exchange library
+Description: Trinity PIM Exchange library
  This is the runtime package for programs that use the libkpimexchange-trinity
  library. 
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkpimexchange1-trinity-dev
 Section: libdevel
 Architecture: any
 Depends: libkpimexchange1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version})
-Description: KDE3 PIM Exchange library [development]
+Description: Trinity PIM Exchange library [development]
  This is the development package which contains the headers for the
  libkpimexchange-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkpimidentities1-trinity
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 PIM user identity information library
+Description: Trinity PIM user identity information library
  This library provides information to KDE programs about user identity,
  such as email address, organization, etc.
  .
  This is the runtime package for programs that use the libkpimidentities-trinity
  library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libksieve0-trinity
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 mail/news message filtering library
+Description: Trinity mail/news message filtering library
  This is the runtime package for programs that use the libksieve-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libksieve0-trinity-dev
 Section: libdevel
 Architecture: any
 Depends: libksieve0-trinity (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version})
-Description: KDE3 mail/news message filtering library [development]
+Description: Trinity mail/news message filtering library [development]
  This is the development package which contains the headers for the libksieve-trinity
  library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libktnef1-trinity
@@ -613,7 +613,7 @@ Description: Library for handling KTNEF email attachments
  .
  This is the runtime library for packages using the ktnef-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libktnef1-trinity-dev
@@ -630,7 +630,7 @@ Description: KTNEF handler library [development]
  This is the development package which contains the headers for the
  ktnef-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libmimelib1c2a-trinity
@@ -639,23 +639,23 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libmimelib1a-trinity
 Replaces: libmimelib1a-trinity
-Description: KDE3 mime library
- This library is used by several KDE3 applications to handle mime types.
+Description: Trinity mime library
+ This library is used by several Trinity applications to handle mime types.
  .
  This is the runtime package for programs that use the libmimelib-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libmimelib1-trinity-dev
 Section: libdevel
 Architecture: any
 Depends: libmimelib1c2a-trinity (= ${Source-Version})
-Description: KDE3 mime library [development]
+Description: Trinity mime library [development]
  This library is used by several KDE applications to handle mime types.
  .
  This is the development package which contains the headers for the
  libmimelib library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
diff --git a/debian/squeeze/kdesdk/debian/changelog b/debian/squeeze/kdesdk/debian/changelog
index 45201d54b..e78025460 100644
--- a/debian/squeeze/kdesdk/debian/changelog
+++ b/debian/squeeze/kdesdk/debian/changelog
@@ -6,7 +6,7 @@ kdesdk-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
 
 kdesdk-trinity (4:3.5.10-0ubuntu1~intrepid5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 02 March 2009 21:41:00 -0600
@@ -832,7 +832,7 @@ kdesdk (4:3.1.0-3) unstable; urgency=low
 
 kdesdk (4:3.1.0-2) unstable; urgency=low
 
-  * First KDE3 upload to debian (closes: #167062).
+  * First Trinity upload to debian (closes: #167062).
   * Rolled the epoch to aid upgrades from the unofficial repository on
     ftp.kde.org.. *sigh*
 
diff --git a/debian/squeeze/kdesdk/debian/control b/debian/squeeze/kdesdk/debian/control
index dfd7dfc54..def7fcd4c 100644
--- a/debian/squeeze/kdesdk/debian/control
+++ b/debian/squeeze/kdesdk/debian/control
@@ -16,13 +16,13 @@ Architecture: all
 Section: kde
 Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), kcachegrind-trinity (>= ${Source-Version}), kdesdk-kfile-plugins-trinity (>= ${Source-Version}), kdesdk-kio-plugins-trinity (>= ${Source-Version}) | kdesvn-kio-plugins-trinity, kdesdk-misc-trinity (>= ${Source-Version}), kdesdk-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})
 Suggests: kcachegrind-converters-trinity, kbabel-trinity-dev, kdesdk-trinity-doc-html
-Description: software development kit from the official KDE3 release
+Description: software development kit 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,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
- This metapackage includes the KDE3 Software Development Kit, a collection
+ This metapackage includes the Trinity Software Development Kit, a collection
  of applications and tools useful for developing KDE applications.
 
 Package: kdesdk-trinity-doc-html
@@ -30,7 +30,7 @@ Architecture: all
 Section: doc
 Suggests: konqueror-trinity | www-browser, kdesdk-trinity
 Replaces: cervisia-trinity (<< 4:3.2.0), kbabel-trinity (<< 4:3.2.0), kbugbuster-trinity (<< 4:3.2.0), kompare-trinity (<< 4:3.2.0)
-Description: KDE3 Software Development Kit documentation in HTML format
+Description: Trinity Software Development Kit documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
  This package provides all of the KDE SDK documentation converted to
@@ -41,7 +41,7 @@ Description: KDE3 Software Development Kit documentation in HTML format
  /usr/share/doc/kde/HTML/en/umbrello/. Documentation is provided for most
  KDE SDK packages.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: cervisia-trinity
@@ -50,7 +50,7 @@ Section: devel
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity, kdesdk-trinity-doc-html
 Conflicts: cervisia
-Description: a graphical CVS front end for KDE3
+Description: a graphical CVS front end for Trinity
  Cervisia is a KDE-based graphical front end for the CVS client.
  .
  As well as providing both common and advanced CVS operations, it offers
@@ -59,7 +59,7 @@ Description: a graphical CVS front end for KDE3
  versions of files.  A Changelog editor is also included and is coupled
  with the commit dialog.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kapptemplate-trinity
@@ -67,13 +67,13 @@ Architecture: all
 Section: devel
 Conflicts: kapptemplate
 Recommends: automake1.9 | automaken, kdelibs4-trinity-dev (>= 4:3.5.8)
-Description: creates a framework to develop a KDE3 application
+Description: creates a framework to develop a Trinity application
  KAppTemplate is a shell script that will create the necessary
  framework to develop various KDE applications.  It takes care of the
  autoconf/automake code as well as providing a skeleton and example of
  what the code typically looks like.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kbabel-trinity
@@ -83,7 +83,7 @@ Depends: ${shlibs:Depends}
 Conflicts: kbabel
 Recommends: gettext
 Suggests: khelpcenter-trinity, kdesdk-trinity-doc-html
-Description: PO-file editing suite for KDE3
+Description: PO-file editing suite for Trinity
  This is a suite of programs for editing gettext message files (PO-files).
  It is designed to help you translate fast and consistently.
  .
@@ -94,7 +94,7 @@ Description: PO-file editing suite for KDE3
  PO-files at once.  KBabelDict is a dictionary to assist with searching
  for common translations.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kbabel-trinity-dev
@@ -103,7 +103,7 @@ Section: libdevel
 Depends: kbabel-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
 Conflicts: kbabel
 Replaces: kbabel-trinity (<< 4:3.0.8-0)
-Description: PO-file editing suite for KDE3 (development files)
+Description: PO-file editing suite for Trinity (development files)
  This is a suite of programs for editing gettext message files (PO-files).
  It is designed to help you translate fast and consistently.
  .
@@ -116,7 +116,7 @@ Description: PO-file editing suite for KDE3 (development files)
  .
  This package contains the KBabel development files.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kbugbuster-trinity
@@ -125,12 +125,12 @@ Section: devel
 Depends: ${shlibs:Depends}
 Conflicts: kbugbuster
 Suggests: khelpcenter-trinity
-Description: a front end for the KDE3 bug tracking system
+Description: a front end for the Trinity bug tracking system
  KBugBuster is a GUI front end for the KDE bug tracking system.
  It allows the user to view and manipulate bug reports and provides a
  variety of options for searching through reports.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kcachegrind-trinity
@@ -149,7 +149,7 @@ Description: visualisation tool for valgrind profiling output
  For visualising the output from other profiling tools, several converters
  can be found in the kcachegrind-converters package.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kcachegrind-converters-trinity
@@ -167,7 +167,7 @@ Description: format converters for KCachegrind profiling visualisation tool
  profiled using calltree without being recompiled, and shared libraries
  and plugin architectures are supported.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kdesdk-kfile-plugins-trinity
@@ -175,12 +175,12 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
 Conflicts: kdesdk-kfile-plugins
-Description: KDE3 file dialog plugins for software development files
+Description: Trinity file dialog plugins for software development files
  This is a collection of plugins for the KDE file dialog.  These plugins
  extend the file dialog to offer advanced meta-information for source files,
  patch files and Qt Linguist data.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kdesdk-misc-trinity
@@ -191,7 +191,7 @@ Recommends: libqt3-mt-dev | libqt3-dev
 Suggests: gimp | xpaint
 Conflicts: kdepalettes-trinity (<= 4:3.1.0-1), scheck-trinity (<< 4:3.2.0-0), kdesdk-misc
 Replaces: kdepalettes-trinity (<= 4:3.1.0-1), scheck-trinity (<< 4:3.2.0-0), kdevelop3-plugins-trinity (<= 4:3.2.0-3)
-Description: various goodies from the KDE3 Software Development Kit
+Description: various goodies from the Trinity Software Development Kit
  This package contains miscellaneous goodies provided with the official
  KDE release to assist with KDE software development.
  .
@@ -201,7 +201,7 @@ Description: various goodies from the KDE3 Software Development Kit
   - palettes that match the KDE standard colour palette;
   - a KDE address book plugin that reads the list of KDE CVS accounts.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kdesdk-scripts-trinity
@@ -212,7 +212,7 @@ Recommends: automake1.9 | automaken, cvs, gawk
 Suggests: khelpcenter-trinity, kdesdk-trinity-doc-html, dmalloc, gdb, kdelibs4-trinity-doc, qt3-doc, valgrind, devscripts
 Enhances: kate-trinity
 Replaces: kdevelop-trinity (<< 1:1.4.0-3.2)
-Description: a set of useful development scripts for KDE3
+Description: a set of useful development scripts for Trinity
  This package contains a number of scripts which can be used to help in
  developing KDE-based applications.  Many of these scripts however are
  not specific to KDE, and in particular there are several general-use
@@ -224,7 +224,7 @@ Description: a set of useful development scripts for KDE3
   - bash and zsh completion controls for KDE apps;
   - valgrind error suppressions for KDE apps.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kmtrace-trinity
@@ -232,11 +232,11 @@ Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, less
 Conflicts: kmtrace
-Description: a KDE3 memory leak tracer
+Description: a Trinity memory leak tracer
  KMtrace is a KDE tool to assist with malloc debugging using glibc's
  "mtrace" functionality.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kompare-trinity
@@ -245,12 +245,12 @@ Section: devel
 Depends: ${shlibs:Depends}
 Conflicts: kompare
 Suggests: khelpcenter-trinity
-Description: a KDE3 GUI for viewing differences between files
+Description: a Trinity GUI for viewing differences between files
  Kompare is a graphical user interface for viewing the differences between
  files.  It can compare two documents, create a diff file, display a diff
  file and/or blend a diff file back into the original documents.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kspy-trinity
@@ -270,7 +270,7 @@ Description: examines the internal state of a Qt/KDE app
  .
  See /usr/share/doc/kspy/README for usage instructions.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kuiviewer-trinity
@@ -286,7 +286,7 @@ Description: viewer for Qt Designer user interface files
  .
  The Qt Designer itself is in the package qt3-designer.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: libcvsservice0-trinity
@@ -303,7 +303,7 @@ Description: DCOP service for accessing CVS repositories
  .
  DCOP is the Desktop Communication Protocol used throughout KDE.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: libcvsservice-trinity-dev
@@ -321,7 +321,7 @@ Description: development files for CVS DCOP service
  .
  Development files for libcvsservice are included in this package.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: poxml-trinity
@@ -336,7 +336,7 @@ Description: tools for using PO-files to translate DocBook XML files
  Also included are some miscellaneous command-line utilities for
  manipulating DocBook XML files, PO-files and PO-template files.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: umbrello-trinity
@@ -356,7 +356,7 @@ Description: UML modelling tool and code generator
  diagrams, use case diagrams, state diagrams, activity diagrams, component
  diagrams and deployment diagrams.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kdesdk-kio-plugins-trinity
@@ -365,12 +365,12 @@ Section: devel
 Depends: ${shlibs:Depends}, subversion
 Conflicts: kdesdk-kio-plugins
 Replaces: kdesdk-misc-trinity (<< 4:3.5.0)
-Description: subversion ioslave for KDE3
+Description: subversion ioslave for Trinity
  This package provides easy access to remote SVN repositories from within
  Konqueror, and KDE generally, by browsing them as if they were a
  filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kunittest-trinity
@@ -379,14 +379,14 @@ Section: devel
 Depends: ${shlibs:Depends}
 Conflicts: kunittest
 Suggests: kdelibs4-trinity-doc
-Description: unit testing library for KDE3
+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
  libraries to create your own testing application.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kdesdk-trinity-dbg
diff --git a/debian/squeeze/kdetoys/debian/changelog b/debian/squeeze/kdetoys/debian/changelog
index 04d47a8f1..b10216451 100644
--- a/debian/squeeze/kdetoys/debian/changelog
+++ b/debian/squeeze/kdetoys/debian/changelog
@@ -6,7 +6,7 @@ kdetoys-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
 
 kdetoys-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 01 March 2009 13:35:00 -0600
@@ -548,7 +548,7 @@ kdetoys (4:3.1.1-1) unstable; urgency=low
 
 kdetoys (4:3.1.0-2) unstable; urgency=low
 
-  * First KDE3 upload to debian!
+  * First Trinity upload to debian!
   * KTeaTime now supports custom tasks (closes: #141942).
   * Fixed kscore manpage directory (closes: #156881).
 
diff --git a/debian/squeeze/kdetoys/debian/control b/debian/squeeze/kdetoys/debian/control
index 029c5e916..f45f650e9 100644
--- a/debian/squeeze/kdetoys/debian/control
+++ b/debian/squeeze/kdetoys/debian/control
@@ -12,21 +12,21 @@ Architecture: all
 Section: kde
 Depends: amor-trinity (>= ${Source-Version}), eyesapplet-trinity (>= ${Source-Version}), fifteenapplet-trinity (>= ${Source-Version}), kmoon-trinity (>= ${Source-Version}), kodo-trinity (>= ${Source-Version}), kteatime-trinity (>= ${Source-Version}), ktux-trinity (>= ${Source-Version}), kweather-trinity (>= ${Source-Version}), kworldclock-trinity (>= ${Source-Version})
 Suggests: kdetoys-trinity-doc-html (>= ${Source-Version})
-Description: toys from the official KDE3 release
+Description: toys 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,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
  This metapackage includes a collection of toys and fun extras provided
- with the official release of KDE3.
+ with the official release of Trinity.
 
 Package: kdetoys-trinity-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror-trinity | www-browser, kdetoys-trinity
 Replaces: amor-trinity (<< 4:2.2.0-0), kmoon-trinity (<< 4:2.2.0-0), kodo-trinity (<< 4:2.2.0-0), kteatime-trinity (<< 4:2.2.0-0), kweather-trinity (<< 4:3.0.0-0), kworldclock-trinity (<< 4:2.2.0-0)
-Description: KDE3 toys documentation in HTML format
+Description: Trinity toys documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
  This package provides all of the KDE toys documentation converted to
@@ -37,7 +37,7 @@ Description: KDE3 toys documentation in HTML format
  /opt/trinity/share/doc/kde/HTML/en/amor/. Documentation is provided for most
  KDE toys packages.
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: amor-trinity
@@ -48,14 +48,14 @@ Recommends: kwin-trinity
 Suggests: khelpcenter-trinity
 Conflicts: task-kdetoys-trinity
 Replaces: kdetoys-trinity (<< 4:3.0.1-0), task-kdetoys-trinity
-Description: a KDE3 creature for your desktop
+Description: a Trinity creature for your desktop
  AMOR stands for Amusing Misuse Of Resources. It provides several different
  characters who prance around your X screen doing tricks and giving you tips.
  .
  Note that AMOR will only work with some window managers. Both KWin (the
  KDE window manager) and Metacity (a GTK2 window manager) are supported.
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: eyesapplet-trinity
@@ -65,11 +65,11 @@ Depends: ${shlibs:Depends}
 Recommends: kicker-trinity
 Conflicts: task-kdetoys-trinity
 Replaces: kdetoys-trinity (<< 4:3.0.1-0), task-kdetoys-trinity
-Description: eyes applet for KDE3
+Description: eyes applet for Trinity
  An applet for the KDE panel containing a pair of eyes that follow your mouse
  around the screen.
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: fifteenapplet-trinity
@@ -77,12 +77,12 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
 Recommends: kicker-trinity
-Description: fifteen pieces puzzle for KDE3
+Description: fifteen pieces puzzle for Trinity
  An applet for the KDE panel that lets you play the Fifteen Pieces
  sliding block puzzle. You have to order 15 pieces in a 4x4 square by
  moving them around.
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: kmoon-trinity
@@ -93,10 +93,10 @@ Recommends: kicker-trinity
 Suggests: khelpcenter-trinity
 Conflicts: task-kdetoys-trinity
 Replaces: kdetoys-trinity (<< 4:3.0.1-0), task-kdetoys-trinity
-Description: moon phase indicator for KDE3
+Description: moon phase indicator for Trinity
  An applet for the KDE panel that displays the current phase of the moon.
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: kodo-trinity
@@ -106,12 +106,12 @@ Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Conflicts: task-kdetoys-trinity
 Replaces: kdetoysv (<< 4:3.0.1-0), task-kdetoys-trinity
-Description: mouse odometer for KDE3
+Description: mouse odometer for Trinity
  KOdometer measures your desktop mileage. It tracks the movement of your mouse
  pointer across your desktop and renders it in inches/feet/miles! It can
  do cm/metres/km too. Its most exciting feature is the tripometer.
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: kteatime-trinity
@@ -121,19 +121,19 @@ Depends: ${shlibs:Depends}, kicker-trinity
 Suggests: khelpcenter-trinity
 Conflicts: task-kdetoys-trinity
 Replaces: kdetoys-trinity (<< 4:3.0.1-0), task-kdetoys-trinity
-Description: KDE3 utility for making a fine cup of tea
+Description: Trinity utility for making a fine cup of tea
  KTeaTime is a handy timer for steeping tea. No longer will you have to
  guess at how long it takes for your tea to be ready. Simply select the
  type of tea you have, and it will alert you when the tea is ready to
  drink.
  .
- KTeaTime sits in the KDE3 system tray.
+ KTeaTime sits in the Trinity system tray.
  .
- Please note that KTeaTime is written explicitly for KDE3. If you are
+ Please note that KTeaTime is written explicitly for Trinity. If you are
  using a non-KDE window manager or desktop environment then it is quite
  possible that KTeaTime will not work on your system.
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: ktux-trinity
@@ -143,10 +143,10 @@ Depends: ${shlibs:Depends}
 Suggests: kwin-trinity
 Conflicts: task-kdetoys-trinity
 Replaces: kdetoys-trinity (<< 4:3.0.1-0), task-kdetoys-trinity
-Description: Tux screensaver for KDE3
+Description: Tux screensaver for Trinity
  A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE).
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: kweather-trinity
@@ -155,7 +155,7 @@ Section: kde
 Depends: ${shlibs:Depends}
 Recommends: kicker-trinity
 Suggests: khelpcenter-trinity
-Description: weather display applet for KDE3
+Description: weather display applet for Trinity
  An applet for the KDE panel that displays your area's current weather.
  Information shown includes the temperature, wind speed, air pressure
  and more. By pressing a button a full weather report can be obtained.
@@ -164,7 +164,7 @@ Description: weather display applet for KDE3
  stations and provide this information to other applications, including
  Konqueror's sidebar and Kontact's summary page.
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: kworldclock-trinity
@@ -175,7 +175,7 @@ Suggests: kdeartwork-misc-trinity, kicker-trinity, kdesktop-trinity, khelpcenter
 Conflicts: task-kdetoys-trinity, kworldwatch-trinity (<= 4:2.2-beta1-1)
 Replaces: kdetoys-trinity (<< 4:3.0.1-0), task-kdetoys-trinity, kworldwatch-trinity (<= 4:2.2-beta1-1)
 Provides: kworldwatch-trinity
-Description: earth watcher for KDE3
+Description: earth watcher for Trinity
  Displays where in the world it is light and dark depending on time, as
  well as offering the time in all of the major cities of the world.
  This can be run standalone, as an applet in the KDE panel or as a
@@ -183,7 +183,7 @@ Description: earth watcher for KDE3
  .
  Additional kworldclock themes are available in the kdeartwork-misc package.
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: kdetoys-trinity-dbg
diff --git a/debian/squeeze/kdeutils/debian/changelog b/debian/squeeze/kdeutils/debian/changelog
index 03b87885e..0835dfb62 100644
--- a/debian/squeeze/kdeutils/debian/changelog
+++ b/debian/squeeze/kdeutils/debian/changelog
@@ -12,7 +12,7 @@ kdeutils-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
 
 kdeutils-trinity (4:3.5.10-0ubuntu1~intrepid4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 01 March 2009 17:29:00 -0600
diff --git a/debian/squeeze/kdeutils/debian/control b/debian/squeeze/kdeutils/debian/control
index 4f0c2fa7c..d95667e61 100644
--- a/debian/squeeze/kdeutils/debian/control
+++ b/debian/squeeze/kdeutils/debian/control
@@ -13,14 +13,14 @@ Section: kde
 Architecture: all
 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})
 Suggests: kdeutils-trinity-doc-html (>= ${Source-Version})
-Description: general purpose utilities from the official KDE3 release
+Description: general purpose utilities 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,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
  This metapackage includes a collection of general purpose utilities 
- provided with the official release of KDE3.
+ provided with the official release of Trinity.
 
 Package: kdeutils-trinity-doc
 Section: doc
@@ -29,14 +29,14 @@ Description: developer documentation for the KDE utilities module
  This package contains documentation for the KDE utilities module, of
  use more for developers creating applications than regular users.
  .
- This package is part of KDE3, and a component of the KDE utilities module.
+ This package is part of Trinity, and a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: kdeutils-trinity-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror-trinity | www-browser, kdebase-trinity
-Description: KDE3 utilities documentation in HTML format
+Description: Trinity utilities documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
  This package provides all of the KDE utilities documentation
@@ -47,18 +47,18 @@ Description: KDE3 utilities documentation in HTML format
  /usr/share/doc/kde/HTML/en/ark/. Documentation is provided for most
  KDE utilities packages.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: kdeutils-trinity-dev
 Section: utils
 Architecture: any
 Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
-Description: development files for the KDE3 utilities module
+Description: development files for the Trinity utilities module
  This package contains development files needed to compile kdeutils
  applications.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: ark-trinity
@@ -68,7 +68,7 @@ Depends: ${shlibs:Depends}
 Recommends: ncompress, unzip, zip, zoo, bzip2, p7zip-full, xz-utils, lzma
 Suggests: khelpcenter-trinity, rar, unrar | unrar-free
 Replaces: kdebase-data-trinity (<< 4:3.3.91)
-Description: graphical archiving tool for KDE3
+Description: graphical archiving tool for Trinity
  Ark is a graphical program for managing various archive formats within the
  KDE environment. Archives can be viewed, extracted, created and modified
  from within Ark.
@@ -80,7 +80,7 @@ Description: graphical archiving tool for KDE3
  if you install the Konqueror Integration plugin available in the konq-plugins
  package.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: kcalc-trinity
@@ -89,7 +89,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Replaces: kdebase-data-trinity (<< 4:3.3.91)
-Description: calculator for KDE3
+Description: calculator for Trinity
  KCalc is KDE's scientific calculator.
  .
  It provides:
@@ -98,7 +98,7 @@ Description: calculator for KDE3
   * a results-stack which lets you conveniently recall previous results
   * configurable precision, and number of digits after the period
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: kcharselect-trinity
@@ -106,10 +106,10 @@ Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: character selector for KDE3
+Description: character selector for Trinity
  A character set selector for KDE.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: kdelirc-trinity
@@ -117,20 +117,20 @@ Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: infrared control for KDE3
+Description: infrared control for Trinity
  This is a frontend for the LIRC suite to use infrared devices with KDE.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: kdessh-trinity
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, openssh-client | ssh-client
-Description: ssh frontend for KDE3
+Description: ssh frontend for Trinity
  This package contains KDE's frontend for ssh.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: kdf-trinity
@@ -138,13 +138,13 @@ Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: disk space utility for KDE3
+Description: disk space utility for Trinity
  KDiskFree displays the available file devices (hard drive partitions, floppy
  and CD drives, etc.) along with information on their capacity, free space, type
  and mount point. It also allows you to mount and unmount drives and view them
  in a file manager.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: kedit-trinity
@@ -152,7 +152,7 @@ Section: editors
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: basic text editor for KDE3
+Description: basic text editor for Trinity
  A simple text editor for KDE.
  .
  It can be used with Konqueror for text and configuration file browsing.
@@ -160,7 +160,7 @@ Description: basic text editor for KDE3
  functionality will intentionally remain rather limited to ensure a
  reasonably fast start.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: kfloppy-trinity
@@ -172,7 +172,7 @@ Description: floppy formatter for KDE
  Kfloppy is a utility that provides a straightforward graphical means
  to format 3.5" and 5.25" floppy disks.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: kgpg-trinity
@@ -180,7 +180,7 @@ Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, konsole-trinity (>= 4:3.5.8), gnupg
 Suggests: khelpcenter-trinity
-Description: GnuPG frontend for KDE3
+Description: GnuPG frontend for Trinity
  Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file
  encryption, file decryption and key management.
  .
@@ -195,7 +195,7 @@ Description: GnuPG frontend for KDE3
      signing)
    * decrypting clipboard contents, including integration with Klipper
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: khexedit-trinity
@@ -203,12 +203,12 @@ Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: KDE3 hex editor
+Description: Trinity hex editor
  KHexEdit is an editor for the raw data of binary files.  It includes
  find/replace functions, bookmarks, many configuration options, drag and drop
  support and other powerful features.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: kjots-trinity
@@ -216,11 +216,11 @@ Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: note taking utility for KDE3
+Description: note taking utility for Trinity
  Kjots is a small note taker program. Name and idea are taken from the jots
  program included in the tkgoodstuff package.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: klaptopdaemon-trinity
@@ -232,21 +232,21 @@ Description: battery monitoring and management for laptops using KDE
  This package contains utilities to monitor batteries and configure
  power management, for laptops, from within KDE.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: kmilo-trinity
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Description:  laptop special keys support for KDE3
+Description:  laptop special keys support for Trinity
  KMilo lets you use the special keys on some keyboards and laptops.
  .
  Usually this includes volume keys and other features. Currently, KMilo
  comes with plugins for Powerbooks, Thinkpads, Vaios and generic keyboards
  with special keys.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: kmilo-legacy-trinity
@@ -262,7 +262,7 @@ Description:  non-standard plugins for KMilo
  In Debian the intention is that all laptops work with the generic kmilo
  plugin, if you need this package please file a bug.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: kregexpeditor-trinity
@@ -270,11 +270,11 @@ Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: graphical regular expression editor plugin for KDE3
+Description: graphical regular expression editor plugin for Trinity
  This package contains a graphical regular expression editor plugin for use
  with KDE. It let you draw your regular expression in an unambiguous way.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: ksim-trinity
@@ -282,12 +282,12 @@ Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: system information monitor for KDE3
+Description: system information monitor for Trinity
  KSim is a system monitor app which has its own plugin system with support
  for GKrellm skins. It allows users to follow uptime, memory usage, network
  connections, power, etc.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: ktimer-trinity
@@ -295,12 +295,12 @@ Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: timer utility for KDE3
+Description: timer utility for Trinity
  This is a timer application for KDE. It allows you to execute commands after
  a certain amount of time. It supports looping commands as well as delayed
  command execution.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: kwalletmanager-trinity
@@ -308,12 +308,12 @@ Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: wallet manager for KDE3
+Description: wallet manager for Trinity
  This program keeps various wallets for any kind of data that the user can
  store encrypted with passwords and can also serve as a password manager that
  keeps a master password to all wallets.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: superkaramba-trinity
@@ -335,7 +335,7 @@ Description: a program based on karamba improving the eyecandy of KDE
   * Create little games or virtual pets that live on your desktop.
   * Display information from the internet, such as weather and headlines.
  .
- This package is part of KDE3, as a component of the KDE utilities module.
+ This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
 
 Package: kdeutils-trinity-dbg
diff --git a/debian/squeeze/kdevelop.cmake/debian/changelog b/debian/squeeze/kdevelop.cmake/debian/changelog
index f638f2ceb..d37ad0e8d 100644
--- a/debian/squeeze/kdevelop.cmake/debian/changelog
+++ b/debian/squeeze/kdevelop.cmake/debian/changelog
@@ -18,7 +18,7 @@ kdevelop-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
 
 kdevelop-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 23:07:00 -0600
@@ -960,7 +960,7 @@ gideon (1:2.999+cvs20030301-0woody1) unstable; urgency=low
 
 gideon (1:2.999-1) unstable; urgency=low
 
-  * Fixed for KDE3.
+  * Fixed for Trinity.
 
  -- Stefan Schimanski <schimmi@kde.org>  Mon, 24 Sep 2002 00:08:15 +0200
 
diff --git a/debian/squeeze/kdevelop/debian/changelog b/debian/squeeze/kdevelop/debian/changelog
index f638f2ceb..d37ad0e8d 100644
--- a/debian/squeeze/kdevelop/debian/changelog
+++ b/debian/squeeze/kdevelop/debian/changelog
@@ -18,7 +18,7 @@ kdevelop-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
 
 kdevelop-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 23:07:00 -0600
@@ -960,7 +960,7 @@ gideon (1:2.999+cvs20030301-0woody1) unstable; urgency=low
 
 gideon (1:2.999-1) unstable; urgency=low
 
-  * Fixed for KDE3.
+  * Fixed for Trinity.
 
  -- Stefan Schimanski <schimmi@kde.org>  Mon, 24 Sep 2002 00:08:15 +0200
 
diff --git a/debian/squeeze/kdewebdev/debian/changelog b/debian/squeeze/kdewebdev/debian/changelog
index 36cb83a38..67562c948 100644
--- a/debian/squeeze/kdewebdev/debian/changelog
+++ b/debian/squeeze/kdewebdev/debian/changelog
@@ -6,7 +6,7 @@ kdewebdev-trinity (4:3.5.10-0ubuntu5) karmic; urgency=low
 
 kdewebdev-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 20:08:00 -0600
@@ -577,7 +577,7 @@ quanta (1:3.1.0-3) unstable; urgency=low
 
 quanta (1:3.1.0-2) unstable; urgency=low
 
-  * First KDE3 upload to debian (closes: #164599).
+  * First Trinity upload to debian (closes: #164599).
   * Updated PHP documentation index (closes: #96787).
   * Latin characters are displayed correctly (closes: #124005).
 
@@ -611,7 +611,7 @@ quanta (1:3.0pr2-1) unstable; urgency=low
 quanta (1:3.0pr1-1) unstable; urgency=low
 
   * New upstream release.
-  * Built for KDE3.
+  * Built for Trinity.
 
  -- Ben Burton <benb@acm.org>  Wed,  4 Sep 2002 10:36:12 +1000
 
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/changelog b/debian/squeeze/libraries/kipi-plugins/debian/changelog
index 6f7c8ed50..da8fca349 100755
--- a/debian/squeeze/libraries/kipi-plugins/debian/changelog
+++ b/debian/squeeze/libraries/kipi-plugins/debian/changelog
@@ -6,7 +6,7 @@ kipi-plugins-trinity (0.1.6-0ubuntu1) karmic; urgency=low
 
 kipi-plugins-trinity (0.1.5-0ubuntu4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 19:52:00 -0600
diff --git a/debian/squeeze/libraries/libkdcraw/debian/changelog b/debian/squeeze/libraries/libkdcraw/debian/changelog
index d4eda6180..4458e7b08 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/changelog
+++ b/debian/squeeze/libraries/libkdcraw/debian/changelog
@@ -6,7 +6,7 @@ libkdcraw-trinity (0.1.9-0ubuntu1) karmic; urgency=low
 
 libkdcraw-trinity (0.1.4-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/libraries/libkexiv2/debian/changelog b/debian/squeeze/libraries/libkexiv2/debian/changelog
index cebc28b14..b40a8b352 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/changelog
+++ b/debian/squeeze/libraries/libkexiv2/debian/changelog
@@ -6,7 +6,7 @@ libkexiv2-trinity (0.1.7-0ubuntu4) karmic; urgency=low
 
 libkexiv2-trinity (0.1.7-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/libraries/libkipi/debian/changelog b/debian/squeeze/libraries/libkipi/debian/changelog
index a5746bc99..ed7cd918a 100644
--- a/debian/squeeze/libraries/libkipi/debian/changelog
+++ b/debian/squeeze/libraries/libkipi/debian/changelog
@@ -12,7 +12,7 @@ libkipi-trinity (0.1.5-2intrepid6) jaunty; urgency=low
 
 libkipi-trinity (0.1.5-2intrepid5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/libraries/libksquirrel/debian/control b/debian/squeeze/libraries/libksquirrel/debian/control
index 48a5f320e..8fc0ef737 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/control
+++ b/debian/squeeze/libraries/libksquirrel/debian/control
@@ -14,18 +14,18 @@ Homagepage: http://ksquirrel.sourceforge.net
 Package: libksquirrel0-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 image viewer
+Description: Trinity image viewer
  Runtime libraries for KSquirrel.
 
 Package: libksquirrel-trinity-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, libksquirrel0-trinity (= ${binary:Version})
-Description: KDE3 image viewer
+Description: Trinity image viewer
  Development libraries for KSquirrel.
 
 Package: libksquirrel-tools-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, libksquirrel0-trinity (= ${binary:Version})
-Description: KDE3 image viewer
+Description: Trinity image viewer
  Tools for KSquirrel.
diff --git a/debian/squeeze/libraries/mlt++/debian/changelog b/debian/squeeze/libraries/mlt++/debian/changelog
index dbdad4092..d49fd4142 100644
--- a/debian/squeeze/libraries/mlt++/debian/changelog
+++ b/debian/squeeze/libraries/mlt++/debian/changelog
@@ -6,7 +6,7 @@ mlt++-trinity (0.2.5~svn20071228-0.0ubuntu5) karmic; urgency=low
 
 mlt++-trinity (0.2.5~svn20071228-0.0ubuntu4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/libraries/mlt/debian/changelog b/debian/squeeze/libraries/mlt/debian/changelog
index bb56b0cc2..56a1c1fd2 100644
--- a/debian/squeeze/libraries/mlt/debian/changelog
+++ b/debian/squeeze/libraries/mlt/debian/changelog
@@ -6,7 +6,7 @@ mlt-trinity (0.2.4.svn20071228-0.0ubuntu5) karmic; urgency=low
 
 mlt-trinity (0.2.4.svn20071228-0.0ubuntu4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/libraries/python-trinity/debian/control b/debian/squeeze/libraries/python-trinity/debian/control
index c384f66d6..7f6e42bca 100644
--- a/debian/squeeze/libraries/python-trinity/debian/control
+++ b/debian/squeeze/libraries/python-trinity/debian/control
@@ -15,8 +15,8 @@ Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (>= 3.18)
 XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
 Conflicts: python-trinity-trinity
-Description: KDE3 bindings for Python [Trinity]
- Python binding module that provides wide access to the KDE3 API,
+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.
 
@@ -25,8 +25,8 @@ Priority: extra
 Architecture: any
 Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-qt3-dbg, ${shlibs:Depends}
 XB-Python-Version: ${python:Versions}
-Description: KDE3 bindings for Python (debug extensions) [Trinity]
- Python binding module that provides wide access to the KDE3 API,
+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.
  .
@@ -37,7 +37,7 @@ Section: python
 Architecture: all
 Depends: pyqt-tools, ${python:Depends}
 XB-Python-Version: ${python:Versions}
-Description: KDE3 bindings for Python - Development files and scripts [Trinity]
+Description: Trinity bindings for Python - Development files and scripts [Trinity]
  Development .sip files with definitions of PyKDE classes. They
  are needed to build PyKDE, but also as building blocks of other
  packages based on them. 
diff --git a/debian/squeeze/libraries/python-trinity/debian/copyright b/debian/squeeze/libraries/python-trinity/debian/copyright
index d67316545..eec6b36a5 100644
--- a/debian/squeeze/libraries/python-trinity/debian/copyright
+++ b/debian/squeeze/libraries/python-trinity/debian/copyright
@@ -6,7 +6,7 @@ It was downloaded from http://www.riverbankcomputing.co.uk
 Upstream Authors:
 
     Jim Bublitz <jbublitz@nwinternet.com>
-      PyKDE(KDE2, KDE3) 
+      PyKDE(KDE2, Trinity) 
     Phil Thompson <phil@river-bank.demon.co.uk>
       sip, PyQt, original PyKDE (KDE1) and loads of good advice and help
 
diff --git a/debian/squeeze/libraries/python-trinity/debian/watch b/debian/squeeze/libraries/python-trinity/debian/watch
index 26518db46..8b3afcac0 100644
--- a/debian/squeeze/libraries/python-trinity/debian/watch
+++ b/debian/squeeze/libraries/python-trinity/debian/watch
@@ -1,3 +1,3 @@
 version=3
 
-http://www.riverbankcomputing.com/Downloads/PyKDE3/PyKDE-(.*)\.tar\.bz2
+http://www.riverbankcomputing.com/Downloads/PyTrinity/PyKDE-(.*)\.tar\.bz2