merge

88 files changed, 410 insertions, 410 deletions

diff --git a/debian/lenny/tdeedu/debian/blinken-trinity.README.Debian b/debian/lenny/tdeedu/debian/blinken-trinity.README.Debian
index 2301e6877..1680d27f9 100644
--- a/debian/lenny/tdeedu/debian/blinken-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/blinken-trinity.README.Debian
@@ -1,7 +1,7 @@
 Blinken for Debian
 ------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/blinken-trinity.menu b/debian/lenny/tdeedu/debian/blinken-trinity.menu
index 6b851f95c..e0bf88bac 100644
--- a/debian/lenny/tdeedu/debian/blinken-trinity.menu
+++ b/debian/lenny/tdeedu/debian/blinken-trinity.menu
@@ -1,4 +1,4 @@
-?package(blinken):needs="X11"\
+?package(blinken-trinity):needs="X11"\
   section="Games/Puzzles"\
   hints="TDE"\
   title="Blinken"\
diff --git a/debian/lenny/tdeedu/debian/cdbs/versions.pl b/debian/lenny/tdeedu/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/debian/lenny/tdeedu/debian/cdbs/versions.pl
+++ b/debian/lenny/tdeedu/debian/cdbs/versions.pl
@@ -13,7 +13,7 @@ my ($version2, $version2_next);
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
 ($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
 
-print "KDE-Version3=$version3\n";
-print "KDE-Version2=$version2\n";
-print "KDE-Next-Version3=$version3_next\n";
-print "KDE-Next-Version2=$version2_next\n";
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/lenny/tdeedu/debian/control b/debian/lenny/tdeedu/debian/control
index 7db799915..209b7b17a 100644
--- a/debian/lenny/tdeedu/debian/control
+++ b/debian/lenny/tdeedu/debian/control
@@ -15,7 +15,7 @@ Breaks: kdeedu-trinity (<< 4:14.0.0~)
 Depends: blinken-trinity (>= ${Source-Version}), kalzium-trinity (>= ${Source-Version}), kanagram-trinity (>= ${Source-Version}), kbruch-trinity (>= ${Source-Version}), tdeedu-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: tdeedu-trinity-doc-html
 Description: educational apps from the official Trinity release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+ TDE (the Trinity 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.
@@ -30,11 +30,11 @@ Replaces: kdeedu-data-trinity (<< 4:14.0.0~)
 Breaks: kdeedu-data-trinity (<< 4:14.0.0~)
 Description: shared data for Trinity educational applications
  This package contains shared data necessary for running the
- educational applications provided with KDE (the K Desktop
+ educational applications provided with TDE (the Trinity Desktop
  Environment).
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: tdeedu-trinity-dbg
 Architecture: any
@@ -55,26 +55,26 @@ Replaces: kdeedu-trinity-doc-html (<< 4:14.0.0~)
 Breaks: kdeedu-trinity-doc-html (<< 4:14.0.0~)
 Suggests: konqueror-trinity | www-browser, tdeedu-trinity
 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
+ By default the educational applications provided with TDE (the Trinity
+ Desktop Environment) only provide their documentation in TDE docbook
  format, which can only be read by Konqueror or KHelpCenter. This
- package provides all of the KDE edutainment documentation converted
+ package provides all of the TDE edutainment documentation converted
  to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
  /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
  /opt/trinity/share/doc/tde/HTML/en/kalzium/. Documentation is provided for
- most KDE educational packages.
+ most TDE educational packages.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: blinken-trinity
 Architecture: any
 Section: games
 Replaces: blinken-trinity (<< 4:14.0.0~)
 Breaks: blinken-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, ttf-sjfonts, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, ttf-sjfonts, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: Trinity version of the Simon Says electronic memory game
  Blinken is based on an electronic game released in 1978, which
@@ -86,15 +86,15 @@ Description: Trinity 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 Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kalzium-trinity
 Architecture: any
 Section: science
 Replaces: kalzium-trinity (<< 4:14.0.0~)
 Breaks: kalzium-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, kalzium-data-trinity (>> ${KDE-Version3}~), kalzium-data-trinity (<< ${KDE-Next-Version3}~), tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, kalzium-data-trinity (>> ${TDE-Version3}~), kalzium-data-trinity (<< ${TDE-Next-Version3}~), tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: chemistry teaching tool for Trinity
  Kalzium is a program which shows you the Periodic System of Elements
@@ -113,8 +113,8 @@ Description: chemistry teaching tool for Trinity
  OCaml supports native code generation, Kalzium includes a chemical
  equation solver.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kalzium-data-trinity
 Architecture: all
@@ -123,21 +123,21 @@ Replaces: kalzium-data-trinity (<< 4:14.0.0~)
 Breaks: kalzium-data-trinity (<< 4:14.0.0~)
 Description: data files for Kalzium
  This package contains architecture-independent data files for
- Kalzium, the KDE periodic table application.  This includes pictures
+ Kalzium, the TDE periodic table application.  This includes pictures
  of various chemical equipment and of samples of several elements, in
  addition to the actual chemical data.
  .
  See the kalzium package for further information.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kanagram-trinity
 Architecture: any
 Section: games
 Replaces: kanagram-trinity (<< 4:14.0.0~)
 Breaks: kanagram-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: letter order game for Trinity
  KAnagram is a game that is based on the word/letter puzzles that the
@@ -152,44 +152,44 @@ Description: letter order game for Trinity
  children aged 10+ because of the difficulty, but of course everyone
  is welcome to try.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kbruch-trinity
 Architecture: any
 Section: math
 Replaces: kbruch-trinity (<< 4:14.0.0~)
 Breaks: kbruch-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 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 Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: keduca-trinity
 Architecture: any
 Section: tde
 Replaces: keduca-trinity (<< 4:14.0.0~)
 Breaks: keduca-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 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 Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kgeography-trinity
 Architecture: any
 Section: tde
 Replaces: kgeography-trinity (<< 4:14.0.0~)
 Breaks: kgeography-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, kgeography-data-trinity (>> ${KDE-Version3}~), kgeography-data-trinity (<< ${KDE-Next-Version3}~), tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, kgeography-data-trinity (>> ${TDE-Version3}~), kgeography-data-trinity (<< ${TDE-Next-Version3}~), tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: Geography learning tool for Trinity
  KGeography contains maps allowing you to learn various countries or
@@ -197,8 +197,8 @@ Description: Geography learning tool for Trinity
  including a map browser and games involving the names, capitals, or
  flags of the map divisions.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kgeography-data-trinity
 Architecture: all
@@ -207,20 +207,20 @@ Replaces: kgeography-data-trinity (<< 4:14.0.0~)
 Breaks: kgeography-data-trinity (<< 4:14.0.0~)
 Description: data files for KGeography
  This package contains architecture-independent data files for
- KGeography, the geography learning tool for KDE.  This includes map
+ KGeography, the geography learning tool for TDE. This includes map
  and flag images.
  .
  See the kgeography package for further information.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: khangman-trinity
 Architecture: any
 Section: games
 Replaces: khangman-trinity (<< 4:14.0.0~)
 Breaks: khangman-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, fonts-dustin | ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, fonts-dustin | ttf-dustin, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: the classical hangman game for Trinity
  KHangMan is a game based on the well known hangman game.  It is aimed
@@ -232,17 +232,17 @@ Description: the classical hangman game for Trinity
  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 Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kig-trinity
 Architecture: any
 Section: math
 Replaces: kig-trinity (<< 4:14.0.0~)
 Breaks: kig-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
-Description: interactive geometry program for KDE
+Description: interactive geometry program for TDE
  Kig is an application for interactive geometry.  It is intended to
  serve two purposes:
  .
@@ -260,32 +260,32 @@ 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 Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kiten-trinity
 Architecture: any
 Section: tde
 Replaces: kiten-trinity (<< 4:14.0.0~)
 Breaks: kiten-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~), ttf-kochi-gothic | ttf-kochi-mincho
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~), ttf-kochi-gothic | ttf-kochi-mincho
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: Japanese reference/study tool for Trinity
- Kiten is a Japanese reference and study tool for KDE.  It is an
+ Kiten is a Japanese reference and study tool for TDE. 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 Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: klatin-trinity
 Architecture: any
 Section: tde
 Replaces: klatin-trinity (<< 4:14.0.0~)
 Breaks: klatin-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: application to help revise/teach Latin
  KLatin is a program to help revise Latin.  There are three "sections"
@@ -302,15 +302,15 @@ 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 Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: klettres-trinity
 Architecture: any
 Section: tde
 Replaces: klettres-trinity (<< 4:14.0.0~)
 Breaks: klettres-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, klettres-data-trinity (>> ${KDE-Version3}~), klettres-data-trinity (<< ${KDE-Next-Version3}~), tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, klettres-data-trinity (>> ${TDE-Version3}~), klettres-data-trinity (<< ${TDE-Next-Version3}~), tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: foreign alphabet tutor for Trinity
  KLettres is an application specially designed to help the user to
@@ -321,8 +321,8 @@ Description: foreign alphabet tutor for Trinity
  Seven languages are currently available: Czech, Danish, Dutch,
  English, French, Italian and Slovak.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: klettres-data-trinity
 Architecture: all
@@ -331,23 +331,23 @@ Replaces: klettres-data-trinity (<< 4:14.0.0~)
 Breaks: klettres-data-trinity (<< 4:14.0.0~)
 Description: data files for KLettres foreign alphabet tutor
  This package contains architecture-independent data files for
- KLettres, the foreign alphabet tutor for KDE.  This includes sound
+ KLettres, the foreign alphabet tutor for TDE. This includes sound
  files and graphics.
  .
  See the klettres package for further information.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kmplot-trinity
 Architecture: any
 Section: math
 Replaces: kmplot-trinity (<< 4:14.0.0~)
 Breaks: kmplot-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: mathematical function plotter for Trinity
- KmPlot is a mathematical function plotter for KDE.  It has a powerful
+ KmPlot is a mathematical function plotter for TDE. It has a powerful
  built-in parser.  You can plot different functions simultaneously and
  combine them to build new functions.
  .
@@ -360,15 +360,15 @@ Description: mathematical function plotter for Trinity
  maximum and minimum values, changing function parameters dynamically
  and plotting derivatives and integral functions.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kpercentage-trinity
 Architecture: any
 Section: math
 Replaces: kpercentage-trinity (<< 4:14.0.0~)
 Breaks: kpercentage-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: percentage calculation teaching tool for Trinity
  KPercentage is a small math application that will help pupils to
@@ -378,18 +378,18 @@ Description: percentage calculation teaching tool for Trinity
  Finally the pupil can select a random mode, in which all three tasks
  are mixed randomly.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kstars-trinity
 Architecture: any
 Section: science
 Replaces: kstars-trinity (<< 4:14.0.0~)
 Breaks: kstars-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, kstars-data-trinity (>> ${KDE-Version3}~), kstars-data-trinity (<< ${KDE-Next-Version3}~), tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~), indi-trinity (= ${Source-Version})
