Additional renaming of kde to tde

22 files changed, 193 insertions, 193 deletions

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