Finish renaming tdevelop components

64 files changed, 301 insertions, 225 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8275eb30..440f3684 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = tdevelop std extras kde_app_devel kdevdesigner
+SUBDIRS = tdevelop std extras tde_app_devel tdevdesigner
 
diff --git a/doc/api/Architecture.dox b/doc/api/Architecture.dox
index ae4ef73d..52c1447a 100644
--- a/doc/api/Architecture.dox
+++ b/doc/api/Architecture.dox
@@ -40,7 +40,7 @@ parts to distinguish, mainly:
 
   - src            = The core part of KDevelop
   - lib/interfaces = Plugin handler interface classes
-  - parts          = The various parts using the KParts framework ( KDevPlugin children )
+  - parts          = The various parts using the KParts framework ( TDevPlugin children )
   - languages      = \ref language-parts
   - buildtools     = \ref buildtool-parts
   - vcs            = \ref vcs-parts
@@ -67,12 +67,12 @@ There are two types of possible main window objects:
    pre-arranged access tabs around user areas.
  .
 
-Both main window classes inherit from the KDevMainWindow class which provides
+Both main window classes inherit from the TDevMainWindow class which provides
 access to common window features.
 
 \subsubsection toplevel The TopLevel Object
 
-There is only one toplevel object of class KDevMainWindow in KDevelop. It can
+There is only one toplevel object of class TDevMainWindow in KDevelop. It can
 be accessed through the static function TopLevel::getInstance() (see the
 TopLevel class).
 
@@ -83,7 +83,7 @@ be viewed according to their functionalities as follows.
 
 \subsubsection language-parts Programming Language Support Parts
 
-These parts implement a KDevLanguageSupport Class interface.
+These parts implement a TDevLanguageSupport Class interface.
 To add support for a new programming language check the \ref howToAddProgrammingLanguages page (doc/api/HowToAddProgrammingLanguages.dox file).
 Take a look at \ref LangSupportStatus (doc/api/LangSupportStatus.dox file) to see the current status/features of the programming languages currently supported by KDevelop.
 
@@ -135,7 +135,7 @@ Take a look at \ref LangSupportStatus (doc/api/LangSupportStatus.dox file) to se
 
 \subsubsection buildtool-parts Build tools Parts
 
-These parts implement a KDevProject Class interface.
+These parts implement a TDevProject Class interface.
 
   - buildtools/ada = Ada build tool
     - (see AdaProjectPart)
@@ -166,7 +166,7 @@ These parts implement a KDevProject Class interface.
 
 \subsubsection vcs-parts VCS (Version Control System) Parts
 
-These parts implement a KDevVersionControl Class interface.
+These parts implement a TDevVersionControl Class interface.
 
   - vcs/cervisia = Cervisia Support
     - (see CervisiaPlugin)
@@ -211,7 +211,7 @@ Take a look at \ref EditorsSupportStatus (doc/api/EditorsSupportStatus.dox file)
 Some of the parts are considered global - that is, they effect the entire
 operation of KDevelop.
 
-These parts implement a KDevPlugin Class interface.
+These parts implement a TDevPlugin Class interface.
 
   - parts/appwizard = New Project Wizard
     - see AppWizardPart
@@ -264,7 +264,7 @@ These parts implement a KDevPlugin Class interface.
 
 \subsubsection project-specific-parts Project Specific Parts
 
-These parts implement a KDevPlugin Class interface.
+These parts implement a TDevPlugin Class interface.
 
   - parts/astyle = Source code formatter
     - (see AStylePart)
diff --git a/doc/api/FutureTasks.dox b/doc/api/FutureTasks.dox
index 1d7f7f26..763537f3 100644
--- a/doc/api/FutureTasks.dox
+++ b/doc/api/FutureTasks.dox
@@ -129,7 +129,7 @@
       the same border as other items (impossible)
     - Browser tool bar should truncate long menu entries so it doesn't
       take so much space (already implemented?)
-    - Extend KDevPlugin-API in order to have a preferred border for at
+    - Extend TDevPlugin-API in order to have a preferred border for at
       least the selection parts (Automake Manager, Class Browser, File
       Groups, etc...)
 
diff --git a/doc/api/HighPriTasks.dox b/doc/api/HighPriTasks.dox
index 062b3b06..7bcbaf1f 100644
--- a/doc/api/HighPriTasks.dox
+++ b/doc/api/HighPriTasks.dox
@@ -12,7 +12,7 @@
     This way the .tdevelop file can be shared in teams of developers.
 
 
-\section KDevelop2compat KDevelop 2 compatibility
+\section TDevelop2compat KDevelop 2 compatibility
 (These are things that must be accomplished before we can say that KDevelop 3
 >= tdevelop 2.x UI-wise and functionality-wise!)
 
diff --git a/doc/api/HowToAddApplicationTemplates.dox b/doc/api/HowToAddApplicationTemplates.dox
index f53ce4f8..1da5a3e5 100644
--- a/doc/api/HowToAddApplicationTemplates.dox
+++ b/doc/api/HowToAddApplicationTemplates.dox
@@ -27,7 +27,7 @@ applications like kedit as well as plugins for example for tdevelop or noatun.\n
 
 \section templates_1 I. Example: How To Create a Simple KDE Application Template "KHello"
 
-You can find this template in <code>$TDEDIR/share/apps/kdevappwizard/template-khello</code>.
+You can find this template in <code>$TDEDIR/share/apps/tdevappwizard/template-khello</code>.
 
 \subsection templates_1_1 I.1. Step 1: Basic Skeleton
 
@@ -64,7 +64,7 @@ wizard will replace:
     - \%{YEAR} ........ by the year
     .
 </pre></code>
-All this can be found in <code>$TDEDIR/share/apps/kdevappwizard/template-common/tdevelop.pm</code>.
+All this can be found in <code>$TDEDIR/share/apps/tdevappwizard/template-common/tdevelop.pm</code>.
 \subsubsection templates_1_2a I.2.1. The Source Files
 
 The files <code>template-khello/app.cpp, template-khello/app.h</code> and
@@ -135,22 +135,22 @@ if  [ `id -u` = 0 ]; then
   # we are root so install the template into the global kde directory
   kde_dir=`tde-config --prefix`
 else
-  # we are a user so install it into $HOME/.trinity/share/apps/kdevappwizard directory
+  # we are a user so install it into $HOME/.trinity/share/apps/tdevappwizard directory
   kde_dir=`tde-config --localprefix`
   echo "Note: It would be better to install as root. Press CTRL+C to abort"
 fi
 
 # use usual path or another one?
-echo "Install dir [${kde_dir}/share/apps/kdevappwizard]:"
+echo "Install dir [${kde_dir}/share/apps/tdevappwizard]:"
 read newdir
 
-if [ "$newdir"a = a ]; then newdir="${kde_dir}/share/apps/kdevappwizard/"; fi
+if [ "$newdir"a = a ]; then newdir="${kde_dir}/share/apps/tdevappwizard/"; fi
 
 # make sure the directories exist
 if [ ! -e "${newdir}/template-khello" ]; then mkdir -p "${newdir}/template-khello" ; fi;
 if [ ! -e "${newdir}/templates" ]; then mkdir -p "${newdir}/templates" ; fi;
 if [ ! -e "${newdir}" ]; then mkdir -p "$newdir" ; fi;
-if [ ! -e "${newdir}/template-common" ]; then ln -s "${kde_prefix}/share/apps/kdevappwizard/template-common" "${newdir}/template-common" ; fi;
+if [ ! -e "${newdir}/template-common" ]; then ln -s "${kde_prefix}/share/apps/tdevappwizard/template-common" "${newdir}/template-common" ; fi;
 
 # install now
 cp -R --target-directory "$newdir" template-khello
diff --git a/doc/api/HowToAddGenericBuildTools.dox b/doc/api/HowToAddGenericBuildTools.dox
index b073cf0f..d713082a 100644
--- a/doc/api/HowToAddGenericBuildTools.dox
+++ b/doc/api/HowToAddGenericBuildTools.dox
@@ -6,7 +6,7 @@
 
 This part offers build tool facilities using project files in xml format (dtd is located in buildtools/generic/kdevxmlproject.dtd).
 Those xml files can be converted into makefiles, ant xml files or simply shell scripts using build system plugins.
-Build system plugin is an object that implements KDevBuildSystem interface.
+Build system plugin is an object that implements TDevBuildSystem interface.
 Build system plugins are located in buildtools/generic/buildsystem.
 
 \section sectionStep1 Step 1: Make your plugin loadable
diff --git a/doc/api/HowToAddPlugins.dox b/doc/api/HowToAddPlugins.dox
index fa7f74e2..b0b282db 100644
--- a/doc/api/HowToAddPlugins.dox
+++ b/doc/api/HowToAddPlugins.dox
@@ -8,7 +8,7 @@
 
 For a plugin <code>foo</code>, create a file <code>foo.desktop</code> which contains KDevelop/Part in its list of ServiceTypes.
 
-  - See <code>parts/doctreeview/kdevdoctreeview.desktop</code> for an example.
+  - See <code>parts/doctreeview/tdevdoctreeview.desktop</code> for an example.
   .
 
 If you install this file into <code>\$(kde_servicesdir)</code>, your plugin will automatically be loaded.
@@ -80,9 +80,9 @@ See <code>parts/doctreeview/doctreeviewfactory.cpp</code> for an example.
 
 \section implementPart Step 3: Implement your part.
 
-Your part must be derived from <code>KDevPlugin</code>.
+Your part must be derived from <code>TDevPlugin</code>.
 
-  - KDevPlugin takes two arguments:
+  - TDevPlugin takes two arguments:
     - 1) A <i>parent</i> argument. This also comes from
 	  <code>createPartObject()</code>.
 	- 2) A <i>name</i>, which in turn is given to the <code>QObject</code>
@@ -93,7 +93,7 @@ Your part must be derived from <code>KDevPlugin</code>.
 \subsection accessIDE How to access other IDE components
 
 A part can access other components of the IDE via some accessors
-of <code>KDevPlugin</code>:
+of <code>TDevPlugin</code>:
 
   - The <i>application core</i> via <code>core()</code>,
   - the <i>build tools</i> via <code>project()</code>,
@@ -155,7 +155,7 @@ to write it back.
 
 \subsection sessionAccess Project session file (*.kdevses)
 
-The base class of all TDevelop plugins is KDevPlugin. It provides two virtual methods 
+The base class of all TDevelop plugins is TDevPlugin. It provides two virtual methods 
 restorePartialProjectSession(..) and savePartialProjectSession(..)
 that you should reimplement in your special plugin to attach to session loading and saving.
 
diff --git a/doc/api/HowToAddProgrammingLanguages.dox b/doc/api/HowToAddProgrammingLanguages.dox
index a5840885..5dd44fda 100644
--- a/doc/api/HowToAddProgrammingLanguages.dox
+++ b/doc/api/HowToAddProgrammingLanguages.dox
@@ -6,7 +6,7 @@
 
 \section LSupport List of things to have "complete" support of a given language in KDevelop
 
-  - Implement interface KDevLanguageSupport
+  - Implement interface TDevLanguageSupport
   - \ref sectionClassWizard
   - \ref sectionAttributeMethodWizard
   - \ref sectionQtUiSubclassing - (if the language has Qt bindings)
@@ -43,7 +43,7 @@ Take a look at \ref LangSupportStatus (doc/api/LangSupportStatus.dox file) to se
 \section sectionLanguageSupport Language Support
 
 Any language support should be written as a tdevelop part and implement
-KDevLanguageSupport interface (<code>lib/interfaces/kdevlanguagesupport.h</code>).
+TDevLanguageSupport interface (<code>lib/interfaces/tdevlanguagesupport.h</code>).
 
 Implementing methods:
  - <code>virtual Features features();</code>
@@ -54,7 +54,7 @@ Should be enough for a language support to start working.
 
 KDevelop ships with KDevLang project template. It is a simple language support prototype that can be used when developing language support plugins with KDevelop.
 To use it, start a New Project and select: <code>C++->KDevelop->KDevelop Language Support Plugin</code> in the application wizard.
-The template is located in <code>languages/cpp/app_templates/kdevlang</code>, you can change it there if you need.
+The template is located in <code>languages/cpp/app_templates/tdevlang</code>, you can change it there if you need.
 
 
 You should look at <code>languages/ruby</code> for a simple language support
@@ -177,7 +177,7 @@ write a <b>Debugger </b>. KDevelop already provides GDB support
 \subsection sectionCompilerPlugins Compiler plugins
 
 There is an ability to create compiler plugin for KDevelop. Compiler plugin provides the compiler configuration dialog which implements command line compiler options.
-Compiler plugins must implement KDevCompilerOptions interface.
+Compiler plugins must implement TDevCompilerOptions interface.
 
 
 \section MiscInf Other Info
@@ -226,7 +226,7 @@ currently provides several build tools. They are:
     - see GenericProjectPart at <code>buildtools/generic</code>
     - Offers build tool facilities using project files in xml format (dtd is located in <code>buildtools/generic/kdevxmlproject.dtd</code>).
       Those xml files can be converted into makefiles, ant xml files or simply shell scripts using build system plugins.
-      Build system plugin is an object that implements KDevBuildSystem interface. Build system plugins are located in <code>buildtools/generic/buildsystem</code>.
+      Build system plugin is an object that implements TDevBuildSystem interface. Build system plugins are located in <code>buildtools/generic/buildsystem</code>.
     .
   - QMake build tool
     - see TrollProjectPart at <code>buildtools/qmake</code>