+Depends: ${shlibs:Depends}, kstars-data-trinity (>> ${TDE-Version3}~), kstars-data-trinity (<< ${TDE-Next-Version3}~), tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~), indi-trinity (= ${Source-Version})
 Suggests: konqueror-trinity, khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: desktop planetarium for Trinity
- KStars is a graphical desktop planetarium for KDE.  It depicts an
+ KStars is a graphical desktop planetarium for TDE. It depicts an
  accurate simulation of the night sky, including stars,
  constellations, star clusters, nebulae, galaxies, all planets, the
  Sun, the Moon, comets and asteroids.  You can see the sky as it
@@ -401,8 +401,8 @@ Description: desktop planetarium for Trinity
  powerful features, yet the interface is clean and simple and fun to
  use.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kstars-data-trinity
 Architecture: all
@@ -411,20 +411,20 @@ Replaces: kstars-data-trinity (<< 4:14.0.0~)
 Breaks: kstars-data-trinity (<< 4:14.0.0~)
 Description: data files for KStars desktop planetarium
  This package contains architecture-independent data files for KStars,
- the graphical desktop planetarium for KDE.  This includes star
+ the graphical desktop planetarium for TDE. This includes star
  catalogues and astronomical images.
  .
  See the kstars package for further information.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: ktouch-trinity
 Architecture: any
 Section: tde
 Replaces: ktouch-trinity (<< 4:14.0.0~)
 Breaks: ktouch-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: touch typing tutor for Trinity
  KTouch is a program for learning touch typing - it helps you learn to
@@ -436,15 +436,15 @@ Description: touch typing tutor for Trinity
  are.  It can display which key to press next, and the correct finger
  to use.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kturtle-trinity
 Architecture: any
 Section: devel
 Replaces: kturtle-trinity (<< 4:14.0.0~)
 Breaks: kturtle-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: educational Logo programming environment
  KTurtle is an educational programming environment using the Logo
@@ -464,15 +464,15 @@ Description: educational Logo programming environment
  qualities of the programming language and will not try to suit
  professional programmers' needs.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kverbos-trinity
 Architecture: any
 Section: tde
 Replaces: kverbos-trinity (<< 4:14.0.0~)
 Breaks: kverbos-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: Spanish verb form study application for Trinity
  Kverbos allows the user to learn the forms of Spanish verbs.  The
@@ -483,15 +483,15 @@ Description: Spanish verb form study application for Trinity
  program can build regular verb forms by itself.  Irregular verb forms
  have to be entered by the user.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kvoctrain-trinity
 Architecture: any
 Section: tde
 Replaces: kvoctrain-trinity (<< 4:14.0.0~)
 Breaks: kvoctrain-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: vocabulary trainer for Trinity
  KVocTrain is a little utility to help you train your vocabulary when
@@ -509,27 +509,27 @@ Description: vocabulary trainer for Trinity
  things.  This is and probably will stay beyond the scope of this
  application.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kwordquiz-trinity
 Architecture: any
 Section: tde
 Replaces: kwordquiz-trinity (<< 4:14.0.0~)
 Breaks: kwordquiz-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 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.
  .
  KWordQuiz can open several types of vocabulary data.  Supported are
- kvtml files used by other KDE programs such as KVocTrain, wql files
+ kvtml files used by other TDE programs such as KVocTrain, wql files
  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 Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: libtdeedu3-trinity
 Architecture: any
@@ -538,12 +538,12 @@ Replaces: libkdeedu3-trinity (<< 4:14.0.0~)
 Breaks: libkdeedu3-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Description: library for use with Trinity educational apps
- The KDE-based library libtdeedu is used with educational
+ The TDE-based library libtdeedu 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 Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: libtdeedu-trinity-dev
 Architecture: any
@@ -552,14 +552,14 @@ Replaces: libkdeedu-trinity-dev (<< 4:14.0.0~)
 Breaks: libkdeedu-trinity-dev (<< 4:14.0.0~)
 Depends: libtdeedu3-trinity (= ${Source-Version}), tdelibs14-trinity-dev
 Description: development files for Trinity educational library
- The KDE-based library libtdeedu is used with educational
+ The TDE-based library libtdeedu 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 libtdeedu are included in this package.
  .
- This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: libkiten1-trinity
 Architecture: any
@@ -569,7 +569,7 @@ Breaks: libkiten1-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, edict, kanjidic
 Recommends: ttf-kochi-gothic | ttf-kochi-mincho
 Description: library for Kiten Japanese reference/study tool
- Kiten is a Japanese reference/study tool for KDE.  The library
+ Kiten is a Japanese reference/study tool for TDE. The library
  libkiten contains portions of Kiten that may be useful for other
  applications.  These portions include dictionary, character lookup
  and widget classes.
@@ -578,8 +578,8 @@ 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 Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: libkiten-trinity-dev
 Architecture: any
@@ -588,7 +588,7 @@ Replaces: libkiten-trinity-dev (<< 4:14.0.0~)
 Breaks: libkiten-trinity-dev (<< 4:14.0.0~)
 Depends: libkiten1-trinity (= ${Source-Version}), tdelibs14-trinity-dev
 Description: development files for Kiten library
- Kiten is a Japanese reference/study tool for KDE.  The library
+ Kiten is a Japanese reference/study tool for TDE. The library
  libkiten contains portions of Kiten that may be useful for other
  applications.  These portions include dictionary, character lookup
  and widget classes.
@@ -596,8 +596,8 @@ 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 Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: indi-trinity
 Architecture: any
@@ -613,5 +613,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 Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE education module.
+ See the 'tde-trinity' and 'tdeedu-trinity' packages for more information.
diff --git a/debian/lenny/tdeedu/debian/control.in b/debian/lenny/tdeedu/debian/control.in
index 25ff08c24..e31d4384d 100644
--- a/debian/lenny/tdeedu/debian/control.in
+++ b/debian/lenny/tdeedu/debian/control.in
@@ -12,25 +12,25 @@ Architecture: all
 Section: tde
 Depends: blinken (>= ${Source-Version}), kalzium (>= ${Source-Version}), kanagram (>= ${Source-Version}), kbruch (>= ${Source-Version}), tdeedu-data (>= ${Source-Version}), keduca (>= ${Source-Version}), kgeography (>= ${Source-Version}), khangman (>= ${Source-Version}), kig (>= ${Source-Version}), kiten (>= ${Source-Version}), klatin (>= ${Source-Version}), klettres (>= ${Source-Version}), kmplot (>= ${Source-Version}), kpercentage (>= ${Source-Version}), kstars (>= ${Source-Version}), ktouch (>= ${Source-Version}), kturtle (>= ${Source-Version}), kverbos (>= ${Source-Version}), kvoctrain (>= ${Source-Version}), kwordquiz (>= ${Source-Version}), indi (>= ${Source-Version})
 Suggests: tdeedu-doc-html
-Description: educational apps from the official KDE release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: educational apps from the official TDE release
+ TDE (the Trinity 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 KDE.
+ official release of TDE.
 
 Package: tdeedu-data
 Architecture: all
 Section: tde
-Description: shared data for KDE educational applications
+Description: shared data for TDE educational applications
  This package contains shared data necessary for running the
- educational applications provided with KDE (the K Desktop
+ educational applications provided with TDE (the Trinity Desktop
  Environment).
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: tdeedu-dbg
 Architecture: any
@@ -46,27 +46,27 @@ Package: tdeedu-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror | www-browser, tdeedu
-Description: KDE edutainment documentation in HTML format
- By default the educational applications provided with KDE (the K
- Desktop Environment) only provide their documentation in KDE docbook
+Description: TDE edutainment documentation in HTML format
+ By default the educational applications provided with TDE (the Trinity
+ Desktop Environment) only provide their documentation in TDE docbook
  format, which can only be read by Konqueror or KHelpCenter. This
- package provides all of the KDE edutainment documentation converted
+ package provides all of the TDE edutainment documentation converted
  to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
  /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
  /opt/trinity/share/doc/tde/HTML/en/kalzium/. Documentation is provided for
- most KDE educational packages.
+ most TDE educational packages.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: blinken
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, ttf-sjfonts, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, ttf-sjfonts, tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
-Description: KDE version of the Simon Says electronic memory game
+Description: TDE 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,15 +76,15 @@ Description: KDE 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 KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: kalzium
 Architecture: any
 Section: science
-Depends: ${shlibs:Depends}, kalzium-data (>> ${KDE-Version3}), kalzium-data (<< ${KDE-Next-Version3}), tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, kalzium-data (>> ${TDE-Version3}), kalzium-data (<< ${TDE-Next-Version3}), tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
-Description: chemistry teaching tool for KDE
+Description: chemistry teaching tool for TDE
  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,8 +101,8 @@ Description: chemistry teaching tool for KDE
  OCaml supports native code generation, Kalzium includes a chemical
  equation solver.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: kalzium-data
 Architecture: all
@@ -110,21 +110,21 @@ Section: science
 Replaces: kalzium (<< 4:3.5.0)
 Description: data files for Kalzium
  This package contains architecture-independent data files for
- Kalzium, the KDE periodic table application.  This includes pictures
+ Kalzium, the TDE periodic table application.  This includes pictures
  of various chemical equipment and of samples of several elements, in
  addition to the actual chemical data.
  .
  See the kalzium package for further information.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: kanagram
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
-Description: letter order game for KDE
+Description: letter order game for TDE
  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
@@ -137,67 +137,67 @@ Description: letter order game for KDE
  children aged 10+ because of the difficulty, but of course everyone
  is welcome to try.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: kbruch
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
-Description: fraction calculation teaching tool for KDE
+Description: fraction calculation teaching tool for TDE
  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 KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: keduca
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
-Description: interactive form-based tests for KDE
+Description: interactive form-based tests for TDE
  KEduca is a flash-card application which allows you to make
  interactive form-based tests.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: kgeography
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, kgeography-data (>> ${KDE-Version3}), kgeography-data (<< ${KDE-Next-Version3}), tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, kgeography-data (>> ${TDE-Version3}), kgeography-data (<< ${TDE-Next-Version3}), tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
-Description: Geography learning tool for KDE
+Description: Geography learning tool for TDE
  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 KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: kgeography-data
 Architecture: all
 Section: tde
 Description: data files for KGeography
  This package contains architecture-independent data files for
- KGeography, the geography learning tool for KDE.  This includes map
+ KGeography, the geography learning tool for TDE. This includes map
  and flag images.
  .
  See the kgeography package for further information.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: khangman
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, ttf-dustin, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, ttf-dustin, tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
-Description: the classical hangman game for KDE
+Description: the classical hangman game for TDE
  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.
@@ -207,15 +207,15 @@ Description: the classical hangman game for KDE
  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 KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: kig
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
-Description: interactive geometry program for KDE
+Description: interactive geometry program for TDE
  Kig is an application for interactive geometry.  It is intended to
  serve two purposes:
  .
@@ -233,28 +233,28 @@ 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 KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: kiten
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3}), ttf-kochi-gothic | ttf-kochi-mincho
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3}), ttf-kochi-gothic | ttf-kochi-mincho
 Suggests: khelpcenter, tdeedu-doc-html
