Additional renaming of kde to tde

119 files changed, 422 insertions, 422 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23a1d92c..806890a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,8 @@ cmake_minimum_required( VERSION 2.8 )
 
 ##### general package setup #####################
 
-project( kdesdk )
-set( PACKAGE kdesdk )
+project( tdesdk )
+set( PACKAGE tdesdk )
 set( VERSION "3.5.13" )
 
 
@@ -76,7 +76,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
 ##### activate dependencies #####################
 
 
-##### kdesdk directories ########################
+##### tdesdk directories ########################
 
 tde_conditional_add_subdirectory( BUILD_CERVISIA cervisia )
 tde_conditional_add_subdirectory( BUILD_DOC doc )
diff --git a/Makefile.am.in b/Makefile.am.in
index ac039ee6..cef537c2 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -1,4 +1,4 @@
-## kdesdk/Makefile.am
+## tdesdk/Makefile.am
 ## (C) 1997 Stephan Kulow
 
 AUTOMAKE_OPTIONS = foreign 1.6.1
diff --git a/cervisia/ChangeLog b/cervisia/ChangeLog
index 6461e67f..13984ed9 100644
--- a/cervisia/ChangeLog
+++ b/cervisia/ChangeLog
@@ -835,11 +835,11 @@
                ======>   TODO Before Importing
 	========================================
 	* Remove stale CVS directories and add to main repository
-	kdesdk/cervisia/CVS
-	kdesdk/po/cervisia/CVS
-	kdesdk/doc/cervisia/CVS
+	tdesdk/cervisia/CVS
+	tdesdk/po/cervisia/CVS
+	tdesdk/doc/cervisia/CVS
 
-	cd kdesdk
+	cd tdesdk
 	cvs add cervisia
 	cd cervisia
 	cvs add -kb *.png
@@ -859,7 +859,7 @@
 	* Updated version string
 	* Added a kdoc build target to Makefile.am so we can generate some
 	api documentation
-	* Imported to kdesdk CVS module
+	* Imported to tdesdk CVS module
 
 2001-07-05  Bernd Gehrmann  <bernd@physik.hu-berlin.de>
 
@@ -1234,7 +1234,7 @@
 2000-09-15  Bernd Gehrmann  <bernd@physik.hu-berlin.de>
 
 	* Avoid -no-rtti because some crap code in
-	  kdelibs crashes without rtti
+	  tdelibs crashes without rtti
 	* Fixed selection by keyboard in log message list
 	* Avoid exploding status bar width with
 	  long command lines
@@ -1275,7 +1275,7 @@
 
 2000-07-13  Bernd Gehrmann  <bernd@physik.hu-berlin.de>
 
-	* Fixed problems with latest kdelibs2 and gcc 2.96
+	* Fixed problems with latest tdelibs2 and gcc 2.96
 	  (thanks to Stan Bubrouski)
 	* Error messages don't confuse the 'Fetch list'
 	  item in the check out dialog any more
diff --git a/cervisia/cervisia-change_repos_list.pl b/cervisia/cervisia-change_repos_list.pl
index 925c49ee..daf06462 100644
--- a/cervisia/cervisia-change_repos_list.pl
+++ b/cervisia/cervisia-change_repos_list.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# (copied from kdesdk/cervisia/misc.cpp)
+# (copied from tdesdk/cervisia/misc.cpp)
 # These regular expression parts aren't useful to check the validity of the
 # CVSROOT specification. They are just used to extract the different parts of it.
 $usernamerx = "([a-z0-9_][a-z0-9_-]*)?";
diff --git a/cervisia/cervisia-normalize_cvsroot.pl b/cervisia/cervisia-normalize_cvsroot.pl
index 8a96dcb8..69ac22bf 100644
--- a/cervisia/cervisia-normalize_cvsroot.pl
+++ b/cervisia/cervisia-normalize_cvsroot.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# (copied from kdesdk/cervisia/misc.cpp)
+# (copied from tdesdk/cervisia/misc.cpp)
 # These regular expression parts aren't useful to check the validity of the
 # CVSROOT specification. They are just used to extract the different parts of it.
 $usernamerx = "([a-z0-9_][a-z0-9_-]*)?";
diff --git a/cervisia/cvsservice/DESIGN b/cervisia/cvsservice/DESIGN
index 90ad3f18..c258e911 100644
--- a/cervisia/cvsservice/DESIGN
+++ b/cervisia/cvsservice/DESIGN
@@ -37,7 +37,7 @@ How-to use this service in C++ applications:
     Repository_stub repository(appId, "CvsRepository");
 
     // set directory of working copy
-    repository.setWorkingCopy("/home/user/kde/kdesdk/cervisia");
+    repository.setWorkingCopy("/home/user/kde/tdesdk/cervisia");
 
     // create stub for service
     CvsService_stub cvsService(appId, "CvsService");
@@ -62,7 +62,7 @@ How-to use this service in a shell script:
     APP=`dcopstart cvsservice`
 
     # set directory of working copy
-    dcop $APP CvsRepository setWorkingCopy /home/user/kde/kdesdk/cervisia
+    dcop $APP CvsRepository setWorkingCopy /home/user/kde/tdesdk/cervisia
 
     # call "cvs log" for cervisiapart.h
     JOB=`dcop $APP CvsService log cervisiapart.h`
@@ -88,7 +88,7 @@ How-to use this service in a javascript:
         var appID = client.dcopStart("cvsservice");
 
         // set directory of working copy
-        client.send(appID, "CvsRepository", "setWorkingCopy(QString)", "/home/user/kde/kdesdk/cervisia");
+        client.send(appID, "CvsRepository", "setWorkingCopy(QString)", "/home/user/kde/tdesdk/cervisia");
 
         // call "cvs log" for cervisiapart.h
         var job = client.call(appID, "CvsService", "log(QString)", "cervisiapart.h");
diff --git a/cervisia/cvsservice/Makefile.am b/cervisia/cvsservice/Makefile.am
index 565d1a9d..b1ef39f0 100644
--- a/cervisia/cvsservice/Makefile.am
+++ b/cervisia/cvsservice/Makefile.am
@@ -49,6 +49,6 @@ messages:
 
 # API documentation
 # Not activated because KDE_INIT_DOXYGEN is missing in
-# kdesdk's configure.in.in
+# tdesdk's configure.in.in
 #DOXYGEN_REFERENCES = dcop tdecore tdeui
 #include ../../admin/Doxyfile.am
diff --git a/cervisia/cvsservice/sshagent.cpp b/cervisia/cvsservice/sshagent.cpp
index e263219b..b620cc98 100644
--- a/cervisia/cvsservice/sshagent.cpp
+++ b/cervisia/cvsservice/sshagent.cpp
@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kprocess.h>
 
 #include <stdlib.h>
diff --git a/doc/cervisia/index.docbook b/doc/cervisia/index.docbook
index 66e45dd9..a7679a08 100644
--- a/doc/cervisia/index.docbook
+++ b/doc/cervisia/index.docbook
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kappname "&cervisia;">
-  <!ENTITY package "kdesdk">
+  <!ENTITY package "tdesdk">
   <!ENTITY ssh "<command>ssh</command>">
   <!ENTITY rsh "<command>rsh</command>">
   <!ENTITY % addindex "IGNORE">
@@ -52,7 +52,7 @@
 
 <keywordset>
 <keyword>KDE</keyword>
-<keyword>kdesdk</keyword>
+<keyword>tdesdk</keyword>
 <keyword>Cervisia</keyword>
 <keyword>CVS</keyword>
 <keyword>version control</keyword>
@@ -70,7 +70,7 @@ user friendly version control system front-end. The aim is to support &CVS; and
 other version control system programs in a unified interface, featuring conflict
 resolution, difference and history viewers, status for the working copy files,
 and support for most version control functions. You can get &cervisia;
-by building the kdesdk module or installing the kdesdk package provided by your
+by building the tdesdk module or installing the tdesdk package provided by your
 distribution. Currently, only &CVS; is supported, but other version control
 systems may be integrated in the future.
 </para>
@@ -635,8 +635,8 @@ button.
 Note that it is possible to checkout any existing subfolder of the module,
 without retrieving the rest of the module. Just enter the path to the subfolder 
 as well. For instance, if you want to get only the
-<filename class="directory">doc/cervisia</filename> subfolder of the kdesdk
-module, enter <filename class="directory">kdesdk/doc/cervisia</filename> in this
+<filename class="directory">doc/cervisia</filename> subfolder of the tdesdk
+module, enter <filename class="directory">tdesdk/doc/cervisia</filename> in this
 field.
 </para></listitem>
 </varlistentry>
diff --git a/doc/kbabel/dictionaries.docbook b/doc/kbabel/dictionaries.docbook
index a9e5ed70..18d287c2 100644
--- a/doc/kbabel/dictionaries.docbook
+++ b/doc/kbabel/dictionaries.docbook
@@ -284,7 +284,7 @@ Slavic ones.</para>
 
 <para>
 For example, say I wanted to translate the word
-<quote>on</quote>, from <filename>kdelibs.po</filename>, into Romanian
+<quote>on</quote>, from <filename>tdelibs.po</filename>, into Romanian
 but have no clue.  I look in the same file for French and find
 <foreignphrase lang="fr">actif</foreignphrase>, and in the Spanish one find
 <foreignphrase lang="es">activado</foreignphrase>.  So, I conclude that the best one in Romanian
@@ -318,7 +318,7 @@ values:</para>
     <term>@PACKAGE@</term>
     <listitem><para>
       The name of application or package currently being translated.
-      For example, it can expand to kbabel, kdelibs, konqueror
+      For example, it can expand to kbabel, tdelibs, konqueror
       and so on.
     </para></listitem>
   </varlistentry>
diff --git a/doc/kbabel/index.docbook b/doc/kbabel/index.docbook
index 51cb8661..a621d894 100644
--- a/doc/kbabel/index.docbook
+++ b/doc/kbabel/index.docbook
@@ -9,7 +9,7 @@
  <!ENTITY kbabelfaq SYSTEM "faq.docbook">
  <!ENTITY glossary SYSTEM "glossary.docbook">
  <!ENTITY kappname "&kbabel;">
- <!ENTITY package "kdesdk">
+ <!ENTITY package "tdesdk">
  <!ENTITY % addindex "IGNORE">
  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
 ]>
@@ -52,7 +52,7 @@ customize many options.
 <keyword>KDE</keyword>
 <keyword>KBabel</keyword>
 <keyword>catalogmanager</keyword>
-<keyword>kdesdk</keyword>
+<keyword>tdesdk</keyword>
 <keyword>gettext</keyword>
 <keyword>translation</keyword>
 <keyword>i18n</keyword>
diff --git a/doc/kbabel/preferences.docbook b/doc/kbabel/preferences.docbook
index fbaeee10..5058feac 100644
--- a/doc/kbabel/preferences.docbook
+++ b/doc/kbabel/preferences.docbook
@@ -1116,17 +1116,17 @@ but not using it will probably lead to no result.)
 
 <para>
 An example of path pattern could be that you want to display the source reference
-of &kde;'s file desktop_kdebase.po. In that case you will probably need a path  pattern like:
-<userinput>@CODEROOT@</userinput>/<userinput>@PACKAGEDIR@</userinput>/kdebase/<userinput>@COMMENTPATH@</userinput>
+of &kde;'s file desktop_tdebase.po. In that case you will probably need a path  pattern like:
+<userinput>@CODEROOT@</userinput>/<userinput>@PACKAGEDIR@</userinput>/tdebase/<userinput>@COMMENTPATH@</userinput>
 (compared to one of the default path patterns, the sequence <userinput>@PACKAGE@</userinput> has been
-replaced by kdebase).
+replaced by tdebase).
 </para>
 
 <para>
 In case of really complex problems you can, of course, define an absolute path
 without any variables beside <userinput>@COMMENTPATH@</userinput>, like for example:
-/home/usr/kde-source/kdebase/<userinput>@COMMENTPATH@</userinput> assuming that
-/home/usr/kde-source/kdebase is the path where the kdebase source module is.
+/home/usr/kde-source/tdebase/<userinput>@COMMENTPATH@</userinput> assuming that
+/home/usr/kde-source/tdebase is the path where the tdebase source module is.
 </para>
 
 </sect3>
diff --git a/doc/kbabel/using.docbook b/doc/kbabel/using.docbook
index 1bed9ed8..ce67d1a9 100644
--- a/doc/kbabel/using.docbook
+++ b/doc/kbabel/using.docbook
@@ -738,17 +738,17 @@ read, edit and save the &GNU; gettext plural forms too.
 
 <para>
 Every language to which &kde; is translated must have set a correct
-number of plural forms. This is done by translating a specific entry in <filename>kdelibs.po</filename>.
+number of plural forms. This is done by translating a specific entry in <filename>tdelibs.po</filename>.
 The number is set by selecting the name of a language, which uses
 the same number and <emphasis>rules</emphasis> for finding the
 right plural form. The up-to-date list of possible values can be found in the
-kdelibs source code, in the file <filename>tdecore/klocale.cpp</filename>.
+tdelibs source code, in the file <filename>tdecore/klocale.cpp</filename>.
 </para>
 
 <note><para>
 &GNU; gettext allows to define the number and type of plural forms by a formula and to set this
 formula independently for each PO file. &kde; can only define the number and type of plural forms
-one time in kdelibs.
+one time in tdelibs.
 </para></note>
 
 <para>
diff --git a/doc/kbugbuster/index.docbook b/doc/kbugbuster/index.docbook
index ed3acbb9..573f8d5d 100644
--- a/doc/kbugbuster/index.docbook
+++ b/doc/kbugbuster/index.docbook
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kappname "&kbugbuster;">
-  <!ENTITY package "kdesdk">
+  <!ENTITY package "tdesdk">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
 ]>
@@ -38,7 +38,7 @@ Please respect the format of the date (DD/MM/YYYY) and of the version
 
 <abstract>
 <para>
-&kbugbuster; is part of the kdesdk package.
+&kbugbuster; is part of the tdesdk package.
 </para>
 </abstract>
 
diff --git a/doc/kcachegrind/index.docbook b/doc/kcachegrind/index.docbook
index 6a85d5eb..434c89d7 100644
--- a/doc/kcachegrind/index.docbook
+++ b/doc/kcachegrind/index.docbook
@@ -7,7 +7,7 @@
   <!ENTITY valgrind "<application>Valgrind</application>">
   <!ENTITY oprofile "<application>OProfile</application>">
   <!ENTITY kappname "&kcachegrind;">
-  <!ENTITY package "kdesdk">
+  <!ENTITY package "tdesdk">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
 ]>
@@ -49,7 +49,7 @@
 
 <keywordset>
 <keyword>KDE</keyword>
-<keyword>kdesdk</keyword>
+<keyword>tdesdk</keyword>
 <keyword>Cachegrind</keyword>
 <keyword>Callgrind</keyword>
 <keyword>Valgrind</keyword>
diff --git a/doc/kompare/index.docbook b/doc/kompare/index.docbook
index 04f30a7f..2ca8f970 100644
--- a/doc/kompare/index.docbook
+++ b/doc/kompare/index.docbook
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
    <!ENTITY kappname "&kompare;">
    <!ENTITY version "3.4">
-   <!ENTITY package "kdesdk">
+   <!ENTITY package "tdesdk">
    <!ENTITY % addindex "IGNORE">
    <!ENTITY % English "INCLUDE">
 ]>
diff --git a/doc/scripts/CMakeLists.txt b/doc/scripts/CMakeLists.txt
index a0e83e48..df348060 100644
--- a/doc/scripts/CMakeLists.txt
+++ b/doc/scripts/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-add_subdirectory( kdesvn-build )
+add_subdirectory( tdesvn-build )
diff --git a/doc/scripts/kdesvn-build/CMakeLists.txt b/doc/scripts/kdesvn-build/CMakeLists.txt
index 4359269d..f063a809 100644
--- a/doc/scripts/kdesvn-build/CMakeLists.txt
+++ b/doc/scripts/kdesvn-build/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kdesvn-build )
+tde_create_handbook( DESTINATION tdesvn-build )
diff --git a/doc/scripts/kdesvn-build/index.docbook b/doc/scripts/kdesvn-build/index.docbook
index e54dbb9b..4ae84648 100644
--- a/doc/scripts/kdesvn-build/index.docbook
+++ b/doc/scripts/kdesvn-build/index.docbook
@@ -1,17 +1,17 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "kdesvn-build">
-  <!ENTITY package "kdesdk">
+  <!ENTITY kappname "tdesvn-build">
+  <!ENTITY package "tdesdk">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"> <!-- Change language only here -->
   <!ENTITY svn "<application>Subversion</application>">
-  <!ENTITY kdesvn-build "<application>kdesvn-build</application>">
+  <!ENTITY tdesvn-build "<application>tdesvn-build</application>">
 ]>
 
 <book lang="&language;">
 
 <bookinfo>
-<title>&kdesvn-build; Script Manual</title>
+<title>&tdesvn-build; Script Manual</title>
 
 <authorgroup id="authors">
 <author>
@@ -45,12 +45,12 @@
 <releaseinfo>0.98</releaseinfo>
 
 <abstract>
-<para>The &kdesvn-build; is a Perl script which builds and installs &kde; directly from the sources found in the &kde; &svn; repository.</para>
+<para>The &tdesvn-build; is a Perl script which builds and installs &kde; directly from the sources found in the &kde; &svn; repository.</para>
 </abstract>
 
 <keywordset>
 <keyword>KDE</keyword>
-<keyword>kdesdk</keyword>
+<keyword>tdesdk</keyword>
 <keyword>SVN</keyword>
 <keyword>Subversion</keyword>
 <keyword>KDE development</keyword>
@@ -63,18 +63,18 @@
 <title>Introduction</title>
 
 <para>
-&kdesvn-build; is a Perl script to help users install  <ulink
+&tdesvn-build; is a Perl script to help users install  <ulink
 url="http://www.kde.org/">&kde;</ulink> from <ulink
 url="http://subversion.tigris.org/">&svn;</ulink>.  You may also want to
-consider the kde-build script include with &kde;'s kdesdk module.
+consider the kde-build script include with &kde;'s tdesdk module.
 </para>
 
 <para>