diff --git a/doc/api/HowToDocument.dox b/doc/api/HowToDocument.dox
index d606a8bf..65cd7c31 100644
--- a/doc/api/HowToDocument.dox
+++ b/doc/api/HowToDocument.dox
@@ -3,7 +3,7 @@
   */
 /** \page howToDocument How to document KDevelop parts
 
-You should add a README and a README.dox file to your part (KDevPlugin).
+You should add a README and a README.dox file to your part (TDevPlugin).
 
 On the README file put this text:
 \verbatim
@@ -31,7 +31,7 @@ implements your part.
 
 On the area marked with <code>...</code> you can add optional informations. Here is an example of that:
 
-\verbinclude languages/cpp/app_templates/kdevpart/README.dox
+\verbinclude languages/cpp/app_templates/tdevpart/README.dox
 
 All these infos are optional and you should only add the link to the bugzilla database if YOUR_COMPONENT_NAME
 has been defined in that database.
diff --git a/doc/extras/CMakeLists.txt b/doc/extras/CMakeLists.txt
index dd7c977f..a358cf07 100644
--- a/doc/extras/CMakeLists.txt
+++ b/doc/extras/CMakeLists.txt
@@ -14,5 +14,5 @@ add_subdirectory( w3c )
 install(
   FILES
     sdl.toc opengl.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs
 )
diff --git a/doc/extras/Makefile.am b/doc/extras/Makefile.am
index 0e7893c4..deb28a1a 100644
--- a/doc/extras/Makefile.am
+++ b/doc/extras/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS=w3c
 
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
 toc_DATA = sdl.toc opengl.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/doc/extras/w3c/CMakeLists.txt b/doc/extras/w3c/CMakeLists.txt
index 7424e5fd..9681021f 100644
--- a/doc/extras/w3c/CMakeLists.txt
+++ b/doc/extras/w3c/CMakeLists.txt
@@ -12,5 +12,5 @@
 install(
   FILES
     w3c-dom-level2-html.toc w3c-svg.toc w3c-uaag10.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs
 )
diff --git a/doc/extras/w3c/Makefile.am b/doc/extras/w3c/Makefile.am
index 19518e8d..68a489f8 100644
--- a/doc/extras/w3c/Makefile.am
+++ b/doc/extras/w3c/Makefile.am
@@ -1,3 +1,3 @@
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
 toc_DATA = w3c-dom-level2-html.toc w3c-svg.toc w3c-uaag10.toc
 
diff --git a/doc/platform/Mainpage.dox b/doc/platform/Mainpage.dox
index 29f6deb0..ae377ddf 100644
--- a/doc/platform/Mainpage.dox
+++ b/doc/platform/Mainpage.dox
@@ -81,11 +81,11 @@ KDevelop Technotes</a>.
 
 \section langapi Programming Language Support API
 
-- <a href="kdevlanginterfaces/html/index.html"><b>Language Support Interfaces Library</b></a>
-   (<a href="kdevlanginterfaces/html/classes.html">classes</a>)\n
+- <a href="tdevlanginterfaces/html/index.html"><b>Language Support Interfaces Library</b></a>
+   (<a href="tdevlanginterfaces/html/classes.html">classes</a>)\n
    <i>Interfaces for KDevelop language support facilities.</i>
-- <a href="kdevlangdebugger/html/index.html"><b>Debugger Support Library</b></a>
-   (<a href="kdevlangdebugger/html/classes.html">classes</a>)\n
+- <a href="tdevlangdebugger/html/index.html"><b>Debugger Support Library</b></a>
+   (<a href="tdevlangdebugger/html/classes.html">classes</a>)\n
    <i>Classes to implement debugger support for a programming language.</i>
 .
 
@@ -110,8 +110,8 @@ KDevelop Technotes</a>.
 
 \section shellapi Shell API
 
-- <a href="kdevshellsrc/html/index.html"><b>Generic Shell</b></a>
-   (<a href="kdevshellsrc/html/classes.html">classes</a>)\n
+- <a href="tdevshellsrc/html/index.html"><b>Generic Shell</b></a>
+   (<a href="tdevshellsrc/html/classes.html">classes</a>)\n
    <i>The Shell - a profile-based implementation of TDevelop plugin architecture.</i>
 - <a href="kdevprofileslib/html/index.html"><b>Shell Profiles Library</b></a>
    (<a href="kdevprofileslib/html/classes.html">classes</a>)\n
diff --git a/doc/std/CMakeLists.txt b/doc/std/CMakeLists.txt
index 3c034ee5..edb0d2a8 100644
--- a/doc/std/CMakeLists.txt
+++ b/doc/std/CMakeLists.txt
@@ -11,6 +11,6 @@
 
 install(
   FILES
-    kdev3api.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs
+    tdev3api.toc
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs
 )
diff --git a/doc/std/Makefile.am b/doc/std/Makefile.am
index 07f12cde..7b636e47 100644
--- a/doc/std/Makefile.am
+++ b/doc/std/Makefile.am
@@ -1,5 +1,5 @@
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
-toc_DATA = kdev3api.toc
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
+toc_DATA = tdev3api.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
 #index_DATA = 
diff --git a/doc/std/kdev3api.toc b/doc/std/tdev3api.toc
index ef1c82dc..ef1c82dc 100644
--- a/doc/std/kdev3api.toc
+++ b/doc/std/tdev3api.toc
diff --git a/doc/kde_app_devel/CMakeLists.txt b/doc/tde_app_devel/CMakeLists.txt
index 243887d5..83e96ce9 100644
--- a/doc/kde_app_devel/CMakeLists.txt
+++ b/doc/tde_app_devel/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kde_app_devel )
+tde_create_handbook( DESTINATION tde_app_devel )
diff --git a/doc/kdearch/Makefile.am b/doc/tde_app_devel/Makefile.am
index 171f575c..171f575c 100644
--- a/doc/kdearch/Makefile.am
+++ b/doc/tde_app_devel/Makefile.am
diff --git a/doc/kde_app_devel/appwizard.png b/doc/tde_app_devel/appwizard.png
index adbadb35..adbadb35 100644
--- a/doc/kde_app_devel/appwizard.png
+++ b/doc/tde_app_devel/appwizard.png
diff --git a/doc/kde_app_devel/index.docbook b/doc/tde_app_devel/index.docbook
index 2d913c0b..e212e4e6 100644
--- a/doc/kde_app_devel/index.docbook
+++ b/doc/tde_app_devel/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY tdevelop "<application>KDevelop</application>">
+  <!ENTITY tdevelop "<application>TDevelop</application>">
   <!ENTITY kappname "&tdevelop;">
   <!ENTITY % addindex "INCLUDE">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
@@ -47,7 +47,7 @@ the &tdevelop; IDE</para>
 
 <keywordset>
 <keyword>KDE</keyword>
-<keyword>KDevelop</keyword>
+<keyword>TDevelop</keyword>
 <keyword>IDE</keyword>
 <keyword>development</keyword>
 <keyword>programming</keyword>
@@ -85,7 +85,7 @@ review of the functionality provided by the IDE.
 <title>About this Handbook</title>
 <para>
 This handbook has been written to give developers an introduction into KDE application development by 
-using the KDevelop Integrated Development Environment. 
+using the TDevelop Integrated Development Environment. 
 </para>
 <para>
 The following chapters therefore give an introduction on how to create projects, explains the sourcecode 
@@ -135,7 +135,7 @@ You will learn how to:
 Additional information about Qt/KDE programming is available by various sources:
 <itemizedlist>
 <listitem><para>Programming with Qt by Matthias Kalle Dalheimer</para></listitem>
-<listitem><para><ulink url="www.kdevelop.org">The User Manual to KDevelop, provided with the TDevelop IDE</ulink></para></listitem>
+<listitem><para><ulink url="www.kdevelop.org">The User Manual to TDevelop, provided with the TDevelop IDE</ulink></para></listitem>
 <listitem><para><ulink url="doc.trolltech.com">The Online Reference to the Qt library</ulink></para></listitem>
 <listitem><para><ulink url="developer.kde.org">The KDE Developer web site</ulink></para></listitem>
 </itemizedlist>
@@ -147,7 +147,7 @@ Unix Systems as well as about the C and C++ programming language.
 </para>
 <para>
 For obtaining help about the TDevelop IDE, you should send requests to our mailinglist at 
-<email>kdevelop@kdevelop.org</email>. Mind that the KDevelop team is dedicated to provide the means to enable you to 
+<email>kdevelop@kdevelop.org</email>. Mind that the TDevelop team is dedicated to provide the means to enable you to 
 program applications and therefore is not intended as a technical support team in cases where the 
 applications you're developing don't work due to implementation errors or misconfigurations of your 
 operating system. By this, we ask all users to take advantage of the mailinglist in any case you're running 
@@ -697,7 +697,7 @@ what in later steps.
 </para>
 <para>
 This chapter makes the assumption that you understand the basic navigation of &tdevelop;.  Consult the
-KDevelop User Manual for information if you need it.
+TDevelop User Manual for information if you need it.
 </para>
 <para>
 The Automake manager shows the project files as follows:
diff --git a/doc/kde_app_devel/kscribblefiles.png b/doc/tde_app_devel/kscribblefiles.png
index 1591b3cf..1591b3cf 100644
--- a/doc/kde_app_devel/kscribblefiles.png
+++ b/doc/tde_app_devel/kscribblefiles.png
diff --git a/doc/tdearch/Makefile.am b/doc/tdearch/Makefile.am
new file mode 100644
index 00000000..171f575c
--- /dev/null
+++ b/doc/tdearch/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = AUTO
diff --git a/doc/kdearch/affine-general.png b/doc/tdearch/affine-general.png
index 8e59d5e5..8e59d5e5 100644
--- a/doc/kdearch/affine-general.png
+++ b/doc/tdearch/affine-general.png
diff --git a/doc/kdearch/affine-rotate.png b/doc/tdearch/affine-rotate.png
index 7192ed9c..7192ed9c 100644
--- a/doc/kdearch/affine-rotate.png
+++ b/doc/tdearch/affine-rotate.png
diff --git a/doc/kdearch/affine-scale.png b/doc/tdearch/affine-scale.png
index 0b52fd4c..0b52fd4c 100644
--- a/doc/kdearch/affine-scale.png
+++ b/doc/tdearch/affine-scale.png
diff --git a/doc/kdearch/affine-shear.png b/doc/tdearch/affine-shear.png
index 1ed5fbd8..1ed5fbd8 100644
--- a/doc/kdearch/affine-shear.png
+++ b/doc/tdearch/affine-shear.png
diff --git a/doc/kdearch/affine-translate.png b/doc/tdearch/affine-translate.png
index 87265e30..87265e30 100644
--- a/doc/kdearch/affine-translate.png
+++ b/doc/tdearch/affine-translate.png
diff --git a/doc/kdearch/brushstyles.png b/doc/tdearch/brushstyles.png
index b6df50ca..b6df50ca 100644
--- a/doc/kdearch/brushstyles.png
+++ b/doc/tdearch/brushstyles.png
diff --git a/doc/kdearch/canvas.png b/doc/tdearch/canvas.png
index dd83dae9..dd83dae9 100644
--- a/doc/kdearch/canvas.png
+++ b/doc/tdearch/canvas.png
diff --git a/doc/kdearch/capflat.png b/doc/tdearch/capflat.png
index 5e1c92ce..5e1c92ce 100644
--- a/doc/kdearch/capflat.png
+++ b/doc/tdearch/capflat.png
diff --git a/doc/kdearch/capround.png b/doc/tdearch/capround.png
index 0e66eaac..0e66eaac 100644
--- a/doc/kdearch/capround.png
+++ b/doc/tdearch/capround.png
diff --git a/doc/kdearch/capsquare.png b/doc/tdearch/capsquare.png
index 35724a72..35724a72 100644
--- a/doc/kdearch/capsquare.png
+++ b/doc/tdearch/capsquare.png
diff --git a/doc/kdearch/index.docbook b/doc/tdearch/index.docbook
index 97dee33d..3bc09158 100644
--- a/doc/kdearch/index.docbook
+++ b/doc/tdearch/index.docbook
@@ -1965,7 +1965,7 @@ EXTRA_DIST = $(kde_servicesdir_DATA)
 
 <para>
 The content of the following example file
-<filename>kdevdoxygen.desktop</filename> defines the
+<filename>tdevdoxygen.desktop</filename> defines the
 <literal>KDevDoxygen</literal> plugin with the service type
 <literal>TDevelop/Part</literal>:
 </para>
@@ -1976,7 +1976,7 @@ Type=Service
 Comment=Doxygen
 Name=KDevDoxygen
 ServiceTypes=TDevelop/Part
-X-TDE-Library=libkdevdoxygen
+X-TDE-Library=libtdevdoxygen
 X-TDevelop-ProgrammingLanguages=C,C++,Java
 X-TDevelop-Scope=Project
 </programlisting>
@@ -1992,7 +1992,7 @@ the library must contain the following function:
 
 <programlisting>
 extern "C" {
-    void *init_libkdevdoxygen()
+    void *init_libtdevdoxygen()
     {
         return new DoxygenFactory;
     }
diff --git a/doc/kdearch/joinbevel.png b/doc/tdearch/joinbevel.png
index 584b6bd4..584b6bd4 100644
--- a/doc/kdearch/joinbevel.png
+++ b/doc/tdearch/joinbevel.png
diff --git a/doc/kdearch/joinmiter.png b/doc/tdearch/joinmiter.png
index e5d94b13..e5d94b13 100644
--- a/doc/kdearch/joinmiter.png
+++ b/doc/tdearch/joinmiter.png
diff --git a/doc/kdearch/joinround.png b/doc/tdearch/joinround.png
index 9a8bbe93..9a8bbe93 100644
--- a/doc/kdearch/joinround.png
+++ b/doc/tdearch/joinround.png
diff --git a/doc/kdearch/konqi-mirrored.png b/doc/tdearch/konqi-mirrored.png
index 5145c0ee..5145c0ee 100644
--- a/doc/kdearch/konqi-mirrored.png
+++ b/doc/tdearch/konqi-mirrored.png
diff --git a/doc/kdearch/konqi-normal.png b/doc/tdearch/konqi-normal.png
index c16e1475..c16e1475 100644
--- a/doc/kdearch/konqi-normal.png
+++ b/doc/tdearch/konqi-normal.png
diff --git a/doc/kdearch/konqi-rotated.png b/doc/tdearch/konqi-rotated.png
index 157e82dd..157e82dd 100644
--- a/doc/kdearch/konqi-rotated.png
+++ b/doc/tdearch/konqi-rotated.png
diff --git a/doc/kdearch/konqi-sheared.png b/doc/tdearch/konqi-sheared.png
index ee645f87..ee645f87 100644
--- a/doc/kdearch/konqi-sheared.png
+++ b/doc/tdearch/konqi-sheared.png
diff --git a/doc/kdearch/kview-menu.png b/doc/tdearch/kview-menu.png
index 0e57e721..0e57e721 100644
--- a/doc/kdearch/kview-menu.png
+++ b/doc/tdearch/kview-menu.png
diff --git a/doc/kdearch/opengl.png b/doc/tdearch/opengl.png
index 2489777d..2489777d 100644
--- a/doc/kdearch/opengl.png
+++ b/doc/tdearch/opengl.png
diff --git a/doc/kdearch/penstyles.png b/doc/tdearch/penstyles.png
index 7e976bcd..7e976bcd 100644
--- a/doc/kdearch/penstyles.png
+++ b/doc/tdearch/penstyles.png
diff --git a/doc/kdearch/whatsthis.png b/doc/tdearch/whatsthis.png
index 4bdba093..4bdba093 100644
--- a/doc/kdearch/whatsthis.png
+++ b/doc/tdearch/whatsthis.png
diff --git a/doc/tdevassistant/CMakeLists.txt b/doc/tdevassistant/CMakeLists.txt
new file mode 100644
index 00000000..caa4d7b8
--- /dev/null
+++ b/doc/tdevassistant/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdevassistant )
diff --git a/doc/kde_app_devel/Makefile.am b/doc/tdevassistant/Makefile.am
index 41691557..41691557 100644
--- a/doc/kde_app_devel/Makefile.am
+++ b/doc/tdevassistant/Makefile.am
diff --git a/doc/tdevassistant/index.docbook b/doc/tdevassistant/index.docbook
new file mode 100644
index 00000000..065276f9
--- /dev/null
+++ b/doc/tdevassistant/index.docbook
@@ -0,0 +1,65 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY tdevassistant "<application>TDevAssistant</application>">
+  <!ENTITY kappname "&tdevassistant;">
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE">
+]>
+
+<!-- Note: When updating this empty handbook, remember that usually most handbooks -->
+<!-- use the book model rather than article. Feel free to use article if the new handbook -->
+<!-- remains really short. -->
+
+<article lang="&language;">
+<title>The &tdevassistant; Handbook</title>
+
+<articleinfo>
+<title>The &tdevassistant; Handbook</title>
+
+<authorgroup>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<releaseinfo>&tde-release-version;</releaseinfo>
+<date>Reviewed: &tde-release-date;</date>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<!-- <legalnotice>&FDLNotice;</legalnotice> -->
+
+<abstract>
+<para>
+&tdevassistant; is a development documentation viewer for &tde;.
+</para>
+</abstract>
+
+<keywordset>
+<keyword>TDE</keyword>
+</keywordset>
+
+</articleinfo>
+
+<sect1 id="apologies">
+<title>We Apologize</title>
+<para>No documentation has yet been written for &tdevassistant;.</para>
+
+<para>If you need help, please check <ulink url="http://www.trinitydesktop.org">The &tde;
+web site</ulink>, submit questions to the <ulink url="http://www.trinitydesktop.org/mailinglist.php">
+&tde; mail lists</ulink>, or file a bug report at the <ulink url="http://bugs.trinitydesktop.org/">
+&tde; bug tracker</ulink>.</para>
+
+<para>If you are interested in helping, please consider writing the help file.
+Submitting a basic text file is acceptable as the &tde-team; will convert the text.</para>
+
+<para>Thank you for helping and thank you for your patience.</para>
+
+&underFDL;
+
+</sect1>
+
+&documentation.index; 
+</article>
diff --git a/doc/kdevdesigner/CMakeLists.txt b/doc/tdevdesigner/CMakeLists.txt
index db314d97..d8d93cbb 100644
--- a/doc/kdevdesigner/CMakeLists.txt
+++ b/doc/tdevdesigner/CMakeLists.txt
@@ -6,4 +6,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kdevdesigner )
+tde_create_handbook( DESTINATION tdevdesigner )
diff --git a/doc/kdevdesigner/Makefile.am b/doc/tdevdesigner/Makefile.am
index 41691557..41691557 100644
--- a/doc/kdevdesigner/Makefile.am
+++ b/doc/tdevdesigner/Makefile.am
diff --git a/doc/kdevdesigner/index.docbook b/doc/tdevdesigner/index.docbook
index c903aa65..3bfdf384 100644
--- a/doc/kdevdesigner/index.docbook
+++ b/doc/tdevdesigner/index.docbook
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kdevdesigner "<application>KDevDesigner</application>">
-  <!ENTITY kappname "&kdevdesigner;">
+  <!ENTITY tdevdesigner "<application>TDevDesigner</application>">
+  <!ENTITY kappname "&tdevdesigner;">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
 ]>
@@ -11,10 +11,10 @@
 <!-- remains really short. -->
 
 <article lang="&language;">
-<title>The &kdevdesigner; Handbook</title>
+<title>The &tdevdesigner; Handbook</title>
 
 <articleinfo>
-<title>The &kdevdesigner; Handbook</title>
+<title>The &tdevdesigner; Handbook</title>
 
 <authorgroup>
 <author>&tde-authors;</author>
@@ -33,7 +33,7 @@
 
 <abstract>
 <para>
-&kdevdesigner; is a GUI designer environment for &tde;.
+&tdevdesigner; is a GUI designer environment for &tde;.
 </para>
 </abstract>
 
@@ -45,7 +45,7 @@
 
 <sect1 id="apologies">
 <title>We Apologize</title>
-<para>No documentation has yet been written for &kdevdesigner;.</para>
+<para>No documentation has yet been written for &tdevdesigner;.</para>
 
 <para>If you need help, please check <ulink url="http://www.trinitydesktop.org">The &tde;
 web site</ulink>, submit questions to the <ulink url="http://www.trinitydesktop.org/mailinglist.php">
diff --git a/doc/tdevelop/app-files.docbook b/doc/tdevelop/app-files.docbook
index 547010ec..736baf16 100644
--- a/doc/tdevelop/app-files.docbook
+++ b/doc/tdevelop/app-files.docbook
@@ -56,7 +56,7 @@ Most &tdevelop; features are provided by KParts. These are basically application
 </para>
 
 <para>
-There are quite a lot of default configuration subdirectories in <filename class="directory">$<envar>TDEDIR</envar>/share/apps/</filename> whose names all start with a <filename>kdev</filename> sequence. Most of them are for &tdevelop; internal use only. They might be deliberately grouped for readability as:
+There are quite a lot of default configuration subdirectories in <filename class="directory">$<envar>TDEDIR</envar>/share/apps/</filename> whose names all start with a <filename>tdev</filename> sequence. Most of them are for &tdevelop; internal use only. They might be deliberately grouped for readability as:
 <simplelist>
   <member><link linkend="app-files-default-apps-stdalone">Stand-alone Applications</link></member>
   <member><link linkend="app-files-default-apps-task">Task Specific Parts</link></member>
@@ -76,25 +76,25 @@ There are quite a lot of default configuration subdirectories in <filename class
         <listitem><para><filename class="directory">profiles/</filename> &mdash; contains default plugin profile settings. (Currently there is only a <filename>tiny</filename> profile provided which defines a minimum set of active &tdevelop; plugins.)</para></listitem>
         <listitem><para><filename>eventsrc</filename> &mdash; holds a lot of <quote>Process successful</quote> localization strings.</para></listitem>
         <listitem><para><filename>tdevelopui.rc</filename> &mdash; provides the basic menu and tool bar entries &tdevelop; uses.</para></listitem>
-        <listitem><para><filename>kdevhtml_partui.rc</filename> &mdash; provides a <guimenuitem>Print...</guimenuitem> entry in the <guimenu>File</guimenu> menu, a <guimenuitem>Copy</guimenuitem> entry in the <guimenu>Edit</guimenu> menu, and <guilabel>Back</guilabel> and <guilabel>Forward</guilabel> arrows in the <guilabel>Browser Toolbar</guilabel> in case a &HTML; file is browsed from the <guilabel>Documentation</guilabel> plugin.</para></listitem>
+        <listitem><para><filename>tdevhtml_partui.rc</filename> &mdash; provides a <guimenuitem>Print...</guimenuitem> entry in the <guimenu>File</guimenu> menu, a <guimenuitem>Copy</guimenuitem> entry in the <guimenu>Edit</guimenu> menu, and <guilabel>Back</guilabel> and <guilabel>Forward</guilabel> arrows in the <guilabel>Browser Toolbar</guilabel> in case a &HTML; file is browsed from the <guilabel>Documentation</guilabel> plugin.</para></listitem>
       </itemizedlist>
     </listitem>
-    <listitem><para><filename class="directory">kdevassistant/</filename> &mdash; provides the menu and tool bars of the stand-alone &tdevelop; Assistant documentation browser.</para></listitem>
-    <listitem><para><filename class="directory">kdevdesigner/</filename> and <filename class="directory">kdevdesignerpart/</filename> &mdash; provide menu bar and tool bars of the stand-alone &tdevelop; user interface designer.</para></listitem>
+    <listitem><para><filename class="directory">tdevassistant/</filename> &mdash; provides the menu and tool bars of the stand-alone &tdevelop; Assistant documentation browser.</para></listitem>
+    <listitem><para><filename class="directory">tdevdesigner/</filename> and <filename class="directory">tdevdesignerpart/</filename> &mdash; provide menu bar and tool bars of the stand-alone &tdevelop; user interface designer.</para></listitem>
   </itemizedlist></listitem>
 
   <listitem><itemizedlist id="app-files-default-apps-task">
     <title>Task Specific Parts</title>
     <listitem id="app-files-default-abbrev">
-      <para><filename class="directory">kdevabbrev/</filename> &mdash; contains files used by the <guilabel>Abbreviation Expansion</guilabel> plugin:</para>
+      <para><filename class="directory">tdevabbrev/</filename> &mdash; contains files used by the <guilabel>Abbreviation Expansion</guilabel> plugin:</para>
       <itemizedlist>
         <listitem><para><filename class="directory">sources/</filename> &mdash; contains keyword definition files used by the <guilabel>Expand Text</guilabel> command.</para></listitem>
         <listitem><para><filename class="directory">templates/</filename> &mdash; contains template definition files used by the <guilabel>Expand Abbreviation</guilabel> command.</para></listitem>
-        <listitem><para><filename>kdevabbrev.rc</filename> &mdash; provides the <guimenuitem>Expand Text</guimenuitem> and <guimenuitem>Expand Abbreviation</guimenuitem> entries in the <guimenu>Edit</guimenu> menu.</para></listitem>
+        <listitem><para><filename>tdevabbrev.rc</filename> &mdash; provides the <guimenuitem>Expand Text</guimenuitem> and <guimenuitem>Expand Abbreviation</guimenuitem> entries in the <guimenu>Edit</guimenu> menu.</para></listitem>
 </itemizedlist>
     </listitem>
     <listitem id="app-files-default-appwizard">
-      <para><filename class="directory">kdevappwizard/</filename> &mdash; contains files used by the &appwizard; part:</para>
+      <para><filename class="directory">tdevappwizard/</filename> &mdash; contains files used by the &appwizard; part:</para>
       <itemizedlist>
         <listitem><para><filename class="directory">importfiles/</filename> &mdash; contains <filename>.tdevelop</filename> project files which control the initialization of a new project.</para></listitem>
         <listitem><para><filename class="directory">imports/</filename> &mdash; contains templates to set up project specific <filename>.desktop</filename> files.</para></listitem>
@@ -104,89 +104,89 @@ There are quite a lot of default configuration subdirectories in <filename class
         <listitem><para><filename>*.tar.gz</filename> &mdash; tarballs containing the source files to be included in a new generated project directory.</para></listitem>
       </itemizedlist>
     </listitem>
-    <listitem><para><filename class="directory">kdevastyle/</filename> &mdash; provides the <guimenuitem>Reformat Source</guimenuitem> entry in the <guimenu>Edit</guimenu> menu.</para></listitem>
-    <listitem><para><filename class="directory">kdevautoproject/</filename> &mdash; provides most of the entries in the <guimenu>Build</guimenu> menu and the <guilabel>Build Toolbar (&tdevelop;)</guilabel> toolbar.</para></listitem>
+    <listitem><para><filename class="directory">tdevastyle/</filename> &mdash; provides the <guimenuitem>Reformat Source</guimenuitem> entry in the <guimenu>Edit</guimenu> menu.</para></listitem>
+    <listitem><para><filename class="directory">tdevautoproject/</filename> &mdash; provides most of the entries in the <guimenu>Build</guimenu> menu and the <guilabel>Build Toolbar (&tdevelop;)</guilabel> toolbar.</para></listitem>
     <listitem>
-      <para><filename class="directory">kdevclassview/</filename> &mdash; contains files used by the <guilabel>Class View</guilabel> project plugin:</para>
+      <para><filename class="directory">tdevclassview/</filename> &mdash; contains files used by the <guilabel>Class View</guilabel> project plugin:</para>
       <itemizedlist>
         <listitem><para><filename class="directory">pics/</filename> &mdash; contains the icons used in the <guilabel>Classes</guilabel> classview tree.</para></listitem>
-        <listitem><para><filename>kdevclassview.tc</filename> &mdash; provides the <guimenuitem>Class Inheritance Diagram</guimenuitem> entry in the <guimenu>Projects</guimenu> menu as well as the classes navigation combo box in the <guilabel>Browser Toolbar</guilabel>.</para></listitem>
+        <listitem><para><filename>tdevclassview.tc</filename> &mdash; provides the <guimenuitem>Class Inheritance Diagram</guimenuitem> entry in the <guimenu>Projects</guimenu> menu as well as the classes navigation combo box in the <guilabel>Browser Toolbar</guilabel>.</para></listitem>
       </itemizedlist>
     </listitem>
-    <listitem><para><filename class="directory">kdevcloser/</filename> &mdash; provides the <guimenu>Windows</guimenu> menu close entries.</para></listitem>
-    <listitem><para><filename class="directory">kdevctags/</filename> &mdash; provides the <guimenuitem>CTags</guimenuitem> entry in the <guimenu>Tools</guimenu> menu for the <guilabel>CTags Frontend</guilabel> project plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevcvsservice/</filename> &mdash; provides the icon used by the <guilabel>CvsService</guilabel> tab and a short shell script used to add a new entry to the &cvs; repository, both used by the <guilabel>CVS Integration</guilabel> project plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevdebugger/</filename> &mdash; provides the <guimenu>Debug</guimenu> menu entries for the <guilabel>Debugger Frontend</guilabel> project plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevdiff/</filename> &mdash; provides the <guimenuitem>Difference Viewer</guimenuitem> entry in the <guimenu>Tools</guimenu> menu.</para></listitem>
-    <listitem><para><filename class="directory">kdevdistpart/</filename> &mdash; provides the <guimenuitem>Distribution &amp; Publishing</guimenuitem> entry in the <guimenu>Project</guimenu> menu for the <guilabel>Final Packaging Support</guilabel> project plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevcloser/</filename> &mdash; provides the <guimenu>Windows</guimenu> menu close entries.</para></listitem>
+    <listitem><para><filename class="directory">tdevctags/</filename> &mdash; provides the <guimenuitem>CTags</guimenuitem> entry in the <guimenu>Tools</guimenu> menu for the <guilabel>CTags Frontend</guilabel> project plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevcvsservice/</filename> &mdash; provides the icon used by the <guilabel>CvsService</guilabel> tab and a short shell script used to add a new entry to the &cvs; repository, both used by the <guilabel>CVS Integration</guilabel> project plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevdebugger/</filename> &mdash; provides the <guimenu>Debug</guimenu> menu entries for the <guilabel>Debugger Frontend</guilabel> project plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevdiff/</filename> &mdash; provides the <guimenuitem>Difference Viewer</guimenuitem> entry in the <guimenu>Tools</guimenu> menu.</para></listitem>
+    <listitem><para><filename class="directory">tdevdistpart/</filename> &mdash; provides the <guimenuitem>Distribution &amp; Publishing</guimenuitem> entry in the <guimenu>Project</guimenu> menu for the <guilabel>Final Packaging Support</guilabel> project plugin.</para></listitem>
     <listitem id="app-files-default-kdevdoc">
-      <para><filename class="directory">kdevdocumentation/</filename> &mdash; contains files used by the <guilabel>Documentation</guilabel> plugin:</para>
+      <para><filename class="directory">tdevdocumentation/</filename> &mdash; contains files used by the <guilabel>Documentation</guilabel> plugin:</para>
       <itemizedlist>
         <listitem><para><filename class="directory">en/</filename> and <filename class="directory">pics/</filename> &mdash; contain files used by the <application>htdig</application> search tool.</para></listitem>
         <listitem><para><filename class="directory">tocs/</filename> &mdash; contain the default &tdevelop; documentation content description files (see the description in <link linkend="toc-file-structure">Basic Structure of &tdevelop; TOC Files</link>).</para></listitem>
-        <listitem><para><filename>kdevpart_documentation.rc</filename> &mdash; provides the search related entries in the <guimenu>Help</guimenu> menu.</para></listitem>
+        <listitem><para><filename>tdevpart_documentation.rc</filename> &mdash; provides the search related entries in the <guimenu>Help</guimenu> menu.</para></listitem>
       </itemizedlist>
     </listitem>
-    <listitem><para><filename class="directory">kdevdoxygen/</filename> &mdash; provides the menu entries for the <guilabel>Doxygen Support</guilabel> project plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevdoxygen/</filename> &mdash; provides the menu entries for the <guilabel>Doxygen Support</guilabel> project plugin.</para></listitem>
     <listitem id="app-files-default-filecreate">
-      <para><filename class="directory">kdevfilecreate/</filename> &mdash; contains files used by the <guilabel>New File Wizard:</guilabel>
+      <para><filename class="directory">tdevfilecreate/</filename> &mdash; contains files used by the <guilabel>New File Wizard:</guilabel>
       <itemizedlist>
         <listitem><para><filename class="directory">file-templates/</filename> &mdash; provides the initial text contents to be put into the new source file of a given type.</para></listitem>
-        <listitem><para><filename>kdevpart_filecreate.rc</filename> &mdash; provides the <guimenuitem>New</guimenuitem> entry in the <guimenu>File</guimenu> menu.</para></listitem>
+        <listitem><para><filename>tdevpart_filecreate.rc</filename> &mdash; provides the <guimenuitem>New</guimenuitem> entry in the <guimenu>File</guimenu> menu.</para></listitem>
         <listitem><para><filename>template-info.xml</filename> &mdash; contains descriptions of the available file types to be displayed in the <guilabel>New File</guilabel> tool view.</para></listitem>
       </itemizedlist>
     </para></listitem>
-    <listitem><para><filename class="directory">kdevfilter/</filename> &mdash; provides the <guimenuitem>Execute Command...</guimenuitem> and <guimenuitem>Filter Selection Through Command...</guimenuitem> entries in the <guimenu>Tools</guimenu> menu used by the <guilabel>Shell Filtering and Insertion</guilabel> plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevfullscreen/</filename> &mdash; provides the <guimenuitem>Full Screen Mode</guimenuitem> entry in the <guimenu>View</guimenu> menu and the according tool bar icon.</para></listitem>
-    <listitem><para><filename class="directory">kdevgrepview/</filename> &mdash; provides the <guimenuitem>Find in Files...</guimenuitem>entry in the <guimenu>Edit</guimenu> menu used by the <guilabel>Grep Frontend</guilabel> plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevhistory/</filename> &mdash; provides the <guimenuitem>Back</guimenuitem> and <guimenuitem>Forward</guimenuitem> entries in the <guimenu>View</guimenu> menu.</para></listitem>
-    <listitem><para><filename class="directory">kdevjavadebugger/</filename> &mdash; provides a <guimenu>Java Debug</guimenu> menu in order to debug a &Java; application.</para></listitem>
-    <listitem><para><filename class="directory">kdevoutputviews/</filename> &mdash; provides the <guimenuitem>Next Error</guimenuitem> and <guimenuitem>Previous Error</guimenuitem> entries in the <guimenu>View</guimenu> menu.</para></listitem>
-    <listitem><para><filename class="directory">kdevpartexplorer/</filename> &mdash; provides the <guimenuitem>Part Explorer</guimenuitem> entry in the <guimenu>Tools</guimenu> menu used by the <guilabel>Part Explorer Tool</guilabel> plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevquickopen/</filename> &mdash; provides the <guimenuitem>Quick Open File..</guimenuitem> entry in the <guimenu>File</guimenu> menu and the <guimenuitem>Quick Open Class...</guimenuitem> and <guimenuitem>Quick Open Method</guimenuitem> entries in the <guimenu>Tools</guimenu> menu used by the <guilabel>Quick Open</guilabel> project plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevregexptest/</filename> &mdash; provides the <guimenuitem>Debug Regular Expression...</guimenuitem> entry in the <guimenu>Tools</guimenu> menu used by the <guilabel>Regular Expression Tester</guilabel> plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevreplace/</filename> &mdash; provides the <guimenuitem>Find-Select-Replace...</guimenuitem> entry in the <guimenu>Edit</guimenu> menu used by the <guilabel>Replace Part</guilabel> plugin.</para></listitem>
-    <listitem id="app-files-default-tips"><para><filename class="directory">kdevtipofday/</filename> &mdash; provides the <guimenuitem>Tip of the Day</guimenuitem> entry in the <guimenu>Help</guimenu> menu as well as a HTML-File containing the available tips.</para></listitem>
-    <listitem><para><filename class="directory">kdevtools/</filename> &mdash; controls various menu entries ceated by <guimenu>Tools Menu</guimenu> and <guilabel>External Tools Menu</guilabel> settings provided by the <guilabel>Tools Menu Addition</guilabel> plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevvalgrind/</filename> &mdash; provides the <guimenuitem>Valgrind Memory Leak Check</guimenuitem> and <guimenuitem>Profile with KCachegrind</guimenuitem> entries in the <guimenu>Debug</guimenu> menu used by the <guilabel>Valgrind Frontend</guilabel> plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevfilter/</filename> &mdash; provides the <guimenuitem>Execute Command...</guimenuitem> and <guimenuitem>Filter Selection Through Command...</guimenuitem> entries in the <guimenu>Tools</guimenu> menu used by the <guilabel>Shell Filtering and Insertion</guilabel> plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevfullscreen/</filename> &mdash; provides the <guimenuitem>Full Screen Mode</guimenuitem> entry in the <guimenu>View</guimenu> menu and the according tool bar icon.</para></listitem>
+    <listitem><para><filename class="directory">tdevgrepview/</filename> &mdash; provides the <guimenuitem>Find in Files...</guimenuitem>entry in the <guimenu>Edit</guimenu> menu used by the <guilabel>Grep Frontend</guilabel> plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevhistory/</filename> &mdash; provides the <guimenuitem>Back</guimenuitem> and <guimenuitem>Forward</guimenuitem> entries in the <guimenu>View</guimenu> menu.</para></listitem>
+    <listitem><para><filename class="directory">tdevjavadebugger/</filename> &mdash; provides a <guimenu>Java Debug</guimenu> menu in order to debug a &Java; application.</para></listitem>
+    <listitem><para><filename class="directory">tdevoutputviews/</filename> &mdash; provides the <guimenuitem>Next Error</guimenuitem> and <guimenuitem>Previous Error</guimenuitem> entries in the <guimenu>View</guimenu> menu.</para></listitem>
+    <listitem><para><filename class="directory">tdevpartexplorer/</filename> &mdash; provides the <guimenuitem>Part Explorer</guimenuitem> entry in the <guimenu>Tools</guimenu> menu used by the <guilabel>Part Explorer Tool</guilabel> plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevquickopen/</filename> &mdash; provides the <guimenuitem>Quick Open File..</guimenuitem> entry in the <guimenu>File</guimenu> menu and the <guimenuitem>Quick Open Class...</guimenuitem> and <guimenuitem>Quick Open Method</guimenuitem> entries in the <guimenu>Tools</guimenu> menu used by the <guilabel>Quick Open</guilabel> project plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevregexptest/</filename> &mdash; provides the <guimenuitem>Debug Regular Expression...</guimenuitem> entry in the <guimenu>Tools</guimenu> menu used by the <guilabel>Regular Expression Tester</guilabel> plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevreplace/</filename> &mdash; provides the <guimenuitem>Find-Select-Replace...</guimenuitem> entry in the <guimenu>Edit</guimenu> menu used by the <guilabel>Replace Part</guilabel> plugin.</para></listitem>
+    <listitem id="app-files-default-tips"><para><filename class="directory">tdevtipofday/</filename> &mdash; provides the <guimenuitem>Tip of the Day</guimenuitem> entry in the <guimenu>Help</guimenu> menu as well as a HTML-File containing the available tips.</para></listitem>
+    <listitem><para><filename class="directory">tdevtools/</filename> &mdash; controls various menu entries ceated by <guimenu>Tools Menu</guimenu> and <guilabel>External Tools Menu</guilabel> settings provided by the <guilabel>Tools Menu Addition</guilabel> plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevvalgrind/</filename> &mdash; provides the <guimenuitem>Valgrind Memory Leak Check</guimenuitem> and <guimenuitem>Profile with KCachegrind</guimenuitem> entries in the <guimenu>Debug</guimenu> menu used by the <guilabel>Valgrind Frontend</guilabel> plugin.</para></listitem>
   </itemizedlist></listitem>
 
   <listitem><itemizedlist id="app-files-default-apps-project">
     <title>Project Generation Parts</title>
-    <listitem><para><filename class="directory">kdevadaproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons to build an Ada application.</para></listitem>
-    <listitem><para><filename class="directory">kdevantproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu when the Ant project generator is used.</para></listitem>
-    <listitem><para><filename class="directory">kdevautoproject/</filename> &mdash;  provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons when working with the &GNU; Tools based &automake; project generator. Additionally provides the <guimenuitem>Add Translation</guimenuitem> and <guimenuitem>Build Configuration</guimenuitem> entries to the <guimenu>Project</guimenu> menu.</para></listitem>
-    <listitem><para><filename class="directory">kdevcustomproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons when the project is based on custom Makefils.</para></listitem>
-    <listitem><para><filename class="directory">kdevgenericproject/</filename> &mdash; contains menu definitions for an experimental generic project generator. Currently (version 3.1.0) unused.</para></listitem>
-    <listitem><para><filename class="directory">kdevhaskellproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons to build a Haskell application.</para></listitem>
-    <listitem><para><filename class="directory">kdevpascalproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons to build a Pascal application.</para></listitem>
-    <listitem><para><filename class="directory">kdevtrollproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons to build an application using the &Qt; QMake project manager.</para></listitem>
+    <listitem><para><filename class="directory">tdevadaproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons to build an Ada application.</para></listitem>
+    <listitem><para><filename class="directory">tdevantproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu when the Ant project generator is used.</para></listitem>
+    <listitem><para><filename class="directory">tdevautoproject/</filename> &mdash;  provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons when working with the &GNU; Tools based &automake; project generator. Additionally provides the <guimenuitem>Add Translation</guimenuitem> and <guimenuitem>Build Configuration</guimenuitem> entries to the <guimenu>Project</guimenu> menu.</para></listitem>
+    <listitem><para><filename class="directory">tdevcustomproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons when the project is based on custom Makefils.</para></listitem>
+    <listitem><para><filename class="directory">tdevgenericproject/</filename> &mdash; contains menu definitions for an experimental generic project generator. Currently (version 3.1.0) unused.</para></listitem>
+    <listitem><para><filename class="directory">tdevhaskellproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons to build a Haskell application.</para></listitem>
+    <listitem><para><filename class="directory">tdevpascalproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons to build a Pascal application.</para></listitem>
+    <listitem><para><filename class="directory">tdevtrollproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons to build an application using the &Qt; QMake project manager.</para></listitem>
   </itemizedlist></listitem>
 
   <listitem><itemizedlist id="app-files-default-apps-lang">
     <title>Language Specific Parts</title>
-    <listitem><para><filename class="directory">kdevadasupport/</filename> &mdash; provides entries in the <guimenu>Tools</guimenu> menu and according tool bar icons needed to develop Ada applications.</para></listitem>
-    <listitem><para><filename class="directory">kdevbashsupport/</filename> &mdash; provides entries in the <guimenu>Build</guimenu> menu and according tool bar icons needed to develop Bash scripts.</para></listitem>
+    <listitem><para><filename class="directory">tdevadasupport/</filename> &mdash; provides entries in the <guimenu>Tools</guimenu> menu and according tool bar icons needed to develop Ada applications.</para></listitem>
+    <listitem><para><filename class="directory">tdevbashsupport/</filename> &mdash; provides entries in the <guimenu>Build</guimenu> menu and according tool bar icons needed to develop Bash scripts.</para></listitem>
     <listitem id="app-files-default-apps-lang-cpp">
-      <para><filename class="directory">kdevcppsupport/</filename> &mdash; contains files used by the &appwizard; to build C++ applications:</para>
+      <para><filename class="directory">tdevcppsupport/</filename> &mdash; contains files used by the &appwizard; to build C++ applications:</para>
       <itemizedlist>
         <listitem><para><filename class="directory">newclass/</filename> &mdash; contains header and source templates from which the &appwizard; builds the according source files.</para></listitem>
         <listitem><para><filename class="directory">subclassing/</filename> &mdash; contains templates which the &appwizard; uses to set up initial class declarations/definitions in the source files.</para></listitem>
         <listitem><para><filename class="directory">templates</filename> &mdash; contains templates from which the &appwizard; sets up the default header and source template files to be used by the &nfwizard;. </para></listitem>
         <listitem><para><filename>configuration</filename> &mdash; dummy template to add macros.</para></listitem>
-        <listitem><para><filename>kdevcppsupport.rc</filename> &mdash; provides the <guimenuitem>Complete Text</guimenuitem> and <guimenuitem>Make Member</guimenuitem> entries fo the <guimenu>Edit</guimenu> menu, the <guimenuitem>Switch Header/Implementation</guimenuitem> entry for the <guimenu>View</guimenu> menu, and the <guimenuitem>New Class</guimenuitem> entry for the <guimenu>Project</guimenu> menu as well as a <guiicon>New Class</guiicon> icon for the <guilabel>Browser Toolbar</guilabel>.</para></listitem>
+        <listitem><para><filename>tdevcppsupport.rc</filename> &mdash; provides the <guimenuitem>Complete Text</guimenuitem> and <guimenuitem>Make Member</guimenuitem> entries fo the <guimenu>Edit</guimenu> menu, the <guimenuitem>Switch Header/Implementation</guimenuitem> entry for the <guimenu>View</guimenu> menu, and the <guimenuitem>New Class</guimenuitem> entry for the <guimenu>Project</guimenu> menu as well as a <guiicon>New Class</guiicon> icon for the <guilabel>Browser Toolbar</guilabel>.</para></listitem>
       </itemizedlist>
     </listitem>
-    <listitem><para><filename class="directory">kdevfortransupport/</filename> &mdash; provides entries in the <guimenu>Build</guimenu> menu needed to develop Fortran applications.</para></listitem>
-    <listitem><para><filename class="directory">kdevhaskellsupport/</filename> &mdash; provides entries in the <guimenu>Build</guimenu> menu and according tool bar icons needed to develop Haskell applications.</para></listitem>
-     <listitem><para><filename class="directory">kdevjavasupport/</filename> &mdash; contains the UI definition needed to develop &Java; applications.</para></listitem>
-    <listitem><para><filename class="directory">kdevpascalsupport/</filename> &mdash;  contains the UI definition needed to develop Pascal applications.</para></listitem>
-    <listitem><para><filename class="directory">kdevperlsupport/</filename> &mdash; provides <guimenu>Project</guimenu> and <guimenu>Help</guimenu> menu entries needed to develop Perl scripts.</para></listitem>
-    <listitem><para><filename class="directory">kdevphpsupport/</filename> &mdash; contains UI and PHP function definition files needed to develop PHP scripts.</para></listitem>
-    <listitem><para><filename class="directory">kdevpythonsupport/</filename> &mdash; provides <guimenu>Build</guimenu> and <guimenu>Help</guimenu> menu entries and according tool bar icons needed to develop Python scripts.</para></listitem>
-    <listitem><para><filename class="directory">kdevrubysupport/</filename> &mdash; provides <guimenu>Build</guimenu> menu entries and according tool bar icons needed to develop Ruby scripts.</para></listitem>
-    <listitem><para><filename class="directory">kdevscriptproject/</filename> &mdash; provides th UI definitions needed to develop custom projects. Currently (version 3.1.0) unused.</para></listitem>
-    <listitem><para><filename class="directory">kdevsqlsupport/</filename> &mdash; provides th UI definitions needed to develop SQL projects. Currently (version 3.1.0) unused.</para></listitem>
+    <listitem><para><filename class="directory">tdevfortransupport/</filename> &mdash; provides entries in the <guimenu>Build</guimenu> menu needed to develop Fortran applications.</para></listitem>
+    <listitem><para><filename class="directory">tdevhaskellsupport/</filename> &mdash; provides entries in the <guimenu>Build</guimenu> menu and according tool bar icons needed to develop Haskell applications.</para></listitem>
+     <listitem><para><filename class="directory">tdevjavasupport/</filename> &mdash; contains the UI definition needed to develop &Java; applications.</para></listitem>
+    <listitem><para><filename class="directory">tdevpascalsupport/</filename> &mdash;  contains the UI definition needed to develop Pascal applications.</para></listitem>
+    <listitem><para><filename class="directory">tdevperlsupport/</filename> &mdash; provides <guimenu>Project</guimenu> and <guimenu>Help</guimenu> menu entries needed to develop Perl scripts.</para></listitem>
+    <listitem><para><filename class="directory">tdevphpsupport/</filename> &mdash; contains UI and PHP function definition files needed to develop PHP scripts.</para></listitem>
+    <listitem><para><filename class="directory">tdevpythonsupport/</filename> &mdash; provides <guimenu>Build</guimenu> and <guimenu>Help</guimenu> menu entries and according tool bar icons needed to develop Python scripts.</para></listitem>
+    <listitem><para><filename class="directory">tdevrubysupport/</filename> &mdash; provides <guimenu>Build</guimenu> menu entries and according tool bar icons needed to develop Ruby scripts.</para></listitem>
+    <listitem><para><filename class="directory">tdevscriptproject/</filename> &mdash; provides th UI definitions needed to develop custom projects. Currently (version 3.1.0) unused.</para></listitem>
+    <listitem><para><filename class="directory">tdevsqlsupport/</filename> &mdash; provides th UI definitions needed to develop SQL projects. Currently (version 3.1.0) unused.</para></listitem>
   </itemizedlist></listitem>
 
 </itemizedlist>
@@ -212,7 +212,7 @@ All information about user defined settings is kept in two subdirectories of <fi
 <title>Application Specific Configuration</title>
 
 <para>
-Any user changes to the <link linkend="app-files-default">&tdevelop; Default Configuration</link> settings as well as user specific settings which are not kept in any of the <link linkend="app-files-user-config">Resource Configuration Files</link> are found in <filename>kdev...</filename> subdirectories of the <filename class="directory">$<envar>TDEHOME</envar>/share/apps/</filename> directory.
+Any user changes to the <link linkend="app-files-default">&tdevelop; Default Configuration</link> settings as well as user specific settings which are not kept in any of the <link linkend="app-files-user-config">Resource Configuration Files</link> are found in <filename>tdev...</filename> subdirectories of the <filename class="directory">$<envar>TDEHOME</envar>/share/apps/</filename> directory.
 </para>
 <para>
 Most of these configuration files are however used by various &tdevelop; plugins in order to provide some specific menu and/or toolbar entries. Thus they are of interest only in case something went really wrong with the user interface.
@@ -223,30 +223,30 @@ In case the contents of these directories mirror those of the Default Configurat
 
 <itemizedlist>
   <listitem>
-    <para><filename class="directory">kdevabbrev/</filename> &mdash;  contains files used by the <guilabel>Abbreviation Expansion</guilabel> plugin:</para>
+    <para><filename class="directory">tdevabbrev/</filename> &mdash;  contains files used by the <guilabel>Abbreviation Expansion</guilabel> plugin:</para>
     <itemizedlist>
       <listitem><para><filename class="directory">sources/</filename> &mdash; currently empty; &tdevelop; uses the <link linkend="app-files-default-abbrev">default keyword definition</link> files for <guilabel>Expand Text</guilabel> commands.</para></listitem>
       <listitem><para><filename class="directory">templates/</filename> &mdash; contains the user modified template definition files used by the <guilabel>Expand Abbreviation</guilabel> command.</para></listitem>
-      <listitem><para><filename>kdevabbrev.rc</filename> &mdash; provides the <guimenuitem>Expand Text</guimenuitem> and <guimenuitem>Expand Abbreviation</guimenuitem> entries in the <guimenu>Edit</guimenu> menu.</para></listitem>
+      <listitem><para><filename>tdevabbrev.rc</filename> &mdash; provides the <guimenuitem>Expand Text</guimenuitem> and <guimenuitem>Expand Abbreviation</guimenuitem> entries in the <guimenu>Edit</guimenu> menu.</para></listitem>
     </itemizedlist>    
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevappwizard/</filename> &mdash; only provides the <guimenuitem>New Project...</guimenuitem> and <guimenuitem>Import Existing Project...</guimenuitem> entries in the <guimenu>Projects</guimenu> menu. The &appwizard; will use the <link linkend="app-files-default-appwizard">default configuration settings</link> for its actual works.</para>
+    <para><filename class="directory">tdevappwizard/</filename> &mdash; only provides the <guimenuitem>New Project...</guimenuitem> and <guimenuitem>Import Existing Project...</guimenuitem> entries in the <guimenu>Projects</guimenu> menu. The &appwizard; will use the <link linkend="app-files-default-appwizard">default configuration settings</link> for its actual works.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevastyle/</filename> &mdash; provides the actual <guimenuitem>Reformat Source</guimenuitem> entry in the <guimenu>Edit</guimenu> menu.</para>
+    <para><filename class="directory">tdevastyle/</filename> &mdash; provides the actual <guimenuitem>Reformat Source</guimenuitem> entry in the <guimenu>Edit</guimenu> menu.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevautoproject/</filename> &mdash; provides the actual entries in the <guimenu>Build</guimenu> menu and the <guilabel>Build Toolbar (KDevelop)</guilabel> toolbar.</para>
+    <para><filename class="directory">tdevautoproject/</filename> &mdash; provides the actual entries in the <guimenu>Build</guimenu> menu and the <guilabel>Build Toolbar (TDevelop)</guilabel> toolbar.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevclassview/</filename> &mdash; provides the <guimenuitem>Class Inheritance Diagram</guimenuitem> entry in the <guimenu>Project</guimenu> menu and the class browser combo box in the <guilabel>Browser Toolbar</guilabel> by the <guilabel>Class View</guilabel> project plugin.</para>
+    <para><filename class="directory">tdevclassview/</filename> &mdash; provides the <guimenuitem>Class Inheritance Diagram</guimenuitem> entry in the <guimenu>Project</guimenu> menu and the class browser combo box in the <guilabel>Browser Toolbar</guilabel> by the <guilabel>Class View</guilabel> project plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevcloser/</filename> &mdash; provides the <guimenuitem>Close Selected Windows...</guimenuitem> entry in the <guimenu>Windows</guimenu> menu.</para>
+    <para><filename class="directory">tdevcloser/</filename> &mdash; provides the <guimenuitem>Close Selected Windows...</guimenuitem> entry in the <guimenu>Windows</guimenu> menu.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevcppsupport/</filename> &mdash; holds the acual configuration used by the &appwizard; to build C++ applications. The &appwizard; however uses its main bulk of configuration information directly from the <link linkend="app-files-default-apps-lang-cpp">default configuration directory</link>. See there for more detail.</para>
+    <para><filename class="directory">tdevcppsupport/</filename> &mdash; holds the acual configuration used by the &appwizard; to build C++ applications. The &appwizard; however uses its main bulk of configuration information directly from the <link linkend="app-files-default-apps-lang-cpp">default configuration directory</link>. See there for more detail.</para>
     <itemizedlist>
       <listitem>
         <para><filename class="directory">newclass/</filename> &mdash; contains the actual header and source templates from which the &appwizard; builds the according source files.</para>
@@ -255,22 +255,22 @@ In case the contents of these directories mirror those of the Default Configurat
         <para><filename class="directory">pcs/</filename> &mdash; contains database files &tdevelop; uses build the actual Persistent Code Store (<filename>.pcs</filename>) file of a &kde; C++ project.</para>
       </listitem>
       <listitem>
-        <para><filename>kdevcppsupport.rc</filename> &mdash; provides the <guimenuitem>Complete Text</guimenuitem> and <guimenuitem>Make Member</guimenuitem> entries fo the <guimenu>Edit</guimenu> menu, the <guimenuitem>Switch Header/Implementation</guimenuitem> entry for the <guimenu>View</guimenu> menu, and the <guimenuitem>New Class</guimenuitem> entry for the <guimenu>Project</guimenu> menu as well as a <guiicon>New Class</guiicon> icon for the <guilabel>Browser Toolbar</guilabel>.</para>
+        <para><filename>tdevcppsupport.rc</filename> &mdash; provides the <guimenuitem>Complete Text</guimenuitem> and <guimenuitem>Make Member</guimenuitem> entries fo the <guimenu>Edit</guimenu> menu, the <guimenuitem>Switch Header/Implementation</guimenuitem> entry for the <guimenu>View</guimenu> menu, and the <guimenuitem>New Class</guimenuitem> entry for the <guimenu>Project</guimenu> menu as well as a <guiicon>New Class</guiicon> icon for the <guilabel>Browser Toolbar</guilabel>.</para>
       </listitem>
     </itemizedlist>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevctags/</filename> &mdash; provides the <guimenuitem>CTags</guimenuitem> entry in the <guimenu>Tools</guimenu> menu for the <guilabel>CTags Frontend</guilabel> project plugin.</para>
+    <para><filename class="directory">tdevctags/</filename> &mdash; provides the <guimenuitem>CTags</guimenuitem> entry in the <guimenu>Tools</guimenu> menu for the <guilabel>CTags Frontend</guilabel> project plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevdebugger/</filename> &mdash; provides the <guimenu>Debug</guimenu> menu entries for the <guilabel>Debugger Frontend</guilabel> project plugin.</para>
+    <para><filename class="directory">tdevdebugger/</filename> &mdash; provides the <guimenu>Debug</guimenu> menu entries for the <guilabel>Debugger Frontend</guilabel> project plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevdiff/</filename> &mdash; provides the <guimenuitem>Difference Viewer</guimenuitem> entry in the <guimenu>Tools</guimenu> menu.</para>
+    <para><filename class="directory">tdevdiff/</filename> &mdash; provides the <guimenuitem>Difference Viewer</guimenuitem> entry in the <guimenu>Tools</guimenu> menu.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevdocumentation/</filename> &mdash; contains the actual files used by the <guilabel>Documentation</guilabel> plugin in addition to the <link linkend="app-files-default-kdevdoc"> default configuration files</link>. See there for more detail.</para>
-    <para>The directories in <filename class="directory">kdevdocumentation/</filename> mainly hold actual bookkeeping information. The actually set up documentation files are kept in <link linkend="app-files-user-config-doc"> <quote><filename>doc...pluginrc</filename></quote> files</link> in the <filename class="directory">$<envar>TDEHOME</envar>/share/config/</filename> directory.</para>
+    <para><filename class="directory">tdevdocumentation/</filename> &mdash; contains the actual files used by the <guilabel>Documentation</guilabel> plugin in addition to the <link linkend="app-files-default-kdevdoc"> default configuration files</link>. See there for more detail.</para>
+    <para>The directories in <filename class="directory">tdevdocumentation/</filename> mainly hold actual bookkeeping information. The actually set up documentation files are kept in <link linkend="app-files-user-config-doc"> <quote><filename>doc...pluginrc</filename></quote> files</link> in the <filename class="directory">$<envar>TDEHOME</envar>/share/config/</filename> directory.</para>
     <itemizedlist>
       <listitem>
         <para><filename class="directory">bookmarks/</filename> &mdash; maintains the entries in the <guilabel>Bookmarks</guilabel> tab of the &tdevelop; <guilabel>Documentation</guilabel> plugin.</para>
@@ -282,12 +282,12 @@ In case the contents of these directories mirror those of the Default Configurat
         <para><filename class="directory">search/</filename> &mdash; contains files used by the <application>htdig</application> search tool which serves search calls from the <guilabel>Search</guilabel> tab of the <guilabel>Documentation</guilabel> plugin.</para>
       </listitem>
       <listitem>
-        <para><filename>kdevpart_documentation.rc</filename> &mdash; provides the search related entries in the <guimenu>Help</guimenu> menu.</para>
+        <para><filename>tdevpart_documentation.rc</filename> &mdash; provides the search related entries in the <guimenu>Help</guimenu> menu.</para>
       </listitem>
     </itemizedlist>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevdoxygen/</filename> &mdash; provides the menu entries for the <guilabel>Doxygen Support</guilabel> project plugin.</para>
+    <para><filename class="directory">tdevdoxygen/</filename> &mdash; provides the menu entries for the <guilabel>Doxygen Support</guilabel> project plugin.</para>
   </listitem>
   <listitem>
     <para><filename class="directory">tdevelop/</filename> &mdash; contains some actual settings &tdevelop; uses for its basic setup:</para>
@@ -297,45 +297,45 @@ In case the contents of these directories mirror those of the Default Configurat
     </itemizedlist>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevfilecreate/</filename> &mdash; contains files used by the <guilabel>New File Wizard:</guilabel></para>
+    <para><filename class="directory">tdevfilecreate/</filename> &mdash; contains files used by the <guilabel>New File Wizard:</guilabel></para>
       <itemizedlist>
         <listitem><para><filename class="directory">file-templates/</filename> &mdash; provides the actually used text contents to be put into the new source file of a given type. More file templates are found in the <link linkend="app-files-default-filecreate">default configuration files</link> directory.</para></listitem>
-        <listitem><para><filename>kdevpart_filecreate.rc</filename> &mdash; provides the <guimenuitem>New</guimenuitem> entry in the <guimenu>File</guimenu> menu.</para></listitem>
+        <listitem><para><filename>tdevpart_filecreate.rc</filename> &mdash; provides the <guimenuitem>New</guimenuitem> entry in the <guimenu>File</guimenu> menu.</para></listitem>
         <listitem><para><filename>template-info.xml</filename> &mdash; contains descriptions of the available file types to be displayed in the <guilabel>New File</guilabel> tool view.</para></listitem>
       </itemizedlist>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevfilter/</filename> &mdash; provides the <guimenuitem>Execute Command...</guimenuitem> and <guimenuitem>Filter Selection Through Command...</guimenuitem> entries in the <guimenu>Tools</guimenu> menu used by the <guilabel>Shell Filtering and Insertion</guilabel> plugin.</para>
+    <para><filename class="directory">tdevfilter/</filename> &mdash; provides the <guimenuitem>Execute Command...</guimenuitem> and <guimenuitem>Filter Selection Through Command...</guimenuitem> entries in the <guimenu>Tools</guimenu> menu used by the <guilabel>Shell Filtering and Insertion</guilabel> plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevfullscreen/</filename> &mdash; provides the <guimenuitem>Full Screen Mode</guimenuitem> entry in the <guimenu>View</guimenu> menu and the according tool bar icon.</para>
+    <para><filename class="directory">tdevfullscreen/</filename> &mdash; provides the <guimenuitem>Full Screen Mode</guimenuitem> entry in the <guimenu>View</guimenu> menu and the according tool bar icon.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevgrepview/</filename> &mdash; provides the <guimenuitem>Find in Files...</guimenuitem>entry in the <guimenu>Edit</guimenu> menu used by the <guilabel>Grep Frontend</guilabel> plugin.</para>
+    <para><filename class="directory">tdevgrepview/</filename> &mdash; provides the <guimenuitem>Find in Files...</guimenuitem>entry in the <guimenu>Edit</guimenu> menu used by the <guilabel>Grep Frontend</guilabel> plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevoutputviews/</filename> &mdash; provides the <guimenuitem>Next Error</guimenuitem> and <guimenuitem>Previous Error</guimenuitem> entries in the <guimenu>View</guimenu> menu.</para>
+    <para><filename class="directory">tdevoutputviews/</filename> &mdash; provides the <guimenuitem>Next Error</guimenuitem> and <guimenuitem>Previous Error</guimenuitem> entries in the <guimenu>View</guimenu> menu.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevpartexplorer/</filename> &mdash; provides the <guimenuitem>Part Explorer</guimenuitem> entry in the <guimenu>Tools</guimenu> menu used by the <guilabel>Part Explorer Tool</guilabel> plugin.</para>
+    <para><filename class="directory">tdevpartexplorer/</filename> &mdash; provides the <guimenuitem>Part Explorer</guimenuitem> entry in the <guimenu>Tools</guimenu> menu used by the <guilabel>Part Explorer Tool</guilabel> plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevquickopen/</filename> &mdash; provides the <guimenuitem>Quick Open File..</guimenuitem> entry in the <guimenu>File</guimenu> menu and the <guimenuitem>Quick Open Class...</guimenuitem> and <guimenuitem>Quick Open Method</guimenuitem> entries in the <guimenu>Tools</guimenu> menu used by the <guilabel>Quick Open</guilabel> project plugin.</para>
+    <para><filename class="directory">tdevquickopen/</filename> &mdash; provides the <guimenuitem>Quick Open File..</guimenuitem> entry in the <guimenu>File</guimenu> menu and the <guimenuitem>Quick Open Class...</guimenuitem> and <guimenuitem>Quick Open Method</guimenuitem> entries in the <guimenu>Tools</guimenu> menu used by the <guilabel>Quick Open</guilabel> project plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevregexptest/</filename> &mdash; provides the <guimenuitem>Debug Regular Expression...</guimenuitem> entry in the <guimenu>Tools</guimenu> menu used by the <guilabel>Regular Expression Tester</guilabel> plugin.</para>
+    <para><filename class="directory">tdevregexptest/</filename> &mdash; provides the <guimenuitem>Debug Regular Expression...</guimenuitem> entry in the <guimenu>Tools</guimenu> menu used by the <guilabel>Regular Expression Tester</guilabel> plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevreplace/</filename> &mdash; provides the <guimenuitem>Find-Select-Replace...</guimenuitem> entry in the <guimenu>Edit</guimenu> menu used by the <guilabel>Replace Part</guilabel> plugin.</para>
+    <para><filename class="directory">tdevreplace/</filename> &mdash; provides the <guimenuitem>Find-Select-Replace...</guimenuitem> entry in the <guimenu>Edit</guimenu> menu used by the <guilabel>Replace Part</guilabel> plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevtipofday/</filename> &mdash;provides the <guimenuitem>Tip of the Day</guimenuitem> entry in the <guimenu>Help</guimenu> menu. The HTML-File containing the available tips is provided as a <link linkend="app-files-default-tips">default configuration file</link> only.</para>
+    <para><filename class="directory">tdevtipofday/</filename> &mdash;provides the <guimenuitem>Tip of the Day</guimenuitem> entry in the <guimenu>Help</guimenu> menu. The HTML-File containing the available tips is provided as a <link linkend="app-files-default-tips">default configuration file</link> only.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevtools/</filename> &mdash; controls various menu entries ceated by <guimenu>Tools Menu</guimenu> and <guilabel>External Tools Menu</guilabel> settings provided by the <guilabel>Tools Menu Addition</guilabel> plugin.</para>
+    <para><filename class="directory">tdevtools/</filename> &mdash; controls various menu entries ceated by <guimenu>Tools Menu</guimenu> and <guilabel>External Tools Menu</guilabel> settings provided by the <guilabel>Tools Menu Addition</guilabel> plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevvalgrind/</filename> &mdash; provides the <guimenuitem>Valgrind Memory Leak Check</guimenuitem> and <guimenuitem>Profile with KCachegrind</guimenuitem> entries in the <guimenu>Debug</guimenu> menu used by the <guilabel>Valgrind Frontend</guilabel> plugin.</para>
+    <para><filename class="directory">tdevvalgrind/</filename> &mdash; provides the <guimenuitem>Valgrind Memory Leak Check</guimenuitem> and <guimenuitem>Profile with KCachegrind</guimenuitem> entries in the <guimenu>Debug</guimenu> menu used by the <guilabel>Valgrind Frontend</guilabel> plugin.</para>
   </listitem>
 </itemizedlist>
 
@@ -348,35 +348,35 @@ In case the contents of these directories mirror those of the Default Configurat
 There are two groups of &tdevelop; configuration files in the <filename class="directory">$<envar>TDEHOME</envar>/share/config/</filename> directory, distiguished by their surrounding character sequences:
 <simplelist>
   <member><quote><filename>doc...pluginrc</filename></quote> denotes <link linkend="app-files-user-config-doc">files used by the documentation plugin.</link></member>
-  <member><quote><filename>kdev...rc</filename></quote> denotes configuration <link linkend="app-files-user-config-kdev">files used by &tdevelop;</link> itself and its available plugins.</member>
+  <member><quote><filename>tdev...rc</filename></quote> denotes configuration <link linkend="app-files-user-config-kdev">files used by &tdevelop;</link> itself and its available plugins.</member>
 </simplelist>
 </para>
 
 <itemizedlist id="app-files-user-config-kdev">
 <title>Configuration Files Used by &tdevelop;</title>
   <listitem>
-    <para><filename>kdevabbrevrc</filename> &mdash; holds the current state of the <guilabel>Abbreviations</guilabel> configuration provided by the <guilabel>Abbreviation Expansion</guilabel> plugin.</para>
+    <para><filename>tdevabbrevrc</filename> &mdash; holds the current state of the <guilabel>Abbreviations</guilabel> configuration provided by the <guilabel>Abbreviation Expansion</guilabel> plugin.</para>
     <note><para>This only records whether the abbreviations will be used or not. The actual definitions of new abbreviations will go into the <filename>$<envar>TDEHOME</envar>/share/apps/kdevabbrev/templates/templates</filename> file.</para></note>
   </listitem>
   <listitem>
-    <para><filename>kdevassistantrc</filename> &mdash; holds some configuration states specific of the stand-alone  &tdevelop; Assistant documentation browser.</para>
+    <para><filename>tdevassistantrc</filename> &mdash; holds some configuration states specific of the stand-alone  &tdevelop; Assistant documentation browser.</para>
     <note><para>Most common configuration settings are shared with the &tdevelop; IDE <filename>tdeveloprc</filename> file.</para></note>
   </listitem>
-  <listitem><para><filename>kdevassistantuimode4rc</filename> &mdash; holds the current MDI configuration states (dock positions &etc;) of the stand-alone  &tdevelop; Assistant documentation browser.</para></listitem>
+  <listitem><para><filename>tdevassistantuimode4rc</filename> &mdash; holds the current MDI configuration states (dock positions &etc;) of the stand-alone  &tdevelop; Assistant documentation browser.</para></listitem>
   <listitem>
-    <para><filename>kdevclassviewrc</filename> &mdash; holds the <guilabel>View Mode</guilabel> setting of the <guilabel>Classes</guilabel> class browser tab provided by the <guilabel>Class View</guilabel> project plugin.</para>
+    <para><filename>tdevclassviewrc</filename> &mdash; holds the <guilabel>View Mode</guilabel> setting of the <guilabel>Classes</guilabel> class browser tab provided by the <guilabel>Class View</guilabel> project plugin.</para>
     <note><para>This is a global setting, although the <guilabel>Class View</guilabel> plugin may be disabled on a per project basis. Any change in this setting will be globally updated whenever the current project is closed and thus affect all subsequently loaded projects.</para></note>
   </listitem>
-  <listitem><para><filename>kdevcppsupportrc</filename> &mdash; holds some settings used to set up CPP source files. In particular you will find the settings made on the <guilabel>C++ Class Generator</guilabel> configuration dialog in here.</para></listitem>
-  <listitem><para><filename>kdevdocumentationrc</filename> &mdash; holds actual settings the <guilabel>Documentation</guilabel> plugin uses.</para></listitem>
+  <listitem><para><filename>tdevcppsupportrc</filename> &mdash; holds some settings used to set up CPP source files. In particular you will find the settings made on the <guilabel>C++ Class Generator</guilabel> configuration dialog in here.</para></listitem>
+  <listitem><para><filename>tdevdocumentationrc</filename> &mdash; holds actual settings the <guilabel>Documentation</guilabel> plugin uses.</para></listitem>
   <listitem><para><filename>tdeveloprc</filename> &mdash; holds the global settings the &tdevelop; IDE and the &tdevelop; Assistant stand-alone documentation browser will use.</para></listitem>
   <listitem><para><filename>tdevelopuimode4rc</filename> &mdash;  holds the current MDI configuration states (dock positions &etc;) of the  &tdevelop; IDE.</para></listitem>
-  <listitem><para><filename>kdevfileselectorrc</filename> &mdash; holds actual settings the <guilabel>File Selector</guilabel> plugin uses.</para></listitem>
-  <listitem><para><filename>kdevfileviewrc</filename> &mdash; holds the actual filename color settings the <guilabel>CVS Integration (Cervisia)</guilabel> project plugin uses for display.</para></listitem>
-  <listitem><para><filename>kdevfilterrc</filename> &mdash; holds actual settings the <guilabel>Shell Filtering and Insertion</guilabel> plugin uses.</para></listitem>
-  <listitem><para><filename>kdevgrepviewrc</filename> &mdash; holds actual settings the <guilabel>Grep Frontend</guilabel> plugin uses.</para></listitem>
-  <listitem><para><filename>kdevsnippetrc</filename> &mdash; holds actual settings the <guilabel>Code Snippets</guilabel> plugin uses.</para></listitem>
-  <listitem><para><filename>kdevtoolsrc</filename> &mdash; holds actual settings the <guilabel>Tools Menu Addition</guilabel> plugin uses.</para></listitem>
+  <listitem><para><filename>tdevfileselectorrc</filename> &mdash; holds actual settings the <guilabel>File Selector</guilabel> plugin uses.</para></listitem>
+  <listitem><para><filename>tdevfileviewrc</filename> &mdash; holds the actual filename color settings the <guilabel>CVS Integration (Cervisia)</guilabel> project plugin uses for display.</para></listitem>
+  <listitem><para><filename>tdevfilterrc</filename> &mdash; holds actual settings the <guilabel>Shell Filtering and Insertion</guilabel> plugin uses.</para></listitem>
+  <listitem><para><filename>tdevgrepviewrc</filename> &mdash; holds actual settings the <guilabel>Grep Frontend</guilabel> plugin uses.</para></listitem>
+  <listitem><para><filename>tdevsnippetrc</filename> &mdash; holds actual settings the <guilabel>Code Snippets</guilabel> plugin uses.</para></listitem>
+  <listitem><para><filename>tdevtoolsrc</filename> &mdash; holds actual settings the <guilabel>Tools Menu Addition</guilabel> plugin uses.</para></listitem>
 </itemizedlist>
 
 <itemizedlist id="app-files-user-config-doc">
@@ -385,7 +385,7 @@ There are two groups of &tdevelop; configuration files in the <filename class="d
   <listitem><para><filename>doccustompluginrc</filename> &mdash; holds information about any custom documentation file defined on the <guilabel>Custom Documentation Collection</guilabel> configuration page.</para></listitem>
   <listitem><para><filename>docdevhelppluginrc</filename> &mdash; holds information about the actual GNOME 2 DevHelp documentation files as defined on the <guilabel>Devhelp Documentation Collection</guilabel> configuration page.</para></listitem>
   <listitem><para><filename>docdoxygenpluginrc</filename> &mdash; holds information about the actual Doxygen generated API documentations as defined on the <guilabel>Doxygen Documentation Collection</guilabel> configuration page.</para></listitem>
-  <listitem><para><filename>dockdevtocpluginrc</filename> &mdash; holds information about the actual KDevelopTOC structured documentation files as defined on the <guilabel>KDevelopTOC Documentation Collection</guilabel> configuration page.</para></listitem>
+  <listitem><para><filename>doctdevtocpluginrc</filename> &mdash; holds information about the actual TDevelopTOC structured documentation files as defined on the <guilabel>TDevelopTOC Documentation Collection</guilabel> configuration page.</para></listitem>
   <listitem><para><filename>docqtpluginrc</filename> &mdash; holds information about the QT documentation files actually included on the <guilabel> Documentation Collection</guilabel>Qt configuration page.</para></listitem>
 </itemizedlist>
 
diff --git a/doc/tdevelop/commands.docbook b/doc/tdevelop/commands.docbook
index 31fff849..495da173 100644
--- a/doc/tdevelop/commands.docbook
+++ b/doc/tdevelop/commands.docbook
@@ -78,7 +78,7 @@ box.</para></listitem>
 <guimenuitem>Open Recent</guimenuitem>
 </menuchoice></term>
 <listitem><para>Displays a submenu showing the files recently opened.
-Selecting one of these will make KDevelop open that file.
+Selecting one of these will make TDevelop open that file.
 </para></listitem>
 </varlistentry>
 
@@ -229,7 +229,7 @@ and re-open the current one.
 <guimenu>File</guimenu>
 <guimenuitem>Quit</guimenuitem>
 </menuchoice></term>
-<listitem><para>Close KDevelop.</para></listitem>
+<listitem><para>Close TDevelop.</para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -1666,7 +1666,7 @@ Execute Command...
 </menuchoice></term>
 <listitem><para>
 Filters selection through external command using 
-<link linkend="KDevFilter">the Filter plugin</link>.
+<link linkend="TDevFilter">the Filter plugin</link>.
 </para></listitem>
 </varlistentry>
 
@@ -1840,10 +1840,10 @@ Configure Editor...
 <varlistentry>
 <term><menuchoice>
 <guimenu>Settings</guimenu>
-<guimenuitem>Configure KDevelop...</guimenuitem>
+<guimenuitem>Configure TDevelop...</guimenuitem>
 </menuchoice></term>
 <listitem><para>
-Configure KDevelop...
+Configure TDevelop...
 </para></listitem>
 </varlistentry>
 
@@ -1866,7 +1866,7 @@ Configure KDevelop...
 <varlistentry>
 <term><menuchoice>
 <guimenu>Help</guimenu>
-<guimenuitem>KDevelop Handbook</guimenuitem>
+<guimenuitem>TDevelop Handbook</guimenuitem>
 </menuchoice></term>
 <listitem><para>View this document.</para></listitem>
 </varlistentry>
@@ -1960,10 +1960,10 @@ Info Page...
 <varlistentry>
 <term><menuchoice>
 <guimenu>Help</guimenu>
-<guimenuitem>About KDevelop...</guimenuitem>
+<guimenuitem>About TDevelop...</guimenuitem>
 </menuchoice></term>
 <listitem><para>Display some brief information about
-KDevelop's version number, authors and license agreement.</para></listitem>
+TDevelop's version number, authors and license agreement.</para></listitem>
 </varlistentry>
 
 <varlistentry>
diff --git a/doc/tdevelop/getting-started.docbook b/doc/tdevelop/getting-started.docbook
index a805f393..39d7c4de 100644
--- a/doc/tdevelop/getting-started.docbook
+++ b/doc/tdevelop/getting-started.docbook
@@ -77,7 +77,7 @@ already did switch to another user interface mode some items may not be there as
 described or will behave slightly different. If in doubt which user interface
 mode your &tdevelop; currently uses, check with the
 <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure
-KDevelop...</guimenuitem> <guimenuitem>User Interface</guimenuitem></menuchoice>
+TDevelop...</guimenuitem> <guimenuitem>User Interface</guimenuitem></menuchoice>
 dialog.</para>
 </note>
 
@@ -416,7 +416,7 @@ and plugged-in tools to extend the basic &IDE; capabilities. The
 <para>The upper set of <guimenu>Tools</guimenu> menu entries will be provided by
 the editor plugin which is in use. You may select your favorite editor via
 <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure
-KDevelop...</guimenuitem> <guilabel>Editor</guilabel></menuchoice>. Once an
+TDevelop...</guimenuitem> <guilabel>Editor</guilabel></menuchoice>. Once an
 editable document file is selected, the upper part of the 
 <guimenu>Tools</guimenu> menu will provide advanced editing commands specific to
 the editor part in use.</para>
@@ -452,10 +452,10 @@ Also, you can configure shortcuts, toolbars, notifications, the editor and
 <varlistentry>
 <term><guimenu>Help</guimenu></term>
 <listitem>
-<para>Here you can open this KDevelop manual, look up terms in various
+<para>Here you can open this TDevelop manual, look up terms in various
 documentation files, open man pages (the traditional UNIX manual format) and
 info pages (the GNU manual format). Furthermore you can report bugs here or get
-some info about your current KDevelop version and its authors.</para>
+some info about your current TDevelop version and its authors.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -497,7 +497,7 @@ different main purpose.</para>
 actual work. More tools to work on that project will be available then. The
 actual number of tool views depends on the <link linkend="plugin-tools">Plugin
 Tools</link> being currently available to &tdevelop;. You will find more on this
-topic in the <link linkend="setup">Configuring KDevelop</link> chapter.</para>
+topic in the <link linkend="setup">Configuring TDevelop</link> chapter.</para>
 
 <para>Currently, with no project open and the default number of plugin tools
 loaded, you will find the following tool views. Clicking on a tab will open
@@ -627,7 +627,7 @@ adjusted.</para>
 
 <note>
 <para>If you want to know more about &tdevelop; configuration, have a look at
-the <link linkend="setup">Configuring KDevelop</link> chapter.</para>
+the <link linkend="setup">Configuring TDevelop</link> chapter.</para>
 </note>
 
 <sect2 id="gettingstarted-configure-general">
@@ -635,8 +635,8 @@ the <link linkend="setup">Configuring KDevelop</link> chapter.</para>
 
 <para>To configure &tdevelop;, click the
 <menuchoice><guimenu>Settings</guimenu></menuchoice> menu and select
-<menuchoice><guimenuitem>Configure KDevelop...</guimenuitem></menuchoice>. The
-<guilabel>Configure KDevelop</guilabel> dialog will pop up, showing the
+<menuchoice><guimenuitem>Configure TDevelop...</guimenuitem></menuchoice>. The
+<guilabel>Configure TDevelop</guilabel> dialog will pop up, showing the
 following <guilabel>General</guilabel> settings page to the right.</para>
 
 <screenshot>
@@ -770,7 +770,7 @@ mandatory that the <emphasis>KDELibs Apidocs</emphasis> were present when
 perform the  <link linkend="gettingstarted-edit-defs">identifier lookup
 examples</link> later in this chapter, make sure that this documentation exists
 and is accessible to &tdevelop;. See <link linkend="tdevelop-install">Installing
-KDevelop</link> fore more detail.</para>
+TDevelop</link> fore more detail.</para>
 </listitem>
 </itemizedlist>
 </note>
@@ -1127,7 +1127,7 @@ and <filename>hello.kdevses</filename>.</para>
 
 <para>Of particular importance in each project is the
 <filename>xxx.tdevelop</filename> (where <quote>xxx</quote> denotes the project
-name) file. It is the main <emphasis>KDevelop 3 Project File</emphasis> and
+name) file. It is the main <emphasis>TDevelop 3 Project File</emphasis> and
 needed if you later want load this project into the &IDE;.</para>
 
 <warning>
@@ -1789,7 +1789,7 @@ this behavior.</para>
 <procedure>
 <step>
 <para>Select <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure
-KDevelop...</guimenuitem></menuchoice></para>
+TDevelop...</guimenuitem></menuchoice></para>
 </step>
 <step>
 <para>In the left hand icon bar on the dialog popup click the <guilabel>User
diff --git a/doc/tdevelop/index.docbook b/doc/tdevelop/index.docbook
index d412dc35..9e83802d 100644
--- a/doc/tdevelop/index.docbook
+++ b/doc/tdevelop/index.docbook
@@ -76,7 +76,7 @@ Entries which require special treatment are marked with comments starting with '
 <book lang="&language;">
 
 <bookinfo>
-  <title>&tdevelop; User Manual</title>
+  <title>&tdevelop; Handbook</title>
 
   <date>2006-06-19</date>
   <releaseinfo>&kdevrelease;</releaseinfo>
diff --git a/doc/tdevelop/nutshell.docbook b/doc/tdevelop/nutshell.docbook
index ca0a4276..93db1506 100644
--- a/doc/tdevelop/nutshell.docbook
+++ b/doc/tdevelop/nutshell.docbook
@@ -37,7 +37,7 @@ smaller tool view tabs in IDEAl Mode</link></term>
 <para>By default &tdevelop; starts with large text-based tool tip tabs
 around the work area. You may change this look to &eg; save space in the
 &tdevelop; configuration dialog (<menuchoice><guimenu>Settings</guimenu>
-<guimenuitem>Configure KDevelop...</guimenuitem> <guimenuitem>User
+<guimenuitem>Configure TDevelop...</guimenuitem> <guimenuitem>User
 Interface</guimenuitem></menuchoice>).</para>
 <para>If you use an older &tdevelop; 3 version, this configuration dialog
 may not be available. To change the toolview tabs display manually, place a
diff --git a/doc/tdevelop/plugin-tools.docbook b/doc/tdevelop/plugin-tools.docbook
index ad10fb16..174767e2 100644
--- a/doc/tdevelop/plugin-tools.docbook
+++ b/doc/tdevelop/plugin-tools.docbook
@@ -14,11 +14,11 @@ For example, in the file menu there is a Quick Open feature, but only if
 it's enabled in the Project - Project Options dialog.
 </para>
  
-<para>Technically, plugins are based on the KDevPlugin class defined in 
+<para>Technically, plugins are based on the TDevPlugin class defined in 
 lib/interfaces/kdevplugin.h. The following is taken from a comment from there.</para>
 
 <para> 
-KDevPlugin is the base class for all TDevelop plugins.
+TDevPlugin is the base class for all TDevelop plugins.
 A plugin is a component which is loaded into TDevelop shell at startup or by request.
 A plugin has a scope that can be either:
 <itemizedlist>
@@ -32,7 +32,7 @@ A plugin has a scope that can be either:
 are not selectable by user in plugin configuration pages.</para>
 
 <para>Global plugins are plugins which require only shell to be loaded and do not operate on 
-KDevProject interface and/or do not use project wide information.
+TDevProject interface and/or do not use project wide information.
 For example, the uimode plugin allows a developer to select which user interface they wish to use. 
 </para>
 
@@ -43,13 +43,13 @@ The Automake Manager, for example, only needs to be active when an Automake base
 
 <para>As stated above, core plugins cannot be disabled. Global plugins can be
 enabled/disabled in <menuchoice><guimenu>Settings</guimenu>
-<guimenuitem>Configure KDevelop...</guimenuitem></menuchoice>
+<guimenuitem>Configure TDevelop...</guimenuitem></menuchoice>
 under <guibutton>Plugins</guibutton>.
 Project plugins can be
 enabled/disabled in <menuchoice><guimenu>Project</guimenu>
 <guimenuitem>Project Options...</guimenuitem></menuchoice>
 under <guibutton>Plugins</guibutton>.
-Active plugins can have many effects on KDevelop. 
+Active plugins can have many effects on TDevelop. 
 Depending on their function, they may add extra menus, extra menu items, extra tool buttons, etc. 
 </para>
 
@@ -67,13 +67,13 @@ it is because the plugin authors made them this way.</para>
 
 <para>Scope: Core</para>
 <itemizedlist>
-<listitem><formalpara id="KDevAppWizard">
+<listitem><formalpara id="TDevAppWizard">
 <title>Application Wizard</title>
 <para>Application Wizard</para></formalpara></listitem>
-<listitem><formalpara id="KDevDiff">
+<listitem><formalpara id="TDevDiff">
 <title>Difference Viewer</title>
 <para>Difference Viewer</para></formalpara></listitem>
-<listitem><formalpara id="KDevFileCreate">
+<listitem><formalpara id="TDevFileCreate">
 <title>FileCreate</title>
 <para>FileCreate</para></formalpara></listitem>
 <listitem><formalpara id="KDevFullScreen">
@@ -85,7 +85,7 @@ it is because the plugin authors made them this way.</para>
 <listitem><formalpara id="KDevUIChooser">
 <title>User-Interface Selection</title>
 <para>Provides a dialog for UI-mode selection.</para></formalpara></listitem>
-<listitem><formalpara id="KDevVCSManager">
+<listitem><formalpara id="TDevVCSManager">
 <title>VCSManager</title>
 <para>Version Control System Manager </para></formalpara></listitem>
 </itemizedlist>
@@ -95,13 +95,13 @@ it is because the plugin authors made them this way.</para>
 <listitem><formalpara id="KDevAbbrev">
 <title>Abbreviation Expansion</title>
 <para>Provides support for customizable abbreviations - short words which expand into commonly needed code structures.</para></formalpara></listitem>
-<listitem><formalpara id="KDevDocumentation">
+<listitem><formalpara id="TDevDocumentation">
 <title>Documentation</title>
 <para>The Documentation plugin offers browsing and searching in local and online documentation with support for multiple documentation systems.</para></formalpara></listitem>
 <listitem><formalpara id="KDevfilelist">
 <title>FileList</title>
 <para>Provides a list of all currently open files. (Handy when the tab bar is not quite wide enough.)</para></formalpara></listitem>
-<listitem><formalpara id="KDevFileSelector">
+<listitem><formalpara id="TDevFileSelector">
 <title>File Selector</title>
 <para>Powerful network transparent file browser utility.</para></formalpara></listitem>
 <listitem><formalpara>
@@ -109,14 +109,14 @@ it is because the plugin authors made them this way.</para>
 <para>Provides a way of manipulating editor text using commandline tools. Appears in the Tools menu.</para></formalpara></listitem>
 <listitem><formalpara id="KDevGrepView">
 <title>Grep Frontend</title>
-<para>Integrates "find|grep" in KDevelop - allows fast searching of multiple files using patterns or regular expressions.</para></formalpara></listitem>
+<para>Integrates "find|grep" in TDevelop - allows fast searching of multiple files using patterns or regular expressions.</para></formalpara></listitem>
 <listitem><formalpara id="KDevKonsoleView">
 <title>Embedded Konsole</title>
-<para>This plugin gives KDevelop an embedded konsole for quick and easy command line access.</para></formalpara></listitem>
+<para>This plugin gives TDevelop an embedded konsole for quick and easy command line access.</para></formalpara></listitem>
 <listitem><formalpara id="KDevOpenWith">
 <title>"Open with" Menu Addon</title>
-<para>This plugin provides additional "open" alternatives for various context menus in KDevelop.</para></formalpara></listitem>
-<listitem><formalpara id="KDevPartExplorer">
+<para>This plugin provides additional "open" alternatives for various context menus in TDevelop.</para></formalpara></listitem>
+<listitem><formalpara id="TDevPartExplorer">
 <title>Part Explorer Tool</title>
 <para>A Graphical tool for performing TDETrader-like queries about registered services</para></formalpara></listitem>
 <listitem><formalpara id="KDevRegexpTest">
@@ -127,7 +127,7 @@ it is because the plugin authors made them this way.</para>
 <para>This plugin is an interactive projectwide "Search and Replace" tool. Search using string or regexp matching, and select the replacements to be made from a preview before the action is finalized. When loaded it appears in the Edit menu.</para></formalpara></listitem>
 <listitem><formalpara id="KDevscripting">
 <title>Scripting</title>
-<para>The Scripting plugin offers KScript based scripting of the KDevelop application</para></formalpara></listitem>
+<para>The Scripting plugin offers KScript based scripting of the TDevelop application</para></formalpara></listitem>
 <listitem><formalpara id="Code_Snippets">
 <title>Code Snippets</title>
 <para>This plugin allows you to store code snippets and add them to your code</para></formalpara></listitem>
@@ -242,13 +242,13 @@ templates than for &Java;.
 <para>
 The set of code templates is configurable. If the plugin is enabled, you can see
 which ones are available in the <menuchoice><guimenu>Settings</guimenu>
-<guimenuitem>Configure KDevelop...</guimenuitem></menuchoice>
+<guimenuitem>Configure TDevelop...</guimenuitem></menuchoice>
 dialog under <guibutton>Abbreviations</guibutton>.
 </para>
 </listitem>
 
 <listitem>
-<formalpara id="KDevFilter">
+<formalpara id="TDevFilter">
 <title>The <command>filter</command> Plugin</title>
 <indexterm zone="plugin-tools"><primary><command>filter</command></primary></indexterm>
 
diff --git a/doc/tdevelop/project-advanced.docbook b/doc/tdevelop/project-advanced.docbook
index a87b1658..81c0e4a6 100644
--- a/doc/tdevelop/project-advanced.docbook
+++ b/doc/tdevelop/project-advanced.docbook
@@ -42,10 +42,10 @@
 </sect2> <!-- loading-project -->
 
 <sect2 id="converting-projects">
-<title>Converting Old KDevelop Project Files</title>
+<title>Converting Old TDevelop Project Files</title>
 
 <para>
-&tdevelop; allows you to open old KDevelop 2.x project files and convert them to &tdevelop; files. To do so go to <guimenuitem>Open Project...</guimenuitem> and select <guilabel>KDevelop 2 project files</guilabel> in the <guilabel>Filter:</guilabel>. Then select project file you want to open. The project gets converted to &tdevelop; and saved as a <guilabel>&tdevelop; project file</guilabel>.
+&tdevelop; allows you to open old TDevelop 2.x project files and convert them to &tdevelop; files. To do so go to <guimenuitem>Open Project...</guimenuitem> and select <guilabel>TDevelop 2 project files</guilabel> in the <guilabel>Filter:</guilabel>. Then select project file you want to open. The project gets converted to &tdevelop; and saved as a <guilabel>&tdevelop; project file</guilabel>.
 </para>
 
 </sect2> <!-- converting-projects -->
diff --git a/doc/tdevelop/setup.docbook b/doc/tdevelop/setup.docbook
index 0c078a3b..2c448945 100644
--- a/doc/tdevelop/setup.docbook
+++ b/doc/tdevelop/setup.docbook
@@ -271,14 +271,14 @@ This let you choose the way you want <filename>.ui</filename> files to be displa
   </para><para>This uses &tdevelop; own designer embedded within &tdevelop;</para></listitem>
   <listitem><para>
   Run &tdevelop;'s designer as a separate application
-  </para><para>The KDevDesigner application will be run separately in its own window.</para>
+  </para><para>The TDevDesigner application will be run separately in its own window.</para>
 <screenshot>
   <mediaobject>
     <imageobject>
-      <imagedata fileref="kdevdesigner.png" format="PNG"/>
+      <imagedata fileref="tdevdesigner.png" format="PNG"/>
     </imageobject>
     <caption><para>
-   KDevDesigner in its own window
+   TDevDesigner in its own window
     </para></caption>
   </mediaobject>
 </screenshot>
@@ -294,7 +294,7 @@ Run Qt Designer
 <term id="terminal-emulation"><guilabel>Terminal Emulation</guilabel></term>
 <listitem>
 <para>
-You choose here which terminal you want to be integrated within KDevelop.
+You choose here which terminal you want to be integrated within TDevelop.
 </para>
 <itemizedlist>
   <listitem><para>
@@ -349,7 +349,7 @@ A typical example of this user interface mode is Borland Delphi 6.0.</para></lis
 </itemizedlist>
 
 <para>
-To switch the user interface mode select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &tdevelop;...</guimenuitem> </menuchoice> from the menus. The <guilabel>Customize KDevelop</guilabel> dialog will pop up, where you have to select <guilabel>User Interface</guilabel> in the left hand tree. This will display the following settings dialog to the right.</para>
+To switch the user interface mode select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &tdevelop;...</guimenuitem> </menuchoice> from the menus. The <guilabel>Customize TDevelop</guilabel> dialog will pop up, where you have to select <guilabel>User Interface</guilabel> in the left hand tree. This will display the following settings dialog to the right.</para>
 
 <screenshot>
   <mediaobject>
@@ -524,7 +524,7 @@ The active toolview window must be shown fixed (non-overlap mode), sharing the w
 <sect2 id="setup-editor">
 <title>Selecting an Editor</title>
 
-<para>&tdevelop; allows you to select your favorite text editor tool. Mark the <guilabel>Editor</guilabel> entry in the left hand side selections tree of the <guilabel>Configure KDevelop</guilabel> window. The following dialog will be displayed to the right.
+<para>&tdevelop; allows you to select your favorite text editor tool. Mark the <guilabel>Editor</guilabel> entry in the left hand side selections tree of the <guilabel>Configure TDevelop</guilabel> window. The following dialog will be displayed to the right.
 </para>
 
 <screenshot>
@@ -568,7 +568,7 @@ Changing the editor will not effect already open files. There are two possibilit
 </para></note>
 
 <important id="setup-editor-tdeparts"><para>
-KDevelop lets you use editor interfaces which have registered with &kde; and that provide a KatePart interface. If you miss one one of the selections shown above check your &kde; installation if the corresponding KPart was correctly installed.
+TDevelop lets you use editor interfaces which have registered with &kde; and that provide a KatePart interface. If you miss one one of the selections shown above check your &kde; installation if the corresponding KPart was correctly installed.
 </para></important>
 
 <para>What to do if the file has been changed externally:</para>
@@ -663,7 +663,7 @@ The reformat source feature is currently available for C, C++, and &Java; only.
 </para></note>
 
 <para>
-To set up a specific format style, select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &tdevelop;..</guimenuitem> </menuchoice> from the menubar. The <guilabel>Customize KDevelop</guilabel> dialog will pop up, where you have to select <guilabel>Source Formatter</guilabel> in the left hand tree. This will display a series of three settings dialog tabs to the right, namely a <link linkend="setup-format-general">General Formatting Setup</link>, a <link linkend="setup-format-indent">Indentation Style Setup</link>, and a <link linkend="setup-format-other">Other Formatting Setup</link>.
+To set up a specific format style, select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &tdevelop;..</guimenuitem> </menuchoice> from the menubar. The <guilabel>Customize TDevelop</guilabel> dialog will pop up, where you have to select <guilabel>Source Formatter</guilabel> in the left hand tree. This will display a series of three settings dialog tabs to the right, namely a <link linkend="setup-format-general">General Formatting Setup</link>, a <link linkend="setup-format-indent">Indentation Style Setup</link>, and a <link linkend="setup-format-other">Other Formatting Setup</link>.
 </para>
 
 <tip><para>
@@ -997,7 +997,7 @@ split a long line apart. For C/C++ code this can be controlled here.</para>
 <title>Setting Up the Code Snippets Tool</title>
 
 <para>
-When editing in &tdevelop; you can store often used parts of code as <link linkend="editing-snippets">Code Snippets</link>. To configure the capabilities of the code snippets part select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &tdevelop;..</guimenuitem> </menuchoice> from the menubar. The <guilabel>Customize KDevelop</guilabel> dialog will pop up, where you have to select <guilabel>Code Snippets</guilabel> in the left hand tree. This will show the following dialog in the right hand side.
+When editing in &tdevelop; you can store often used parts of code as <link linkend="editing-snippets">Code Snippets</link>. To configure the capabilities of the code snippets part select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &tdevelop;..</guimenuitem> </menuchoice> from the menubar. The <guilabel>Customize TDevelop</guilabel> dialog will pop up, where you have to select <guilabel>Code Snippets</guilabel> in the left hand tree. This will show the following dialog in the right hand side.
 </para>
 
 <screenshot>
@@ -1089,7 +1089,7 @@ system.
 <para>The behaviour of the <guilabel>File Selector</guilabel> can be highly
 configured. Select <menuchoice> <guimenu>Settings</guimenu>
 <guimenuitem>Configure &tdevelop;..</guimenuitem> </menuchoice> from the
-menubar. The <guilabel>Customize KDevelop</guilabel> dialog will pop up,
+menubar. The <guilabel>Customize TDevelop</guilabel> dialog will pop up,
 where you have to select <guilabel>File Selector</guilabel> in the left hand
 tree. This will show the following dialog in the right hand side.</para>
 
@@ -1330,7 +1330,7 @@ If &tdevelop; was automatically restarted by the &kde; session manager the chang
 </para></note>
 
 <para>
-You may set up contents and behaviour of the various parts of this documentation window if you select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &tdevelop;..</guimenuitem> </menuchoice> from the menubar. The <guilabel>Customize KDevelop</guilabel> dialog will pop up, where you have to select <guilabel>Documentation</guilabel> in the left hand window.
+You may set up contents and behaviour of the various parts of this documentation window if you select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &tdevelop;..</guimenuitem> </menuchoice> from the menubar. The <guilabel>Customize TDevelop</guilabel> dialog will pop up, where you have to select <guilabel>Documentation</guilabel> in the left hand window.
 </para>
 
 <para>
@@ -1662,10 +1662,10 @@ You must put the &API; of your current project into this <guilabel>Doxygen Docum
 </sect3> <!-- setup-docu-general-dox -->
 
 <sect3 id="setup-docu-general-toc">
-<title>Handling Structured Documentation (KDevelopTOC Files)</title>
+<title>Handling Structured Documentation (TDevelopTOC Files)</title>
 
 <para>
-The main bulk of the &tdevelop; documentation facility provides immediate access to structured documentation, local as well as remote ones. You can configure this on the <guilabel>KDevelopTOC Documentation Collection</guilabel> page.
+The main bulk of the &tdevelop; documentation facility provides immediate access to structured documentation, local as well as remote ones. You can configure this on the <guilabel>TDevelopTOC Documentation Collection</guilabel> page.
 </para>
 
 <screenshot>
@@ -1674,17 +1674,17 @@ The main bulk of the &tdevelop; documentation facility provides immediate access
       <imagedata fileref="configure-docu-toc.png" format="PNG"/>
     </imageobject>
     <caption><para>
-    Providing KDevelopTOC structured documentation access
+    Providing TDevelopTOC structured documentation access
     </para></caption>
   </mediaobject>
 </screenshot>
 
 <para>
-&tdevelop; comes with a bunch of predefined KDevelopTOC files which are automatically entered in the table at installation time. To keep the display manageable only the most often used will initially be marked for display. If you want to see another documentation, mark the <guilabel>TOC</guilabel> check box in the <link linkend="setup-docu-columns">setup table</link>.
+&tdevelop; comes with a bunch of predefined TDevelopTOC files which are automatically entered in the table at installation time. To keep the display manageable only the most often used will initially be marked for display. If you want to see another documentation, mark the <guilabel>TOC</guilabel> check box in the <link linkend="setup-docu-columns">setup table</link>.
 </para>
 
 <para>
-KDevelopTOC files cannot be indexed to perform a full text search because they usually point to a remote location. On the other hand, such a <filename>.toc</filename> file can have an index manually defined, using the <computeroutput>&lt;index&gt;</computeroutput> tag. Thus the <guilabel>Index</guilabel> check box will be enabled ony when &tdevelop; finds an <computeroutput>&lt;index&gt;</computeroutput> tag in the <filename>.toc</filename> file. (For more detail see the description below in the <link linkend="setup-docu-general-toc-files">&tdevelop; TOC Files</link> section.)
+TDevelopTOC files cannot be indexed to perform a full text search because they usually point to a remote location. On the other hand, such a <filename>.toc</filename> file can have an index manually defined, using the <computeroutput>&lt;index&gt;</computeroutput> tag. Thus the <guilabel>Index</guilabel> check box will be enabled ony when &tdevelop; finds an <computeroutput>&lt;index&gt;</computeroutput> tag in the <filename>.toc</filename> file. (For more detail see the description below in the <link linkend="setup-docu-general-toc-files">&tdevelop; TOC Files</link> section.)
 </para>
 <para>
 The <guilabel>Search</guilabel> check box in the <link linkend="setup-docu-columns">setup table</link> will alway be disabled.
@@ -1720,7 +1720,7 @@ Such structured access is made possible through the use of special <quote>table
 <term>Standard Directory of &tdevelop; TOC Files</term>
 <listitem>
 <para>
-When &tdevelop; was installed usually a series of predefined <filename>.toc</filename> files has been put into the <filename class="directory">$TDEDIR/share/apps/kdevdocumentation/tocs</filename> directory. These are fairly simple, structured text files. You may look at them using a text editor or other text display facility.
+When &tdevelop; was installed usually a series of predefined <filename>.toc</filename> files has been put into the <filename class="directory">$TDEDIR/share/apps/tdevdocumentation/tocs</filename> directory. These are fairly simple, structured text files. You may look at them using a text editor or other text display facility.
 </para>
 </listitem>
 </varlistentry></variablelist>
diff --git a/doc/tdevelop/survey-manual.docbook b/doc/tdevelop/survey-manual.docbook
index 0bd59c8d..93c1fd63 100644
--- a/doc/tdevelop/survey-manual.docbook
+++ b/doc/tdevelop/survey-manual.docbook
@@ -198,7 +198,7 @@ necessary and why you need an &IDE;.</para>
   </para></listitem>
 -->
 <varlistentry><term>    
-<link linkend="app-uimodes-examples">KDevelop User Interface Mode Examples </link>
+<link linkend="app-uimodes-examples">TDevelop User Interface Mode Examples </link>
 </term><listitem><para>Shows user interface modes.
 </para></listitem></varlistentry>
   
diff --git a/doc/tdevelop/kdevdesigner.png b/doc/tdevelop/tdevdesigner.png
index 4fa74c68..4fa74c68 100644
--- a/doc/tdevelop/kdevdesigner.png
+++ b/doc/tdevelop/tdevdesigner.png
diff --git a/doc/tdevelop/tdevelop-install.docbook b/doc/tdevelop/tdevelop-install.docbook
index 14f7236b..663d9d08 100644
--- a/doc/tdevelop/tdevelop-install.docbook
+++ b/doc/tdevelop/tdevelop-install.docbook
@@ -699,7 +699,7 @@ The <command>tdebuildsycoca</command> command does not run from within the root.
 API is the short form of <quote>Application Program Interface</quote>. Actually such an API cotains a series of descriptions (&ie; calling conventions) by which an application program can access the operating system and other services. In our context, however, a broader definition was adopted. The API of a &kde; or &Qt; application is an abstract of the classes and methods interfaces, a synopsis to be used like a dictionary to navigate the sources.
 </para>
 <para>
-There is a version of the most current API available at the <ulink url="http://www.kdevelop.org/HEAD/doc/api/html/index.html">KDevelop-Home website</ulink>. It will be automatically updated every 24 hours so you can keep up.
+There is a version of the most current API available at the <ulink url="http://www.kdevelop.org/HEAD/doc/api/html/index.html">TDevelop-Home website</ulink>. It will be automatically updated every 24 hours so you can keep up.
 </para>
 <para>
 Alas, this version is best used read-only over the internet. If you do not always have internet access you may as well build your own API documentation from the &tdevelop; sources. To do so, you must tell the automake system where to find the KDELIBS API in your system. This is accomplished by the special option <option>--with-tdelibsdoxy-dir</option> in the <command>configure</command> command when you prepare to compile the &tdevelop; sources:
diff --git a/doc/tdevelop/tdevelop-scripting.docbook b/doc/tdevelop/tdevelop-scripting.docbook
index 1b722f2d..1cb8a294 100644
--- a/doc/tdevelop/tdevelop-scripting.docbook
+++ b/doc/tdevelop/tdevelop-scripting.docbook
@@ -7,12 +7,12 @@
   </authorgroup>
 </chapterinfo>
 
-<title>Using Scripts in KDevelop</title>
+<title>Using Scripts in TDevelop</title>
 
 <sect1 id="running-scripts">
 <title>Running Scripts</title>
 <para>
-  To access a script that is available to &tdevelop; use the <menuchoice><guimenu>Tools</guimenu><guimenuitem>Scripts</guimenuitem></menuchoice> menu.  If there there is no such menu item then there are no installed scripts available to KDevelop.
+  To access a script that is available to &tdevelop; use the <menuchoice><guimenu>Tools</guimenu><guimenuitem>Scripts</guimenuitem></menuchoice> menu.  If there there is no such menu item then there are no installed scripts available to TDevelop.
 </para>
 </sect1>
 
diff --git a/doc/tdevelop/tdevelop-survey.docbook b/doc/tdevelop/tdevelop-survey.docbook
index 0f117958..7aca28a9 100644
--- a/doc/tdevelop/tdevelop-survey.docbook
+++ b/doc/tdevelop/tdevelop-survey.docbook
@@ -145,7 +145,7 @@
   <primary>switch UI modes</primary></indexterm>
 
 <para>
-To switch the user interface mode select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure KDevelop...</guimenuitem> </menuchoice> from the menus. The <guilabel>Customize KDevelop</guilabel> dialog will pop up, where you have to select <guilabel>User Interface</guilabel> in the left hand tree. This will display the settings page shown below.
+To switch the user interface mode select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure TDevelop...</guimenuitem> </menuchoice> from the menus. The <guilabel>Customize TDevelop</guilabel> dialog will pop up, where you have to select <guilabel>User Interface</guilabel> in the left hand tree. This will display the settings page shown below.
 </para>
 
 <screenshot>