-Description: Japanese reference/study tool for KDE
- Kiten is a Japanese reference and study tool for KDE.  It is an
+Description: Japanese reference/study tool for TDE
+ Kiten is a Japanese reference and study tool for TDE. 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 KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: klatin
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
 Description: application to help revise/teach Latin
  KLatin is a program to help revise Latin.  There are three "sections"
@@ -271,15 +271,15 @@ 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 KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: klettres
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, klettres-data (>> ${KDE-Version3}), klettres-data (<< ${KDE-Next-Version3}), tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, klettres-data (>> ${TDE-Version3}), klettres-data (<< ${TDE-Next-Version3}), tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
-Description: foreign alphabet tutor for KDE
+Description: foreign alphabet tutor for TDE
  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
@@ -288,8 +288,8 @@ Description: foreign alphabet tutor for KDE
  Seven languages are currently available: Czech, Danish, Dutch,
  English, French, Italian and Slovak.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: klettres-data
 Architecture: all
@@ -297,21 +297,21 @@ Section: tde
 Replaces: klettres (<< 4:3.2.0.1)
 Description: data files for KLettres foreign alphabet tutor
  This package contains architecture-independent data files for
- KLettres, the foreign alphabet tutor for KDE.  This includes sound
+ KLettres, the foreign alphabet tutor for TDE. This includes sound
  files and graphics.
  .
  See the klettres package for further information.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: kmplot
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
-Description: mathematical function plotter for KDE
- KmPlot is a mathematical function plotter for KDE.  It has a powerful
+Description: mathematical function plotter for TDE
+ KmPlot is a mathematical function plotter for TDE. It has a powerful
  built-in parser.  You can plot different functions simultaneously and
  combine them to build new functions.
  .
@@ -324,15 +324,15 @@ Description: mathematical function plotter for KDE
  maximum and minimum values, changing function parameters dynamically
  and plotting derivatives and integral functions.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: kpercentage
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
-Description: percentage calculation teaching tool for KDE
+Description: percentage calculation teaching tool for TDE
  KPercentage is a small math application that will help pupils to
  improve their skills in calculating percentages.
  .
@@ -340,16 +340,16 @@ Description: percentage calculation teaching tool for KDE
  Finally the pupil can select a random mode, in which all three tasks
  are mixed randomly.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: kstars
 Architecture: any
 Section: science
-Depends: ${shlibs:Depends}, kstars-data (>> ${KDE-Version3}), kstars-data (<< ${KDE-Next-Version3}), tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3}), indi (= ${Source-Version})
+Depends: ${shlibs:Depends}, kstars-data (>> ${TDE-Version3}), kstars-data (<< ${TDE-Next-Version3}), tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3}), indi (= ${Source-Version})
 Suggests: konqueror, khelpcenter, tdeedu-doc-html
-Description: desktop planetarium for KDE
- KStars is a graphical desktop planetarium for KDE.  It depicts an
+Description: desktop planetarium for TDE
+ KStars is a graphical desktop planetarium for TDE. It depicts an
  accurate simulation of the night sky, including stars,
  constellations, star clusters, nebulae, galaxies, all planets, the
  Sun, the Moon, comets and asteroids.  You can see the sky as it
@@ -361,8 +361,8 @@ Description: desktop planetarium for KDE
  powerful features, yet the interface is clean and simple and fun to
  use.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: kstars-data
 Architecture: all
@@ -370,20 +370,20 @@ Section: science
 Replaces: kstars (<< 4:3.2.0.1)
 Description: data files for KStars desktop planetarium
  This package contains architecture-independent data files for KStars,
- the graphical desktop planetarium for KDE.  This includes star
+ the graphical desktop planetarium for TDE. This includes star
  catalogues and astronomical images.
  .
  See the kstars package for further information.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: ktouch
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
-Description: touch typing tutor for KDE
+Description: touch typing tutor for TDE
  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.
@@ -393,13 +393,13 @@ Description: touch typing tutor for KDE
  are.  It can display which key to press next, and the correct finger
  to use.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: kturtle
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
 Description: educational Logo programming environment
  KTurtle is an educational programming environment using the Logo
@@ -419,15 +419,15 @@ Description: educational Logo programming environment
  qualities of the programming language and will not try to suit
  professional programmers' needs.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: kverbos
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
-Description: Spanish verb form study application for KDE
+Description: Spanish verb form study application for TDE
  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.
@@ -436,15 +436,15 @@ Description: Spanish verb form study application for KDE
  program can build regular verb forms by itself.  Irregular verb forms
  have to be entered by the user.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: kvoctrain
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
-Description: vocabulary trainer for KDE
+Description: vocabulary trainer for TDE
  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
@@ -460,25 +460,25 @@ Description: vocabulary trainer for KDE
  things.  This is and probably will stay beyond the scope of this
  application.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: kwordquiz
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${TDE-Version3}), tdeedu-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, tdeedu-doc-html
-Description: flashcard and vocabulary learning program for KDE
+Description: flashcard and vocabulary learning program for TDE
  KWordQuiz is a flashcard-based tool that helps you to master new
  vocabularies. It may be a language or any other kind of terminology.
  .
  KWordQuiz can open several types of vocabulary data.  Supported are
- kvtml files used by other KDE programs such as KVocTrain, wql files
+ kvtml files used by other TDE programs such as KVocTrain, wql files
  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 KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: libtdeedu3
 Architecture: any
@@ -486,27 +486,27 @@ Section: libs
 Depends: ${shlibs:Depends}
 Conflicts: libtdeedu1
 Replaces: libtdeedu1
-Description: library for use with KDE educational apps
- The KDE-based library libtdeedu is used with educational
+Description: library for use with TDE educational apps
+ The TDE-based library libtdeedu 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 KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: libtdeedu-dev
 Architecture: any
 Section: libdevel
 Depends: libtdeedu3 (= ${Source-Version}), tdelibs4-dev
-Description: development files for KDE educational library
- The KDE-based library libtdeedu is used with educational
+Description: development files for TDE educational library
+ The TDE-based library libtdeedu 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 libtdeedu are included in this package.
  .
- This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: libkiten1
 Architecture: any
@@ -515,7 +515,7 @@ Depends: ${shlibs:Depends}, edict, kanjidic
 Recommends: ttf-kochi-gothic | ttf-kochi-mincho
 Replaces: kiten (<< 4:3.4.0)
 Description: library for Kiten Japanese reference/study tool
- Kiten is a Japanese reference/study tool for KDE.  The library
+ Kiten is a Japanese reference/study tool for TDE. The library
  libkiten contains portions of Kiten that may be useful for other
  applications.  These portions include dictionary, character lookup
  and widget classes.
@@ -524,15 +524,15 @@ 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 KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: libkiten-dev
 Architecture: any
 Section: libdevel
 Depends: libkiten1 (= ${Source-Version}), tdelibs4-dev
 Description: development files for Kiten library
- Kiten is a Japanese reference/study tool for KDE.  The library
+ Kiten is a Japanese reference/study tool for TDE. The library
  libkiten contains portions of Kiten that may be useful for other
  applications.  These portions include dictionary, character lookup
  and widget classes.
@@ -540,8 +540,8 @@ 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 KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
 
 Package: indi
 Architecture: any
@@ -556,5 +556,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 KDE, as a component of the KDE education module.
- See the 'kde' and 'tdeedu' packages for more information.
+ This package is part of TDE, as a component of the TDE education module.
+ See the 'tde' and 'tdeedu' packages for more information.
diff --git a/debian/lenny/tdeedu/debian/kalzium-trinity.README.Debian b/debian/lenny/tdeedu/debian/kalzium-trinity.README.Debian
index d65c1bcb3..57b0b7c6a 100644
--- a/debian/lenny/tdeedu/debian/kalzium-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kalzium-trinity.README.Debian
@@ -1,7 +1,7 @@
 Kalzium for Debian
 ------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/kalzium-trinity.menu b/debian/lenny/tdeedu/debian/kalzium-trinity.menu
index 5c727993c..7deabbbc8 100644
--- a/debian/lenny/tdeedu/debian/kalzium-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kalzium-trinity.menu
@@ -1,4 +1,4 @@
-?package(kalzium):needs="X11"\
+?package(kalzium-trinity):needs="X11"\
   section="Apps/Science/Chemistry"\
   hints="TDE"\
   title="Kalzium"\
diff --git a/debian/lenny/tdeedu/debian/kanagram-trinity.README.Debian b/debian/lenny/tdeedu/debian/kanagram-trinity.README.Debian
index 1af240471..77691b8ff 100644
--- a/debian/lenny/tdeedu/debian/kanagram-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kanagram-trinity.README.Debian
@@ -1,7 +1,7 @@
 KMessedWords for Debian
 -----------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/kanagram-trinity.menu b/debian/lenny/tdeedu/debian/kanagram-trinity.menu
index c0cfb57b4..60412d1ce 100644
--- a/debian/lenny/tdeedu/debian/kanagram-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kanagram-trinity.menu
@@ -1,4 +1,4 @@
-?package(kanagram):needs="X11"\
+?package(kanagram-trinity):needs="X11"\
   section="Games/Puzzles"\
   hints="TDE"\
   title="KAnagram"\
diff --git a/debian/lenny/tdeedu/debian/kbruch-trinity.README.Debian b/debian/lenny/tdeedu/debian/kbruch-trinity.README.Debian
index 424617cfe..7d56d7d39 100644
--- a/debian/lenny/tdeedu/debian/kbruch-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kbruch-trinity.README.Debian
@@ -1,7 +1,7 @@
 KBruch for Debian
 -----------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/kbruch-trinity.menu b/debian/lenny/tdeedu/debian/kbruch-trinity.menu