-Here we document the &kdesvn-build; configuration file syntax and options, its
+Here we document the &tdesvn-build; configuration file syntax and options, its
 command line options, features, and an overview of all necessary steps required
 to build &kde; from source, including the steps which you should perform using
 other tools, or in other words, steps that are not automatically performed
-by the &kdesvn-build; script.
+by the &tdesvn-build; script.
 </para>
 
 </chapter>
@@ -83,7 +83,7 @@ by the &kdesvn-build; script.
 <title>Getting Started</title>
 
 <para>
-In this chapter, we show how to use the &kdesvn-build; to checkout modules from the
+In this chapter, we show how to use the &tdesvn-build; to checkout modules from the
 &kde; repository and build them. We also provide a basic explanation of the &kde;
 &svn; structure and the steps you have to perform before running the script.
 </para>
@@ -117,7 +117,7 @@ does not cover a root installation. If you are performing a system
 wide install, you probably already know what you are doing anyway.
 </para>
 
-<para>Before using the &kdesvn-build; script (or any other building
+<para>Before using the &tdesvn-build; script (or any other building
 strategy) you must install the development tools and libraries needed for &kde;.
 You need the Qt library, version 3.3.0 or greater, Automake 1.8,
 Autoconf 2.5X (better if >=2.57 as a bug was reported with lower versions),
@@ -141,25 +141,25 @@ required software.
 </para>
 
 <para>
-You probably already have a version of the &kdesvn-build; script installed
-in your system. &kdesvn-build;requires you to create a configuration file, named
-<filename>.kdesvn-buildrc</filename>. This file should be installed on
+You probably already have a version of the &tdesvn-build; script installed
+in your system. &tdesvn-build;requires you to create a configuration file, named
+<filename>.tdesvn-buildrc</filename>. This file should be installed on
 the home folder (~/), and contain all configuration data
 required for the script to run, like configuration options,
 compiling options, location of the sources, the destination of the installation
 (prefix), the modules that should be built, &etc;. The default configuration
-data is provided by the <filename>kdesvn-buildrc-sample</filename> file.
+data is provided by the <filename>tdesvn-buildrc-sample</filename> file.
 You can find more information about the syntax of the configuration file
-in <xref linkend="configure-data" /> and in <xref linkend="kdesvn-buildrc" />.
+in <xref linkend="configure-data" /> and in <xref linkend="tdesvn-buildrc" />.
 </para>
 
 <para>
-A good way to get the latest version is to browse the kdesdk/scripts page
+A good way to get the latest version is to browse the tdesdk/scripts page
 at the <ulink url="http://websvn.kde.org/trunk/KDE">websvn.kde.org</ulink> website.
-You will see a list of the files available in the kdesdk/scripts directory in
-the &kde; &svn; repository. Click the &kdesvn-build; link and download
+You will see a list of the files available in the tdesdk/scripts directory in
+the &kde; &svn; repository. Click the &tdesvn-build; link and download
 the latest version of the script. Do the same for the
-<filename>kdesvn-buildrc-sample</filename> file.
+<filename>tdesvn-buildrc-sample</filename> file.
 Make the script executable, and be sure it is in your path.
 </para>
 
@@ -170,12 +170,12 @@ Make the script executable, and be sure it is in your path.
 
 <para>
 To use the script, you must have a file in your home directory called
-<filename>.kdesvn-buildrc</filename>, which sets the general options and sets the modules
+<filename>.tdesvn-buildrc</filename>, which sets the general options and sets the modules
 you would like to download and build.
 </para>
 
 <para>
-Use the <filename>kdesvn-buildrc-sample</filename> file as a
+Use the <filename>tdesvn-buildrc-sample</filename> file as a
 template, setting global options, and the modules you want to build.
 </para>
 
@@ -193,26 +193,26 @@ Pay close attention to the kdedir and qtdir global variables, as the first sets
 where your &kde; build is going to be installed, (by default to
 <filename>~/kde</filename>), and the second where (and if) your qt library is
 going to be built and installed, (by default to
-<filename>~/kdesvn/build/qt-copy</filename>). You will need to know the
+<filename>~/tdesvn/build/qt-copy</filename>). You will need to know the
 kdedir and qtdir location later, to set up the environment variables
 that are necessary to run your new installation.
 Check if the listed modules are in fact the modules you want to build.
-The default options from the <filename>kdesvn-buildrc-sample</filename> file
+The default options from the <filename>tdesvn-buildrc-sample</filename> file
 should be enough to get a fairly complete &kde; installation.
-Save the resulting as <filename>.kdesvn-buildrc</filename> in your home
+Save the resulting as <filename>.tdesvn-buildrc</filename> in your home
 folder.
 </para>
 
 <para>
-If you wish to fine tune your <filename>.kdesvn-buildrc</filename>,
-consult <xref linkend="kdesvn-buildrc" /> for detailed information
+If you wish to fine tune your <filename>.tdesvn-buildrc</filename>,
+consult <xref linkend="tdesvn-buildrc" /> for detailed information
 about all configuration options.
 </para>
 
 </sect1>
 
 <sect1 id="building-and-troubleshooting">
-<title>Using the &kdesvn-build; script</title>
+<title>Using the &tdesvn-build; script</title>
 
 <para>
 Now you are ready to run the script. From a terminal window,
@@ -220,7 +220,7 @@ log in to the user you are using to compile &kde; and execute
 the script:
 <screen>
 <prompt>&percnt;</prompt><command>su</command> <option>-</option> <replaceable>devel-username</replaceable>
-<prompt>&percnt;</prompt><command>kdesvn-build</command>
+<prompt>&percnt;</prompt><command>tdesvn-build</command>
 </screen>
 </para>
 
@@ -353,7 +353,7 @@ the stable KDE desktop.
 <title>Script Features</title>
 
 <para>
-&kdesvn-build; features include:
+&tdesvn-build; features include:
 </para>
 
 
@@ -391,7 +391,7 @@ support.
 <listitem><para>
 Tilde-expansion for your configuration options.  For example, you can
 specify:
-<programlisting>qtdir ~/kdesvn/build/qt-copy</programlisting>
+<programlisting>qtdir ~/tdesvn/build/qt-copy</programlisting>
 </para></listitem>
 
 <listitem><para>
@@ -415,7 +415,7 @@ you can specify options to apply to individual modules as well.
 Since the autotools sometimes get out of sync with changes to the
 source tree, you can force a rebuild of a module by creating a file called
 .refresh-me in the build directory of the module in question, or by running
-&kdesvn-build; with the <option>--refresh-build</option> option.
+&tdesvn-build; with the <option>--refresh-build</option> option.
 </para></listitem>
 
 <listitem><para>
@@ -473,7 +473,7 @@ configuration option</link>.
 </itemizedlist>
 
 <para>
-Things that &kdesvn-build; does NOT do:
+Things that &tdesvn-build; does NOT do:
 </para>
 
 <itemizedlist>
@@ -496,12 +496,12 @@ The script probably is not bug-free. Sorry.
 
 </chapter>
 
-<chapter id="kdesvn-buildrc">
-<title>The Format of .kdesvn-buildrc</title>
+<chapter id="tdesvn-buildrc">
+<title>The Format of .tdesvn-buildrc</title>
 
 <para>
 To use the script, you must have a file in your home directory called
-<filename>.kdesvn-buildrc</filename>, which describes the modules you would
+<filename>.tdesvn-buildrc</filename>, which describes the modules you would
 like to download and build.
 </para>
 
@@ -532,7 +532,7 @@ end module
 
 <para>
 <replaceable>module-name</replaceable> must be a module from the &kde; &svn; repository (for
-example, kdelibs or kdebase).  Some options override global options, some
+example, tdelibs or tdebase).  Some options override global options, some
 add to global options, and some global options simply can't be overridden.
 </para>
 
@@ -553,7 +553,7 @@ authors using the address you can find <link linkend="authors">above</link>.
 <listitem><para><link linkend="conf-configure-flags">configure-flags</link> to define what flags to configure a module with.</para></listitem>
 <listitem><para><link linkend="conf-cxxflags">cxxflags</link> to define the <envar>CXXFLAGS</envar> variable.</para></listitem>
 <listitem><para><link linkend="conf-dest-dir">dest-dir</link> to change the directory name for a module.</para></listitem>
-<listitem><para><link linkend="conf-disable-agent-check">disable-agent-check</link>, to keep kdesvn-build from checking on ssh-agent's status.</para></listitem>
+<listitem><para><link linkend="conf-disable-agent-check">disable-agent-check</link>, to keep tdesvn-build from checking on ssh-agent's status.</para></listitem>
 <listitem><para><link linkend="conf-do-not-compile">do-not-compile</link>, to mark directories to skip building.</para></listitem>
 <listitem><para><link linkend="conf-inst-apps">inst-apps</link>, to only build and install some directories.</para></listitem>
 <listitem><para><link linkend="conf-install-after-build">install-after-build</link>, to avoid installing after the build process.</para></listitem>
@@ -569,7 +569,7 @@ authors using the address you can find <link linkend="authors">above</link>.
 <listitem><para><link linkend="conf-qtdir">qtdir</link>, to set the path to Qt.</para></listitem>
 <listitem><para><link linkend="conf-set-env">set-env</link>, to set an environment variable.</para></listitem>
 <listitem><para><link linkend="conf-source-dir">source-dir</link>, to change where to download the source code to.</para></listitem>
-<listitem><para><link linkend="conf-stop-on-failure">stop-on-failure</link>, to make kdesvn-build stop as soon as a failure is encountered.</para></listitem>
+<listitem><para><link linkend="conf-stop-on-failure">stop-on-failure</link>, to make tdesvn-build stop as soon as a failure is encountered.</para></listitem>
 <listitem><para><link linkend="conf-svn-server">svn-server</link>, to change the server the sources are downloaded from.</para></listitem>
 <listitem><para><link linkend="conf-use-qt-builddir-hack">use-qt-builddir-hack</link>, to give Qt a separate build directory from its source like KDE.</para></listitem>
 <listitem><para><link linkend="conf-use-unsermake">use-unsermake</link>, to use the advanced unsermake build system.</para></listitem>
@@ -599,10 +599,10 @@ as well.
 <row id="conf-apidox">
 <entry>apidox</entry>
 <entry>Overrides global</entry>
-<entry>Set this option to <quote>true</quote> in order to have &kdesvn-build; automatically
+<entry>Set this option to <quote>true</quote> in order to have &tdesvn-build; automatically
 build and install the API documentation for the module after the normal build/install
 process.  This only works for modules where <command>make apidox</command> does something,
-including kdelibs, kdebase, and koffice, among others.
+including tdelibs, tdebase, and koffice, among others.
 </entry>
 </row>
 
@@ -638,7 +638,7 @@ KDE 3.4 branch, you would set this option to "3.4".</para>
 <para>Note that some modules use a different branch name.  Notably, the
 required arts module doesn't go by KDE version numbers.  The arts that
 accompanied KDE 3.4 was version 1.4.</para>
-<para>If kdesvn-build fails to properly download a branch with this option, you
+<para>If tdesvn-build fails to properly download a branch with this option, you
 may have to manually specify the URL to download from using the <link
 linkend="conf-override-url">override-url</link> option.</para>
 </entry>
@@ -698,8 +698,8 @@ set of configure options than the rest of &kde;, so this option
 <row id="conf-colorful-output">
 <entry>colorful-output</entry>
 <entry>Can't be overridden</entry>
-<entry>Set this option to false to disable the colorful output of &kdesvn-build;.
-This option defaults to <quote>true</quote>.  Note that &kdesvn-build; won't output the
+<entry>Set this option to false to disable the colorful output of &tdesvn-build;.
+This option defaults to <quote>true</quote>.  Note that &tdesvn-build; won't output the
 color codes to anything but a terminal (such as xterm, &konsole;, or the normal
 Linux console).
 </entry>
@@ -729,7 +729,7 @@ extragear-network using this option.
 <entry>disable-agent-check</entry>
 <entry>Can't be overridden</entry>
 <entry>Normally if you're using SSH to download the Subversion sources (such as
-if you're using the svn+ssh protocol), kdesvn-build will try and make sure that
+if you're using the svn+ssh protocol), tdesvn-build will try and make sure that
 if you're using ssh-agent, it is actually managing some SSH identities.  This is
 to try and prevent SSH from asking for your passphrase for every module.  You can
 disable this check by setting disable-agent-check to true.
@@ -755,7 +755,7 @@ directive to choose directories that you want to check out.</para>
 <entry>email-address</entry>
 <entry>Can't be overridden</entry>
 <entry>
-<para>Set this option to the e-mail address kdesvn-build should send from should
+<para>Set this option to the e-mail address tdesvn-build should send from should
 it ever need to send e-mail.  You do not need to worry about this if you don't
 use any feature which send e-mail.  (They are all disabled by default).
 </para>
@@ -771,13 +771,13 @@ needs this option.
 <entry>Can't be overridden</entry>
 <entry>
 <para>You can set this option to the email address to send a report to when a
-module fails to build.  kdesvn-build will wait until all the modules are done
+module fails to build.  tdesvn-build will wait until all the modules are done
 and collate all of the results in the report.  The report is only sent if a
 module fails to build.
 </para>
 
 <para>Please see the <link linkend="conf-email-address">email-address</link>
-option to set the address kdesvn-build should send from, since the default
+option to set the address tdesvn-build should send from, since the default
 is usually not what you want.
 </para>
 </entry>
@@ -887,11 +887,11 @@ option for a module, then you have pretty much commented it out.
 <row id="conf-module-base-path">
 <entry>module-base-path</entry>
 <entry>Overrides global</entry>
-<entry><para>Set this option to override &kdesvn-build;'s default directory path to the
+<entry><para>Set this option to override &tdesvn-build;'s default directory path to the
 module in question.  This can be used, for example, to pull specific branches
 or tagged versions of libraries.  <ulink url="http://websvn.kde.org/">The &kde;
 Source Viewer</ulink> is invaluable in helping to pick the right path.</para>
-<para>Note that &kdesvn-build; constructs the final path according to the
+<para>Note that &tdesvn-build; constructs the final path according to the
 following template:
 <varname>$svn-server</varname>/home/kde/<varname>$module-base-path</varname>/<varname>$module-name</varname>.
 </para>
@@ -904,25 +904,25 @@ following template:
 <entry>niceness</entry>
 <entry>Can't be overridden</entry>
 <entry>Set this option to a number between 20 and 0.  The higher the number, the
-lower a priority &kdesvn-build; will set for itself.  The default is 10.
+lower a priority &tdesvn-build; will set for itself.  The default is 10.
 </entry>
 </row>
 
 <row id="conf-no-rebuild-on-fail">
 <entry>no-rebuild-on-fail</entry>
 <entry>Overrides global</entry>
-<entry>Set this option value to <quote>true</quote> to always prevent &kdesvn-build; from trying
+<entry>Set this option value to <quote>true</quote> to always prevent &tdesvn-build; from trying
 to rebuild this module if it should fail an incremental build.  Normally
-&kdesvn-build; will try to rebuild the module from scratch to counteract the
+&tdesvn-build; will try to rebuild the module from scratch to counteract the
 effect of a stray &svn; update messing up the build system.</entry>
 </row>
 
 <row id="conf-override-url">
 <entry>override-url</entry>
 <entry>Overrides global</entry>
-<entry>If you set this option, kdesvn-build will use its value as the URL
+<entry>If you set this option, tdesvn-build will use its value as the URL
 to pass to Subversion <emphasis>completely unchanged</emphasis>.  You should
-generally use this if you want to download a specific release but kdesvn-build
+generally use this if you want to download a specific release but tdesvn-build
 can't figure out what you mean using <link linkend="conf-branch">branch</link>.
 </entry>
 </row>
@@ -957,7 +957,7 @@ installed.
 
 <para>Note that using this option can have a significant detrimental impact on
 both your bandwidth usage (if you use 'all') and the time taken to compile KDE,
-since kdesvn-build will be unable to perform incremental builds.</para>
+since tdesvn-build will be unable to perform incremental builds.</para>
 </entry>
 </row>
 
@@ -981,7 +981,7 @@ globally).</para>
 <entry>Can't be overridden</entry>
 <entry>This option is used to set the directory on your computer to store the &kde;
 &svn; sources at.  If you don't specify this value, the default is
-<filename class="directory">~/kdesvn</filename>.  If
+<filename class="directory">~/tdesvn</filename>.  If
 you do specify this value, use an absolute path name.
 </entry>
 </row>
@@ -1010,7 +1010,7 @@ by default.
 to use this option. KDE releases are available in tarball form from <ulink
 url="ftp://ftp.kde.org/">The KDE FTP site</ulink> or one of <ulink
 url="http://download.kde.org/download.php">its mirrors</ulink>.</para>
-<para>If you are using kdesvn-build because you have having trouble getting
+<para>If you are using tdesvn-build because you have having trouble getting
 a KDE release to build on your distribution, consider using the <ulink
 url="http://developer.kde.org/build/konstruct/">Konstruct build tool</ulink>
 instead, which works from the release tarballs.</para>
@@ -1023,7 +1023,7 @@ instead, which works from the release tarballs.</para>
 <entry>Although this option overrides the global option, it only makes sense for
 qt-copy.  Set this option to <quote>true</quote> to enable the script's
 <emphasis>experimental</emphasis> srcdir != builddir mode.  When enabled,
-&kdesvn-build; will copy the qt-copy source module to the build directory,
+&tdesvn-build; will copy the qt-copy source module to the build directory,
 and perform builds from there.  That means your QTDIR environment variable
 should be set to
 <filename class="directory">$(qt-copy-build-dir)/qt-copy/lib</filename>
@@ -1046,10 +1046,10 @@ script.  This can lead to some serious decreases in build time, especially for
 systems</ulink>.  This option defaults to <quote>true</quote> (for most modules).
 </para>
 
-<para>Normally if you use this option kdesvn-build will automatically keep
+<para>Normally if you use this option tdesvn-build will automatically keep
 unsermake up-to-date.  This may start to get annoying, especially if you are
 managing unsermake yourself.  If this is the case, you can set this option to
-<quote>self</quote>, and kdesvn-build will still use unsermake, but will not
+<quote>self</quote>, and tdesvn-build will still use unsermake, but will not
 do anything special to keep it updated.
 </para>
 </entry>
@@ -1138,7 +1138,7 @@ Only output warnings and errors.
 <varlistentry id="cmdline-verbose">
 <term><option>--verbose</option></term>
 <listitem><para>
-Be very descriptive about what's going on, and what kdesvn-build is doing.
+Be very descriptive about what's going on, and what tdesvn-build is doing.
 </para></listitem>
 </varlistentry>
 
@@ -1199,7 +1199,7 @@ verbose about what they're doing in debugging mode.
 <term><option>--no-rebuild-on-fail</option></term>
 <listitem><para>
 don't try and
-rebuild modules that have failed building from scratch.  &kdesvn-build; will
+rebuild modules that have failed building from scratch.  &tdesvn-build; will
 never try to do this to a module that already was tried to be built from
 scratch.
 </para></listitem>
@@ -1255,7 +1255,7 @@ other module names on the command line.
 <listitem><para>
 which interprets the next command line
 parameter as the file to read the configuration options from.  The default
-value for this parameter is ~/.kdesvn-buildrc.
+value for this parameter is ~/.tdesvn-buildrc.
 </para></listitem>
 </varlistentry>
 
@@ -1271,7 +1271,7 @@ This option implies <link linkend="cmdline-reconfigure"><option>--reconfigure</o
 <term><option>--build-system-only</option></term>
 <listitem><para>
 stop after running <command>make <option>-f</option> Makefile.cvs</command>.  The configure
-script will still need to be run, which &kdesvn-build; will do next time.  This lets you
+script will still need to be run, which &tdesvn-build; will do next time.  This lets you
 prepare all the configure scripts at once so you can view the <command>./configure
 <option>--help</option></command> for each module, and edit your configure-flags accordingly.
 </para></listitem>
@@ -1300,8 +1300,8 @@ linkend="conf-log-dir">log-dir</link> option, you would do:
 <listitem><para>
 You can use this option to override an option in your configuration file for
 a specific module.  For instance, to override the <link
-linkend="conf-use-unsermake">use-unsermake</link> option for kdemultimedia, you
-would do: <option>--kdemultimedia,use-unsermake=false</option>.
+linkend="conf-use-unsermake">use-unsermake</link> option for tdemultimedia, you
+would do: <option>--tdemultimedia,use-unsermake=false</option>.
 </para></listitem>
 </varlistentry>
 
diff --git a/doc/scripts/man-cheatmake.1.docbook b/doc/scripts/man-cheatmake.1.docbook
index 4fdb9498..ce140ef9 100644
--- a/doc/scripts/man-cheatmake.1.docbook
+++ b/doc/scripts/man-cheatmake.1.docbook
@@ -71,11 +71,11 @@ simpler variable <envar>OBJ_SUBDIR</envar> should be used. </para>
 <variablelist>
 <varlistentry>
 <term><envar>OBJ_SUBJDIR</envar></term>
-<listitem><para>Indicates that the build directory is in the given subdirectory of the source directory. For instance, if the source directory is <filename class="directory">kdesdk</filename> and the build directory is <filename class="directory">kdesdk/obj-i386-linux</filename>, then <envar>OBJ_SUBDIR</envar> should be set to <parameter>obj-i386-linux</parameter>.</para></listitem>
+<listitem><para>Indicates that the build directory is in the given subdirectory of the source directory. For instance, if the source directory is <filename class="directory">tdesdk</filename> and the build directory is <filename class="directory">tdesdk/obj-i386-linux</filename>, then <envar>OBJ_SUBDIR</envar> should be set to <parameter>obj-i386-linux</parameter>.</para></listitem>
 </varlistentry>
 <varlistentry>
 <term><envar>OBJ_REPLACEMENT</envar></term>
-<listitem><para>A <command>sed</command> expression that is used to transform the source directory into the build directory.  For instance, if the source directory is <filename class="directory">kdesdk/obj-i386-linux</filename>, then <envar>OBJ_REPLACEMENT</envar> should be set to <parameter>s#kdesdk#kdesdk-obj#</parameter>.</para>
+<listitem><para>A <command>sed</command> expression that is used to transform the source directory into the build directory.  For instance, if the source directory is <filename class="directory">tdesdk/obj-i386-linux</filename>, then <envar>OBJ_REPLACEMENT</envar> should be set to <parameter>s#tdesdk#tdesdk-obj#</parameter>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/doc/scripts/man-create_makefile.1.docbook b/doc/scripts/man-create_makefile.1.docbook
index 553e2512..ffcfa342 100644
--- a/doc/scripts/man-create_makefile.1.docbook
+++ b/doc/scripts/man-create_makefile.1.docbook
@@ -66,11 +66,11 @@ simpler variable <envar>OBJ_SUBDIR</envar> should be used. </para>
 <variablelist>
 <varlistentry>
 <term><envar>OBJ_SUBJDIR</envar></term>
-<listitem><para>Indicates that the build directory is in the given subdirectory of the source directory. For instance, if the source directory is <filename class="directory">kdesdk</filename> and the build directory is <filename class="directory">kdesdk/obj-i386-linux</filename>, then <envar>OBJ_SUBDIR</envar> should be set to <parameter>obj-i386-linux</parameter>.</para></listitem>
+<listitem><para>Indicates that the build directory is in the given subdirectory of the source directory. For instance, if the source directory is <filename class="directory">tdesdk</filename> and the build directory is <filename class="directory">tdesdk/obj-i386-linux</filename>, then <envar>OBJ_SUBDIR</envar> should be set to <parameter>obj-i386-linux</parameter>.</para></listitem>
 </varlistentry>
 <varlistentry>
 <term><envar>OBJ_REPLACEMENT</envar></term>
-<listitem><para>A <command>sed</command> expression that is used to transform the source directory into the build directory.  For instance, if the source directory is <filename class="directory">kdesdk/obj-i386-linux</filename>, then <envar>OBJ_REPLACEMENT</envar> should be set to <parameter>s#kdesdk#kdesdk-obj#</parameter>.</para>
+<listitem><para>A <command>sed</command> expression that is used to transform the source directory into the build directory.  For instance, if the source directory is <filename class="directory">tdesdk/obj-i386-linux</filename>, then <envar>OBJ_REPLACEMENT</envar> should be set to <parameter>s#tdesdk#tdesdk-obj#</parameter>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/doc/scripts/man-create_makefiles.1.docbook b/doc/scripts/man-create_makefiles.1.docbook
index edc11159..e9ee67df 100644
--- a/doc/scripts/man-create_makefiles.1.docbook
+++ b/doc/scripts/man-create_makefiles.1.docbook
@@ -60,11 +60,11 @@ simpler variable <envar>OBJ_SUBDIR</envar> should be used. </para>
 <variablelist>
 <varlistentry>
 <term><envar>OBJ_SUBJDIR</envar></term>
-<listitem><para>Indicates that the build directory is in the given subdirectory of the source directory. For instance, if the source directory is <filename class="directory">kdesdk</filename> and the build directory is <filename class="directory">kdesdk/obj-i386-linux</filename>, then <envar>OBJ_SUBDIR</envar> should be set to <parameter>obj-i386-linux</parameter>.</para></listitem>
+<listitem><para>Indicates that the build directory is in the given subdirectory of the source directory. For instance, if the source directory is <filename class="directory">tdesdk</filename> and the build directory is <filename class="directory">tdesdk/obj-i386-linux</filename>, then <envar>OBJ_SUBDIR</envar> should be set to <parameter>obj-i386-linux</parameter>.</para></listitem>
 </varlistentry>
 <varlistentry>
 <term><envar>OBJ_REPLACEMENT</envar></term>
-<listitem><para>A <command>sed</command> expression that is used to transform the source directory into the build directory.  For instance, if the source directory is <filename class="directory">kdesdk/obj-i386-linux</filename>, then <envar>OBJ_REPLACEMENT</envar> should be set to <parameter>s#kdesdk#kdesdk-obj#</parameter>.</para>
+<listitem><para>A <command>sed</command> expression that is used to transform the source directory into the build directory.  For instance, if the source directory is <filename class="directory">tdesdk/obj-i386-linux</filename>, then <envar>OBJ_REPLACEMENT</envar> should be set to <parameter>s#tdesdk#tdesdk-obj#</parameter>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/doc/umbrello/index.docbook b/doc/umbrello/index.docbook
index 0da7c91e..e2855b92 100644
--- a/doc/umbrello/index.docbook
+++ b/doc/umbrello/index.docbook
@@ -3,7 +3,7 @@
  "dtd/kdex.dtd" [
  <!ENTITY umbrello "<application>Umbrello &UML; Modeller</application>">
  <!ENTITY kappname "&umbrello;">
- <!ENTITY packagename "kdesdk">
+ <!ENTITY packagename "tdesdk">
  <!ENTITY UML "<acronym>UML</acronym>">
  <!ENTITY introduction-chapter SYSTEM "introduction.docbook">
  <!ENTITY uml-basics-chapter SYSTEM "uml_basics.docbook">
diff --git a/kapptemplate/ChangeLog b/kapptemplate/ChangeLog
index 1c1721c3..74cae703 100644
--- a/kapptemplate/ChangeLog
+++ b/kapptemplate/ChangeLog
@@ -68,7 +68,7 @@ Feb-04-2001 - Simon Hausman (v1.0.1)
   o Fixed memory leak in plugin module
   o Use createObject instead of old create in plugin module
   o Added version number to xml file in plugin module
-  o Fixed integration of configure.in.in in kdesdk
+  o Fixed integration of configure.in.in in tdesdk
 
 Feb-04-2001 - Kurt Granroth (v1.0)
   o GIGANTIC REWRITE.  This was *almost* a complete rewrite from
@@ -154,7 +154,7 @@ Nov-04-1999 - Kurt Granroth (v0.4.1)
     install-sh, mkinstalldirs)
   o Renamed .png files to "proper" naming convention
   o Got rid of admin/ directory from CVS.  It is now copied over from
-    the common admin directory (found in kdesdk/admin).  This should
+    the common admin directory (found in tdesdk/admin).  This should
     prevent a lot of redundent updates
 
 Nov-02-1999 - Kurt Granroth (v0.4)
@@ -171,7 +171,7 @@ Jan-18-1999 - Kurt Granroth (v0.3.1)
     CVS.  It was wigging out when it tried to cp the CVS directory...
   
 Jan-01-1999 - Kurt Granroth (v0.3)
-  o Added kapptemplate to kdesdk
+  o Added kapptemplate to tdesdk
   o HUGE clean-up of code
   o Put in some session management stuff
   o Changed main() to use 'App *widget = new App;' instead of 'App widget'.
diff --git a/kapptemplate/README b/kapptemplate/README
index 9ee09553..2c5db4b7 100644
--- a/kapptemplate/README
+++ b/kapptemplate/README
@@ -49,7 +49,7 @@ How do I install it?
 If you have a standalone kapptemplate.tar.bz2, do:
   ./configure
   make && make install
-If you are installing from kdesdk, then just
+If you are installing from tdesdk, then just
   make && make install
 If you are installing from .deb or .rpm, then install like any other
 normal package
diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp
index a1333cf7..397982fa 100644
--- a/kapptemplate/kapp/app.cpp
+++ b/kapptemplate/kapp/app.cpp
@@ -13,7 +13,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/kapptemplate/kapptemplate.lsm b/kapptemplate/kapptemplate.lsm
index d557a8f7..e1841e2a 100644
--- a/kapptemplate/kapptemplate.lsm
+++ b/kapptemplate/kapptemplate.lsm
@@ -10,7 +10,7 @@ Keywords:       KDE application generator DCOP KParts Plugins XML-GUI
 Author:         Kurt Granroth <granroth@kde.org>
 Maintained-by:  Kurt Granroth <granroth@kde.org>
 Home-page:      http://www.granroth.org/kapptemplate
-Primary-site:   cvs.kde.org:/home/kde/kdesdk/kapptemplate
+Primary-site:   cvs.kde.org:/home/kde/tdesdk/kapptemplate
                 xxxxxx  kapptemplate-1.0.6.tar.bz2
                 xxx     kapptemplate-1.0.6.lsm
 Platform:       Unix
diff --git a/kbabel/ChangeLog b/kbabel/ChangeLog
index c62d9c40..0fa02524 100644
--- a/kbabel/ChangeLog
+++ b/kbabel/ChangeLog
@@ -266,7 +266,7 @@ Changes 0.3.3:
 - now using standard KDialogBase
 
 Changes 0.3.2:
-- made changes due to some api changes in kdelibs
+- made changes due to some api changes in tdelibs
 - partly fixed layout problem in the preferences dialog
 - fixed bug in commands editor for catalog manager
 
diff --git a/kbabel/README b/kbabel/README
index 34dc745f..adeaac88 100644
--- a/kbabel/README
+++ b/kbabel/README
@@ -14,7 +14,7 @@ please send a mail to Stanislav Visnovsky <visnovsky@kde.org>.
 
 For always up-to-date information about KBabel have a look at its homepage at
 http://kbabel.kde.org
-The always newest version of KBabel can be found in module kdesdk in
+The always newest version of KBabel can be found in module tdesdk in
 KDE's SVN.
 
 
diff --git a/kbabel/catalogmanager/catalogmanager.h b/kbabel/catalogmanager/catalogmanager.h
index bb4e2e58..fe5d4928 100644
--- a/kbabel/catalogmanager/catalogmanager.h
+++ b/kbabel/catalogmanager/catalogmanager.h
@@ -41,7 +41,7 @@
 #include <tqguardedptr.h>
 #include <tqmap.h>
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kmainwindow.h>
 #include <kdirwatch.h>
 #include <kprocess.h>
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 73c2debd..2473af73 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -70,7 +70,7 @@
 #include <kio/netaccess.h>
 #include <kprogress.h>
 #include <twin.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <ktempfile.h>
 
 #include <tqfileinfo.h>
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index 182cf3b0..00c9491d 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -3313,7 +3313,7 @@ int Catalog::getNumberOfPluralForms(const TQString& lang)
 {
     int nr=-1;
 
-    KLocale locale("kdelibs");
+    KLocale locale("tdelibs");
     locale.setLanguage(lang);
 
     const char* formsString =
@@ -3321,7 +3321,7 @@ int Catalog::getNumberOfPluralForms(const TQString& lang)
     "pick the _right_ value out of NoPlural/TwoForms/French... If not sure what "
     "to do mail thd@kde.org and coolo@kde.org, they will tell you. Better leave "
     "that out if unsure, the programs will crash!!\n"
-    "Definition of PluralForm - to be set by the translator of kdelibs.po";
+    "Definition of PluralForm - to be set by the translator of tdelibs.po";
 
     TQString formsTranslation = locale.translate(formsString);
 
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index f9e5be2f..cb54e884 100644
--- a/kbabel/commonui/context.cpp
+++ b/kbabel/commonui/context.cpp
@@ -52,7 +52,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kio/netaccess.h>
 
 #include <klibloader.h>
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index 02c20196..163b4eeb 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -618,7 +618,7 @@ void IdentityPreferences::testPluralForm()
         msg = i18n("It is not possible to find out the number "
                 "of singular/plural forms automatically for the "
                 "language code \"%1\".\n"
-                "Do you have kdelibs.po installed for this language?\n"
+                "Do you have tdelibs.po installed for this language?\n"
                 "Please set the correct number manually.").tqarg(lang);
     }
     else
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 50f8fb0c..24c3eae9 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -1066,7 +1066,7 @@ void KBabelMW::addToRecentFiles(KURL url)
 
 void KBabelMW::fileSave()
 {
-    // do it asynchronously due to kdelibs bug
+    // do it asynchronously due to tdelibs bug
     TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( fileSave_internal() ));
 }
 
diff --git a/kbabel/kbabel/kbabel.h b/kbabel/kbabel/kbabel.h
index 392f71ad..872ae2c0 100644
--- a/kbabel/kbabel/kbabel.h
+++ b/kbabel/kbabel/kbabel.h
@@ -40,7 +40,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kdockwidget.h>
 #include <tqstringlist.h>
 #include <tqptrlist.h>
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 213a4e1a..4c50a7e9 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -56,7 +56,7 @@
 #include <tqvbox.h>
 
 #include <dcopclient.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kcharsets.h>
 #include <kcmenumngr.h>
 #include <kconfigdialog.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index 16458a75..69d1acce 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -32,7 +32,7 @@
 #include <tqprogressdialog.h>
 
 #include <tqinputdialog.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kio/netaccess.h>
@@ -539,9 +539,9 @@ KDBSearchEngine::repeat ()
     DataBaseItem item;
     int i, h, tot;
 
-    int req = dm->searchCatalogInfo ("kdelibs.po");
+    int req = dm->searchCatalogInfo ("tdelibs.po");
     if (req == -1)
-	kdDebug (0) << "No kdelibs.po found!" << endl;
+	kdDebug (0) << "No tdelibs.po found!" << endl;
 
 
     TQProgressDialog *pd =