index 684d52e2f..d0050f91a 100644
--- a/debian/lenny/tdeedu/debian/kbruch-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kbruch-trinity.menu
@@ -1,4 +1,4 @@
-?package(kbruch):needs="X11"\
+?package(kbruch-trinity):needs="X11"\
   section="Applications/Education"\
   hints="TDE"\
   title="KBruch"\
diff --git a/debian/lenny/tdeedu/debian/keduca-trinity.README.Debian b/debian/lenny/tdeedu/debian/keduca-trinity.README.Debian
index b061f1f0a..3932ea2fb 100644
--- a/debian/lenny/tdeedu/debian/keduca-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/keduca-trinity.README.Debian
@@ -1,7 +1,7 @@
 KEduca for Debian
 -----------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/keduca-trinity.menu b/debian/lenny/tdeedu/debian/keduca-trinity.menu
index 3eb2c2819..450fc5f86 100644
--- a/debian/lenny/tdeedu/debian/keduca-trinity.menu
+++ b/debian/lenny/tdeedu/debian/keduca-trinity.menu
@@ -1,4 +1,4 @@
-?package(keduca):needs="X11"\
+?package(keduca-trinity):needs="X11"\
   section="Applications/Education"\
   hints="TDE"\
   title="KEduca"\
@@ -6,7 +6,7 @@
   command="/opt/trinity/bin/keduca"\
   icon="/opt/trinity/share/pixmaps/keduca.xpm"
 
-?package(keduca):needs="X11"\
+?package(keduca-trinity):needs="X11"\
   section="Applications/Education"\
   hints="TDE"\
   title="KEduca-Editor"\
diff --git a/debian/lenny/tdeedu/debian/kgeography-trinity.README.Debian b/debian/lenny/tdeedu/debian/kgeography-trinity.README.Debian
index 69c1e534f..e0b5ac9b8 100644
--- a/debian/lenny/tdeedu/debian/kgeography-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kgeography-trinity.README.Debian
@@ -1,7 +1,7 @@
 KGeography for Debian
 ---------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/kgeography-trinity.menu b/debian/lenny/tdeedu/debian/kgeography-trinity.menu
index 54458aab8..9cb6374a5 100644
--- a/debian/lenny/tdeedu/debian/kgeography-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kgeography-trinity.menu
@@ -1,4 +1,4 @@
-?package(kgeography):needs="X11"\
+?package(kgeography-trinity):needs="X11"\
   section="Applications/Education"\
   hints="TDE"\
   title="KGeography"\
diff --git a/debian/lenny/tdeedu/debian/khangman-trinity.README.Debian b/debian/lenny/tdeedu/debian/khangman-trinity.README.Debian
index da2935ff1..b46348693 100644
--- a/debian/lenny/tdeedu/debian/khangman-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/khangman-trinity.README.Debian
@@ -1,7 +1,7 @@
 KHangMan for Debian
 -------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/khangman-trinity.menu b/debian/lenny/tdeedu/debian/khangman-trinity.menu
index 4130e814a..033963128 100644
--- a/debian/lenny/tdeedu/debian/khangman-trinity.menu
+++ b/debian/lenny/tdeedu/debian/khangman-trinity.menu
@@ -1,4 +1,4 @@
-?package(khangman):needs="X11"\
+?package(khangman-trinity):needs="X11"\
   section="Games/Puzzles"\
   hints="TDE"\
   title="KHangMan"\
diff --git a/debian/lenny/tdeedu/debian/kig-trinity.README.Debian b/debian/lenny/tdeedu/debian/kig-trinity.README.Debian
index 00bf214c7..21d766153 100644
--- a/debian/lenny/tdeedu/debian/kig-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kig-trinity.README.Debian
@@ -1,7 +1,7 @@
 Kig for Debian
 --------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/kig-trinity.menu b/debian/lenny/tdeedu/debian/kig-trinity.menu
index 74b7208ed..bd8c7e241 100644
--- a/debian/lenny/tdeedu/debian/kig-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kig-trinity.menu
@@ -1,4 +1,4 @@
-?package(kig):needs="X11"\
+?package(kig-trinity):needs="X11"\
   section="Applications/Science/Mathematics"\
   hints="TDE"\
   title="Kig"\
diff --git a/debian/lenny/tdeedu/debian/kiten-trinity.README.Debian b/debian/lenny/tdeedu/debian/kiten-trinity.README.Debian
index 4efd3659b..3b0d66768 100644
--- a/debian/lenny/tdeedu/debian/kiten-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kiten-trinity.README.Debian
@@ -1,7 +1,7 @@
 Kiten for Debian
 ----------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/kiten-trinity.menu b/debian/lenny/tdeedu/debian/kiten-trinity.menu
index 674cfc40e..72d6a1251 100644
--- a/debian/lenny/tdeedu/debian/kiten-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kiten-trinity.menu
@@ -1,4 +1,4 @@
-?package(kiten):needs="X11"\
+?package(kiten-trinity):needs="X11"\
   section="Applications/Education"\
   hints="TDE"\
   title="Kiten"\
diff --git a/debian/lenny/tdeedu/debian/klatin-trinity.README.Debian b/debian/lenny/tdeedu/debian/klatin-trinity.README.Debian
index f03b75aef..eb2f5e329 100644
--- a/debian/lenny/tdeedu/debian/klatin-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/klatin-trinity.README.Debian
@@ -1,7 +1,7 @@
 KLatin for Debian
 -----------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/klatin-trinity.menu b/debian/lenny/tdeedu/debian/klatin-trinity.menu
index eba23f711..6a27f0e9e 100644
--- a/debian/lenny/tdeedu/debian/klatin-trinity.menu
+++ b/debian/lenny/tdeedu/debian/klatin-trinity.menu
@@ -1,4 +1,4 @@
-?package(klatin):needs="X11"\
+?package(klatin-trinity):needs="X11"\
   section="Applications/Education"\
   hints="TDE"\
   title="KLatin"\
diff --git a/debian/lenny/tdeedu/debian/klettres-trinity.README.Debian b/debian/lenny/tdeedu/debian/klettres-trinity.README.Debian
index 0208d8dff..74b1c2de0 100644
--- a/debian/lenny/tdeedu/debian/klettres-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/klettres-trinity.README.Debian
@@ -1,7 +1,7 @@
 KLettres for Debian
 -------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/klettres-trinity.menu b/debian/lenny/tdeedu/debian/klettres-trinity.menu
index d95337ae4..0db4a8d0b 100644
--- a/debian/lenny/tdeedu/debian/klettres-trinity.menu
+++ b/debian/lenny/tdeedu/debian/klettres-trinity.menu
@@ -1,4 +1,4 @@
-?package(klettres):needs="X11"\
+?package(klettres-trinity):needs="X11"\
   section="Applications/Education"\
   hints="TDE"\
   title="KLettres"\
diff --git a/debian/lenny/tdeedu/debian/kmplot-trinity.README.Debian b/debian/lenny/tdeedu/debian/kmplot-trinity.README.Debian
index 85a642d3a..b1d49586d 100644
--- a/debian/lenny/tdeedu/debian/kmplot-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kmplot-trinity.README.Debian
@@ -1,7 +1,7 @@
 KmPlot for Debian
 -----------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/kmplot-trinity.menu b/debian/lenny/tdeedu/debian/kmplot-trinity.menu
index cce8113dc..755a6f7ba 100644
--- a/debian/lenny/tdeedu/debian/kmplot-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kmplot-trinity.menu
@@ -1,4 +1,4 @@
-?package(kmplot):needs="X11"\
+?package(kmplot-trinity):needs="X11"\
   section="Applications/Science/Mathematics"\
   hints="TDE"\
   title="KmPlot"\
diff --git a/debian/lenny/tdeedu/debian/kpercentage-trinity.README.Debian b/debian/lenny/tdeedu/debian/kpercentage-trinity.README.Debian
index 60cbe6af6..f99cbba30 100644
--- a/debian/lenny/tdeedu/debian/kpercentage-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kpercentage-trinity.README.Debian
@@ -1,7 +1,7 @@
 KPercentage for Debian
 ----------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/kpercentage-trinity.menu b/debian/lenny/tdeedu/debian/kpercentage-trinity.menu
index 5efdba16a..1ca8947e9 100644
--- a/debian/lenny/tdeedu/debian/kpercentage-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kpercentage-trinity.menu
@@ -1,4 +1,4 @@
-?package(kpercentage):needs="X11"\
+?package(kpercentage-trinity):needs="X11"\
   section="Applications/Education"\
   hints="TDE"\
   title="KPercentage"\
diff --git a/debian/lenny/tdeedu/debian/kstars-trinity.README.Debian b/debian/lenny/tdeedu/debian/kstars-trinity.README.Debian
index 5969718d5..adba4b1a6 100644
--- a/debian/lenny/tdeedu/debian/kstars-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kstars-trinity.README.Debian
@@ -1,7 +1,7 @@
 KStars for Debian
 -----------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/kstars-trinity.menu b/debian/lenny/tdeedu/debian/kstars-trinity.menu
index 9bae2a16c..0074c7e93 100644
--- a/debian/lenny/tdeedu/debian/kstars-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kstars-trinity.menu
@@ -1,4 +1,4 @@
-?package(kstars):needs="X11"\
+?package(kstars-trinity):needs="X11"\
   section="Applications/Science/Astronomy"\
   hints="TDE"\
   title="KStars"\
diff --git a/debian/lenny/tdeedu/debian/ktouch-trinity.README.Debian b/debian/lenny/tdeedu/debian/ktouch-trinity.README.Debian
index 1e9011ebd..1b538edbd 100644
--- a/debian/lenny/tdeedu/debian/ktouch-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/ktouch-trinity.README.Debian
@@ -1,7 +1,7 @@
 KTouch for Debian
 -----------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/ktouch-trinity.menu b/debian/lenny/tdeedu/debian/ktouch-trinity.menu
index 52b5d3347..f0bb0f189 100644
--- a/debian/lenny/tdeedu/debian/ktouch-trinity.menu
+++ b/debian/lenny/tdeedu/debian/ktouch-trinity.menu
@@ -1,4 +1,4 @@
-?package(ktouch):needs="X11"\
+?package(ktouch-trinity):needs="X11"\
   section="Applications/Education"\
   hints="TDE"\
   title="KTouch"\
diff --git a/debian/lenny/tdeedu/debian/kturtle-trinity.README.Debian b/debian/lenny/tdeedu/debian/kturtle-trinity.README.Debian
index 6cfc8dbac..3ad3006b0 100644
--- a/debian/lenny/tdeedu/debian/kturtle-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kturtle-trinity.README.Debian
@@ -1,7 +1,7 @@
 KTurtle for Debian
 ------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/kturtle-trinity.menu b/debian/lenny/tdeedu/debian/kturtle-trinity.menu
index eabb3cbb3..c3fef1da9 100644
--- a/debian/lenny/tdeedu/debian/kturtle-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kturtle-trinity.menu
@@ -1,4 +1,4 @@
-?package(kturtle):needs="X11"\
+?package(kturtle-trinity):needs="X11"\
   section="Applications/Education"\
   hints="TDE"\
   title="KTurtle"\
diff --git a/debian/lenny/tdeedu/debian/kverbos-trinity.README.Debian b/debian/lenny/tdeedu/debian/kverbos-trinity.README.Debian
index 197071f05..c2b55dc43 100644
--- a/debian/lenny/tdeedu/debian/kverbos-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kverbos-trinity.README.Debian
@@ -1,7 +1,7 @@
 Kverbos for Debian
 ------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/kverbos-trinity.menu b/debian/lenny/tdeedu/debian/kverbos-trinity.menu
index a6111be0e..27077e1ce 100644
--- a/debian/lenny/tdeedu/debian/kverbos-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kverbos-trinity.menu
@@ -1,4 +1,4 @@
-?package(kverbos):needs="X11"\
+?package(kverbos-trinity):needs="X11"\
   section="Applications/Education"\
   hints="TDE"\
   title="Kverbos"\
diff --git a/debian/lenny/tdeedu/debian/kvoctrain-trinity.README.Debian b/debian/lenny/tdeedu/debian/kvoctrain-trinity.README.Debian
index d9f42d1fe..851bab339 100644
--- a/debian/lenny/tdeedu/debian/kvoctrain-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kvoctrain-trinity.README.Debian
@@ -1,7 +1,7 @@
 KVocTrain for Debian
 --------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/kvoctrain-trinity.menu b/debian/lenny/tdeedu/debian/kvoctrain-trinity.menu
index e4043bee4..f301a8d3a 100644
--- a/debian/lenny/tdeedu/debian/kvoctrain-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kvoctrain-trinity.menu
@@ -1,4 +1,4 @@
-?package(kvoctrain):needs="X11"\
+?package(kvoctrain-trinity):needs="X11"\
   section="Applications/Education"\
   hints="TDE"\
   title="KVocTrain"\
diff --git a/debian/lenny/tdeedu/debian/kwordquiz-trinity.README.Debian b/debian/lenny/tdeedu/debian/kwordquiz-trinity.README.Debian
index 681ee1b28..3e4de808f 100644
--- a/debian/lenny/tdeedu/debian/kwordquiz-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kwordquiz-trinity.README.Debian
@@ -1,7 +1,7 @@
 KWordQuiz for Debian
 --------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.
 
diff --git a/debian/lenny/tdeedu/debian/kwordquiz-trinity.menu b/debian/lenny/tdeedu/debian/kwordquiz-trinity.menu
index 5abc01a39..ba420f327 100644
--- a/debian/lenny/tdeedu/debian/kwordquiz-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kwordquiz-trinity.menu
@@ -1,4 +1,4 @@
-?package(kwordquiz):needs="X11"\
+?package(kwordquiz-trinity):needs="X11"\
   section="Applications/Education"\
   hints="TDE"\
   title="KWordQuiz"\
diff --git a/debian/lenny/tdeedu/debian/man/blinken-trinity.1 b/debian/lenny/tdeedu/debian/man/blinken-trinity.1
index e52c7c668..745feac0d 100644
--- a/debian/lenny/tdeedu/debian/man/blinken-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/blinken-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-blinken \- electronic memory game for KDE
+blinken \- electronic memory game for TDE
 .SH SYNOPSIS
 .B blinken
 .RI "[ " generic-options " ]"
@@ -30,18 +30,18 @@ recall.  If the player is successful in remembering the sequence of
 lights in the correct order, they advance to the next stage, where an
 identical sequence with one extra step is presented.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fIblinken \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/blinken/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/blinken/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/blinken/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/celestrongps-trinity.1 b/debian/lenny/tdeedu/debian/man/celestrongps-trinity.1
index bce30b4c4..45adf8fdc 100644
--- a/debian/lenny/tdeedu/debian/man/celestrongps-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/celestrongps-trinity.1
@@ -36,8 +36,8 @@ in turn start this device driver.
 Much more detailed information can be found in the KStars Handbook, as
 described below.
 .PP
-KStars is a graphical desktop planetarium for KDE, and forms part of
-the official KDE edutainment module.
+KStars is a graphical desktop planetarium for TDE, and forms part of
+the official TDE edutainment module.
 .SH OPTIONS
 .TP
 \fB\-v\fP
@@ -47,14 +47,14 @@ Write more verbose output to stderr.
 .BR kstars (1).
 .PP
 The KStars Handbook contains detailed information on how to use INDI for
-telescope control.  You can read this handbook in the KDE Help Centre.
+telescope control.  You can read this handbook in the TDE Help Centre.
 Alternatively you can enter the URL
 \fIhelp:/kstars/indi.html\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kstars/indi.html\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/fliccd-trinity.1 b/debian/lenny/tdeedu/debian/man/fliccd-trinity.1
index a909cde14..3a0a73c0b 100644
--- a/debian/lenny/tdeedu/debian/man/fliccd-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/fliccd-trinity.1
@@ -36,8 +36,8 @@ in turn start this device driver.
 Much more detailed information can be found in the KStars Handbook, as
 described below.
 .PP
-KStars is a graphical desktop planetarium for KDE, and forms part of
-the official KDE edutainment module.
+KStars is a graphical desktop planetarium for TDE, and forms part of
+the official TDE edutainment module.
 .SH OPTIONS
 .TP
 \fB\-v\fP
@@ -47,14 +47,14 @@ Write more verbose output to stderr.
 .BR kstars (1).
 .PP
 The KStars Handbook contains detailed information on how to use INDI for
-telescope control.  You can read this handbook in the KDE Help Centre.
+telescope control.  You can read this handbook in the TDE Help Centre.
 Alternatively you can enter the URL
 \fIhelp:/kstars/indi.html\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kstars/indi.html\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/indiserver-trinity.1 b/debian/lenny/tdeedu/debian/man/indiserver-trinity.1
index 1504c0631..d11ee6dc9 100644
--- a/debian/lenny/tdeedu/debian/man/indiserver-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/indiserver-trinity.1
@@ -68,8 +68,8 @@ v4lphilips (Philips Webcam)
 Much more detailed information can be found in the KStars Handbook, as
 described below.
 .PP
-KStars is a graphical desktop planetarium for KDE, and forms part of
-the official KDE edutainment module.
+KStars is a graphical desktop planetarium for TDE, and forms part of
+the official TDE edutainment module.
 .SH OPTIONS
 .TP
 \fB\-p\fP \fIport\fP
@@ -101,14 +101,14 @@ connections on port 8000:
 .BR v4lphilips (1).
 .PP
 The KStars Handbook contains detailed information on how to use INDI for
-telescope control.  You can read this handbook in the KDE Help Centre.
+telescope control.  You can read this handbook in the TDE Help Centre.
 Alternatively you can enter the URL
 \fIhelp:/kstars/indi.html\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kstars/indi.html\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/kalzium-trinity.1 b/debian/lenny/tdeedu/debian/man/kalzium-trinity.1
index 9792c173d..b01903f10 100644
--- a/debian/lenny/tdeedu/debian/man/kalzium-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kalzium-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kalzium \- a chemistry teaching tool for KDE
+kalzium \- a chemistry teaching tool for TDE
 .SH SYNOPSIS
 .B kalzium
 .RI "[ " generic-options " ]"
@@ -34,18 +34,18 @@ acidic behavior or different states of matter.  You can also plot data for a
 range of elements (weight, mean weight, density, IE1, IE2, electronegativity),
 and you can go back in time to see what elements were known at a given date.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fIkalzium \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kalzium/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kalzium/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kalzium/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/kanagram-trinity.1 b/debian/lenny/tdeedu/debian/man/kanagram-trinity.1
index 35a1c1f78..0955cd6d8 100644
--- a/debian/lenny/tdeedu/debian/man/kanagram-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kanagram-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kanagram \- a letter order game for KDE
+kanagram \- a letter order game for TDE
 .SH SYNOPSIS
 .B kanagram
 .RI "[ " generic-options " ]"
@@ -31,18 +31,18 @@ It is fully customizable, allowing you to write in your own words and set
 your own 'look and feel' of the game.  It is aimed for children aged 10+
 because of the difficulty, but of course everyone is welcome to try.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fIkanagram \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kanagram/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kanagram/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kanagram/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/kbruch-trinity.1 b/debian/lenny/tdeedu/debian/man/kbruch-trinity.1
index 51b7ab0b8..68655e82e 100644
--- a/debian/lenny/tdeedu/debian/man/kbruch-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kbruch-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kbruch \- a fraction calculation teaching tool for KDE
+kbruch \- a fraction calculation teaching tool for TDE
 .SH SYNOPSIS
 .B kbruch
 .RI "[ " generic-options " ]"
@@ -25,18 +25,18 @@ kbruch \- a fraction calculation teaching tool for KDE
 Different exercises are provided for this purpose.  The program checks
 the user's input and gives feedback.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fIkbruch \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kbruch/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kbruch/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kbruch/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/keduca-shrinker-trinity.1 b/debian/lenny/tdeedu/debian/man/keduca-shrinker-trinity.1
index 53715bed4..57de28410 100644
--- a/debian/lenny/tdeedu/debian/man/keduca-shrinker-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/keduca-shrinker-trinity.1
@@ -34,7 +34,7 @@ original test in the KEduca Editor, you should explicitly clear the "Compress
 the file" checkbox.  Otherwise keduca-shrinker will not be able to read it.
 .PP
 \fBKEduca\fP is a flash-card application for working with interactive
-form-based tests.  It is shipped as part of the official KDE edutainment
+form-based tests.  It is shipped as part of the official TDE edutainment
 module.
 .SH OPTIONS
 .TP
@@ -54,7 +54,7 @@ This defaults to 20.
 .BR keduca (1),
 .BR keducabuilder (1).
 .PP
-This tool is not yet part of the official KDE edutainment module.
+This tool is not yet part of the official TDE edutainment module.
 Its upstream site is
 \fIhttps://gna.org/projects/keduca-shrinker/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/keduca-trinity.1 b/debian/lenny/tdeedu/debian/man/keduca-trinity.1