diff --git a/kbugbuster/backend/bugdetails.cpp b/kbugbuster/backend/bugdetails.cpp
index cebcedd3..6c153e2c 100644
--- a/kbugbuster/backend/bugdetails.cpp
+++ b/kbugbuster/backend/bugdetails.cpp
@@ -180,7 +180,7 @@ TQValueList<BugDetails::Attachment> BugDetails::extractAttachments( const TQStri
 #ifdef DEBUG_EXTRACT
                     kdDebug() << "BugDetails::extractAttachments found header " << *rit << endl;
 #endif
-                    // Taken from libkdenetwork/kmime_headers.cpp
+                    // Taken from libtdenetwork/kmime_headers.cpp
                     int pos=header.find("filename=", 0, false);
                     TQString fn;
                     if(pos>-1) {
diff --git a/kdesdk.lsm b/kdesdk.lsm
index ecb2a710..85641fef 100644
--- a/kdesdk.lsm
+++ b/kdesdk.lsm
@@ -1,5 +1,5 @@
 Begin4
-Title:          kdesdk
+Title:          tdesdk
 Version:        3.5.10
 Entered-date:   2008-08-26
 Description:    K Desktop Environment (KDE) SDK
diff --git a/kompare/ChangeLog b/kompare/ChangeLog
index d9db63b5..76d8edf6 100644
--- a/kompare/ChangeLog
+++ b/kompare/ChangeLog
@@ -299,7 +299,7 @@ Sep    17/18, 2001 : Otto Bruggeman
 	Probably some more fixes for the klibloader.
 
 Sep    17, 2001 : Otto Bruggeman
-	Moved to kdesdk and renamed to kompare with preservation of history.
+	Moved to tdesdk and renamed to kompare with preservation of history.
 	Changed almost every occurence of kdiff to kompare (not in this file).
 
 Sep    08, 2001 : Otto Bruggeman
diff --git a/kompare/tests/cvsdiff/context.diff b/kompare/tests/cvsdiff/context.diff
index 8773139c..1d6eaac3 100644
--- a/kompare/tests/cvsdiff/context.diff
+++ b/kompare/tests/cvsdiff/context.diff
@@ -1,6 +1,6 @@
 Index: client/dcopfind.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/dcopfind.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
 retrieving revision 1.2
 diff -c -r1.2 dcopfind.cpp
 *** client/dcopfind.cpp	2001/10/31 01:17:39	1.2
diff --git a/kompare/tests/cvsdiff/contextm.diff b/kompare/tests/cvsdiff/contextm.diff
index 090c4c71..6877889c 100644
--- a/kompare/tests/cvsdiff/contextm.diff
+++ b/kompare/tests/cvsdiff/contextm.diff
@@ -1,6 +1,6 @@
 Index: client/dcop.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/dcop.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/dcop.cpp,v
 retrieving revision 1.26
 diff -c -r1.26 dcop.cpp
 *** client/dcop.cpp	2001/10/31 01:17:39	1.26
@@ -735,7 +735,7 @@ diff -c -r1.26 dcop.cpp
 + 
 Index: client/dcopfind.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/dcopfind.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
 retrieving revision 1.2
 diff -c -r1.2 dcopfind.cpp
 *** client/dcopfind.cpp	2001/10/31 01:17:39	1.2
@@ -818,7 +818,7 @@ diff -c -r1.2 dcopfind.cpp
   }
 Index: client/marshall.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/marshall.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/marshall.cpp,v
 retrieving revision 1.3
 diff -c -r1.3 marshall.cpp
 *** client/marshall.cpp	2001/10/31 01:17:39	1.3
diff --git a/kompare/tests/cvsdiff/ed.diff b/kompare/tests/cvsdiff/ed.diff
index 2c859e61..3a54449f 100644
--- a/kompare/tests/cvsdiff/ed.diff
+++ b/kompare/tests/cvsdiff/ed.diff
@@ -1,6 +1,6 @@
 Index: client/dcopfind.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/dcopfind.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
 retrieving revision 1.2
 diff -e -r1.2 dcopfind.cpp
 224c
diff --git a/kompare/tests/cvsdiff/edm.diff b/kompare/tests/cvsdiff/edm.diff
index a3c7d41a..53c58d72 100644
--- a/kompare/tests/cvsdiff/edm.diff
+++ b/kompare/tests/cvsdiff/edm.diff
@@ -1,6 +1,6 @@
 Index: client/dcop.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/dcop.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/dcop.cpp,v
 retrieving revision 1.26
 diff -e -r1.26 dcop.cpp
 343a
@@ -553,7 +553,7 @@ typedef QMap<QString, QString> UserList;
 .
 Index: client/dcopfind.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/dcopfind.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
 retrieving revision 1.2
 diff -e -r1.2 dcopfind.cpp
 224c
@@ -577,7 +577,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
 .
 Index: client/marshall.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/marshall.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/marshall.cpp,v
 retrieving revision 1.3
 diff -e -r1.3 marshall.cpp
 347a
diff --git a/kompare/tests/cvsdiff/normal.diff b/kompare/tests/cvsdiff/normal.diff
index 3becb815..81859d0c 100644
--- a/kompare/tests/cvsdiff/normal.diff
+++ b/kompare/tests/cvsdiff/normal.diff
@@ -1,6 +1,6 @@
 Index: client/dcopfind.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/dcopfind.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
 retrieving revision 1.2
 diff -r1.2 dcopfind.cpp
 39c39
diff --git a/kompare/tests/cvsdiff/normalm.diff b/kompare/tests/cvsdiff/normalm.diff
index ee47044e..de88506e 100644
--- a/kompare/tests/cvsdiff/normalm.diff
+++ b/kompare/tests/cvsdiff/normalm.diff
@@ -1,6 +1,6 @@
 Index: client/dcop.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/dcop.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/dcop.cpp,v
 retrieving revision 1.26
 diff -r1.26 dcop.cpp
 23c23,26
@@ -618,7 +618,7 @@ diff -r1.26 dcop.cpp
 > 
 Index: client/dcopfind.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/dcopfind.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
 retrieving revision 1.2
 diff -r1.2 dcopfind.cpp
 39c39
@@ -647,7 +647,7 @@ diff -r1.2 dcopfind.cpp
 >     findObject( app, objid, function, params );
 Index: client/marshall.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/marshall.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/marshall.cpp,v
 retrieving revision 1.3
 diff -r1.3 marshall.cpp
 245c245
diff --git a/kompare/tests/cvsdiff/rcs.diff b/kompare/tests/cvsdiff/rcs.diff
index da42d91a..3de1f238 100644
--- a/kompare/tests/cvsdiff/rcs.diff
+++ b/kompare/tests/cvsdiff/rcs.diff
@@ -1,6 +1,6 @@
 Index: client/dcopfind.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/dcopfind.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
 retrieving revision 1.2
 diff -n -r1.2 dcopfind.cpp
 d39 1
diff --git a/kompare/tests/cvsdiff/rcsm.diff b/kompare/tests/cvsdiff/rcsm.diff
index 9b8f2ae3..994369c3 100644
--- a/kompare/tests/cvsdiff/rcsm.diff
+++ b/kompare/tests/cvsdiff/rcsm.diff
@@ -1,6 +1,6 @@
 Index: client/dcop.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/dcop.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/dcop.cpp,v
 retrieving revision 1.26
 diff -n -r1.26 dcop.cpp
 d23 1
@@ -545,7 +545,7 @@ a343 3
 
 Index: client/dcopfind.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/dcopfind.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
 retrieving revision 1.2
 diff -n -r1.2 dcopfind.cpp
 d39 1
@@ -569,7 +569,7 @@ a224 5
     findObject( app, objid, function, params );
 Index: client/marshall.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/marshall.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/marshall.cpp,v
 retrieving revision 1.3
 diff -n -r1.3 marshall.cpp
 d245 1
diff --git a/kompare/tests/cvsdiff/unified.diff b/kompare/tests/cvsdiff/unified.diff
index c9e56db8..63dbb88a 100644
--- a/kompare/tests/cvsdiff/unified.diff
+++ b/kompare/tests/cvsdiff/unified.diff
@@ -1,6 +1,6 @@
 Index: client/dcopfind.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/dcopfind.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
 retrieving revision 1.2
 diff -u -r1.2 dcopfind.cpp
 --- client/dcopfind.cpp	2001/10/31 01:17:39	1.2
diff --git a/kompare/tests/cvsdiff/unifiedm.diff b/kompare/tests/cvsdiff/unifiedm.diff
index 3331435c..788b469d 100644
--- a/kompare/tests/cvsdiff/unifiedm.diff
+++ b/kompare/tests/cvsdiff/unifiedm.diff
@@ -1,6 +1,6 @@
 Index: client/dcop.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/dcop.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/dcop.cpp,v
 retrieving revision 1.26
 diff -u -r1.26 dcop.cpp
 --- client/dcop.cpp	2001/10/31 01:17:39	1.26
@@ -656,7 +656,7 @@ diff -u -r1.26 dcop.cpp
 +
 Index: client/dcopfind.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/dcopfind.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
 retrieving revision 1.2
 diff -u -r1.2 dcopfind.cpp
 --- client/dcopfind.cpp	2001/10/31 01:17:39	1.2
@@ -706,7 +706,7 @@ diff -u -r1.2 dcopfind.cpp
  }
 Index: client/marshall.cpp
 ===================================================================
-RCS file: /home/kde/kdelibs/dcop/client/marshall.cpp,v
+RCS file: /home/kde/tdelibs/dcop/client/marshall.cpp,v
 retrieving revision 1.3
 diff -u -r1.3 marshall.cpp
 --- client/marshall.cpp	2001/10/31 01:17:39	1.3
diff --git a/kprofilemethod/README b/kprofilemethod/README
index 543e841c..2b066905 100644
--- a/kprofilemethod/README
+++ b/kprofilemethod/README
@@ -9,7 +9,7 @@ As the docu in kprofilemethod.h says:
 WARNING:
 
  Please do not commit code that uses kprofilemethod.h
- Since not everyone has kdesdk installed, it won't build for everyone.
+ Since not everyone has tdesdk installed, it won't build for everyone.
  This is a tool to be used for a one-time profiling, and then you need
  to remove all its traces before committing.
 
diff --git a/kunittest/runnergui.cpp b/kunittest/runnergui.cpp
index 73e888e4..4644d0e5 100644
--- a/kunittest/runnergui.cpp
+++ b/kunittest/runnergui.cpp
@@ -422,8 +422,8 @@ namespace KUnitTest
             TQDataStream arg(data, IO_WriteOnly);
             bool ok;
             arg << TQString(reFileAndLine.cap(1)) << (reFileAndLine.cap(2).toInt(&ok) - 1);
-            client.send("kdevelop-*", "KDevPartController", "editDocument(TQString,int)", data);
-            client.send("kdevelop-*", "MainWindow", "raise()", TQString(""));
+            client.send("tdevelop-*", "KDevPartController", "editDocument(TQString,int)", data);
+            client.send("tdevelop-*", "MainWindow", "raise()", TQString(""));
 
             client.detach();
         }
diff --git a/poxml/lauri.po b/poxml/lauri.po
index 553253d5..c28eeb2f 100644
--- a/poxml/lauri.po
+++ b/poxml/lauri.po
@@ -8,7 +8,7 @@ msgstr ""
 "POT-Creation-Date: 2001-02-09 01:25+0100\n"
 "PO-Revision-Date: 2001-07-02 20:31MET\n"
 "Last-Translator: Stephan Kulow <coolo@kde.org>\n"
-"Language-Team: german <kde-i18n-de@kde.org>\n"
+"Language-Team: german <tde-i18n-de@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/poxml/transxx.cpp b/poxml/transxx.cpp
index 864259da..cd3a78be 100644
--- a/poxml/transxx.cpp
+++ b/poxml/transxx.cpp
@@ -60,7 +60,7 @@ int main(int argc, char **argv)
         projectId += fi.baseName( false );
         headerLines.gres( TQRegExp( "^Project-Id-Version:.*" ), projectId );
         headerLines.gres( TQRegExp( "^Last-Translator:.*" ), "Last-Translator: transxx program <null@kde.org>" );
-        headerLines.gres( TQRegExp( "^Language-Team:.*" ), "Language-Team: Test Language <kde-i18n-doc@kde.org>" );
+        headerLines.gres( TQRegExp( "^Language-Team:.*" ), "Language-Team: Test Language <tde-i18n-doc@kde.org>" );
         TQString revisionDate ( "PO-Revision-Date: " );
         const TQDateTime dt = TQDateTime::tqcurrentDateTime( Qt::UTC );
         revisionDate += dt.toString( "yyyy-MM-dd hh:mm+0000" );
diff --git a/poxml/xml2pot.cpp b/poxml/xml2pot.cpp
index e98c1c5f..658e557b 100644
--- a/poxml/xml2pot.cpp
+++ b/poxml/xml2pot.cpp
@@ -46,7 +46,7 @@ int main( int argc, char **argv )
     cout << "\"POT-Creation-Date: " << now.toString("yyyy-MM-dd hh:mm").utf8().data() << "+0000\\n\"\n";
     cout << "\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n";
     cout << "\"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n\"\n";
-    cout << "\"Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\\n\"\n";
+    cout << "\"Language-Team: LANGUAGE <tde-i18n-doc@kde.org>\\n\"\n";
     cout << "\"MIME-Version: 1.0\\n\"\n";
     cout << "\"Content-Type: application/x-xml2pot; charset=UTF-8\\n\"\n";
     cout << "\"Content-Transfer-Encoding: 8bit\\n\"\n";
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 89adcaa5..2f623d85 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -6,20 +6,20 @@ bin_SCRIPTS = \
   noncvslist cvs-clean cvs2dist cvsblame cvsforwardport create_cvsignore \
   colorsvn create_svnignore nonsvnlist svn2dist svnaddcurrentdir svnbackport svnforwardport \
   svn-clean svngettags svnlastchange svnlastlog svnrevertlast svnversions \
-  svnchangesince findmissingcrystal kdesvn-build \
+  svnchangesince findmissingcrystal tdesvn-build \
   kdedoc qtdoc extractrc extractattr zonetab2pot.py \
   licensecheck fixkdeincludes fixuifiles includemocs \
   cxxmetric extend_dmalloc kdekillall kdelnk2desktop.py \
   package_crystalsvg png2mng.pl kdemangen.pl
 
 # Install syntax highlighting file for KWrite/Kate.
-kdesvn_build_syntaxdir = $(kde_datadir)/katepart/syntax
-kdesvn_build_syntax_DATA = kdesvn-buildrc.xml
+tdesvn_build_syntaxdir = $(kde_datadir)/katepart/syntax
+tdesvn_build_syntax_DATA = tdesvn-buildrc.xml
 
 # sorted by bin_SCRIPTS reference
 man_MANS = \
   kde-build.1 \
-  kdesvn-build.1 \
+  tdesvn-build.1 \
   cvsversion.1 cvscheck.1 \
   noncvslist.1 \
   cvsblame.1 \
@@ -35,7 +35,7 @@ noinst_SCRIPTS = \
 EXTRA_DIST = completions kde-emacs \
   colorcvsrc-sample gettext.patch kde-buildrc \
   kde-devel-emacs.el kde-devel-gdb kde-devel-vim.vim \
-  kde.supp kdesvn-buildrc-sample
+  kde.supp tdesvn-buildrc-sample
 
 # it'd be too good if this worked everywhere ...
 #%.1: %
@@ -45,7 +45,7 @@ pod2man_options = "--center=K Desktop Environment (SDK)" "--release=KDE 3.5"
 
 kde-build.1: kde-build
 	pod2man $(pod2man_options) $< > $@
-kdesvn-build.1: kdesvn-build
+tdesvn-build.1: tdesvn-build
 	pod2man $(pod2man_options) $< > $@
 cvsversion.1: cvsversion
 	pod2man $(pod2man_options) $< > $@
diff --git a/scripts/README b/scripts/README
index 38046db3..211dc18e 100644
--- a/scripts/README
+++ b/scripts/README
@@ -170,7 +170,7 @@ build-progress.sh Displays the progress of kde-build, times needed to complete e
 		step. And sets the titlebar of the terminal to the directory that
 		make is processing 
 
-kdesvn-build	Updates and recompiles a local Subversion tree.
+tdesvn-build	Updates and recompiles a local Subversion tree.
 
 === OTHERS
 
diff --git a/scripts/cvs-clean b/scripts/cvs-clean
index f6ae254d..66fbce19 100755
--- a/scripts/cvs-clean
+++ b/scripts/cvs-clean
@@ -8,7 +8,7 @@
 #  inspired by the "old" cvs-clean target from Makefile.common
 #
 # This file is free software in terms of the modified BSD licence.
-# See kdelibs/doc/common/bsd-license.html for the exact conditions.
+# See tdelibs/doc/common/bsd-license.html for the exact conditions.
 #
 
 use File::Path;
diff --git a/scripts/cvs2dist b/scripts/cvs2dist
index 29721ec9..ba2e4eb7 100755
--- a/scripts/cvs2dist
+++ b/scripts/cvs2dist
@@ -322,12 +322,12 @@ modulename=`echo $modulename | sed -e 's#^.*/##'`
 
 remove="$remove $modulename.lsm"
 
-# we check out kde-i18n/subdirs in temp_dir/kde-i18n..
+# we check out tde-i18n/subdirs in temp_dir/tde-i18n..
 if [ $doi18n = "yes" ]; then
     pushd $temp_dir
-    echo "cvs co kde-i18n/subdirs" >> $log
-    cvs -z4 -q -d "$cvsroot" co $branch -P kde-i18n/subdirs > /dev/null 2>&1
-    i18nlangs_tmp="$(cat kde-i18n/subdirs)"
+    echo "cvs co tde-i18n/subdirs" >> $log
+    cvs -z4 -q -d "$cvsroot" co $branch -P tde-i18n/subdirs > /dev/null 2>&1
+    i18nlangs_tmp="$(cat tde-i18n/subdirs)"
     skiplist="`echo $noi18nlang | sed -e 's/,/ /g'`"
     skiplist="$skiplist $always_skip_languages"
     for lang in $i18nlangs_tmp; do
@@ -355,7 +355,7 @@ if [ -d $module/doc/$name ]; then
 	    pushd $temp_dir
 	    for lang in $i18nlangs; do
 		test -d $temp_dist/doc/$lang && rm -Rf $temp_dist/doc/$lang
-		docdirname="kde-i18n/$lang/docs/$modulename/$name"
+		docdirname="tde-i18n/$lang/docs/$modulename/$name"
 		echo "cvs co $docdirname" >> $log
 		cvs -z4 -q -d "$cvsroot" co $branch -P "$docdirname" > /dev/null 2>&1
 		if [ ! -d "$docdirname" ]; then
@@ -395,7 +395,7 @@ if [ $doi18n = "yes" ]; then
 
 	pushd $temp_dir/
 	for lang in $i18nlangs; do
-		pofilename="kde-i18n/$lang/messages/$modulename/$name.po";
+		pofilename="tde-i18n/$lang/messages/$modulename/$name.po";
 		echo "cvs co $pofilename" >> $log
 		cvs -z4 -q -d "$cvsroot" co $branch -P "$pofilename" > /dev/null 2>&1
 		if [ ! -f "$pofilename" ]; then
diff --git a/scripts/cvsversion b/scripts/cvsversion
index 200c008a..a28cc669 100755
--- a/scripts/cvsversion
+++ b/scripts/cvsversion
@@ -20,8 +20,8 @@ cvs diff -r <version> [-r <version>] <file>
 
 =head1 EXAMPLES
 
-    cd baseline/kdelibs ; cvsversion configure.in
-    cvsversion baseline/kdelibs/configure.in
+    cd baseline/tdelibs ; cvsversion configure.in
+    cvsversion baseline/tdelibs/configure.in
 
 =head1 AUTHOR
 