index 6b2f607eb..634977aa1 100644
--- a/debian/lenny/tdeedu/debian/man/keduca-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/keduca-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-keduca \- interactive form-based tests for KDE
+keduca \- interactive form-based tests for TDE
 .SH SYNOPSIS
 .B keduca
 .RI "[ " generic-options " ]"
@@ -27,21 +27,21 @@ interactive form-based tests.  This application is used only for viewing
 and taking these tests \- you can create and edit tests using the
 related application \fBKEducaBuilder\fP.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fIkeduca \-\-help\fP.
 .SH SEE ALSO
 .BR keduca-shrinker (1),
 .BR keducabuilder (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/keduca/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/keduca/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/keduca/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/keducabuilder-trinity.1 b/debian/lenny/tdeedu/debian/man/keducabuilder-trinity.1
index 1028a8927..a6431a28d 100644
--- a/debian/lenny/tdeedu/debian/man/keducabuilder-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/keducabuilder-trinity.1
@@ -27,21 +27,21 @@ application for working with interactive form-based tests.
 KEducaBuilder is used to create and edit these tests, whereas KEduca
 itself can be used to view and take these tests.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fIkeduca \-\-help\fP.
 .SH SEE ALSO
 .BR keduca (1),
 .BR keduca-shrinker (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/keduca/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/keduca/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/keduca/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/kgeography-trinity.1 b/debian/lenny/tdeedu/debian/man/kgeography-trinity.1
index b25bb7076..451605d93 100644
--- a/debian/lenny/tdeedu/debian/man/kgeography-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kgeography-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kgeography \- geography learning tool for KDE
+kgeography \- geography learning tool for TDE
 .SH SYNOPSIS
 .B kgeography
 .RI "[ " generic-options " ]"
@@ -26,18 +26,18 @@ kgeography \- geography learning tool for KDE
  including a map browser and games involving the names, capitals, or
  flags of the map divisions.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fIkgeography \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kgeography/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kgeography/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kgeography/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/khangman-trinity.1 b/debian/lenny/tdeedu/debian/man/khangman-trinity.1
index a5fc8f698..b130aa3ca 100644
--- a/debian/lenny/tdeedu/debian/man/khangman-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/khangman-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-khangman \- the classical hangman game for KDE
+khangman \- the classical hangman game for TDE
 .SH SYNOPSIS
 .B khangman
 .RI "[ " generic-options " ]"
@@ -30,18 +30,18 @@ the word by trying one letter after another.  Each time you guess a wrong
 letter, a picture of a hangman is drawn.  You must guess the word before
 getting hanged!  You have 10 tries.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fIkhangman \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/khangman/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/khangman/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/khangman/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/kig-trinity.1 b/debian/lenny/tdeedu/debian/man/kig-trinity.1
index 0238e3569..208ed9165 100644
--- a/debian/lenny/tdeedu/debian/man/kig-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kig-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kig \- an interactive geometry program for KDE
+kig \- an interactive geometry program for TDE
 .SH SYNOPSIS
 .B kig
 .RI "[ " generic-options " ]"
@@ -46,7 +46,7 @@ Kig supports loci and user-defined macros.  It also supports imports
 and exports to/from foreign file formats including Cabri, Dr. Geo, KGeo,
 KSeg and XFig.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 Below are the kig-specific options.
 For a full summary of options, run \fIkig \-\-help\fP.
@@ -61,14 +61,14 @@ Used with \-\-convert\-to\-native to specify where to save the newly
 created Kig file.  Note that a filename of '\-' means standard
 output (which is also the default).
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kig/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kig/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kig/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/kiten-trinity.1 b/debian/lenny/tdeedu/debian/man/kiten-trinity.1
index 77a7269f0..8ae3bd3ed 100644
--- a/debian/lenny/tdeedu/debian/man/kiten-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kiten-trinity.1
@@ -16,31 +16,31 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kiten \- a Japanese reference/study tool for KDE
+kiten \- a Japanese reference/study tool for TDE
 .SH SYNOPSIS
 .B kiten
 .RI "[ " generic-options " ]"
 .SH DESCRIPTION
-\fBKiten\fP is a Japanese reference and study tool for KDE.  It is an
+\fBKiten\fP is a Japanese reference and study tool for TDE.  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.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fIkiten \-\-help\fP.
 .SH SEE ALSO
 .BR kitengen (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kiten/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kiten/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kiten/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/kitengen-trinity.1 b/debian/lenny/tdeedu/debian/man/kitengen-trinity.1
index ee8e8c4c2..12b27ee11 100644
--- a/debian/lenny/tdeedu/debian/man/kitengen-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kitengen-trinity.1
@@ -26,24 +26,24 @@ kitengen \- index table generator for Kiten
 This program is for Kiten's internal use and should \fBnot\fP be run
 directly.
 .PP
-\fBKiten\fP is a Japanese reference and study tool for KDE.  It is an
+\fBKiten\fP is a Japanese reference and study tool for TDE.  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.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH SEE ALSO
 .BR kiten (1).
 .PP
-Full user documentation for Kiten is available through the KDE Help Centre.
+Full user documentation for Kiten is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kiten/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kiten/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kiten/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/klatin-trinity.1 b/debian/lenny/tdeedu/debian/man/klatin-trinity.1
index dd1b100cf..35c59e219 100644
--- a/debian/lenny/tdeedu/debian/man/klatin-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/klatin-trinity.1
@@ -35,18 +35,18 @@ In the grammar and verb sections KLatin asks for a particular part of a
 noun or a verb, such as the "ablative singular", or the "1st person
 indicative passive plural", and is not multiple choice.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fIklatin \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/klatin/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/klatin/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/klatin/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/klettres-trinity.1 b/debian/lenny/tdeedu/debian/man/klettres-trinity.1
index 01b3826b8..6f6a3177d 100644
--- a/debian/lenny/tdeedu/debian/man/klettres-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/klettres-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-klettres \- a foreign alphabet tutor for KDE
+klettres \- a foreign alphabet tutor for TDE
 .SH SYNOPSIS
 .B klettres
 .RI "[ " generic-options " ]"
@@ -29,18 +29,18 @@ adult that wants to learn the basics of a foreign language.
 Seven languages are currently available: Czech, Danish, Dutch, English,
 French, Italian and Slovak.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fIklettres \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/klettres/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/klettres/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/klettres/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/kmplot-trinity.1 b/debian/lenny/tdeedu/debian/man/kmplot-trinity.1
index 8f5f1d431..aa8e4cb50 100644
--- a/debian/lenny/tdeedu/debian/man/kmplot-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kmplot-trinity.1
@@ -16,13 +16,13 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kmplot \- a mathematical function plotter for KDE
+kmplot \- a mathematical function plotter for TDE
 .SH SYNOPSIS
 .B kmplot
 .RI "[ " generic-options " ]"
 [ \fIURL\fP ]
 .SH DESCRIPTION
-\fBKmPlot\fP is a mathematical function plotter for KDE.
+\fBKmPlot\fP is a mathematical function plotter for TDE.
 It has a powerful built-in parser.  You can plot different functions
 simultaneously and combine them to build new functions.
 .PP
@@ -36,18 +36,18 @@ finding maximum and minimum values,
 changing function parameters dynamically and
 plotting derivatives and integral functions.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fIkmplot \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kmplot/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kmplot/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kmplot/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/kpercentage-trinity.1 b/debian/lenny/tdeedu/debian/man/kpercentage-trinity.1
index 6cdb905b5..26aceb232 100644
--- a/debian/lenny/tdeedu/debian/man/kpercentage-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kpercentage-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kpercentage \- a percentage calculation teaching tool for KDE
+kpercentage \- a percentage calculation teaching tool for TDE
 .SH SYNOPSIS
 .B kpercentage
 .RI "[ " generic-options " ]"
@@ -28,18 +28,18 @@ There is a special training section for the three basic tasks.  Finally
 the pupil can select a random mode, in which all three tasks are mixed
 randomly.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fIkpercentage \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kpercentage/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kpercentage/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kpercentage/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/kstars-trinity.1 b/debian/lenny/tdeedu/debian/man/kstars-trinity.1
index fed1ca9b9..d6cce79bf 100644
--- a/debian/lenny/tdeedu/debian/man/kstars-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kstars-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kstars \- a desktop planetarium for KDE
+kstars \- a desktop planetarium for TDE
 .SH SYNOPSIS
 .B kstars
 .RI "[ " generic-options " ]"
@@ -29,7 +29,7 @@ kstars \- a desktop planetarium for KDE
 [ \fB\-\-date\fP \fIdate-and-time\fP ]
 [ \fB\-\-script\fP \fIscript-file\fP ]
 .SH DESCRIPTION
-\fBKStars\fP is a graphical desktop planetarium for KDE.  It depicts an
+\fBKStars\fP is a graphical desktop planetarium for TDE.  It depicts an
 accurate simulation of the night sky, including stars, constellations,
 star clusters, nebulae, galaxies, all planets, the Sun, the Moon,
 comets and asteroids.  You can see the sky as it appears from any
@@ -46,7 +46,7 @@ a graphics file and exit immediately without launching a graphical user
 interface at all.  Several other options are available to control
 precisely how this image is dumped.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 Below are the kstars-specific options.
 For a full summary of options, run \fIkstars \-\-help\fP.
@@ -95,14 +95,14 @@ Specifies the width of the sky image to dump (default is 640).
 .SH SEE ALSO
 .BR indiserver (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kstars/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kstars/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kstars/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/ktouch-trinity.1 b/debian/lenny/tdeedu/debian/man/ktouch-trinity.1
index dba00f4fb..4738c6a8c 100644
--- a/debian/lenny/tdeedu/debian/man/ktouch-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/ktouch-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-ktouch \- a touch typing tutor for KDE
+ktouch \- a touch typing tutor for TDE
 .SH SYNOPSIS
 .B ktouch
 .RI "[ " generic-options " ]"
@@ -30,7 +30,7 @@ KTouch helps you learn to touch type by providing you with text to
 train on, and adjusts to different levels depending on how good you are.
 It can display which key to press next, and the correct finger to use.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 Below are the ktouch-specific options.
 For a full summary of options, run \fIktouch \-\-help\fP.
@@ -38,14 +38,14 @@ For a full summary of options, run \fIktouch \-\-help\fP.
 \fIURL\fP
 The training file to open.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/ktouch/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/ktouch/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/ktouch/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/kturtle-trinity.1 b/debian/lenny/tdeedu/debian/man/kturtle-trinity.1
index 5c048f946..756e2c62d 100644
--- a/debian/lenny/tdeedu/debian/man/kturtle-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kturtle-trinity.1
@@ -38,18 +38,18 @@ Note that this version of Logo is only focused on the educational
 qualities of the programming language and will not try to suit
 professional programmers' needs.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fIkturtle \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kturtle/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kturtle/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kturtle/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/kverbos-trinity.1 b/debian/lenny/tdeedu/debian/man/kverbos-trinity.1
index 08f956415..a78e0dec1 100644
--- a/debian/lenny/tdeedu/debian/man/kverbos-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kverbos-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kverbos \- a Spanish verb form study application for KDE
+kverbos \- a Spanish verb form study application for TDE
 .SH SYNOPSIS
 .B kverbos
 .RI "[ " generic-options " ] [ " file " ]"
@@ -33,18 +33,18 @@ If a form of a verb is uncertain then the internet offers good sources:
 .br
 http://csgrs6k1.uwaterloo.ca/~dmg/lando/verbos/con-jugador.html
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fIkverbos \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kverbos/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kverbos/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kverbos/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/kvoctrain-trinity.1 b/debian/lenny/tdeedu/debian/man/kvoctrain-trinity.1
index 52ca3fabb..50b8bd39f 100644
--- a/debian/lenny/tdeedu/debian/man/kvoctrain-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kvoctrain-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kvoctrain \- a vocabulary trainer for KDE
+kvoctrain \- a vocabulary trainer for TDE
 .SH SYNOPSIS
 .B kvoctrain
 .RI "[ " generic-options " ] [ " file " ]"
@@ -35,21 +35,21 @@ try again.
 KVocTrain is not intended to teach you grammer or other sophisticated
 things. This is and probably will stay beyond the scope of this application.
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fIkvoctrain \-\-help\fP.
 .SH SEE ALSO
 .BR langen2kvtml (1),
 .BR spotlight2kvtml (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kvoctrain/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kvoctrain/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kvoctrain/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/kwordquiz-trinity.1 b/debian/lenny/tdeedu/debian/man/kwordquiz-trinity.1
index 387d9bbac..538db52fa 100644
--- a/debian/lenny/tdeedu/debian/man/kwordquiz-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kwordquiz-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kwordquiz \- a flashcard and vocabulary learning program for KDE
+kwordquiz \- a flashcard and vocabulary learning program for TDE
 .SH SYNOPSIS
 .B kwordquiz
 .RI "[ " generic-options " ]"
@@ -31,12 +31,12 @@ kwordquiz \- a flashcard and vocabulary learning program for KDE
 vocabularies.  It may be a language or any other kind of terminology.
 .PP
 KWordQuiz can open several types of vocabulary data.  Supported
-are \fI.kvtml\fP files used by other KDE programs such as KVocTrain,
+are \fI.kvtml\fP files used by other TDE programs such as KVocTrain,
 \fI.wql\fP files used by WordQuiz for Windows, \fI.csv\fP files with
 comma-separated text, and \fI.xml.gz\fP
 files created by Pauker (\fIhttp://pauker.sourceforge.net/\fP).
 .PP
-This application is part of the official KDE edutainment module.
+This application is part of the official TDE edutainment module.
 .SH OPTIONS
 Below are the kwordquiz-specific options.
 For a full summary of options, run \fIkwordquiz \-\-help\fP.
@@ -52,14 +52,14 @@ Begin a quiz immediately.  The \fIsession\fP argument may be
 \fBflash\fP (for a flashcard quiz), \fBmc\fP (for a multiple choice
 quiz) or \fBqa\fP (for a question and answer quiz).
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kwordquiz/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kwordquiz/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kwordquiz/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/langen2kvtml-trinity.1 b/debian/lenny/tdeedu/debian/man/langen2kvtml-trinity.1
index a48bfc713..226baef49 100644
--- a/debian/lenny/tdeedu/debian/man/langen2kvtml-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/langen2kvtml-trinity.1
@@ -38,7 +38,7 @@ Note that you \fBmust\fP run KVocTrain at least once before this script
 can be used.  In some circumstances this script will edit the user's
 KVocTrain preferences file.
 .PP
-This utility is part of the official KDE edutainment module.
+This utility is part of the official TDE edutainment module.
 .SH OPTIONS
 .TP
 \fB\-\-lang=\fP\fIxx\fP
diff --git a/debian/lenny/tdeedu/debian/man/lx200_16-trinity.1 b/debian/lenny/tdeedu/debian/man/lx200_16-trinity.1
index 5ac503e7d..d169ebf17 100644
--- a/debian/lenny/tdeedu/debian/man/lx200_16-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/lx200_16-trinity.1
@@ -36,8 +36,8 @@ in turn start this device driver.
 Much more detailed information can be found in the KStars Handbook, as
 described below.
 .PP
-KStars is a graphical desktop planetarium for KDE, and forms part of
-the official KDE edutainment module.
+KStars is a graphical desktop planetarium for TDE, and forms part of
+the official TDE edutainment module.
 .SH OPTIONS
 .TP
 \fB\-v\fP
@@ -47,14 +47,14 @@ Write more verbose output to stderr.
 .BR kstars (1).
 .PP
 The KStars Handbook contains detailed information on how to use INDI for
-telescope control.  You can read this handbook in the KDE Help Centre.
+telescope control.  You can read this handbook in the TDE Help Centre.
 Alternatively you can enter the URL
 \fIhelp:/kstars/indi.html\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kstars/indi.html\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/lx200autostar-trinity.1 b/debian/lenny/tdeedu/debian/man/lx200autostar-trinity.1
index 4f9d11c95..b13bbffe3 100644
--- a/debian/lenny/tdeedu/debian/man/lx200autostar-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/lx200autostar-trinity.1
@@ -36,8 +36,8 @@ in turn start this device driver.
 Much more detailed information can be found in the KStars Handbook, as
 described below.
 .PP
-KStars is a graphical desktop planetarium for KDE, and forms part of
-the official KDE edutainment module.
+KStars is a graphical desktop planetarium for TDE, and forms part of
+the official TDE edutainment module.
 .SH OPTIONS
 .TP
 \fB\-v\fP
@@ -47,14 +47,14 @@ Write more verbose output to stderr.
 .BR kstars (1).
 .PP
 The KStars Handbook contains detailed information on how to use INDI for
-telescope control.  You can read this handbook in the KDE Help Centre.
+telescope control.  You can read this handbook in the TDE Help Centre.
 Alternatively you can enter the URL
 \fIhelp:/kstars/indi.html\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kstars/indi.html\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/lx200classic-trinity.1 b/debian/lenny/tdeedu/debian/man/lx200classic-trinity.1
index 481d6e01a..a37527a85 100644
--- a/debian/lenny/tdeedu/debian/man/lx200classic-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/lx200classic-trinity.1
@@ -36,8 +36,8 @@ in turn start this device driver.
 Much more detailed information can be found in the KStars Handbook, as
 described below.
 .PP
-KStars is a graphical desktop planetarium for KDE, and forms part of
-the official KDE edutainment module.
+KStars is a graphical desktop planetarium for TDE, and forms part of
+the official TDE edutainment module.
 .SH OPTIONS
 .TP
 \fB\-v\fP
@@ -47,14 +47,14 @@ Write more verbose output to stderr.
 .BR kstars (1).
 .PP
 The KStars Handbook contains detailed information on how to use INDI for
-telescope control.  You can read this handbook in the KDE Help Centre.
+telescope control.  You can read this handbook in the TDE Help Centre.
 Alternatively you can enter the URL
 \fIhelp:/kstars/indi.html\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kstars/indi.html\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/lx200generic-trinity.1 b/debian/lenny/tdeedu/debian/man/lx200generic-trinity.1
index d1d52f121..b37ccfee9 100644
--- a/debian/lenny/tdeedu/debian/man/lx200generic-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/lx200generic-trinity.1
@@ -36,8 +36,8 @@ in turn start this device driver.
 Much more detailed information can be found in the KStars Handbook, as
 described below.
 .PP
-KStars is a graphical desktop planetarium for KDE, and forms part of
-the official KDE edutainment module.
+KStars is a graphical desktop planetarium for TDE, and forms part of
+the official TDE edutainment module.
 .SH OPTIONS
 .TP
 \fB\-v\fP
@@ -47,14 +47,14 @@ Write more verbose output to stderr.
 .BR kstars (1).
 .PP
 The KStars Handbook contains detailed information on how to use INDI for
-telescope control.  You can read this handbook in the KDE Help Centre.
+telescope control.  You can read this handbook in the TDE Help Centre.
 Alternatively you can enter the URL
 \fIhelp:/kstars/indi.html\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kstars/indi.html\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/lx200gps-trinity.1 b/debian/lenny/tdeedu/debian/man/lx200gps-trinity.1
index ec533e6d8..ea0d2fc82 100644
--- a/debian/lenny/tdeedu/debian/man/lx200gps-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/lx200gps-trinity.1
@@ -36,8 +36,8 @@ in turn start this device driver.
 Much more detailed information can be found in the KStars Handbook, as
 described below.
 .PP
-KStars is a graphical desktop planetarium for KDE, and forms part of
-the official KDE edutainment module.
+KStars is a graphical desktop planetarium for TDE, and forms part of
+the official TDE edutainment module.
 .SH OPTIONS
 .TP
 \fB\-v\fP
@@ -47,14 +47,14 @@ Write more verbose output to stderr.
 .BR kstars (1).
 .PP
 The KStars Handbook contains detailed information on how to use INDI for
-telescope control.  You can read this handbook in the KDE Help Centre.
+telescope control.  You can read this handbook in the TDE Help Centre.
 Alternatively you can enter the URL
 \fIhelp:/kstars/indi.html\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kstars/indi.html\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/spotlight2kvtml-trinity.1 b/debian/lenny/tdeedu/debian/man/spotlight2kvtml-trinity.1
index e3a4b5415..eaff0a1aa 100644
--- a/debian/lenny/tdeedu/debian/man/spotlight2kvtml-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/spotlight2kvtml-trinity.1
@@ -37,7 +37,7 @@ Note that Spotlight Online changes its vocabulary list format from time
 to time, so spotlight2kvtml might be out of date and might not behave
 correctly.
 .PP
-This utility is part of the official KDE edutainment module.
+This utility is part of the official TDE edutainment module.
 .SH SEE ALSO
 .BR kvoctrain (1),
 .BR langen2kvtml (1).
diff --git a/debian/lenny/tdeedu/debian/man/temma-trinity.1 b/debian/lenny/tdeedu/debian/man/temma-trinity.1
index 1e3db31c9..46b9e4eaa 100644
--- a/debian/lenny/tdeedu/debian/man/temma-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/temma-trinity.1
@@ -36,8 +36,8 @@ in turn start this device driver.
 Much more detailed information can be found in the KStars Handbook, as
 described below.
 .PP
-KStars is a graphical desktop planetarium for KDE, and forms part of
-the official KDE edutainment module.
+KStars is a graphical desktop planetarium for TDE, and forms part of
+the official TDE edutainment module.
 .SH OPTIONS
 .TP
 \fB\-v\fP
@@ -47,14 +47,14 @@ Write more verbose output to stderr.
 .BR kstars (1).
 .PP
 The KStars Handbook contains detailed information on how to use INDI for
-telescope control.  You can read this handbook in the KDE Help Centre.
+telescope control.  You can read this handbook in the TDE Help Centre.
 Alternatively you can enter the URL
 \fIhelp:/kstars/indi.html\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kstars/indi.html\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/test_extdate-trinity.1 b/debian/lenny/tdeedu/debian/man/test_extdate-trinity.1
index cf2006585..90bd63d89 100644
--- a/debian/lenny/tdeedu/debian/man/test_extdate-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/test_extdate-trinity.1
@@ -24,7 +24,7 @@ This is a simple test program for testing the non-GUI functionality of the
 ExtDate classes.  It compares the results of several operations against
 the results from QDate and writes the results to the console.
 .PP
-The \fBExtDate library\fP consists of a group of classes allowing KDE
+The \fBExtDate library\fP consists of a group of classes allowing TDE
 applications to access calendar dates outside of the limited range of
 years imposed by QDate.
 .PP
@@ -33,7 +33,7 @@ recognize dates prior to 14 Oct 1752 (when the Gregorian calendar
 was adopted by England), nor dates after 31 Dec 8000.  Both of these
 limits are arbitrary.
 .PP
-This library is part of the official KDE edutainment module.
+This library is part of the official TDE edutainment module.
 .SH SEE ALSO
 .BR test_extdatepicker (1).
 .PP
diff --git a/debian/lenny/tdeedu/debian/man/test_extdatepicker-trinity.1 b/debian/lenny/tdeedu/debian/man/test_extdatepicker-trinity.1
index f2112913e..9a25504f0 100644
--- a/debian/lenny/tdeedu/debian/man/test_extdatepicker-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/test_extdatepicker-trinity.1
@@ -25,7 +25,7 @@ This is a simple test program for testing the graphical functionality of
 the ExtDate classes.  It presents a KDatePicker widget and an
 ExtDatePicker widget side by side for user interaction.
 .PP
-The \fBExtDate library\fP consists of a group of classes allowing KDE
+The \fBExtDate library\fP consists of a group of classes allowing TDE
 applications to access calendar dates outside of the limited range of
 years imposed by QDate.
 .PP
@@ -34,7 +34,7 @@ recognize dates prior to 14 Oct 1752 (when the Gregorian calendar
 was adopted by England), nor dates after 31 Dec 8000.  Both of these
 limits are arbitrary.
 .PP
-This library is part of the official KDE edutainment module.
+This library is part of the official TDE edutainment module.
 .SH OPTIONS
 For a full summary of options, run \fItest_extdatepicker \-\-help\fP.
 .SH SEE ALSO
diff --git a/debian/lenny/tdeedu/debian/man/v4ldriver-trinity.1 b/debian/lenny/tdeedu/debian/man/v4ldriver-trinity.1
index f9f4c52d0..9220a16bb 100644
--- a/debian/lenny/tdeedu/debian/man/v4ldriver-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/v4ldriver-trinity.1
@@ -36,8 +36,8 @@ in turn start this device driver.
 Much more detailed information can be found in the KStars Handbook, as
 described below.
 .PP
-KStars is a graphical desktop planetarium for KDE, and forms part of
-the official KDE edutainment module.
+KStars is a graphical desktop planetarium for TDE, and forms part of
+the official TDE edutainment module.
 .SH OPTIONS
 .TP
 \fB\-v\fP
@@ -47,14 +47,14 @@ Write more verbose output to stderr.
 .BR kstars (1).
 .PP
 The KStars Handbook contains detailed information on how to use INDI for
-telescope control.  You can read this handbook in the KDE Help Centre.
+telescope control.  You can read this handbook in the TDE Help Centre.
 Alternatively you can enter the URL
 \fIhelp:/kstars/indi.html\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kstars/indi.html\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/man/v4lphilips-trinity.1 b/debian/lenny/tdeedu/debian/man/v4lphilips-trinity.1
index 40838ded0..1553652d6 100644
--- a/debian/lenny/tdeedu/debian/man/v4lphilips-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/v4lphilips-trinity.1
@@ -36,8 +36,8 @@ in turn start this device driver.
 Much more detailed information can be found in the KStars Handbook, as
 described below.
 .PP
-KStars is a graphical desktop planetarium for KDE, and forms part of
-the official KDE edutainment module.
+KStars is a graphical desktop planetarium for TDE, and forms part of
+the official TDE edutainment module.
 .SH OPTIONS
 .TP
 \fB\-v\fP
@@ -47,14 +47,14 @@ Write more verbose output to stderr.
 .BR kstars (1).
 .PP
 The KStars Handbook contains detailed information on how to use INDI for
-telescope control.  You can read this handbook in the KDE Help Centre.
+telescope control.  You can read this handbook in the TDE Help Centre.
 Alternatively you can enter the URL
 \fIhelp:/kstars/indi.html\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kstars/indi.html\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.blinken b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.blinken
index 0981d3897..4ff6e8f6b 100644
--- a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.blinken
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.blinken
@@ -2,7 +2,7 @@ Document: blinken
 Title: Blinken Handbook
 Author: Danny Allen <danny@dannyallen.co.uk>
 Abstract: Blinken brings a retro electronic memory game from the 1970's
- to KDE.
+ to TDE.
 Section: Games/Puzzles
 
 Format: HTML
diff --git a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kgeography b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kgeography
index 0f3d386af..494fbe50c 100644
--- a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kgeography
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kgeography
@@ -1,7 +1,7 @@
 Document: kgeography
 Title: KGeography Handbook
 Author: Anne-Marie Mahfouf <annma@kde.org>
-Abstract: KGeography is a geography learning tool for KDE.
+Abstract: KGeography is a geography learning tool for TDE.
 Section: Apps/Education
 
 Format: HTML
diff --git a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.khangman b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.khangman
index c6b25da48..b5ac77cce 100644
--- a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.khangman
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.khangman
@@ -1,7 +1,7 @@
 Document: khangman
 Title: KHangMan Handbook
 Author: Anne-Marie Mahfouf <annma@kde.org>
-Abstract: KHangMan is the classical hangman game for children, adapted for KDE.
+Abstract: KHangMan is the classical hangman game for children, adapted for TDE.
 Section: Games/Puzzles
 
 Format: HTML
diff --git a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kig b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kig
index e8569fb22..60534932f 100644
--- a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kig
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kig
@@ -1,7 +1,7 @@
 Document: kig
 Title: Kig Handbook
 Author: Dominique Devriese <devriese@kde.org>
-Abstract: Kig is a KDE application for Interactive Geometry.
+Abstract: Kig is a TDE application for Interactive Geometry.
 Section: Apps/Math
 
 Format: HTML
diff --git a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kiten b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kiten
index a8b4130a6..a89809268 100644
--- a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kiten
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kiten
@@ -1,7 +1,7 @@
 Document: kiten
 Title: Kiten Handbook
 Author: Jason Katz-Brown <jason@katzbrown.com>
-Abstract: Kiten is a Japanese reference/study tool for KDE.
+Abstract: Kiten is a Japanese reference/study tool for TDE.
 Section: Apps/Tools
 
 Format: HTML
diff --git a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.klatin b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.klatin
index a5f795b93..b1cbf83d1 100644
--- a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.klatin
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.klatin
@@ -1,7 +1,7 @@
 Document: klatin
 Title: KLatin Handbook
 Author: George Wright <gwright@users.sourceforge.net> and Anne-Marie Mahfouf <annma@kde.org>
-Abstract: KLatin is a KDE application to help revise/teach Latin.
+Abstract: KLatin is a TDE application to help revise/teach Latin.
 Section: Apps/Tools
 
 Format: HTML
diff --git a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kmplot b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kmplot
index 6a2342dab..8a1191e91 100644
--- a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kmplot
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kmplot
@@ -1,7 +1,7 @@
 Document: kmplot
 Title: KmPlot Handbook
 Author: Klaus-Dieter Moeller <kd.moeller@t-online.de> and Philip Rodrigues <phil.rod@ntlworld.com>
-Abstract: KmPlot is a mathematical function plotter for the KDE Desktop.
+Abstract: KmPlot is a mathematical function plotter for the Trinity Desktop.
 Section: Apps/Math
 
 Format: HTML
diff --git a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kstars b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kstars
index 33b5ec707..af1fe31ac 100644
--- a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kstars
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kstars
@@ -1,7 +1,7 @@
 Document: kstars
 Title: KStars Handbook
 Author: Jason Harris <kstars@30doradus.org>
-Abstract: KStars is a graphical desktop planetarium for KDE.  It depicts an
+Abstract: KStars is a graphical desktop planetarium for TDE.  It depicts an
  accurate simulation of the night sky, including stars, constellations,
  star clusters, nebulae, galaxies, all planets, the Sun, the Moon,
  comets and asteroids.
diff --git a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kwordquiz b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kwordquiz
index 1635db7e2..15047425c 100644
--- a/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kwordquiz
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kwordquiz
@@ -1,7 +1,7 @@
 Document: kwordquiz
 Title: KWordQuiz Handbook
 Author: Peter Hedlund <peter@peterandlinda.com>
-Abstract: KWordQuiz is a flashcard and vocabulary learning program for KDE.
+Abstract: KWordQuiz is a flashcard and vocabulary learning program for TDE.
 Section: Apps/Tools
 
 Format: HTML
diff --git a/debian/lenny/tdeedu/debian/tdeedu-trinity.README.Debian b/debian/lenny/tdeedu/debian/tdeedu-trinity.README.Debian
index 0e0c0b0a5..d3523892f 100644
--- a/debian/lenny/tdeedu/debian/tdeedu-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/tdeedu-trinity.README.Debian
@@ -1,10 +1,10 @@
-KDE Educational Applications for Debian
+TDE Educational Applications for Debian
 ---------------------------------------
 
 Package tdeedu is a metapackage that depends on the full set of
-edutainment applications provided with the official release of KDE.
+edutainment applications provided with the official release of TDE.
 
-Each application provides documentation in a docbook format that the KDE
+Each application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdeedu-doc-html.