diff --git a/scripts/findmissingcrystal b/scripts/findmissingcrystal
index 258119c3..25fc0dad 100755
--- a/scripts/findmissingcrystal
+++ b/scripts/findmissingcrystal
@@ -13,7 +13,7 @@ for icon in `find $1 -name cr*.png` ; do
 	res=`echo $fullname | cut -d- -f1`
 	type=`echo $fullname | cut -d- -f2`
 	name=`echo $fullname | cut -d- -f3`
-	dir="kdeartwork/IconThemes/kdeclassic/${res}x${res}/${type}s/"
+	dir="tdeartwork/IconThemes/kdeclassic/${res}x${res}/${type}s/"
 	if [ -d "$dir" ]; then
 		classic=`find "${dir}" -name "$name"`
 		if [ -s "$classic" ]; then
diff --git a/scripts/fixkdeincludes b/scripts/fixkdeincludes
index 54e4e9f6..67e11156 100644
--- a/scripts/fixkdeincludes
+++ b/scripts/fixkdeincludes
@@ -557,7 +557,7 @@ sub fix_unnecessary($)
     next if( $include eq "qmodules.h");
     # don't remove this one either. causes conditional
     # code to be compiled incorrectly
-    next if( $include eq "kdeversion.h");
+    next if( $include eq "tdeversion.h");
     # don't remove the config.h include
     # conditional code may depend on this file
     next if( $include eq "config.h");
diff --git a/scripts/includemocs b/scripts/includemocs
index 08eb85ae..e18325c3 100755
--- a/scripts/includemocs
+++ b/scripts/includemocs
@@ -91,8 +91,8 @@ On stderr some informational messages are printed.
 
 =head1 EXAMPLES
 
-	cd kdebase ; includetqmocs
-	cd kdebase ; `eval includetqmocs 2> /dev/null`
+	cd tdebase ; includetqmocs
+	cd tdebase ; `eval includetqmocs 2> /dev/null`
 
 =head1 AUTHOR
 
diff --git a/scripts/kde-build b/scripts/kde-build
index ffafb38e..55cae0e5 100755
--- a/scripts/kde-build
+++ b/scripts/kde-build
@@ -75,7 +75,7 @@ err_buildclean_incremental="13"
 # script is aborted in case on of these modules doesn't build.
 # These modules needs to be build and installed in this specific order!
 #
-critical_modules="arts kdelibs kdebase"
+critical_modules="arts tdelibs tdebase"
 
 # Internal variable, do not change.
 #
@@ -396,7 +396,7 @@ if [ -z "$MAKE" ]; then
 fi
 
 if [ -n "$specifiedModules" ]; then
-  # In case someone with a kdebase dir in $PWD does autocompletion..
+  # In case someone with a tdebase dir in $PWD does autocompletion..
   modules=$( echo $specifiedModules | sed -e 's/\///g' )
 else
   if [ "$ONLYLISTEDMODULES" = yes ]; then
@@ -837,11 +837,11 @@ common directory, e.g. something like
 
     ~/kde-src/
       |
-      +-> kdelibs/
+      +-> tdelibs/
       |
-      +-> kdebase/
+      +-> tdebase/
       |
-      \-> kdenetwork/
+      \-> tdenetwork/
 
 In this case, the KDE source directory would be ~/kde-src/. The script will
 take care of compiling them in the correct order, checks for dependencies
@@ -882,7 +882,7 @@ The following error codes are returned by the script.
         cd ~/scripts/; vi ./kde-buildrc; ./kde-build
 
 On Debian systems, an example F<kde-buildrc> can be found in
-the directory /usr/share/doc/kdesdk-scripts/.
+the directory /usr/share/doc/tdesdk-scripts/.
 
 =head1 BUGS
 
diff --git a/scripts/kde-buildrc b/scripts/kde-buildrc
index d2225ed5..c6f13d44 100644
--- a/scripts/kde-buildrc
+++ b/scripts/kde-buildrc
@@ -50,14 +50,14 @@ USETDESUPPORT="yes"
 
 # Add modules you want to get compiled to this space-seperated list. Note that
 # you don't have to mention the fundamental modules 'arts, 'tdesupport',
-# 'kdelibs' and 'kdebase' here since the kde-build script will care about them
+# 'tdelibs' and 'tdebase' here since the kde-build script will care about them
 # automatically.
 # See http://wiki.kdenews.org/tiki-index.php?page=KDE+CVS+Structure for a list
 # of available modules including extragear-* or koffice.
 
-KDEMODULES="kdetoys"
+KDEMODULES="tdetoys"
 
-#KDEMODULES="kdeaccessibility kdeadmin kdeartwork kdebindings kdeedu tdegames kdegraphics kdemultimedia kdenetwork tdepim kdesdk kdetoys kdeutils kdeaddons kdevelop kdewebdev koffice"
+#KDEMODULES="tdeaccessibility tdeadmin tdeartwork tdebindings tdeedu tdegames tdegraphics tdemultimedia tdenetwork tdepim tdesdk tdetoys tdeutils tdeaddons tdevelop tdewebdev koffice"
 #KDEMODULES="$KDEMODULES extragear-libs extragear-multimedia extragear-sysadmin extragear-office extragear-addons extragear-graphics extragear-network extragear-pim extragear-toys extragear-utils"
 
 
@@ -168,7 +168,7 @@ CONFIGUREFLAGS="--enable-debug --disable-closure"
 
 # List modules here for which unsermake should not be used.
 #
-NO_UNSERMAKE_MODULES="kdenonbeta kdebindings"
+NO_UNSERMAKE_MODULES="kdenonbeta tdebindings"
 
 # If you use an extra build directory (KDEBUILDDIR), setting this to yes will
 # remove a module's build directory before configure is called.
diff --git a/scripts/kde-devel-emacs.el b/scripts/kde-devel-emacs.el
index d59eb9dd..856595e6 100644
--- a/scripts/kde-devel-emacs.el
+++ b/scripts/kde-devel-emacs.el
@@ -2,7 +2,7 @@
 
 ; To use this file, add this to your .emacs, uncommented :
 ;(load "cc-engine.elc")
-;(load "~/kde2/kdesdk/scripts/kde-devel-emacs.el")
+;(load "~/kde2/tdesdk/scripts/kde-devel-emacs.el")
 ; (setq auto-mode-alist
 ;          (append '(("\\.h$"    . c++-mode)) auto-mode-alist))
 
@@ -1887,4 +1887,4 @@ With arg, to it arg times."
 
 (setq-default initial-scratch-message
       "File kde-devel-emacs.el is deprecated! 
-Please use KDE-Emacs from kdesdk/scripts/kde-emacs.")
+Please use KDE-Emacs from tdesdk/scripts/kde-emacs.")
diff --git a/scripts/kde-devel-gdb b/scripts/kde-devel-gdb
index f35161b5..8284428b 100644
--- a/scripts/kde-devel-gdb
+++ b/scripts/kde-devel-gdb
@@ -1,6 +1,6 @@
 # This file defines handy gdb macros for printing out Qt types
 # To use it, add this line to your ~/.gdbinit :
-# source /path/to/kde/sources/kdesdk/scripts/kde-devel-gdb
+# source /path/to/kde/sources/tdesdk/scripts/kde-devel-gdb
 
 # Please don't use tabs in this file. When pasting a
 # macro definition to gdb, tabs are interpreted as completion.
diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim
index 3507c805..563ee41c 100644
--- a/scripts/kde-devel-vim.vim
+++ b/scripts/kde-devel-vim.vim
@@ -1,5 +1,5 @@
 " To use this file, add this line to your ~/.vimrc:, w/o the dquote
-" source /usr/share/kdesdk-scripts/kde-devel-vim.vim
+" source /usr/share/tdesdk-scripts/kde-devel-vim.vim
 "
 " For CreateChangeLogEntry() : If you don't want to re-enter your
 " Name/Email in each vim session then make sure to have the viminfo
diff --git a/scripts/kde-spellcheck.pl b/scripts/kde-spellcheck.pl
index bdde4e43..34ce47a0 100755
--- a/scripts/kde-spellcheck.pl
+++ b/scripts/kde-spellcheck.pl
@@ -948,7 +948,7 @@ Iterface               Interface
 itselfs                itself
 journalised            journalized
 judgement              judgment
-kdelbase               kdebase
+kdelbase               tdebase
 keyboad                keyboard
 klicking               clicking
 knowlege               knowledge
diff --git a/scripts/kdedoc b/scripts/kdedoc
index 09480fcc..0a8191d2 100755
--- a/scripts/kdedoc
+++ b/scripts/kdedoc
@@ -6,7 +6,7 @@
 # You can edit this line to set the directory holding your KDE docs, or you
 # can use the environment variable KDEDOCS to avoid future conflicts with this
 # file if the default changes.
-KDEDOCS=${KDEDOCS:-"$KDEDIR/share/doc/HTML/en/kdelibs-apidocs"}
+KDEDOCS=${KDEDOCS:-"$KDEDIR/share/doc/HTML/en/tdelibs-apidocs"}
 
 if [ $# = 1 ]; then
   if [ -e "$KDEDOCS/doxygen.css" ]; then
diff --git a/scripts/kdemangen.pl b/scripts/kdemangen.pl
index 69951c88..d5e23699 100755
--- a/scripts/kdemangen.pl
+++ b/scripts/kdemangen.pl
@@ -38,7 +38,7 @@
 # USAGE:
 # Suppose you wanted to generate a man page for the KDE-Edu program
 # kalzium..  Then you would
-# 1 cd to /path/to/kde/srcs/kdeedu/debian  ( necessary so the script
+# 1 cd to /path/to/kde/srcs/tdeedu/debian  ( necessary so the script
 #   finds the Debian control file.. )
 # 2 run "/path/to/kdemangen.pl $(which kstars) > kstars.1"
 # 3 run "man ./kstars.1" to check out the generated page..
diff --git a/scripts/kdesvn-build b/scripts/kdesvn-build
index cd1d9cd9..fb81ac67 100755
--- a/scripts/kdesvn-build
+++ b/scripts/kdesvn-build
@@ -6,7 +6,7 @@
 
 =over
 
-=item B<kdesvn-build> - automate the kde svn build process
+=item B<tdesvn-build> - automate the kde svn build process
 
 =back
 
@@ -14,45 +14,45 @@
 
 =over
 
-=item B<kdesvn-build> I<[options]...> I<[modules]...>
+=item B<tdesvn-build> I<[options]...> I<[modules]...>
 
 =back
 
 =head1 DESCRIPTION
 
-The B<kdesvn-build> script is used to automate the download, build,
+The B<tdesvn-build> script is used to automate the download, build,
 and install process for KDE (using Subversion).
 
-It is recommended that you first setup a F<.kdesvn-buildrc> file
-in your home directory. Please refer to B<kdesvn-build> help file
-in KDE help for information on how to write F<.kdesvn-buildrc>,
+It is recommended that you first setup a F<.tdesvn-buildrc> file
+in your home directory. Please refer to B<tdesvn-build> help file
+in KDE help for information on how to write F<.tdesvn-buildrc>,
 or consult the sample file which should have been included
-with this program.  If you don't setup a F<.kdesvn-buildrc>, a
+with this program.  If you don't setup a F<.tdesvn-buildrc>, a
 default set of options will be used, and a few modules will be
 built by default.
 
-After setting up F<.kdesvn-buildrc>, you can run this program from
+After setting up F<.tdesvn-buildrc>, you can run this program from
 either the command-line or from cron. It will automatically
 download the modules from Subversion, create the build
 system, and configure and make the modules you tell it to.
 You can use this program to install KDE as well,
-if you are building KDE for a single user. Note that B<kdesvn-build>
+if you are building KDE for a single user. Note that B<tdesvn-build>
 will try to install the modules by default.
 
 If you DO specify a package name, then your settings will still be
 read, but the script will try to build / install the package
-regardless of F<.kdesvn-buildrc>
+regardless of F<.tdesvn-buildrc>
 
-kdesvn-build reads options in the following order:
+tdesvn-build reads options in the following order:
 
 =over
 
 =item 1. From the command line.
 
-=item 2. From the file F<kdesvn-buildrc> in the current directory.  Note that
+=item 2. From the file F<tdesvn-buildrc> in the current directory.  Note that
          the file is not a hidden file.
 
-=item 3. From the file F<~/.kdesvn-buildrc>.
+=item 3. From the file F<~/.tdesvn-buildrc>.
 
 =item 4. From a set of internal options.
 
@@ -66,7 +66,7 @@ This utility is part of the KDE Software Development Kit.
 
 =item B<--quiet>,  B<-q>
 
-With this switch kdesvn-build will only output a general overview of the build
+With this switch tdesvn-build will only output a general overview of the build
 process.  Progress output is still displayed if available.
 
 =item B<--really-quiet>
@@ -75,7 +75,7 @@ With this switch only warnings and errors will be output.
 
 =item B<--verbose>,  B<-v>
 
-Be very detailed in what is going on, and what actions kdesvn-build is taking.
+Be very detailed in what is going on, and what actions tdesvn-build is taking.
 Only B<--debug> is more detailed.
 
 =item B<--no-svn>
@@ -163,7 +163,7 @@ directory is not deleted.
 =item B<--no-rebuild-on-fail>
 
 Do not try to rebuild a module from scratch if it failed building.  Normally
-kdesvn-build will try progressively harder to build the module before giving
+tdesvn-build will try progressively harder to build the module before giving
 up.
 
 =item B<--build-system-only>
@@ -173,7 +173,7 @@ Create the build infrastructure, but don't actually perform the build.
 =item B<--install>
 
 Try to install the packages passed on the command line, or all packages in
-F<~/.kdesvn-buildrc> that don't have manual-build set. Building and
+F<~/.tdesvn-buildrc> that don't have manual-build set. Building and
 Subversion updates are not performed.
 
 =item B<--E<lt>optionE<gt>=>
@@ -182,15 +182,15 @@ Any unrecognized options are added to the global configuration, overriding
 any value that may exist.
 
 For example, B<--svn-server=http://path.to.svn.server/> would change the
-setting of the global B<svn-server> option for this instance of kdesvn-build.
+setting of the global B<svn-server> option for this instance of tdesvn-build.
 
 =item B<--E<lt>moduleE<gt>,E<lt>optionE<gt>=>
 
 Likewise, allow you to override any module specific option from the
 command line.
 
-Example: B<--kdelibs,use-unsermake=false> would disable unsermake for the
-kdelibs module.
+Example: B<--tdelibs,use-unsermake=false> would disable unsermake for the
+tdelibs module.
 
 =item B<--help>
 
@@ -210,18 +210,18 @@ Output the program version.
 
 =over
 
-=item B<kdesvn-build>
+=item B<tdesvn-build>
 
-=item B<kdesvn-build> I<--no-svn kdelibs>
+=item B<tdesvn-build> I<--no-svn tdelibs>
 
-=item B<kdesvn-bulid> I<--refresh-build> I<kdebase>
+=item B<tdesvn-bulid> I<--refresh-build> I<tdebase>
 
 =back
 
 =head1 BUGS
 
-Since kdesvn-build doesn't generally save information related to the build and
-prior settings, you may need to manually re-run kdesvn-build with a flag like
+Since tdesvn-build doesn't generally save information related to the build and
+prior settings, you may need to manually re-run tdesvn-build with a flag like
 B<--recreate-configure> if you change some options, including B<use-unsermake>.
 
 Please use KDE bugzilla at http://bugs.kde.org for information and
@@ -229,9 +229,9 @@ reporting bugs.
 
 =head1 SEE ALSO
 
-You can find additional information at B<kdesvn-build> home page,
-F<http://kdesvn-build.kde.org/>, or using kdesvn-build
-docbook documentation, using the help kioslave, F<help:/kdesvn-build>.
+You can find additional information at B<tdesvn-build> home page,
+F<http://tdesvn-build.kde.org/>, or using tdesvn-build
+docbook documentation, using the help kioslave, F<help:/tdesvn-build>.
 
 =head1 AUTHOR
 
@@ -243,13 +243,13 @@ Carlos Leonhard Woelz <carlos.woelz@kdemail.net>
 =cut
 
 # Script to handle building KDE from Subversion.  All of the configuration is
-# stored in the file ~/.kdesvn-buildrc.
+# stored in the file ~/.tdesvn-buildrc.
 #
 # Please also see the documentation that should be included with this program,
 # in doc.html
 #
 # Copyright (c) 2003, 2004, 2005 Michael Pyne. <michael.pyne@kdemail.net>
-# Home page: http://kdesvn-build.kde.org/
+# Home page: http://tdesvn-build.kde.org/
 #
 # You may use, alter, and redistribute this software under the terms
 # of the GNU General Public License, v2 (or any later version).
@@ -314,14 +314,14 @@ my %package_opts = (
     "override-url"        => "",
     "prefix"              => "", # Override installation prefix.
     "pretend"             => "",
-    "qtdir"               => "$ENV{HOME}/kdesvn/build/qt-copy",
+    "qtdir"               => "$ENV{HOME}/tdesvn/build/qt-copy",
     "reconfigure"         => "",
     "recreate-configure"  => "",
     "refresh-build"       => "",
     "remove-after-install"=> "none", # { none, builddir, all }
     "revision"            => 0,
     "set-env"             => { }, # Hash of environment vars to set
-    "source-dir"          => "$ENV{HOME}/kdesvn",
+    "source-dir"          => "$ENV{HOME}/tdesvn",
     "stop-on-failure"     => "",
     "svn-server"          => "svn://anonsvn.kde.org/home/kde",
     "tag"                 => "",
@@ -355,7 +355,7 @@ my %fail_lists = (
 my $install_flag; # True if we're in install mode.
 my $BUILD_ID;     # Used by logging subsystem to create a unique log dir.
 my $LOG_DATE;     # Used by logging subsystem to create logs in same dir.
-my @rcfiles = ("./kdesvn-buildrc", "$ENV{HOME}/.kdesvn-buildrc");
+my @rcfiles = ("./tdesvn-buildrc", "$ENV{HOME}/.tdesvn-buildrc");
 my $rcfile; # the file that was used; set by read_options
 
 # Colors
@@ -525,9 +525,9 @@ sub get_subdir_path
     }
     else
     {
-        # Relative directory, tack it on to the end of $kdesvn.
-        my $kdesvndir = get_kdesvn_dir();
-        $dir = "$kdesvndir/$dir";
+        # Relative directory, tack it on to the end of $tdesvn.
+        my $tdesvndir = get_tdesvn_dir();
+        $dir = "$tdesvndir/$dir";
     }
 
     return $dir;
@@ -550,7 +550,7 @@ sub get_dest_dir
 }
 
 # Convienience subroutine to get the source root dir.
-sub get_kdesvn_dir
+sub get_tdesvn_dir
 {
     return get_option ('global', 'source-dir');
 }
@@ -572,8 +572,8 @@ sub list_has(\@$)
 # The second parameter should be 'branches' if we're dealing with a branch or
 #     'tags' if we're dealing with a tag.
 #
-# Ex: 'kdelibs'  => 'branches/KDE'
-#     'kdevelop' => 'branches/kdevelop'
+# Ex: 'tdelibs'  => 'branches/KDE'
+#     'tdevelop' => 'branches/tdevelop'
 sub branch_prefix
 {
     my $module = shift;
@@ -583,10 +583,10 @@ sub branch_prefix
     my @tag_components = qw/arts koffice amarok kst qt taglib/;
 
     # The map call adds the kde prefix to the module names because I don't feel
-    # like typing them all in. kdevelop and konstruct are special cases.
+    # like typing them all in. tdevelop and konstruct are special cases.
     my @kde_module_list = ((map {'kde' . $_} qw/-i18n -common accessibility
             addons admin artwork base bindings edu games graphics libs
-            multimedia network nonbeta pim sdk toys utils webdev/), 'kdevelop',
+            multimedia network nonbeta pim sdk toys utils webdev/), 'tdevelop',
             'konstruct');
 
     # KDE proper modules seem to use this pattern.
@@ -623,7 +623,7 @@ sub handle_branch_tag_option
 }
 
 # Subroutine to return the appropriate SVN URL for a given module, based on
-# the user settings.  For example, 'kdelibs' -> https://svn.kde.org/home/kde/trunk/KDE/kdelibs
+# the user settings.  For example, 'tdelibs' -> https://svn.kde.org/home/kde/trunk/KDE/tdelibs
 sub svn_module_url
 {
     my $module = shift;
@@ -631,7 +631,7 @@ sub svn_module_url
     my $branch = get_option($module, 'module-base-path');
 
     # Allow user to override normal processing of the module in a few ways,
-    # to make it easier to still be able to use kdesvn-build even when I
+    # to make it easier to still be able to use tdesvn-build even when I
     # can't be there to manually update every little special case.
     if(get_option($module, 'override-url'))
     {
@@ -681,7 +681,7 @@ sub get_build_dir
     my $module = shift;
 
     # It is the responsibility of the caller to append $module!
-    return get_kdesvn_dir() if ($module eq 'qt-copy') and not get_option('qt-copy', 'use-qt-builddir-hack');
+    return get_tdesvn_dir() if ($module eq 'qt-copy') and not get_option('qt-copy', 'use-qt-builddir-hack');
     return get_subdir_path($module, 'build-dir');
 }
 
@@ -766,7 +766,7 @@ sub blacklisted
     my ($module, $option) = @_;
 
     # Known to not work.
-    my @unsermake_ban_list = qw/valgrind kde-common qt-copy kdebindings/;
+    my @unsermake_ban_list = qw/valgrind kde-common qt-copy tdebindings/;
 
     return list_has(@unsermake_ban_list, $module) if ($option eq 'use-unsermake');
     return 0;
@@ -876,18 +876,18 @@ sub has_base_module
 # NOTE: The return value is a hash. The key 'module' will return the final
 # module name, the key 'path' will return the full path to the module. The
 # key 'fullpath' will return their concatenation.
-# For example, with $module == 'KDE/kdelibs', and no change in the dest-dir
+# For example, with $module == 'KDE/tdelibs', and no change in the dest-dir
 # option, you'd get something like:
 # {
-#   'path'     => '/home/user/kdesvn/KDE',
-#   'module'   => 'kdelibs',
-#   'fullpath' => '/home/user/kdesvn/KDE/kdelibs'
+#   'path'     => '/home/user/tdesvn/KDE',
+#   'module'   => 'tdelibs',
+#   'fullpath' => '/home/user/tdesvn/KDE/tdelibs'
 # }
 # If dest-dir were changed to e.g. extragear-multimedia, you'd get:
 # {
-#   'path'     => '/home/user/kdesvn',
+#   'path'     => '/home/user/tdesvn',
 #   'module'   => 'extragear-multimedia',
-#   'fullpath' => '/home/user/kdesvn/extragear-multimedia'
+#   'fullpath' => '/home/user/tdesvn/extragear-multimedia'
 # }
 # First parameter is the module.
 # Second parameter is either source or build.
@@ -896,7 +896,7 @@ sub get_module_path_dir
     my $module = shift;
     my $type = shift;
     my $destdir = get_dest_dir($module);
-    my $srcbase = get_kdesvn_dir();
+    my $srcbase = get_tdesvn_dir();
     $srcbase = get_build_dir($module) if $type eq 'build';
 
     my $combined = "$srcbase/$destdir";
@@ -1031,10 +1031,10 @@ sub log_command
         my $result = $?;
         set_error_logfile($module, "$filename.log") if $result;
 
-        # If we are using the alias to a kdesvn-build function, it should have
+        # If we are using the alias to a tdesvn-build function, it should have
         # already printed the error message, so clear out errno (but still
         # return failure status).
-        if ($command[0] eq 'kdesvn-build')
+        if ($command[0] eq 'tdesvn-build')
         {
             $! = 0;
         }
@@ -1074,7 +1074,7 @@ sub log_command
         open (STDERR, ">&STDOUT") unless $command[0] eq 'svn';
 
         # Call internal function, name given by $command[1]
-        if($command[0] eq 'kdesvn-build')
+        if($command[0] eq 'tdesvn-build')
         {
             debug "Calling $command[1]";
 
@@ -1097,7 +1097,7 @@ sub log_command
 r[b[Unable to execute "$cmd_string"]!
 	$!
 
-Please check your binpath setting (it controls the PATH used by kdesvn-build).
+Please check your binpath setting (it controls the PATH used by tdesvn-build).
 Currently it is set to g[$ENV{PATH}].
 EOF
             # Don't use return, this is the child still!
@@ -1222,7 +1222,7 @@ sub run_make_command
 r[b[Unable to execute "$cmd_string"]!
 	$!
 
-Please check your binpath setting (it controls the PATH used by kdesvn-build).
+Please check your binpath setting (it controls the PATH used by tdesvn-build).
 Currently it is set to g[$ENV{PATH}].
 EOF
             # Don't return, we're still in the child!
@@ -1233,13 +1233,13 @@ EOF
 
 # Subroutine to determine if the given subdirectory of a module can actually be
 # built or not.  For instance, /admin can never be built, and the /kalyptus subdir
-# of kdebindings can't either.
+# of tdebindings can't either.
 sub is_subdir_buildable
 {
     my ($module, $dir) = @_;
 
     return 0 if $dir eq 'admin';
-    return 0 if $dir eq 'kalyptus' and $module eq 'kdebindings';
+    return 0 if $dir eq 'kalyptus' and $module eq 'tdebindings';
     return 1;
 }
 
@@ -1385,25 +1385,25 @@ sub setenv
 }
 
 # Display a message to the user regarding their relative lack of
-# ~/.kdesvn-buildrc, and point them to some help.  We will continue using a
+# ~/.tdesvn-buildrc, and point them to some help.  We will continue using a
 # default set of options.
 sub no_config_whine
 {
     my $searched = join("\n    ", @rcfiles);
-    my $homepage = "http://kdesvn-build.kde.org/";
+    my $homepage = "http://tdesvn-build.kde.org/";
 
     note <<"HOME";
 Unable to open configuration file!
 We looked for:
     $searched
 
-kdesvn-build will continue using a default set of options.  These options may
-not apply to you, so feel free to visit the kdesvn-build homepage
+tdesvn-build will continue using a default set of options.  These options may
+not apply to you, so feel free to visit the tdesvn-build homepage
 
 b[g[$homepage]
 
 and use the configuration file generator to guide you through the process of
-creating a config file to customize your kdesvn-build process.
+creating a config file to customize your tdesvn-build process.
 
 HOME
 }
@@ -1412,9 +1412,9 @@ HOME
 # update and build lists to build a default set of modules.
 sub setup_default_modules()
 {
-    @update_list = qw(qt-copy arts tdesupport kdelibs kdebase kdeartwork
-                      kdemultimedia tdepim kdeutils kdegraphics tdegames
-                      kdetoys kdeedu kdeaddons);
+    @update_list = qw(qt-copy arts tdesupport tdelibs tdebase tdeartwork
+                      tdemultimedia tdepim tdeutils tdegraphics tdegames
+                      tdetoys tdeedu tdeaddons);
     @build_list = @update_list;
 
     for my $i (@update_list) {
@@ -1562,7 +1562,7 @@ EOM
         s/#.*$//;       # Remove comments
         next if (/^\s*$/); # Skip blank lines
 
-        # First command in .kdesvn-buildrc should be a global
+        # First command in .tdesvn-buildrc should be a global
         # options declaration, even if none are defined.
         if (not /^global\s*$/)
         {
@@ -1635,13 +1635,13 @@ EOM
 }
 
 # Subroutine to check if the given module needs special treatment to support
-# srcdir != builddir.  If this function returns true kdesvn-build will use a
+# srcdir != builddir.  If this function returns true tdesvn-build will use a
 # few hacks to simulate it, and will update e.g. configure paths appropriately
 # as well.
 sub module_needs_builddir_help
 {
     my $module = shift;
-    my @module_help_list = qw/qt-copy kdebindings valgrind/;
+    my @module_help_list = qw/qt-copy tdebindings valgrind/;
 
     # qt-copy special case to support use-qt-builddir-hack.
     if ($module eq 'qt-copy' and not get_option('qt-copy', 'use-qt-builddir-hack'))
@@ -1856,7 +1856,7 @@ sub set_option
 sub process_arguments
 {
     my $arg;
-    my $version = "kdesvn-build 0.97.6 (KDE 3.5 Edition)";
+    my $version = "tdesvn-build 0.97.6 (KDE 3.5 Edition)";
     my $author = <<DONE;
 $version was written (mostly) by:
   Michael Pyne <michael.pyne\@kdemail.net>
@@ -1880,27 +1880,27 @@ $version
 This script automates the download, build, and install process for KDE (using
 Subversion).
 
-It is recommended that you first setup a .kdesvn-buildrc file in your home
-directory.  Please visit http://kdesvn-build.kde.org/ for
+It is recommended that you first setup a .tdesvn-buildrc file in your home
+directory.  Please visit http://tdesvn-build.kde.org/ for
 information on how to write the file, or consult the sample file which should
-have been included with this program.  If you don't setup a .kdesvn-buildrc,
+have been included with this program.  If you don't setup a .tdesvn-buildrc,
 a default set of options will be used, which a few modules to be built by
 default.
 
-After setting up .kdesvn-buildrc, you can run this program from either the
+After setting up .tdesvn-buildrc, you can run this program from either the
 command-line or from cron.  It will automatically download the modules from
 Subversion, create the build system, and configure and make the modules you
 tell it to.  If you\'d like, you can use this program to install KDE as well,
-if you\'re building KDE for a single user.  Note that kdesvn-build will try
+if you\'re building KDE for a single user.  Note that tdesvn-build will try
 by default to install the modules.
 
-Basic synopsis, after setting up .kdesvn-buildrc:
-\$ kdesvn-build [package names] (Download, build, and install KDE)
+Basic synopsis, after setting up .tdesvn-buildrc:
+\$ tdesvn-build [package names] (Download, build, and install KDE)
 
 If you don\'t specify any particular package names, then your settings
-in .kdesvn-buildrc will be used.  If you DO specify a package name, then
+in .tdesvn-buildrc will be used.  If you DO specify a package name, then
 your settings will still be read, but the script will try to build/install
-the package regardless of .kdesvn-buildrc
+the package regardless of .tdesvn-buildrc
 
 Copyright (c) 2003, 2004, 2005 $author
 The script is distributed under the terms of the GNU General Public License
@@ -1919,7 +1919,7 @@ Options:
                          or create/delete files and directories.  Instead,
                          output what the script would have done.
     --quiet (or -q)      Be less descriptive of the build process, without
-                         printing each little substep kdesvn-build is
+                         printing each little substep tdesvn-build is
                          performing.
     --really-quiet       Only warnings and errors will be displayed.
     --verbose (or -v)    Be *very* descriptive of the build process.  Only
@@ -1953,7 +1953,7 @@ Options:
     --build-system-only  Create the build infrastructure, but don't actually
                          perform the build.
     --install            Try to install the packages passed on the command
-                         line, or all packages in ~/.kdesvn-buildrc that don't
+                         line, or all packages in ~/.tdesvn-buildrc that don't
                          have manual-build set.  Building and Subversion
                          updates are not performed.
 
@@ -1967,7 +1967,7 @@ Options:
     --version            Output the program version.
 
 You can get more help by reading the included HTML documentation, or going
-online to http://kdesvn-build.kde.org/
+online to http://tdesvn-build.kde.org/
 DONE
                 # We haven't done any locking... no need to finish()
                 #  Avoids log-dir errors due to having not performed.
@@ -2230,7 +2230,7 @@ DONE
 # handling separate tasks.
 sub get_lock
 {
-    my $lockfile = "$ENV{HOME}/.kdesvn-lock";
+    my $lockfile = "$ENV{HOME}/.tdesvn-lock";
     sysopen LOCKFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL;
     my $errorCode = $!; # Save for later testing.
 
@@ -2263,15 +2263,15 @@ sub get_lock
 
         if($pid)
         {
-            # Recent kdesvn-build; we wrote a PID in there.
+            # Recent tdesvn-build; we wrote a PID in there.
             chomp $pid;
 
             # See if something's running with this PID.
             if (kill(0, $pid) == 1)
             {
-                # Something *is* running, likely kdesvn-build.  Don't use error,
+                # Something *is* running, likely tdesvn-build.  Don't use error,
                 # it'll scan for $!
-                print clr " r[*y[*r[*] kdesvn-build appears to be running.  Do you want to:\n";
+                print clr " r[*y[*r[*] tdesvn-build appears to be running.  Do you want to:\n";
                 print clr "  (b[Q])uit, (b[P])roceed anyways?: ";
 
                 my $choice = <STDIN>;
@@ -2279,13 +2279,13 @@ sub get_lock
 
                 if(lc $choice ne 'p')
                 {
-                    print clr " y[*] kdesvn-build run canceled.\n";
+                    print clr " y[*] tdesvn-build run canceled.\n";
                     exit 1;
                 }
 
                 # We still can't grab the lockfile, let's just hope things
                 # work out.
-                print clr " y[*] kdesvn-build run in progress by user request.\n";
+                print clr " y[*] tdesvn-build run in progress by user request.\n";
                 return 1;
             }
 
@@ -2296,7 +2296,7 @@ sub get_lock
 
         # No pid found, optimistically assume the user isn't running
         # twice.
-        warning " y[WARNING]: stale kdesvn-build lockfile found, deleting.";
+        warning " y[WARNING]: stale tdesvn-build lockfile found, deleting.";
         unlink $lockfile;
         sysopen LOCKFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL and do
         {
@@ -2311,14 +2311,14 @@ sub get_lock
 
     # Even if we fail it's generally better to allow the script to proceed
     # without being a jerk about things, especially as more non-CLI-skilled
-    # users start using kdesvn-build to build KDE.
+    # users start using tdesvn-build to build KDE.
     return 1;
 }
 
 # Subroutine to free the lock allocated by get_lock()
 sub close_lock
 {
-    my $lockfile = "$ENV{HOME}/.kdesvn-lock";
+    my $lockfile = "$ENV{HOME}/.tdesvn-lock";
 
     close LOCKFILE;
     unlink $lockfile;
@@ -2677,7 +2677,7 @@ EOF
         if ($result) # Run this code for both death-by-signal and nonzero return
         {
             print "\nUnable to add SSH identity, aborting.\n";
-            print "If you don't want kdesvn-build to check in the future,\n";
+            print "If you don't want tdesvn-build to check in the future,\n";
             print clr "Set the g[disable-agent-check] option to g[true] in your $rcfile.\n\n";
 
             return 0;
@@ -2696,7 +2696,7 @@ EOF
 sub handle_updates
 {
     my $update_ref = shift;
-    my $kdesvn = get_kdesvn_dir();
+    my $tdesvn = get_tdesvn_dir();
     my $svnroot = get_option ('global', 'svn-server');
     my $result = 0;
     my $module;
@@ -2710,12 +2710,12 @@ sub handle_updates
     note "<<<  Updating Subversion Directories  >>>";
     info " "; # Add newline for aesthetics unless in quiet mode.
 
-    if (not -e $kdesvn)
+    if (not -e $tdesvn)
     {
         whisper "KDE Subversion download directory doesn't exist, creating.\n";
-        if (not super_mkdir ($kdesvn))
+        if (not super_mkdir ($tdesvn))
         {
-            error "Unable to make directory r[$kdesvn]!";
+            error "Unable to make directory r[$tdesvn]!";
             @build_list = (); # Clear out the build list, since we can't build.
             $install_flag = 0; # Can't install either.
             return 1;
@@ -3024,18 +3024,18 @@ sub prepare_fake_builddir
     my $builddir = get_fullpath($module, 'build');
     my $srcdir = get_fullpath($module, 'source');
 
-    # List reference, not a real list.  The initial kdesvn-build does *NOT*
-    # fork another kdesvn-build using exec, see sub log_command() for more
+    # List reference, not a real list.  The initial tdesvn-build does *NOT*
+    # fork another tdesvn-build using exec, see sub log_command() for more
     # info.
-    my $args = [ 'kdesvn-build', 'safe_lndir', $srcdir, $builddir ];
+    my $args = [ 'tdesvn-build', 'safe_lndir', $srcdir, $builddir ];
 
     # Skip modules that don't need special treatment.
     return 1 unless module_needs_builddir_help($module);
 
     # Backwards compatibility hack.
-    # kdesvn-build 0.97 and earlier would physically copy the Qt source
-    # directory to the build directory.  kdesvn-build versions after that use
-    # the lndir program that is used for kdebindings and valgrind for
+    # tdesvn-build 0.97 and earlier would physically copy the Qt source
+    # directory to the build directory.  tdesvn-build versions after that use
+    # the lndir program that is used for tdebindings and valgrind for
     # portability reasons.  This will break for users who have a real copy of
     # Qt, so check here if the qt-copy configure script file is a real file
     # (not a symlink), and if so, use the old method (since presumably it
@@ -3673,7 +3673,7 @@ EOF
 # If the packages are not already checked-out and/or updated, this
 # subroutine WILL NOT do so for you.
 #
-# This subroutine assumes that the $kdesvn directory has already been
+# This subroutine assumes that the $tdesvn directory has already been
 # set up.  It will create $builddir if it doesn't already exist.
 #
 # If $builddir/$module/.refresh-me exists, the subroutine will
@@ -3684,7 +3684,7 @@ sub handle_build
 {
     my @build_done;
     my $build_ref = shift;
-    my $kdesvn = get_kdesvn_dir();
+    my $tdesvn = get_tdesvn_dir();
     my $svnroot = get_option ('global', 'svn-server');
     my $module;
     my @modules = grep (!/^(KDE\/)?kde-common$/, @{$build_ref});
@@ -3770,7 +3770,7 @@ EOF
     if (not pretending)
     {
         # Print out results, and output to a file
-        open BUILT_LIST, ">$kdesvn/successfully-built";
+        open BUILT_LIST, ">$tdesvn/successfully-built";
         foreach $module (@build_done)
         {
             info "$module";
@@ -3837,7 +3837,7 @@ sub check_module_validity
  y[!!] g[$module] seems to be checked out from somewhere other than expected.
  y[!!]
 
-kdesvn-build expects:        y[$module_expected_url]
+tdesvn-build expects:        y[$module_expected_url]
 The module is actually from: y[$module_actual_url]
 
 If the module location is incorrect, you can fix it by either deleting the
@@ -4123,7 +4123,7 @@ sub email_error_report
 
     # Initial e-mail header.
     my $email_body = <<EOF;
-The following errors were detected in the kdesvn-build run just completed.
+The following errors were detected in the tdesvn-build run just completed.
 
 EOF
 
@@ -4172,10 +4172,10 @@ EOF
 # configuration file will still override these settings.
 sub setup_trinity5_hack
 {
-    my @branched_modules = qw/kde-common kdeaccessibility kdeaddons kdeadmin
-        kdeartwork kdebase kdebindings kdeedu tdegames kdegraphics kdelibs
-        kdemultimedia kdenetwork tdepim kdesdk kdetoys kdeutils kdevelop
-        kdewebdev/;
+    my @branched_modules = qw/kde-common tdeaccessibility tdeaddons tdeadmin
+        tdeartwork tdebase tdebindings tdeedu tdegames tdegraphics tdelibs
+        tdemultimedia tdenetwork tdepim tdesdk tdetoys tdeutils tdevelop
+        tdewebdev/;
 
     # arts uses a different versioning scheme.
     set_option('arts', 'branch', '1.5');
@@ -4215,7 +4215,7 @@ if ($@)
     # We encountered an error.
     print "Encountered an error in the execution of the script.\n";
     print "The error reported was $@\n";
-    print "Please submit a bug against kdesvn-build on http://bugs.kde.org/\n";
+    print "Please submit a bug against tdesvn-build on http://bugs.kde.org/\n";
 
     # Don't finish, because we haven't attained the lock yet.
     exit 99;
@@ -4242,7 +4242,7 @@ eval
 
     # Do some necessary adjusting. Right now this is used for supporting
     # the command-line option shortcut to where you can enter e.g.
-    # kdelibs/khtml, and the script will only try to update that part of
+    # tdelibs/khtml, and the script will only try to update that part of
     # the module.
     munge_lists();
 
@@ -4276,7 +4276,7 @@ if ($@)
     # We encountered an error.
     print "Encountered an error in the execution of the script.\n";
     print "The error reported was $@\n";
-    print "Please submit a bug against kdesvn-build on http://bugs.kde.org/\n";
+    print "Please submit a bug against tdesvn-build on http://bugs.kde.org/\n";
 
     $result = 99;
 }
diff --git a/scripts/kdesvn-buildrc-sample b/scripts/kdesvn-buildrc-sample
index 4e2a2c30..2d8b9bac 100644
--- a/scripts/kdesvn-buildrc-sample
+++ b/scripts/kdesvn-buildrc-sample
@@ -1,6 +1,6 @@
-# Sample configuration file for kdesvn-build. (Applies to KDE 3.5)
+# Sample configuration file for tdesvn-build. (Applies to KDE 3.5)
 #
-# To use this sample configuration file, copy it to ~/.kdesvn-buildrc, and then
+# To use this sample configuration file, copy it to ~/.tdesvn-buildrc, and then
 # edit it to suit your desires.
 
 # Global settings go in this section.  They apply to every module unless
@@ -15,11 +15,11 @@ global
 
 # This is the directory that your KDE sources are downloaded to.  This
 # directory also holds the build and log directories by default.
-#	source-dir ~/kdesvn
+#	source-dir ~/tdesvn
 
 # This is the Qt installation to use to build KDE.  The default is qt-copy
 # from Subversion.
-	qtdir ~/kdesvn/build/qt-copy
+	qtdir ~/tdesvn/build/qt-copy
 
 # You might want to use your system's built-in Qt already (3.3 or greater, not
 # 4.x).  If so, assign the qtdir option appropriately.
@@ -109,8 +109,8 @@ end module
 module tdesupport
 end module
 
-# kdelibs are the base KDE libraries needed by all KDE applications.
-module kdelibs
+# tdelibs are the base KDE libraries needed by all KDE applications.
+module tdelibs
 	configure-flags --enable-sendfile --enable-mitshm
 
 # If you're a programmer you may want to build the API docs.  Note that
@@ -118,40 +118,40 @@ module kdelibs
 #	apidox true
 end module
 
-# kdebase contains useful general-purpose programs, normally people would
+# tdebase contains useful general-purpose programs, normally people would
 # expect a usable desktop to have these.
-module kdebase
+module tdebase
 	configure-flags --with-pam --with-shadow
 end module
 
-# kdemultimedia contains JuK, noatun, Kaboodle, and other KDE multimedia
+# tdemultimedia contains JuK, noatun, Kaboodle, and other KDE multimedia
 # applications.  It does not include amarok, which is in extragear/multimedia
-module kdemultimedia
+module tdemultimedia
 end module
 
-# kdesdk is a useful module for software developers.  It is where kdesvn-build
+# tdesdk is a useful module for software developers.  It is where tdesvn-build
 # is developed.
-module kdesdk
+module tdesdk
 end module
 
-# kdenetwork has Kopete and other useful applications for the Internet and
+# tdenetwork has Kopete and other useful applications for the Internet and
 # other networks.
-module kdenetwork
+module tdenetwork
 end module
 
-# kdeadmin has system administration tools for your computer.
-module kdeadmin
+# tdeadmin has system administration tools for your computer.
+module tdeadmin
     configure-flags --with-shadow --with-pam=yes
 end module
 
-# kdebindings is useful for software developers, and for those who wish to run
+# tdebindings is useful for software developers, and for those who wish to run
 # some KDE programs that don't use C++.  The python bindings are not included
 # by default as they never build for me.  If you'd like to build all the
 # bindings, comment out the checkout-only option below.
-module kdebindings
+module tdebindings
     checkout-only admin dcopc kalyptus smoke qtruby korundum kjsembed dcoppython
 
-#   kdebindings will probably need to use the following option to install
+#   tdebindings will probably need to use the following option to install
 #   successfully.  You must configure the sudo program first to allow for
 #   passwordless operation.
 #   make-install-prefix sudo
@@ -164,21 +164,21 @@ module tdepim
     configure-flags --disable-exchange
 end module
 
-# kdeutils has miscellaneous programs which can be useful.  You probably won't
+# tdeutils has miscellaneous programs which can be useful.  You probably won't
 # die if you remove this from the config file though.
-module kdeutils
+module tdeutils
 end module
 
-# kdegraphics contains various programs useful for graphics editing.  It
+# tdegraphics contains various programs useful for graphics editing.  It
 # doesn't include Krita, which is part of KOffice, but it is worth it just for
 # KolourPaint.
-module kdegraphics
+module tdegraphics
 end module
 
-# kdeaddons are nifty additions to some programs in other KDE modules.  For
+# tdeaddons are nifty additions to some programs in other KDE modules.  For
 # example, there are addons for Konqueror, extra Kicker applets, and Noatun
 # plugins.
-module kdeaddons
+module tdeaddons
 end module
 
 # ... Well, they're games. ;)
@@ -187,12 +187,12 @@ module tdegames
 end module
 
 # Contains nifty diversions of time, which generally aren't games.
-module kdetoys
+module tdetoys
 end module
 
 # Educational programs.  Some are actually quite fun even if you're not trying
 # to learn anything.
-module kdeedu
+module tdeedu
 end module
 
 # The KDE Office Suite.  Includes a pretty expansive collection of programs.
@@ -205,12 +205,12 @@ end module
 # The KDevelop IDE, useful for developing all kinds of programs.  If you don't
 # plan on being a software developer you can save time by removing this from
 # your configuration.
-module kdevelop
+module tdevelop
 	use-unsermake false
 end module
 
 # Includes Quanta Plus and other web design tools.
-module kdewebdev
+module tdewebdev
 end module
 
 # Modules in extragear and playground can also be added.
@@ -221,7 +221,7 @@ end module
 # Includes various libraries needed by other applications in extragear.
 module extragear/libs
 
-# If you don't like the default name that kdesvn-build gives modules on-disk,
+# If you don't like the default name that tdesvn-build gives modules on-disk,
 # you can use dest-dir to change it.
 #	dest-dir extragear-libs
 end module
diff --git a/scripts/kdesvn-buildrc.xml b/scripts/kdesvn-buildrc.xml
index 08607889..d6b915b1 100644
--- a/scripts/kdesvn-buildrc.xml
+++ b/scripts/kdesvn-buildrc.xml
@@ -3,7 +3,7 @@
 <!-- This goes into $KDEDIR/share/apps/katepart/syntax, or
      it can go to $KDEHOME/share/apps/katepart/syntax
  -->
-<language name="kdesvn-buildrc" version="0.2" kateversion="2.4" section="Configuration" extensions=".kdesvn-buildrc;kdesvn-buildrc" author="Michael Pyne &lt;michael.pyne@kdemail.net&gt;" license="LGPL">
+<language name="tdesvn-buildrc" version="0.2" kateversion="2.4" section="Configuration" extensions=".tdesvn-buildrc;tdesvn-buildrc" author="Michael Pyne &lt;michael.pyne@kdemail.net&gt;" license="LGPL">
 
   <highlighting>
     <list name="bools">
@@ -96,7 +96,7 @@
 	<RegExpr attribute="Module Declaration" context="Module" endRegion="Module Options" String="end module" firstNonSpace="true"/>
 	<RegExpr attribute="Module Declaration" context="Module" endRegion="Global Options" String="end global" firstNonSpace="true"/>
 
-	<!-- No kdesvn-build options start with digits or a dash. -->
+	<!-- No tdesvn-build options start with digits or a dash. -->
 	<RegExpr attribute="Possible Error" context="Option Value" String="[0-9-][a-zA-Z0-9-]+" />
 	<RegExpr attribute="Unknown Option Name" context="Option Value" String="[a-zA-Z0-9-]+" />
       </context>
diff --git a/scripts/noncvslist b/scripts/noncvslist
index 69f5a591..5b118a36 100755
--- a/scripts/noncvslist
+++ b/scripts/noncvslist
@@ -115,10 +115,10 @@ new un-added sources files etc. It is a useful housekeeping tool.
 
 =head1 EXAMPLES
 
-Assuming baseline/ has kdelibs/ and kdebase/ checked out within it:
+Assuming baseline/ has tdelibs/ and tdebase/ checked out within it:
 
-	cd baseline/kdelibs; noncvslist
-	cd baseline; noncvslist kdelibs kdebase
+	cd baseline/tdelibs; noncvslist
+	cd baseline; noncvslist tdelibs tdebase
 
 =head1 AUTHOR
 
diff --git a/scripts/package_crystalsvg b/scripts/package_crystalsvg
index 1502da20..e9d230d9 100755
--- a/scripts/package_crystalsvg
+++ b/scripts/package_crystalsvg
@@ -22,7 +22,7 @@ echo -n "Starting up..."
 # KDE modules, searches them for SVG files and packages them up in a tarball, 
 # all the files in the toplevel, together with this script and a list of the files(FILES) 
 # telling what KDE modules/path the svg files were copied from.
-# This script is shipped with the kdesdk package.
+# This script is shipped with the tdesdk package.
 #
 # Author: Frans Englich <frans.englich@telia.com>
 
@@ -45,7 +45,7 @@ NICE=15 # Low..
 
 
 # Path to the LICENSE file
-LICENSE="$SEARCH_DIR"/kdelibs/pics/LICENSE.crystalsvg
+LICENSE="$SEARCH_DIR"/tdelibs/pics/LICENSE.crystalsvg
 
 
 # You shouldn't need to edit anything below.
@@ -109,13 +109,13 @@ These are the Crystal SVG vector sources from KDE CVS.
 LOCATION
 The "FILES" file gives information about the location they come from.
 
-Most come from: kdelibs/pics/crystalsvg  You can visit this cvs directory using webcvs:
-http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdelibs/pics/crystalsvg
+Most come from: tdelibs/pics/crystalsvg  You can visit this cvs directory using webcvs:
+http://webcvs.kde.org/cgi-bin/cvsweb.cgi/tdelibs/pics/crystalsvg
 Due to the naming the SVGs are at the end of the list.
 
 They are in the form of .svgz, which can be renamed to svg.gz and opened with gzip -d *.svg.gz
 
-Application icons may also be found with the application sources:  /<kde_app_suite>/<kde_app_name>/pics e.g. /kdebase/konqueror/pics or /kdeedu/kmplot/pics
+Application icons may also be found with the application sources:  /<kde_app_suite>/<kde_app_name>/pics e.g. /tdebase/konqueror/pics or /tdeedu/kmplot/pics
 
 The package_svg_files script collected the sources automatically.
 
diff --git a/scripts/svn2dist b/scripts/svn2dist
index c59c5ab5..7edefc84 100755
--- a/scripts/svn2dist
+++ b/scripts/svn2dist
@@ -331,7 +331,7 @@ modulename=`echo $modulename | sed -e 's#^.*/##'`
 
 remove="$remove $modulename.lsm"
 
-# we check out kde-i18n/subdirs in temp_dir/kde-i18n..
+# we check out tde-i18n/subdirs in temp_dir/tde-i18n..
 if [ $doi18n = "yes" ]; then
     pushd $temp_dir
     echo "Getting i18n subdirs" >> $log
diff --git a/umbrello/INSTALL b/umbrello/INSTALL
index 22f48d78..dbd22b3e 100644
--- a/umbrello/INSTALL
+++ b/umbrello/INSTALL
@@ -2,7 +2,7 @@ You need to be the parent directory to configure the compile,
 depending on where you got the source you may need to do the extra KDE
 step of Makefile.cvs.
 
-cd kdesdk
+cd tdesdk
 make -f Makefile.cvs
 ./configure --prefix=`kde-config --prefix`
 cd umbrello
diff --git a/umbrello/Makefile.am b/umbrello/Makefile.am
index f99bedf2..374ebc20 100644
--- a/umbrello/Makefile.am
+++ b/umbrello/Makefile.am
@@ -1,8 +1,8 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 
 SUBDIRS = umbrello
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 # not a GNU package. You can remove this line, if 
 # have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = foreign 
diff --git a/umbrello/make-umbrello-release.sh b/umbrello/make-umbrello-release.sh
index 84429ad0..812291f0 100755
--- a/umbrello/make-umbrello-release.sh
+++ b/umbrello/make-umbrello-release.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Make a release from the current branches/KDE/3.5/kdesdk/umbrello
+# Make a release from the current branches/KDE/3.5/tdesdk/umbrello
 #
 # Run this script as follows:
 #   . make-umbrello-release.sh [BRANCH_VERSION]
@@ -8,7 +8,7 @@
 # @todo Create release from trunk if BRANCH_VERSION not given.
 #       Note: trunk uses the cmake based build process.
 #
-# The script creates a directory, /tmp/kdesdk, which is used
+# The script creates a directory, /tmp/tdesdk, which is used
 # as the work area for building the release.
 # The release tarfile will be placed in the current working dir.
 # The release version is taken from the VERSION file.
@@ -22,12 +22,12 @@ version=`grep "^[1-9]" VERSION`
 udir=umbrello-$version
 svnroot=svn://anonsvn.kde.org:/home/kde/branches/KDE/$branchver
 cd /tmp
-svn co -N $svnroot/kdesdk
-cd kdesdk
-svn co $svnroot/kdesdk/umbrello $udir
+svn co -N $svnroot/tdesdk
+cd tdesdk
+svn co $svnroot/tdesdk/umbrello $udir
 svn co $svnroot/kde-common/admin $udir/admin
-svn co -N $svnroot/kdesdk/doc $udir/doc
-svn co    $svnroot/kdesdk/doc/umbrello $udir/doc/umbrello
+svn co -N $svnroot/tdesdk/doc $udir/doc
+svn co    $svnroot/tdesdk/doc/umbrello $udir/doc/umbrello
 cp -p Makefile.cvs $udir/
 cd $udir
 mv configure.in.in configure.in.in.orig
@@ -39,19 +39,19 @@ cat configure.in.in.orig                          >> configure.in.in
 rm configure.in.in.orig
 perl -p -e 's@umbrello/VERSION@VERSION@g' -i `find umbrello -name Makefile.am`
 cd /tmp
-log=/tmp/kdesdk/svn2dist.log
-$origdir/../scripts/svn2dist kdesdk $udir -n umbrello --admin-dir kdesdk/$udir/admin \
+log=/tmp/tdesdk/svn2dist.log
+$origdir/../scripts/svn2dist tdesdk $udir -n umbrello --admin-dir tdesdk/$udir/admin \
          --svn-root svn://anonsvn.kde.org/home/kde/branches/stable --log=$log -o
-mv umbrello/po kdesdk/$udir/
+mv umbrello/po tdesdk/$udir/
 rm -rf umbrello
-cd kdesdk/$udir
+cd tdesdk/$udir
 make -f Makefile.cvs
 cd ..
 tarfile=${udir}.tar.bz2
 tar cfvj $tarfile --exclude=.svn --exclude=autom4te.cache $udir
 mv $tarfile $origdir/
 cd $origdir
-# rm -rf /tmp/kdesdk
+# rm -rf /tmp/tdesdk
 
 echo upload $tarfile to upload.sf.net
 echo wput $tarfile ftp://upload.sf.net/incoming/
diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp
index 4acfb2b5..9cac6c3a 100644
--- a/umbrello/umbrello/codegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerationpolicy.cpp
@@ -28,7 +28,7 @@
 
 // kde includes
 #include <kconfig.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/README b/umbrello/umbrello/codeimport/kdevcppparser/README
index 3ed39eba..8d81c89f 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/README
+++ b/umbrello/umbrello/codeimport/kdevcppparser/README
@@ -1,16 +1,16 @@
 This directory contains the C++ parser from Kdevelop-3.0.
 
-Following files are copies from the directory kdevelop/lib/cppparser:
+Following files are copies from the directory tdevelop/lib/cppparser:
  ast.{h,cpp} driver.{h,cpp} errors.{h,cpp} keywords.lut.h lexer.{h,cpp}
  lookup.{h,cpp} parser.{h,cpp} tree_parser.{h,cpp}
 
-Following files are copies from the directory kdevelop/languages/cpp:
+Following files are copies from the directory tdevelop/languages/cpp:
  ast_utils.{h,cpp}
 
-Following files are copies from the directory kdevelop/lib/util:
+Following files are copies from the directory tdevelop/lib/util:
  urlutil.{h,cpp}
 
-The source files cpptree2uml.{h,cpp} are based on kdevelop/languages/cpp/
+The source files cpptree2uml.{h,cpp} are based on tdevelop/languages/cpp/
 store_walker.{h,cpp}.  The class CppTree2Uml inherits from class TreeParser
 and overrides certain methods from that class.
 
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
index e273aeb7..ebb10af4 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
@@ -1,5 +1,5 @@
 /* This file is part of KDevelop
-    Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
+    Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
index 0d6a4759..49520e33 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
@@ -1,5 +1,5 @@
 /* This file is part of KDevelop
-    Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
+    Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
index 9d070334..ee6937ac 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2002 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                 *
+ *   roberto@tdevelop.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h
index 1f6209db..f84f7249 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2002 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                 *
+ *   roberto@tdevelop.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp
index 8bb7167a..4bc15f65 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Based on kdevelop-3.0 languages/cpp/store_walker.cpp by Roberto Raggi *
+ *   Based on tdevelop-3.0 languages/cpp/store_walker.cpp by Roberto Raggi *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp
index c1db8656..d3c8a1df 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp
@@ -1,5 +1,5 @@
 /* This file is part of KDevelop
-    Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
+    Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.h b/umbrello/umbrello/codeimport/kdevcppparser/driver.h
index 9c365129..a349b7c8 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/driver.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.h
@@ -1,5 +1,5 @@
 /* This file is part of KDevelop
-    Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
+    Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp b/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp
index 9a18ddd6..e3cb19e5 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp
@@ -1,5 +1,5 @@
 /* This file is part of KDevelop
-    Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
+    Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/errors.h b/umbrello/umbrello/codeimport/kdevcppparser/errors.h
index 6751475e..e0959250 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/errors.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/errors.h
@@ -1,5 +1,5 @@
 /* This file is part of KDevelop
-    Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
+    Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h b/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h
index 1969fdb7..e733a254 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h
@@ -1,4 +1,4 @@
-/* Automatically generated from keywords.table using /home/roberto/src/kdelibs/kjs/create_hash_table. DO NOT EDIT ! */
+/* Automatically generated from keywords.table using /home/roberto/src/tdelibs/kjs/create_hash_table. DO NOT EDIT ! */
 
 
 static const struct HashEntry keywordEntries[] = {
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
index f51c9986..f91813f1 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
@@ -1,5 +1,5 @@
 /* This file is part of KDevelop
-    Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
+    Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h
index 3b26fb0c..0e15f053 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h
@@ -1,5 +1,5 @@
 /* This file is part of KDevelop
-    Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
+    Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
index 87b5b546..a05a7ddf 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-// adapted to kdevelop by Roberto Raggi <roberto@kdevelop.org>
+// adapted to tdevelop by Roberto Raggi <roberto@tdevelop.org>
 
 #include "lookup.h"
 
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.h b/umbrello/umbrello/codeimport/kdevcppparser/lookup.h
index b2bad4de..615d8a00 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.h
@@ -19,7 +19,7 @@
  *
  */
 
-// adapted to kdevelop by Roberto Raggi <roberto@kdevelop.org>
+// adapted to tdevelop by Roberto Raggi <roberto@tdevelop.org>
 
 #ifndef _KJSLOOKUP_H_
 #define _KJSLOOKUP_H_
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
index 066ff36b..51837b1e 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
@@ -1,5 +1,5 @@
 /* This file is part of KDevelop
-    Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
+    Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.h b/umbrello/umbrello/codeimport/kdevcppparser/parser.h
index 9be954c2..930a563f 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/parser.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.h
@@ -1,5 +1,5 @@
 /* This file is part of KDevelop
-    Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
+    Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp
index 454c4b99..d419336e 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp
@@ -1,5 +1,5 @@
 /* This file is part of KDevelop
-    Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
+    Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h b/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h
index 5377358b..66fc05ef 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h
@@ -1,5 +1,5 @@
 /* This file is part of KDevelop
-    Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
+    Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
index 92886e07..8b8cc8eb 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
@@ -30,7 +30,7 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if (TDE_VERSION_MINOR==0) && (TDE_VERSION_MAJOR==3)
 #include <kdevkurl.h>
 #endif
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h
index 2d05b162..8f761791 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h
@@ -77,10 +77,10 @@ namespace URLUtil
   * If baseDirUrl == url.path() then it will return ".".
   * <code>
   * KURL baseUrl, dirUrl;
-  * baseUrl.setPath( "/home/mario/src/kdevelop/" );
-  * dirUrl.setPath( "/home/mario/src/kdevelop/parts/cvs/" );
+  * baseUrl.setPath( "/home/mario/src/tdevelop/" );
+  * dirUrl.setPath( "/home/mario/src/tdevelop/parts/cvs/" );
   * TQString relPathName = extractDirPathRelative( baseUrl, url ); // == "parts/cvs/"
-  * TQString absPathName = extractDirPathAbsolute( url ); // == "/home/mario/src/kdevelop/parts/cvs/"
+  * TQString absPathName = extractDirPathAbsolute( url ); // == "/home/mario/src/tdevelop/parts/cvs/"
   * </code>
   * Note that if you pass a file name in @p url (instead of a directory) or the @p baseUrl is not contained
   * in @p url then the function will return "" (void string).
diff --git a/umbrello/umbrello/docgenerators/xmi2docbook.sh b/umbrello/umbrello/docgenerators/xmi2docbook.sh
index 865ebb6f..3385c12d 100644
--- a/umbrello/umbrello/docgenerators/xmi2docbook.sh
+++ b/umbrello/umbrello/docgenerators/xmi2docbook.sh
@@ -1,9 +1,9 @@
 #! /bin/bash
 
 echo Converting from XMI to docbook...
-java -cp /usr/share/java/xalan-j2-2.6.0.jar org.apache.xalan.xslt.Process -xml -in $1.xmi -xsl /home/gael/Logiciels/trinity.5-svn/kdesdk/umbrello.withdocgen/umbrello/docgenerators/xmi2docbook.xsl -out $1.docbook 
+java -cp /usr/share/java/xalan-j2-2.6.0.jar org.apache.xalan.xslt.Process -xml -in $1.xmi -xsl /home/gael/Logiciels/trinity.5-svn/tdesdk/umbrello.withdocgen/umbrello/docgenerators/xmi2docbook.xsl -out $1.docbook 
 
 echo Converting from docbook to XHTML...
-java -cp /usr/share/java/xalan-j2-2.6.0.jar org.apache.xalan.xslt.Process -in $1.docbook -xsl /home/gael/Logiciels/trinity.5-svn/kdesdk/umbrello.withdocgen/umbrello/docgenerators/docbook2xhtml.xsl -out $1.html -html
+java -cp /usr/share/java/xalan-j2-2.6.0.jar org.apache.xalan.xslt.Process -in $1.docbook -xsl /home/gael/Logiciels/trinity.5-svn/tdesdk/umbrello.withdocgen/umbrello/docgenerators/docbook2xhtml.xsl -out $1.html -html
 
 echo done.
diff --git a/umbrello/umbrello/pics/COPYING b/umbrello/umbrello/pics/COPYING
index 5e09cc93..e05154c1 100644
--- a/umbrello/umbrello/pics/COPYING
+++ b/umbrello/umbrello/pics/COPYING
@@ -1,3 +1,3 @@
 Images under this directory as well as the Umbrello and Umbrello
 mimetype icons may be copied under the terms of the LGPL plus add-on as
-found in kdelibs/pics/LICENSE.crystalsvg
+found in tdelibs/pics/LICENSE.crystalsvg
diff --git a/umbrello/umbrello/pics/sources/align_bottom.svg b/umbrello/umbrello/pics/sources/align_bottom.svg
index 0f292766..1799e8aa 100644
--- a/umbrello/umbrello/pics/sources/align_bottom.svg
+++ b/umbrello/umbrello/pics/sources/align_bottom.svg
@@ -16,7 +16,7 @@
    inkscape:version="0.42"
    width="22pt"
    height="22pt"
-   sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/sources"
+   sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/sources"
    sodipodi:docname="align_bottom.svg">
   <metadata
      id="metadata1589">
diff --git a/umbrello/umbrello/pics/sources/align_hori_distribute.svg b/umbrello/umbrello/pics/sources/align_hori_distribute.svg
index f6174a83..6bcc9f69 100644
--- a/umbrello/umbrello/pics/sources/align_hori_distribute.svg
+++ b/umbrello/umbrello/pics/sources/align_hori_distribute.svg
@@ -16,9 +16,9 @@
    inkscape:version="0.42"
    width="22pt"
    height="22pt"
-   sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/sources"
+   sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/sources"
    sodipodi:docname="align_hori_distribute.svg"
-   inkscape:export-filename="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/align_hori_distribute.png"
+   inkscape:export-filename="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/align_hori_distribute.png"
    inkscape:export-xdpi="72.000000"
    inkscape:export-ydpi="72.000000">
   <metadata
diff --git a/umbrello/umbrello/pics/sources/align_hori_middle.svg b/umbrello/umbrello/pics/sources/align_hori_middle.svg
index 4c7b1234..b23ae482 100644
--- a/umbrello/umbrello/pics/sources/align_hori_middle.svg
+++ b/umbrello/umbrello/pics/sources/align_hori_middle.svg
@@ -16,7 +16,7 @@
    inkscape:version="0.42"
    width="27.500000px"
    height="27.500000px"
-   sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/sources"
+   sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/sources"
    sodipodi:docname="align_vert_distribute.svg">
   <metadata
      id="metadata47">
diff --git a/umbrello/umbrello/pics/sources/align_left.svg b/umbrello/umbrello/pics/sources/align_left.svg
index 362e4e34..22c46df3 100644
--- a/umbrello/umbrello/pics/sources/align_left.svg
+++ b/umbrello/umbrello/pics/sources/align_left.svg
@@ -16,7 +16,7 @@
    inkscape:version="0.42"
    width="22pt"
    height="22pt"
-   sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/sources"
+   sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/sources"
    sodipodi:docname="align_left.svg">
   <metadata
      id="metadata5028">
diff --git a/umbrello/umbrello/pics/sources/align_right.svg b/umbrello/umbrello/pics/sources/align_right.svg
index 8fa3af6e..3ed3a88a 100644
--- a/umbrello/umbrello/pics/sources/align_right.svg
+++ b/umbrello/umbrello/pics/sources/align_right.svg
@@ -16,7 +16,7 @@
    inkscape:version="0.42"
    width="22pt"
    height="22pt"
-   sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/sources"
+   sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/sources"
    sodipodi:docname="align_right.svg">
   <metadata
      id="metadata4876">
diff --git a/umbrello/umbrello/pics/sources/align_top.svg b/umbrello/umbrello/pics/sources/align_top.svg
index e7cec488..977ee1b9 100644
--- a/umbrello/umbrello/pics/sources/align_top.svg
+++ b/umbrello/umbrello/pics/sources/align_top.svg
@@ -16,7 +16,7 @@
    inkscape:version="0.42"
    width="22pt"
    height="22pt"
-   sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/sources"
+   sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/sources"
    sodipodi:docname="align_top.svg">
   <metadata
      id="metadata4677">
diff --git a/umbrello/umbrello/pics/sources/align_vert_distribute.svg b/umbrello/umbrello/pics/sources/align_vert_distribute.svg
index 135eda26..d4b78d65 100644
--- a/umbrello/umbrello/pics/sources/align_vert_distribute.svg
+++ b/umbrello/umbrello/pics/sources/align_vert_distribute.svg
@@ -16,9 +16,9 @@
    inkscape:version="0.42"
    width="22pt"
    height="22pt"
-   sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/sources"
+   sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/sources"
    sodipodi:docname="align_vert_distribute.svg"
-   inkscape:export-filename="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/align_hori_distribute.png"
+   inkscape:export-filename="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/align_hori_distribute.png"
    inkscape:export-xdpi="72.000000"
    inkscape:export-ydpi="72.000000">
   <metadata
diff --git a/umbrello/umbrello/pics/sources/align_vert_middle.svg b/umbrello/umbrello/pics/sources/align_vert_middle.svg
index b7b62def..9e63ccf3 100644
--- a/umbrello/umbrello/pics/sources/align_vert_middle.svg
+++ b/umbrello/umbrello/pics/sources/align_vert_middle.svg
@@ -16,7 +16,7 @@
    inkscape:version="0.42"
    width="22pt"
    height="22pt"
-   sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/sources"
+   sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/sources"
    sodipodi:docname="align_vert_middle.svg">
   <metadata
      id="metadata1467">
diff --git a/umbrello/umbrello/pics/sources/diag_entityrelationship.svg b/umbrello/umbrello/pics/sources/diag_entityrelationship.svg
index 586f8e2e..485ef522 100644
--- a/umbrello/umbrello/pics/sources/diag_entityrelationship.svg
+++ b/umbrello/umbrello/pics/sources/diag_entityrelationship.svg
@@ -8,7 +8,7 @@
    inkscape:version="0.40"
    width="16pt"
    height="16pt"
-   sodipodi:docbase="/home/jr/devel/kdesdk/umbrello/umbrello/pics/sources"
+   sodipodi:docbase="/home/jr/devel/tdesdk/umbrello/umbrello/pics/sources"
    sodipodi:docname="diag_entityrelationship.svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
diff --git a/umbrello/umbrello/pics/sources/entity.svg b/umbrello/umbrello/pics/sources/entity.svg
index a40611eb..ea5edd34 100644
--- a/umbrello/umbrello/pics/sources/entity.svg
+++ b/umbrello/umbrello/pics/sources/entity.svg
@@ -8,7 +8,7 @@
    inkscape:version="0.40"
    width="22pt"
    height="22pt"
-   sodipodi:docbase="/home/jr/devel/kdesdk/umbrello/umbrello/pics/sources"
+   sodipodi:docbase="/home/jr/devel/tdesdk/umbrello/umbrello/pics/sources"
    sodipodi:docname="entity.svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@@ -18,7 +18,7 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   inkscape:export-filename="/home/jr/devel/kdesdk/umbrello/umbrello/pics/entity.png"
+   inkscape:export-filename="/home/jr/devel/tdesdk/umbrello/umbrello/pics/entity.png"
    inkscape:export-xdpi="72.000000"
    inkscape:export-ydpi="72.000000">
   <metadata
diff --git a/umbrello/umbrello/pics/sources/relationship.svg b/umbrello/umbrello/pics/sources/relationship.svg
index 89981396..4e69a98e 100644
--- a/umbrello/umbrello/pics/sources/relationship.svg
+++ b/umbrello/umbrello/pics/sources/relationship.svg
@@ -8,7 +8,7 @@
    inkscape:version="0.40"
    width="22pt"
    height="22pt"
-   sodipodi:docbase="/home/jr/devel/kdesdk/umbrello/umbrello/pics/sources"
+   sodipodi:docbase="/home/jr/devel/tdesdk/umbrello/umbrello/pics/sources"
    sodipodi:docname="relationship.svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@@ -17,7 +17,7 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   inkscape:export-filename="/home/jr/devel/kdesdk/umbrello/umbrello/pics/sources/relationship.png"
+   inkscape:export-filename="/home/jr/devel/tdesdk/umbrello/umbrello/pics/sources/relationship.png"
    inkscape:export-xdpi="72.000000"
    inkscape:export-ydpi="72.000000">
   <metadata
diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h
index b2f9181d..3e5b27e7 100644
--- a/umbrello/umbrello/uml.h
+++ b/umbrello/umbrello/uml.h
@@ -22,7 +22,7 @@
 #include <tqdict.h>
 
 #include <kdockwidget.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kurl.h>
 
 // forward declaration of the UML classes
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index 6abc0f8e..39c8ce61 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -23,7 +23,7 @@
 
 // kde includes
 #include <kapplication.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kdebug.h>
 #include <kio/job.h>
 #include <kio/netaccess.h>
diff --git a/umbrello/umbrello/uniqueid.cpp b/umbrello/umbrello/uniqueid.cpp
index 9c271cdb..d1f08341 100644
--- a/umbrello/umbrello/uniqueid.cpp
+++ b/umbrello/umbrello/uniqueid.cpp
@@ -26,7 +26,7 @@ Uml::IDType gen() {
     static char buf[20];
     int length = 12;
     int i = 0;
-    // Source: KDE4 kdelibs/tdecore/krandom.cpp KRandom::randomString()
+    // Source: KDE4 tdelibs/tdecore/krandom.cpp KRandom::randomString()
     while (length--) {
         int r = kapp->random() % 62;
         r += 48;