Additional renaming of kde to tde

711 files changed, 1458 insertions, 1458 deletions

diff --git a/languages/Makefile.am b/languages/Makefile.am
index 1172b71c..52efa309 100644
--- a/languages/Makefile.am
+++ b/languages/Makefile.am
@@ -1,6 +1,6 @@
 ##
-## Do NOT remove the comments that start with "kdevelop:"
-## They are actually directives to the kdevelop plugin system
+## Do NOT remove the comments that start with "tdevelop:"
+## They are actually directives to the tdevelop plugin system
 ##
 ## The include_xxxx variables are controlled by configure.in.in
 ##
@@ -53,18 +53,18 @@ if include_sql
 SQL_LANGUAGE = sql
 endif
 
-#kdevelop: ADA_LANGUAGE = ada
-#kdevelop: BASH_LANGUAGE = bash
-#kdevelop: CPP_LANGUAGE = cpp
-#kdevelop: FORTRAN_LANGUAGE = fortran
-#kdevelop: JAVA_LANGUAGE = java
-#kdevelop: CSHARP_LANGUAGE = csharp
-#kdevelop: PASCAL_LANGUAGE = pascal
-#kdevelop: PERL_LANGUAGE = perl
-#kdevelop: PHP_LANGUAGE = php
-#kdevelop: PYTHON_LANGUAGE = python
-#kdevelop: RUBY_LANGUAGE = ruby
-#kdevelop: SQL_LANGUAGE = sql
+#tdevelop: ADA_LANGUAGE = ada
+#tdevelop: BASH_LANGUAGE = bash
+#tdevelop: CPP_LANGUAGE = cpp
+#tdevelop: FORTRAN_LANGUAGE = fortran
+#tdevelop: JAVA_LANGUAGE = java
+#tdevelop: CSHARP_LANGUAGE = csharp
+#tdevelop: PASCAL_LANGUAGE = pascal
+#tdevelop: PERL_LANGUAGE = perl
+#tdevelop: PHP_LANGUAGE = php
+#tdevelop: PYTHON_LANGUAGE = python
+#tdevelop: RUBY_LANGUAGE = ruby
+#tdevelop: SQL_LANGUAGE = sql
 
 SUBDIRS = lib $(ADA_LANGUAGE) $(BASH_LANGUAGE) $(CPP_LANGUAGE) $(CSHARP_LANGUAGE) \
 	$(FORTRAN_LANGUAGE) $(JAVA_LANGUAGE) $(PASCAL_LANGUAGE) \
diff --git a/languages/ada/CMakeLists.txt b/languages/ada/CMakeLists.txt
index 976f6902..e8d351b9 100644
--- a/languages/ada/CMakeLists.txt
+++ b/languages/ada/CMakeLists.txt
@@ -45,6 +45,6 @@ tde_add_kpart( libkdevadasupport AUTOMOC
     addclassdlg.ui addclass.cpp configproblemreporter.ui
     ada_utils.cpp adasupport.cpp AdaLexer.cpp AdaParser.cpp
     AdaTreeParserSuper.cpp AdaStoreWalker.cpp
-  LINK antlr-static kdevelop-shared
+  LINK antlr-static tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/ada/Makefile.am b/languages/ada/Makefile.am
index 4a7eb0c1..d45a2add 100644
--- a/languages/ada/Makefile.am
+++ b/languages/ada/Makefile.am
@@ -9,7 +9,7 @@ SUBDIRS = app_templates file_templates doc
 
 kde_module_LTLIBRARIES = libkdevadasupport.la
 libkdevadasupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN)
-libkdevadasupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la 				$(top_builddir)/lib/antlr/src/libantlr.la
+libkdevadasupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la 				$(top_builddir)/lib/antlr/src/libantlr.la
 
 libkdevadasupport_la_SOURCES = adasupportpart.cpp problemreporter.cpp backgroundparser.cpp addclassdlg.ui addclass.cpp configproblemreporter.ui ada_utils.cpp adasupport.cpp AdaLexer.cpp AdaParser.cpp AdaTreeParserSuper.cpp AdaStoreWalker.cpp
 
diff --git a/languages/ada/README.dox b/languages/ada/README.dox
index ccb7f0aa..d9cd67bd 100644
--- a/languages/ada/README.dox
+++ b/languages/ada/README.dox
@@ -21,7 +21,7 @@ with the one from <a href="ftp://fara.cs.uni-potsdam.de/incoming/CppCodeGenerato
 \unmaintained This part is currently un-maintained.
 
 \authors <a href="mailto:okellogg AT users.sourceforge.net">Oliver Kellogg</a>
-\authors <a href="mailto:roberto AT kdevelop.org">Roberto Raggi</a>
+\authors <a href="mailto:roberto AT tdevelop.org">Roberto Raggi</a>
 \authors <a href="mailto:cloudtemple AT mksat.net">Alexander Dymo</a>
 
 \feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
diff --git a/languages/ada/ada.store.g b/languages/ada/ada.store.g
index dbca7312..31dccf99 100644
--- a/languages/ada/ada.store.g
+++ b/languages/ada/ada.store.g
@@ -121,7 +121,7 @@ public:
 }
 
 /*
- * Only those rules that require specific action for the kdevelop
+ * Only those rules that require specific action for the tdevelop
  * class store are overloaded here.
  */
 
diff --git a/languages/ada/app_templates/CMakeLists.txt b/languages/ada/app_templates/CMakeLists.txt
index d5fd9bf2..e1d7ba22 100644
--- a/languages/ada/app_templates/CMakeLists.txt
+++ b/languages/ada/app_templates/CMakeLists.txt
@@ -13,4 +13,4 @@ add_subdirectory( adahello )
 
 install( FILES
     ada.appwizard
-  DESTINATION ${DATA_INSTALL_DIR}/kdevelop/profiles/IDE/CompiledLanguageIDE/AdaIDE )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/AdaIDE )
diff --git a/languages/ada/app_templates/Makefile.am b/languages/ada/app_templates/Makefile.am
index 3da5006f..de99e86a 100644
--- a/languages/ada/app_templates/Makefile.am
+++ b/languages/ada/app_templates/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = adahello
 
-profilesdir = $(kde_datadir)/kdevelop/profiles/IDE/CompiledLanguageIDE/AdaIDE
+profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/AdaIDE
 profiles_DATA = ada.appwizard
 
diff --git a/languages/ada/app_templates/adahello/CMakeLists.txt b/languages/ada/app_templates/adahello/CMakeLists.txt
index 5c0dbc7a..cbd00e6e 100644
--- a/languages/ada/app_templates/adahello/CMakeLists.txt
+++ b/languages/ada/app_templates/adahello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( adahello.tar.gz ALL
   COMMAND
-    tar zcf adahello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} main.adb app.kdevelop ada-Makefile app.kdevelop.filelist )
+    tar zcf adahello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} main.adb app.tdevelop ada-Makefile app.tdevelop.filelist )
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/adahello.tar.gz adahello.png
diff --git a/languages/ada/app_templates/adahello/Makefile.am b/languages/ada/app_templates/adahello/Makefile.am
index 45e04df7..5a970c91 100644
--- a/languages/ada/app_templates/adahello/Makefile.am
+++ b/languages/ada/app_templates/adahello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.adb app.kdevelop ada-Makefile app.kdevelop.filelist
+dataFiles = main.adb app.tdevelop ada-Makefile app.tdevelop.filelist
 
 ### no need to change below:
 template_DATA = adahello.kdevtemplate
diff --git a/languages/ada/app_templates/adahello/adahello.kdevtemplate b/languages/ada/app_templates/adahello/adahello.kdevtemplate
index 380f739b..0cc09da2 100644
--- a/languages/ada/app_templates/adahello/adahello.kdevtemplate
+++ b/languages/ada/app_templates/adahello/adahello.kdevtemplate
@@ -70,13 +70,13 @@ Archive=adahello.tar.gz
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
@@ -85,8 +85,8 @@ Dest=%{dest}/Makefile
 
 [FILE3]
 Type=install
-Source=%{src}/app.kdevelop.filelist
-Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist
+Source=%{src}/app.tdevelop.filelist
+Dest=%{dest}/%{APPNAMELC}.tdevelop.filelist
 
 [MkDir1]
 Type=mkdir
diff --git a/languages/ada/app_templates/adahello/app.kdevelop b/languages/ada/app_templates/adahello/app.kdevelop
index b430f6e8..a94f7e34 100644
--- a/languages/ada/app_templates/adahello/app.kdevelop
+++ b/languages/ada/app_templates/adahello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -81,4 +81,4 @@
    <type ext="ada"/>
   </useglobaltypes>
  </kdevfilecreate>
-</kdevelop>
+</tdevelop>
diff --git a/languages/ada/backgroundparser.cpp b/languages/ada/backgroundparser.cpp
index 2ee39af8..f38491b9 100644
--- a/languages/ada/backgroundparser.cpp
+++ b/languages/ada/backgroundparser.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2002 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                 *
+ *   roberto@tdevelop.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/ada/backgroundparser.h b/languages/ada/backgroundparser.h
index e07ff55f..0285ebb6 100644
--- a/languages/ada/backgroundparser.h
+++ b/languages/ada/backgroundparser.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2002 by Roberto Raggi
- * roberto@kdevelop.org
+ * roberto@tdevelop.org
  * Copyright (C) 2003 Oliver Kellogg
  * okellogg@users.sourceforge.net
  *
diff --git a/languages/ada/doc/ada.toc b/languages/ada/doc/ada.toc
index 434a5b6a..cb990b7a 100644
--- a/languages/ada/doc/ada.toc
+++ b/languages/ada/doc/ada.toc
@@ -1,5 +1,5 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>Ada</title>
 <base href="http://www.adahome.com/rm95"/>
 <tocsect1 name="General" url="rm9x-01.html">
@@ -127,4 +127,4 @@
 	<tocsect2 name="Streams" url="rm9x-13-13.html"></tocsect2>
 	<tocsect2 name="Freezing Rules" url="rm9x-13-14.html"></tocsect2>
 </tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/ada/doc/ada_bugs_gcc.toc b/languages/ada/doc/ada_bugs_gcc.toc
index 9c543f0c..0740e7d2 100644
--- a/languages/ada/doc/ada_bugs_gcc.toc
+++ b/languages/ada/doc/ada_bugs_gcc.toc
@@ -1,7 +1,7 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>Ada bugs (GCC)</title>
 <base href="http://gcc.gnu.org/bugzilla/"/>
 <tocsect1 name="Query" url="query.cgi">
 </tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp
index 616f8449..39bbd91d 100644
--- a/languages/ada/problemreporter.cpp
+++ b/languages/ada/problemreporter.cpp
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2002 by Roberto Raggi <roberto@kdevelop.org>
+   Copyright (C) 2002 by Roberto Raggi <roberto@tdevelop.org>
    Copyright (C) 2003 Oliver Kellogg <okellogg@users.sourceforge.net>
 
    This library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
 
 #include <tqfileinfo.h>
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kparts/part.h>
 #include <ktexteditor/editinterface.h>
 #include <ktexteditor/document.h>
diff --git a/languages/ada/problemreporter.h b/languages/ada/problemreporter.h
index 5ac12154..dfad5a82 100644
--- a/languages/ada/problemreporter.h
+++ b/languages/ada/problemreporter.h
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2002 by Roberto Raggi <roberto@kdevelop.org>
+   Copyright (C) 2002 by Roberto Raggi <roberto@tdevelop.org>
    Copyright (C) 2003 Oliver Kellogg <okellogg@users.sourceforge.net>
 
    This library is free software; you can redistribute it and/or
diff --git a/languages/bash/CMakeLists.txt b/languages/bash/CMakeLists.txt
index 0d887e4a..9998693d 100644
--- a/languages/bash/CMakeLists.txt
+++ b/languages/bash/CMakeLists.txt
@@ -37,6 +37,6 @@ install( FILES kdevbashsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevbashsuppor
 
 tde_add_kpart( libkdevbashsupport AUTOMOC
   SOURCES bashsupport_part.cpp
-  LINK kdevelop-shared
+  LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/bash/Makefile.am b/languages/bash/Makefile.am
index 90b94689..5916563a 100644
--- a/languages/bash/Makefile.am
+++ b/languages/bash/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = app_templates doc
 
 kde_module_LTLIBRARIES = libkdevbashsupport.la
 libkdevbashsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevbashsupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la
+libkdevbashsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
 libkdevbashsupport_la_SOURCES = bashsupport_part.cpp
 
diff --git a/languages/bash/app_templates/CMakeLists.txt b/languages/bash/app_templates/CMakeLists.txt
index 7aa79062..57aef895 100644
--- a/languages/bash/app_templates/CMakeLists.txt
+++ b/languages/bash/app_templates/CMakeLists.txt
@@ -13,4 +13,4 @@ add_subdirectory( bashhello )
 
 install( FILES
     bash.appwizard
-  DESTINATION ${DATA_INSTALL_DIR}/kdevelop/profiles/IDE/ScriptingLanguageIDE/ShellIDE )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/ScriptingLanguageIDE/ShellIDE )
diff --git a/languages/bash/app_templates/Makefile.am b/languages/bash/app_templates/Makefile.am
index 7dbe86af..ef118c97 100644
--- a/languages/bash/app_templates/Makefile.am
+++ b/languages/bash/app_templates/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = bashhello
-profilesdir = $(kde_datadir)/kdevelop/profiles/IDE/ScriptingLanguageIDE/ShellIDE
+profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/ScriptingLanguageIDE/ShellIDE
 profiles_DATA = bash.appwizard
diff --git a/languages/bash/app_templates/bashhello/CMakeLists.txt b/languages/bash/app_templates/bashhello/CMakeLists.txt
index 3e7aba81..69abf15c 100644
--- a/languages/bash/app_templates/bashhello/CMakeLists.txt
+++ b/languages/bash/app_templates/bashhello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( bashhello.tar.gz ALL
   COMMAND
-    tar zcf bashhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} app.sh app.kdevelop )
+    tar zcf bashhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} app.sh app.tdevelop )
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/bashhello.tar.gz bashhello.png
diff --git a/languages/bash/app_templates/bashhello/Makefile.am b/languages/bash/app_templates/bashhello/Makefile.am
index 45e403b8..b26692b4 100644
--- a/languages/bash/app_templates/bashhello/Makefile.am
+++ b/languages/bash/app_templates/bashhello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.sh app.kdevelop
+dataFiles = app.sh app.tdevelop
 templateName = bashhello
 
 ### no need to change below:
diff --git a/languages/bash/app_templates/bashhello/app.kdevelop b/languages/bash/app_templates/bashhello/app.kdevelop
index 40e783a4..cab08799 100644
--- a/languages/bash/app_templates/bashhello/app.kdevelop
+++ b/languages/bash/app_templates/bashhello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -79,4 +79,4 @@
 			<type ext="sh"/>
     </useglobaltypes>
   </kdevfilecreate>
-</kdevelop>
+</tdevelop>
diff --git a/languages/bash/app_templates/bashhello/bashhello.kdevtemplate b/languages/bash/app_templates/bashhello/bashhello.kdevtemplate
index e62b1514..b9e7bd11 100644
--- a/languages/bash/app_templates/bashhello/bashhello.kdevtemplate
+++ b/languages/bash/app_templates/bashhello/bashhello.kdevtemplate
@@ -69,8 +69,8 @@ Archive=bashhello.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/bash/doc/bash.toc b/languages/bash/doc/bash.toc
index 060c59c7..75151d6b 100644
--- a/languages/bash/doc/bash.toc
+++ b/languages/bash/doc/bash.toc
@@ -1,5 +1,5 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>Bash Reference Manual</title>
 <base href="http://bashdb.sourceforge.net/"/>
 <tocsect1 name="Introduction" url="bashref.html#SEC1">
@@ -76,5 +76,5 @@
 <tocsect1 name="Parameter and Variable Index" url="bashref.html#SEC136"></tocsect1>
 <tocsect1 name="Function Index" url="bashref.html#SEC137"></tocsect1>
 <tocsect1 name="Concept Index" url="bashref.html#SEC138"></tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
 
diff --git a/languages/bash/doc/bash_bugs.toc b/languages/bash/doc/bash_bugs.toc
index aa7b42e3..6ba61863 100644
--- a/languages/bash/doc/bash_bugs.toc
+++ b/languages/bash/doc/bash_bugs.toc
@@ -1,7 +1,7 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>Bash bugs</title>
 <base href="http://groups.google.com/"/>
 <tocsect1 name="Query" url="groups?group=gnu.bash.bug">
 </tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/cpp/Makefile.am b/languages/cpp/Makefile.am
index 30ba6d44..7c506ac1 100644
--- a/languages/cpp/Makefile.am
+++ b/languages/cpp/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES = -I$(top_srcdir)/languages/lib/designer_integration \
 
 kde_module_LTLIBRARIES = libkdevcppsupport.la
 libkdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevcppsupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \
+libkdevcppsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/lib/catalog/libkdevcatalog.la $(top_builddir)/lib/cppparser/libkdevcppparser.la \
 	$(top_builddir)/languages/lib/interfaces/liblang_interfaces.la \
 	$(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(top_builddir)/lib/interfaces/libkdevinterfaces.la
diff --git a/languages/cpp/README.dox b/languages/cpp/README.dox
index 3078ec53..04c7fe30 100644
--- a/languages/cpp/README.dox
+++ b/languages/cpp/README.dox
@@ -8,9 +8,9 @@ then you can play with KDevPCSImporter the code of the dialog is in languages/cp
 and of course lib/interfaces/kdevpcsimporter.*
 and if you want play with the c++ parser go to lib/cppparser/, the best is to start to read driver.*
 
-\authors <a href="mailto:roberto AT kdevelop.org">Roberto Raggi</a>
+\authors <a href="mailto:roberto AT tdevelop.org">Roberto Raggi</a>
 
-\maintainer <a href="mailto:roberto AT kdevelop.org">Roberto Raggi</a>
+\maintainer <a href="mailto:roberto AT tdevelop.org">Roberto Raggi</a>
 
 \feature supports C/C++ language
 \feature can do code completion
@@ -18,7 +18,7 @@ and if you want play with the c++ parser go to lib/cppparser/, the best is to st
 \feature code highlight
 \feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
-\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=kdevelop&component=cppsupport&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">cppsupport component at Bugzilla database</a>
+\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=cppsupport&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">cppsupport component at Bugzilla database</a>
 
 \faq <b>How can I have documentation on functions when using codecompletion ?</b>
   -# Create the xml-output with <a href="http://www.doxygen.org">Doxygen</a> of the files you want to add to the classstore
diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp
index fcc59880..69d373fd 100644
--- a/languages/cpp/addattributedialog.cpp
+++ b/languages/cpp/addattributedialog.cpp
@@ -1,5 +1,5 @@
 /*
-*  Copyright (C) 2003 Roberto Raggi (roberto@kdevelop.org)
+*  Copyright (C) 2003 Roberto Raggi (roberto@tdevelop.org)
 *
 *  This program is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU General Public
diff --git a/languages/cpp/addattributedialog.h b/languages/cpp/addattributedialog.h
index 948eefa7..73d2013a 100644
--- a/languages/cpp/addattributedialog.h
+++ b/languages/cpp/addattributedialog.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (C) 2003 Roberto Raggi (roberto@kdevelop.org)
+*  Copyright (C) 2003 Roberto Raggi (roberto@tdevelop.org)
 *
 *  This program is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU General Public
diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp
index b7ffe02c..6f13ed91 100644
--- a/languages/cpp/addmethoddialog.cpp
+++ b/languages/cpp/addmethoddialog.cpp
@@ -1,5 +1,5 @@
 /*
-*  Copyright (C) 2003 Roberto Raggi (roberto@kdevelop.org)
+*  Copyright (C) 2003 Roberto Raggi (roberto@tdevelop.org)
 *
 *  This program is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU General Public
diff --git a/languages/cpp/addmethoddialog.h b/languages/cpp/addmethoddialog.h
index f0bb1f2d..9a3c52f1 100644
--- a/languages/cpp/addmethoddialog.h
+++ b/languages/cpp/addmethoddialog.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (C) 2003 Roberto Raggi (roberto@kdevelop.org)
+*  Copyright (C) 2003 Roberto Raggi (roberto@tdevelop.org)
 *
 *  This program is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU General Public
diff --git a/languages/cpp/app_templates/CMakeLists.txt b/languages/cpp/app_templates/CMakeLists.txt
index ada04721..77cc1a57 100644
--- a/languages/cpp/app_templates/CMakeLists.txt
+++ b/languages/cpp/app_templates/CMakeLists.txt
@@ -68,12 +68,12 @@ add_subdirectory( kde4app )
 
 install( FILES
     c.appwizard
-  DESTINATION ${DATA_INSTALL_DIR}/kdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE )
 
 install( FILES
     cpp.appwizard
-  DESTINATION ${DATA_INSTALL_DIR}/kdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE )
 
 install( FILES
     kdecpp.appwizard
-  DESTINATION ${DATA_INSTALL_DIR}/kdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE )
diff --git a/languages/cpp/app_templates/Makefile.am b/languages/cpp/app_templates/Makefile.am
index a075677f..024bfaff 100644
--- a/languages/cpp/app_templates/Makefile.am
+++ b/languages/cpp/app_templates/Makefile.am
@@ -1,10 +1,10 @@
 SUBDIRS = kapp kpartapp kpartplugin kcmodule kicker kioslave kdevpart kdevpart2 chello cpphello kscreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello kconfig35 kdevlang noatunvisual noatunui kmod kfileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_kmdi qt4hello qmakeempty automakeempty makefileempty qtopia4app kde4app
 
-profilescdir = $(kde_datadir)/kdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE
+profilescdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE
 profilesc_DATA = c.appwizard
 
-profilescppdir = $(kde_datadir)/kdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE
+profilescppdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE
 profilescpp_DATA = cpp.appwizard
 
-profileskdecppdir = $(kde_datadir)/kdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE
+profileskdecppdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE
 profileskdecpp_DATA = kdecpp.appwizard
diff --git a/languages/cpp/app_templates/automakeempty/CMakeLists.txt b/languages/cpp/app_templates/automakeempty/CMakeLists.txt
index 9639ee4e..6785106a 100644
--- a/languages/cpp/app_templates/automakeempty/CMakeLists.txt
+++ b/languages/cpp/app_templates/automakeempty/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( automakeempty.tar.gz ALL
   COMMAND tar zcf automakeempty.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     automakeempty-Makefile.am automakeempty-Makefile.cvs
-    configure.in automakeempty.png app.kdevelop
+    configure.in automakeempty.png app.tdevelop
 )
 
 
diff --git a/languages/cpp/app_templates/automakeempty/Makefile.am b/languages/cpp/app_templates/automakeempty/Makefile.am
index 461e4322..06f9a94c 100644
--- a/languages/cpp/app_templates/automakeempty/Makefile.am
+++ b/languages/cpp/app_templates/automakeempty/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = automakeempty-Makefile.am automakeempty-Makefile.cvs \
-	configure.in automakeempty.png app.kdevelop
+	configure.in automakeempty.png app.tdevelop
 templateName = automakeempty
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/automakeempty/app.kdevelop b/languages/cpp/app_templates/automakeempty/app.kdevelop
index 6cadd049..bed072f3 100644
--- a/languages/cpp/app_templates/automakeempty/app.kdevelop
+++ b/languages/cpp/app_templates/automakeempty/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -98,4 +98,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate b/languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate
index db3cdd13..a99dde66 100644
--- a/languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate
+++ b/languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate
@@ -48,16 +48,16 @@ Archive=automakeempty.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [INCADMIN]
 Type=include
-File=%{kdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/chello/CMakeLists.txt b/languages/cpp/app_templates/chello/CMakeLists.txt
index afe494d9..5d792072 100644
--- a/languages/cpp/app_templates/chello/CMakeLists.txt
+++ b/languages/cpp/app_templates/chello/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( chello.tar.gz ALL
   COMMAND tar zcf chello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     main.c src-Makefile.am c-Makefile.am c-Makefile.cvs
-    configure.in chello.png app.kdevelop
+    configure.in chello.png app.tdevelop
 )
 
 
diff --git a/languages/cpp/app_templates/chello/Makefile.am b/languages/cpp/app_templates/chello/Makefile.am
index f7c9742a..0a51e6fd 100644
--- a/languages/cpp/app_templates/chello/Makefile.am
+++ b/languages/cpp/app_templates/chello/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = main.c src-Makefile.am c-Makefile.am c-Makefile.cvs \
-	configure.in chello.png app.kdevelop
+	configure.in chello.png app.tdevelop
 
 templateName = chello
 
diff --git a/languages/cpp/app_templates/chello/app.kdevelop b/languages/cpp/app_templates/chello/app.kdevelop
index 521c9f89..c5c04cbf 100644
--- a/languages/cpp/app_templates/chello/app.kdevelop
+++ b/languages/cpp/app_templates/chello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -104,4 +104,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/chello/chello.kdevtemplate b/languages/cpp/app_templates/chello/chello.kdevtemplate
index 8f2ea5dc..10f700c3 100644
--- a/languages/cpp/app_templates/chello/chello.kdevtemplate
+++ b/languages/cpp/app_templates/chello/chello.kdevtemplate
@@ -211,16 +211,16 @@ Archive=chello.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{kdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/chello_gba/CMakeLists.txt b/languages/cpp/app_templates/chello_gba/CMakeLists.txt
index 3011e87e..b11230fe 100644
--- a/languages/cpp/app_templates/chello_gba/CMakeLists.txt
+++ b/languages/cpp/app_templates/chello_gba/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( chellogba.tar.gz ALL
   COMMAND tar zcf chellogba.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     main.c font.raw.c master.pal.c src-Makefile.am
     c-Makefile.am c-Makefile.cvs configure.in chellogba.png
-    app.kdevelop main.h gba.h font.bmp README.devel
+    app.tdevelop main.h gba.h font.bmp README.devel
 )
 
 
diff --git a/languages/cpp/app_templates/chello_gba/Makefile.am b/languages/cpp/app_templates/chello_gba/Makefile.am
index 2a72573e..fbc6c2b4 100644
--- a/languages/cpp/app_templates/chello_gba/Makefile.am
+++ b/languages/cpp/app_templates/chello_gba/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = main.c font.raw.c master.pal.c src-Makefile.am c-Makefile.am \
-	c-Makefile.cvs configure.in chellogba.png app.kdevelop \
+	c-Makefile.cvs configure.in chellogba.png app.tdevelop \
 	main.h gba.h font.bmp README.devel
 templateName = chellogba
 
diff --git a/languages/cpp/app_templates/chello_gba/README.devel b/languages/cpp/app_templates/chello_gba/README.devel
index a7cdcc75..8fbc0285 100644
--- a/languages/cpp/app_templates/chello_gba/README.devel
+++ b/languages/cpp/app_templates/chello_gba/README.devel
@@ -26,5 +26,5 @@ You can download the emulator from: http://vboy.emuhq.com/
 
 Have fun!
 
-Please report bugs,wishes,problems.. to smeier@kdevelop.org (Sandy Meier)
+Please report bugs,wishes,problems.. to smeier@tdevelop.org (Sandy Meier)
 
diff --git a/languages/cpp/app_templates/chello_gba/app.kdevelop b/languages/cpp/app_templates/chello_gba/app.kdevelop
index 0025fd02..b507444e 100644
--- a/languages/cpp/app_templates/chello_gba/app.kdevelop
+++ b/languages/cpp/app_templates/chello_gba/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -97,4 +97,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate b/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate
index 7a3ba857..10684d2c 100644
--- a/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate
+++ b/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate
@@ -68,17 +68,17 @@ Archive=chellogba.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{kdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/clanlib/CMakeLists.txt b/languages/cpp/app_templates/clanlib/CMakeLists.txt
index 955dcc81..e0b99cc2 100644
--- a/languages/cpp/app_templates/clanlib/CMakeLists.txt
+++ b/languages/cpp/app_templates/clanlib/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( clanlib.tar.gz ALL
   COMMAND tar zcf clanlib.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    src-Makefile.am app-Makefile.am main.cpp app.kdevelop
+    src-Makefile.am app-Makefile.am main.cpp app.tdevelop
     app-configure.in app-autogen.sh
 )
 
diff --git a/languages/cpp/app_templates/clanlib/Makefile.am b/languages/cpp/app_templates/clanlib/Makefile.am
index f4a650af..84e0459b 100644
--- a/languages/cpp/app_templates/clanlib/Makefile.am
+++ b/languages/cpp/app_templates/clanlib/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = src-Makefile.am app-Makefile.am main.cpp app.kdevelop \
+dataFiles = src-Makefile.am app-Makefile.am main.cpp app.tdevelop \
 	app-configure.in app-autogen.sh
 templateName = clanlib
 
diff --git a/languages/cpp/app_templates/clanlib/app.kdevelop b/languages/cpp/app_templates/clanlib/app.kdevelop
index c0d5c286..2a9f649a 100644
--- a/languages/cpp/app_templates/clanlib/app.kdevelop
+++ b/languages/cpp/app_templates/clanlib/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -103,4 +103,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/clanlib/clanlib.kdevtemplate b/languages/cpp/app_templates/clanlib/clanlib.kdevtemplate
index 1e7b2677..38bf8ccf 100644
--- a/languages/cpp/app_templates/clanlib/clanlib.kdevtemplate
+++ b/languages/cpp/app_templates/clanlib/clanlib.kdevtemplate
@@ -68,13 +68,13 @@ Archive=clanlib.tar.gz
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/cmakesimple/README b/languages/cpp/app_templates/cmakesimple/README
index 1a96a1e8..da6a617c 100644
--- a/languages/cpp/app_templates/cmakesimple/README
+++ b/languages/cpp/app_templates/cmakesimple/README
@@ -11,7 +11,7 @@ this application template.
 -----------------------------------------------
 * REQUIREMENTS *
 - Qt version might be 3.3.4 or 3.3.5
--  kdelibs 3.5 and kdelibs headers 3.5 (devel package) in order to build this template.
+-  tdelibs 3.5 and tdelibs headers 3.5 (devel package) in order to build this template.
 - cmake (http://www.cmake.org/) version 2.1 or 2.2 in your PATH
 -----------------------------------------------
 
diff --git a/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt b/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt
index 1bfd8cd0..ccb2dd4a 100644
--- a/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt
+++ b/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( cppcurseshello.tar.gz ALL
   COMMAND tar zcf cppcurseshello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs
-    app-configure.in app.kdevelop
+    app-configure.in app.tdevelop
 )
 
 
diff --git a/languages/cpp/app_templates/cppcurseshello/Makefile.am b/languages/cpp/app_templates/cppcurseshello/Makefile.am
index 3f6f64af..ef3623f6 100644
--- a/languages/cpp/app_templates/cppcurseshello/Makefile.am
+++ b/languages/cpp/app_templates/cppcurseshello/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs\
-	app-configure.in app.kdevelop
+	app-configure.in app.tdevelop
 templateName = cppcurseshello
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/cppcurseshello/app.kdevelop b/languages/cpp/app_templates/cppcurseshello/app.kdevelop
index c7498e39..de718054 100644
--- a/languages/cpp/app_templates/cppcurseshello/app.kdevelop
+++ b/languages/cpp/app_templates/cppcurseshello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -102,4 +102,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate b/languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate
index 451999a3..b1da70a6 100644
--- a/languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate
+++ b/languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate
@@ -68,17 +68,17 @@ Archive=cppcurseshello.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{kdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/cpphello/CMakeLists.txt b/languages/cpp/app_templates/cpphello/CMakeLists.txt
index d8f7f8cc..d77effea 100644
--- a/languages/cpp/app_templates/cpphello/CMakeLists.txt
+++ b/languages/cpp/app_templates/cpphello/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( cpphello.tar.gz ALL
   COMMAND tar zcf cpphello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs
-    configure.in cpphello.png app.kdevelop
+    configure.in cpphello.png app.tdevelop
 )
 
 
diff --git a/languages/cpp/app_templates/cpphello/Makefile.am b/languages/cpp/app_templates/cpphello/Makefile.am
index 49bd1b67..2ba017c2 100644
--- a/languages/cpp/app_templates/cpphello/Makefile.am
+++ b/languages/cpp/app_templates/cpphello/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs \
-	configure.in cpphello.png app.kdevelop
+	configure.in cpphello.png app.tdevelop
 templateName = cpphello
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/cpphello/app.kdevelop b/languages/cpp/app_templates/cpphello/app.kdevelop
index c7498e39..de718054 100644
--- a/languages/cpp/app_templates/cpphello/app.kdevelop
+++ b/languages/cpp/app_templates/cpphello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -102,4 +102,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/cpphello/cpphello.kdevtemplate b/languages/cpp/app_templates/cpphello/cpphello.kdevtemplate
index 0b5b9367..2336840b 100644
--- a/languages/cpp/app_templates/cpphello/cpphello.kdevtemplate
+++ b/languages/cpp/app_templates/cpphello/cpphello.kdevtemplate
@@ -69,17 +69,17 @@ Archive=cpphello.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{kdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt b/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt
index 6373f0f0..b5e16259 100644
--- a/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt
+++ b/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( cppsdlhello.tar.gz ALL
   COMMAND tar zcf cppsdlhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs
-    configure.in cppsdlhello.png app.kdevelop acinclude.m4
+    configure.in cppsdlhello.png app.tdevelop acinclude.m4
 )
 
 
diff --git a/languages/cpp/app_templates/cppsdlhello/Makefile.am b/languages/cpp/app_templates/cppsdlhello/Makefile.am
index e17785a4..c0357370 100644
--- a/languages/cpp/app_templates/cppsdlhello/Makefile.am
+++ b/languages/cpp/app_templates/cppsdlhello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs 		configure.in cppsdlhello.png app.kdevelop acinclude.m4
+dataFiles = main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs 		configure.in cppsdlhello.png app.tdevelop acinclude.m4
 templateName = cppsdlhello
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/cppsdlhello/app.kdevelop b/languages/cpp/app_templates/cppsdlhello/app.kdevelop
index fadfbadc..08e3056d 100644
--- a/languages/cpp/app_templates/cppsdlhello/app.kdevelop
+++ b/languages/cpp/app_templates/cppsdlhello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -100,4 +100,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate b/languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate
index ec4e94b3..864b9769 100644
--- a/languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate
+++ b/languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate
@@ -69,17 +69,17 @@ Archive=cppsdlhello.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{kdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/dcopservice/CMakeLists.txt b/languages/cpp/app_templates/dcopservice/CMakeLists.txt
index 91f82605..c3a2397b 100644
--- a/languages/cpp/app_templates/dcopservice/CMakeLists.txt
+++ b/languages/cpp/app_templates/dcopservice/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( dcopservice.tar.gz ALL
   COMMAND tar zcf dcopservice.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     dcopservice.desktop dcopservice.png dcopservice.h
     src-Makefile.am main.cpp dcopservice.cpp
-    dcopservice.kdevelop subdirs
+    dcopservice.tdevelop subdirs
 )
 
 
diff --git a/languages/cpp/app_templates/dcopservice/Makefile.am b/languages/cpp/app_templates/dcopservice/Makefile.am
index 00875115..dddb4916 100644
--- a/languages/cpp/app_templates/dcopservice/Makefile.am
+++ b/languages/cpp/app_templates/dcopservice/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = dcopservice.desktop dcopservice.png dcopservice.h \
-	src-Makefile.am main.cpp dcopservice.cpp dcopservice.kdevelop \
+	src-Makefile.am main.cpp dcopservice.cpp dcopservice.tdevelop \
 	subdirs
 templateName = dcopservice
 
diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.kdevelop b/languages/cpp/app_templates/dcopservice/dcopservice.kdevelop
index 22681e00..0ee8f3e4 100644
--- a/languages/cpp/app_templates/dcopservice/dcopservice.kdevelop
+++ b/languages/cpp/app_templates/dcopservice/dcopservice.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -106,4 +106,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate b/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate
index dd950d6d..1b33fee1 100644
--- a/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate
+++ b/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate
@@ -69,11 +69,11 @@ Archive=dcopservice.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -85,25 +85,25 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/dcopservice.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/dcopservice.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir3]
 Type=mkdir
@@ -111,7 +111,7 @@ Dir=%{dest}/src
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [MkDir4]
@@ -120,22 +120,22 @@ Dir=%{dest}/po
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [FILE10]
diff --git a/languages/cpp/app_templates/dcopservice/main.cpp b/languages/cpp/app_templates/dcopservice/main.cpp
index 55509560..26b81878 100644
--- a/languages/cpp/app_templates/dcopservice/main.cpp
+++ b/languages/cpp/app_templates/dcopservice/main.cpp
@@ -20,7 +20,7 @@ static KCmdLineOptions options[] =
 
 int main (int argc, char *argv[])
 {
-	KLocale::setMainCatalogue("kdelibs");
+	KLocale::setMainCatalogue("tdelibs");
 	KAboutData aboutdata("%{APPNAMELC}", I18N_NOOP("KDE"),
 				version, description,
 				KAboutData::License_GPL, "(C) %{YEAR}, %{AUTHOR}");
diff --git a/languages/cpp/app_templates/generichello/Makefile.am b/languages/cpp/app_templates/generichello/Makefile.am
index b558eecd..75bad862 100644
--- a/languages/cpp/app_templates/generichello/Makefile.am
+++ b/languages/cpp/app_templates/generichello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.cpp cpphello.png app.kdevelop app.prj
+dataFiles = main.cpp cpphello.png app.tdevelop app.prj
 templateName = cppgenerichello
 
 # BELOW is not the GENERIC Template-Template;
diff --git a/languages/cpp/app_templates/generichello/app.kdevelop b/languages/cpp/app_templates/generichello/app.kdevelop
index c0b6cc1e..63f5ce16 100644
--- a/languages/cpp/app_templates/generichello/app.kdevelop
+++ b/languages/cpp/app_templates/generichello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -58,4 +58,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/generichello/generichello.kdevtemplate b/languages/cpp/app_templates/generichello/generichello.kdevtemplate
index 2c71b0ad..3440ffa5 100644
--- a/languages/cpp/app_templates/generichello/generichello.kdevtemplate
+++ b/languages/cpp/app_templates/generichello/generichello.kdevtemplate
@@ -68,13 +68,13 @@ Archive=generichello.tar.gz
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/gnome2mmapp/Makefile.am b/languages/cpp/app_templates/gnome2mmapp/Makefile.am
index f86ae76c..9d73ddd6 100644
--- a/languages/cpp/app_templates/gnome2mmapp/Makefile.am
+++ b/languages/cpp/app_templates/gnome2mmapp/Makefile.am
@@ -1,7 +1,7 @@
 dataFiles = acconfig.h autogen.sh gnome2mm.glade main_window.cc \
 	main_window_glade.hh Makefile.am app-Makefile.am \
 	configure.in gnome2mm.gladep main_window.hh \
-	app.kdevelop gnome2mm.cc gnome2mmapp main_window_glade.cc\
+	app.tdevelop gnome2mm.cc gnome2mmapp main_window_glade.cc\
 	src-Makefile.am config.h gnome2mmapp.png
 
 templateName = gnome2mmapp
diff --git a/languages/cpp/app_templates/gnome2mmapp/app.kdevelop b/languages/cpp/app_templates/gnome2mmapp/app.kdevelop
index 8ccf488a..19fbacb7 100644
--- a/languages/cpp/app_templates/gnome2mmapp/app.kdevelop
+++ b/languages/cpp/app_templates/gnome2mmapp/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -66,4 +66,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate b/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate
index ec101c69..93e2c3e4 100644
--- a/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate
+++ b/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate
@@ -67,21 +67,21 @@ Archive=gnome2mmapp.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{kdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.kdevtemplate
 
 [GNOME2]
 Type=include
-File=%{kdevelop}/template-common/gnome2.kdevtemplate
+File=%{tdevelop}/template-common/gnome2.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt
index b81f3833..45544ac9 100644
--- a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( gtk2mmapp.tar.gz ALL
   COMMAND tar zcf gtk2mmapp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     acconfig.h autogen.sh gtk2mm.glade main_window.cc
     main_window_glade.hh Makefile.am app-Makefile.am
-    configure.in gtk2mm.gladep main_window.hh app.kdevelop
+    configure.in gtk2mm.gladep main_window.hh app.tdevelop
     gtk2mm.cc main_window_glade.cc src-Makefile.am config.h
     gtk2mmapp.png
 )
diff --git a/languages/cpp/app_templates/gtk2mmapp/Makefile.am b/languages/cpp/app_templates/gtk2mmapp/Makefile.am
index 2069ade7..c44ba568 100644
--- a/languages/cpp/app_templates/gtk2mmapp/Makefile.am
+++ b/languages/cpp/app_templates/gtk2mmapp/Makefile.am
@@ -1,7 +1,7 @@
 dataFiles = acconfig.h autogen.sh gtk2mm.glade main_window.cc \
 	main_window_glade.hh Makefile.am app-Makefile.am \
 	configure.in gtk2mm.gladep main_window.hh \
-	app.kdevelop gtk2mm.cc main_window_glade.cc\
+	app.tdevelop gtk2mm.cc main_window_glade.cc\
 	src-Makefile.am config.h gtk2mmapp.png
 
 templateName = gtk2mmapp
diff --git a/languages/cpp/app_templates/gtk2mmapp/app.kdevelop b/languages/cpp/app_templates/gtk2mmapp/app.kdevelop
index 47330ca2..2ccb9141 100644
--- a/languages/cpp/app_templates/gtk2mmapp/app.kdevelop
+++ b/languages/cpp/app_templates/gtk2mmapp/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate
index 6d52c9bd..b270e2f0 100644
--- a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate
+++ b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate
@@ -59,17 +59,17 @@ Archive=gtk2mmapp.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{kdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/kapp/CMakeLists.txt b/languages/cpp/app_templates/kapp/CMakeLists.txt
index 6b736681..bfe6d93d 100644
--- a/languages/cpp/app_templates/kapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/kapp/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( kapp.tar.gz ALL
   COMMAND tar zcf kapp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     app.cpp app.h pref.cpp pref.h appview.cpp appview.h
     appiface.h app_client.cpp main.cpp appui.rc src-Makefile.am
-    kapp.png app.kdevelop subdirs README
+    kapp.png app.tdevelop subdirs README
 )
 
 
diff --git a/languages/cpp/app_templates/kapp/Makefile.am b/languages/cpp/app_templates/kapp/Makefile.am
index efe532d3..145551d3 100644
--- a/languages/cpp/app_templates/kapp/Makefile.am
+++ b/languages/cpp/app_templates/kapp/Makefile.am
@@ -1,6 +1,6 @@
 dataFiles = app.cpp app.h pref.cpp pref.h appview.cpp appview.h \
 	appiface.h app_client.cpp main.cpp appui.rc src-Makefile.am \
-	kapp.png app.kdevelop subdirs README
+	kapp.png app.tdevelop subdirs README
 
 templateName = kapp
 
diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp
index 10046641..f3872d04 100644
--- a/languages/cpp/app_templates/kapp/app.cpp
+++ b/languages/cpp/app_templates/kapp/app.cpp
@@ -11,7 +11,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kstatusbar.h>
 #include <kaccel.h>
 #include <kio/netaccess.h>
diff --git a/languages/cpp/app_templates/kapp/app.kdevelop b/languages/cpp/app_templates/kapp/app.kdevelop
index 07cf3f0f..ff811f76 100644
--- a/languages/cpp/app_templates/kapp/app.kdevelop
+++ b/languages/cpp/app_templates/kapp/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -165,4 +165,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kapp/kapp.kdevtemplate b/languages/cpp/app_templates/kapp/kapp.kdevtemplate
index 7865c973..c86fde78 100644
--- a/languages/cpp/app_templates/kapp/kapp.kdevtemplate
+++ b/languages/cpp/app_templates/kapp/kapp.kdevtemplate
@@ -67,11 +67,11 @@ Archive=kapp.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -83,39 +83,39 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [MkDir3]
@@ -124,23 +124,23 @@ Dir=%{dest}/src
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.desktop
+Source=%{tdevelop}/template-common/kde-app.desktop
 Dest=%{dest}/src/%{APPNAMELC}.desktop
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [FILE10]
 Type=install
-Source=%{kdevelop}/template-common/hi16-app-app.png
+Source=%{tdevelop}/template-common/hi16-app-app.png
 Dest=%{dest}/src/hi16-app-%{APPNAMELC}.png
 Process=false
 
 [FILE11]
 Type=install
-Source=%{kdevelop}/template-common/hi32-app-app.png
+Source=%{tdevelop}/template-common/hi32-app-app.png
 Dest=%{dest}/src/hi32-app-%{APPNAMELC}.png
 Process=false
 
@@ -150,7 +150,7 @@ Dir=%{dest}/po
 
 [FILE12]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE13]
diff --git a/languages/cpp/app_templates/kateplugin/CMakeLists.txt b/languages/cpp/app_templates/kateplugin/CMakeLists.txt
index 5016f4f3..354218ad 100644
--- a/languages/cpp/app_templates/kateplugin/CMakeLists.txt
+++ b/languages/cpp/app_templates/kateplugin/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( kateplugin.tar.gz ALL
   COMMAND tar zcf kateplugin.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     src-Makefile.am plugin_app.cpp plugin_app.h plugin_app.rc
     hi16-action-plugin.png hi22-action-plugin.png
-    kateplugin.png plugin.kdevelop subdirs plugin.desktop
+    kateplugin.png plugin.tdevelop subdirs plugin.desktop
 )
 
 
diff --git a/languages/cpp/app_templates/kateplugin/Makefile.am b/languages/cpp/app_templates/kateplugin/Makefile.am
index 62da4d60..81c1a586 100644
--- a/languages/cpp/app_templates/kateplugin/Makefile.am
+++ b/languages/cpp/app_templates/kateplugin/Makefile.am
@@ -2,7 +2,7 @@ templateName = kateplugin
 dataFiles = src-Makefile.am plugin_app.cpp plugin_app.h\
 		plugin_app.rc hi16-action-plugin.png \
 		hi22-action-plugin.png kateplugin.png \
-		plugin.kdevelop subdirs plugin.desktop
+		plugin.tdevelop subdirs plugin.desktop
 
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate b/languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate
index 767a0a57..22895a3b 100644
--- a/languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate
+++ b/languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate
@@ -67,11 +67,11 @@ Archive=kateplugin.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -83,39 +83,39 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/plugin.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/plugin.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [MkDir3]
@@ -124,7 +124,7 @@ Dir=%{dest}/src
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [MkDir4]
@@ -133,7 +133,7 @@ Dir=%{dest}/po
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE10]
diff --git a/languages/cpp/app_templates/kateplugin/plugin.kdevelop b/languages/cpp/app_templates/kateplugin/plugin.kdevelop
index 9f0b4ede..661ba143 100644
--- a/languages/cpp/app_templates/kateplugin/plugin.kdevelop
+++ b/languages/cpp/app_templates/kateplugin/plugin.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kateplugin2/CMakeLists.txt b/languages/cpp/app_templates/kateplugin2/CMakeLists.txt
index b2b725d2..c4a47fba 100644
--- a/languages/cpp/app_templates/kateplugin2/CMakeLists.txt
+++ b/languages/cpp/app_templates/kateplugin2/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( kateplugin2.tar.gz ALL
   COMMAND tar zcf kateplugin2.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     src-Makefile.am plugin_app.cpp plugin_app.h plugin_app.rc
     hi16-action-plugin.png hi22-action-plugin.png
-    kateplugin2.png plugin.kdevelop subdirs plugin.desktop
+    kateplugin2.png plugin.tdevelop subdirs plugin.desktop
 )
 
 
diff --git a/languages/cpp/app_templates/kateplugin2/Makefile.am b/languages/cpp/app_templates/kateplugin2/Makefile.am
index 29aea978..b12a6477 100644
--- a/languages/cpp/app_templates/kateplugin2/Makefile.am
+++ b/languages/cpp/app_templates/kateplugin2/Makefile.am
@@ -1,6 +1,6 @@
 dataFiles = src-Makefile.am plugin_app.cpp plugin_app.h \
 	plugin_app.rc hi16-action-plugin.png hi22-action-plugin.png \
-	kateplugin2.png plugin.kdevelop subdirs plugin.desktop
+	kateplugin2.png plugin.tdevelop subdirs plugin.desktop
 
 templateName = kateplugin2
 
diff --git a/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate b/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate
index b98ab94f..266120d1 100644
--- a/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate
+++ b/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate
@@ -68,11 +68,11 @@ Archive=kateplugin2.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -84,39 +84,39 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/plugin.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/plugin.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [MkDir3]
@@ -125,7 +125,7 @@ Dir=%{dest}/src
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [MkDir4]
@@ -134,7 +134,7 @@ Dir=%{dest}/po
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE10]
diff --git a/languages/cpp/app_templates/kateplugin2/plugin.kdevelop b/languages/cpp/app_templates/kateplugin2/plugin.kdevelop
index cbed4cac..f3123110 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin.kdevelop
+++ b/languages/cpp/app_templates/kateplugin2/plugin.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -111,4 +111,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kcmodule/CMakeLists.txt b/languages/cpp/app_templates/kcmodule/CMakeLists.txt
index 16a55571..76c3429d 100644
--- a/languages/cpp/app_templates/kcmodule/CMakeLists.txt
+++ b/languages/cpp/app_templates/kcmodule/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( kcmodule.tar.gz ALL
   COMMAND tar zcf kcmodule.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    module.cpp module.h module.desktop module.kdevelop
+    module.cpp module.h module.desktop module.tdevelop
     src-Makefile.am kcmodule.png subdirs
 )
 
diff --git a/languages/cpp/app_templates/kcmodule/Makefile.am b/languages/cpp/app_templates/kcmodule/Makefile.am
index 66173b12..8542c99c 100644
--- a/languages/cpp/app_templates/kcmodule/Makefile.am
+++ b/languages/cpp/app_templates/kcmodule/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = module.cpp module.h module.desktop module.kdevelop \
+dataFiles = module.cpp module.h module.desktop module.tdevelop \
 	src-Makefile.am kcmodule.png subdirs
 templateName = kcmodule
 
diff --git a/languages/cpp/app_templates/kcmodule/kcmodule.kdevtemplate b/languages/cpp/app_templates/kcmodule/kcmodule.kdevtemplate
index c551eeb5..2710abdb 100644
--- a/languages/cpp/app_templates/kcmodule/kcmodule.kdevtemplate
+++ b/languages/cpp/app_templates/kcmodule/kcmodule.kdevtemplate
@@ -69,11 +69,11 @@ Archive=kcmodule.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -85,25 +85,25 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/module.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/module.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir3]
 Type=mkdir
@@ -111,22 +111,22 @@ Dir=%{dest}/po
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [MkDir4]
diff --git a/languages/cpp/app_templates/kcmodule/module.kdevelop b/languages/cpp/app_templates/kcmodule/module.kdevelop
index 76412de2..6ca41ef9 100644
--- a/languages/cpp/app_templates/kcmodule/module.kdevelop
+++ b/languages/cpp/app_templates/kcmodule/module.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kconfig35/CMakeLists.txt b/languages/cpp/app_templates/kconfig35/CMakeLists.txt
index 9756386e..412cabdf 100644
--- a/languages/cpp/app_templates/kconfig35/CMakeLists.txt
+++ b/languages/cpp/app_templates/kconfig35/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( kconfig35.tar.gz ALL
   COMMAND tar zcf kconfig35.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     src-Makefile.am app.cpp app.h main.cpp appui.rc
-    app.kdevelop subdirs app.desktop kxt35.png appview.h
+    app.tdevelop subdirs app.desktop kxt35.png appview.h
     appview.cpp appview_base.ui prefs-base.ui prefs.cpp prefs.h
     app.kcfg settings.kcfgc README src-configure.in.in
 )
diff --git a/languages/cpp/app_templates/kconfig35/Makefile.am b/languages/cpp/app_templates/kconfig35/Makefile.am
index f5f8132d..e6695775 100644
--- a/languages/cpp/app_templates/kconfig35/Makefile.am
+++ b/languages/cpp/app_templates/kconfig35/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.kdevelop \
+dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \
 	subdirs app.desktop kxt35.png appview.h appview.cpp appview_base.ui \
 	prefs-base.ui prefs.cpp prefs.h app.kcfg settings.kcfgc README \
 	src-configure.in.in
diff --git a/languages/cpp/app_templates/kconfig35/README b/languages/cpp/app_templates/kconfig35/README
index 6817ca20..993b3447 100644
--- a/languages/cpp/app_templates/kconfig35/README
+++ b/languages/cpp/app_templates/kconfig35/README
@@ -8,7 +8,7 @@ This README file explains you basic things for starting with
 this application template.
 
 -----------------------------------------------
---NOTE--: you need kdelibs 3.5 and kdelibs headers 3.5 (devel package) in order to build this template.
+--NOTE--: you need tdelibs 3.5 and tdelibs headers 3.5 (devel package) in order to build this template.
 Qt version might be 3.3.4 or 3.3.5
 -----------------------------------------------
 
diff --git a/languages/cpp/app_templates/kconfig35/app.kdevelop b/languages/cpp/app_templates/kconfig35/app.kdevelop
index 07cf3f0f..ff811f76 100644
--- a/languages/cpp/app_templates/kconfig35/app.kdevelop
+++ b/languages/cpp/app_templates/kconfig35/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -165,4 +165,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate b/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate
index 0aa709f4..4a01c38e 100644
--- a/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate
+++ b/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate
@@ -52,11 +52,11 @@ Archive=kconfig35.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -68,39 +68,39 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [MkDir3]
@@ -109,22 +109,22 @@ Dir=%{dest}/src
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.desktop
+Source=%{tdevelop}/template-common/kde-app.desktop
 Dest=%{dest}/src/%{APPNAMELC}.desktop
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [FILE10]
 Type=install
-Source=%{kdevelop}/template-common/hi16-app-app.png
+Source=%{tdevelop}/template-common/hi16-app-app.png
 Dest=%{dest}/src/hi16-app-%{APPNAMELC}.png
 
 [FILE11]
 Type=install
-Source=%{kdevelop}/template-common/hi32-app-app.png
+Source=%{tdevelop}/template-common/hi32-app-app.png
 Dest=%{dest}/src/hi32-app-%{APPNAMELC}.png
 
 [MkDir4]
@@ -133,7 +133,7 @@ Dir=%{dest}/po
 
 [FILE12]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE13]
diff --git a/languages/cpp/app_templates/kde4app/CMakeLists.txt b/languages/cpp/app_templates/kde4app/CMakeLists.txt
index 078366fe..0399f045 100644
--- a/languages/cpp/app_templates/kde4app/CMakeLists.txt
+++ b/languages/cpp/app_templates/kde4app/CMakeLists.txt
@@ -14,8 +14,8 @@ add_custom_target( kde4app.tar.gz ALL
     kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp
     kapp4view.h kapp4view_base.ui main.cpp kde4appui.rc
     kde4app-CMakeLists.txt kapp4.desktop kapp4.kcfg
-    settings.kcfgc kde4app.png README kde4app.kdevelop
-    kde4app.kdevelop.filelist
+    settings.kcfgc kde4app.png README kde4app.tdevelop
+    kde4app.tdevelop.filelist
 )
 
 
diff --git a/languages/cpp/app_templates/kde4app/Makefile.am b/languages/cpp/app_templates/kde4app/Makefile.am
index 2b39fcb4..455acd8d 100644
--- a/languages/cpp/app_templates/kde4app/Makefile.am
+++ b/languages/cpp/app_templates/kde4app/Makefile.am
@@ -1,6 +1,6 @@
 dataFiles = kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp kapp4view.h kapp4view_base.ui \
 	main.cpp kde4appui.rc CMakeLists.txt kapp4.desktop kapp4.kcfg settings.kcfgc \
-	kde4app.png README kde4app.kdevelop kde4app.kdevelop.filelist
+	kde4app.png README kde4app.tdevelop kde4app.tdevelop.filelist
 
 templateName = kde4app
 
diff --git a/languages/cpp/app_templates/kde4app/README b/languages/cpp/app_templates/kde4app/README
index a5f3a307..8180d28c 100644
--- a/languages/cpp/app_templates/kde4app/README
+++ b/languages/cpp/app_templates/kde4app/README
@@ -6,7 +6,7 @@ pages. Each of these two has an environment variables widget in which you have
 to fill in the right values for the variables already listed.
 
 After setting up the variables you'll also need to run cmake inside the build
-directory. This can not be done by kdevelop as a KDE4 environment is needed
+directory. This can not be done by tdevelop as a KDE4 environment is needed
 when running cmake to find KDE4. Open the integrated konsole and change to the build
 subdirectory. Then setup a KDE4 environment and run "cmake ../".
 
diff --git a/languages/cpp/app_templates/kde4app/kde4app.kdevelop b/languages/cpp/app_templates/kde4app/kde4app.kdevelop
index 9ae6fd6b..afbdc832 100644
--- a/languages/cpp/app_templates/kde4app/kde4app.kdevelop
+++ b/languages/cpp/app_templates/kde4app/kde4app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -202,4 +202,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate b/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate
index 2a7269fd..1516e92e 100644
--- a/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate
+++ b/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate
@@ -119,13 +119,13 @@ Dest=%{dest}/README
 
 [FILE14]
 Type=install
-Source=%{src}/kde4app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/kde4app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE15]
 Type=install
-Source=%{src}/kde4app.kdevelop.filelist
-Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist
+Source=%{src}/kde4app.tdevelop.filelist
+Dest=%{dest}/%{APPNAMELC}.tdevelop.filelist
 
 [MKDIR1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/kdedcop/CMakeLists.txt b/languages/cpp/app_templates/kdedcop/CMakeLists.txt
index cca04f6a..0b7e9a3f 100644
--- a/languages/cpp/app_templates/kdedcop/CMakeLists.txt
+++ b/languages/cpp/app_templates/kdedcop/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( kdedcop.tar.gz ALL
   COMMAND tar zcf kdedcop.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.cpp app.h app_iface.h app.kdevelop main.cpp
+    app.cpp app.h app_iface.h app.tdevelop main.cpp
     mainclass.cpp mainclass.h kdedcop.png src-Makefile.am
     subdirs
 )
diff --git a/languages/cpp/app_templates/kdedcop/Makefile.am b/languages/cpp/app_templates/kdedcop/Makefile.am
index 87697fcd..21c39778 100644
--- a/languages/cpp/app_templates/kdedcop/Makefile.am
+++ b/languages/cpp/app_templates/kdedcop/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.cpp app.h app_iface.h app.kdevelop main.cpp mainclass.cpp \
+dataFiles = app.cpp app.h app_iface.h app.tdevelop main.cpp mainclass.cpp \
 	mainclass.h kdedcop.png src-Makefile.am subdirs
 
 templateName = kdedcop
diff --git a/languages/cpp/app_templates/kdedcop/app.kdevelop b/languages/cpp/app_templates/kdedcop/app.kdevelop
index 496a3838..6c6dc03c 100644
--- a/languages/cpp/app_templates/kdedcop/app.kdevelop
+++ b/languages/cpp/app_templates/kdedcop/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -113,4 +113,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate b/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate
index 99f6e28d..a182867a 100644
--- a/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate
+++ b/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate
@@ -67,11 +67,11 @@ Archive=kdedcop.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -83,39 +83,39 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [MkDir3]
@@ -124,23 +124,23 @@ Dir=%{dest}/src
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.desktop
+Source=%{tdevelop}/template-common/kde-app.desktop
 Dest=%{dest}/src/%{APPNAMELC}.desktop
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [FILE10]
 Type=install
-Source=%{kdevelop}/template-common/hi16-app-app.png
+Source=%{tdevelop}/template-common/hi16-app-app.png
 Dest=%{dest}/src/hi16-app-%{APPNAMELC}.png
 Process=false
 
 [FILE11]
 Type=install
-Source=%{kdevelop}/template-common/hi32-app-app.png
+Source=%{tdevelop}/template-common/hi32-app-app.png
 Dest=%{dest}/src/hi32-app-%{APPNAMELC}.png
 Process=false
 
@@ -150,7 +150,7 @@ Dir=%{dest}/po
 
 [FILE12]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE13]
diff --git a/languages/cpp/app_templates/kdevlang/CMakeLists.txt b/languages/cpp/app_templates/kdevlang/CMakeLists.txt
index 854ca21e..483f85d9 100644
--- a/languages/cpp/app_templates/kdevlang/CMakeLists.txt
+++ b/languages/cpp/app_templates/kdevlang/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( kdevlang.tar.gz ALL
   COMMAND tar zcf kdevlang.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     src-Makefile.am kdevlang_part.cpp kdevlang_part.h
-    kdevlang.rc kdevlang.desktop app.kdevelop
+    kdevlang.rc kdevlang.desktop app.tdevelop
     kdevlang-configure.in.in README.dox
 )
 
diff --git a/languages/cpp/app_templates/kdevlang/Makefile.am b/languages/cpp/app_templates/kdevlang/Makefile.am
index 972dd511..7afa5be8 100644
--- a/languages/cpp/app_templates/kdevlang/Makefile.am
+++ b/languages/cpp/app_templates/kdevlang/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = src-Makefile.am kdevlang_part.cpp kdevlang_part.h kdevlang.rc \
-	kdevlang.desktop app.kdevelop kdevlang-configure.in.in README.dox
+	kdevlang.desktop app.tdevelop kdevlang-configure.in.in README.dox
 templateName = kdevlang
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/kdevlang/README.dox b/languages/cpp/app_templates/kdevlang/README.dox
index 86968add..7069f3a5 100644
--- a/languages/cpp/app_templates/kdevlang/README.dox
+++ b/languages/cpp/app_templates/kdevlang/README.dox
@@ -20,7 +20,7 @@ and images.
 ...
 \feature Describe the last feature
 
-\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=kdevelop&component=YOUR_COMPONENT_NAME&
+\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=YOUR_COMPONENT_NAME&
 bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">
 YOUR_COMPONENT_NAME at Bugzilla database</a>
 \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
diff --git a/languages/cpp/app_templates/kdevlang/app.kdevelop b/languages/cpp/app_templates/kdevlang/app.kdevelop
index 7a0e573b..bc9ade0f 100644
--- a/languages/cpp/app_templates/kdevlang/app.kdevelop
+++ b/languages/cpp/app_templates/kdevlang/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -112,4 +112,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang-configure.in.in b/languages/cpp/app_templates/kdevlang/kdevlang-configure.in.in
index 78ed2275..830716e0 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang-configure.in.in
+++ b/languages/cpp/app_templates/kdevlang/kdevlang-configure.in.in
@@ -4,7 +4,7 @@ AM_INIT_AUTOMAKE(%{APPNAMELC}, %{VERSION})
 AC_C_BIGENDIAN
 AC_CHECK_KDEMAXPATHLEN
 
-KDE_CHECK_HEADERS([kdevelop/kdevcore.h])
-KDE_CHECK_LIB([kdevelop],main,
- [LIBKDEVELOP="-lkdevelop"])
+KDE_CHECK_HEADERS([tdevelop/kdevcore.h])
+KDE_CHECK_LIB([tdevelop],main,
+ [LIBKDEVELOP="-ltdevelop"])
 AC_SUBST(LIBKDEVELOP)
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang.desktop b/languages/cpp/app_templates/kdevlang/kdevlang.desktop
index d8f320a3..fc5aab75 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang.desktop
+++ b/languages/cpp/app_templates/kdevlang/kdevlang.desktop
@@ -7,7 +7,7 @@ Name=KDev%{APPNAME}
 Name[nds]=KDev%{ProgNaam}
 Name[sv]=KDevelop %{APPNAME}
 Name[ta]=கெடெவ்%{APPNAME}
-Icon=kdevelop
+Icon=tdevelop
 ServiceTypes=KDevelop/LanguageSupport
 X-KDevelop-Language=ChangeMe
 X-KDE-Library=libkdev%{APPNAMELC}
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate b/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate
index c3ad93bf..a8fc65c4 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate
+++ b/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate
@@ -64,26 +64,26 @@ Archive=kdevlang.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE3]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE5]
diff --git a/languages/cpp/app_templates/kdevlang/src-Makefile.am b/languages/cpp/app_templates/kdevlang/src-Makefile.am
index 325352ad..f758d936 100644
--- a/languages/cpp/app_templates/kdevlang/src-Makefile.am
+++ b/languages/cpp/app_templates/kdevlang/src-Makefile.am
@@ -1,8 +1,8 @@
-AM_CPPFLAGS = -I$(kde_includes)/kdevelop/interfaces -I$(kde_includes)/kdevelop/util -I$(kde_includes)/kinterfacedesigner $(all_includes)
+AM_CPPFLAGS = -I$(kde_includes)/tdevelop/interfaces -I$(kde_includes)/tdevelop/util -I$(kde_includes)/kinterfacedesigner $(all_includes)
 
 kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la
 libkdev%{APPNAMELC}_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdev%{APPNAMELC}_la_LIBADD = -lkdevelop
+libkdev%{APPNAMELC}_la_LIBADD = -ltdevelop
 libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}_part.cpp
 
 METASOURCES = AUTO
diff --git a/languages/cpp/app_templates/kdevpart/CMakeLists.txt b/languages/cpp/app_templates/kdevpart/CMakeLists.txt
index aa4a738e..53293ea9 100644
--- a/languages/cpp/app_templates/kdevpart/CMakeLists.txt
+++ b/languages/cpp/app_templates/kdevpart/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( kdevpart.tar.gz ALL
   COMMAND tar zcf kdevpart.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     src-Makefile.am kdevpart_part.cpp kdevpart_part.h
     kdevpart_widget.h kdevpart_widget.cpp kdevpart_part.rc
-    kdevpart.desktop app.kdevelop README.dox
+    kdevpart.desktop app.tdevelop README.dox
     globalconfigbase.ui globalconfig.h globalconfig.cpp
     projectconfigbase.ui projectconfig.h projectconfig.cpp
 )
diff --git a/languages/cpp/app_templates/kdevpart/Makefile.am b/languages/cpp/app_templates/kdevpart/Makefile.am
index d1541685..11c12dfe 100644
--- a/languages/cpp/app_templates/kdevpart/Makefile.am
+++ b/languages/cpp/app_templates/kdevpart/Makefile.am
@@ -1,6 +1,6 @@
 dataFiles = src-Makefile.am kdevpart_part.cpp kdevpart_part.h \
  	kdevpart_widget.h kdevpart_widget.cpp kdevpart_part.rc \
-	kdevpart.desktop app.kdevelop README.dox globalconfigbase.ui globalconfig.h \
+	kdevpart.desktop app.tdevelop README.dox globalconfigbase.ui globalconfig.h \
 	globalconfig.cpp projectconfigbase.ui projectconfig.h projectconfig.cpp
 templateName = kdevpart
 
diff --git a/languages/cpp/app_templates/kdevpart/README.dox b/languages/cpp/app_templates/kdevpart/README.dox
index 86968add..7069f3a5 100644
--- a/languages/cpp/app_templates/kdevpart/README.dox
+++ b/languages/cpp/app_templates/kdevpart/README.dox
@@ -20,7 +20,7 @@ and images.
 ...
 \feature Describe the last feature
 
-\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=kdevelop&component=YOUR_COMPONENT_NAME&
+\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=YOUR_COMPONENT_NAME&
 bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">
 YOUR_COMPONENT_NAME at Bugzilla database</a>
 \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
diff --git a/languages/cpp/app_templates/kdevpart/app.kdevelop b/languages/cpp/app_templates/kdevpart/app.kdevelop
index 29beaf21..89685ef6 100644
--- a/languages/cpp/app_templates/kdevpart/app.kdevelop
+++ b/languages/cpp/app_templates/kdevpart/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -113,4 +113,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart.desktop b/languages/cpp/app_templates/kdevpart/kdevpart.desktop
index eb61eef9..7a823b1d 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart.desktop
+++ b/languages/cpp/app_templates/kdevpart/kdevpart.desktop
@@ -67,7 +67,7 @@ Comment[sv]=%{APPNAME} beskrivning
 Comment[tr]=%{APPNAME} Tanımı
 Comment[zh_CN]=%{APPNAME} 描述
 Comment[zh_TW]=%{APPNAME} 描述
-Icon=kdevelop
+Icon=tdevelop
 ServiceTypes=KDevelop/Plugin
 
 X-KDevelop-Plugin-Version=1
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate b/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate
index bc7becbf..4be91e8a 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate
+++ b/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate
@@ -132,8 +132,8 @@ Default=
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/kdevpart/src-Makefile.am b/languages/cpp/app_templates/kdevpart/src-Makefile.am
index 5cd25f36..02cbedda 100644
--- a/languages/cpp/app_templates/kdevpart/src-Makefile.am
+++ b/languages/cpp/app_templates/kdevpart/src-Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_include
 
 kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la
 libkdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN)
-libkdev%{APPNAMELC}_la_LIBADD = $(top_builddir)/lib/libkdevelop.la
+libkdev%{APPNAMELC}_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
 libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp \
 	%{APPNAMELC}globalconfigbase.ui %{APPNAMELC}globalconfig.cpp \
diff --git a/languages/cpp/app_templates/kdevpart2/CMakeLists.txt b/languages/cpp/app_templates/kdevpart2/CMakeLists.txt
index 2414bc80..080603a8 100644
--- a/languages/cpp/app_templates/kdevpart2/CMakeLists.txt
+++ b/languages/cpp/app_templates/kdevpart2/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( kdevpart2.tar.gz ALL
   COMMAND tar zcf kdevpart2.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     src-Makefile.am kdevpart_part.cpp kdevpart_part.h
     kdevpart_widget.h kdevpart_widget.cpp kdevpart_part.rc
-    kdevpart.desktop app.kdevelop kdevpart-configure.in.in
+    kdevpart.desktop app.tdevelop kdevpart-configure.in.in
     README.dox subdirs globalconfigbase.ui globalconfig.h
     globalconfig.cpp projectconfigbase.ui projectconfig.h
     projectconfig.cpp
diff --git a/languages/cpp/app_templates/kdevpart2/Makefile.am b/languages/cpp/app_templates/kdevpart2/Makefile.am
index 6e58fa02..436f919c 100644
--- a/languages/cpp/app_templates/kdevpart2/Makefile.am
+++ b/languages/cpp/app_templates/kdevpart2/Makefile.am
@@ -1,6 +1,6 @@
 dataFiles = src-Makefile.am kdevpart_part.cpp kdevpart_part.h\
 	kdevpart_widget.h kdevpart_widget.cpp \
-	kdevpart_part.rc kdevpart.desktop app.kdevelop \
+	kdevpart_part.rc kdevpart.desktop app.tdevelop \
 	kdevpart-configure.in.in README.dox subdirs globalconfigbase.ui globalconfig.h \
 	globalconfig.cpp projectconfigbase.ui projectconfig.h projectconfig.cpp
 
diff --git a/languages/cpp/app_templates/kdevpart2/README.dox b/languages/cpp/app_templates/kdevpart2/README.dox
index 86968add..7069f3a5 100644
--- a/languages/cpp/app_templates/kdevpart2/README.dox
+++ b/languages/cpp/app_templates/kdevpart2/README.dox
@@ -20,7 +20,7 @@ and images.
 ...
 \feature Describe the last feature
 
-\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=kdevelop&component=YOUR_COMPONENT_NAME&
+\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=YOUR_COMPONENT_NAME&
 bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">
 YOUR_COMPONENT_NAME at Bugzilla database</a>
 \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
diff --git a/languages/cpp/app_templates/kdevpart2/app.kdevelop b/languages/cpp/app_templates/kdevpart2/app.kdevelop
index 644adcdf..0099dc3b 100644
--- a/languages/cpp/app_templates/kdevpart2/app.kdevelop
+++ b/languages/cpp/app_templates/kdevpart2/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -145,4 +145,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart-configure.in.in b/languages/cpp/app_templates/kdevpart2/kdevpart-configure.in.in
index 06ee70b8..2d9de694 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart-configure.in.in
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart-configure.in.in
@@ -4,7 +4,7 @@ AM_INIT_AUTOMAKE(%{APPNAMELC}, %{VERSION})
 AC_C_BIGENDIAN
 AC_CHECK_KDEMAXPATHLEN
 
-KDE_CHECK_HEADERS([kdevelop/interfaces/kdevcore.h])
-KDE_CHECK_LIB([kdevelop],main,
- [LIBKDEVELOP="-lkdevelop"])
+KDE_CHECK_HEADERS([tdevelop/interfaces/kdevcore.h])
+KDE_CHECK_LIB([tdevelop],main,
+ [LIBKDEVELOP="-ltdevelop"])
 AC_SUBST(LIBKDEVELOP)
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart.desktop b/languages/cpp/app_templates/kdevpart2/kdevpart.desktop
index eb61eef9..7a823b1d 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart.desktop
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart.desktop
@@ -67,7 +67,7 @@ Comment[sv]=%{APPNAME} beskrivning
 Comment[tr]=%{APPNAME} Tanımı
 Comment[zh_CN]=%{APPNAME} 描述
 Comment[zh_TW]=%{APPNAME} 描述
-Icon=kdevelop
+Icon=tdevelop
 ServiceTypes=KDevelop/Plugin
 
 X-KDevelop-Plugin-Version=1
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate b/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate
index 6b701188..0ee981a3 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate
@@ -133,26 +133,26 @@ Default=
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE3]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE4]
diff --git a/languages/cpp/app_templates/kdevpart2/src-Makefile.am b/languages/cpp/app_templates/kdevpart2/src-Makefile.am
index dded12c0..c5995af4 100644
--- a/languages/cpp/app_templates/kdevpart2/src-Makefile.am
+++ b/languages/cpp/app_templates/kdevpart2/src-Makefile.am
@@ -1,8 +1,8 @@
-INCLUDES = -I$(kde_includes)/kdevelop/interfaces -I$(kde_includes)/kdevelop/util $(all_includes)
+INCLUDES = -I$(kde_includes)/tdevelop/interfaces -I$(kde_includes)/tdevelop/util $(all_includes)
 
 kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la
 libkdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN)
-libkdev%{APPNAMELC}_la_LIBADD = -lkdevelop
+libkdev%{APPNAMELC}_la_LIBADD = -ltdevelop
 libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp %{APPNAMELC}globalconfigbase.ui %{APPNAMELC}globalconfig.cpp %{APPNAMELC}projectconfigbase.ui %{APPNAMELC}projectconfig.cpp
 
 METASOURCES = AUTO
diff --git a/languages/cpp/app_templates/kfileplugin/CMakeLists.txt b/languages/cpp/app_templates/kfileplugin/CMakeLists.txt
index 8bbcf675..fb3aab6b 100644
--- a/languages/cpp/app_templates/kfileplugin/CMakeLists.txt
+++ b/languages/cpp/app_templates/kfileplugin/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( kfileplugin.tar.gz ALL
   COMMAND tar zcf kfileplugin.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     README.devel kfile_plugin.cpp kfile_plugin.desktop
-    kfile_plugin.h plugin.kdevelop kfileplugin kfileplugin.png
+    kfile_plugin.h plugin.tdevelop kfileplugin kfileplugin.png
     src-Makefile.am subdirs
 )
 
diff --git a/languages/cpp/app_templates/kfileplugin/Makefile.am b/languages/cpp/app_templates/kfileplugin/Makefile.am
index 9ac8003d..97f8a748 100644
--- a/languages/cpp/app_templates/kfileplugin/Makefile.am
+++ b/languages/cpp/app_templates/kfileplugin/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = README.devel kfile_plugin.cpp kfile_plugin.desktop \
-	kfile_plugin.h plugin.kdevelop kfileplugin kfileplugin.png \
+	kfile_plugin.h plugin.tdevelop kfileplugin kfileplugin.png \
 	src-Makefile.am subdirs
 templateName = kfileplugin
 
diff --git a/languages/cpp/app_templates/kfileplugin/kfileplugin.kdevtemplate b/languages/cpp/app_templates/kfileplugin/kfileplugin.kdevtemplate
index edff2fd4..b0f7fee4 100644
--- a/languages/cpp/app_templates/kfileplugin/kfileplugin.kdevtemplate
+++ b/languages/cpp/app_templates/kfileplugin/kfileplugin.kdevtemplate
@@ -65,11 +65,11 @@ Archive=kfileplugin.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -81,39 +81,39 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/plugin.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/plugin.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [MkDir3]
@@ -122,7 +122,7 @@ Dir=%{dest}/src
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [MkDir4]
@@ -131,7 +131,7 @@ Dir=%{dest}/po
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE10]
diff --git a/languages/cpp/app_templates/kfileplugin/plugin.kdevelop b/languages/cpp/app_templates/kfileplugin/plugin.kdevelop
index a95b52f9..05640c16 100644
--- a/languages/cpp/app_templates/kfileplugin/plugin.kdevelop
+++ b/languages/cpp/app_templates/kfileplugin/plugin.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -111,4 +111,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/khello/CMakeLists.txt b/languages/cpp/app_templates/khello/CMakeLists.txt
index f51a2100..360e792e 100644
--- a/languages/cpp/app_templates/khello/CMakeLists.txt
+++ b/languages/cpp/app_templates/khello/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( khello.tar.gz ALL
   COMMAND tar zcf khello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     src-Makefile.am app.cpp app.h main.cpp appui.rc
-    app.kdevelop subdirs app.desktop khello.png
+    app.tdevelop subdirs app.desktop khello.png
 )
 
 
diff --git a/languages/cpp/app_templates/khello/Makefile.am b/languages/cpp/app_templates/khello/Makefile.am
index 6f788f99..56df4792 100644
--- a/languages/cpp/app_templates/khello/Makefile.am
+++ b/languages/cpp/app_templates/khello/Makefile.am
@@ -1,5 +1,5 @@
 # all khello data files
-dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.kdevelop \
+dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \
 	subdirs app.desktop khello.png
 templateName = khello
 
diff --git a/languages/cpp/app_templates/khello/app.kdevelop b/languages/cpp/app_templates/khello/app.kdevelop
index 7e6cf8da..7d0c5203 100644
--- a/languages/cpp/app_templates/khello/app.kdevelop
+++ b/languages/cpp/app_templates/khello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -112,4 +112,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>  
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/khello/khello.kdevtemplate b/languages/cpp/app_templates/khello/khello.kdevtemplate
index e401fa5d..1936046a 100644
--- a/languages/cpp/app_templates/khello/khello.kdevtemplate
+++ b/languages/cpp/app_templates/khello/khello.kdevtemplate
@@ -68,11 +68,11 @@ Archive=khello.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -84,39 +84,39 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [MkDir3]
@@ -125,7 +125,7 @@ Dir=%{dest}/po
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE9]
@@ -139,18 +139,18 @@ Dir=%{dest}/src
 
 [FILE10]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [FILE11]
 Type=install
-Source=%{kdevelop}/template-common/hi16-app-app.png
+Source=%{tdevelop}/template-common/hi16-app-app.png
 Dest=%{dest}/src/hi16-app-%{APPNAMELC}.png
 Process=false
 
 [FILE12]
 Type=install
-Source=%{kdevelop}/template-common/hi32-app-app.png
+Source=%{tdevelop}/template-common/hi32-app-app.png
 Dest=%{dest}/src/hi32-app-%{APPNAMELC}.png
 Process=false
 
diff --git a/languages/cpp/app_templates/khello2/CMakeLists.txt b/languages/cpp/app_templates/khello2/CMakeLists.txt
index e8a178bc..8e9fdb9d 100644
--- a/languages/cpp/app_templates/khello2/CMakeLists.txt
+++ b/languages/cpp/app_templates/khello2/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( khello2.tar.gz ALL
   COMMAND tar zcf khello2.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     src-Makefile.am app.cpp app.h main.cpp appui.rc
-    app.kdevelop subdirs app.desktop khello2.png widget.cpp
+    app.tdevelop subdirs app.desktop khello2.png widget.cpp
     widget.h widgetbase.ui
 )
 
diff --git a/languages/cpp/app_templates/khello2/Makefile.am b/languages/cpp/app_templates/khello2/Makefile.am
index 8ac1b18d..14445170 100644
--- a/languages/cpp/app_templates/khello2/Makefile.am
+++ b/languages/cpp/app_templates/khello2/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.kdevelop \
+dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \
 	subdirs app.desktop khello2.png widget.cpp widget.h widgetbase.ui
 
 templateName = khello2
diff --git a/languages/cpp/app_templates/khello2/app.kdevelop b/languages/cpp/app_templates/khello2/app.kdevelop
index 43425791..2efddb24 100644
--- a/languages/cpp/app_templates/khello2/app.kdevelop
+++ b/languages/cpp/app_templates/khello2/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -112,4 +112,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/khello2/khello2.kdevtemplate b/languages/cpp/app_templates/khello2/khello2.kdevtemplate
index 479d7496..a0fd1809 100644
--- a/languages/cpp/app_templates/khello2/khello2.kdevtemplate
+++ b/languages/cpp/app_templates/khello2/khello2.kdevtemplate
@@ -64,11 +64,11 @@ Archive=khello2.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -80,39 +80,39 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [MkDir3]
@@ -121,7 +121,7 @@ Dir=%{dest}/po
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE9]
@@ -135,18 +135,18 @@ Dir=%{dest}/src
 
 [FILE10]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [FILE11]
 Type=install
-Source=%{kdevelop}/template-common/hi16-app-app.png
+Source=%{tdevelop}/template-common/hi16-app-app.png
 Dest=%{dest}/src/hi16-app-%{APPNAMELC}.png
 Process=false
 
 [FILE12]
 Type=install
-Source=%{kdevelop}/template-common/hi32-app-app.png
+Source=%{tdevelop}/template-common/hi32-app-app.png
 Dest=%{dest}/src/hi32-app-%{APPNAMELC}.png
 Process=false
 
diff --git a/languages/cpp/app_templates/kicker/CMakeLists.txt b/languages/cpp/app_templates/kicker/CMakeLists.txt
index 703f49c4..c1a1d7d5 100644
--- a/languages/cpp/app_templates/kicker/CMakeLists.txt
+++ b/languages/cpp/app_templates/kicker/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( kicker.tar.gz ALL
   COMMAND tar zcf kicker.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    applet.cpp applet.h applet.desktop applet.kdevelop
+    applet.cpp applet.h applet.desktop applet.tdevelop
     src-Makefile.am kicker.png subdirs
 )
 
diff --git a/languages/cpp/app_templates/kicker/Makefile.am b/languages/cpp/app_templates/kicker/Makefile.am
index 168a93c9..82095d72 100644
--- a/languages/cpp/app_templates/kicker/Makefile.am
+++ b/languages/cpp/app_templates/kicker/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = applet.cpp applet.h applet.desktop applet.kdevelop \
+dataFiles = applet.cpp applet.h applet.desktop applet.tdevelop \
 	src-Makefile.am kicker.png subdirs
 templateName = kicker
 
diff --git a/languages/cpp/app_templates/kicker/applet.kdevelop b/languages/cpp/app_templates/kicker/applet.kdevelop
index 8bb35326..da5c5195 100644
--- a/languages/cpp/app_templates/kicker/applet.kdevelop
+++ b/languages/cpp/app_templates/kicker/applet.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -112,4 +112,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kicker/kicker.kdevtemplate b/languages/cpp/app_templates/kicker/kicker.kdevtemplate
index f6f87256..9912545c 100644
--- a/languages/cpp/app_templates/kicker/kicker.kdevtemplate
+++ b/languages/cpp/app_templates/kicker/kicker.kdevtemplate
@@ -66,11 +66,11 @@ Archive=kicker.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -82,25 +82,25 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/applet.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/applet.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir3]
 Type=mkdir
@@ -108,7 +108,7 @@ Dir=%{dest}/src
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [MkDir4]
@@ -117,22 +117,22 @@ Dir=%{dest}/po
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [FILE10]
diff --git a/languages/cpp/app_templates/kioslave/CMakeLists.txt b/languages/cpp/app_templates/kioslave/CMakeLists.txt
index 3f41d6d2..c0f70115 100644
--- a/languages/cpp/app_templates/kioslave/CMakeLists.txt
+++ b/languages/cpp/app_templates/kioslave/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( kioslave.tar.gz ALL
   COMMAND tar zcf kioslave.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    slave.cpp slave.h slave.protocol slave.kdevelop
+    slave.cpp slave.h slave.protocol slave.tdevelop
     src-Makefile.am kioslave.png subdirs
 )
 
diff --git a/languages/cpp/app_templates/kioslave/Makefile.am b/languages/cpp/app_templates/kioslave/Makefile.am
index 5aa5b88e..1d9a8224 100644
--- a/languages/cpp/app_templates/kioslave/Makefile.am
+++ b/languages/cpp/app_templates/kioslave/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = slave.cpp slave.h slave.protocol slave.kdevelop \
+dataFiles = slave.cpp slave.h slave.protocol slave.tdevelop \
 	src-Makefile.am  kioslave.png subdirs
 templateName = kioslave
 
diff --git a/languages/cpp/app_templates/kioslave/kioslave.kdevtemplate b/languages/cpp/app_templates/kioslave/kioslave.kdevtemplate
index 0af80e7b..24c6143f 100644
--- a/languages/cpp/app_templates/kioslave/kioslave.kdevtemplate
+++ b/languages/cpp/app_templates/kioslave/kioslave.kdevtemplate
@@ -56,11 +56,11 @@ Archive=kioslave.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -72,25 +72,25 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/slave.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/slave.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir3]
 Type=mkdir
@@ -98,7 +98,7 @@ Dir=%{dest}/src
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [MkDir4]
@@ -107,22 +107,22 @@ Dir=%{dest}/po
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [FILE10]
diff --git a/languages/cpp/app_templates/kioslave/slave.kdevelop b/languages/cpp/app_templates/kioslave/slave.kdevelop
index a2ca970a..5e180089 100644
--- a/languages/cpp/app_templates/kioslave/slave.kdevelop
+++ b/languages/cpp/app_templates/kioslave/slave.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kmake/Makefile.am b/languages/cpp/app_templates/kmake/Makefile.am
index 87d660e0..b7bd96f9 100644
--- a/languages/cpp/app_templates/kmake/Makefile.am
+++ b/languages/cpp/app_templates/kmake/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = appui.rc app.desktop app.cpp mainviewimp.cpp mainviewimp.h mainview.ui app.kdevelop app.pro src.pro
+dataFiles = appui.rc app.desktop app.cpp mainviewimp.cpp mainviewimp.h mainview.ui app.tdevelop app.pro src.pro
 templateName = kmake
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/kmake/app.kdevelop b/languages/cpp/app_templates/kmake/app.kdevelop
index aa290baa..89259578 100644
--- a/languages/cpp/app_templates/kmake/app.kdevelop
+++ b/languages/cpp/app_templates/kmake/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -108,4 +108,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kmake/app.pro b/languages/cpp/app_templates/kmake/app.pro
index 7dc1cc78..b1bfced0 100644
--- a/languages/cpp/app_templates/kmake/app.pro
+++ b/languages/cpp/app_templates/kmake/app.pro
@@ -1,4 +1,4 @@
-# File generated by kdevelop's qmake manager. 
+# File generated by tdevelop's qmake manager. 
 # ------------------------------------------- 
 # Subdir relative project main directory: .
 # Target is a subdirs project 
diff --git a/languages/cpp/app_templates/kmake/kmake.kdevtemplate b/languages/cpp/app_templates/kmake/kmake.kdevtemplate
index 3797d8e9..44209cb7 100644
--- a/languages/cpp/app_templates/kmake/kmake.kdevtemplate
+++ b/languages/cpp/app_templates/kmake/kmake.kdevtemplate
@@ -66,8 +66,8 @@ Archive=kmake.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/kmake/src.pro b/languages/cpp/app_templates/kmake/src.pro
index 950d6a91..1bbea1fd 100644
--- a/languages/cpp/app_templates/kmake/src.pro
+++ b/languages/cpp/app_templates/kmake/src.pro
@@ -1,4 +1,4 @@
-# File generated by kdevelop's qmake manager. 
+# File generated by tdevelop's qmake manager. 
 # ------------------------------------------- 
 # Subdir relative project main directory: ./src
 # Target is an application:  ../bin/%{APPNAMELC}
diff --git a/languages/cpp/app_templates/kmod/CMakeLists.txt b/languages/cpp/app_templates/kmod/CMakeLists.txt
index b67f3b01..af575a10 100644
--- a/languages/cpp/app_templates/kmod/CMakeLists.txt
+++ b/languages/cpp/app_templates/kmod/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( kmod.tar.gz ALL
   COMMAND tar zcf kmod.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    src-Makefile kmod.kdevelop kmod-driver.c
+    src-Makefile kmod.tdevelop kmod-driver.c
 )
 
 
diff --git a/languages/cpp/app_templates/kmod/Makefile.am b/languages/cpp/app_templates/kmod/Makefile.am
index 76afcd5a..f4b1ec98 100644
--- a/languages/cpp/app_templates/kmod/Makefile.am
+++ b/languages/cpp/app_templates/kmod/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = src-Makefile kmod.kdevelop kmod-driver.c
+dataFiles = src-Makefile kmod.tdevelop kmod-driver.c
 
 templateName = kmod
 
diff --git a/languages/cpp/app_templates/kmod/kmod.kdevelop b/languages/cpp/app_templates/kmod/kmod.kdevelop
index 93c6c0f4..673d60f5 100644
--- a/languages/cpp/app_templates/kmod/kmod.kdevelop
+++ b/languages/cpp/app_templates/kmod/kmod.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -90,4 +90,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kmod/kmod.kdevtemplate b/languages/cpp/app_templates/kmod/kmod.kdevtemplate
index 03a335cd..b7173b32 100644
--- a/languages/cpp/app_templates/kmod/kmod.kdevtemplate
+++ b/languages/cpp/app_templates/kmod/kmod.kdevtemplate
@@ -66,13 +66,13 @@ Archive=kmod.tar.gz
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/kmod.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/kmod.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/kofficepart/CMakeLists.txt b/languages/cpp/app_templates/kofficepart/CMakeLists.txt
index 2462d462..37a7ef44 100644
--- a/languages/cpp/app_templates/kofficepart/CMakeLists.txt
+++ b/languages/cpp/app_templates/kofficepart/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( kopart.tar.gz ALL
   COMMAND tar zcf kopart.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    kopart.kdevelop kopart_aboutdata.h kopart_part.cpp
+    kopart.tdevelop kopart_aboutdata.h kopart_part.cpp
     kopart_view.h src-Makefile.am kopart.png kopart_factory.cpp
     kopart_part.h subdirs kopart.desktop kopart.rc
     kopart_factory.h kopart_view.cpp x-kopart.desktop
diff --git a/languages/cpp/app_templates/kofficepart/Makefile.am b/languages/cpp/app_templates/kofficepart/Makefile.am
index 96280d88..02b87d82 100644
--- a/languages/cpp/app_templates/kofficepart/Makefile.am
+++ b/languages/cpp/app_templates/kofficepart/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = kopart.kdevelop kopart_aboutdata.h kopart_part.cpp kopart_view.h \
+dataFiles = kopart.tdevelop kopart_aboutdata.h kopart_part.cpp kopart_view.h \
 	src-Makefile.am kopart.png kopart_factory.cpp kopart_part.h \
 	subdirs kopart.desktop kopart.rc kopart_factory.h \
 	kopart_view.cpp x-kopart.desktop kde-configure.in.in \
diff --git a/languages/cpp/app_templates/kofficepart/kopart.kdevelop b/languages/cpp/app_templates/kofficepart/kopart.kdevelop
index bf70fc63..c01c17a2 100644
--- a/languages/cpp/app_templates/kofficepart/kopart.kdevelop
+++ b/languages/cpp/app_templates/kofficepart/kopart.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate b/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate
index 9d5ecba4..97885dc4 100644
--- a/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate
+++ b/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate
@@ -63,11 +63,11 @@ Archive=kopart.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -79,25 +79,25 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/kopart.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/kopart.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir3]
 Type=mkdir
@@ -105,7 +105,7 @@ Dir=%{dest}/src
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [MkDir4]
@@ -114,17 +114,17 @@ Dir=%{dest}/po
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE9]
diff --git a/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt b/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt
index 89bf20db..e38fc279 100644
--- a/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt
+++ b/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( konqnavpanel.tar.gz ALL
   COMMAND tar zcf konqnavpanel.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     konqnavpanel.cpp konqnavpanel.h konqnavpanel.desktop
-    konqnavpanel.kdevelop src-Makefile.am konqnavpanel.png
+    konqnavpanel.tdevelop src-Makefile.am konqnavpanel.png
     subdirs
 )
 
diff --git a/languages/cpp/app_templates/konqnavpanel/Makefile.am b/languages/cpp/app_templates/konqnavpanel/Makefile.am
index 7a3ae56b..6fccbf38 100644
--- a/languages/cpp/app_templates/konqnavpanel/Makefile.am
+++ b/languages/cpp/app_templates/konqnavpanel/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = konqnavpanel.cpp konqnavpanel.h konqnavpanel.desktop \
-	konqnavpanel.kdevelop src-Makefile.am \
+	konqnavpanel.tdevelop src-Makefile.am \
 	konqnavpanel.png subdirs
 templateName = konqnavpanel
 
diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevelop b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevelop
index 8bb35326..da5c5195 100644
--- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevelop
+++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -112,4 +112,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate
index 4cbc7d5d..d9afb9a5 100644
--- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate
+++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate
@@ -65,11 +65,11 @@ Archive=konqnavpanel.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -81,25 +81,25 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/konqnavpanel.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/konqnavpanel.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir3]
 Type=mkdir
@@ -107,7 +107,7 @@ Dir=%{dest}/src
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [MkDir4]
@@ -116,22 +116,22 @@ Dir=%{dest}/po
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [FILE10]
diff --git a/languages/cpp/app_templates/kpartapp/CMakeLists.txt b/languages/cpp/app_templates/kpartapp/CMakeLists.txt
index 80d44525..9f3d8119 100644
--- a/languages/cpp/app_templates/kpartapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/kpartapp/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( kpartapp.tar.gz ALL
   COMMAND tar zcf kpartapp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     src-Makefile.am app.cpp app.h app_part.cpp app_part.h
-    main.cpp app_part.rc app_shell.rc kpartapp.png app.kdevelop
+    main.cpp app_part.rc app_shell.rc kpartapp.png app.tdevelop
     subdirs
 )
 
diff --git a/languages/cpp/app_templates/kpartapp/Makefile.am b/languages/cpp/app_templates/kpartapp/Makefile.am
index 9b69f17d..bfb8ceed 100644
--- a/languages/cpp/app_templates/kpartapp/Makefile.am
+++ b/languages/cpp/app_templates/kpartapp/Makefile.am
@@ -1,6 +1,6 @@
 dataFiles = src-Makefile.am app.cpp app.h app_part.cpp\
 	app_part.h main.cpp app_part.rc app_shell.rc \
-	kpartapp.png app.kdevelop subdirs
+	kpartapp.png app.tdevelop subdirs
 templateName = kpartapp
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/cpp/app_templates/kpartapp/app.kdevelop b/languages/cpp/app_templates/kpartapp/app.kdevelop
index 3adbae9e..c9cf269d 100644
--- a/languages/cpp/app_templates/kpartapp/app.kdevelop
+++ b/languages/cpp/app_templates/kpartapp/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -112,4 +112,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate b/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate
index 03583faa..dc5f67ae 100644
--- a/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate
+++ b/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate
@@ -65,11 +65,11 @@ Archive=kpartapp.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -81,39 +81,39 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [MkDir3]
@@ -122,28 +122,28 @@ Dir=%{dest}/src
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-part.desktop
+Source=%{tdevelop}/template-common/kde-part.desktop
 Dest=%{dest}/src/%{APPNAMELC}_part.desktop
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.desktop
+Source=%{tdevelop}/template-common/kde-app.desktop
 Dest=%{dest}/src/%{APPNAMELC}.desktop
 
 [FILE10]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [FILE11]
 Type=install
-Source=%{kdevelop}/template-common/hi16-app-app.png
+Source=%{tdevelop}/template-common/hi16-app-app.png
 Dest=%{dest}/src/hi16-app-%{APPNAMELC}.png
 Process=false
 
 [FILE12]
 Type=install
-Source=%{kdevelop}/template-common/hi32-app-app.png
+Source=%{tdevelop}/template-common/hi32-app-app.png
 Dest=%{dest}/src/hi32-app-%{APPNAMELC}.png
 Process=false
 
@@ -153,7 +153,7 @@ Dir=%{dest}/po
 
 [FILE13]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE14]
diff --git a/languages/cpp/app_templates/kpartplugin/CMakeLists.txt b/languages/cpp/app_templates/kpartplugin/CMakeLists.txt
index 0de10864..00f4c664 100644
--- a/languages/cpp/app_templates/kpartplugin/CMakeLists.txt
+++ b/languages/cpp/app_templates/kpartplugin/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( kpartplugin.tar.gz ALL
   COMMAND tar zcf kpartplugin.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     src-Makefile.am plugin_app.cpp plugin_app.h plugin_app.rc
     hi16-action-plugin.png hi22-action-plugin.png
-    kpartplugin.png plugin.kdevelop subdirs
+    kpartplugin.png plugin.tdevelop subdirs
 )
 
 
diff --git a/languages/cpp/app_templates/kpartplugin/Makefile.am b/languages/cpp/app_templates/kpartplugin/Makefile.am
index 170bdd6d..057be667 100644
--- a/languages/cpp/app_templates/kpartplugin/Makefile.am
+++ b/languages/cpp/app_templates/kpartplugin/Makefile.am
@@ -1,6 +1,6 @@
 dataFiles = src-Makefile.am plugin_app.cpp plugin_app.h  \
 	plugin_app.rc hi16-action-plugin.png hi22-action-plugin.png \
-	kpartplugin.png plugin.kdevelop subdirs
+	kpartplugin.png plugin.tdevelop subdirs
 	
 templateName = kpartplugin
 
diff --git a/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate b/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate
index f331c6cf..ec8d3dcf 100644
--- a/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate
+++ b/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate
@@ -64,11 +64,11 @@ Archive=kpartplugin.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -80,39 +80,39 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/plugin.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/plugin.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [MkDir3]
@@ -121,7 +121,7 @@ Dir=%{dest}/src
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [MkDir4]
@@ -130,7 +130,7 @@ Dir=%{dest}/po
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE10]
diff --git a/languages/cpp/app_templates/kpartplugin/plugin.kdevelop b/languages/cpp/app_templates/kpartplugin/plugin.kdevelop
index dc1b3e25..032e1d86 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin.kdevelop
+++ b/languages/cpp/app_templates/kpartplugin/plugin.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -111,4 +111,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kscons_kmdi/CMakeLists.txt b/languages/cpp/app_templates/kscons_kmdi/CMakeLists.txt
index 87a8bd63..c42fac4f 100644
--- a/languages/cpp/app_templates/kscons_kmdi/CMakeLists.txt
+++ b/languages/cpp/app_templates/kscons_kmdi/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( kscons_kmdi.tar.gz ALL
   COMMAND tar zcf kscons_kmdi.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.kcfg app.kdevelop appkmdi.cpp appkmdi.h appkmdiView.cpp
+    app.kcfg app.tdevelop appkmdi.cpp appkmdi.h appkmdiView.cpp
     appkmdiView.h INSTALL kmdikonsole.cpp kmdikonsole.h
     main.cpp messages.sh prefs.ui QUICKSTART README
     SConscript-doc SConscript-src SConstruct settings.kcfgc
diff --git a/languages/cpp/app_templates/kscons_kmdi/INSTALL b/languages/cpp/app_templates/kscons_kmdi/INSTALL
index edeed594..67c1dd4b 100644
--- a/languages/cpp/app_templates/kscons_kmdi/INSTALL
+++ b/languages/cpp/app_templates/kscons_kmdi/INSTALL
@@ -1,7 +1,7 @@
 REQUIREMENTS
 ------------
 
-* KDE headers & libraries for kdelibs
+* KDE headers & libraries for tdelibs
 * A Python interpreter for the compilation
 
 scons v0.96.1 or newer is recommended, but it's not required since a
diff --git a/languages/cpp/app_templates/kscons_kmdi/Makefile.am b/languages/cpp/app_templates/kscons_kmdi/Makefile.am
index aa6d9b53..e349e104 100644
--- a/languages/cpp/app_templates/kscons_kmdi/Makefile.am
+++ b/languages/cpp/app_templates/kscons_kmdi/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.kcfg app.kdevelop appkmdi.cpp appkmdi.h appkmdiView.cpp \
+dataFiles = app.kcfg app.tdevelop appkmdi.cpp appkmdi.h appkmdiView.cpp \
 appkmdiView.h INSTALL kmdikonsole.cpp kmdikonsole.h main.cpp \
 messages.sh prefs.ui QUICKSTART README SConscript-doc SConscript-src \
 SConstruct settings.kcfgc tips VERSION \
diff --git a/languages/cpp/app_templates/kscons_kmdi/app.kdevelop b/languages/cpp/app_templates/kscons_kmdi/app.kdevelop
index e6a14fff..25ed5653 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app.kdevelop
+++ b/languages/cpp/app_templates/kscons_kmdi/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -166,4 +166,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
index 7cc0f221..6b55b671 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
@@ -26,14 +26,14 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
 #include <kmessagebox.h>
 #include <ktabwidget.h>
 #include <kedittoolbar.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kstdaccel.h>
 #include <kaction.h>
 #include <kstdaction.h>
diff --git a/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate b/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate
index 4f0f8856..1fbd8062 100644
--- a/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate
+++ b/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate
@@ -64,7 +64,7 @@ Archive=kscons_kmdi.tar.gz
 
 [SCONS]
 Type=include
-File=%{kdevelop}/template-common/scons.kdevtemplate
+File=%{tdevelop}/template-common/scons.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -82,14 +82,14 @@ Dest=%{dest}/doc/SConscript
 [FILE2]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE4]
 Type=install
@@ -102,18 +102,18 @@ Dir=%{dest}/src
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.desktop
+Source=%{tdevelop}/template-common/kde-app.desktop
 Dest=%{dest}/src/%{APPNAMELC}.desktop
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/hi16-app-app.png
+Source=%{tdevelop}/template-common/hi16-app-app.png
 Dest=%{dest}/src/hi16-app-%{APPNAMELC}.png
 Process=false
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/hi32-app-app.png
+Source=%{tdevelop}/template-common/hi32-app-app.png
 Dest=%{dest}/src/hi32-app-%{APPNAMELC}.png
 Process=false
 
@@ -225,12 +225,12 @@ Dest=%{dest}/src/%{APPNAMELC}_part.h
 
 [FILE36]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.desktop
+Source=%{tdevelop}/template-common/kde-app.desktop
 Dest=%{dest}/src/%{APPNAMELC}.desktop
 
 [FILE37]
 Type=install
-Source=%{kdevelop}/template-common/kde-part.desktop
+Source=%{tdevelop}/template-common/kde-part.desktop
 Dest=%{dest}/src/%{APPNAMELC}_part.desktop
 
 [FILE38]
diff --git a/languages/cpp/app_templates/kscons_kmdi/tips b/languages/cpp/app_templates/kscons_kmdi/tips
index 56f29469..b9618b42 100644
--- a/languages/cpp/app_templates/kscons_kmdi/tips
+++ b/languages/cpp/app_templates/kscons_kmdi/tips
@@ -1,6 +1,6 @@
 <tip category="help">
 <html>
 <p>... that automake was not involved in building this kde application ?</p>
-<p>The kdevelop template &quot;kscons_kxt&quot; was used instead.</p>
+<p>The tdevelop template &quot;kscons_kxt&quot; was used instead.</p>
 </html>
 </tip>
diff --git a/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt b/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt
index dae6dd3b..bf1be9f6 100644
--- a/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt
+++ b/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( kscons_kxt.tar.gz ALL
   COMMAND tar zcf kscons_kxt.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.cpp app.h main.cpp appui.rc app.kdevelop appview.h
+    app.cpp app.h main.cpp appui.rc app.tdevelop appview.h
     appview.cpp appview_base.ui prefs-base.ui prefs.cpp
     prefs.h app.kcfg settings.kcfgc messages.sh SConstruct
     SConscript-doc SConscript-src tips VERSION QUICKSTART
diff --git a/languages/cpp/app_templates/kscons_kxt/INSTALL b/languages/cpp/app_templates/kscons_kxt/INSTALL
index edeed594..67c1dd4b 100644
--- a/languages/cpp/app_templates/kscons_kxt/INSTALL
+++ b/languages/cpp/app_templates/kscons_kxt/INSTALL
@@ -1,7 +1,7 @@
 REQUIREMENTS
 ------------
 
-* KDE headers & libraries for kdelibs
+* KDE headers & libraries for tdelibs
 * A Python interpreter for the compilation
 
 scons v0.96.1 or newer is recommended, but it's not required since a
diff --git a/languages/cpp/app_templates/kscons_kxt/Makefile.am b/languages/cpp/app_templates/kscons_kxt/Makefile.am
index 8cce001c..59a58ee1 100644
--- a/languages/cpp/app_templates/kscons_kxt/Makefile.am
+++ b/languages/cpp/app_templates/kscons_kxt/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.cpp app.h main.cpp appui.rc app.kdevelop \
+dataFiles = app.cpp app.h main.cpp appui.rc app.tdevelop \
 appview.h appview.cpp appview_base.ui prefs-base.ui \
 prefs.cpp prefs.h app.kcfg settings.kcfgc messages.sh \
 SConstruct SConscript-doc SConscript-src tips VERSION \
diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp
index ec892c11..2a89e471 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/app.cpp
@@ -13,7 +13,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
diff --git a/languages/cpp/app_templates/kscons_kxt/app.kdevelop b/languages/cpp/app_templates/kscons_kxt/app.kdevelop
index e6a14fff..25ed5653 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.kdevelop
+++ b/languages/cpp/app_templates/kscons_kxt/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -166,4 +166,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate b/languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate
index 6236f905..a6d2fbda 100644
--- a/languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate
+++ b/languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate
@@ -65,7 +65,7 @@ Archive=kscons_kxt.tar.gz
 
 [SCONS]
 Type=include
-File=%{kdevelop}/template-common/scons.kdevtemplate
+File=%{tdevelop}/template-common/scons.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -83,14 +83,14 @@ Dest=%{dest}/doc/SConscript
 [FILE2]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE4]
 Type=install
@@ -103,18 +103,18 @@ Dir=%{dest}/src
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.desktop
+Source=%{tdevelop}/template-common/kde-app.desktop
 Dest=%{dest}/src/%{APPNAMELC}.desktop
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/hi16-app-app.png
+Source=%{tdevelop}/template-common/hi16-app-app.png
 Dest=%{dest}/src/hi16-app-%{APPNAMELC}.png
 Process=false
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/hi32-app-app.png
+Source=%{tdevelop}/template-common/hi32-app-app.png
 Dest=%{dest}/src/hi32-app-%{APPNAMELC}.png
 Process=false
 
diff --git a/languages/cpp/app_templates/kscons_kxt/tips b/languages/cpp/app_templates/kscons_kxt/tips
index 56f29469..b9618b42 100644
--- a/languages/cpp/app_templates/kscons_kxt/tips
+++ b/languages/cpp/app_templates/kscons_kxt/tips
@@ -1,6 +1,6 @@
 <tip category="help">
 <html>
 <p>... that automake was not involved in building this kde application ?</p>
-<p>The kdevelop template &quot;kscons_kxt&quot; was used instead.</p>
+<p>The tdevelop template &quot;kscons_kxt&quot; was used instead.</p>
 </html>
 </tip>
diff --git a/languages/cpp/app_templates/kscreensaver/CMakeLists.txt b/languages/cpp/app_templates/kscreensaver/CMakeLists.txt
index fc8ab374..a74c003c 100644
--- a/languages/cpp/app_templates/kscreensaver/CMakeLists.txt
+++ b/languages/cpp/app_templates/kscreensaver/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( kscreensaver.tar.gz ALL
   COMMAND tar zcf kscreensaver.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     kscreensaver.desktop kscreensaver.png kscreensaver.h
     kscreensaverui.ui src-Makefile.am kscreensaver.cpp
-    kscreensaver.kdevelop subdirs
+    kscreensaver.tdevelop subdirs
 )
 
 
diff --git a/languages/cpp/app_templates/kscreensaver/Makefile.am b/languages/cpp/app_templates/kscreensaver/Makefile.am
index 28747ace..a304c27a 100644
--- a/languages/cpp/app_templates/kscreensaver/Makefile.am
+++ b/languages/cpp/app_templates/kscreensaver/Makefile.am
@@ -1,6 +1,6 @@
 dataFiles = kscreensaver.desktop kscreensaver.png kscreensaver.h \
 	kscreensaverui.ui src-Makefile.am kscreensaver.cpp \
-	kscreensaver.kdevelop subdirs
+	kscreensaver.tdevelop subdirs
 
 templateName= kscreensaver
 
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevelop b/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevelop
index e912518f..bb887180 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevelop
+++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate b/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate
index 027ba4ea..979b6614 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate
+++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate
@@ -68,11 +68,11 @@ Archive=kscreensaver.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -85,25 +85,25 @@ Dir=%{dest}/doc/en
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/kscreensaver.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/kscreensaver.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir3]
 Type=mkdir
@@ -111,7 +111,7 @@ Dir=%{dest}/src
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [MkDir4]
@@ -120,22 +120,22 @@ Dir=%{dest}/po
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [FILE10]
diff --git a/languages/cpp/app_templates/kxt/CMakeLists.txt b/languages/cpp/app_templates/kxt/CMakeLists.txt
index 25505013..4b203750 100644
--- a/languages/cpp/app_templates/kxt/CMakeLists.txt
+++ b/languages/cpp/app_templates/kxt/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( kxt.tar.gz ALL
   COMMAND tar zcf kxt.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     src-Makefile.am app.cpp app.h main.cpp appui.rc
-    app.kdevelop subdirs app.desktop preview.png appview.h
+    app.tdevelop subdirs app.desktop preview.png appview.h
     appview.cpp appview_base.ui prefs-base.ui prefs.cpp prefs.h
     app.kcfg settings.kcfgc README src-configure.in.in
 )
diff --git a/languages/cpp/app_templates/kxt/Makefile.am b/languages/cpp/app_templates/kxt/Makefile.am
index 07767961..8321742a 100644
--- a/languages/cpp/app_templates/kxt/Makefile.am
+++ b/languages/cpp/app_templates/kxt/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.kdevelop \
+dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \
 	subdirs app.desktop preview.png appview.h appview.cpp appview_base.ui \
 	prefs-base.ui prefs.cpp prefs.h app.kcfg settings.kcfgc README \
 	src-configure.in.in
diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp
index ce5577cb..e3032dc1 100644
--- a/languages/cpp/app_templates/kxt/app.cpp
+++ b/languages/cpp/app_templates/kxt/app.cpp
@@ -13,7 +13,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
diff --git a/languages/cpp/app_templates/kxt/app.kdevelop b/languages/cpp/app_templates/kxt/app.kdevelop
index e6a14fff..25ed5653 100644
--- a/languages/cpp/app_templates/kxt/app.kdevelop
+++ b/languages/cpp/app_templates/kxt/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -166,4 +166,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/kxt/kxt.kdevtemplate b/languages/cpp/app_templates/kxt/kxt.kdevtemplate
index a7a23298..43918275 100644
--- a/languages/cpp/app_templates/kxt/kxt.kdevtemplate
+++ b/languages/cpp/app_templates/kxt/kxt.kdevtemplate
@@ -67,11 +67,11 @@ Archive=kxt.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -83,39 +83,39 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [MkDir3]
@@ -124,23 +124,23 @@ Dir=%{dest}/src
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.desktop
+Source=%{tdevelop}/template-common/kde-app.desktop
 Dest=%{dest}/src/%{APPNAMELC}.desktop
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [FILE10]
 Type=install
-Source=%{kdevelop}/template-common/hi16-app-app.png
+Source=%{tdevelop}/template-common/hi16-app-app.png
 Dest=%{dest}/src/hi16-app-%{APPNAMELC}.png
 Process=false
 
 [FILE11]
 Type=install
-Source=%{kdevelop}/template-common/hi32-app-app.png
+Source=%{tdevelop}/template-common/hi32-app-app.png
 Dest=%{dest}/src/hi32-app-%{APPNAMELC}.png
 Process=false
 
@@ -150,7 +150,7 @@ Dir=%{dest}/po
 
 [FILE12]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE13]
diff --git a/languages/cpp/app_templates/makefileempty/CMakeLists.txt b/languages/cpp/app_templates/makefileempty/CMakeLists.txt
index 04cc2b33..48a6e3dd 100644
--- a/languages/cpp/app_templates/makefileempty/CMakeLists.txt
+++ b/languages/cpp/app_templates/makefileempty/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( makefileempty.tar.gz ALL
   COMMAND tar zcf makefileempty.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    makefileempty-Makefile makefileempty.png app.kdevelop
+    makefileempty-Makefile makefileempty.png app.tdevelop
 )
 
 
diff --git a/languages/cpp/app_templates/makefileempty/Makefile.am b/languages/cpp/app_templates/makefileempty/Makefile.am
index 87f1db69..ec381a04 100644
--- a/languages/cpp/app_templates/makefileempty/Makefile.am
+++ b/languages/cpp/app_templates/makefileempty/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = makefileempty-Makefile \
-	makefileempty.png app.kdevelop
+	makefileempty.png app.tdevelop
 templateName = makefileempty
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/makefileempty/app.kdevelop b/languages/cpp/app_templates/makefileempty/app.kdevelop
index a0b41f59..e6806599 100644
--- a/languages/cpp/app_templates/makefileempty/app.kdevelop
+++ b/languages/cpp/app_templates/makefileempty/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -98,4 +98,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate b/languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate
index bacfcae0..413f9772 100644
--- a/languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate
+++ b/languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate
@@ -48,12 +48,12 @@ Archive=makefileempty.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/noatunui/CMakeLists.txt b/languages/cpp/app_templates/noatunui/CMakeLists.txt
index 506cd194..332a960a 100644
--- a/languages/cpp/app_templates/noatunui/CMakeLists.txt
+++ b/languages/cpp/app_templates/noatunui/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( noatunui.tar.gz ALL
   COMMAND tar zcf noatunui.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     src-Makefile.am plugin_app.cpp plugin_impl.cpp
-    plugin_impl.h noatunui.png plugin.plugin plugin.kdevelop
+    plugin_impl.h noatunui.png plugin.plugin plugin.tdevelop
     subdirs
 )
 
diff --git a/languages/cpp/app_templates/noatunui/Makefile.am b/languages/cpp/app_templates/noatunui/Makefile.am
index 29358f2f..a222f235 100644
--- a/languages/cpp/app_templates/noatunui/Makefile.am
+++ b/languages/cpp/app_templates/noatunui/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = src-Makefile.am plugin_app.cpp plugin_impl.cpp plugin_impl.h \
-	noatunui.png plugin.plugin plugin.kdevelop subdirs
+	noatunui.png plugin.plugin plugin.tdevelop subdirs
 templateName = noatunui
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/noatunui/noatunui.kdevtemplate b/languages/cpp/app_templates/noatunui/noatunui.kdevtemplate
index 394e71ed..cc3720c1 100644
--- a/languages/cpp/app_templates/noatunui/noatunui.kdevtemplate
+++ b/languages/cpp/app_templates/noatunui/noatunui.kdevtemplate
@@ -63,11 +63,11 @@ Archive=noatunui.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -79,39 +79,39 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/plugin.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/plugin.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [MkDir3]
@@ -120,7 +120,7 @@ Dir=%{dest}/src
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [MkDir4]
@@ -129,7 +129,7 @@ Dir=%{dest}/po
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE10]
diff --git a/languages/cpp/app_templates/noatunui/plugin.kdevelop b/languages/cpp/app_templates/noatunui/plugin.kdevelop
index f0cda142..ba43279c 100644
--- a/languages/cpp/app_templates/noatunui/plugin.kdevelop
+++ b/languages/cpp/app_templates/noatunui/plugin.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -108,4 +108,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/noatunvisual/CMakeLists.txt b/languages/cpp/app_templates/noatunvisual/CMakeLists.txt
index 5a92db6f..8b5668ec 100644
--- a/languages/cpp/app_templates/noatunvisual/CMakeLists.txt
+++ b/languages/cpp/app_templates/noatunvisual/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( noatunvisual.tar.gz ALL
   COMMAND tar zcf noatunvisual.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     src-Makefile.am plugin_app.cpp plugin_app.h plugin_impl.cpp
     plugin_impl.h noatunvisual.png plugin.plugin
-    plugin.kdevelop subdirs noatunvisual-configure.in.in
+    plugin.tdevelop subdirs noatunvisual-configure.in.in
 )
 
 
diff --git a/languages/cpp/app_templates/noatunvisual/Makefile.am b/languages/cpp/app_templates/noatunvisual/Makefile.am
index 0d6a43eb..d7466e24 100644
--- a/languages/cpp/app_templates/noatunvisual/Makefile.am
+++ b/languages/cpp/app_templates/noatunvisual/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = src-Makefile.am plugin_app.cpp plugin_app.h plugin_impl.cpp \
-	plugin_impl.h noatunvisual.png plugin.plugin plugin.kdevelop \
+	plugin_impl.h noatunvisual.png plugin.plugin plugin.tdevelop \
 	subdirs noatunvisual-configure.in.in
 templateName = noatunvisual
 
diff --git a/languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate b/languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate
index 4c726194..885bada0 100644
--- a/languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate
+++ b/languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate
@@ -67,11 +67,11 @@ Archive=noatunvisual.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -84,33 +84,33 @@ Dir=%{dest}/doc/en
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
-Source=%{src}/plugin.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/plugin.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE7]
@@ -124,7 +124,7 @@ Dir=%{dest}/src
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [MkDir4]
@@ -133,7 +133,7 @@ Dir=%{dest}/po
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE10]
diff --git a/languages/cpp/app_templates/noatunvisual/plugin.kdevelop b/languages/cpp/app_templates/noatunvisual/plugin.kdevelop
index 281d095e..0352c4cd 100644
--- a/languages/cpp/app_templates/noatunvisual/plugin.kdevelop
+++ b/languages/cpp/app_templates/noatunvisual/plugin.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -115,4 +115,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/opieapp/CMakeLists.txt b/languages/cpp/app_templates/opieapp/CMakeLists.txt
index 1e8ce9db..4f2b2824 100644
--- a/languages/cpp/app_templates/opieapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/opieapp/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( opieapp.tar.gz ALL
   COMMAND tar zcf opieapp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    Example.png app.kdevelop example.desktop Makefile.am
+    Example.png app.tdevelop example.desktop Makefile.am
     app.pro example.cpp example.h examplebase.ui
 )
 
diff --git a/languages/cpp/app_templates/opieapp/Makefile.am b/languages/cpp/app_templates/opieapp/Makefile.am
index 643a1c29..10a1f2a1 100644
--- a/languages/cpp/app_templates/opieapp/Makefile.am
+++ b/languages/cpp/app_templates/opieapp/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = Example.png  app.kdevelop  example.desktop   Makefile.am  \
+dataFiles = Example.png  app.tdevelop  example.desktop   Makefile.am  \
 	app.pro example.cpp example.h examplebase.ui
 
 templateName = opieapp
diff --git a/languages/cpp/app_templates/opieapp/app.kdevelop b/languages/cpp/app_templates/opieapp/app.kdevelop
index 69b6f2bc..9bdb127e 100644
--- a/languages/cpp/app_templates/opieapp/app.kdevelop
+++ b/languages/cpp/app_templates/opieapp/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -140,4 +140,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/opieapp/opieapp.kdevtemplate b/languages/cpp/app_templates/opieapp/opieapp.kdevtemplate
index 622ec9a6..e91ec97e 100644
--- a/languages/cpp/app_templates/opieapp/opieapp.kdevtemplate
+++ b/languages/cpp/app_templates/opieapp/opieapp.kdevtemplate
@@ -69,8 +69,8 @@ Archive=opieapp.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir0]
 Type=mkdir
diff --git a/languages/cpp/app_templates/opieapplet/CMakeLists.txt b/languages/cpp/app_templates/opieapplet/CMakeLists.txt
index de20130d..e4dc42f0 100644
--- a/languages/cpp/app_templates/opieapplet/CMakeLists.txt
+++ b/languages/cpp/app_templates/opieapplet/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( opieapplet.tar.gz ALL
   COMMAND tar zcf opieapplet.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    Makefile.am Example.png app.kdevelop app.pro simpleimpl.cpp
+    Makefile.am Example.png app.tdevelop app.pro simpleimpl.cpp
     simpleimpl.h
 )
 
diff --git a/languages/cpp/app_templates/opieapplet/Makefile.am b/languages/cpp/app_templates/opieapplet/Makefile.am
index 8faf4e32..6bbb09ac 100644
--- a/languages/cpp/app_templates/opieapplet/Makefile.am
+++ b/languages/cpp/app_templates/opieapplet/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = Makefile.am Example.png  app.kdevelop  app.pro \
+dataFiles = Makefile.am Example.png  app.tdevelop  app.pro \
 	simpleimpl.cpp simpleimpl.h
 
 templateName = opieapplet
diff --git a/languages/cpp/app_templates/opieapplet/app.kdevelop b/languages/cpp/app_templates/opieapplet/app.kdevelop
index eee2c55a..c5544656 100644
--- a/languages/cpp/app_templates/opieapplet/app.kdevelop
+++ b/languages/cpp/app_templates/opieapplet/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -155,4 +155,4 @@ fi
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate b/languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate
index 7be33a95..b9206d16 100644
--- a/languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate
+++ b/languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate
@@ -69,8 +69,8 @@ Archive=opieapplet.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir0]
 Type=mkdir
diff --git a/languages/cpp/app_templates/opieinput/CMakeLists.txt b/languages/cpp/app_templates/opieinput/CMakeLists.txt
index e942fb09..f7bba492 100644
--- a/languages/cpp/app_templates/opieinput/CMakeLists.txt
+++ b/languages/cpp/app_templates/opieinput/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( opieinput.tar.gz ALL
   COMMAND tar zcf opieinput.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    Makefile.am Example.png app.kdevelop app.pro simpleimpl.cpp
+    Makefile.am Example.png app.tdevelop app.pro simpleimpl.cpp
     simpleimpl.h
 )
 
diff --git a/languages/cpp/app_templates/opieinput/Makefile.am b/languages/cpp/app_templates/opieinput/Makefile.am
index d748092c..9a3e5ffd 100644
--- a/languages/cpp/app_templates/opieinput/Makefile.am
+++ b/languages/cpp/app_templates/opieinput/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = Makefile.am Example.png app.kdevelop app.pro \
+dataFiles = Makefile.am Example.png app.tdevelop app.pro \
 	simpleimpl.cpp simpleimpl.h
 templateName = opieinput
 
diff --git a/languages/cpp/app_templates/opieinput/app.kdevelop b/languages/cpp/app_templates/opieinput/app.kdevelop
index 639a3215..cc61122f 100644
--- a/languages/cpp/app_templates/opieinput/app.kdevelop
+++ b/languages/cpp/app_templates/opieinput/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -156,4 +156,4 @@ fi
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/opieinput/opieinput.kdevtemplate b/languages/cpp/app_templates/opieinput/opieinput.kdevtemplate
index 39250370..d2d26636 100644
--- a/languages/cpp/app_templates/opieinput/opieinput.kdevtemplate
+++ b/languages/cpp/app_templates/opieinput/opieinput.kdevtemplate
@@ -65,8 +65,8 @@ Archive=opieinput.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir0]
 Type=mkdir
diff --git a/languages/cpp/app_templates/opiemenu/CMakeLists.txt b/languages/cpp/app_templates/opiemenu/CMakeLists.txt
index 8567a4f8..c321604c 100644
--- a/languages/cpp/app_templates/opiemenu/CMakeLists.txt
+++ b/languages/cpp/app_templates/opiemenu/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( opiemenu.tar.gz ALL
   COMMAND tar zcf opiemenu.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    Makefile.am Example.png app.kdevelop app.pro simpleimpl.cpp
+    Makefile.am Example.png app.tdevelop app.pro simpleimpl.cpp
     simpleimpl.h
 )
 
diff --git a/languages/cpp/app_templates/opiemenu/Makefile.am b/languages/cpp/app_templates/opiemenu/Makefile.am
index c44b3f96..343a2bfa 100644
--- a/languages/cpp/app_templates/opiemenu/Makefile.am
+++ b/languages/cpp/app_templates/opiemenu/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = Makefile.am Example.png  app.kdevelop  app.pro \
+dataFiles = Makefile.am Example.png  app.tdevelop  app.pro \
 	simpleimpl.cpp simpleimpl.h
 
 templateName = opiemenu
diff --git a/languages/cpp/app_templates/opiemenu/app.kdevelop b/languages/cpp/app_templates/opiemenu/app.kdevelop
index eee2c55a..c5544656 100644
--- a/languages/cpp/app_templates/opiemenu/app.kdevelop
+++ b/languages/cpp/app_templates/opiemenu/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -155,4 +155,4 @@ fi
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate b/languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate
index b32b13ed..1a5cb239 100644
--- a/languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate
+++ b/languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate
@@ -66,8 +66,8 @@ Archive=opiemenu.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir0]
 Type=mkdir
diff --git a/languages/cpp/app_templates/opienet/CMakeLists.txt b/languages/cpp/app_templates/opienet/CMakeLists.txt
index 1c95a265..a08e71be 100644
--- a/languages/cpp/app_templates/opienet/CMakeLists.txt
+++ b/languages/cpp/app_templates/opienet/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( opienet.tar.gz ALL
   COMMAND tar zcf opienet.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    Makefile.am Example.png app.kdevelop app.pro
+    Makefile.am Example.png app.tdevelop app.pro
     simpleiface.cpp simpleiface.h simplemodule.h
     simplemodule.cpp
 )
diff --git a/languages/cpp/app_templates/opienet/Makefile.am b/languages/cpp/app_templates/opienet/Makefile.am
index 47dc4231..5245c17e 100644
--- a/languages/cpp/app_templates/opienet/Makefile.am
+++ b/languages/cpp/app_templates/opienet/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = Makefile.am Example.png  app.kdevelop  app.pro \
+dataFiles = Makefile.am Example.png  app.tdevelop  app.pro \
 	simpleiface.cpp simpleiface.h simplemodule.h \
 	simplemodule.cpp
 
diff --git a/languages/cpp/app_templates/opienet/app.kdevelop b/languages/cpp/app_templates/opienet/app.kdevelop
index 660b7bee..7717a098 100644
--- a/languages/cpp/app_templates/opienet/app.kdevelop
+++ b/languages/cpp/app_templates/opienet/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -140,4 +140,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/opienet/opienet.kdevtemplate b/languages/cpp/app_templates/opienet/opienet.kdevtemplate
index 4ab9ebbe..2b30fc1f 100644
--- a/languages/cpp/app_templates/opienet/opienet.kdevtemplate
+++ b/languages/cpp/app_templates/opienet/opienet.kdevtemplate
@@ -67,8 +67,8 @@ Archive=opienet.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir0]
 Type=mkdir
diff --git a/languages/cpp/app_templates/opietoday/CMakeLists.txt b/languages/cpp/app_templates/opietoday/CMakeLists.txt
index 3d86b992..6c7c4d66 100644
--- a/languages/cpp/app_templates/opietoday/CMakeLists.txt
+++ b/languages/cpp/app_templates/opietoday/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( opietoday.tar.gz ALL
   COMMAND tar zcf opietoday.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    Makefile.am Example.png app.kdevelop
+    Makefile.am Example.png app.tdevelop
     app.pro exampleplugin.cpp examplepluginimpl.cpp
     examplepluginwidget.cpp exampleplugin.h examplepluginimpl.h
     examplepluginwidget.h
diff --git a/languages/cpp/app_templates/opietoday/Makefile.am b/languages/cpp/app_templates/opietoday/Makefile.am
index 8854404d..6c999369 100644
--- a/languages/cpp/app_templates/opietoday/Makefile.am
+++ b/languages/cpp/app_templates/opietoday/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = Makefile.am Example.png  app.kdevelop  app.pro exampleplugin.cpp \
+dataFiles = Makefile.am Example.png  app.tdevelop  app.pro exampleplugin.cpp \
 	examplepluginimpl.cpp  examplepluginwidget.cpp exampleplugin.h \
 	examplepluginimpl.h  examplepluginwidget.h
 
diff --git a/languages/cpp/app_templates/opietoday/app.kdevelop b/languages/cpp/app_templates/opietoday/app.kdevelop
index f6e57207..c387911b 100644
--- a/languages/cpp/app_templates/opietoday/app.kdevelop
+++ b/languages/cpp/app_templates/opietoday/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -140,4 +140,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/opietoday/opietoday.kdevtemplate b/languages/cpp/app_templates/opietoday/opietoday.kdevtemplate
index 25d8f42d..71d7c413 100644
--- a/languages/cpp/app_templates/opietoday/opietoday.kdevtemplate
+++ b/languages/cpp/app_templates/opietoday/opietoday.kdevtemplate
@@ -66,8 +66,8 @@ Archive=opietoday.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir0]
 Type=mkdir
diff --git a/languages/cpp/app_templates/prc-tool/Makefile.am b/languages/cpp/app_templates/prc-tool/Makefile.am
index 3d4b5610..06f097a4 100644
--- a/languages/cpp/app_templates/prc-tool/Makefile.am
+++ b/languages/cpp/app_templates/prc-tool/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = prc-tool.png src-Makefile prc-tool.kdevelop callback.h \
+dataFiles = prc-tool.png src-Makefile prc-tool.tdevelop callback.h \
 	palmhello.c palmhello.pbitm palmhello.rcp palmhelloRsc.h
 templateName = prc-tool
 
diff --git a/languages/cpp/app_templates/prc-tool/prc-tool.kdevelop b/languages/cpp/app_templates/prc-tool/prc-tool.kdevelop
index 2c5a6c0a..9015718f 100644
--- a/languages/cpp/app_templates/prc-tool/prc-tool.kdevelop
+++ b/languages/cpp/app_templates/prc-tool/prc-tool.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -48,4 +48,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate b/languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate
index 4216c466..b08cc900 100644
--- a/languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate
+++ b/languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate
@@ -65,13 +65,13 @@ Archive=prc-tool.tar.gz
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/prc-tool.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/prc-tool.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/qmakeapp/CMakeLists.txt b/languages/cpp/app_templates/qmakeapp/CMakeLists.txt
index febda6f6..4af3dc73 100644
--- a/languages/cpp/app_templates/qmakeapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/qmakeapp/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( qmakeapp.tar.gz ALL
   COMMAND tar zcf qmakeapp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     main.cpp qmakeapp.cpp qmakeapp.h qmakeapp.png
-    qmakeapp.kdevelop qmakeapp.pro src.pro filesave.xpm
+    qmakeapp.tdevelop qmakeapp.pro src.pro filesave.xpm
     fileopen.xpm fileprint.xpm
 )
 
diff --git a/languages/cpp/app_templates/qmakeapp/Makefile.am b/languages/cpp/app_templates/qmakeapp/Makefile.am
index c70050fa..233717d7 100644
--- a/languages/cpp/app_templates/qmakeapp/Makefile.am
+++ b/languages/cpp/app_templates/qmakeapp/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.cpp qmakeapp.cpp qmakeapp.h qmakeapp.png qmakeapp.kdevelop \
+dataFiles = main.cpp qmakeapp.cpp qmakeapp.h qmakeapp.png qmakeapp.tdevelop \
 	qmakeapp.pro src.pro filesave.xpm fileopen.xpm fileprint.xpm
 
 templateName = qmakeapp
diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevelop b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevelop
index ef24a34b..bb0c89c4 100644
--- a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevelop
+++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -109,4 +109,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate
index 2fab0758..ac4ee476 100644
--- a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate
+++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate
@@ -54,8 +54,8 @@ Archive=qmakeapp.tar.gz
 
 [FILE1]
 Type=install
-Source=%{src}/qmakeapp.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/qmakeapp.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/qmakeempty/CMakeLists.txt b/languages/cpp/app_templates/qmakeempty/CMakeLists.txt
index d6424957..bc109590 100644
--- a/languages/cpp/app_templates/qmakeempty/CMakeLists.txt
+++ b/languages/cpp/app_templates/qmakeempty/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( qmakeempty.tar.gz ALL
   COMMAND tar zcf qmakeempty.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    qmakeempty.kdevelop qmakeempty.pro qmakeempty.png
+    qmakeempty.tdevelop qmakeempty.pro qmakeempty.png
 )
 
 
diff --git a/languages/cpp/app_templates/qmakeempty/Makefile.am b/languages/cpp/app_templates/qmakeempty/Makefile.am
index 57677d88..9d62ad0a 100644
--- a/languages/cpp/app_templates/qmakeempty/Makefile.am
+++ b/languages/cpp/app_templates/qmakeempty/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = qmakeempty.kdevelop \
+dataFiles = qmakeempty.tdevelop \
 	qmakeempty.pro qmakeempty.png
 
 templateName = qmakeempty
diff --git a/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevelop b/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevelop
index cd633ede..ebddab8a 100644
--- a/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevelop
+++ b/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate b/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate
index cb108705..a245ba2a 100644
--- a/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate
+++ b/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate
@@ -47,8 +47,8 @@ Archive=qmakeempty.tar.gz
 
 [FILE1]
 Type=install
-Source=%{src}/qmakeempty.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/qmakeempty.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/qmakesimple/CMakeLists.txt b/languages/cpp/app_templates/qmakesimple/CMakeLists.txt
index 3693890b..64b3b0bd 100644
--- a/languages/cpp/app_templates/qmakesimple/CMakeLists.txt
+++ b/languages/cpp/app_templates/qmakesimple/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( qmakesimple.tar.gz ALL
   COMMAND tar zcf qmakesimple.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    main.cpp qmakesimple.png app.kdevelop app.pro src.pro
+    main.cpp qmakesimple.png app.tdevelop app.pro src.pro
 )
 
 
diff --git a/languages/cpp/app_templates/qmakesimple/Makefile.am b/languages/cpp/app_templates/qmakesimple/Makefile.am
index a187172f..ac17219f 100644
--- a/languages/cpp/app_templates/qmakesimple/Makefile.am
+++ b/languages/cpp/app_templates/qmakesimple/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.cpp qmakesimple.png app.kdevelop app.pro src.pro
+dataFiles = main.cpp qmakesimple.png app.tdevelop app.pro src.pro
 templateName = qmakesimple
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/qmakesimple/app.kdevelop b/languages/cpp/app_templates/qmakesimple/app.kdevelop
index a77f86f3..1a0462a4 100644
--- a/languages/cpp/app_templates/qmakesimple/app.kdevelop
+++ b/languages/cpp/app_templates/qmakesimple/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -97,4 +97,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate
index 1d7cc7b1..ed31a929 100644
--- a/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate
+++ b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate
@@ -54,8 +54,8 @@ Archive=qmakesimple.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/qt4hello/CMakeLists.txt b/languages/cpp/app_templates/qt4hello/CMakeLists.txt
index 9ee76557..7ec55256 100644
--- a/languages/cpp/app_templates/qt4hello/CMakeLists.txt
+++ b/languages/cpp/app_templates/qt4hello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( qt4hello.tar.gz ALL
   COMMAND tar zcf qt4hello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    main.cpp qt4hello.png qt4hello.kdevelop qt4hello.pro
+    main.cpp qt4hello.png qt4hello.tdevelop qt4hello.pro
     src.pro ReadMe
 )
 
diff --git a/languages/cpp/app_templates/qt4hello/Makefile.am b/languages/cpp/app_templates/qt4hello/Makefile.am
index b285f781..3f735466 100644
--- a/languages/cpp/app_templates/qt4hello/Makefile.am
+++ b/languages/cpp/app_templates/qt4hello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.cpp qt4hello.png qt4hello.kdevelop \
+dataFiles = main.cpp qt4hello.png qt4hello.tdevelop \
 	qt4hello.pro src.pro ReadMe
 
 templateName = qt4hello
diff --git a/languages/cpp/app_templates/qt4hello/qt4hello.kdevelop b/languages/cpp/app_templates/qt4hello/qt4hello.kdevelop
index cd633ede..ebddab8a 100644
--- a/languages/cpp/app_templates/qt4hello/qt4hello.kdevelop
+++ b/languages/cpp/app_templates/qt4hello/qt4hello.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate b/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate
index d1796a14..72b85449 100644
--- a/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate
+++ b/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate
@@ -51,8 +51,8 @@ Archive=qt4hello.tar.gz
 
 [FILE1]
 Type=install
-Source=%{src}/qt4hello.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/qt4hello.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt b/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt
index 9b294a7b..422740dc 100644
--- a/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( qt4makeapp.tar.gz ALL
   COMMAND tar zcf qt4makeapp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     main.cpp qt4makeapp.cpp qt4makeapp.h qt4makeapp.png
-    qt4makeapp.kdevelop qt4makeapp.pro src.pro application.qrc
+    qt4makeapp.tdevelop qt4makeapp.pro src.pro application.qrc
     ReadMe filesave.xpm fileopen.xpm filenew.xpm editcopy.xpm
     editpaste.xpm editcut.xpm
 )
diff --git a/languages/cpp/app_templates/qt4makeapp/Makefile.am b/languages/cpp/app_templates/qt4makeapp/Makefile.am
index 62c4c120..68f78acb 100644
--- a/languages/cpp/app_templates/qt4makeapp/Makefile.am
+++ b/languages/cpp/app_templates/qt4makeapp/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.cpp qt4makeapp.cpp qt4makeapp.h qt4makeapp.png qt4makeapp.kdevelop \
+dataFiles = main.cpp qt4makeapp.cpp qt4makeapp.h qt4makeapp.png qt4makeapp.tdevelop \
 	qt4makeapp.pro src.pro application.qrc ReadMe filesave.xpm fileopen.xpm filenew.xpm \
 	editcopy.xpm editpaste.xpm editcut.xpm
 
diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevelop b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevelop
index cd633ede..ebddab8a 100644
--- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevelop
+++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate
index ff91d477..540ff927 100644
--- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate
+++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate
@@ -53,8 +53,8 @@ Archive=qt4makeapp.tar.gz
 
 [FILE1]
 Type=install
-Source=%{src}/qt4makeapp.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/qt4makeapp.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/qtopia4app/CMakeLists.txt b/languages/cpp/app_templates/qtopia4app/CMakeLists.txt
index 70331f8f..57849362 100644
--- a/languages/cpp/app_templates/qtopia4app/CMakeLists.txt
+++ b/languages/cpp/app_templates/qtopia4app/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( qtopia4app.tar.gz ALL
   COMMAND tar zcf qtopia4app.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    Example.png app.kdevelop example.desktop example.html
+    Example.png app.tdevelop example.desktop example.html
     main.cpp Makefile.am app.pro example.cpp example.h
     examplebase.ui
 )
diff --git a/languages/cpp/app_templates/qtopia4app/Makefile.am b/languages/cpp/app_templates/qtopia4app/Makefile.am
index 57785690..324291bb 100644
--- a/languages/cpp/app_templates/qtopia4app/Makefile.am
+++ b/languages/cpp/app_templates/qtopia4app/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = Example.png app.kdevelop example.desktop \
+dataFiles = Example.png app.tdevelop example.desktop \
 	example.html main.cpp Makefile.am app.pro example.cpp \
 	example.h examplebase.ui
 
diff --git a/languages/cpp/app_templates/qtopia4app/app.kdevelop b/languages/cpp/app_templates/qtopia4app/app.kdevelop
index 465fd677..c5a43418 100644
--- a/languages/cpp/app_templates/qtopia4app/app.kdevelop
+++ b/languages/cpp/app_templates/qtopia4app/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -160,4 +160,4 @@
       <designerpluginpaths/>
     </qt>
   </kdevcppsupport>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate b/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate
index 298407f5..28510dd2 100644
--- a/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate
+++ b/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate
@@ -57,8 +57,8 @@ Dir=%{dest}/help/html
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt b/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt
index 959515e9..424d19bc 100644
--- a/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( qtopiaapp.tar.gz ALL
   COMMAND tar zcf qtopiaapp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    Example.png app.kdevelop example.control example.desktop
+    Example.png app.tdevelop example.control example.desktop
     example.html main.cpp Makefile.am app.pro example.cpp
     example.h examplebase.ui qtopiaapp
 )
diff --git a/languages/cpp/app_templates/qtopiaapp/Makefile.am b/languages/cpp/app_templates/qtopiaapp/Makefile.am
index c250d5fa..afaaf294 100644
--- a/languages/cpp/app_templates/qtopiaapp/Makefile.am
+++ b/languages/cpp/app_templates/qtopiaapp/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = Example.png app.kdevelop example.control example.desktop \
+dataFiles = Example.png app.tdevelop example.control example.desktop \
 	example.html main.cpp Makefile.am app.pro example.cpp \
 	example.h examplebase.ui qtopiaapp
 
diff --git a/languages/cpp/app_templates/qtopiaapp/app.kdevelop b/languages/cpp/app_templates/qtopiaapp/app.kdevelop
index 9db37db3..42dcde2e 100644
--- a/languages/cpp/app_templates/qtopiaapp/app.kdevelop
+++ b/languages/cpp/app_templates/qtopiaapp/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -128,4 +128,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate b/languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate
index 45479b04..1271b2d9 100644
--- a/languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate
+++ b/languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate
@@ -69,8 +69,8 @@ Archive=qtopiaapp.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/win32gui/CMakeLists.txt b/languages/cpp/app_templates/win32gui/CMakeLists.txt
index 9aa12a42..09d0bc52 100644
--- a/languages/cpp/app_templates/win32gui/CMakeLists.txt
+++ b/languages/cpp/app_templates/win32gui/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( win32gui.tar.gz ALL
   COMMAND tar zcf win32gui.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     app.cpp src-Makefile.am win32gui-Makefile.am
     win32gui-Makefile.cvs win32gui-configure.in win32gui.png
-    app.kdevelop
+    app.tdevelop
 )
 
 
diff --git a/languages/cpp/app_templates/win32gui/Makefile.am b/languages/cpp/app_templates/win32gui/Makefile.am
index 66931bfd..a29fa6a8 100644
--- a/languages/cpp/app_templates/win32gui/Makefile.am
+++ b/languages/cpp/app_templates/win32gui/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = app.cpp src-Makefile.am win32gui-Makefile.am win32gui-Makefile.cvs \
-	win32gui-configure.in win32gui.png app.kdevelop
+	win32gui-configure.in win32gui.png app.tdevelop
 
 templateName = win32gui
 
diff --git a/languages/cpp/app_templates/win32gui/app.kdevelop b/languages/cpp/app_templates/win32gui/app.kdevelop
index f9dc8145..aef7f367 100644
--- a/languages/cpp/app_templates/win32gui/app.kdevelop
+++ b/languages/cpp/app_templates/win32gui/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -189,4 +189,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate b/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate
index 0a600294..8c63cc15 100644
--- a/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate
+++ b/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate
@@ -64,17 +64,17 @@ Archive=win32gui.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{kdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/win32hello/CMakeLists.txt b/languages/cpp/app_templates/win32hello/CMakeLists.txt
index d3d7d6ec..bc1c8d80 100644
--- a/languages/cpp/app_templates/win32hello/CMakeLists.txt
+++ b/languages/cpp/app_templates/win32hello/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( win32hello.tar.gz ALL
   COMMAND tar zcf win32hello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     app.cpp src-Makefile.am win32-Makefile.am
     win32-Makefile.cvs win32-configure.in win32hello.png
-    app.kdevelop
+    app.tdevelop
 )
 
 
diff --git a/languages/cpp/app_templates/win32hello/Makefile.am b/languages/cpp/app_templates/win32hello/Makefile.am
index d6c7dfad..a55bcebc 100644
--- a/languages/cpp/app_templates/win32hello/Makefile.am
+++ b/languages/cpp/app_templates/win32hello/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = app.cpp src-Makefile.am win32-Makefile.am win32-Makefile.cvs \
-	win32-configure.in win32hello.png app.kdevelop
+	win32-configure.in win32hello.png app.tdevelop
 
 templateName = win32hello
 
diff --git a/languages/cpp/app_templates/win32hello/app.kdevelop b/languages/cpp/app_templates/win32hello/app.kdevelop
index 33c1e97e..47943b75 100644
--- a/languages/cpp/app_templates/win32hello/app.kdevelop
+++ b/languages/cpp/app_templates/win32hello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -161,4 +161,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/win32hello/win32hello.kdevtemplate b/languages/cpp/app_templates/win32hello/win32hello.kdevtemplate
index b6fb54d2..eee01a57 100644
--- a/languages/cpp/app_templates/win32hello/win32hello.kdevtemplate
+++ b/languages/cpp/app_templates/win32hello/win32hello.kdevtemplate
@@ -63,17 +63,17 @@ Archive=win32hello.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{kdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/wxhello/CMakeLists.txt b/languages/cpp/app_templates/wxhello/CMakeLists.txt
index 57ec33db..f1a8ffec 100644
--- a/languages/cpp/app_templates/wxhello/CMakeLists.txt
+++ b/languages/cpp/app_templates/wxhello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( wxhello.tar.gz ALL
   COMMAND tar zcf wxhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    src-Makefile.am app.cpp app.h app.kdevelop subdirs
+    src-Makefile.am app.cpp app.h app.tdevelop subdirs
     app.desktop wxhello.png
 )
 
diff --git a/languages/cpp/app_templates/wxhello/Makefile.am b/languages/cpp/app_templates/wxhello/Makefile.am
index 5f1a213a..c45b1d10 100644
--- a/languages/cpp/app_templates/wxhello/Makefile.am
+++ b/languages/cpp/app_templates/wxhello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = src-Makefile.am app.cpp app.h app.kdevelop subdirs \
+dataFiles = src-Makefile.am app.cpp app.h app.tdevelop subdirs \
 	app.desktop wxhello.png
 
 templateName = wxhello
diff --git a/languages/cpp/app_templates/wxhello/app.kdevelop b/languages/cpp/app_templates/wxhello/app.kdevelop
index 77835163..851ec979 100644
--- a/languages/cpp/app_templates/wxhello/app.kdevelop
+++ b/languages/cpp/app_templates/wxhello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -111,4 +111,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/app_templates/wxhello/wxhello b/languages/cpp/app_templates/wxhello/wxhello
index 2e0d224f..247ac763 100644
--- a/languages/cpp/app_templates/wxhello/wxhello
+++ b/languages/cpp/app_templates/wxhello/wxhello
@@ -51,8 +51,8 @@ Option=INSTALL_DOCS
 
 [PROJECT]
 Type=install
-Source=%{src}/template-wxhello/app.kdevelop
-Dest=%{dest}/${APPNAMELC}.kdevelop
+Source=%{src}/template-wxhello/app.tdevelop
+Dest=%{dest}/${APPNAMELC}.tdevelop
 
 [WXMAKEFILE.AM]
 Type=install
diff --git a/languages/cpp/app_templates/wxhello/wxhello.kdevtemplate b/languages/cpp/app_templates/wxhello/wxhello.kdevtemplate
index 48e605e1..14cc5273 100644
--- a/languages/cpp/app_templates/wxhello/wxhello.kdevtemplate
+++ b/languages/cpp/app_templates/wxhello/wxhello.kdevtemplate
@@ -64,11 +64,11 @@ Archive=wxhello.tar.gz
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [WXARCH]
 Type=install archive
-Source=%{kdevelop}/template-common/wxwidgets.tar.gz
+Source=%{tdevelop}/template-common/wxwidgets.tar.gz
 Dest=%{dest}
 
 [MKDIR_DOCBOOK1]
@@ -81,42 +81,42 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [WX]
 Type=include
-File=%{kdevelop}/template-common/wx.kdevtemplate
+File=%{tdevelop}/template-common/wx.kdevtemplate
 
 [FILE4]
 Type=install
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/wx-Makefile.am
+Source=%{tdevelop}/template-common/wx-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/wx-Makefile.cvs
+Source=%{tdevelop}/template-common/wx-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/wx-configure.in
+Source=%{tdevelop}/template-common/wx-configure.in
 Dest=%{dest}/configure.in
 
 [MkDir3]
@@ -125,13 +125,13 @@ Dir=%{dest}/src
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/hi16-app-app.png
+Source=%{tdevelop}/template-common/hi16-app-app.png
 Dest=%{dest}/src/hi16-app-%{APPNAMELC}.png
 Process=false
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/hi32-app-app.png
+Source=%{tdevelop}/template-common/hi32-app-app.png
 Dest=%{dest}/src/hi32-app-%{APPNAMELC}.png
 Process=false
 
diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp
index 050d4c24..9fded09c 100644
--- a/languages/cpp/ast_utils.cpp
+++ b/languages/cpp/ast_utils.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2002 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                 *
+*   roberto@tdevelop.org                                                 *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/ast_utils.h b/languages/cpp/ast_utils.h
index a960abad..1f3b2799 100644
--- a/languages/cpp/ast_utils.h
+++ b/languages/cpp/ast_utils.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2002 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                 *
+*   roberto@tdevelop.org                                                 *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp
index 13b831e0..668c5599 100644
--- a/languages/cpp/backgroundparser.cpp
+++ b/languages/cpp/backgroundparser.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2002 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                 *
+*   roberto@tdevelop.org                                                 *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/backgroundparser.h b/languages/cpp/backgroundparser.h
index f3cd86fd..fde6c823 100644
--- a/languages/cpp/backgroundparser.h
+++ b/languages/cpp/backgroundparser.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2002 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                 *
+*   roberto@tdevelop.org                                                 *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/bithelpers.h b/languages/cpp/bithelpers.h
index 3cb74420..4ca54950 100644
--- a/languages/cpp/bithelpers.h
+++ b/languages/cpp/bithelpers.h
@@ -1,7 +1,7 @@
 
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp
index e786fb87..445940e6 100644
--- a/languages/cpp/ccconfigwidget.cpp
+++ b/languages/cpp/ccconfigwidget.cpp
@@ -38,8 +38,8 @@
 #include <knuminput.h>
 #include <kmainwindow.h>
 #include <klineedit.h>
-#include <kdeversion.h>
-// kdevelop includes
+#include <tdeversion.h>
+// tdevelop includes
 #include <domutil.h>
 #include <kdevcoderepository.h>
 #include <kdevmainwindow.h>
diff --git a/languages/cpp/codecompletionentry.h b/languages/cpp/codecompletionentry.h
index 60042004..e510b765 100644
--- a/languages/cpp/codecompletionentry.h
+++ b/languages/cpp/codecompletionentry.h
@@ -5,11 +5,11 @@
    copyright            : (C) 2001 by Victor R�er
    email                : victor_roeder@gmx.de
    copyright            : (C) 2002,2003 by Roberto Raggi
-   email                : roberto@kdevelop.org
+   email                : roberto@tdevelop.org
    copyright            : (C) 2005 by Adam Treat
    email                : manyoso@yahoo.com
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/codeinformationrepository.cpp b/languages/cpp/codeinformationrepository.cpp
index b2c3c30c..7498ad23 100644
--- a/languages/cpp/codeinformationrepository.cpp
+++ b/languages/cpp/codeinformationrepository.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2003 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                  *
+*   roberto@tdevelop.org                                                  *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/codeinformationrepository.h b/languages/cpp/codeinformationrepository.h
index 2c5f4cb2..961af5ef 100644
--- a/languages/cpp/codeinformationrepository.h
+++ b/languages/cpp/codeinformationrepository.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2003 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                  *
+*   roberto@tdevelop.org                                                  *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/compiler/gccoptions/Makefile.am b/languages/cpp/compiler/gccoptions/Makefile.am
index 3e801ae4..26e3b518 100644
--- a/languages/cpp/compiler/gccoptions/Makefile.am
+++ b/languages/cpp/compiler/gccoptions/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras
 
 kde_module_LTLIBRARIES = libkdevgccoptions.la
 libkdevgccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
-libkdevgccoptions_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \
+libkdevgccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_KHTML)
 
 libkdevgccoptions_la_SOURCES = gccoptionsplugin.cpp
diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
index 4add5992..ca2d8fa5 100644
--- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
+++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2000-2001 by Bernd Gehrmann                             *
-*   bernd@kdevelop.org                                                    *
+*   bernd@tdevelop.org                                                    *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h
index d5a0d644..2d434a65 100644
--- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h
+++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2000-2001 by Bernd Gehrmann                             *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/completiondebug.cpp b/languages/cpp/completiondebug.cpp
index dc73329e..8774d9e8 100644
--- a/languages/cpp/completiondebug.cpp
+++ b/languages/cpp/completiondebug.cpp
@@ -1,7 +1,7 @@
 
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/completiondebug.h b/languages/cpp/completiondebug.h
index 325ad193..75823296 100644
--- a/languages/cpp/completiondebug.h
+++ b/languages/cpp/completiondebug.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 copyright            : (C) 2006 by David Nolden
-email                : david.nolden.kdevelop@art-master.de
+email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 /***************************************************************************
  *                                                                         *
diff --git a/languages/cpp/computerecoverypoints.h b/languages/cpp/computerecoverypoints.h
index a7cfaea5..12ca437c 100644
--- a/languages/cpp/computerecoverypoints.h
+++ b/languages/cpp/computerecoverypoints.h
@@ -3,11 +3,11 @@
    copyright            : (C) 2001 by Victor R�er
    email                : victor_roeder@gmx.de
    copyright            : (C) 2002,2003 by Roberto Raggi
-   email                : roberto@kdevelop.org
+   email                : roberto@tdevelop.org
    copyright            : (C) 2005 by Adam Treat
    email                : manyoso@yahoo.com
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/cpp_tags.h b/languages/cpp/cpp_tags.h
index 12a0199f..f98cf48b 100644
--- a/languages/cpp/cpp_tags.h
+++ b/languages/cpp/cpp_tags.h
@@ -5,7 +5,7 @@
 // Description:
 //
 //
-// Author: KDevelop Authors <kdevelop-devel@kdevelop.org>, (C) 2003
+// Author: KDevelop Authors <tdevelop-devel@tdevelop.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index be16ec28..9796bd17 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -5,11 +5,11 @@ begin                : Sat Jul 21 2001
 copyright            : (C) 2001 by Victor R�er
 email                : victor_roeder@gmx.de
 copyright            : (C) 2002,2003 by Roberto Raggi
-email                : roberto@kdevelop.org
+email                : roberto@tdevelop.org
 copyright            : (C) 2005 by Adam Treat
 email                : manyoso@yahoo.com
 copyright            : (C) 2006,2007 by David Nolden
-email                : david.nolden.kdevelop@art-master.de
+email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h
index 27bfc1b6..6f61b1b5 100644
--- a/languages/cpp/cppcodecompletion.h
+++ b/languages/cpp/cppcodecompletion.h
@@ -5,7 +5,7 @@
   copyright            : (C) 2001 by Victor R�er
   email                : victor_roeder@gmx.de
   copyright            : (C) 2002,2003 by Roberto Raggi
-  email                : roberto@kdevelop.org
+  email                : roberto@tdevelop.org
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/cppcodecompletionconfig.cpp b/languages/cpp/cppcodecompletionconfig.cpp
index 104f422c..1bcc6ace 100644
--- a/languages/cpp/cppcodecompletionconfig.cpp
+++ b/languages/cpp/cppcodecompletionconfig.cpp
@@ -5,7 +5,7 @@
 // Description:
 //
 //
-// Author: Roberto Raggi <robertol@kdevelop.org>, (C) 2003
+// Author: Roberto Raggi <robertol@tdevelop.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
diff --git a/languages/cpp/cppcodecompletionconfig.h b/languages/cpp/cppcodecompletionconfig.h
index 924f674d..544264e4 100644
--- a/languages/cpp/cppcodecompletionconfig.h
+++ b/languages/cpp/cppcodecompletionconfig.h
@@ -5,7 +5,7 @@
 // Description:
 //
 //
-// Author: Roberto Raggi <robertol@kdevelop.org>, (C) 2003
+// Author: Roberto Raggi <robertol@tdevelop.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
diff --git a/languages/cpp/cppevaluation.cpp b/languages/cpp/cppevaluation.cpp
index bb3e354b..3338b97a 100644
--- a/languages/cpp/cppevaluation.cpp
+++ b/languages/cpp/cppevaluation.cpp
@@ -3,11 +3,11 @@
    copyright            : (C) 2001 by Victor R�er
    email                : victor_roeder@gmx.de
    copyright            : (C) 2002,2003 by Roberto Raggi
-   email                : roberto@kdevelop.org
+   email                : roberto@tdevelop.org
    copyright            : (C) 2005 by Adam Treat
    email                : manyoso@yahoo.com
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/cppevaluation.h b/languages/cpp/cppevaluation.h
index 97924b0a..2216eed9 100644
--- a/languages/cpp/cppevaluation.h
+++ b/languages/cpp/cppevaluation.h
@@ -3,11 +3,11 @@
   copyright            : (C) 2001 by Victor R�er
   email                : victor_roeder@gmx.de
   copyright            : (C) 2002,2003 by Roberto Raggi
-  email                : roberto@kdevelop.org
+  email                : roberto@tdevelop.org
   copyright            : (C) 2005 by Adam Treat
   email                : manyoso@yahoo.com
   copyright            : (C) 2006 by David Nolden
-  email                : david.nolden.kdevelop@art-master.de
+  email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp
index 75d01b5f..14294fe0 100644
--- a/languages/cpp/cppimplementationwidget.cpp
+++ b/languages/cpp/cppimplementationwidget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2004 by Alexander Dymo                                  *
-*   adymo@kdevelop.org                                                    *
+*   adymo@tdevelop.org                                                    *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU Library General Public License as       *
diff --git a/languages/cpp/cppimplementationwidget.h b/languages/cpp/cppimplementationwidget.h
index c766156e..0552fd34 100644
--- a/languages/cpp/cppimplementationwidget.h
+++ b/languages/cpp/cppimplementationwidget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2004 by Alexander Dymo                                  *
-*   adymo@kdevelop.org                                                    *
+*   adymo@tdevelop.org                                                    *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU Library General Public License as       *
diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp
index 65fb9c76..dd4d278b 100644
--- a/languages/cpp/cppnewclassdlg.cpp
+++ b/languages/cpp/cppnewclassdlg.cpp
@@ -4,11 +4,11 @@
 *   Copyright (C) 1999 by Benoit.Cerrina                                  *
 *   Benoit.Cerrina@writeme.com                                            *
 *   Copyright (C) 2002 by Bernd Gehrmann                                  *
-*   bernd@kdevelop.org                                                    *
+*   bernd@tdevelop.org                                                    *
 *   Copyright (C) 2003 by Eray Ozkural                                    *
 *   <erayo@cs.bilkent.edu.tr>                                             *
 *   Copyright (C) 2003-2004 by Alexander Dymo                             *
-*   adymo@kdevelop.org                                                    *
+*   adymo@tdevelop.org                                                    *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
@@ -37,7 +37,7 @@
 #include <tqpushbutton.h>
 #include <tqtabwidget.h>
 #include <klineedit.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 
 #include "cppsupportpart.h"
 #include "kdevproject.h"
diff --git a/languages/cpp/cppnewclassdlg.h b/languages/cpp/cppnewclassdlg.h
index 55563f0c..8c5d26b0 100644
--- a/languages/cpp/cppnewclassdlg.h
+++ b/languages/cpp/cppnewclassdlg.h
@@ -2,7 +2,7 @@
 *   Copyright (C) 1998 by Sandy Meier                                     *
 *   smeier@rz.uni-potsdam.de                                              *
 *   Copyright (C) 2002 by Bernd Gehrmann                                  *
-*   bernd@kdevelop.org                                                    *
+*   bernd@tdevelop.org                                                    *
 *   Copyright (C) 2003 by Alexander Dymo                                  *
 *   cloudtemple@mksat.net                                                 *
 *                                                                         *
diff --git a/languages/cpp/cppsupport_events.h b/languages/cpp/cppsupport_events.h
index b40fc0ec..b3677002 100644
--- a/languages/cpp/cppsupport_events.h
+++ b/languages/cpp/cppsupport_events.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2003 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                  *
+*   roberto@tdevelop.org                                                  *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/cppsupport_utils.h b/languages/cpp/cppsupport_utils.h
index 37331eaa..a77bbf7e 100644
--- a/languages/cpp/cppsupport_utils.h
+++ b/languages/cpp/cppsupport_utils.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2003 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                  *
+*   roberto@tdevelop.org                                                  *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/cppsupportfactory.cpp b/languages/cpp/cppsupportfactory.cpp
index 77a586c9..1a87f1cd 100644
--- a/languages/cpp/cppsupportfactory.cpp
+++ b/languages/cpp/cppsupportfactory.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2000-2001 by Bernd Gehrmann                             *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/cppsupportfactory.h b/languages/cpp/cppsupportfactory.h
index 78f53a7f..55878c84 100644
--- a/languages/cpp/cppsupportfactory.h
+++ b/languages/cpp/cppsupportfactory.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2000-2001 by Bernd Gehrmann                             *
-*   bernd@kdevelop.org                                                    *
+*   bernd@tdevelop.org                                                    *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index 9cae9c77..ac9d52ba 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -2,9 +2,9 @@
 *   Copyright (C) 1999 by Jonas Nordin                                    *
 *   jonas.nordin@syncom.se                                                *
 *   Copyright (C) 2000-2001 by Bernd Gehrmann                             *
-*   bernd@kdevelop.org                                                    *
+*   bernd@tdevelop.org                                                    *
 *   Copyright (C) 2002-2003 by Roberto Raggi                              *
-*   roberto@kdevelop.org                                                  *
+*   roberto@tdevelop.org                                                  *
 *   Copyright (C) 2003-2004 by Alexander Dymo                             *
 *   adymo@mksat.net                                                       *
 *                                                                         *
@@ -81,7 +81,7 @@
 #include <kmainwindow.h>
 #include <kstatusbar.h>
 #include <kconfig.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 
@@ -1098,7 +1098,7 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url )
 
 void CppSupportPart::slotSaveMemory() {
 	if( m_backgroundParser ) {
-		///This is done so the caches are completely empty after kdevelop was idle for some time(else it would be waste of memory). The background-parsers internal lexer-cache-manager just cares about keeping the count of cached files under a specific count, but doesn't decrease that count when kdevelop is idle.
+		///This is done so the caches are completely empty after tdevelop was idle for some time(else it would be waste of memory). The background-parsers internal lexer-cache-manager just cares about keeping the count of cached files under a specific count, but doesn't decrease that count when tdevelop is idle.
 		m_backgroundParser->lock();
 		m_backgroundParser->saveMemory();
 		m_backgroundParser->unlock();
@@ -1468,19 +1468,19 @@ bool CppSupportPart::parseProject( bool force )
 
 	_jd = new JobData;
 	if( TQFileInfo( project() ->projectDirectory() + "/" + project()->projectName().lower()
-				+ ".kdevelop.pcs" ).exists())
+				+ ".tdevelop.pcs" ).exists())
 	{
 		TQDir d( project() ->projectDirectory());
-		d.rename(project() ->projectName().lower() + ".kdevelop.pcs",
-					project() ->projectName() +".kdevelop.pcs");
+		d.rename(project() ->projectName().lower() + ".tdevelop.pcs",
+					project() ->projectName() +".tdevelop.pcs");
 	}
 	_jd->file.setName( project() ->projectDirectory() + "/" + project()->projectName()
-			+ ".kdevelop.pcs" );
+			+ ".tdevelop.pcs" );
 
 	TQString skip_file_name = project() ->projectDirectory() + "/" +
-		project() ->projectName() + ".kdevelop.ignore_pcs";
+		project() ->projectName() + ".tdevelop.ignore_pcs";
 	TQString skip_lower_file_name = project() ->projectDirectory() + "/" +
-		project() ->projectName().lower() + ".kdevelop.ignore_pcs";
+		project() ->projectName().lower() + ".tdevelop.ignore_pcs";
 
 	if ( !force && !TQFile::exists( skip_file_name ) &&
 			!TQFile::exists( skip_lower_file_name ) && _jd->file.open( IO_ReadOnly ) )
@@ -1620,10 +1620,10 @@ void CppSupportPart::slotParseFiles()
 				mainWindow( ) ->statusBar( ) ->message( i18n( "Done" ), 2000 );
 				TQFile::remove( project() ->projectDirectory()
 						+ "/" + project() ->projectName()
-						+ ".kdevelop.ignore_pcs" );
+						+ ".tdevelop.ignore_pcs" );
 				TQFile::remove( project() ->projectDirectory()
 						+ "/" + project() ->projectName().lower()
-						+ ".kdevelop.ignore_pcs" );
+						+ ".tdevelop.ignore_pcs" );
 
 			}
 			else
@@ -2160,7 +2160,7 @@ void CppSupportPart::saveProjectSourceInfo()
 		return ;
 
 	TQFile f( project() ->projectDirectory() + "/"
-			+ project() ->projectName() + ".kdevelop.pcs" );
+			+ project() ->projectName() + ".tdevelop.pcs" );
 	if ( !f.open( IO_WriteOnly ) )
 		return ;
 
@@ -2201,9 +2201,9 @@ void CppSupportPart::saveProjectSourceInfo()
 	}
 
 	TQFile::remove(  project() ->projectDirectory() + "/"
-			+ project() ->projectName() + ".kdevelop.ignore_pcs" );
+			+ project() ->projectName() + ".tdevelop.ignore_pcs" );
 	TQFile::remove(  project() ->projectDirectory() + "/"
-			+ project() ->projectName().lower() + ".kdevelop.ignore_pcs" );
+			+ project() ->projectName().lower() + ".tdevelop.ignore_pcs" );
 
 	m_backgroundParser->unlock();
 }
@@ -2714,7 +2714,7 @@ void CppSupportPart::createIgnorePCSFile( )
 	static TQCString skip_me( "ignore me\n" );
 
 	TQString skip_file_name = project() ->projectDirectory() + "/"
-		+ project() ->projectName() + ".kdevelop.ignore_pcs";
+		+ project() ->projectName() + ".tdevelop.ignore_pcs";
 	TQFile skip_pcs_file( skip_file_name );
 	if ( skip_pcs_file.open( IO_WriteOnly ) )
 	{
diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h
index 906a2694..ea42bd46 100644
--- a/languages/cpp/cppsupportpart.h
+++ b/languages/cpp/cppsupportpart.h
@@ -2,9 +2,9 @@
 *   Copyright (C) 1999 by Jonas Nordin                                    *
 *   jonas.nordin@syncom.se                                                *
 *   Copyright (C) 2000-2001 by Bernd Gehrmann                             *
-*   bernd@kdevelop.org                                                    *
+*   bernd@tdevelop.org                                                    *
 *   Copyright (C) 2002-2003 by Roberto Raggi                              *
-*   roberto@kdevelop.org                                                  *
+*   roberto@tdevelop.org                                                  *
 *   Copyright (C) 2003-2004 by Alexander Dymo                             *
 *   adymo@mksat.net                                                       *
 *                                                                         *
diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp
index 93c5d754..e237d683 100644
--- a/languages/cpp/createpcsdialog.cpp
+++ b/languages/cpp/createpcsdialog.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2003 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                  *
+*   roberto@tdevelop.org                                                  *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/createpcsdialog.h b/languages/cpp/createpcsdialog.h
index cdb30538..8dfff5f2 100644
--- a/languages/cpp/createpcsdialog.h
+++ b/languages/cpp/createpcsdialog.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2003 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                  *
+*   roberto@tdevelop.org                                                  *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/debugger/CMakeLists.txt b/languages/cpp/debugger/CMakeLists.txt
index 115b00f8..4b660c1d 100644
--- a/languages/cpp/debugger/CMakeLists.txt
+++ b/languages/cpp/debugger/CMakeLists.txt
@@ -50,6 +50,6 @@ tde_add_kpart( libkdevdebugger AUTOMOC
     debuggerconfigwidgetbase.ui debuggertracingdialogbase.ui
     gdboutputwidget.cpp gdbtable.cpp debuggertracingdialog.cpp
     label_with_double_click.cpp
-  LINK gdbmi_parser-shared lang_debugger-shared kdevwidgets-shared kdevelop-shared
+  LINK gdbmi_parser-shared lang_debugger-shared kdevwidgets-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/cpp/debugger/Makefile.am b/languages/cpp/debugger/Makefile.am
index 0ac84358..454cf345 100644
--- a/languages/cpp/debugger/Makefile.am
+++ b/languages/cpp/debugger/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = -I$(top_srcdir)/languages/lib/debugger \
 
 kde_module_LTLIBRARIES = libkdevdebugger.la
 libkdevdebugger_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevdebugger_la_LIBADD = $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML) \
+libkdevdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML) \
 	$(top_builddir)/languages/lib/debugger/liblang_debugger.la \
 	$(top_builddir)/languages/cpp/debugger/mi/libgdbmi_parser.la
 
diff --git a/languages/cpp/debugger/breakpoint.cpp b/languages/cpp/debugger/breakpoint.cpp
index 9d1860e4..c42f32c9 100644
--- a/languages/cpp/debugger/breakpoint.cpp
+++ b/languages/cpp/debugger/breakpoint.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Tue May 13 2003
     copyright            : (C) 2003 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/debugger/breakpoint.h b/languages/cpp/debugger/breakpoint.h
index 64db16d5..46a97792 100644
--- a/languages/cpp/debugger/breakpoint.h
+++ b/languages/cpp/debugger/breakpoint.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Tue May 13 2003
     copyright            : (C) 2003 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/debugger/dbgcontroller.cpp b/languages/cpp/debugger/dbgcontroller.cpp
index 6ca94543..8977b294 100644
--- a/languages/cpp/debugger/dbgcontroller.cpp
+++ b/languages/cpp/debugger/dbgcontroller.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/debugger/dbgcontroller.h b/languages/cpp/debugger/dbgcontroller.h
index 9c555e51..c87a333f 100644
--- a/languages/cpp/debugger/dbgcontroller.h
+++ b/languages/cpp/debugger/dbgcontroller.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp
index 64f4dcee..c31f4a4c 100644
--- a/languages/cpp/debugger/dbgpsdlg.cpp
+++ b/languages/cpp/debugger/dbgpsdlg.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Mon Sep 20 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kprocess.h>
 #include <kstdguiitem.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <klistview.h>
 #include <klistviewsearchline.h>
 #include <kmessagebox.h>
diff --git a/languages/cpp/debugger/dbgpsdlg.h b/languages/cpp/debugger/dbgpsdlg.h
index 82e73606..a2771a3a 100644
--- a/languages/cpp/debugger/dbgpsdlg.h
+++ b/languages/cpp/debugger/dbgpsdlg.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Mon Sep 20 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index 5da4b47a..e8bb0c90 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Thu Dec 23 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
@@ -51,7 +51,7 @@
 // So, if you can get it to work as a KToolBar, and it works well when the
 // app is running, then all these classes can be removed.
 
-// This code is very specific to the internal debugger in kdevelop.
+// This code is very specific to the internal debugger in tdevelop.
 
 namespace GDBDebugger
 {
@@ -307,7 +307,7 @@ DbgToolBar::DbgToolBar(DebuggerPart* part,
     TQPushButton*  bFinish     = new DbgButton(BarIcon("dbgstepout"),    i18n("Step Out"),   this);
     TQPushButton*  bRunTo      = new DbgButton(BarIcon("dbgrunto"),      i18n("Run to Cursor"),   this);
     TQPushButton*  bView       = new DbgButton(BarIcon("dbgmemview"),    i18n("Viewers"),    this);
-    bKDevFocus_ = new DbgButton(BarIcon("kdevelop"),      TQString(),      this);
+    bKDevFocus_ = new DbgButton(BarIcon("tdevelop"),      TQString(),      this);
     bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"),    TQString(),      this);
 
   connect(bRun,        TQT_SIGNAL(clicked()), part_,  TQT_SLOT(slotRun()));
@@ -399,7 +399,7 @@ void DbgToolBar::slotKdevFocus()
 {
     // I really want to be able to set the focus on the _application_ being debugged
     // but this is the best compromise I can come up with. All we do is save the
-    // window that had focus when they switch to the kdevelop window. To do this
+    // window that had focus when they switch to the tdevelop window. To do this
     // the toolbar _cannot_ accept focus.
     // If anyone has a way of determining what window the app is _actually_ running on
     // then please fix and send a patch.
diff --git a/languages/cpp/debugger/dbgtoolbar.h b/languages/cpp/debugger/dbgtoolbar.h
index b9998fd3..5e1424d7 100644
--- a/languages/cpp/debugger/dbgtoolbar.h
+++ b/languages/cpp/debugger/dbgtoolbar.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Thu Dec 23 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/debugger/debuggerconfigwidget.cpp b/languages/cpp/debugger/debuggerconfigwidget.cpp
index 409329f7..d4c97957 100644
--- a/languages/cpp/debugger/debuggerconfigwidget.cpp
+++ b/languages/cpp/debugger/debuggerconfigwidget.cpp
@@ -1,8 +1,8 @@
 /***************************************************************************
  *   Copyright (C) 1999-2001 by John Birch                                 *
- *   jbb@kdevelop.org                                                      *
+ *   jbb@tdevelop.org                                                      *
  *   Copyright (C) 2001 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/debugger/debuggerconfigwidget.h b/languages/cpp/debugger/debuggerconfigwidget.h
index d17d1202..c684d5a1 100644
--- a/languages/cpp/debugger/debuggerconfigwidget.h
+++ b/languages/cpp/debugger/debuggerconfigwidget.h
@@ -1,8 +1,8 @@
 /***************************************************************************
  *   Copyright (C) 1999-2001 by John Birch                                 *
- *   jbb@kdevelop.org                                                      *
+ *   jbb@tdevelop.org                                                      *
  *   Copyright (C) 2001 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index b74b9d63..59294487 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -1,8 +1,8 @@
 /***************************************************************************
  *   Copyright (C) 1999-2001 by John Birch                                 *
- *   jbb@kdevelop.org                                                      *
+ *   jbb@tdevelop.org                                                      *
  *   Copyright (C) 2001 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h
index 6981265f..b201b15a 100644
--- a/languages/cpp/debugger/debuggerpart.h
+++ b/languages/cpp/debugger/debuggerpart.h
@@ -1,8 +1,8 @@
 /***************************************************************************
  *   Copyright (C) 1999-2001 by John Birch                                 *
- *   jbb@kdevelop.org                                                      *
+ *   jbb@tdevelop.org                                                      *
  *   Copyright (C) 2001 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/debugger/disassemblewidget.cpp b/languages/cpp/debugger/disassemblewidget.cpp
index 562aa1ae..705185fd 100644
--- a/languages/cpp/debugger/disassemblewidget.cpp
+++ b/languages/cpp/debugger/disassemblewidget.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Tues Jan 3 2000
     copyright            : (C) 2000 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
@@ -18,7 +18,7 @@
 #include "gdbcommand.h"
 
 #include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <ktextedit.h>
 #include <kglobalsettings.h>
 
diff --git a/languages/cpp/debugger/disassemblewidget.h b/languages/cpp/debugger/disassemblewidget.h
index 18dc3a7a..73e743f7 100644
--- a/languages/cpp/debugger/disassemblewidget.h
+++ b/languages/cpp/debugger/disassemblewidget.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp
index 639ab74b..2b8ae5a6 100644
--- a/languages/cpp/debugger/framestackwidget.cpp
+++ b/languages/cpp/debugger/framestackwidget.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/debugger/framestackwidget.h b/languages/cpp/debugger/framestackwidget.h
index 631c440f..2477c342 100644
--- a/languages/cpp/debugger/framestackwidget.h
+++ b/languages/cpp/debugger/framestackwidget.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp
index 1e62a201..8626a3e1 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.cpp
+++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Tue May 13 2003
     copyright            : (C) 2003 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/debugger/gdbbreakpointwidget.h b/languages/cpp/debugger/gdbbreakpointwidget.h
index c1a0c7fe..677aca87 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.h
+++ b/languages/cpp/debugger/gdbbreakpointwidget.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Tue May 13 2003
     copyright            : (C) 2003 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/debugger/gdbcommand.cpp b/languages/cpp/debugger/gdbcommand.cpp
index b783b31f..c6c4bbc3 100644
--- a/languages/cpp/debugger/gdbcommand.cpp
+++ b/languages/cpp/debugger/gdbcommand.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/debugger/gdbcommand.h b/languages/cpp/debugger/gdbcommand.h
index 7000235a..ab8becf9 100644
--- a/languages/cpp/debugger/gdbcommand.h
+++ b/languages/cpp/debugger/gdbcommand.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp
index fce96961..ab7ffe69 100644
--- a/languages/cpp/debugger/gdbcontroller.cpp
+++ b/languages/cpp/debugger/gdbcontroller.cpp
@@ -3,7 +3,7 @@
 //                             -------------------
 //    begin                : Sun Aug 8 1999
 //    copyright            : (C) 1999 by John Birch
-//    email                : jbb@kdevelop.org
+//    email                : jbb@tdevelop.org
 // **************************************************************************
 //
 // **************************************************************************
@@ -50,7 +50,7 @@ using namespace std;
 
 // **************************************************************************
 //
-// Does all the communication between gdb and the kdevelop's debugger code.
+// Does all the communication between gdb and the tdevelop's debugger code.
 // Significatant classes being used here are
 //
 // GDBParser  - parses the "variable" data using the vartree and varitems
diff --git a/languages/cpp/debugger/gdbcontroller.h b/languages/cpp/debugger/gdbcontroller.h
index 8cbf3b26..6ea27f41 100644
--- a/languages/cpp/debugger/gdbcontroller.h
+++ b/languages/cpp/debugger/gdbcontroller.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp
index 7648fdf2..c0157463 100644
--- a/languages/cpp/debugger/gdboutputwidget.cpp
+++ b/languages/cpp/debugger/gdboutputwidget.cpp
@@ -3,7 +3,7 @@
 //                             -------------------
 //    begin                : 10th April 2003
 //    copyright            : (C) 2003 by John Birch
-//    email                : jbb@kdevelop.org
+//    email                : jbb@tdevelop.org
 // **************************************************************************
 //
 // **************************************************************************
diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h
index ed841d9b..28ffb8bc 100644
--- a/languages/cpp/debugger/gdboutputwidget.h
+++ b/languages/cpp/debugger/gdboutputwidget.h
@@ -3,7 +3,7 @@
 //                             -------------------
 //    begin                : 10th April 2003
 //    copyright            : (C) 2003 by John Birch
-//    email                : jbb@kdevelop.org
+//    email                : jbb@tdevelop.org
 // **************************************************************************
 //
 // **************************************************************************
diff --git a/languages/cpp/debugger/gdbparser.cpp b/languages/cpp/debugger/gdbparser.cpp
index 5a8588b1..4d2161f8 100644
--- a/languages/cpp/debugger/gdbparser.cpp
+++ b/languages/cpp/debugger/gdbparser.cpp
@@ -1,7 +1,7 @@
 // **************************************************************************
 //    begin                : Tue Aug 17 1999
 //    copyright            : (C) 1999 by John Birch
-//    email                : jbb@kdevelop.org
+//    email                : jbb@tdevelop.org
 // **************************************************************************
 
 // **************************************************************************
@@ -114,7 +114,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s)
         // Strip the type of the pointer from the value.
         //
         // When printing values of pointers, gdb prints the pointer
-        // type as well. This is not necessary for kdevelop -- after
+        // type as well. This is not necessary for tdevelop -- after
         // all, there's separate column with value type. But that behaviour
         // is not configurable. The only way to change it is to explicitly
         // pass the 'x' format specifier to the 'print' command. 
diff --git a/languages/cpp/debugger/gdbparser.h b/languages/cpp/debugger/gdbparser.h
index a56c082d..61f7ec8b 100644
--- a/languages/cpp/debugger/gdbparser.h
+++ b/languages/cpp/debugger/gdbparser.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Tue Aug 17 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp
index 48c2ddd4..3b69c206 100644
--- a/languages/cpp/debugger/memviewdlg.cpp
+++ b/languages/cpp/debugger/memviewdlg.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Tue Oct 5 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
@@ -22,7 +22,7 @@
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kstdguiitem.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
@@ -224,7 +224,7 @@ namespace GDBDebugger
             edit->setText(
                 "<h1>Not available</h1>"
                 "<p>Could not open the khexedit2 library. "
-                "Make sure that the KHexEdit package (part of kdeutils) is installed. "
+                "Make sure that the KHexEdit package (part of tdeutils) is installed. "
                 "Specifically, check for the following files:"
                 "<ul><li>libkhexeditcommon.so.0.0.0\n"
                 "<li>libkbyteseditwidget.so\n"
diff --git a/languages/cpp/debugger/memviewdlg.h b/languages/cpp/debugger/memviewdlg.h
index ecdb304f..0de16b27 100644
--- a/languages/cpp/debugger/memviewdlg.h
+++ b/languages/cpp/debugger/memviewdlg.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Tue Oct 5 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/debugger/mi/gdbmi.cpp b/languages/cpp/debugger/mi/gdbmi.cpp
index 27f90284..33ac959d 100644
--- a/languages/cpp/debugger/mi/gdbmi.cpp
+++ b/languages/cpp/debugger/mi/gdbmi.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2004 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *   Copyright (C) 2005-2006 by Vladimir Prus                              *
  *   ghost@cs.msu.su                                                       *
  *                                                                         *
diff --git a/languages/cpp/debugger/mi/gdbmi.h b/languages/cpp/debugger/mi/gdbmi.h
index 03985958..21d2a772 100644
--- a/languages/cpp/debugger/mi/gdbmi.h
+++ b/languages/cpp/debugger/mi/gdbmi.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2004 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *   Copyright (C) 2005-2006 by Vladimir Prus                              *
  *   ghost@cs.msu.su                                                       *
  *                                                                         *
diff --git a/languages/cpp/debugger/mi/milexer.cpp b/languages/cpp/debugger/mi/milexer.cpp
index 74b8eda9..81a97001 100644
--- a/languages/cpp/debugger/mi/milexer.cpp
+++ b/languages/cpp/debugger/mi/milexer.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2004 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU Library General Public License as       *
diff --git a/languages/cpp/debugger/mi/milexer.h b/languages/cpp/debugger/mi/milexer.h
index 8f07ba58..ff6ca3fe 100644
--- a/languages/cpp/debugger/mi/milexer.h
+++ b/languages/cpp/debugger/mi/milexer.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2004 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU Library General Public License as       *
diff --git a/languages/cpp/debugger/mi/miparser.cpp b/languages/cpp/debugger/mi/miparser.cpp
index fdd16137..8f819dcf 100644
--- a/languages/cpp/debugger/mi/miparser.cpp
+++ b/languages/cpp/debugger/mi/miparser.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2004 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *   Copyright (C) 2005-2006 by Vladimir Prus                              *
  *   ghost@cs.msu.su                                                       *
  *                                                                         *
diff --git a/languages/cpp/debugger/mi/miparser.h b/languages/cpp/debugger/mi/miparser.h
index 9bea70b2..36ff9603 100644
--- a/languages/cpp/debugger/mi/miparser.h
+++ b/languages/cpp/debugger/mi/miparser.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2004 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU Library General Public License as       *
diff --git a/languages/cpp/debugger/mi/tokens.h b/languages/cpp/debugger/mi/tokens.h
index 6d105041..554a16db 100644
--- a/languages/cpp/debugger/mi/tokens.h
+++ b/languages/cpp/debugger/mi/tokens.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2004 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU Library General Public License as       *
diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp
index 52ff7a24..5c437938 100644
--- a/languages/cpp/debugger/stty.cpp
+++ b/languages/cpp/debugger/stty.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Mon Sep 13 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 
   This code was originally written by Judin Maxim, from the
 	KDEStudio project.
@@ -228,7 +228,7 @@ int STTY::findTTY()
 
     if (ptyfd >= 0) {
         if (needGrantPty && !chownpty(ptyfd, TRUE)) {
-            fprintf(stderr,"kdevelop: chownpty failed for device %s::%s.\n",pty_master,tty_slave);
+            fprintf(stderr,"tdevelop: chownpty failed for device %s::%s.\n",pty_master,tty_slave);
             fprintf(stderr,"        : This means the session can be eavesdroped.\n");
             fprintf(stderr,"        : Make sure konsole_grantpty is installed and setuid root.\n");
         }
@@ -329,7 +329,7 @@ bool STTY::findExternalTTY(const TQString &termApp)
         if ( termApp == "konsole" )
         {
             ::execlp( prog,       prog,
-                  "-caption", i18n("kdevelop: Debug application console").local8Bit().data(),
+                  "-caption", i18n("tdevelop: Debug application console").local8Bit().data(),
                   "-e",       "sh",
                   "-c",       scriptStr,
                   NULL);
diff --git a/languages/cpp/debugger/stty.h b/languages/cpp/debugger/stty.h
index 5fd45cc6..16d84c1e 100644
--- a/languages/cpp/debugger/stty.h
+++ b/languages/cpp/debugger/stty.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Mon Sep 13 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 
   This code was originally written by Judin Maxim, from the
 	KDEStudio project.
diff --git a/languages/cpp/debugger/tests/breakpoints/breakpoints.kdevelop b/languages/cpp/debugger/tests/breakpoints/breakpoints.kdevelop
index 4b3b07c9..54214a1b 100644
--- a/languages/cpp/debugger/tests/breakpoints/breakpoints.kdevelop
+++ b/languages/cpp/debugger/tests/breakpoints/breakpoints.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>Vladimir Prus</author>
     <email>ghost@ghostwalk</email>
@@ -160,4 +160,4 @@
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/debugger/tests/dll/dll.kdevelop b/languages/cpp/debugger/tests/dll/dll.kdevelop
index dbeb12b3..f92f1d08 100644
--- a/languages/cpp/debugger/tests/dll/dll.kdevelop
+++ b/languages/cpp/debugger/tests/dll/dll.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>Vladimir Prus</author>
     <email>ghost@ghostwalk</email>
@@ -155,4 +155,4 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
   </kdevfileview>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/debugger/tests/infinite_loop/infinite_loop.kdevelop b/languages/cpp/debugger/tests/infinite_loop/infinite_loop.kdevelop
index 24055c6f..267a73d8 100644
--- a/languages/cpp/debugger/tests/infinite_loop/infinite_loop.kdevelop
+++ b/languages/cpp/debugger/tests/infinite_loop/infinite_loop.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>Vladimir Prus</author>
     <email>ghost@zigzag</email>
@@ -106,4 +106,4 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
   </kdevfileview>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop b/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop
index 03faba9a..a838d09d 100644
--- a/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop
+++ b/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>Vladimir Prus</author>
     <email>ghost@cs.msu.su</email>
@@ -215,4 +215,4 @@
     <graphicFilter>-f0</graphicFilter>
     <scaling>-1</scaling>
   </kdevvisualadvance>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/debugger/tests/segfault/segfault.kdevelop b/languages/cpp/debugger/tests/segfault/segfault.kdevelop
index 0135e84b..4eccf2e1 100644
--- a/languages/cpp/debugger/tests/segfault/segfault.kdevelop
+++ b/languages/cpp/debugger/tests/segfault/segfault.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>Vladimir Prus</author>
     <email>ghost@zigzag</email>
@@ -160,4 +160,4 @@
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/debugger/tests/threads/threads.kdevelop b/languages/cpp/debugger/tests/threads/threads.kdevelop
index 3cd806b8..048b3aed 100644
--- a/languages/cpp/debugger/tests/threads/threads.kdevelop
+++ b/languages/cpp/debugger/tests/threads/threads.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>Vladimir Prus</author>
     <email>ghost@zigzag</email>
@@ -98,4 +98,4 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
   </kdevfileview>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/debugger/tests/tracing/tracing.kdevelop b/languages/cpp/debugger/tests/tracing/tracing.kdevelop
index 94d39c6f..56743de1 100644
--- a/languages/cpp/debugger/tests/tracing/tracing.kdevelop
+++ b/languages/cpp/debugger/tests/tracing/tracing.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>Vladimir Prus</author>
     <email>ghost@ghostwalk</email>
@@ -160,4 +160,4 @@
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/debugger/tests/two_module/two_module.kdevelop b/languages/cpp/debugger/tests/two_module/two_module.kdevelop
index a9ecc5ad..a6d22c2a 100644
--- a/languages/cpp/debugger/tests/two_module/two_module.kdevelop
+++ b/languages/cpp/debugger/tests/two_module/two_module.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>Vladimir Prus</author>
     <email>ghost@ghostwalk</email>
@@ -160,4 +160,4 @@
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-</kdevelop>
+</tdevelop>
diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp
index 581b3cb8..a8c9f594 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -1,7 +1,7 @@
 // **************************************************************************
 //    begin                : Sun Aug 8 1999
 //    copyright            : (C) 1999 by John Birch
-//    email                : jbb@kdevelop.org
+//    email                : jbb@tdevelop.org
 // **************************************************************************
 
 // **************************************************************************
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kpopupmenu.h>
 #include <klineedit.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kiconloader.h>
 
 #include <tqheader.h>
diff --git a/languages/cpp/debugger/variablewidget.h b/languages/cpp/debugger/variablewidget.h
index 2e5e6c38..cb8ffb0f 100644
--- a/languages/cpp/debugger/variablewidget.h
+++ b/languages/cpp/debugger/variablewidget.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/declarationinfo.h b/languages/cpp/declarationinfo.h
index de49dae3..413e8ded 100644
--- a/languages/cpp/declarationinfo.h
+++ b/languages/cpp/declarationinfo.h
@@ -3,11 +3,11 @@
    copyright            : (C) 2001 by Victor R�er
    email                : victor_roeder@gmx.de
    copyright            : (C) 2002,2003 by Roberto Raggi
-   email                : roberto@kdevelop.org
+   email                : roberto@tdevelop.org
    copyright            : (C) 2005 by Adam Treat
    email                : manyoso@yahoo.com
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/doc/c++_bugs_gcc.toc b/languages/cpp/doc/c++_bugs_gcc.toc
index 758b6675..a2d75a4f 100644
--- a/languages/cpp/doc/c++_bugs_gcc.toc
+++ b/languages/cpp/doc/c++_bugs_gcc.toc
@@ -1,7 +1,7 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>C++ bugs (GCC)</title>
 <base href="http://gcc.gnu.org/bugzilla/"/>
 <tocsect1 name="Query" url="query.cgi">
 </tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/cpp/doc/clanlib.toc b/languages/cpp/doc/clanlib.toc
index 97e8ec56..2cad8dcd 100644
--- a/languages/cpp/doc/clanlib.toc
+++ b/languages/cpp/doc/clanlib.toc
@@ -1,5 +1,5 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>Clanlib</title>
 <base href="http://www.clanlib.org/docs/" />
 <tocsect1 name="Overview" url="overview/index.html">
@@ -381,4 +381,4 @@
 		</tocsect3>
 	</tocsect2>
 </tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/cpp/doc/cppannotations.toc b/languages/cpp/doc/cppannotations.toc
index ad63b241..81f7f04d 100644
--- a/languages/cpp/doc/cppannotations.toc
+++ b/languages/cpp/doc/cppannotations.toc
@@ -1,5 +1,5 @@
-<!DOCTYPE kdeveloptoc> 
-<kdeveloptoc> 
+<!DOCTYPE tdeveloptoc> 
+<tdeveloptoc> 
 <title>C++ Annotations</title>
 <base href="http://www.icce.rug.nl/documents/cplusplus/"/>
 
@@ -453,4 +453,4 @@
 
 <tocsect1 name="Index" url="cppindex.html" />
 
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/cpp/doc/gnome1.toc b/languages/cpp/doc/gnome1.toc
index ace302d5..bbab9265 100644
--- a/languages/cpp/doc/gnome1.toc
+++ b/languages/cpp/doc/gnome1.toc
@@ -1,5 +1,5 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>GNOME 1.0 API Reference</title>
 <base href="http://developer.gnome.org/doc/API"/>
 <tocsect1 name="GLib" url="glib/index.html">
@@ -420,5 +420,5 @@
     <tocsect3 name="bonobo-async" url="bonobo/bonobo-bonobo-async.html"/>
   </tocsect2>
 </tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
 
diff --git a/languages/cpp/doc/gnustep.toc b/languages/cpp/doc/gnustep.toc
index ef477440..7e936e42 100644
--- a/languages/cpp/doc/gnustep.toc
+++ b/languages/cpp/doc/gnustep.toc
@@ -1,5 +1,5 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>GNUstep</title>
 <base href="http://www.gnustep.org/resources/documentation"/>
 <tocsect1 name="Base" url="base/Base.html">
@@ -180,5 +180,5 @@
   <tocsect2 name="DPSOperators" url="gui/DPSOperators.html"/>
 </tocsect1>
 <tocsect1 name="Backend" url="back/Back.html"/>
-</kdeveloptoc>
+</tdeveloptoc>
 
diff --git a/languages/cpp/doc/gtk_bugs.toc b/languages/cpp/doc/gtk_bugs.toc
index fd1aa962..940be9bc 100644
--- a/languages/cpp/doc/gtk_bugs.toc
+++ b/languages/cpp/doc/gtk_bugs.toc
@@ -1,7 +1,7 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>GTK bugs</title>
 <base href="http://bugzilla.gnome.org/"/>
 <tocsect1 name="Query" url="query.cgi">
 </tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc
index 72e55d3c..14791ba5 100644
--- a/languages/cpp/doc/kde2book.toc
+++ b/languages/cpp/doc/kde2book.toc
@@ -1,5 +1,5 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>KDE2 Development Book (kde.org)</title>
 <base href="http://developer.kde.org/documentation/books/kde-2.0-development"/>
 <tocsect1 name="Foreword" url="f822.html">
@@ -1299,13 +1299,13 @@
 <entry name="KCustomActions widget, toolbars" url="ch05.html"/>
 <entry name="kcustomui.rc file (KCustomActions widget)" url="ch05.html"/>
 <entry name="kdcop (DCOP shell client)" url="ch13lev1sec7.html"/>
-<entry name="kdeadmin module (CVS)" url="ch17lev1sec2.html"/>
-<entry name="kdeadmin package" url="ch01lev1sec5.html"/>
+<entry name="tdeadmin module (CVS)" url="ch17lev1sec2.html"/>
+<entry name="tdeadmin package" url="ch01lev1sec5.html"/>
 <entry name="KDE, advantages" url="ch01.html"/>
 <entry name="KDE, advantages" url="ch01lev1sec2.html"/>
-<entry name="kdebase module (CVS)" url="ch17lev1sec2.html"/>
-<entry name="kdebase package" url="ch01lev1sec5.html"/>
-<entry name="kdebindings module (CVS)" url="ch17lev1sec2.html"/>
+<entry name="tdebase module (CVS)" url="ch17lev1sec2.html"/>
+<entry name="tdebase package" url="ch01lev1sec5.html"/>
+<entry name="tdebindings module (CVS)" url="ch17lev1sec2.html"/>
 <entry name="kde-common module (CVS)" url="ch17lev1sec2.html"/>
 <entry name="kde-devel mailing list" url="ch01lev1sec3.html"/>
 <entry name="KDE Developers' Web site" url="ch01lev1sec2.html"/>
@@ -1314,40 +1314,40 @@
 <entry name="KDE, distributions" url="ch01lev1sec2.html"/>
 <entry name="tdegames module (CVS)" url="ch17lev1sec2.html"/>
 <entry name="tdegames package" url="ch01lev1sec5.html"/>
-<entry name="kdegraphics module (CVS)" url="ch17lev1sec2.html"/>
-<entry name="kdegraphics package" url="ch01lev1sec5.html"/>
+<entry name="tdegraphics module (CVS)" url="ch17lev1sec2.html"/>
+<entry name="tdegraphics package" url="ch01lev1sec5.html"/>
 <entry name="kdei18n package" url="ch01lev1sec5.html"/>
 <entry name="kde-il8n module (CVS)" url="ch17lev1sec2.html"/>
 <entry name="KDE, installing, binary packages" url="ch01lev1sec5.html"/>
 <entry name="KDE, installing, source packages" url="ch01lev1sec5.html"/>
 <entry name="KDE, installing" url="ch01lev1sec5.html"/>
-<entry name="kdelibs module (CVS)" url="ch17lev1sec2.html"/>
-<entry name="kdelibs package" url="ch01lev1sec5.html"/>
+<entry name="tdelibs module (CVS)" url="ch17lev1sec2.html"/>
+<entry name="tdelibs package" url="ch01lev1sec5.html"/>
 <entry name="KDE, licenses" url="ch01lev1sec6.html"/>
 <entry name="KDE-MDI application template" url="ch18lev1sec2.html"/>
 <entry name="KDE Mini application template" url="ch18lev1sec2.html"/>
-<entry name="kdemultimedia module (CVS)" url="ch17lev1sec2.html"/>
-<entry name="kdemultimedia package" url="ch01lev1sec5.html"/>
-<entry name="kdenetwork module (CVS)" url="ch17lev1sec2.html"/>
-<entry name="kdenetwork package" url="ch01lev1sec5.html"/>
+<entry name="tdemultimedia module (CVS)" url="ch17lev1sec2.html"/>
+<entry name="tdemultimedia package" url="ch01lev1sec5.html"/>
+<entry name="tdenetwork module (CVS)" url="ch17lev1sec2.html"/>
+<entry name="tdenetwork package" url="ch01lev1sec5.html"/>
 <entry name="kdenonbeta module (CVS)" url="ch17lev1sec2.html"/>
 <entry name="KDE Normal application template" url="ch18lev1sec2.html"/>
 <entry name="KDE, obtaining" url="ch01lev1sec5.html"/>
 <entry name="KDE, online resources" url="ch01lev1sec3.html"/>
 <entry name="KDE, (overview of)" url="ch01.html"/>
 <entry name="KDE, Qt toolkit" url="ch03.html"/>
-<entry name="kdesdk module (CVS)" url="ch17lev1sec2.html"/>
+<entry name="tdesdk module (CVS)" url="ch17lev1sec2.html"/>
 <entry name="tdesupport module (CVS)" url="ch17lev1sec2.html"/>
 <entry name="tdesupport package" url="ch01lev1sec5.html"/>
 <entry name="KDE, system requirements" url="ch01lev1sec4.html"/>
-<entry name="kdetoys module (CVS)" url="ch17lev1sec2.html"/>
+<entry name="tdetoys module (CVS)" url="ch17lev1sec2.html"/>
 <entry name="KDE Translator's and Documenter's Web site" url="ch06lev1sec4.html"/>
 <entry name="tdeui (KDE user-interface library), dialog boxes" url="ch08lev1sec4.html"/>
 <entry name="tdeui (KDE user-interface library), manager widgets" url="ch08lev1sec4.html"/>
 <entry name="tdeui (KDE user-interface library" url="ch08lev1sec4.html"/>
 <entry name="KDE user-interface library" url="ch08lev1sec4.html"/>
-<entry name="kdeutils module (CVS)" url="ch17lev1sec2.html"/>
-<entry name="kdeutils package" url="ch01lev1sec5.html"/>
+<entry name="tdeutils module (CVS)" url="ch17lev1sec2.html"/>
+<entry name="tdeutils package" url="ch01lev1sec5.html"/>
 <entry name="KDevelop IDE, Classbrowser" url="ch18lev1sec4.html"/>
 <entry name="KDevelop IDE, Classparser" url="ch18lev1sec4.html"/>
 <entry name="KDevelop IDE, Dialog Editor, advantages" url="ch18.html"/>
@@ -1382,7 +1382,7 @@
 <entry name="KDevelop IDE, views, Output View" url="ch18.html"/>
 <entry name="KDevelop IDE, views, Tree View" url="ch18.html"/>
 <entry name="KDevelop IDE, working area" url="ch18.html"/>
-<entry name="kdevelop module (CVS)" url="ch17lev1sec2.html"/>
+<entry name="tdevelop module (CVS)" url="ch17lev1sec2.html"/>
 <entry name="KDE Web site" url="ch01lev1sec3.html"/>
 <entry name="kdgb debugger" url="ch02.html"/>
 <entry name="kdialogapp.cpp file (KDialogApp)" url="ch11.html"/>
@@ -2119,16 +2119,16 @@
 <entry name="packages, gt-2.1.0" url="ch01lev1sec5.html"/>
 <entry name="packages, installing, binary packages" url="ch01lev1sec5.html"/>
 <entry name="packages, installing, source packages" url="ch01lev1sec5.html"/>
-<entry name="packages, kdeadmin" url="ch01lev1sec5.html"/>
-<entry name="packages, kdebase" url="ch01lev1sec5.html"/>
+<entry name="packages, tdeadmin" url="ch01lev1sec5.html"/>
+<entry name="packages, tdebase" url="ch01lev1sec5.html"/>
 <entry name="packages, tdegames" url="ch01lev1sec5.html"/>
-<entry name="packages, kdegraphics" url="ch01lev1sec5.html"/>
+<entry name="packages, tdegraphics" url="ch01lev1sec5.html"/>
 <entry name="packages, kdei18n" url="ch01lev1sec5.html"/>
-<entry name="packages, kdelibs" url="ch01lev1sec5.html"/>
-<entry name="packages, kdemultimedia" url="ch01lev1sec5.html"/>
-<entry name="packages, kdenetwork" url="ch01lev1sec5.html"/>
+<entry name="packages, tdelibs" url="ch01lev1sec5.html"/>
+<entry name="packages, tdemultimedia" url="ch01lev1sec5.html"/>
+<entry name="packages, tdenetwork" url="ch01lev1sec5.html"/>
 <entry name="packages, tdesupport" url="ch01lev1sec5.html"/>
-<entry name="packages, kdeutils" url="ch01lev1sec5.html"/>
+<entry name="packages, tdeutils" url="ch01lev1sec5.html"/>
 <entry name="packages, make targets" url="ch16lev1sec2.html"/>
 <entry name="packages, shared libraries" url="ch16lev1sec2.html"/>
 <entry name="packages, structure of" url="ch16.html"/>
@@ -2871,5 +2871,5 @@
 <entry name="zoomIn action" url="ch06.html"/>
 <entry name="ZoomOut action" url="ch06.html"/>
 </index>
-</kdeveloptoc>
+</tdeveloptoc>
 
diff --git a/languages/cpp/doc/kdetemplates.toc b/languages/cpp/doc/kdetemplates.toc
index c72f19ad..c764c0c4 100644
--- a/languages/cpp/doc/kdetemplates.toc
+++ b/languages/cpp/doc/kdetemplates.toc
@@ -1,9 +1,9 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>The KDevelop C++ KDE templates explained</title>
-<base href="http://women.kde.org/articles/tutorials/kdevelop_templates"/>
+<base href="http://women.kde.org/articles/tutorials/tdevelop_templates"/>
 <tocsect1 name="General KDE templates" url="index.php"/>
 <tocsect1 name="Other KDE templates" url="others.php/"/>
 <tocsect1 name="SCons templates" url="scons.php"/>
 <tocsect1 name="Qt templates" url="qt.php"/>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/cpp/doc/libc.toc b/languages/cpp/doc/libc.toc
index a007614d..1503a46d 100644
--- a/languages/cpp/doc/libc.toc
+++ b/languages/cpp/doc/libc.toc
@@ -1,5 +1,5 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>LIBC (umn.edu)</title>
 <base href="http://epoxy.mrs.umn.edu/doc/glibc-doc/html/"/>
 <tocsect1 name="1. Introduction" url="chapters_1.html#SEC1">
@@ -854,5 +854,5 @@
   </tocsect2>
 </tocsect1>
 <tocsect1 name="E. Contributors to the GNU C Library" url="chapters_39.html#SEC718"/>
-</kdeveloptoc>
+</tdeveloptoc>
 
diff --git a/languages/cpp/doc/libstdc++.toc b/languages/cpp/doc/libstdc++.toc
index afdb10c1..16628929 100644
--- a/languages/cpp/doc/libstdc++.toc
+++ b/languages/cpp/doc/libstdc++.toc
@@ -1,5 +1,5 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>LIBSTDC++ (gcc.gnu.org)</title>
 <base href="http://gcc.gnu.org/onlinedocs/libstdc++"/>
 <tocsect1 name="Documentation" url="documentation.html"/>
@@ -15,5 +15,5 @@
 <tocsect1 name="Numerics" url="26_numerics/howto.html"/>
 <tocsect1 name="I/O" url="27_io/howto.html"/>
 <tocsect1 name="Extensions" url="ext/howto.html"/>
-</kdeveloptoc>
+</tdeveloptoc>
 
diff --git a/languages/cpp/doc/qt-kdev3.toc b/languages/cpp/doc/qt-kdev3.toc
index b9e225ec..af086cf5 100644
--- a/languages/cpp/doc/qt-kdev3.toc
+++ b/languages/cpp/doc/qt-kdev3.toc
@@ -1,7 +1,7 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>Qt Designer-3 and KDevelop-3</title>
-<base href="http://women.kde.org/articles/tutorials/kdevelop3"/>
+<base href="http://women.kde.org/articles/tutorials/tdevelop3"/>
 <tocsect1 name="Index" url="index.html">
 </tocsect1>
 <tocsect1 name="Introduction" url="introduction.html">
@@ -36,4 +36,4 @@
 </tocsect1>
 <tocsect1 name="Credits and License" url="credits.html">
 </tocsect1>
-</kdeveloptoc>
\ No newline at end of file
+</tdeveloptoc>
\ No newline at end of file
diff --git a/languages/cpp/doc/stl.toc b/languages/cpp/doc/stl.toc
index d86b82b0..09681836 100644
--- a/languages/cpp/doc/stl.toc
+++ b/languages/cpp/doc/stl.toc
@@ -1,5 +1,5 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>STL (sgi.com)</title>
 <base href="http://www.sgi.com/tech/stl"/>
 <tocsect1 name="Introduction" url="stl_introduction.html"/>
@@ -483,5 +483,5 @@
 <entry name="pair, STL class" url="pair.html"/>
 <entry name="priority_queue, STL" url="priority_queue.html"/>
 </index>
-</kdeveloptoc>
+</tdeveloptoc>
 
diff --git a/languages/cpp/doc/wxwidgets_bugs.toc b/languages/cpp/doc/wxwidgets_bugs.toc
index f7bb39c7..046b4419 100644
--- a/languages/cpp/doc/wxwidgets_bugs.toc
+++ b/languages/cpp/doc/wxwidgets_bugs.toc
@@ -1,7 +1,7 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>wxWidgets bugs</title>
 <base href="http://sourceforge.net/"/>
 <tocsect1 name="Query" url="tracker/?group_id=9863&amp;atid=109863">
 </tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/cpp/expressioninfo.h b/languages/cpp/expressioninfo.h
index 4b42a2f4..13918a20 100644
--- a/languages/cpp/expressioninfo.h
+++ b/languages/cpp/expressioninfo.h
@@ -3,11 +3,11 @@
    copyright            : (C) 2001 by Victor R�er
    email                : victor_roeder@gmx.de
    copyright            : (C) 2002,2003 by Roberto Raggi
-   email                : roberto@kdevelop.org
+   email                : roberto@tdevelop.org
    copyright            : (C) 2005 by Adam Treat
    email                : manyoso@yahoo.com
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp
index 39cceae0..d6b6dd02 100644
--- a/languages/cpp/includepathresolver.cpp
+++ b/languages/cpp/includepathresolver.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2007 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
@@ -14,7 +14,7 @@
 
 /** Compatibility:
  * make/automake: Should work perfectly
- * cmake: Thanks to the path-recursion, this works with cmake(tested with version "2.4-patch 6" tested with kdelibs out-of-source and with kdevelop4 in-source)
+ * cmake: Thanks to the path-recursion, this works with cmake(tested with version "2.4-patch 6" tested with tdelibs out-of-source and with tdevelop4 in-source)
  *
  * 
  * unsermake:
diff --git a/languages/cpp/includepathresolver.h b/languages/cpp/includepathresolver.h
index 57106e4f..8046a987 100644
--- a/languages/cpp/includepathresolver.h
+++ b/languages/cpp/includepathresolver.h
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2007 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/kdevdriver.h b/languages/cpp/kdevdriver.h
index 3a9f0ac6..07dc3660 100644
--- a/languages/cpp/kdevdriver.h
+++ b/languages/cpp/kdevdriver.h
@@ -6,7 +6,7 @@
 #include "driver.h"
 
 #include <kdevproject.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 
 #include <cstdlib>
 #include <unistd.h>
diff --git a/languages/cpp/pcsimporter/CMakeLists.txt b/languages/cpp/pcsimporter/CMakeLists.txt
index 7f070539..2f904a5d 100644
--- a/languages/cpp/pcsimporter/CMakeLists.txt
+++ b/languages/cpp/pcsimporter/CMakeLists.txt
@@ -10,6 +10,6 @@
 #################################################
 
 add_subdirectory( qtimporter )
-add_subdirectory( kdelibsimporter )
+add_subdirectory( tdelibsimporter )
 add_subdirectory( customimporter )
 add_subdirectory( qt4importer )
diff --git a/languages/cpp/pcsimporter/Makefile.am b/languages/cpp/pcsimporter/Makefile.am
index 5a2945ac..31533b36 100644
--- a/languages/cpp/pcsimporter/Makefile.am
+++ b/languages/cpp/pcsimporter/Makefile.am
@@ -1,3 +1,3 @@
 INCLUDES = 
 METASOURCES = AUTO
-SUBDIRS = qtimporter kdelibsimporter customimporter qt4importer
+SUBDIRS = qtimporter tdelibsimporter customimporter qt4importer
diff --git a/languages/cpp/pcsimporter/customimporter/CMakeLists.txt b/languages/cpp/pcsimporter/customimporter/CMakeLists.txt
index 0d807a57..c2e07bdb 100644
--- a/languages/cpp/pcsimporter/customimporter/CMakeLists.txt
+++ b/languages/cpp/pcsimporter/customimporter/CMakeLists.txt
@@ -33,6 +33,6 @@ tde_add_kpart( libkdevcustompcsimporter AUTOMOC
   SOURCES
     kdevcustomimporter.cpp settingsdialog.cpp
     settingsdialogbase.ui
-  LINK lang_interfaces-shared kdevelop-shared
+  LINK lang_interfaces-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/cpp/pcsimporter/customimporter/Makefile.am b/languages/cpp/pcsimporter/customimporter/Makefile.am
index 5a630be9..7e6a7093 100644
--- a/languages/cpp/pcsimporter/customimporter/Makefile.am
+++ b/languages/cpp/pcsimporter/customimporter/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES =  libkdevcustompcsimporter.la
 
 noinst_HEADERS =  kdevcustomimporter.h
 libkdevcustompcsimporter_la_SOURCES = kdevcustomimporter.cpp settingsdialog.cpp settingsdialogbase.ui
-libkdevcustompcsimporter_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \
+libkdevcustompcsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/languages/lib/interfaces/liblang_interfaces.la
 libkdevcustompcsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
 kde_services_DATA = kdevpcscustomimporter.desktop
diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
index 9994dcdd..def22f97 100644
--- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2003 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                  *
+*   roberto@tdevelop.org                                                  *
 *                                                                         *
 *   Copyright (C) 2006 by Jens Dagerbo                                    *
 *   jens.dagerbo@swipnet.se                                               *
@@ -17,7 +17,7 @@
 #include <klistbox.h>
 #include <kcombobox.h>
 #include <kurlrequester.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.h b/languages/cpp/pcsimporter/customimporter/settingsdialog.h
index 7b920a7d..ce05c74f 100644
--- a/languages/cpp/pcsimporter/customimporter/settingsdialog.h
+++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/CMakeLists.txt b/languages/cpp/pcsimporter/kdelibsimporter/CMakeLists.txt
index e74d7bf1..d48bad5a 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/CMakeLists.txt
+++ b/languages/cpp/pcsimporter/kdelibsimporter/CMakeLists.txt
@@ -24,15 +24,15 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevkdelibsimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevtdelibsimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevkdelibsimporter (module) ###########
+##### libkdevtdelibsimporter (module) ###########
 
-tde_add_kpart( libkdevkdelibsimporter AUTOMOC
+tde_add_kpart( libkdevtdelibsimporter AUTOMOC
   SOURCES
-    kdevkdelibsimporter.cpp settingsdialogbase.ui
+    kdevtdelibsimporter.cpp settingsdialogbase.ui
     settingsdialog.cpp
-  LINK lang_interfaces-shared kdevelop-shared
+  LINK lang_interfaces-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/Makefile.am b/languages/cpp/pcsimporter/kdelibsimporter/Makefile.am
index 96c3474f..14efcabc 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/Makefile.am
+++ b/languages/cpp/pcsimporter/kdelibsimporter/Makefile.am
@@ -1,11 +1,11 @@
 INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
-kde_module_LTLIBRARIES =  libkdevkdelibsimporter.la
+kde_module_LTLIBRARIES =  libkdevtdelibsimporter.la
 
-noinst_HEADERS = kdevkdelibsimporter.h settingsdialog.h
-libkdevkdelibsimporter_la_SOURCES = kdevkdelibsimporter.cpp settingsdialogbase.ui settingsdialog.cpp
-kde_services_DATA =  kdevkdelibsimporter.desktop
-libkdevkdelibsimporter_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \
+noinst_HEADERS = kdevtdelibsimporter.h settingsdialog.h
+libkdevtdelibsimporter_la_SOURCES = kdevtdelibsimporter.cpp settingsdialogbase.ui settingsdialog.cpp
+kde_services_DATA =  kdevtdelibsimporter.desktop
+libkdevtdelibsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/languages/lib/interfaces/liblang_interfaces.la
-libkdevkdelibsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+libkdevtdelibsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp
index 4a853d77..c3e7ca0c 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp
+++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2003 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                  *
+*   roberto@tdevelop.org                                                  *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
@@ -9,8 +9,8 @@
 *                                                                         *
 ***************************************************************************/
 
-#include "kdevkdelibsimporter.h"
-#include "kdevkdelibsimporter.moc"
+#include "kdevtdelibsimporter.h"
+#include "kdevtdelibsimporter.moc"
 #include "settingsdialog.h"
 
 #include <kdebug.h>
@@ -21,7 +21,7 @@
 #include <tqdir.h>
 #include <tqcombobox.h>
 
-K_EXPORT_COMPONENT_FACTORY( libkdevkdelibsimporter, KGenericFactory<KDevKDELibsImporter>( "kdevkdelibsimporter" ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevtdelibsimporter, KGenericFactory<KDevKDELibsImporter>( "kdevtdelibsimporter" ) )
 
 KDevKDELibsImporter::KDevKDELibsImporter( TQObject * parent, const char * name, const TQStringList& )
 		: KDevPCSImporter( parent, name )
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.desktop b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.desktop
index 51163d14..7836c861 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.desktop
+++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.desktop
@@ -17,7 +17,7 @@ Comment[da]=KDevelop KDELibs PCS importør
 Comment[de]=KDELibs-Import für persistenten Klassenspeicher
 Comment[el]=Εισαγωγέας PCS KDevelop KDELibs
 Comment[es]=Importador PCS de KDELibs de KDevelop
-Comment[et]=KDevelopi kdelibs PCS importija
+Comment[et]=KDevelopi tdelibs PCS importija
 Comment[eu]=KDevelop-en KDELibs PCS inportatzailea
 Comment[fa]=واردکنندۀ KDevelop KDELibs PCS
 Comment[fr]=Importation PCS de KDELibs pour KDevelop
@@ -44,6 +44,6 @@ Comment[zh_CN]=KDevelop KDELibs PCS 导入器
 Comment[zh_TW]=KDevelop KDE 函式庫匯入器
 Icon=gear
 ServiceTypes=KDevelop/PCSImporter
-X-KDE-Library=libkdevkdelibsimporter
+X-KDE-Library=libkdevtdelibsimporter
 X-KDevelop-PCSImporter=
 X-KDevelop-Version=5
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h
index 47671869..06782a37 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h
+++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp
index 57d16676..a6d95acf 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2003 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                  *
+*   roberto@tdevelop.org                                                  *
 *                                                                         *
 *   Copyright (C) 2006 by Jens Dagerbo                                    *
 *   jens.dagerbo@swipnet.se                                               *
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h
index afe38e8d..26668187 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h
+++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui
index b631bfc9..a7ba1365 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui
@@ -43,7 +43,7 @@ Only the selected entry will be used</string>
                 <string></string>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>Decide if you want to restrict the Code Completion database to only the base kdelibs API or the entire KDE include structure</string>
+                <string>Decide if you want to restrict the Code Completion database to only the base tdelibs API or the entire KDE include structure</string>
             </property>
         </widget>
         <widget class="TQLabel" row="3" column="0">
diff --git a/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt b/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt
index 3eac2ddc..8e29fdec 100644
--- a/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt
+++ b/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt
@@ -33,6 +33,6 @@ tde_add_kpart( libkdevqt4importer AUTOMOC
   SOURCES
     kdevqt4importer.cpp settingsdialogbase.ui
     settingsdialog.cpp
-  LINK lang_interfaces-shared kdevelop-shared
+  LINK lang_interfaces-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/cpp/pcsimporter/qt4importer/Makefile.am b/languages/cpp/pcsimporter/qt4importer/Makefile.am
index b0b4a622..12f12104 100644
--- a/languages/cpp/pcsimporter/qt4importer/Makefile.am
+++ b/languages/cpp/pcsimporter/qt4importer/Makefile.am
@@ -6,6 +6,6 @@ kde_module_LTLIBRARIES =  libkdevqt4importer.la
 noinst_HEADERS = kdevqt4importer.h settingsdialog.h
 libkdevqt4importer_la_SOURCES = kdevqt4importer.cpp settingsdialogbase.ui settingsdialog.cpp
 kde_services_DATA =  kdevqt4importer.desktop
-libkdevqt4importer_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \
+libkdevqt4importer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
         $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la
 libkdevqt4importer_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
index c73b7456..5a38e464 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
index 3b9c6cb9..77546f8d 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
index fbf13efc..f92f6fb6 100644
--- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   Copyright (C) 2006 by Jens Dagerbo                                    *
  *   jens.dagerbo@swipnet.se                                               *
diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h
index bd4ce565..e69ed901 100644
--- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h
+++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt b/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt
index 9f60fd6b..64e95d39 100644
--- a/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt
+++ b/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt
@@ -32,6 +32,6 @@ install( FILES kdevqtimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 tde_add_kpart( libkdevqtimporter AUTOMOC
   SOURCES
     kdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp
-  LINK lang_interfaces-shared kdevelop-shared
+  LINK lang_interfaces-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/cpp/pcsimporter/qtimporter/Makefile.am b/languages/cpp/pcsimporter/qtimporter/Makefile.am
index 878f9b4a..80ccc8be 100644
--- a/languages/cpp/pcsimporter/qtimporter/Makefile.am
+++ b/languages/cpp/pcsimporter/qtimporter/Makefile.am
@@ -6,6 +6,6 @@ kde_module_LTLIBRARIES =  libkdevqtimporter.la
 noinst_HEADERS = kdevqtimporter.h settingsdialog.h
 libkdevqtimporter_la_SOURCES = kdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp
 kde_services_DATA =  kdevqtimporter.desktop
-libkdevqtimporter_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \
+libkdevqtimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/languages/lib/interfaces/liblang_interfaces.la
 libkdevqtimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
index 62eb38fd..79fef26d 100644
--- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
+++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2003 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                  *
+*   roberto@tdevelop.org                                                  *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
index 7504b649..d69e5b0b 100644
--- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
+++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
index 5f65e105..b3c717fd 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2003 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                  *
+*   roberto@tdevelop.org                                                  *
 *                                                                         *
 *   Copyright (C) 2006 by Jens Dagerbo                                    *
 *   jens.dagerbo@swipnet.se                                               *
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h
index bd4ce565..e69ed901 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp
index f8dc13e3..7508e1df 100644
--- a/languages/cpp/problemreporter.cpp
+++ b/languages/cpp/problemreporter.cpp
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2002 by Roberto Raggi <roberto@kdevelop.org>
+   Copyright (C) 2002 by Roberto Raggi <roberto@tdevelop.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -25,7 +25,7 @@
 #include <kdevmainwindow.h>
 #include <kdevproject.h>
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kparts/part.h>
 #include <ktexteditor/editinterface.h>
 #include <ktexteditor/document.h>
diff --git a/languages/cpp/problemreporter.h b/languages/cpp/problemreporter.h
index 7eccbbbb..03b52c38 100644
--- a/languages/cpp/problemreporter.h
+++ b/languages/cpp/problemreporter.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002 by Roberto Raggi <roberto@kdevelop.org>
+  Copyright (C) 2002 by Roberto Raggi <roberto@tdevelop.org>
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public
diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp
index 943fda92..3742c0f6 100644
--- a/languages/cpp/qtdesignercppintegration.cpp
+++ b/languages/cpp/qtdesignercppintegration.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
 *   Copyright (C) 2004 by Alexander Dymo                                  *
 *   adymo@mksat.net                                                       *
-*   Portions Copyright (C) 2003 Roberto Raggi (roberto@kdevelop.org)      *
+*   Portions Copyright (C) 2003 Roberto Raggi (roberto@tdevelop.org)      *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/safetycounter.h b/languages/cpp/safetycounter.h
index d4333176..a885e31a 100644
--- a/languages/cpp/safetycounter.h
+++ b/languages/cpp/safetycounter.h
@@ -1,7 +1,7 @@
 
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/setuphelper.cpp b/languages/cpp/setuphelper.cpp
index 63b4fd94..b75723c4 100644
--- a/languages/cpp/setuphelper.cpp
+++ b/languages/cpp/setuphelper.cpp
@@ -42,7 +42,7 @@ TQString getVerboseGccIncludePath(bool *ok)
 {
   *ok = false;
   ///Create temp file
-  KTempFile tempFile(locateLocal("tmp", "kdevelop_temp"), ".cpp");
+  KTempFile tempFile(locateLocal("tmp", "tdevelop_temp"), ".cpp");
   tempFile.setAutoDelete(true);
   if( tempFile.status() != 0 ) 
     return TQString();//Failed to create temp file
diff --git a/languages/cpp/simplecontext.cpp b/languages/cpp/simplecontext.cpp
index 225bfc84..5cb3f8d9 100644
--- a/languages/cpp/simplecontext.cpp
+++ b/languages/cpp/simplecontext.cpp
@@ -3,11 +3,11 @@
    copyright            : (C) 2001 by Victor R�er
    email                : victor_roeder@gmx.de
    copyright            : (C) 2002,2003 by Roberto Raggi
-   email                : roberto@kdevelop.org
+   email                : roberto@tdevelop.org
    copyright            : (C) 2005 by Adam Treat
    email                : manyoso@yahoo.com
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simplecontext.h b/languages/cpp/simplecontext.h
index a0075554..593e41a8 100644
--- a/languages/cpp/simplecontext.h
+++ b/languages/cpp/simplecontext.h
@@ -3,11 +3,11 @@
    copyright            : (C) 2001 by Victor R�er
    email                : victor_roeder@gmx.de
    copyright            : (C) 2002,2003 by Roberto Raggi
-   email                : roberto@kdevelop.org
+   email                : roberto@tdevelop.org
    copyright            : (C) 2005 by Adam Treat
    email                : manyoso@yahoo.com
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp
index a5efb703..2254fb35 100644
--- a/languages/cpp/simpletype.cpp
+++ b/languages/cpp/simpletype.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
   copyright            : (C) 2006 by David Nolden
-  email                : david.nolden.kdevelop@art-master.de
+  email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletype.h b/languages/cpp/simpletype.h
index 43e55280..c6ca1031 100644
--- a/languages/cpp/simpletype.h
+++ b/languages/cpp/simpletype.h
@@ -1,7 +1,7 @@
 
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletypecachebinder.h b/languages/cpp/simpletypecachebinder.h
index 3f950cbf..6b6898fb 100644
--- a/languages/cpp/simpletypecachebinder.h
+++ b/languages/cpp/simpletypecachebinder.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  copyright            : (C) 2006 by David Nolden
- email                : david.nolden.kdevelop@art-master.de
+ email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletypecatalog.cpp b/languages/cpp/simpletypecatalog.cpp
index f662acc5..edf4dfbb 100644
--- a/languages/cpp/simpletypecatalog.cpp
+++ b/languages/cpp/simpletypecatalog.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletypecatalog.h b/languages/cpp/simpletypecatalog.h
index e22a3fcf..ba674d16 100644
--- a/languages/cpp/simpletypecatalog.h
+++ b/languages/cpp/simpletypecatalog.h
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletypefunction.cpp b/languages/cpp/simpletypefunction.cpp
index 0af7bdc8..b6367d4d 100644
--- a/languages/cpp/simpletypefunction.cpp
+++ b/languages/cpp/simpletypefunction.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletypefunction.h b/languages/cpp/simpletypefunction.h
index 90b5fcab..72afa4e7 100644
--- a/languages/cpp/simpletypefunction.h
+++ b/languages/cpp/simpletypefunction.h
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletypenamespace.cpp b/languages/cpp/simpletypenamespace.cpp
index f7937db1..d5206810 100644
--- a/languages/cpp/simpletypenamespace.cpp
+++ b/languages/cpp/simpletypenamespace.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 copyright            : (C) 2006 by David Nolden
-email                : david.nolden.kdevelop@art-master.de
+email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletypenamespace.h b/languages/cpp/simpletypenamespace.h
index b465cfb6..b0a645ec 100644
--- a/languages/cpp/simpletypenamespace.h
+++ b/languages/cpp/simpletypenamespace.h
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/store_walker.cpp b/languages/cpp/store_walker.cpp
index 8b13b808..9a15d569 100644
--- a/languages/cpp/store_walker.cpp
+++ b/languages/cpp/store_walker.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2003 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                  *
+*   roberto@tdevelop.org                                                  *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/store_walker.h b/languages/cpp/store_walker.h
index 1e646d79..9251aedf 100644
--- a/languages/cpp/store_walker.h
+++ b/languages/cpp/store_walker.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2003 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                  *
+*   roberto@tdevelop.org                                                  *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/storeconverter.cpp b/languages/cpp/storeconverter.cpp
index 6ad55925..78630219 100644
--- a/languages/cpp/storeconverter.cpp
+++ b/languages/cpp/storeconverter.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2003-2004 by Alexander Dymo                             *
-*   adymo@kdevelop.org                                                    *
+*   adymo@tdevelop.org                                                    *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/storeconverter.h b/languages/cpp/storeconverter.h
index 1aa48e6b..d6907608 100644
--- a/languages/cpp/storeconverter.h
+++ b/languages/cpp/storeconverter.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2003-2004 by Alexander Dymo                             *
-*   adymo@kdevelop.org                                                    *
+*   adymo@tdevelop.org                                                    *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/stringhelpers.cpp b/languages/cpp/stringhelpers.cpp
index bc267c15..0d9cba0f 100644
--- a/languages/cpp/stringhelpers.cpp
+++ b/languages/cpp/stringhelpers.cpp
@@ -1,7 +1,7 @@
 
 /***************************************************************************
 k   copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/stringhelpers.h b/languages/cpp/stringhelpers.h
index 33e01827..8f781073 100644
--- a/languages/cpp/stringhelpers.h
+++ b/languages/cpp/stringhelpers.h
@@ -1,7 +1,7 @@
 
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.kdevelop@art-master.de
+   email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/tag_creator.cpp b/languages/cpp/tag_creator.cpp
index 80ab86f5..1b95b4cd 100644
--- a/languages/cpp/tag_creator.cpp
+++ b/languages/cpp/tag_creator.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/tag_creator.h b/languages/cpp/tag_creator.h
index 425d7135..2bca5fde 100644
--- a/languages/cpp/tag_creator.h
+++ b/languages/cpp/tag_creator.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2003 by Roberto Raggi                                   *
-*   roberto@kdevelop.org                                                  *
+*   roberto@tdevelop.org                                                  *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/cpp/typedecoration.h b/languages/cpp/typedecoration.h
index e142d837..ecb8e3b1 100644
--- a/languages/cpp/typedecoration.h
+++ b/languages/cpp/typedecoration.h
@@ -1,6 +1,6 @@
 /***************************************************************************
   copyright            : (C) 2006 by David Nolden
-  email                : david.nolden.kdevelop@art-master.de
+  email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/typedesc.cpp b/languages/cpp/typedesc.cpp
index bc314743..1150f8fb 100644
--- a/languages/cpp/typedesc.cpp
+++ b/languages/cpp/typedesc.cpp
@@ -2,7 +2,7 @@
                         cppcodecompletion.cpp  -  description
                            -------------------
   copyright            : (C) 2006 by David Nolden
-  email                : david.nolden.kdevelop@art-master.de
+  email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/typedesc.h b/languages/cpp/typedesc.h
index ddb072d2..de2417a1 100644
--- a/languages/cpp/typedesc.h
+++ b/languages/cpp/typedesc.h
@@ -1,6 +1,6 @@
 /***************************************************************************
   copyright            : (C) 2006 by David Nolden
-  email                : david.nolden.kdevelop@art-master.de
+  email                : david.nolden.tdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/csharp/CMakeLists.txt b/languages/csharp/CMakeLists.txt
index 3d68dd7c..b509fd03 100644
--- a/languages/csharp/CMakeLists.txt
+++ b/languages/csharp/CMakeLists.txt
@@ -45,7 +45,7 @@ tde_add_kpart( libkdevcsharpsupport AUTOMOC
   SOURCES
     csharpsupportpart.cpp csharpconfigwidget.cpp
     csharpconfigwidgetbase.ui
-  LINK kdevelop-shared
+  LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/languages/csharp/Makefile.am b/languages/csharp/Makefile.am
index 51d0c110..9524ed00 100644
--- a/languages/csharp/Makefile.am
+++ b/languages/csharp/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS = app_templates file_templates doc
 
 kde_module_LTLIBRARIES = libkdevcsharpsupport.la kio_csharpdoc.la
 libkdevcsharpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevcsharpsupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la
+libkdevcsharpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
 libkdevcsharpsupport_la_SOURCES = csharpsupportpart.cpp csharpconfigwidget.cpp csharpconfigwidgetbase.ui
 
diff --git a/languages/csharp/README.dox b/languages/csharp/README.dox
index 36797a75..e3a47947 100644
--- a/languages/csharp/README.dox
+++ b/languages/csharp/README.dox
@@ -6,7 +6,7 @@ over several lines. You can even use some html commands in these lines like:
 <code>This is code</code>, html links <a href="http://somelocation">link text</a>,
 and images.
 
-\authors <a href="mailto:bernd AT kdevelop.org">Bernd Gehrmann</a>
+\authors <a href="mailto:bernd AT tdevelop.org">Bernd Gehrmann</a>
 \authors <a href="mailto:willems.luc AT pandora.be">Luc Willems</a>
 
 \maintainer <a href="mailto:willems.luc AT pandora.be">Luc Willems</a>
diff --git a/languages/csharp/app_templates/CMakeLists.txt b/languages/csharp/app_templates/CMakeLists.txt
index fa6089e3..2f8bf40c 100644
--- a/languages/csharp/app_templates/CMakeLists.txt
+++ b/languages/csharp/app_templates/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     csharp.appwizard
-  DESTINATION ${DATA_INSTALL_DIR}/kdevelop/profiles/IDE/ScriptingLanguageIDE/CSharpIDE )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/ScriptingLanguageIDE/CSharpIDE )
diff --git a/languages/csharp/app_templates/Makefile.am b/languages/csharp/app_templates/Makefile.am
index 14608ada..80fc73e0 100644
--- a/languages/csharp/app_templates/Makefile.am
+++ b/languages/csharp/app_templates/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = 
-profilesdir = $(kde_datadir)/kdevelop/profiles/IDE/ScriptingLanguageIDE/CSharpIDE
+profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/ScriptingLanguageIDE/CSharpIDE
 profiles_DATA = csharp.appwizard
diff --git a/languages/csharp/csharpconfigwidget.cpp b/languages/csharp/csharpconfigwidget.cpp
index 620f7881..adc7e0c5 100644
--- a/languages/csharp/csharpconfigwidget.cpp
+++ b/languages/csharp/csharpconfigwidget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2002 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/csharp/csharpconfigwidget.h b/languages/csharp/csharpconfigwidget.h
index 1f14bd3e..f1936cbb 100644
--- a/languages/csharp/csharpconfigwidget.h
+++ b/languages/csharp/csharpconfigwidget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2002 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/csharp/csharpdoc.cpp b/languages/csharp/csharpdoc.cpp
index f70df162..154301a4 100644
--- a/languages/csharp/csharpdoc.cpp
+++ b/languages/csharp/csharpdoc.cpp
@@ -11,7 +11,7 @@
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <kprocess.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kglobal.h>
 
 using namespace KIO;
@@ -117,7 +117,7 @@ extern "C" {
     int kdemain(int argc, char **argv)
     {
         KInstance instance( "kio_csharpdoc" );
-        KGlobal::locale()->setMainCatalogue("kdevelop");
+        KGlobal::locale()->setMainCatalogue("tdevelop");
 
         if (argc != 4) {
             fprintf(stderr, "Usage: kio_csharpdoc protocol domain-socket1 domain-socket2\n");
diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp
index f6a3545c..9746a190 100644
--- a/languages/csharp/csharpsupportpart.cpp
+++ b/languages/csharp/csharpsupportpart.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2001-2002 by Bernd Gehrmann                             *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/csharp/csharpsupportpart.h b/languages/csharp/csharpsupportpart.h
index d116514a..6d1255f5 100644
--- a/languages/csharp/csharpsupportpart.h
+++ b/languages/csharp/csharpsupportpart.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2001-2002 by Bernd Gehrmann                             *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/fortran/CMakeLists.txt b/languages/fortran/CMakeLists.txt
index 14705d83..507795aa 100644
--- a/languages/fortran/CMakeLists.txt
+++ b/languages/fortran/CMakeLists.txt
@@ -41,6 +41,6 @@ tde_add_kpart( libkdevfortransupport AUTOMOC
   SOURCES
     fortransupportpart.cpp fixedformparser.cpp
     ftnchekconfigwidget.cpp ftnchekconfigwidgetbase.ui
-  LINK kdevelop-shared
+  LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/fortran/Makefile.am b/languages/fortran/Makefile.am
index ac6f5be2..73f4582c 100644
--- a/languages/fortran/Makefile.am
+++ b/languages/fortran/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = file_templates app_templates compiler doc
 
 kde_module_LTLIBRARIES = libkdevfortransupport.la
 libkdevfortransupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevfortransupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la
+libkdevfortransupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
 libkdevfortransupport_la_SOURCES = fortransupportpart.cpp fixedformparser.cpp ftnchekconfigwidget.cpp ftnchekconfigwidgetbase.ui
 
diff --git a/languages/fortran/README.dox b/languages/fortran/README.dox
index d0a5e953..5eeb52a4 100644
--- a/languages/fortran/README.dox
+++ b/languages/fortran/README.dox
@@ -6,7 +6,7 @@ over several lines. You can even use some html commands in these lines like:
 <code>This is code</code>, html links <a href="http://somelocation">link text</a>,
 and images.
 
-\authors <a href="mailto:bernd AT kdevelop.org">Bernd Gehrmann</a>
+\authors <a href="mailto:bernd AT tdevelop.org">Bernd Gehrmann</a>
 
 \maintainer <a href="mailto:$EMAIL$">$AUTHOR$</a>
 \maintainer <a href="mailto:2nd maintainer AT provider.com">2nd maintainer full name</a>
diff --git a/languages/fortran/app_templates/CMakeLists.txt b/languages/fortran/app_templates/CMakeLists.txt
index d34e1f05..67504f40 100644
--- a/languages/fortran/app_templates/CMakeLists.txt
+++ b/languages/fortran/app_templates/CMakeLists.txt
@@ -13,4 +13,4 @@ add_subdirectory( fortranhello )
 
 install( FILES
     fortran.appwizard
-  DESTINATION ${DATA_INSTALL_DIR}/kdevelop/profiles/IDE/CompiledLanguageIDE/FortranIDE )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/FortranIDE )
diff --git a/languages/fortran/app_templates/Makefile.am b/languages/fortran/app_templates/Makefile.am
index 056dc759..9d88626a 100644
--- a/languages/fortran/app_templates/Makefile.am
+++ b/languages/fortran/app_templates/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = fortranhello
-profilesdir = $(kde_datadir)/kdevelop/profiles/IDE/CompiledLanguageIDE/FortranIDE
+profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/FortranIDE
 profiles_DATA = fortran.appwizard
diff --git a/languages/fortran/app_templates/fortranhello/CMakeLists.txt b/languages/fortran/app_templates/fortranhello/CMakeLists.txt
index f0b40cf6..74709631 100644
--- a/languages/fortran/app_templates/fortranhello/CMakeLists.txt
+++ b/languages/fortran/app_templates/fortranhello/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( fortranhello.tar.gz ALL
   COMMAND tar zcf fortranhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     main.f src-Makefile.am fortran-Makefile.am
     fortran-Makefile.cvs configure.in fortranhello.png
-    app.kdevelop
+    app.tdevelop
 )
 
 
diff --git a/languages/fortran/app_templates/fortranhello/Makefile.am b/languages/fortran/app_templates/fortranhello/Makefile.am
index ba97453d..3bf32575 100644
--- a/languages/fortran/app_templates/fortranhello/Makefile.am
+++ b/languages/fortran/app_templates/fortranhello/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = main.f src-Makefile.am fortran-Makefile.am fortran-Makefile.cvs \
-	configure.in fortranhello.png app.kdevelop
+	configure.in fortranhello.png app.tdevelop
 templateName = fortranhello
 
 ### no need to change below:
diff --git a/languages/fortran/app_templates/fortranhello/app.kdevelop b/languages/fortran/app_templates/fortranhello/app.kdevelop
index b4abc5ae..f97fd76a 100644
--- a/languages/fortran/app_templates/fortranhello/app.kdevelop
+++ b/languages/fortran/app_templates/fortranhello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <group pattern="*.F;*.fpp;*.FPP" name="Fortran77 source files" />
     </groups>
   </kdevfileview>
-</kdevelop>
+</tdevelop>
diff --git a/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate b/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate
index b6580853..e4c5cb33 100644
--- a/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate
+++ b/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate
@@ -67,17 +67,17 @@ Archive=fortranhello.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{kdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/fortran/compiler/pgioptions/Makefile.am b/languages/fortran/compiler/pgioptions/Makefile.am
index 3c3dd54e..893b7950 100644
--- a/languages/fortran/compiler/pgioptions/Makefile.am
+++ b/languages/fortran/compiler/pgioptions/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras
 
 kde_module_LTLIBRARIES = libkdevpgioptions.la
 libkdevpgioptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
-libkdevpgioptions_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \
+libkdevpgioptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/lib/interfaces/extras/libkdevextras.la
 
 libkdevpgioptions_la_SOURCES = pgioptionsfactory.cpp pgioptionsplugin.cpp
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp
index 66a12fbb..e6d58fb3 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp
+++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2001 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h
index 88030b72..8b568587 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h
+++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2001 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
index c8137575..305288ab 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
+++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2001 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h
index 5022f929..e7b07655 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h
+++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2001 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/fortran/doc/fortran_bugs_gcc.toc b/languages/fortran/doc/fortran_bugs_gcc.toc
index 444a2a05..b53ae1f8 100644
--- a/languages/fortran/doc/fortran_bugs_gcc.toc
+++ b/languages/fortran/doc/fortran_bugs_gcc.toc
@@ -1,7 +1,7 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>Fortran bugs (GCC)</title>
 <base href="http://gcc.gnu.org/bugzilla/"/>
 <tocsect1 name="Query" url="query.cgi">
 </tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/fortran/fixedformparser.cpp b/languages/fortran/fixedformparser.cpp
index 312d811e..3ae94319 100644
--- a/languages/fortran/fixedformparser.cpp
+++ b/languages/fortran/fixedformparser.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2001 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/fortran/fixedformparser.h b/languages/fortran/fixedformparser.h
index f219e5ca..84d1e16b 100644
--- a/languages/fortran/fixedformparser.h
+++ b/languages/fortran/fixedformparser.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2001 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp
index f60e9049..180a3965 100644
--- a/languages/fortran/fortransupportpart.cpp
+++ b/languages/fortran/fortransupportpart.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2001 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -157,7 +157,7 @@ void FortranSupportPart::slotFtnchek()
 
 void FortranSupportPart::projectConfigWidget(KDialogBase *dlg)
 {
-    TQVBox *vbox = dlg->addVBoxPage(i18n("Ftnchek"), i18n("Ftnchek"), BarIcon("kdevelop", KIcon::SizeMedium));
+    TQVBox *vbox = dlg->addVBoxPage(i18n("Ftnchek"), i18n("Ftnchek"), BarIcon("tdevelop", KIcon::SizeMedium));
     FtnchekConfigWidget *w = new FtnchekConfigWidget(*projectDom(), vbox, "ftnchek config widget");
     connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
 }
diff --git a/languages/fortran/fortransupportpart.h b/languages/fortran/fortransupportpart.h
index bf927a7d..cade03d8 100644
--- a/languages/fortran/fortransupportpart.h
+++ b/languages/fortran/fortransupportpart.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2001 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/fortran/ftnchekconfigwidget.cpp b/languages/fortran/ftnchekconfigwidget.cpp
index 286293aa..c7b9ccb4 100644
--- a/languages/fortran/ftnchekconfigwidget.cpp
+++ b/languages/fortran/ftnchekconfigwidget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2001 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/fortran/ftnchekconfigwidget.h b/languages/fortran/ftnchekconfigwidget.h
index ac4afcc0..bb6cebd9 100644
--- a/languages/fortran/ftnchekconfigwidget.h
+++ b/languages/fortran/ftnchekconfigwidget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2001 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/java/CMakeLists.txt b/languages/java/CMakeLists.txt
index dd5a8474..d3f7f5a7 100644
--- a/languages/java/CMakeLists.txt
+++ b/languages/java/CMakeLists.txt
@@ -49,6 +49,6 @@ tde_add_kpart( libkdevjavasupport AUTOMOC
     javasupportpart.cpp JavaStoreWalker.cpp
     javasupport_utils.cpp problemreporter.cpp driver.cpp
     kdevdriver.cpp KDevJavaSupportIface.skel
-  LINK antlr-static kdevcatalog-shared kdevelop-shared
+  LINK antlr-static kdevcatalog-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/java/Makefile.am b/languages/java/Makefile.am
index 386f220f..a1a1e812 100644
--- a/languages/java/Makefile.am
+++ b/languages/java/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/catalog \
 
 kde_module_LTLIBRARIES = libkdevjavasupport.la
 libkdevjavasupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevjavasupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
+libkdevjavasupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
 
 libkdevjavasupport_la_SOURCES = JavaLexer.cpp KDevJavaSupportIface.cpp javasupportfactory.cpp \
 JavaRecognizer.cpp backgroundparser.cpp configproblemreporter.ui  javasupportpart.cpp \
diff --git a/languages/java/README.dox b/languages/java/README.dox
index 618ddd50..0cb5898b 100644
--- a/languages/java/README.dox
+++ b/languages/java/README.dox
@@ -7,15 +7,15 @@ over several lines. You can even use some html commands in these lines like:
 and images.
 
 \authors <a href="mailto:jonas.nordin AT syncom.se">Jonas Nordin</a> Copyright (C) 1999
-\authors <a href="mailto:bernd AT kdevelop.org">Bernd Gehrmann</a> Copyright (C) 2000-2001
-\authors <a href="mailto:roberto AT kdevelop.org">Roberto Raggi</a> Copyright (C) 2002-2003
+\authors <a href="mailto:bernd AT tdevelop.org">Bernd Gehrmann</a> Copyright (C) 2000-2001
+\authors <a href="mailto:roberto AT tdevelop.org">Roberto Raggi</a> Copyright (C) 2002-2003
 
-\maintainer <a href="mailto:roberto AT kdevelop.org">Roberto Raggi</a> Copyright (C) 2002-2003
+\maintainer <a href="mailto:roberto AT tdevelop.org">Roberto Raggi</a> Copyright (C) 2002-2003
 
 \feature Java language support
 \feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
-\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=kdevelop&component=javasupport&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">javasupport component at Bugzilla database</a>
+\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=javasupport&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">javasupport component at Bugzilla database</a>
 \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
 ..
 \bug Describe a the nth bug that you know of, but probably hasn't been reported yet.
diff --git a/languages/java/app_templates/CMakeLists.txt b/languages/java/app_templates/CMakeLists.txt
index 707b676d..f7e7d242 100644
--- a/languages/java/app_templates/CMakeLists.txt
+++ b/languages/java/app_templates/CMakeLists.txt
@@ -15,4 +15,4 @@ add_subdirectory( superwaba )
 
 install( FILES
     java.appwizard
-  DESTINATION ${DATA_INSTALL_DIR}/kdevelop/profiles/IDE/CompiledLanguageIDE/JavaIDE )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/JavaIDE )
diff --git a/languages/java/app_templates/Makefile.am b/languages/java/app_templates/Makefile.am
index b47abfca..fe3931a3 100644
--- a/languages/java/app_templates/Makefile.am
+++ b/languages/java/app_templates/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = javahello kappjava superwaba
-profilesdir = $(kde_datadir)/kdevelop/profiles/IDE/CompiledLanguageIDE/JavaIDE
+profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/JavaIDE
 profiles_DATA = java.appwizard
diff --git a/languages/java/app_templates/javahello/CMakeLists.txt b/languages/java/app_templates/javahello/CMakeLists.txt
index bbfc746f..8129bbc1 100644
--- a/languages/java/app_templates/javahello/CMakeLists.txt
+++ b/languages/java/app_templates/javahello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( javahello.tar.gz ALL
   COMMAND tar zcf javahello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    Main.java build.xml javahello.filelist javahello.kdevelop
+    Main.java build.xml javahello.filelist javahello.tdevelop
 )
 
 
diff --git a/languages/java/app_templates/javahello/Makefile.am b/languages/java/app_templates/javahello/Makefile.am
index 8551a6ac..f47e7056 100644
--- a/languages/java/app_templates/javahello/Makefile.am
+++ b/languages/java/app_templates/javahello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = Main.java build.xml javahello.filelist javahello.kdevelop
+dataFiles = Main.java build.xml javahello.filelist javahello.tdevelop
 templateName= javahello
 
 ### no need to change below:
diff --git a/languages/java/app_templates/javahello/javahello.kdevelop b/languages/java/app_templates/javahello/javahello.kdevelop
index c3eb6898..a41fae72 100644
--- a/languages/java/app_templates/javahello/javahello.kdevelop
+++ b/languages/java/app_templates/javahello/javahello.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -66,4 +66,4 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
   </kdevfileview>
-</kdevelop>
+</tdevelop>
diff --git a/languages/java/app_templates/javahello/javahello.kdevtemplate b/languages/java/app_templates/javahello/javahello.kdevtemplate
index a7427704..62fcffc5 100644
--- a/languages/java/app_templates/javahello/javahello.kdevtemplate
+++ b/languages/java/app_templates/javahello/javahello.kdevtemplate
@@ -73,8 +73,8 @@ Archive=javahello.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/javahello.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/javahello.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/java/app_templates/kappjava/CMakeLists.txt b/languages/java/app_templates/kappjava/CMakeLists.txt
index 3b4abe1e..042872fd 100644
--- a/languages/java/app_templates/kappjava/CMakeLists.txt
+++ b/languages/java/app_templates/kappjava/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( kappjava.tar.gz ALL
   COMMAND tar zcf kappjava.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     app.java pref.java appview.java app_client.java appui.rc
-    src-Makefile.am kappjava.png app.kdevelop subdirs
+    src-Makefile.am kappjava.png app.tdevelop subdirs
 )
 
 
diff --git a/languages/java/app_templates/kappjava/Makefile.am b/languages/java/app_templates/kappjava/Makefile.am
index 4cda2ef7..edbd4468 100644
--- a/languages/java/app_templates/kappjava/Makefile.am
+++ b/languages/java/app_templates/kappjava/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = app.java pref.java appview.java  app_client.java appui.rc \
-	src-Makefile.am kappjava.png app.kdevelop subdirs
+	src-Makefile.am kappjava.png app.tdevelop subdirs
 templateName = kappjava
 
 ### no need to change below:
diff --git a/languages/java/app_templates/kappjava/app.kdevelop b/languages/java/app_templates/kappjava/app.kdevelop
index 078f5c1a..7ee74558 100644
--- a/languages/java/app_templates/kappjava/app.kdevelop
+++ b/languages/java/app_templates/kappjava/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -85,4 +85,4 @@
       <type ext="java"/>
     </useglobaltypes>
   </kdevfilecreate>
-</kdevelop>
+</tdevelop>
diff --git a/languages/java/app_templates/kappjava/kappjava.kdevtemplate b/languages/java/app_templates/kappjava/kappjava.kdevtemplate
index 3fd80ca8..b070a6bc 100644
--- a/languages/java/app_templates/kappjava/kappjava.kdevtemplate
+++ b/languages/java/app_templates/kappjava/kappjava.kdevtemplate
@@ -65,35 +65,35 @@ Archive=kappjava.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [DOCBOOK]
 Type=include
-File=%{kdevelop}/template-common/dockbook.kdevtemplate
+File=%{tdevelop}/template-common/dockbook.kdevtemplate
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-configure.in.in
+Source=%{tdevelop}/template-common/kde-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [MkDir3]
@@ -102,23 +102,23 @@ Dir=%{dest}/src
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.desktop
+Source=%{tdevelop}/template-common/kde-app.desktop
 Dest=%{dest}/src/%{APPNAMELC}.desktop
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [FILE10]
 Type=install
-Source=%{kdevelop}/template-common/hi16-app-app.png
+Source=%{tdevelop}/template-common/hi16-app-app.png
 Dest=%{dest}/src/hi16-app-%{APPNAMELC}.png
 Process=false
 
 [FILE11]
 Type=install
-Source=%{kdevelop}/template-common/hi32-app-app.png
+Source=%{tdevelop}/template-common/hi32-app-app.png
 Dest=%{dest}/src/hi32-app-%{APPNAMELC}.png
 Process=false
 
@@ -128,7 +128,7 @@ Dir=%{dest}/po
 
 [FILE12]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE13]
diff --git a/languages/java/app_templates/superwaba/CMakeLists.txt b/languages/java/app_templates/superwaba/CMakeLists.txt
index 160b1a14..58932352 100644
--- a/languages/java/app_templates/superwaba/CMakeLists.txt
+++ b/languages/java/app_templates/superwaba/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( superwaba.tar.gz ALL
   COMMAND tar zcf superwaba.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    superwaba.png sw.java src-Makefile sw.kdevelop sw.filelist
+    superwaba.png sw.java src-Makefile sw.tdevelop sw.filelist
 )
 
 
diff --git a/languages/java/app_templates/superwaba/Makefile.am b/languages/java/app_templates/superwaba/Makefile.am
index 8c27b8d5..bc706fe6 100644
--- a/languages/java/app_templates/superwaba/Makefile.am
+++ b/languages/java/app_templates/superwaba/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = superwaba.png sw.java src-Makefile sw.kdevelop sw.filelist
+dataFiles = superwaba.png sw.java src-Makefile sw.tdevelop sw.filelist
 templateName = superwaba
 
 ### no need to change below:
diff --git a/languages/java/app_templates/superwaba/superwaba b/languages/java/app_templates/superwaba/superwaba
index eea98775..17183f35 100644
--- a/languages/java/app_templates/superwaba/superwaba
+++ b/languages/java/app_templates/superwaba/superwaba
@@ -26,13 +26,13 @@ ValueType=QString
 
 [GNU]
 Type=install archive
-Source=%{kdevelop}/template-common/gnu.tar.gz
+Source=%{tdevelop}/template-common/gnu.tar.gz
 Dest=%{dest}
 
 [PROJECT]
 Type=install
-Source=%{src}/sw.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/sw.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILELIST]
 Type=install
diff --git a/languages/java/app_templates/superwaba/superwaba.kdevtemplate b/languages/java/app_templates/superwaba/superwaba.kdevtemplate
index a963caac..27257770 100644
--- a/languages/java/app_templates/superwaba/superwaba.kdevtemplate
+++ b/languages/java/app_templates/superwaba/superwaba.kdevtemplate
@@ -104,14 +104,14 @@ ValueType=QString
 
 [GNU]
 Type=install archive
-Source=%{kdevelop}/template-common/gnu.tar.gz
+Source=%{tdevelop}/template-common/gnu.tar.gz
 Dest=%{dest}
 
 [PROJECT]
 Type=install
 EscapeXML=true
-Source=%{src}/sw.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/sw.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILELIST]
 Type=install
@@ -162,5 +162,5 @@ Archive=superwaba.tar.gz
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
diff --git a/languages/java/app_templates/superwaba/sw.kdevelop b/languages/java/app_templates/superwaba/sw.kdevelop
index bddee282..11db7411 100644
--- a/languages/java/app_templates/superwaba/sw.kdevelop
+++ b/languages/java/app_templates/superwaba/sw.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -91,4 +91,4 @@
    <type ext="java"/>
   </useglobaltypes>
  </kdevfilecreate>
-</kdevelop>
+</tdevelop>
diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp
index cdeae8b4..14471290 100644
--- a/languages/java/backgroundparser.cpp
+++ b/languages/java/backgroundparser.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2002 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                 *
+ *   roberto@tdevelop.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/java/backgroundparser.h b/languages/java/backgroundparser.h
index fee2bc78..67bf1120 100644
--- a/languages/java/backgroundparser.h
+++ b/languages/java/backgroundparser.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2002 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                 *
+ *   roberto@tdevelop.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/java/doc/java_bugs_gcc.toc b/languages/java/doc/java_bugs_gcc.toc
index 8162d1e1..e3a0a3ce 100644
--- a/languages/java/doc/java_bugs_gcc.toc
+++ b/languages/java/doc/java_bugs_gcc.toc
@@ -1,7 +1,7 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>Java bugs (GCC)</title>
 <base href="http://gcc.gnu.org/bugzilla/"/>
 <tocsect1 name="Query" url="query.cgi">
 </tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/java/doc/java_bugs_sun.toc b/languages/java/doc/java_bugs_sun.toc
index 779f2a32..9a590055 100644
--- a/languages/java/doc/java_bugs_sun.toc
+++ b/languages/java/doc/java_bugs_sun.toc
@@ -1,7 +1,7 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>Java bugs (Sun)</title>
 <base href="http://developer.java.sun.com/developer/bugParade/"/>
 <tocsect1 name="Query" url="index.jshtml">
 </tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/java/doc/sw.toc b/languages/java/doc/sw.toc
index da6356d2..45606da7 100644
--- a/languages/java/doc/sw.toc
+++ b/languages/java/doc/sw.toc
@@ -1,5 +1,5 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>SuperWaba 3.4.1 API</title>
 <base href="http://www.superwaba.com.br/doc/"/>
 <tocsect1 name="java.lang" url="java/lang/package-summary.html">
@@ -142,5 +142,5 @@
 	<tocsect2 name="Properties.Int" url="superwaba/ext/xplat/util/props/Properties.Int.html"/>
 	<tocsect2 name="Properties.Boolean" url="superwaba/ext/xplat/util/props/Properties.Boolean.html"/>
 </tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
 
diff --git a/languages/java/driver.cpp b/languages/java/driver.cpp
index 7991028e..61f633b4 100644
--- a/languages/java/driver.cpp
+++ b/languages/java/driver.cpp
@@ -1,5 +1,5 @@
 /* This file is part of KDevelop
-    Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
+    Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/languages/java/driver.h b/languages/java/driver.h
index 5b8c522a..f3e2868e 100644
--- a/languages/java/driver.h
+++ b/languages/java/driver.h
@@ -1,5 +1,5 @@
 /* This file is part of KDevelop
-    Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
+    Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/languages/java/java.store.g b/languages/java/java.store.g
index b69b7323..6930c8d1 100644
--- a/languages/java/java.store.g
+++ b/languages/java/java.store.g
@@ -1,4 +1,4 @@
-// KDevelop support by Roberto Raggi (roberto@kdevelop.org)
+// KDevelop support by Roberto Raggi (roberto@tdevelop.org)
 
 header "pre_include_hpp" {
 	#include <codemodel.h>
diff --git a/languages/java/javasupport_events.h b/languages/java/javasupport_events.h
index 36cda51b..e1ce433e 100644
--- a/languages/java/javasupport_events.h
+++ b/languages/java/javasupport_events.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/java/javasupport_utils.h b/languages/java/javasupport_utils.h
index ad380966..8cbedb14 100644
--- a/languages/java/javasupport_utils.h
+++ b/languages/java/javasupport_utils.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp
index a453c84a..92bce808 100644
--- a/languages/java/javasupportfactory.cpp
+++ b/languages/java/javasupportfactory.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2000-2001 by Bernd Gehrmann                             *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/java/javasupportfactory.h b/languages/java/javasupportfactory.h
index fc82d929..064b7dd4 100644
--- a/languages/java/javasupportfactory.h
+++ b/languages/java/javasupportfactory.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2000-2001 by Bernd Gehrmann                             *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index 258d7cc6..e4aeb27f 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -2,9 +2,9 @@
  *   Copyright (C) 1999 by Jonas Nordin                                    *
  *   jonas.nordin@syncom.se                                                *
  *   Copyright (C) 2000-2001 by Bernd Gehrmann                             *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *   Copyright (C) 2002-2003 by Roberto Raggi                              *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -50,7 +50,7 @@
 #include <kmainwindow.h>
 #include <kstatusbar.h>
 #include <kconfig.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 
@@ -508,12 +508,12 @@ JavaSupportPart::parseProject( )
     TQMap< TQString, TQPair<uint, uint> > pcs;
 
     if( TQFileInfo( project()->projectDirectory() + "/" +
-			    project()->projectName().lower() + ".kdevelop.pcs" ).exists() )
+			    project()->projectName().lower() + ".tdevelop.pcs" ).exists() )
     {
-        d.rename(project()->projectName().lower() + ".kdevelop.pcs",
-			project()->projectName() + ".kdevelop.pcs");
+        d.rename(project()->projectName().lower() + ".tdevelop.pcs",
+			project()->projectName() + ".tdevelop.pcs");
     }
-    TQFile f(project()->projectDirectory() + "/" + project()->projectName() + ".kdevelop.pcs");
+    TQFile f(project()->projectDirectory() + "/" + project()->projectName() + ".tdevelop.pcs");
     if( f.open(IO_ReadOnly) ){
 	stream.setDevice( &f );
 
@@ -846,7 +846,7 @@ void JavaSupportPart::saveProjectSourceInfo( )
 	return;
 
     TQFile f( project()->projectDirectory() + "/" +
-		    project()->projectName() + ".kdevelop.pcs" );
+		    project()->projectName() + ".tdevelop.pcs" );
     if( !f.open( IO_WriteOnly ) )
 	return;
 
diff --git a/languages/java/javasupportpart.h b/languages/java/javasupportpart.h
index 54a8cee4..cfb4d924 100644
--- a/languages/java/javasupportpart.h
+++ b/languages/java/javasupportpart.h
@@ -2,9 +2,9 @@
  *   Copyright (C) 1999 by Jonas Nordin                                    *
  *   jonas.nordin@syncom.se                                                *
  *   Copyright (C) 2000-2001 by Bernd Gehrmann                             *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *   Copyright (C) 2002-2003 by Roberto Raggi                              *
- *   roberto@kdevelop.org                                                  *
+ *   roberto@tdevelop.org                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/java/kdevdriver.h b/languages/java/kdevdriver.h
index 041129fa..cc0a1393 100644
--- a/languages/java/kdevdriver.h
+++ b/languages/java/kdevdriver.h
@@ -5,7 +5,7 @@
 #include "javasupportpart.h"
 
 #include <kdevproject.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 
 #include "driver.h"
 
diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp
index f2d655b0..53517ced 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2002 by Roberto Raggi <roberto@kdevelop.org>
+   Copyright (C) 2002 by Roberto Raggi <roberto@tdevelop.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -24,7 +24,7 @@
 #include <kdevpartcontroller.h>
 #include <kdevmainwindow.h>
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kparts/part.h>
 #include <ktexteditor/editinterface.h>
 #include <ktexteditor/document.h>
diff --git a/languages/java/problemreporter.h b/languages/java/problemreporter.h
index 67230aa2..27db738e 100644
--- a/languages/java/problemreporter.h
+++ b/languages/java/problemreporter.h
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2002 by Roberto Raggi <roberto@kdevelop.org>
+   Copyright (C) 2002 by Roberto Raggi <roberto@tdevelop.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/languages/kjssupport/Makefile.am b/languages/kjssupport/Makefile.am
index d61fc67c..72cc722b 100644
--- a/languages/kjssupport/Makefile.am
+++ b/languages/kjssupport/Makefile.am
@@ -1,8 +1,8 @@
-INCLUDES = -I$(kde_includes)/kdevelop $(all_includes)
+INCLUDES = -I$(kde_includes)/tdevelop $(all_includes)
 
 kde_module_LTLIBRARIES = libkdevkjssupport.la
 libkdevkjssupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevkjssupport_la_LIBADD = -lkjsembed -lkdevelop
+libkdevkjssupport_la_LIBADD = -lkjsembed -ltdevelop
 libkdevkjssupport_la_SOURCES = kjssupport_part.cpp kjsproblems.cpp jscodecompletion.cpp subclassingdlg.cpp subclassingdlgbase.ui
 
 METASOURCES = AUTO
diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp
index 5717858a..24eeda70 100644
--- a/languages/kjssupport/jscodecompletion.cpp
+++ b/languages/kjssupport/jscodecompletion.cpp
@@ -28,14 +28,14 @@
 #include <kdialogbase.h>
 
 
-#include <kdevelop/kdevcore.h>
-#include <kdevelop/kdevmainwindow.h>
-#include <kdevelop/kdevlanguagesupport.h>
-#include <kdevelop/kdevpartcontroller.h>
-#include <kdevelop/kdevproject.h>
-#include <kdevelop/kdevappfrontend.h>
-#include <kdevelop/domutil.h>
-#include <kdevelop/codemodel.h>
+#include <tdevelop/kdevcore.h>
+#include <tdevelop/kdevmainwindow.h>
+#include <tdevelop/kdevlanguagesupport.h>
+#include <tdevelop/kdevpartcontroller.h>
+#include <tdevelop/kdevproject.h>
+#include <tdevelop/kdevappfrontend.h>
+#include <tdevelop/domutil.h>
+#include <tdevelop/codemodel.h>
 
 JSCodeCompletion::JSCodeCompletion(TQObject *parent, const char *name)
 		: TQObject(parent, name)
diff --git a/languages/kjssupport/jscodecompletion.h b/languages/kjssupport/jscodecompletion.h
index 3cad550c..5397c232 100644
--- a/languages/kjssupport/jscodecompletion.h
+++ b/languages/kjssupport/jscodecompletion.h
@@ -13,9 +13,9 @@
 #define JSCODECOMPLETION_H
 
 #include <tqobject.h>
-#include <kdevelop/codemodel.h>
-#include <kdevelop/kdevplugin.h>
-#include <kdevelop/kdevlanguagesupport.h>
+#include <tdevelop/codemodel.h>
+#include <tdevelop/kdevplugin.h>
+#include <tdevelop/kdevlanguagesupport.h>
 
 #include <ktexteditor/editinterface.h>
 #include <ktexteditor/viewcursorinterface.h>
diff --git a/languages/kjssupport/kdevkjssupport.desktop b/languages/kjssupport/kdevkjssupport.desktop
index d60863b8..1c591e06 100644
--- a/languages/kjssupport/kdevkjssupport.desktop
+++ b/languages/kjssupport/kdevkjssupport.desktop
@@ -47,7 +47,7 @@ GenericName[sv]=KDE Javaskript-stöd
 GenericName[tr]=KDE JavaScript Desteği
 GenericName[zh_CN]=KDE JavaScript 支持
 GenericName[zh_TW]=KDE JavaScript 支援
-Icon=kdevelop
+Icon=tdevelop
 ServiceTypes=KDevelop/LanguageSupport
 X-KDevelop-Language=Javascript
 X-KDE-Library=libkdevkjssupport
diff --git a/languages/kjssupport/kjssupport_part.h b/languages/kjssupport/kjssupport_part.h
index dc279f1f..d73bb591 100644
--- a/languages/kjssupport/kjssupport_part.h
+++ b/languages/kjssupport/kjssupport_part.h
@@ -21,9 +21,9 @@
 #define __KDEVPART_KJSSUPPORT_H__
 
 
-#include <kdevelop/kdevplugin.h>
-#include <kdevelop/codemodel.h>
-#include <kdevelop/kdevlanguagesupport.h>
+#include <tdevelop/kdevplugin.h>
+#include <tdevelop/codemodel.h>
+#include <tdevelop/kdevlanguagesupport.h>
 #include <kdialogbase.h>
 #include <tqstringlist.h>
 #include <tqdict.h>
diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp
index a4052064..274cba8e 100644
--- a/languages/kjssupport/subclassingdlg.cpp
+++ b/languages/kjssupport/subclassingdlg.cpp
@@ -16,10 +16,10 @@
 /*#include "backgroundparser.h"
 #include "store_walker.h"
 #include "cppsupportfactory.h"*/
-#include <kdevelop/kdevsourceformatter.h>
-#include <kdevelop/kdevproject.h>
-#include <kdevelop/filetemplate.h>
-#include <kdevelop/codemodel.h>
+#include <tdevelop/kdevsourceformatter.h>
+#include <tdevelop/kdevproject.h>
+#include <tdevelop/filetemplate.h>
+#include <tdevelop/codemodel.h>
 
 #include <tqradiobutton.h>
 #include <tqstringlist.h>
diff --git a/languages/kjssupport/template/Makefile.am b/languages/kjssupport/template/Makefile.am
index 3244188a..284227b7 100644
--- a/languages/kjssupport/template/Makefile.am
+++ b/languages/kjssupport/template/Makefile.am
@@ -3,7 +3,7 @@ commondatadir = ${appwizarddatadir}/template-common
 jshellodir = ${appwizarddatadir}/template-jshello
 templatedir = ${appwizarddatadir}/templates
 
-jshello_DATA = app.js app.kdevelop
+jshello_DATA = app.js app.tdevelop
 template_DATA = jshello
 
 DISTCLEANFILES = script.local
diff --git a/languages/kjssupport/template/app.kdevelop b/languages/kjssupport/template/app.kdevelop
index 2bb39a0a..cbef8262 100644
--- a/languages/kjssupport/template/app.kdevelop
+++ b/languages/kjssupport/template/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>$AUTHOR$</author>
   <email>$EMAIL$</email>
@@ -42,4 +42,4 @@
 			<type ext="js"/>
     </useglobaltypes>
   </kdevfilecreate>
-</kdevelop>
+</tdevelop>
diff --git a/languages/kjssupport/template/script b/languages/kjssupport/template/script
index d3a808c5..1473d762 100644
--- a/languages/kjssupport/template/script
+++ b/languages/kjssupport/template/script
@@ -5,7 +5,7 @@ use gideon;
 initGideon();
 
 print "Installing project file\n";
-installHTML( "${src}/template-jshello/app.kdevelop", "${dest}/${APPNAMELC}.kdevelop" );
+installHTML( "${src}/template-jshello/app.tdevelop", "${dest}/${APPNAMELC}.tdevelop" );
 
 print "Installing application sources\n";
 install( "${src}/template-jshello/app.js",       "${dest}/${APPNAMELC}.js" );
diff --git a/languages/lib/debugger/CMakeLists.txt b/languages/lib/debugger/CMakeLists.txt
index 5e4e118f..0f980a45 100644
--- a/languages/lib/debugger/CMakeLists.txt
+++ b/languages/lib/debugger/CMakeLists.txt
@@ -25,7 +25,7 @@ link_directories(
 
 install( FILES
     debugger.h kdevdebugger.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kdevelop/languages/debugger )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/languages/debugger )
 
 
 ##### lang_debugger (shared) ####################
diff --git a/languages/lib/debugger/Mainpage.dox b/languages/lib/debugger/Mainpage.dox
index 6dfb64ab..5d8b3f2e 100644
--- a/languages/lib/debugger/Mainpage.dox
+++ b/languages/lib/debugger/Mainpage.dox
@@ -5,7 +5,7 @@ This library contains classes to implement debugger support for a programming la
 
 <b>Link with</b>: -llang_debugger
 
-<b>Include path</b>: -I\$(kde_includes)/kdevelop/languages/debugger
+<b>Include path</b>: -I\$(kde_includes)/tdevelop/languages/debugger
 
 \section usingdebugger Where to use this library
 
diff --git a/languages/lib/debugger/Makefile.am b/languages/lib/debugger/Makefile.am
index 34e277b7..70484a34 100644
--- a/languages/lib/debugger/Makefile.am
+++ b/languages/lib/debugger/Makefile.am
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = liblang_debugger.la
 liblang_debugger_la_LDFLAGS = $(all_libraries)
 liblang_debugger_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KPARTS) -lktexteditor
 liblang_debugger_la_SOURCES = kdevdebugger.cpp debugger.cpp
-langincludedirdir = $(includedir)/kdevelop/languages/debugger
+langincludedirdir = $(includedir)/tdevelop/languages/debugger
 langincludedir_HEADERS = debugger.h kdevdebugger.h
 
 DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces kdevutil
diff --git a/languages/lib/debugger/debugger.h b/languages/lib/debugger/debugger.h
index 0b813f66..d5603a69 100644
--- a/languages/lib/debugger/debugger.h
+++ b/languages/lib/debugger/debugger.h
@@ -8,7 +8,7 @@
 #include <kparts/part.h>
 #include <ktexteditor/markinterface.h>
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <ktexteditor/markinterfaceextension.h>
 
 class KDevPartController;
diff --git a/languages/lib/designer_integration/CMakeLists.txt b/languages/lib/designer_integration/CMakeLists.txt
index ca493996..2b319a90 100644
--- a/languages/lib/designer_integration/CMakeLists.txt
+++ b/languages/lib/designer_integration/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 install( FILES
     qtdesignerintegration.h implementationwidget.h
     ${CMAKE_CURRENT_BINARY_DIR}/implementationwidgetbase.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kdevelop/languages/designer_integration )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/languages/designer_integration )
 
 
 ##### designerintegration (shared) ##############
@@ -39,6 +39,6 @@ tde_add_library( designerintegration SHARED AUTOMOC
     implementationwidgetbase.ui implementationwidget.cpp
     qtdesignerintegration.cpp
   VERSION 0.0.0
-  LINK kdevelop-shared
+  LINK tdevelop-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/languages/lib/designer_integration/Makefile.am b/languages/lib/designer_integration/Makefile.am
index 182ff9ad..3ba9afb5 100644
--- a/languages/lib/designer_integration/Makefile.am
+++ b/languages/lib/designer_integration/Makefile.am
@@ -8,7 +8,7 @@ libdesignerintegration_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfa
 libdesignerintegration_la_SOURCES = implementationwidgetbase.ui \
 	implementationwidget.cpp qtdesignerintegration.cpp
 
-langincludedirdir = $(includedir)/kdevelop/languages/designer_integration
+langincludedirdir = $(includedir)/tdevelop/languages/designer_integration
 langincludedir_HEADERS = qtdesignerintegration.h implementationwidget.h implementationwidgetbase.h
 
 DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces kdevutil
diff --git a/languages/lib/designer_integration/implementationwidget.cpp b/languages/lib/designer_integration/implementationwidget.cpp
index d9a3d6a7..68782e60 100644
--- a/languages/lib/designer_integration/implementationwidget.cpp
+++ b/languages/lib/designer_integration/implementationwidget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2004 by Alexander Dymo                                  *
- *   adymo@kdevelop.org                                                    *
+ *   adymo@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU Library General Public License as       *
diff --git a/languages/lib/designer_integration/implementationwidget.h b/languages/lib/designer_integration/implementationwidget.h
index 83b84bb4..d6825d0b 100644
--- a/languages/lib/designer_integration/implementationwidget.h
+++ b/languages/lib/designer_integration/implementationwidget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2004 by Alexander Dymo                                  *
- *   adymo@kdevelop.org                                                    *
+ *   adymo@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU Library General Public License as       *
diff --git a/languages/lib/designer_integration/qtdesignerintegration.cpp b/languages/lib/designer_integration/qtdesignerintegration.cpp
index 1d9e0c01..6cd22927 100644
--- a/languages/lib/designer_integration/qtdesignerintegration.cpp
+++ b/languages/lib/designer_integration/qtdesignerintegration.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2004 by Alexander Dymo                                  *
- *   adymo@kdevelop.org                                                    *
+ *   adymo@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU Library General Public License as       *
diff --git a/languages/lib/designer_integration/qtdesignerintegration.h b/languages/lib/designer_integration/qtdesignerintegration.h
index d1f72aeb..d561d59f 100644
--- a/languages/lib/designer_integration/qtdesignerintegration.h
+++ b/languages/lib/designer_integration/qtdesignerintegration.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2004 by Alexander Dymo                                  *
- *   adymo@kdevelop.org                                                    *
+ *   adymo@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU Library General Public License as       *
diff --git a/languages/lib/interfaces/CMakeLists.txt b/languages/lib/interfaces/CMakeLists.txt
index dc4eea21..370eece3 100644
--- a/languages/lib/interfaces/CMakeLists.txt
+++ b/languages/lib/interfaces/CMakeLists.txt
@@ -22,12 +22,12 @@ link_directories(
 
 ##### headers ###################################
 
-install( FILES kdevpcsimporter.h DESTINATION ${INCLUDE_INSTALL_DIR}/kdevelop/languages/interfaces )
+install( FILES kdevpcsimporter.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/languages/interfaces )
 
 
 ##### other data ################################
 
-install( FILES kdeveloppcsimporter.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+install( FILES tdeveloppcsimporter.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
 ##### lang_interfaces (shared) ##################
diff --git a/languages/lib/interfaces/Mainpage.dox b/languages/lib/interfaces/Mainpage.dox
index f31c4bfc..c8cd98b7 100644
--- a/languages/lib/interfaces/Mainpage.dox
+++ b/languages/lib/interfaces/Mainpage.dox
@@ -5,6 +5,6 @@ This library contains interfaces for KDevelop language support facilities.
 
 <b>Link with</b>: -llang_interfaces
 
-<b>Include path</b>: -I\$(kde_includes)/kdevelop/languages/interfaces
+<b>Include path</b>: -I\$(kde_includes)/tdevelop/languages/interfaces
 */
 
diff --git a/languages/lib/interfaces/Makefile.am b/languages/lib/interfaces/Makefile.am
index b8ae2a04..d469eaa6 100644
--- a/languages/lib/interfaces/Makefile.am
+++ b/languages/lib/interfaces/Makefile.am
@@ -1,6 +1,6 @@
 
 METASOURCES = AUTO
-langincludedirdir = $(includedir)/kdevelop/languages/interfaces
+langincludedirdir = $(includedir)/tdevelop/languages/interfaces
 lib_LTLIBRARIES = liblang_interfaces.la
 liblang_interfaces_la_LDFLAGS = $(all_libraries)
 liblang_interfaces_la_SOURCES = kdevpcsimporter.cpp
@@ -8,7 +8,7 @@ liblang_interfaces_la_LIBADD = $(LIB_QT)
 langincludedir_HEADERS = kdevpcsimporter.h
 INCLUDES = $(all_includes)
 servicetypedir = $(kde_servicetypesdir)
-servicetype_DATA = kdeveloppcsimporter.desktop
+servicetype_DATA = tdeveloppcsimporter.desktop
 
 DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces kdevutil
 DOXYGEN_PROJECTNAME = KDevelop Language Support Interfaces Library
diff --git a/languages/lib/interfaces/kdevpcsimporter.cpp b/languages/lib/interfaces/kdevpcsimporter.cpp
index c4b4e664..b6779322 100644
--- a/languages/lib/interfaces/kdevpcsimporter.cpp
+++ b/languages/lib/interfaces/kdevpcsimporter.cpp
@@ -1,5 +1,5 @@
 /* This file is part of KDevelop
-    Copyright (C) 2003 Roberto Raggi <roberto@kdevelop.org>
+    Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/languages/lib/interfaces/kdevpcsimporter.h b/languages/lib/interfaces/kdevpcsimporter.h
index 7253a30b..e90fdec2 100644
--- a/languages/lib/interfaces/kdevpcsimporter.h
+++ b/languages/lib/interfaces/kdevpcsimporter.h
@@ -1,5 +1,5 @@
 /* This file is part of KDevelop
-    Copyright (C) 2003 Roberto Raggi <roberto@kdevelop.org>
+    Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/languages/pascal/CMakeLists.txt b/languages/pascal/CMakeLists.txt
index 19ecf137..7449570e 100644
--- a/languages/pascal/CMakeLists.txt
+++ b/languages/pascal/CMakeLists.txt
@@ -46,6 +46,6 @@ tde_add_kpart( libkdevpascalsupport AUTOMOC
     pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp
     PascalStoreWalker.cpp backgroundparser.cpp
     configproblemreporter.ui problemreporter.cpp
-  LINK antlr-static kdevcatalog-shared kdevelop-shared
+  LINK antlr-static kdevcatalog-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/pascal/Makefile.am b/languages/pascal/Makefile.am
index 5abaa01b..9d168734 100644
--- a/languages/pascal/Makefile.am
+++ b/languages/pascal/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = file_templates app_templates compiler doc
 
 kde_module_LTLIBRARIES = libkdevpascalsupport.la
 libkdevpascalsupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN)
-libkdevpascalsupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
+libkdevpascalsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
 
 libkdevpascalsupport_la_SOURCES = pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp configproblemreporter.ui problemreporter.cpp
 
diff --git a/languages/pascal/app_templates/CMakeLists.txt b/languages/pascal/app_templates/CMakeLists.txt
index d493e7a1..25961a78 100644
--- a/languages/pascal/app_templates/CMakeLists.txt
+++ b/languages/pascal/app_templates/CMakeLists.txt
@@ -16,4 +16,4 @@ add_subdirectory( fpcsharedlib )
 
 install( FILES
     pascal.appwizard
-  DESTINATION ${DATA_INSTALL_DIR}/kdevelop/profiles/IDE/CompiledLanguageIDE/PascalIDE )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/PascalIDE )
diff --git a/languages/pascal/app_templates/Makefile.am b/languages/pascal/app_templates/Makefile.am
index 9fd47804..38782178 100644
--- a/languages/pascal/app_templates/Makefile.am
+++ b/languages/pascal/app_templates/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = pascalhello fpcgtk fpchello fpcsharedlib
-profilesdir = $(kde_datadir)/kdevelop/profiles/IDE/CompiledLanguageIDE/PascalIDE
+profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/PascalIDE
 profiles_DATA = pascal.appwizard
diff --git a/languages/pascal/app_templates/fpcgtk/CMakeLists.txt b/languages/pascal/app_templates/fpcgtk/CMakeLists.txt
index 8a154204..eb16e978 100644
--- a/languages/pascal/app_templates/fpcgtk/CMakeLists.txt
+++ b/languages/pascal/app_templates/fpcgtk/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( fpcgtk.tar.gz ALL
   COMMAND tar zcf fpcgtk.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    main.pp app.kdevelop
+    main.pp app.tdevelop
 )
 
 
diff --git a/languages/pascal/app_templates/fpcgtk/Makefile.am b/languages/pascal/app_templates/fpcgtk/Makefile.am
index 252cbf27..5c4c116f 100644
--- a/languages/pascal/app_templates/fpcgtk/Makefile.am
+++ b/languages/pascal/app_templates/fpcgtk/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.pp app.kdevelop
+dataFiles = main.pp app.tdevelop
 templateName = fpcgtk
 
 ### no need to change below:
diff --git a/languages/pascal/app_templates/fpcgtk/app.kdevelop b/languages/pascal/app_templates/fpcgtk/app.kdevelop
index 995d340b..e7b3a147 100644
--- a/languages/pascal/app_templates/fpcgtk/app.kdevelop
+++ b/languages/pascal/app_templates/fpcgtk/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -83,4 +83,4 @@
    <type ext="dpr"/>
   </useglobaltypes>
  </kdevfilecreate>
-</kdevelop>
+</tdevelop>
diff --git a/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate b/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate
index 56696aa1..45bb7eea 100644
--- a/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate
+++ b/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate
@@ -64,13 +64,13 @@ Archive=fpcgtk.tar.gz
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir1]
 Type=mkdir
diff --git a/languages/pascal/app_templates/fpchello/CMakeLists.txt b/languages/pascal/app_templates/fpchello/CMakeLists.txt
index f51b2517..12941440 100644
--- a/languages/pascal/app_templates/fpchello/CMakeLists.txt
+++ b/languages/pascal/app_templates/fpchello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( fpchello.tar.gz ALL
   COMMAND tar zcf fpchello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    main.pp app.kdevelop
+    main.pp app.tdevelop
 )
 
 
diff --git a/languages/pascal/app_templates/fpchello/Makefile.am b/languages/pascal/app_templates/fpchello/Makefile.am
index e09141dc..744bc214 100644
--- a/languages/pascal/app_templates/fpchello/Makefile.am
+++ b/languages/pascal/app_templates/fpchello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.pp app.kdevelop
+dataFiles = main.pp app.tdevelop
 templateName = fpchello
 
 ### no need to change below:
diff --git a/languages/pascal/app_templates/fpchello/app.kdevelop b/languages/pascal/app_templates/fpchello/app.kdevelop
index f0a07582..a2f83092 100644
--- a/languages/pascal/app_templates/fpchello/app.kdevelop
+++ b/languages/pascal/app_templates/fpchello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -83,4 +83,4 @@
    <type ext="dpr"/>
   </useglobaltypes>
  </kdevfilecreate>
-</kdevelop>
+</tdevelop>
diff --git a/languages/pascal/app_templates/fpchello/fpchello.kdevtemplate b/languages/pascal/app_templates/fpchello/fpchello.kdevtemplate
index 44fa8bc1..65c46115 100644
--- a/languages/pascal/app_templates/fpchello/fpchello.kdevtemplate
+++ b/languages/pascal/app_templates/fpchello/fpchello.kdevtemplate
@@ -65,13 +65,13 @@ Archive=fpchello.tar.gz
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir1]
 Type=mkdir
diff --git a/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt b/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt
index de4923f3..52a5e4f7 100644
--- a/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt
+++ b/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( fpcsharedlib.tar.gz ALL
   COMMAND tar zcf fpcsharedlib.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    main.pp app.kdevelop
+    main.pp app.tdevelop
 )
 
 
diff --git a/languages/pascal/app_templates/fpcsharedlib/Makefile.am b/languages/pascal/app_templates/fpcsharedlib/Makefile.am
index 6a7f1a85..d1d0eef4 100644
--- a/languages/pascal/app_templates/fpcsharedlib/Makefile.am
+++ b/languages/pascal/app_templates/fpcsharedlib/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.pp app.kdevelop
+dataFiles = main.pp app.tdevelop
 templateName = fpcsharedlib
 
 ### no need to change below:
diff --git a/languages/pascal/app_templates/fpcsharedlib/app.kdevelop b/languages/pascal/app_templates/fpcsharedlib/app.kdevelop
index bdf974e9..8249e017 100644
--- a/languages/pascal/app_templates/fpcsharedlib/app.kdevelop
+++ b/languages/pascal/app_templates/fpcsharedlib/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>

-<kdevelop>

+<tdevelop>

  <general>

   <author>%{AUTHOR}</author>

   <email>%{EMAIL}</email>

@@ -83,4 +83,4 @@
    <type ext="dpr"/>

   </useglobaltypes>

  </kdevfilecreate>

-</kdevelop>

+</tdevelop>

diff --git a/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate b/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate
index 3e4eb4fe..35835599 100644
--- a/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate
+++ b/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate
@@ -65,13 +65,13 @@ Archive=fpcsharedlib.tar.gz
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir1]
 Type=mkdir
diff --git a/languages/pascal/app_templates/pascalhello/CMakeLists.txt b/languages/pascal/app_templates/pascalhello/CMakeLists.txt
index 0c130705..3422a8ff 100644
--- a/languages/pascal/app_templates/pascalhello/CMakeLists.txt
+++ b/languages/pascal/app_templates/pascalhello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( pascalhello.tar.gz ALL
   COMMAND tar zcf pascalhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    main.pp app.kdevelop
+    main.pp app.tdevelop
 )
 
 
diff --git a/languages/pascal/app_templates/pascalhello/Makefile.am b/languages/pascal/app_templates/pascalhello/Makefile.am
index 02924e72..3e72435c 100644
--- a/languages/pascal/app_templates/pascalhello/Makefile.am
+++ b/languages/pascal/app_templates/pascalhello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.pp app.kdevelop
+dataFiles = main.pp app.tdevelop
 templateName = pascalhello
 
 ### no need to change below:
diff --git a/languages/pascal/app_templates/pascalhello/app.kdevelop b/languages/pascal/app_templates/pascalhello/app.kdevelop
index fcb75f33..51e8c65e 100644
--- a/languages/pascal/app_templates/pascalhello/app.kdevelop
+++ b/languages/pascal/app_templates/pascalhello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -80,4 +80,4 @@
    <type ext="dpr"/>
   </useglobaltypes>
  </kdevfilecreate>
-</kdevelop>
+</tdevelop>
diff --git a/languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate b/languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate
index 13c9df69..ed7104cb 100644
--- a/languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate
+++ b/languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate
@@ -67,13 +67,13 @@ Archive=pascalhello.tar.gz
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir1]
 Type=mkdir
diff --git a/languages/pascal/backgroundparser.cpp b/languages/pascal/backgroundparser.cpp
index be9a1909..d29fd1be 100644
--- a/languages/pascal/backgroundparser.cpp
+++ b/languages/pascal/backgroundparser.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2002 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                 *
+ *   roberto@tdevelop.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/pascal/backgroundparser.h b/languages/pascal/backgroundparser.h
index 170b3073..6fd8a71e 100644
--- a/languages/pascal/backgroundparser.h
+++ b/languages/pascal/backgroundparser.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2002 by Roberto Raggi                                   *
- *   roberto@kdevelop.org                                                 *
+ *   roberto@tdevelop.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/pascal/compiler/dccoptions/Makefile.am b/languages/pascal/compiler/dccoptions/Makefile.am
index 61dd304c..7665da4d 100644
--- a/languages/pascal/compiler/dccoptions/Makefile.am
+++ b/languages/pascal/compiler/dccoptions/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras
 
 kde_module_LTLIBRARIES = libkdevdccoptions.la
 libkdevdccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
-libkdevdccoptions_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \
+libkdevdccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_KHTML)
 
 libkdevdccoptions_la_SOURCES = dccoptionsplugin.cpp optiontabs.cpp
diff --git a/languages/pascal/compiler/fpcoptions/Makefile.am b/languages/pascal/compiler/fpcoptions/Makefile.am
index 2868bd01..3837ab58 100644
--- a/languages/pascal/compiler/fpcoptions/Makefile.am
+++ b/languages/pascal/compiler/fpcoptions/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras
 
 kde_module_LTLIBRARIES = libkdevfpcoptions.la
 libkdevfpcoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
-libkdevfpcoptions_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \
+libkdevfpcoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_KHTML)
 
 libkdevfpcoptions_la_SOURCES = fpcoptionsplugin.cpp optiontabs.cpp
diff --git a/languages/pascal/doc/pascal_bugs_fp.toc b/languages/pascal/doc/pascal_bugs_fp.toc
index 60be2ec5..11674d6e 100644
--- a/languages/pascal/doc/pascal_bugs_fp.toc
+++ b/languages/pascal/doc/pascal_bugs_fp.toc
@@ -1,7 +1,7 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>Pascal bugs (fp)</title>
 <base href="http://www.freepascal.org/"/>
 <tocsect1 name="Query" url="bugs.html">
 </tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp
index 9d1a9ac6..cc3c44ce 100644
--- a/languages/pascal/problemreporter.cpp
+++ b/languages/pascal/problemreporter.cpp
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2002 by Roberto Raggi <roberto@kdevelop.org>
+   Copyright (C) 2002 by Roberto Raggi <roberto@tdevelop.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -23,7 +23,7 @@
 #include "configproblemreporter.h"
 #include "backgroundparser.h"
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kparts/part.h>
 #include <ktexteditor/editinterface.h>
 #include <ktexteditor/document.h>
diff --git a/languages/pascal/problemreporter.h b/languages/pascal/problemreporter.h
index 82bbdb1e..83e9e569 100644
--- a/languages/pascal/problemreporter.h
+++ b/languages/pascal/problemreporter.h
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2002 by Roberto Raggi <roberto@kdevelop.org>
+   Copyright (C) 2002 by Roberto Raggi <roberto@tdevelop.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/languages/perl/CMakeLists.txt b/languages/perl/CMakeLists.txt
index 6a1f8945..d8c68f75 100644
--- a/languages/perl/CMakeLists.txt
+++ b/languages/perl/CMakeLists.txt
@@ -40,7 +40,7 @@ tde_add_kpart( libkdevperlsupport AUTOMOC
   SOURCES
     perlparser.cpp perlsupportpart.cpp
     perlconfigwidget.cpp perlconfigwidgetbase.ui
-  LINK kdevelop-shared
+  LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/languages/perl/Makefile.am b/languages/perl/Makefile.am
index 2354c124..c0fa3598 100644
--- a/languages/perl/Makefile.am
+++ b/languages/perl/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS = app_templates file_templates doc
 
 kde_module_LTLIBRARIES = libkdevperlsupport.la kio_perldoc.la
 libkdevperlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevperlsupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la
+libkdevperlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
 libkdevperlsupport_la_SOURCES = perlparser.cpp perlsupportpart.cpp perlconfigwidget.cpp perlconfigwidgetbase.ui
 
diff --git a/languages/perl/README.dox b/languages/perl/README.dox
index 09d1f0f0..fc637af6 100644
--- a/languages/perl/README.dox
+++ b/languages/perl/README.dox
@@ -6,7 +6,7 @@ over several lines. You can even use some html commands in these lines like:
 <code>This is code</code>, html links <a href="http://somelocation">link text</a>,
 and images.
 
-\authors <a href="mailto:bernd AT kdevelop.org">Bernd Gehrmann</a>
+\authors <a href="mailto:bernd AT tdevelop.org">Bernd Gehrmann</a>
 \authors <a href="mailto:willems.luc AT pandora.be">Luc Willems</a>
 
 \maintainer <a href="mailto:willems.luc AT pandora.be">Luc Willems</a>
diff --git a/languages/perl/app_templates/CMakeLists.txt b/languages/perl/app_templates/CMakeLists.txt
index 427b980f..158505c2 100644
--- a/languages/perl/app_templates/CMakeLists.txt
+++ b/languages/perl/app_templates/CMakeLists.txt
@@ -13,4 +13,4 @@ add_subdirectory( perlhello )
 
 install( FILES
     perl.appwizard
-  DESTINATION ${DATA_INSTALL_DIR}/kdevelop/profiles/IDE/ScriptingLanguageIDE/PerlIDE )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/ScriptingLanguageIDE/PerlIDE )
diff --git a/languages/perl/app_templates/Makefile.am b/languages/perl/app_templates/Makefile.am
index c284be59..4157405d 100644
--- a/languages/perl/app_templates/Makefile.am
+++ b/languages/perl/app_templates/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = perlhello
-profilesdir = $(kde_datadir)/kdevelop/profiles/IDE/ScriptingLanguageIDE/PerlIDE
+profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/ScriptingLanguageIDE/PerlIDE
 profiles_DATA = perl.appwizard
diff --git a/languages/perl/app_templates/perlhello/CMakeLists.txt b/languages/perl/app_templates/perlhello/CMakeLists.txt
index 820fda1e..bf51d851 100644
--- a/languages/perl/app_templates/perlhello/CMakeLists.txt
+++ b/languages/perl/app_templates/perlhello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( perlhello.tar.gz ALL
   COMMAND tar zcf perlhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.pl app.kdevelop
+    app.pl app.tdevelop
 )
 
 
diff --git a/languages/perl/app_templates/perlhello/Makefile.am b/languages/perl/app_templates/perlhello/Makefile.am
index 1c1d7b33..b483b35b 100644
--- a/languages/perl/app_templates/perlhello/Makefile.am
+++ b/languages/perl/app_templates/perlhello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.pl app.kdevelop 
+dataFiles = app.pl app.tdevelop 
 templateName = perlhello
 
 ### no need to change below:
diff --git a/languages/perl/app_templates/perlhello/app.kdevelop b/languages/perl/app_templates/perlhello/app.kdevelop
index c781322d..a83391b7 100644
--- a/languages/perl/app_templates/perlhello/app.kdevelop
+++ b/languages/perl/app_templates/perlhello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -74,4 +74,4 @@
       <type ext="pm" />
     </useglobaltypes>
  </kdevfilecreate>
-</kdevelop>
+</tdevelop>
diff --git a/languages/perl/app_templates/perlhello/perlhello.kdevtemplate b/languages/perl/app_templates/perlhello/perlhello.kdevtemplate
index ead7b5b8..8ec5a560 100644
--- a/languages/perl/app_templates/perlhello/perlhello.kdevtemplate
+++ b/languages/perl/app_templates/perlhello/perlhello.kdevtemplate
@@ -67,8 +67,8 @@ Archive=perlhello.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/perl/doc/perl.toc b/languages/perl/doc/perl.toc
index 05bab529..108cb6ae 100644
--- a/languages/perl/doc/perl.toc
+++ b/languages/perl/doc/perl.toc
@@ -1,5 +1,5 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>Perl</title>
 <tocsect1 name="Data structures" url="man:perldata"/>
 <tocsect1 name="Syntax" url="man:perlsyn"/>
@@ -50,5 +50,5 @@
 <tocsect1 name="Calling conventions from C" url="man:perlcall"/>
 <tocsect1 name="API listing" url="man:perlapi"/>
 <tocsect1 name="Internal functions" url="man:perlintern"/>
-</kdeveloptoc>
+</tdeveloptoc>
 
diff --git a/languages/perl/doc/perl_bugs.toc b/languages/perl/doc/perl_bugs.toc
index 126b35f3..e936c504 100644
--- a/languages/perl/doc/perl_bugs.toc
+++ b/languages/perl/doc/perl_bugs.toc
@@ -1,7 +1,7 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>Perl bugs</title>
 <base href="http://www.nntp.perl.org/"/>
 <tocsect1 name="Query" url="group">
 </tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/perl/perlconfigwidget.cpp b/languages/perl/perlconfigwidget.cpp
index e41def0c..d09d9793 100644
--- a/languages/perl/perlconfigwidget.cpp
+++ b/languages/perl/perlconfigwidget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2002 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/perl/perlconfigwidget.h b/languages/perl/perlconfigwidget.h
index 0f863ad0..5c380a93 100644
--- a/languages/perl/perlconfigwidget.h
+++ b/languages/perl/perlconfigwidget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2002 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/perl/perldoc.cpp b/languages/perl/perldoc.cpp
index cc0a03f9..51a8f774 100644
--- a/languages/perl/perldoc.cpp
+++ b/languages/perl/perldoc.cpp
@@ -11,7 +11,7 @@
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <kprocess.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kglobal.h>
 
 using namespace KIO;
@@ -117,7 +117,7 @@ extern "C" {
     int kdemain(int argc, char **argv)
     {
         KInstance instance( "kio_perldoc" );
-        KGlobal::locale()->setMainCatalogue("kdevelop");
+        KGlobal::locale()->setMainCatalogue("tdevelop");
 
         if (argc != 4) {
             fprintf(stderr, "Usage: kio_perldoc protocol domain-socket1 domain-socket2\n");
diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp
index be725f28..8cf62ca9 100644
--- a/languages/perl/perlsupportpart.cpp
+++ b/languages/perl/perlsupportpart.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2001-2002 by Bernd Gehrmann                             *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/perl/perlsupportpart.h b/languages/perl/perlsupportpart.h
index 7de6c95f..259c5a35 100644
--- a/languages/perl/perlsupportpart.h
+++ b/languages/perl/perlsupportpart.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2001-2002 by Bernd Gehrmann                             *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/php/CMakeLists.txt b/languages/php/CMakeLists.txt
index 27003401..3a9e4123 100644
--- a/languages/php/CMakeLists.txt
+++ b/languages/php/CMakeLists.txt
@@ -46,6 +46,6 @@ tde_add_kpart( libkdevphpsupport AUTOMOC
     phperrorview.cpp phpconfigdata.cpp phpcodecompletion.cpp
     phpparser.cpp phpnewclassdlgbase.ui phpnewclassdlg.cpp
     phpfile.cpp
-  LINK kdevwidgets-shared kdevelop-shared
+  LINK kdevwidgets-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/php/Makefile.am b/languages/php/Makefile.am
index ac053aaf..2938d11d 100644
--- a/languages/php/Makefile.am
+++ b/languages/php/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS = data app_templates file_templates doc
 
 kde_module_LTLIBRARIES = libkdevphpsupport.la
 libkdevphpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevphpsupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML)
+libkdevphpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML)
 
 libkdevphpsupport_la_SOURCES = phpsupportpart.cpp phpconfigwidgetbase.ui phpconfigwidget.cpp phpinfodlg.ui phphtmlview.cpp phperrorview.cpp phpconfigdata.cpp phpcodecompletion.cpp phpparser.cpp phpnewclassdlgbase.ui phpnewclassdlg.cpp phpfile.cpp
 
diff --git a/languages/php/README.dox b/languages/php/README.dox
index 57d1b1b8..4db52ea9 100644
--- a/languages/php/README.dox
+++ b/languages/php/README.dox
@@ -7,16 +7,16 @@ develop php script for web or php script for shell.
 It's support checking of your script with problems report and also parse
 all include files from your script.
 
-\authors <a href="mailto:smeier AT kdevelop.org">Sandy Meier</a>
+\authors <a href="mailto:smeier AT tdevelop.org">Sandy Meier</a>
 \authors <a href="mailto:n.escuder AT intra-links.com">Escuder Nicolas</a>
 
-\maintainer <a href="mailto:smeier AT kdevelop.org">Sandy Meier</a>
+\maintainer <a href="mailto:smeier AT tdevelop.org">Sandy Meier</a>
 \maintainer <a href="mailto:n.escuder AT intra-links.com">Escuder Nicolas</a>
 
 \feature PHP language support
 \feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
-\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=kdevelop&component=php+support&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">php support component at Bugzilla database</a>
+\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=php+support&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">php support component at Bugzilla database</a>
 
 \requirement PHP Cli Version or WebServer with php
 
diff --git a/languages/php/app_templates/CMakeLists.txt b/languages/php/app_templates/CMakeLists.txt
index 2d9a1d86..3283f151 100644
--- a/languages/php/app_templates/CMakeLists.txt
+++ b/languages/php/app_templates/CMakeLists.txt
@@ -13,4 +13,4 @@ add_subdirectory( phphello )
 
 install( FILES
     php.appwizard
-  DESTINATION ${DATA_INSTALL_DIR}/kdevelop/profiles/IDE/ScriptingLanguageIDE/PHPIDE )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/ScriptingLanguageIDE/PHPIDE )
diff --git a/languages/php/app_templates/Makefile.am b/languages/php/app_templates/Makefile.am
index 12fdee76..fdfd110d 100644
--- a/languages/php/app_templates/Makefile.am
+++ b/languages/php/app_templates/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = phphello
-profilesdir = $(kde_datadir)/kdevelop/profiles/IDE/ScriptingLanguageIDE/PHPIDE
+profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/ScriptingLanguageIDE/PHPIDE
 profiles_DATA = php.appwizard
diff --git a/languages/php/app_templates/phphello/CMakeLists.txt b/languages/php/app_templates/phphello/CMakeLists.txt
index ae644c70..4e534e08 100644
--- a/languages/php/app_templates/phphello/CMakeLists.txt
+++ b/languages/php/app_templates/phphello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( phphello.tar.gz ALL
   COMMAND tar zcf phphello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.php app.kdevelop
+    app.php app.tdevelop
 )
 
 
diff --git a/languages/php/app_templates/phphello/Makefile.am b/languages/php/app_templates/phphello/Makefile.am
index 12d29f1b..bc983960 100644
--- a/languages/php/app_templates/phphello/Makefile.am
+++ b/languages/php/app_templates/phphello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.php app.kdevelop
+dataFiles = app.php app.tdevelop
 templateName = phphello
 
 ### no need to change below:
diff --git a/languages/php/app_templates/phphello/app.kdevelop b/languages/php/app_templates/phphello/app.kdevelop
index c8844e1e..2cdb1c70 100644
--- a/languages/php/app_templates/phphello/app.kdevelop
+++ b/languages/php/app_templates/phphello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -84,4 +84,4 @@
       <group pattern="*.inc" name="Include files" />
     </groups>
   </kdevfileview>
-</kdevelop>
+</tdevelop>
diff --git a/languages/php/app_templates/phphello/phphello b/languages/php/app_templates/phphello/phphello
index f9f1a69f..7ba99d9c 100644
--- a/languages/php/app_templates/phphello/phphello
+++ b/languages/php/app_templates/phphello/phphello
@@ -12,8 +12,8 @@ Archive=phphello.tar.gz
 
 [PROJECT]
 Type=install
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [APP.PHP]
 Type=install
diff --git a/languages/php/app_templates/phphello/phphello.kdevtemplate b/languages/php/app_templates/phphello/phphello.kdevtemplate
index 8d52f490..481f2748 100644
--- a/languages/php/app_templates/phphello/phphello.kdevtemplate
+++ b/languages/php/app_templates/phphello/phphello.kdevtemplate
@@ -67,8 +67,8 @@ Archive=phphello.tar.gz
 [PROJECT]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [APP.PHP]
 Type=install
diff --git a/languages/php/doc/php.toc b/languages/php/doc/php.toc
index b665d5c7..1c3e6db3 100644
--- a/languages/php/doc/php.toc
+++ b/languages/php/doc/php.toc
@@ -1,5 +1,5 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>PHP Manual</title>
 <base href="http://www.php.net/manual/en/"/>
 <tocsect1 name="PHP Manual" url="manual.php">
@@ -7066,4 +7066,4 @@
 <entry name="counter_get_meta" url="internals2.counter.function.counter-get-meta.php"/>
 <entry name="counter_get_named" url="internals2.counter.function.counter-get-named.php"/>
 </index>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/php/doc/php_bugs.toc b/languages/php/doc/php_bugs.toc
index 48c180a6..d8f5c265 100644
--- a/languages/php/doc/php_bugs.toc
+++ b/languages/php/doc/php_bugs.toc
@@ -1,7 +1,7 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>PHP bugs</title>
 <base href="http://bugs.php.net/"/>
 <tocsect1 name="Query" url="index.html">
 </tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp
index c8af6b94..60c9877b 100644
--- a/languages/php/phpcodecompletion.cpp
+++ b/languages/php/phpcodecompletion.cpp
@@ -1,6 +1,6 @@
 /*
    Copyright (C) 2005 by Nicolas Escuder <n.escuder@intra-links.com>
-   Copyright (C) 2001 by smeier@kdevelop.org
+   Copyright (C) 2001 by smeier@tdevelop.org
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/languages/php/phpcodecompletion.h b/languages/php/phpcodecompletion.h
index b036beb7..dfee50c0 100644
--- a/languages/php/phpcodecompletion.h
+++ b/languages/php/phpcodecompletion.h
@@ -1,6 +1,6 @@
 /*
    Copyright (C) 2005 by Nicolas Escuder <n.escuder@intra-links.com>
-   Copyright (C) 2001 by smeier@kdevelop.org
+   Copyright (C) 2001 by smeier@tdevelop.org
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/languages/php/phpconfigdata.cpp b/languages/php/phpconfigdata.cpp
index 00baec12..b710f264 100644
--- a/languages/php/phpconfigdata.cpp
+++ b/languages/php/phpconfigdata.cpp
@@ -1,6 +1,6 @@
 /*
    Copyright (C) 2005 by Nicolas Escuder <n.escuder@intra-links.com>
-   Copyright (C) 2001 by smeier@kdevelop.org
+   Copyright (C) 2001 by smeier@tdevelop.org
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/languages/php/phpconfigdata.h b/languages/php/phpconfigdata.h
index d43661e1..e5727ead 100644
--- a/languages/php/phpconfigdata.h
+++ b/languages/php/phpconfigdata.h
@@ -1,6 +1,6 @@
 /*
    Copyright (C) 2005 by Nicolas Escuder <n.escuder@intra-links.com>
-   Copyright (C) 2001 by smeier@kdevelop.org
+   Copyright (C) 2001 by smeier@tdevelop.org
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp
index 658812f7..11e3066f 100644
--- a/languages/php/phperrorview.cpp
+++ b/languages/php/phperrorview.cpp
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2002 by Roberto Raggi <roberto@kdevelop.org>
+   Copyright (C) 2002 by Roberto Raggi <roberto@tdevelop.org>
    Copyright (C) 2005 by Nicolas Escuder <n.escuder@intra-links.com>
 
    This library is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
 #include <kdevmainwindow.h>
 #include <kdevproject.h>
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kparts/part.h>
 #include <ktexteditor/editinterface.h>
 #include <ktexteditor/document.h>
diff --git a/languages/php/phperrorview.h b/languages/php/phperrorview.h
index 447506d0..70e373de 100644
--- a/languages/php/phperrorview.h
+++ b/languages/php/phperrorview.h
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2002 by Roberto Raggi <roberto@kdevelop.org>
+   Copyright (C) 2002 by Roberto Raggi <roberto@tdevelop.org>
    Copyright (C) 2005 by Nicolas Escuder <n.escuder@intra-links.com>
 
    This library is free software; you can redistribute it and/or
diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp
index 282e6c01..314dfcf6 100644
--- a/languages/php/phpnewclassdlg.cpp
+++ b/languages/php/phpnewclassdlg.cpp
@@ -3,7 +3,7 @@
                              -------------------
     begin                : Sat Aug 11 2001
     copyright            : (C) 2001 by Sandy Meier
-    email                : smeier@kdevelop.org
+    email                : smeier@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/php/phpnewclassdlg.h b/languages/php/phpnewclassdlg.h
index 23f11577..57086be5 100644
--- a/languages/php/phpnewclassdlg.h
+++ b/languages/php/phpnewclassdlg.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : Sat Aug 11 2001
     copyright            : (C) 2001 by Sandy Meier
-    email                : smeier@kdevelop.org
+    email                : smeier@tdevelop.org
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/php/phpsupport_event.h b/languages/php/phpsupport_event.h
index 28713efb..17d935a9 100644
--- a/languages/php/phpsupport_event.h
+++ b/languages/php/phpsupport_event.h
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2003 by Roberto Raggi <roberto@kdevelop.org>
+   Copyright (C) 2003 by Roberto Raggi <roberto@tdevelop.org>
    Copyright (C) 2005 by Nicolas Escuder <n.escuder@intra-links.com>
 
    This library is free software; you can redistribute it and/or
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index d31bc933..52c9f109 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -1,6 +1,6 @@
 /*
    Copyright (C) 2005 by Nicolas Escuder <n.escuder@intra-links.com>
-   Copyright (C) 2001 by smeier@kdevelop.org
+   Copyright (C) 2001 by smeier@tdevelop.org
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h
index 2d3f74a0..b234e6dc 100644
--- a/languages/php/phpsupportpart.h
+++ b/languages/php/phpsupportpart.h
@@ -1,6 +1,6 @@
 /*
    Copyright (C) 2005 by Nicolas Escuder <n.escuder@intra-links.com>
-   Copyright (C) 2001 by smeier@kdevelop.org
+   Copyright (C) 2001 by smeier@tdevelop.org
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/languages/python/Makefile.am b/languages/python/Makefile.am
index ddebc35d..bd2e8813 100644
--- a/languages/python/Makefile.am
+++ b/languages/python/Makefile.am
@@ -10,7 +10,7 @@ SUBDIRS = app_templates file_templates doc
 kde_module_LTLIBRARIES = libkdevpythonsupport.la kio_pydoc.la
 
 libkdevpythonsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevpythonsupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \
+libkdevpythonsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la
 libkdevpythonsupport_la_SOURCES = pythonsupportpart.cpp pythonconfigwidget.cpp pythonconfigwidgetbase.ui \
 	pythonimplementationwidget.cpp qtdesignerpythonintegration.cpp
diff --git a/languages/python/README.dox b/languages/python/README.dox
index e581f9e1..339976a3 100644
--- a/languages/python/README.dox
+++ b/languages/python/README.dox
@@ -6,7 +6,7 @@ over several lines. You can even use some html commands in these lines like:
 <code>This is code</code>, html links <a href="http://somelocation">link text</a>,
 and images.
 
-\authors <a href="mailto:bernd AT kdevelop.org">Bernd Gehrmann</a>
+\authors <a href="mailto:bernd AT tdevelop.org">Bernd Gehrmann</a>
 
 \maintainer <a href="mailto:$EMAIL$">$AUTHOR$</a>
 \maintainer <a href="mailto:2nd maintainer AT provider.com">2nd maintainer full name</a>
diff --git a/languages/python/app_templates/CMakeLists.txt b/languages/python/app_templates/CMakeLists.txt
index 26cceb47..b31829e6 100644
--- a/languages/python/app_templates/CMakeLists.txt
+++ b/languages/python/app_templates/CMakeLists.txt
@@ -15,4 +15,4 @@ add_subdirectory( pyqt )
 
 install( FILES
     python.appwizard
-  DESTINATION ${DATA_INSTALL_DIR}/kdevelop/profiles/IDE/ScriptingLanguageIDE/PythonIDE )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/ScriptingLanguageIDE/PythonIDE )
diff --git a/languages/python/app_templates/Makefile.am b/languages/python/app_templates/Makefile.am
index 1ca030e1..ebc46b87 100644
--- a/languages/python/app_templates/Makefile.am
+++ b/languages/python/app_templates/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = pythonhello pytk pyqt
-profilesdir = $(kde_datadir)/kdevelop/profiles/IDE/ScriptingLanguageIDE/PythonIDE
+profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/ScriptingLanguageIDE/PythonIDE
 profiles_DATA = python.appwizard
diff --git a/languages/python/app_templates/pyqt/CMakeLists.txt b/languages/python/app_templates/pyqt/CMakeLists.txt
index 131e2165..672d6652 100644
--- a/languages/python/app_templates/pyqt/CMakeLists.txt
+++ b/languages/python/app_templates/pyqt/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( pyqt.tar.gz ALL
   COMMAND tar zcf pyqt.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.py app.kdevelop fileopen.pyxpm fileprint.pyxpm
+    app.py app.tdevelop fileopen.pyxpm fileprint.pyxpm
     filesave.pyxpm app-Makefile.am app-autogen.sh
     app-configure.ac documentdetails.ui missing install-sh
     mkinstalldirs pyqt-am-preproc.py templates-ui-dialog
diff --git a/languages/python/app_templates/pyqt/Makefile.am b/languages/python/app_templates/pyqt/Makefile.am
index ea9502cc..dc12ca69 100644
--- a/languages/python/app_templates/pyqt/Makefile.am
+++ b/languages/python/app_templates/pyqt/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.py app.kdevelop fileopen.pyxpm fileprint.pyxpm  \
+dataFiles = app.py app.tdevelop fileopen.pyxpm fileprint.pyxpm  \
 	filesave.pyxpm app-Makefile.am app-autogen.sh app-configure.ac \
 	documentdetails.ui missing install-sh mkinstalldirs \
 	pyqt-am-preproc.py templates-ui-dialog templates-ui-mainwin \
diff --git a/languages/python/app_templates/pyqt/app.kdevelop b/languages/python/app_templates/pyqt/app.kdevelop
index a8fb1726..2abb394e 100644
--- a/languages/python/app_templates/pyqt/app.kdevelop
+++ b/languages/python/app_templates/pyqt/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -78,4 +78,4 @@
       <type ext="ui"/>
     </useglobaltypes>
   </kdevfilecreate>  
-</kdevelop>
+</tdevelop>
diff --git a/languages/python/app_templates/pyqt/pyqt-am-preproc.py b/languages/python/app_templates/pyqt/pyqt-am-preproc.py
index dda5e2c3..ff7b5a16 100644
--- a/languages/python/app_templates/pyqt/pyqt-am-preproc.py
+++ b/languages/python/app_templates/pyqt/pyqt-am-preproc.py
@@ -38,7 +38,7 @@ mf = f.readlines()
 f.close()
 
 # parse for variables
-re_variable = re.compile("^(#kdevelop:[ \t]*)?([A-Za-z][A-Za-z0-9_]*)[ \t]*:?=[ \t]*(.*)$")
+re_variable = re.compile("^(#tdevelop:[ \t]*)?([A-Za-z][A-Za-z0-9_]*)[ \t]*:?=[ \t]*(.*)$")
 variables = {}
 
 
diff --git a/languages/python/app_templates/pyqt/pyqt.kdevtemplate b/languages/python/app_templates/pyqt/pyqt.kdevtemplate
index bffbcd8c..f19e263c 100644
--- a/languages/python/app_templates/pyqt/pyqt.kdevtemplate
+++ b/languages/python/app_templates/pyqt/pyqt.kdevtemplate
@@ -66,13 +66,13 @@ Archive=pyqt.tar.gz
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/python/app_templates/pythonhello/CMakeLists.txt b/languages/python/app_templates/pythonhello/CMakeLists.txt
index 84dfc7b0..dfdbbc3b 100644
--- a/languages/python/app_templates/pythonhello/CMakeLists.txt
+++ b/languages/python/app_templates/pythonhello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( pythonhello.tar.gz ALL
   COMMAND tar zcf pythonhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.py app.kdevelop pythonhello.png
+    app.py app.tdevelop pythonhello.png
 )
 
 
diff --git a/languages/python/app_templates/pythonhello/Makefile.am b/languages/python/app_templates/pythonhello/Makefile.am
index 3d66b1a7..2dc4f559 100644
--- a/languages/python/app_templates/pythonhello/Makefile.am
+++ b/languages/python/app_templates/pythonhello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.py app.kdevelop pythonhello.png
+dataFiles = app.py app.tdevelop pythonhello.png
 templateName = pythonhello
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/python/app_templates/pythonhello/app.kdevelop b/languages/python/app_templates/pythonhello/app.kdevelop
index 2c494d6a..9826d145 100644
--- a/languages/python/app_templates/pythonhello/app.kdevelop
+++ b/languages/python/app_templates/pythonhello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -81,4 +81,4 @@
       <type ext="py"/>
     </useglobaltypes>
   </kdevfilecreate>
-</kdevelop>
+</tdevelop>
diff --git a/languages/python/app_templates/pythonhello/pythonhello.kdevtemplate b/languages/python/app_templates/pythonhello/pythonhello.kdevtemplate
index 6d52cf8a..0e130571 100644
--- a/languages/python/app_templates/pythonhello/pythonhello.kdevtemplate
+++ b/languages/python/app_templates/pythonhello/pythonhello.kdevtemplate
@@ -66,8 +66,8 @@ Archive=pythonhello.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/python/app_templates/pytk/CMakeLists.txt b/languages/python/app_templates/pytk/CMakeLists.txt
index ad5572b7..1a28ddad 100644
--- a/languages/python/app_templates/pytk/CMakeLists.txt
+++ b/languages/python/app_templates/pytk/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( pytk.tar.gz ALL
   COMMAND tar zcf pytk.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.py app.kdevelop pytk.png
+    app.py app.tdevelop pytk.png
 )
 
 
diff --git a/languages/python/app_templates/pytk/Makefile.am b/languages/python/app_templates/pytk/Makefile.am
index 0639ee15..d1ebe715 100644
--- a/languages/python/app_templates/pytk/Makefile.am
+++ b/languages/python/app_templates/pytk/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.py app.kdevelop pytk.png
+dataFiles = app.py app.tdevelop pytk.png
 templateName = pytk
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/python/app_templates/pytk/app.kdevelop b/languages/python/app_templates/pytk/app.kdevelop
index 044ea0b7..1482b842 100644
--- a/languages/python/app_templates/pytk/app.kdevelop
+++ b/languages/python/app_templates/pytk/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -79,4 +79,4 @@
       <type ext="py"/>
     </useglobaltypes>
   </kdevfilecreate>
-</kdevelop>
+</tdevelop>
diff --git a/languages/python/app_templates/pytk/pytk.kdevtemplate b/languages/python/app_templates/pytk/pytk.kdevtemplate
index 3756df01..3b8ac6bc 100644
--- a/languages/python/app_templates/pytk/pytk.kdevtemplate
+++ b/languages/python/app_templates/pytk/pytk.kdevtemplate
@@ -66,8 +66,8 @@ Archive=pytk.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/python/doc/python.toc b/languages/python/doc/python.toc
index 08f3b21d..342e213c 100644
--- a/languages/python/doc/python.toc
+++ b/languages/python/doc/python.toc
@@ -1,5 +1,5 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>Python</title>
 <base href="http://docs.python.org"/>
 <tocsect1 name="Tutorial" url="tut/tut.html">
@@ -1567,5 +1567,5 @@
 <entry name="xor, bit-wise" url="ref/bitwise.html#l2h-317"/>
 <entry name="xor, ZeroDivisionError exception" url="ref/binary.html#l2h-309"/>
 </index>
-</kdeveloptoc>
+</tdeveloptoc>
 
diff --git a/languages/python/doc/python_bugs.toc b/languages/python/doc/python_bugs.toc
index 0b2a5196..136804a5 100644
--- a/languages/python/doc/python_bugs.toc
+++ b/languages/python/doc/python_bugs.toc
@@ -1,7 +1,7 @@
-<!DOCTYPE kdeveloptoc>

-<kdeveloptoc>

+<!DOCTYPE tdeveloptoc>

+<tdeveloptoc>

 <title>Python bugs</title>

 <base href="http://sourceforge.net/"/>

 <tocsect1 name="Query" url="tracker/?group_id=5470&amp;atid=105470">

 </tocsect1>

-</kdeveloptoc>

+</tdeveloptoc>

diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp
index 4b70e170..afe3ce74 100644
--- a/languages/python/pydoc.cpp
+++ b/languages/python/pydoc.cpp
@@ -9,7 +9,7 @@
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <kprocess.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kglobal.h>
 #include <klocale.h>
 
@@ -97,7 +97,7 @@ extern "C" {
     int kdemain(int argc, char **argv)
     {
         KInstance instance( "kio_pydoc" );
-        KGlobal::locale()->setMainCatalogue("kdevelop");
+        KGlobal::locale()->setMainCatalogue("tdevelop");
 
         if (argc != 4) {
             fprintf(stderr, "Usage: kio_pydoc protocol domain-socket1 domain-socket2\n");
diff --git a/languages/python/pythonconfigwidget.cpp b/languages/python/pythonconfigwidget.cpp
index 29103705..09fc00ac 100644
--- a/languages/python/pythonconfigwidget.cpp
+++ b/languages/python/pythonconfigwidget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2002 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/python/pythonconfigwidget.h b/languages/python/pythonconfigwidget.h
index 37427c7a..5cfd8505 100644
--- a/languages/python/pythonconfigwidget.h
+++ b/languages/python/pythonconfigwidget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2002 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/python/pythonimplementationwidget.cpp b/languages/python/pythonimplementationwidget.cpp
index 9aba5441..94835226 100644
--- a/languages/python/pythonimplementationwidget.cpp
+++ b/languages/python/pythonimplementationwidget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2005 by Alexander Dymo                                  *
- *   adymo@kdevelop.org                                                    *
+ *   adymo@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/python/pythonimplementationwidget.h b/languages/python/pythonimplementationwidget.h
index 12db23cd..b20c098c 100644
--- a/languages/python/pythonimplementationwidget.h
+++ b/languages/python/pythonimplementationwidget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2005 by Alexander Dymo                                  *
- *   adymo@kdevelop.org                                                    *
+ *   adymo@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
index f7014bb6..39e635b3 100644
--- a/languages/python/pythonsupportpart.cpp
+++ b/languages/python/pythonsupportpart.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2001-2002 by Bernd Gehrmann                             *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/python/pythonsupportpart.h b/languages/python/pythonsupportpart.h
index e9e65bfa..ed569f50 100644
--- a/languages/python/pythonsupportpart.h
+++ b/languages/python/pythonsupportpart.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2001-2002 by Bernd Gehrmann                             *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/python/qtdesignerpythonintegration.cpp b/languages/python/qtdesignerpythonintegration.cpp
index 267da965..d9503339 100644
--- a/languages/python/qtdesignerpythonintegration.cpp
+++ b/languages/python/qtdesignerpythonintegration.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2005 by Alexander Dymo                                  *
- *   adymo@kdevelop.org                                                    *
+ *   adymo@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/python/qtdesignerpythonintegration.h b/languages/python/qtdesignerpythonintegration.h
index 63759d23..f9d9606b 100644
--- a/languages/python/qtdesignerpythonintegration.h
+++ b/languages/python/qtdesignerpythonintegration.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2005 by Alexander Dymo                                  *
- *   adymo@kdevelop.org                                                    *
+ *   adymo@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/ruby/Makefile.am b/languages/ruby/Makefile.am
index 1b5fb83b..e0a3612b 100644
--- a/languages/ruby/Makefile.am
+++ b/languages/ruby/Makefile.am
@@ -9,7 +9,7 @@ SUBDIRS = app_templates file_templates doc debugger
 
 kde_module_LTLIBRARIES = libkdevrubysupport.la
 libkdevrubysupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevrubysupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \
+libkdevrubysupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(top_builddir)/lib/util/libkdevutil.la
 
 libkdevrubysupport_la_SOURCES = rubysupport_part.cpp rubyconfigwidgetbase.ui \
diff --git a/languages/ruby/README b/languages/ruby/README
index 731741e1..7df3c4b5 100644
--- a/languages/ruby/README
+++ b/languages/ruby/README
@@ -1,3 +1,3 @@
 Please read the on-line, automaticaly updated KDevelop API documentation at:
-http://www.kdevelop.org
+http://www.tdevelop.org
 or read the README.dox file.
diff --git a/languages/ruby/app_templates/CMakeLists.txt b/languages/ruby/app_templates/CMakeLists.txt
index 9e07d2c5..1f8c054a 100644
--- a/languages/ruby/app_templates/CMakeLists.txt
+++ b/languages/ruby/app_templates/CMakeLists.txt
@@ -20,4 +20,4 @@ add_subdirectory( qtruby4app )
 
 install( FILES
     ruby.appwizard
-  DESTINATION ${DATA_INSTALL_DIR}/kdevelop/profiles/IDE/ScriptingLanguageIDE/RubyIDE )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/ScriptingLanguageIDE/RubyIDE )
diff --git a/languages/ruby/app_templates/Makefile.am b/languages/ruby/app_templates/Makefile.am
index 52239564..3150485b 100644
--- a/languages/ruby/app_templates/Makefile.am
+++ b/languages/ruby/app_templates/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = rubyhello qtruby qtrubyapp dcopservice kapp kxt rails qtruby4app
-profilesdir = $(kde_datadir)/kdevelop/profiles/IDE/ScriptingLanguageIDE/RubyIDE
+profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/ScriptingLanguageIDE/RubyIDE
 profiles_DATA = ruby.appwizard
diff --git a/languages/ruby/app_templates/dcopservice/CMakeLists.txt b/languages/ruby/app_templates/dcopservice/CMakeLists.txt
index 3e6b459b..f673e72c 100644
--- a/languages/ruby/app_templates/dcopservice/CMakeLists.txt
+++ b/languages/ruby/app_templates/dcopservice/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( dcopserviceruby.tar.gz ALL
   COMMAND tar zcf dcopserviceruby.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     dcopservice.desktop app.cpp app-configure.in.in
-    src-Makefile.am main.rb dcopservice.rb dcopservice.kdevelop
+    src-Makefile.am main.rb dcopservice.rb dcopservice.tdevelop
     subdirs
 )
 
diff --git a/languages/ruby/app_templates/dcopservice/Makefile.am b/languages/ruby/app_templates/dcopservice/Makefile.am
index 441e9ceb..a7193d6a 100644
--- a/languages/ruby/app_templates/dcopservice/Makefile.am
+++ b/languages/ruby/app_templates/dcopservice/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = dcopservice.desktop app.cpp app-configure.in.in \
-	src-Makefile.am main.rb dcopservice.rb dcopservice.kdevelop \
+	src-Makefile.am main.rb dcopservice.rb dcopservice.tdevelop \
 	subdirs
 templateName = dcopserviceruby
 
diff --git a/languages/ruby/app_templates/dcopservice/dcopservice.kdevelop b/languages/ruby/app_templates/dcopservice/dcopservice.kdevelop
index f4e274da..0d4d45e3 100644
--- a/languages/ruby/app_templates/dcopservice/dcopservice.kdevelop
+++ b/languages/ruby/app_templates/dcopservice/dcopservice.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -88,4 +88,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate b/languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate
index adf9c172..9873b1f1 100644
--- a/languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate
+++ b/languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate
@@ -66,11 +66,11 @@ Archive=dcopserviceruby.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -82,25 +82,25 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/dcopservice.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/dcopservice.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir3]
 Type=mkdir
@@ -108,7 +108,7 @@ Dir=%{dest}/src
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [MkDir4]
@@ -117,17 +117,17 @@ Dir=%{dest}/po
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE9]
diff --git a/languages/ruby/app_templates/dcopservice/main.rb b/languages/ruby/app_templates/dcopservice/main.rb
index 3122b087..9b5f6406 100644
--- a/languages/ruby/app_templates/dcopservice/main.rb
+++ b/languages/ruby/app_templates/dcopservice/main.rb
@@ -5,7 +5,7 @@ description = I18N_NOOP("A KDE DCOP Application")
 version = "0.1"
 options = []
 
-KDE::Locale.mainCatalogue = "kdelibs"
+KDE::Locale.mainCatalogue = "tdelibs"
 aboutdata = KDE::AboutData.new("%{APPNAMELC}", I18N_NOOP("KDE"),
                                 version, description,
                                 KDE::AboutData.License_GPL, "(C) %{YEAR}, %{AUTHOR}")
diff --git a/languages/ruby/app_templates/kapp/CMakeLists.txt b/languages/ruby/app_templates/kapp/CMakeLists.txt
index 41c2de16..6817278b 100644
--- a/languages/ruby/app_templates/kapp/CMakeLists.txt
+++ b/languages/ruby/app_templates/kapp/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( kappruby.tar.gz ALL
   COMMAND tar zcf kappruby.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     app_client.rb appiface.rb app.rb appview.rb main.rb pref.rb
-    app.cpp appui.rc app.desktop app.kdevelop app-Makefile.am
+    app.cpp appui.rc app.desktop app.tdevelop app-Makefile.am
     app-configure.in.in src-Makefile.am subdirs README
 )
 
diff --git a/languages/ruby/app_templates/kapp/Makefile.am b/languages/ruby/app_templates/kapp/Makefile.am
index 20cf1f3f..9dbc37b5 100644
--- a/languages/ruby/app_templates/kapp/Makefile.am
+++ b/languages/ruby/app_templates/kapp/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = app_client.rb appiface.rb app.rb appview.rb main.rb pref.rb app.cpp  \
-			appui.rc app.desktop app.kdevelop app-Makefile.am app-configure.in.in \
+			appui.rc app.desktop app.tdevelop app-Makefile.am app-configure.in.in \
 			src-Makefile.am subdirs README
 
 templateName = kappruby
diff --git a/languages/ruby/app_templates/kapp/app.kdevelop b/languages/ruby/app_templates/kapp/app.kdevelop
index 3a1efdd9..5c57b8fb 100644
--- a/languages/ruby/app_templates/kapp/app.kdevelop
+++ b/languages/ruby/app_templates/kapp/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
 	<general>
 		<author>%{AUTHOR}</author>
 		<email>%{EMAIL}</email>
@@ -87,4 +87,4 @@
 			<mainprogram>src/main.rb</mainprogram>
 		</run>
 	</kdevrubysupport>
-</kdevelop>
+</tdevelop>
diff --git a/languages/ruby/app_templates/kapp/kappruby.kdevtemplate b/languages/ruby/app_templates/kapp/kappruby.kdevtemplate
index 490d7591..d0fc3f88 100644
--- a/languages/ruby/app_templates/kapp/kappruby.kdevtemplate
+++ b/languages/ruby/app_templates/kapp/kappruby.kdevtemplate
@@ -64,11 +64,11 @@ Archive=kappruby.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -80,34 +80,34 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE7]
@@ -121,23 +121,23 @@ Dir=%{dest}/src
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.desktop
+Source=%{tdevelop}/template-common/kde-app.desktop
 Dest=%{dest}/src/%{APPNAMELC}.desktop
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [FILE10]
 Type=install
-Source=%{kdevelop}/template-common/hi16-app-app.png
+Source=%{tdevelop}/template-common/hi16-app-app.png
 Dest=%{dest}/src/hi16-app-%{APPNAMELC}.png
 Process=false
 
 [FILE11]
 Type=install
-Source=%{kdevelop}/template-common/hi32-app-app.png
+Source=%{tdevelop}/template-common/hi32-app-app.png
 Dest=%{dest}/src/hi32-app-%{APPNAMELC}.png
 Process=false
 
@@ -147,7 +147,7 @@ Dir=%{dest}/po
 
 [FILE12]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE13]
diff --git a/languages/ruby/app_templates/kxt/CMakeLists.txt b/languages/ruby/app_templates/kxt/CMakeLists.txt
index 2543047d..539cfdb6 100644
--- a/languages/ruby/app_templates/kxt/CMakeLists.txt
+++ b/languages/ruby/app_templates/kxt/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( kxtruby.tar.gz ALL
   COMMAND tar zcf kxtruby.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     app.rb main.rb prefs.rb app.cpp appview.rb appview_base.ui
-    prefs-base.ui appui.rc app.desktop kxtruby.png app.kdevelop
+    prefs-base.ui appui.rc app.desktop kxtruby.png app.tdevelop
     app-Makefile.am app-configure.in.in app.kcfg settings.kcfgc
     src-Makefile.am subdirs README
 )
diff --git a/languages/ruby/app_templates/kxt/Makefile.am b/languages/ruby/app_templates/kxt/Makefile.am
index b642b88b..2ea8cf5b 100644
--- a/languages/ruby/app_templates/kxt/Makefile.am
+++ b/languages/ruby/app_templates/kxt/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = app.rb main.rb prefs.rb app.cpp appview.rb appview_base.ui prefs-base.ui \
-			appui.rc app.desktop kxtruby.png app.kdevelop \
+			appui.rc app.desktop kxtruby.png app.tdevelop \
 			app-Makefile.am app-configure.in.in \
 			app.kcfg settings.kcfgc src-Makefile.am subdirs README
 
diff --git a/languages/ruby/app_templates/kxt/README b/languages/ruby/app_templates/kxt/README
index 490ddab8..0e9ea0a3 100644
--- a/languages/ruby/app_templates/kxt/README
+++ b/languages/ruby/app_templates/kxt/README
@@ -10,8 +10,8 @@ this application template, a KConfig XT Ruby template.
 -- REQUIREMENTS --
 you need 
 - Qt version might be 3.3.4 or 3.3.5.
-- kdelibs 3.5 and kdelibs headers 3.5 (devel package) in order to build this template.
-- Korundum either from your distribution or from the kdebindings module or also
+- tdelibs 3.5 and tdelibs headers 3.5 (devel package) in order to build this template.
+- Korundum either from your distribution or from the tdebindings module or also
 from
 http://rubyforge.org/projects/korundum/.
 
diff --git a/languages/ruby/app_templates/kxt/app.kdevelop b/languages/ruby/app_templates/kxt/app.kdevelop
index 3a1efdd9..5c57b8fb 100644
--- a/languages/ruby/app_templates/kxt/app.kdevelop
+++ b/languages/ruby/app_templates/kxt/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
 	<general>
 		<author>%{AUTHOR}</author>
 		<email>%{EMAIL}</email>
@@ -87,4 +87,4 @@
 			<mainprogram>src/main.rb</mainprogram>
 		</run>
 	</kdevrubysupport>
-</kdevelop>
+</tdevelop>
diff --git a/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate b/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate
index fd2a5c1a..841f56e0 100644
--- a/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate
+++ b/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate
@@ -67,11 +67,11 @@ Archive=kxtruby.tar.gz
 
 [ADMIN]
 Type=include
-File=%{kdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{kdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
@@ -83,34 +83,34 @@ Dir=%{dest}/doc/en
 
 [FILE1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 
 [FILE2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE5]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.am
+Source=%{tdevelop}/template-common/kde-Makefile.am
 Dest=%{dest}/Makefile.am
 
 [FILE6]
 Type=install
-Source=%{kdevelop}/template-common/kde-Makefile.cvs
+Source=%{tdevelop}/template-common/kde-Makefile.cvs
 Dest=%{dest}/Makefile.cvs
 
 [FILE7]
@@ -124,23 +124,23 @@ Dir=%{dest}/src
 
 [FILE8]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.desktop
+Source=%{tdevelop}/template-common/kde-app.desktop
 Dest=%{dest}/src/%{APPNAMELC}.desktop
 
 [FILE9]
 Type=install
-Source=%{kdevelop}/template-common/kde-app.lsm
+Source=%{tdevelop}/template-common/kde-app.lsm
 Dest=%{dest}/src/%{APPNAMELC}.lsm
 
 [FILE10]
 Type=install
-Source=%{kdevelop}/template-common/hi16-app-app.png
+Source=%{tdevelop}/template-common/hi16-app-app.png
 Dest=%{dest}/src/hi16-app-%{APPNAMELC}.png
 Process=false
 
 [FILE11]
 Type=install
-Source=%{kdevelop}/template-common/hi32-app-app.png
+Source=%{tdevelop}/template-common/hi32-app-app.png
 Dest=%{dest}/src/hi32-app-%{APPNAMELC}.png
 Process=false
 
@@ -150,7 +150,7 @@ Dir=%{dest}/po
 
 [FILE12]
 Type=install
-Source=%{kdevelop}/template-common/kde-po-Makefile.am
+Source=%{tdevelop}/template-common/kde-po-Makefile.am
 Dest=%{dest}/po/Makefile.am
 
 [FILE13]
diff --git a/languages/ruby/app_templates/qtruby/CMakeLists.txt b/languages/ruby/app_templates/qtruby/CMakeLists.txt
index 476f6c65..beac7f1f 100644
--- a/languages/ruby/app_templates/qtruby/CMakeLists.txt
+++ b/languages/ruby/app_templates/qtruby/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( qtruby.tar.gz ALL
   COMMAND tar zcf qtruby.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.rb app.kdevelop app-Makefile app.filelist README
+    app.rb app.tdevelop app-Makefile app.filelist README
 )
 
 
diff --git a/languages/ruby/app_templates/qtruby/Makefile.am b/languages/ruby/app_templates/qtruby/Makefile.am
index 68b7bd82..919a69f5 100644
--- a/languages/ruby/app_templates/qtruby/Makefile.am
+++ b/languages/ruby/app_templates/qtruby/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.rb app.kdevelop app-Makefile app.filelist README
+dataFiles = app.rb app.tdevelop app-Makefile app.filelist README
 templateName = qtruby
 
 ### no need to change below:
diff --git a/languages/ruby/app_templates/qtruby/README b/languages/ruby/app_templates/qtruby/README
index 34e85c43..27ca26c2 100644
--- a/languages/ruby/app_templates/qtruby/README
+++ b/languages/ruby/app_templates/qtruby/README
@@ -10,10 +10,10 @@ this application template, a simple QtRuby Hello world template.
 -- REQUIREMENTS --
 you need 
 - Qt version might be 3.3.4 or 3.3.5.
-- kdelibs 3.5 and kdelibs headers 3.5 (devel package) in order to build this template.
-- qtruby either from your distribution or from the kdebindings module or also from
+- tdelibs 3.5 and tdelibs headers 3.5 (devel package) in order to build this template.
+- qtruby either from your distribution or from the tdebindings module or also from
 http://rubyforge.org/projects/korundum/.
-If you use the kdebindings module you need to build kdebindings/smoke/qt and then kdebindings/qtruby.
+If you use the tdebindings module you need to build tdebindings/smoke/qt and then tdebindings/qtruby.
 
 -----------------------------------------------
 
diff --git a/languages/ruby/app_templates/qtruby/app.kdevelop b/languages/ruby/app_templates/qtruby/app.kdevelop
index ec464627..3b59130c 100644
--- a/languages/ruby/app_templates/qtruby/app.kdevelop
+++ b/languages/ruby/app_templates/qtruby/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
 	<general>
 		<author>%{AUTHOR}</author>
 		<email>%{EMAIL}</email>
@@ -82,4 +82,4 @@
 			<terminal>false</terminal>
 		</run>
 	</kdevrubysupport>
-</kdevelop>
+</tdevelop>
diff --git a/languages/ruby/app_templates/qtruby/qtruby.kdevtemplate b/languages/ruby/app_templates/qtruby/qtruby.kdevtemplate
index 6e7328ac..da8500dc 100644
--- a/languages/ruby/app_templates/qtruby/qtruby.kdevtemplate
+++ b/languages/ruby/app_templates/qtruby/qtruby.kdevtemplate
@@ -58,8 +58,8 @@ Archive=qtruby.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
@@ -74,7 +74,7 @@ Dest=%{dest}/Makefile
 [FILE4]
 Type=install
 Source=%{src}/app.filelist
-Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist
+Dest=%{dest}/%{APPNAMELC}.tdevelop.filelist
 
 [FILE5]
 Type=install
diff --git a/languages/ruby/app_templates/qtruby4app/CMakeLists.txt b/languages/ruby/app_templates/qtruby4app/CMakeLists.txt
index 8408f69a..e5045380 100644
--- a/languages/ruby/app_templates/qtruby4app/CMakeLists.txt
+++ b/languages/ruby/app_templates/qtruby4app/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( qtruby4app.tar.gz ALL
   COMMAND tar zcf qtruby4app.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    main.rb qtruby4app.rb qtruby4app.png qtruby4app.kdevelop
+    main.rb qtruby4app.rb qtruby4app.png qtruby4app.tdevelop
     application.qrc ReadMe filesave.xpm fileopen.xpm
     filenew.xpm editcopy.xpm editpaste.xpm editcut.xpm
     app-Makefile app.filelist
diff --git a/languages/ruby/app_templates/qtruby4app/Makefile.am b/languages/ruby/app_templates/qtruby4app/Makefile.am
index 2bdc1ef9..8f4adecd 100644
--- a/languages/ruby/app_templates/qtruby4app/Makefile.am
+++ b/languages/ruby/app_templates/qtruby4app/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles =  main.rb qtruby4app.rb qtruby4app.png qtruby4app.kdevelop \
+dataFiles =  main.rb qtruby4app.rb qtruby4app.png qtruby4app.tdevelop \
 	application.qrc ReadMe filesave.xpm fileopen.xpm filenew.xpm \
 	editcopy.xpm editpaste.xpm editcut.xpm app-Makefile app.filelist
 
diff --git a/languages/ruby/app_templates/qtruby4app/qrc_application.rb b/languages/ruby/app_templates/qtruby4app/qrc_application.rb
index b2bd7673..861ea1e0 100644
--- a/languages/ruby/app_templates/qtruby4app/qrc_application.rb
+++ b/languages/ruby/app_templates/qtruby4app/qrc_application.rb
@@ -21,7 +21,7 @@ class QCleanupResources__dest_class__
 	end
 
 @@qt_resource_data = [
-  # /home/rdale/src/kde/branches/KDE/3.5/kdevelop/languages/ruby/app_templates/qtruby4makeapp/fileopen.xpm
+  # /home/rdale/src/kde/branches/KDE/3.5/tdevelop/languages/ruby/app_templates/qtruby4makeapp/fileopen.xpm
   0x0,0x0,0x18,0xf9,
   0x2f,
   0x2a,0x20,0x58,0x50,0x4d,0x20,0x2a,0x2f,0xa,0x73,0x74,0x61,0x74,0x69,0x63,0x20,
@@ -424,7 +424,7 @@ class QCleanupResources__dest_class__
   0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,
   0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,
   0x58,0x59,0x58,0x22,0xa,0x7d,0x3b,0xa,
-    # /home/rdale/src/kde/branches/KDE/3.5/kdevelop/languages/ruby/app_templates/qtruby4makeapp/filesave.xpm
+    # /home/rdale/src/kde/branches/KDE/3.5/tdevelop/languages/ruby/app_templates/qtruby4makeapp/filesave.xpm
   0x0,0x0,0x18,0xf9,
   0x2f,
   0x2a,0x20,0x58,0x50,0x4d,0x20,0x2a,0x2f,0xa,0x73,0x74,0x61,0x74,0x69,0x63,0x20,
@@ -827,7 +827,7 @@ class QCleanupResources__dest_class__
   0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,
   0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,
   0x58,0x59,0x58,0x22,0xa,0x7d,0x3b,0xa,
-    # /home/rdale/src/kde/branches/KDE/3.5/kdevelop/languages/ruby/app_templates/qtruby4makeapp/editcopy.xpm
+    # /home/rdale/src/kde/branches/KDE/3.5/tdevelop/languages/ruby/app_templates/qtruby4makeapp/editcopy.xpm
   0x0,0x0,0x12,0x99,
   0x2f,
   0x2a,0x20,0x58,0x50,0x4d,0x20,0x2a,0x2f,0xa,0x73,0x74,0x61,0x74,0x69,0x63,0x20,
@@ -1128,7 +1128,7 @@ class QCleanupResources__dest_class__
   0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,
   0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,
   0x2e,0x44,0x2e,0x22,0xa,0x7d,0x3b,0xa,
-    # /home/rdale/src/kde/branches/KDE/3.5/kdevelop/languages/ruby/app_templates/qtruby4makeapp/filenew.xpm
+    # /home/rdale/src/kde/branches/KDE/3.5/tdevelop/languages/ruby/app_templates/qtruby4makeapp/filenew.xpm
   0x0,0x0,0x14,0x9,
   0x2f,
   0x2a,0x20,0x58,0x50,0x4d,0x20,0x2a,0x2f,0xa,0x73,0x74,0x61,0x74,0x69,0x63,0x20,
@@ -1452,7 +1452,7 @@ class QCleanupResources__dest_class__
   0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,
   0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,
   0x2e,0x60,0x2e,0x22,0xa,0x7d,0x3b,0xa,
-    # /home/rdale/src/kde/branches/KDE/3.5/kdevelop/languages/ruby/app_templates/qtruby4makeapp/editpaste.xpm
+    # /home/rdale/src/kde/branches/KDE/3.5/tdevelop/languages/ruby/app_templates/qtruby4makeapp/editpaste.xpm
   0x0,0x0,0x18,0xf8,
   0x2f,
   0x2a,0x20,0x58,0x50,0x4d,0x20,0x2a,0x2f,0xa,0x73,0x74,0x61,0x74,0x69,0x63,0x20,
@@ -1855,7 +1855,7 @@ class QCleanupResources__dest_class__
   0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59,0x58,
   0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,
   0x59,0x58,0x22,0xa,0x7d,0x3b,0xa,
-    # /home/rdale/src/kde/branches/KDE/3.5/kdevelop/languages/ruby/app_templates/qtruby4makeapp/editcut.xpm
+    # /home/rdale/src/kde/branches/KDE/3.5/tdevelop/languages/ruby/app_templates/qtruby4makeapp/editcut.xpm
   0x0,0x0,0x16,0x47,
   0x2f,
   0x2a,0x20,0x58,0x50,0x4d,0x20,0x2a,0x2f,0xa,0x73,0x74,0x61,0x74,0x69,0x63,0x20,
diff --git a/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevelop b/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevelop
index 4afe7bca..3df7f3ab 100644
--- a/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevelop
+++ b/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -80,4 +80,4 @@
 			<mainprogram>./main.rb</mainprogram>
 		</run>
 	</kdevrubysupport>
-</kdevelop>
+</tdevelop>
diff --git a/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate b/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate
index bd778450..70df2248 100644
--- a/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate
+++ b/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate
@@ -49,8 +49,8 @@ Archive=qtruby4app.tar.gz
 
 [FILE1]
 Type=install
-Source=%{src}/qtruby4app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/qtruby4app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
@@ -110,7 +110,7 @@ Dest=%{dest}/ReadMe
 [FILE13]
 Type=install
 Source=%{src}/app.filelist
-Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist
+Dest=%{dest}/%{APPNAMELC}.tdevelop.filelist
 
 [MSG]
 Type=message
diff --git a/languages/ruby/app_templates/qtrubyapp/CMakeLists.txt b/languages/ruby/app_templates/qtrubyapp/CMakeLists.txt
index 299ac911..37f6e5b1 100644
--- a/languages/ruby/app_templates/qtrubyapp/CMakeLists.txt
+++ b/languages/ruby/app_templates/qtrubyapp/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( qtrubyapp.tar.gz ALL
   COMMAND tar zcf qtrubyapp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    main.rb qtrubyapp.rb qtrubyapp.png qtrubyapp.kdevelop
+    main.rb qtrubyapp.rb qtrubyapp.png qtrubyapp.tdevelop
     filesave.xpm fileopen.xpm fileprint.xpm app.filelist
     app-Makefile README
 )
diff --git a/languages/ruby/app_templates/qtrubyapp/Makefile.am b/languages/ruby/app_templates/qtrubyapp/Makefile.am
index 7fc1c803..7777b886 100644
--- a/languages/ruby/app_templates/qtrubyapp/Makefile.am
+++ b/languages/ruby/app_templates/qtrubyapp/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.rb qtrubyapp.rb qtrubyapp.png qtrubyapp.kdevelop \
+dataFiles = main.rb qtrubyapp.rb qtrubyapp.png qtrubyapp.tdevelop \
 	filesave.xpm fileopen.xpm fileprint.xpm app.filelist app-Makefile README
 
 templateName = qtrubyapp
diff --git a/languages/ruby/app_templates/qtrubyapp/README b/languages/ruby/app_templates/qtrubyapp/README
index 9468893b..f0524746 100644
--- a/languages/ruby/app_templates/qtrubyapp/README
+++ b/languages/ruby/app_templates/qtrubyapp/README
@@ -10,10 +10,10 @@ this application template.
 -- REQUIREMENTS --
 you need 
 - Qt version might be 3.3.4 or 3.3.5.
-- kdelibs 3.5 and kdelibs headers 3.5 (devel package) in order to build this template.
-- qtruby either from your distribution or from the kdebindings module or also from
+- tdelibs 3.5 and tdelibs headers 3.5 (devel package) in order to build this template.
+- qtruby either from your distribution or from the tdebindings module or also from
 http://rubyforge.org/projects/korundum/.
-If you use the kdebindings module you need to build kdebindings/smoke/qt and then kdebindings/qtruby.
+If you use the tdebindings module you need to build tdebindings/smoke/qt and then tdebindings/qtruby.
 
 -----------------------------------------------
 
diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevelop b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevelop
index 4afe7bca..3df7f3ab 100644
--- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevelop
+++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -80,4 +80,4 @@
 			<mainprogram>./main.rb</mainprogram>
 		</run>
 	</kdevrubysupport>
-</kdevelop>
+</tdevelop>
diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate
index 5fd82925..3e2c896a 100644
--- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate
+++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate
@@ -65,8 +65,8 @@ Archive=qtrubyapp.tar.gz
 
 [FILE1]
 Type=install
-Source=%{src}/qtrubyapp.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/qtrubyapp.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
@@ -101,7 +101,7 @@ Dest=%{dest}/Makefile
 [FILE8]
 Type=install
 Source=%{src}/app.filelist
-Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist
+Dest=%{dest}/%{APPNAMELC}.tdevelop.filelist
 
 [FILE9]
 Type=install
diff --git a/languages/ruby/app_templates/rails/CMakeLists.txt b/languages/ruby/app_templates/rails/CMakeLists.txt
index 75948f30..6f53dd0d 100644
--- a/languages/ruby/app_templates/rails/CMakeLists.txt
+++ b/languages/ruby/app_templates/rails/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( rails.tar.gz ALL
   COMMAND tar zcf rails.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.kdevelop
+    app.tdevelop
 )
 
 
diff --git a/languages/ruby/app_templates/rails/Makefile.am b/languages/ruby/app_templates/rails/Makefile.am
index 49d77bdd..9d89a708 100644
--- a/languages/ruby/app_templates/rails/Makefile.am
+++ b/languages/ruby/app_templates/rails/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.kdevelop
+dataFiles = app.tdevelop
 templateName= rails
 
 ### no need to change below:
diff --git a/languages/ruby/app_templates/rails/app.kdevelop b/languages/ruby/app_templates/rails/app.kdevelop
index c02c2057..17a0e6a1 100644
--- a/languages/ruby/app_templates/rails/app.kdevelop
+++ b/languages/ruby/app_templates/rails/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -104,4 +104,4 @@
 			<mainprogram>script/server</mainprogram>
 		</run>
 	</kdevrubysupport>
-</kdevelop>
+</tdevelop>
diff --git a/languages/ruby/app_templates/rails/rails.kdevtemplate b/languages/ruby/app_templates/rails/rails.kdevtemplate
index e377e1c4..5ed2d78d 100644
--- a/languages/ruby/app_templates/rails/rails.kdevtemplate
+++ b/languages/ruby/app_templates/rails/rails.kdevtemplate
@@ -39,8 +39,8 @@ Archive=rails.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MSG]
 Type=message
diff --git a/languages/ruby/app_templates/rubyhello/CMakeLists.txt b/languages/ruby/app_templates/rubyhello/CMakeLists.txt
index 3aeb22f1..74da59e4 100644
--- a/languages/ruby/app_templates/rubyhello/CMakeLists.txt
+++ b/languages/ruby/app_templates/rubyhello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( rubyhello.tar.gz ALL
   COMMAND tar zcf rubyhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.rb app.kdevelop
+    app.rb app.tdevelop
 )
 
 
diff --git a/languages/ruby/app_templates/rubyhello/Makefile.am b/languages/ruby/app_templates/rubyhello/Makefile.am
index ecb3e535..5d20526e 100644
--- a/languages/ruby/app_templates/rubyhello/Makefile.am
+++ b/languages/ruby/app_templates/rubyhello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.rb app.kdevelop
+dataFiles = app.rb app.tdevelop
 templateName= rubyhello
 
 ### no need to change below:
diff --git a/languages/ruby/app_templates/rubyhello/app.kdevelop b/languages/ruby/app_templates/rubyhello/app.kdevelop
index 2d1d24c5..c938d122 100644
--- a/languages/ruby/app_templates/rubyhello/app.kdevelop
+++ b/languages/ruby/app_templates/rubyhello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -88,4 +88,4 @@
                 </run>
         </kdevrubysupport>
 
-</kdevelop>
+</tdevelop>
diff --git a/languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate b/languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate
index 3612becb..bce79ff9 100644
--- a/languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate
+++ b/languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate
@@ -65,8 +65,8 @@ Archive=rubyhello.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/ruby/debugger/CMakeLists.txt b/languages/ruby/debugger/CMakeLists.txt
index 36655f65..8290afd7 100644
--- a/languages/ruby/debugger/CMakeLists.txt
+++ b/languages/ruby/debugger/CMakeLists.txt
@@ -43,6 +43,6 @@ tde_add_kpart( libkdevrbdebugger AUTOMOC
     breakpoint.cpp variablewidget.cpp rdbbreakpointwidget.cpp
     framestackwidget.cpp dbgpsdlg.cpp dbgtoolbar.cpp
     rdboutputwidget.cpp rdbtable.cpp
-  LINK lang_debugger-shared kdevwidgets-shared kdevelop-shared
+  LINK lang_debugger-shared kdevwidgets-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/ruby/debugger/Makefile.am b/languages/ruby/debugger/Makefile.am
index f4c512c2..aefb6217 100644
--- a/languages/ruby/debugger/Makefile.am
+++ b/languages/ruby/debugger/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/languages/lib/debugger \
 
 kde_module_LTLIBRARIES = libkdevrbdebugger.la
 libkdevrbdebugger_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevrbdebugger_la_LIBADD = $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML) \
+libkdevrbdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML) \
 	$(top_builddir)/languages/lib/debugger/liblang_debugger.la
 
 libkdevrbdebugger_la_SOURCES = debuggerpart.cpp dbgcontroller.cpp rdbcontroller.cpp dbgcommand.cpp rdbcommand.cpp rdbparser.cpp stty.cpp breakpoint.cpp variablewidget.cpp rdbbreakpointwidget.cpp framestackwidget.cpp dbgpsdlg.cpp dbgtoolbar.cpp rdboutputwidget.cpp rdbtable.cpp
diff --git a/languages/ruby/debugger/breakpoint.cpp b/languages/ruby/debugger/breakpoint.cpp
index 972a13a4..9b3ed18d 100644
--- a/languages/ruby/debugger/breakpoint.cpp
+++ b/languages/ruby/debugger/breakpoint.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Tue May 13 2003
     copyright            : (C) 2003 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/debugger/breakpoint.h b/languages/ruby/debugger/breakpoint.h
index 91f1c8db..a184f33b 100644
--- a/languages/ruby/debugger/breakpoint.h
+++ b/languages/ruby/debugger/breakpoint.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Tue May 13 2003
     copyright            : (C) 2003 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/debugger/dbgcommand.cpp b/languages/ruby/debugger/dbgcommand.cpp
index 7d958091..87308152 100644
--- a/languages/ruby/debugger/dbgcommand.cpp
+++ b/languages/ruby/debugger/dbgcommand.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/debugger/dbgcommand.h b/languages/ruby/debugger/dbgcommand.h
index 6cea2afb..ccccc2a3 100644
--- a/languages/ruby/debugger/dbgcommand.h
+++ b/languages/ruby/debugger/dbgcommand.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/debugger/dbgcontroller.cpp b/languages/ruby/debugger/dbgcontroller.cpp
index 7ee560b7..57eb4f5f 100644
--- a/languages/ruby/debugger/dbgcontroller.cpp
+++ b/languages/ruby/debugger/dbgcontroller.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/debugger/dbgcontroller.h b/languages/ruby/debugger/dbgcontroller.h
index b134d213..9f3a79fc 100644
--- a/languages/ruby/debugger/dbgcontroller.h
+++ b/languages/ruby/debugger/dbgcontroller.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp
index be258778..bc02d7aa 100644
--- a/languages/ruby/debugger/dbgpsdlg.cpp
+++ b/languages/ruby/debugger/dbgpsdlg.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Mon Sep 20 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kprocess.h>
 #include <kstdguiitem.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 
 #include <tqframe.h>
 #include <tqlabel.h>
diff --git a/languages/ruby/debugger/dbgpsdlg.h b/languages/ruby/debugger/dbgpsdlg.h
index 5ab9ebe1..b7037ecf 100644
--- a/languages/ruby/debugger/dbgpsdlg.h
+++ b/languages/ruby/debugger/dbgpsdlg.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Mon Sep 20 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp
index 0b96201f..3b13b148 100644
--- a/languages/ruby/debugger/dbgtoolbar.cpp
+++ b/languages/ruby/debugger/dbgtoolbar.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Thu Dec 23 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
@@ -57,7 +57,7 @@
 // So, if you can get it to work as a KToolBar, and it works well when the
 // app is running, then all these classes can be removed.
 
-// This code is very specific to the internal debugger in kdevelop.
+// This code is very specific to the internal debugger in tdevelop.
 
 namespace RDBDebugger
 {
@@ -304,7 +304,7 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part,
     TQPushButton*  bFinish     = new DbgButton(BarIcon("dbgstepout"),    i18n("Step Out"),   this);
     TQPushButton*  bRunTo      = new DbgButton(BarIcon("dbgrunto"),      i18n("Run to Cursor"),   this);
     bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"),    TQString(),      this);
-    bKDevFocus_ = new DbgButton(BarIcon("kdevelop"),      TQString(),      this);
+    bKDevFocus_ = new DbgButton(BarIcon("tdevelop"),      TQString(),      this);
 
   connect(bRun,        TQT_SIGNAL(clicked()), part_,  TQT_SLOT(slotRun()));
   connect(bInterrupt,  TQT_SIGNAL(clicked()), part_,  TQT_SLOT(slotPause()));
@@ -385,7 +385,7 @@ void DbgToolBar::slotKdevFocus()
 {
     // I really want to be able to set the focus on the _application_ being debugged
     // but this is the best compromise I can come up with. All we do is save the
-    // window that had focus when they switch to the kdevelop window. To do this
+    // window that had focus when they switch to the tdevelop window. To do this
     // the toolbar _cannot_ accept focus.
     // If anyone has a way of determining what window the app is _actually_ running on
     // then please fix and send a patch.
diff --git a/languages/ruby/debugger/dbgtoolbar.h b/languages/ruby/debugger/dbgtoolbar.h
index 8143875a..5b3cc649 100644
--- a/languages/ruby/debugger/dbgtoolbar.h
+++ b/languages/ruby/debugger/dbgtoolbar.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Thu Dec 23 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index 4bc0895f..2d6437fe 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -1,8 +1,8 @@
 /***************************************************************************
  *   Copyright (C) 1999-2001 by John Birch                                 *
- *   jbb@kdevelop.org                                                      *
+ *   jbb@tdevelop.org                                                      *
  *   Copyright (C) 2001 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *	                                                                       *
  *                         Adapted for ruby debugging                      *
  *                         --------------------------                      *
diff --git a/languages/ruby/debugger/debuggerpart.h b/languages/ruby/debugger/debuggerpart.h
index f35970fb..61558bb1 100644
--- a/languages/ruby/debugger/debuggerpart.h
+++ b/languages/ruby/debugger/debuggerpart.h
@@ -1,8 +1,8 @@
 /***************************************************************************
  *   Copyright (C) 1999-2001 by John Birch                                 *
- *   jbb@kdevelop.org                                                      *
+ *   jbb@tdevelop.org                                                      *
  *   Copyright (C) 2001 by Bernd Gehrmann                                  *
- *   bernd@kdevelop.org                                                    *
+ *   bernd@tdevelop.org                                                    *
  *	                                                                       *
  *                         Adapted for ruby debugging                      *
  *                         --------------------------                      *
diff --git a/languages/ruby/debugger/framestackwidget.cpp b/languages/ruby/debugger/framestackwidget.cpp
index 1d9b4b2f..72b148b6 100644
--- a/languages/ruby/debugger/framestackwidget.cpp
+++ b/languages/ruby/debugger/framestackwidget.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/debugger/framestackwidget.h b/languages/ruby/debugger/framestackwidget.h
index 37874fdf..a1e797d1 100644
--- a/languages/ruby/debugger/framestackwidget.h
+++ b/languages/ruby/debugger/framestackwidget.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp
index 8607b73e..03d42788 100644
--- a/languages/ruby/debugger/rdbbreakpointwidget.cpp
+++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Tue May 13 2003
     copyright            : (C) 2003 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/debugger/rdbbreakpointwidget.h b/languages/ruby/debugger/rdbbreakpointwidget.h
index b28b31cc..b3f1e4cd 100644
--- a/languages/ruby/debugger/rdbbreakpointwidget.h
+++ b/languages/ruby/debugger/rdbbreakpointwidget.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Tue May 13 2003
     copyright            : (C) 2003 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/debugger/rdbcommand.cpp b/languages/ruby/debugger/rdbcommand.cpp
index bfc630cc..98d91fd8 100644
--- a/languages/ruby/debugger/rdbcommand.cpp
+++ b/languages/ruby/debugger/rdbcommand.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/debugger/rdbcommand.h b/languages/ruby/debugger/rdbcommand.h
index 0d46a5fc..fca69ad6 100644
--- a/languages/ruby/debugger/rdbcommand.h
+++ b/languages/ruby/debugger/rdbcommand.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp
index 5dd15586..d98695af 100644
--- a/languages/ruby/debugger/rdbcontroller.cpp
+++ b/languages/ruby/debugger/rdbcontroller.cpp
@@ -3,7 +3,7 @@
 //                             -------------------
 //    begin                : Sun Aug 8 1999
 //    copyright            : (C) 1999 by John Birch
-//    email                : jbb@kdevelop.org
+//    email                : jbb@tdevelop.org
 //	
 //                          Adapted for ruby debugging
 //                          --------------------------
@@ -58,7 +58,7 @@ using namespace std;
 
 // **************************************************************************
 //
-// Does all the communication between rdb and the kdevelop's debugger code.
+// Does all the communication between rdb and the tdevelop's debugger code.
 // Significatant classes being used here are
 //
 // RDBParser  - parses the "variable" data using the vartree and varitems
diff --git a/languages/ruby/debugger/rdbcontroller.h b/languages/ruby/debugger/rdbcontroller.h
index a5dd90e6..5cc0fc61 100644
--- a/languages/ruby/debugger/rdbcontroller.h
+++ b/languages/ruby/debugger/rdbcontroller.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/debugger/rdboutputwidget.cpp b/languages/ruby/debugger/rdboutputwidget.cpp
index 7c489ed4..ea249fe2 100644
--- a/languages/ruby/debugger/rdboutputwidget.cpp
+++ b/languages/ruby/debugger/rdboutputwidget.cpp
@@ -3,7 +3,7 @@
 //                             -------------------
 //    begin                : 10th April 2003
 //    copyright            : (C) 2003 by John Birch
-//    email                : jbb@kdevelop.org
+//    email                : jbb@tdevelop.org
 //	
 //                          Adapted for ruby debugging
 //                          --------------------------
diff --git a/languages/ruby/debugger/rdboutputwidget.h b/languages/ruby/debugger/rdboutputwidget.h
index efb33536..7655bf19 100644
--- a/languages/ruby/debugger/rdboutputwidget.h
+++ b/languages/ruby/debugger/rdboutputwidget.h
@@ -3,7 +3,7 @@
 //                             -------------------
 //    begin                : 10th April 2003
 //    copyright            : (C) 2003 by John Birch
-//    email                : jbb@kdevelop.org
+//    email                : jbb@tdevelop.org
 //	
 //                          Adapted for ruby debugging
 //                          --------------------------
diff --git a/languages/ruby/debugger/rdbparser.cpp b/languages/ruby/debugger/rdbparser.cpp
index a517c301..532fb0e3 100644
--- a/languages/ruby/debugger/rdbparser.cpp
+++ b/languages/ruby/debugger/rdbparser.cpp
@@ -1,7 +1,7 @@
 // **************************************************************************
 //    begin                : Tue Aug 17 1999
 //    copyright            : (C) 1999 by John Birch
-//    email                : jbb@kdevelop.org
+//    email                : jbb@tdevelop.org
 //	
 //                          Adapted for ruby debugging
 //                          --------------------------
diff --git a/languages/ruby/debugger/rdbparser.h b/languages/ruby/debugger/rdbparser.h
index d57e25d7..3184bfd6 100644
--- a/languages/ruby/debugger/rdbparser.h
+++ b/languages/ruby/debugger/rdbparser.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Tue Aug 17 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp
index 0cdd0eea..6027e9a2 100644
--- a/languages/ruby/debugger/stty.cpp
+++ b/languages/ruby/debugger/stty.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Mon Sep 13 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 
   This code was originally written by Judin Maxim, from the
 	KDEStudio project.
@@ -233,7 +233,7 @@ int STTY::findTTY()
 
     if (ptyfd >= 0) {
         if (needGrantPty && !chownpty(ptyfd, TRUE)) {
-            fprintf(stderr,"kdevelop: chownpty failed for device %s::%s.\n",pty_master,tty_slave);
+            fprintf(stderr,"tdevelop: chownpty failed for device %s::%s.\n",pty_master,tty_slave);
             fprintf(stderr,"        : This means the session can be eavesdroped.\n");
             fprintf(stderr,"        : Make sure konsole_grantpty is installed and setuid root.\n");
         }
@@ -313,7 +313,7 @@ bool STTY::findExternalTTY(const TQString &termApp)
         if ( termApp == "konsole" )
         {
             ::execlp( prog,       prog,
-                  "-caption", i18n("kdevelop: Debug application console").local8Bit().data(),
+                  "-caption", i18n("tdevelop: Debug application console").local8Bit().data(),
                   "-e",       "sh",
                   "-c",       scriptStr,
                   NULL);
diff --git a/languages/ruby/debugger/stty.h b/languages/ruby/debugger/stty.h
index d49e79f8..899db4ff 100644
--- a/languages/ruby/debugger/stty.h
+++ b/languages/ruby/debugger/stty.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Mon Sep 13 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 
   This code was originally written by Judin Maxim, from the
 	KDEStudio project.
diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp
index 0348e8f9..2dd28b31 100644
--- a/languages/ruby/debugger/variablewidget.cpp
+++ b/languages/ruby/debugger/variablewidget.cpp
@@ -1,7 +1,7 @@
 // **************************************************************************
 //    begin                : Sun Aug 8 1999
 //    copyright            : (C) 1999 by John Birch
-//    email                : jbb@kdevelop.org
+//    email                : jbb@tdevelop.org
 //	
 //                          Adapted for ruby debugging
 //                          --------------------------
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <kpopupmenu.h>
 #include <klineedit.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 
 #include <tqheader.h>
 #include <tqlabel.h>
diff --git a/languages/ruby/debugger/variablewidget.h b/languages/ruby/debugger/variablewidget.h
index a54fc42e..60e73218 100644
--- a/languages/ruby/debugger/variablewidget.h
+++ b/languages/ruby/debugger/variablewidget.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     begin                : Sun Aug 8 1999
     copyright            : (C) 1999 by John Birch
-    email                : jbb@kdevelop.org
+    email                : jbb@tdevelop.org
 	
                           Adapted for ruby debugging
                           --------------------------
diff --git a/languages/ruby/doc/qtruby.toc b/languages/ruby/doc/qtruby.toc
index 92bf203e..902a3713 100644
--- a/languages/ruby/doc/qtruby.toc
+++ b/languages/ruby/doc/qtruby.toc
@@ -1,9 +1,9 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>QtRuby and Korundum</title>
 <base href="http://developer.kde.org/language-bindings/ruby/"/>
 <tocsect1 name="Qt Tutorial #1" url="tutorial/tutorial.html"></tocsect1>
 <tocsect1 name="Qt Tutorial #2" url="tutorial2/tutorial2.html"></tocsect1>
 <tocsect1 name="Qt Designer Tutorial" url="colortooltutorial/designer-manual-3.html"></tocsect1>
 <tocsect1 name="KDE 3.0 Tutorial" url="trinitytutorial/index.html"></tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/ruby/doc/rails.toc b/languages/ruby/doc/rails.toc
index 6f92fcd6..d5bfb6bf 100644
--- a/languages/ruby/doc/rails.toc
+++ b/languages/ruby/doc/rails.toc
@@ -1,9 +1,9 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>Rails</title>
 <base href="http://"/>
 <tocsect1 name="Rails Site" url="rubyonrails.org/"></tocsect1>
 <tocsect1 name="Rails API Reference" url="api.rubyonrails.com/"></tocsect1>
 <tocsect1 name="Wiki" url="wiki.rubyonrails.org/"></tocsect1>
 <tocsect1 name="Bug tracker" url="dev.rubyonrails.org/"></tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/ruby/doc/ruby.toc b/languages/ruby/doc/ruby.toc
index bce60158..1924e218 100644
--- a/languages/ruby/doc/ruby.toc
+++ b/languages/ruby/doc/ruby.toc
@@ -1,5 +1,5 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>Ruby</title>
 <base href="http://www.ruby-doc.org/docs/ProgrammingRuby/"/>
 <tocsect1 name="Pickaxe Book" url="">
@@ -1395,5 +1395,5 @@
 <entry name="~ (Regexp)" url="html/ref_c_regexp.html#Regexp._sd"/>
 <entry name="~ (String)" url="html/ref_c_string.html#String._sd"/>
 </index>
-</kdeveloptoc>
+</tdeveloptoc>
 
diff --git a/languages/ruby/doc/ruby_bugs.toc b/languages/ruby/doc/ruby_bugs.toc
index 8e70566d..717a65bf 100644
--- a/languages/ruby/doc/ruby_bugs.toc
+++ b/languages/ruby/doc/ruby_bugs.toc
@@ -1,7 +1,7 @@
-<!DOCTYPE kdeveloptoc>
-<kdeveloptoc>
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
 <title>Ruby bugs</title>
 <base href="http://www.rubyforge.org/"/>
 <tocsect1 name="Query" url="tracker/?atid=1698&amp;group_id=426&amp;func=browse">
 </tocsect1>
-</kdeveloptoc>
+</tdeveloptoc>
diff --git a/languages/ruby/qtdesignerrubyintegration.cpp b/languages/ruby/qtdesignerrubyintegration.cpp
index 4ad11e8e..1b4da06d 100644
--- a/languages/ruby/qtdesignerrubyintegration.cpp
+++ b/languages/ruby/qtdesignerrubyintegration.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2004 by Alexander Dymo                                  *
  *   adymo@mksat.net                                                       *
- *   Portions Copyright (C) 2003 Roberto Raggi (roberto@kdevelop.org)      *
+ *   Portions Copyright (C) 2003 Roberto Raggi (roberto@tdevelop.org)      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/ruby/rubyimplementationwidget.cpp b/languages/ruby/rubyimplementationwidget.cpp
index b1371a24..9b11be96 100644
--- a/languages/ruby/rubyimplementationwidget.cpp
+++ b/languages/ruby/rubyimplementationwidget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2004 by Alexander Dymo                                  *
- *   adymo@kdevelop.org                                                    *
+ *   adymo@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/ruby/rubyimplementationwidget.h b/languages/ruby/rubyimplementationwidget.h
index 48c88679..d9ce3dad 100644
--- a/languages/ruby/rubyimplementationwidget.h
+++ b/languages/ruby/rubyimplementationwidget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2004 by Alexander Dymo                                  *
- *   adymo@kdevelop.org                                                    *
+ *   adymo@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/sql/CMakeLists.txt b/languages/sql/CMakeLists.txt
index 4994f55e..8e7d41cc 100644
--- a/languages/sql/CMakeLists.txt
+++ b/languages/sql/CMakeLists.txt
@@ -40,6 +40,6 @@ tde_add_kpart( libkdevsqlsupport AUTOMOC
   SOURCES
     sqlconfigwidget.ui sqlsupport_part.cpp sqlactions.cpp
     sqloutputwidget.cpp
-  LINK kdevelop-shared
+  LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/sql/Makefile.am b/languages/sql/Makefile.am
index 68cfbdea..ba410a98 100644
--- a/languages/sql/Makefile.am
+++ b/languages/sql/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = app_templates doc
 
 kde_module_LTLIBRARIES = libkdevsqlsupport.la
 libkdevsqlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevsqlsupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la
+libkdevsqlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
 libkdevsqlsupport_la_SOURCES = sqlconfigwidget.ui sqlsupport_part.cpp sqlactions.cpp sqloutputwidget.cpp
 
diff --git a/languages/sql/README.dox b/languages/sql/README.dox
index e44edb43..8642d2b4 100644
--- a/languages/sql/README.dox
+++ b/languages/sql/README.dox
@@ -1,9 +1,9 @@
 /** \class SQLSupportPart
 This is a SQL support plugin
 
-\authors <a href="mailto:harry AT kdevelop.org">Harald Fernengel</a>
+\authors <a href="mailto:harry AT tdevelop.org">Harald Fernengel</a>
 
-\maintainer <a href="mailto:harry AT kdevelop.org">Harald Fernengel</a>
+\maintainer <a href="mailto:harry AT tdevelop.org">Harald Fernengel</a>
 
 \feature SQL language support
 \feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
diff --git a/languages/sql/app_templates/CMakeLists.txt b/languages/sql/app_templates/CMakeLists.txt
index 508308ce..d3f4452c 100644
--- a/languages/sql/app_templates/CMakeLists.txt
+++ b/languages/sql/app_templates/CMakeLists.txt
@@ -13,4 +13,4 @@ add_subdirectory( sqlsimple )
 
 install( FILES
     sql.appwizard
-  DESTINATION ${DATA_INSTALL_DIR}/kdevelop/profiles/IDE/DatabaseIDE )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/DatabaseIDE )
diff --git a/languages/sql/app_templates/Makefile.am b/languages/sql/app_templates/Makefile.am
index 78c56300..44c7ddab 100644
--- a/languages/sql/app_templates/Makefile.am
+++ b/languages/sql/app_templates/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = sqlsimple
-profilesdir = $(kde_datadir)/kdevelop/profiles/IDE/DatabaseIDE
+profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/DatabaseIDE
 profiles_DATA = sql.appwizard
diff --git a/languages/sql/app_templates/sqlsimple/CMakeLists.txt b/languages/sql/app_templates/sqlsimple/CMakeLists.txt
index 3df373a6..05ddb17f 100644
--- a/languages/sql/app_templates/sqlsimple/CMakeLists.txt
+++ b/languages/sql/app_templates/sqlsimple/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( sqlsimple.tar.gz ALL
   COMMAND tar zcf sqlsimple.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.sql app.kdevelop
+    app.sql app.tdevelop
 )
 
 
diff --git a/languages/sql/app_templates/sqlsimple/Makefile.am b/languages/sql/app_templates/sqlsimple/Makefile.am
index f7b5a012..6bfae1c4 100644
--- a/languages/sql/app_templates/sqlsimple/Makefile.am
+++ b/languages/sql/app_templates/sqlsimple/Makefile.am
@@ -1,5 +1,5 @@
 templateName = sqlsimple
-dataFiles = app.sql app.kdevelop
+dataFiles = app.sql app.tdevelop
 
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/sql/app_templates/sqlsimple/app.kdevelop b/languages/sql/app_templates/sqlsimple/app.kdevelop
index 78f055cd..7fc4efc9 100644
--- a/languages/sql/app_templates/sqlsimple/app.kdevelop
+++ b/languages/sql/app_templates/sqlsimple/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<kdevelop>
+<tdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -81,4 +81,4 @@
 			<type ext="sql"/>
     </useglobaltypes>
   </kdevfilecreate>
-</kdevelop>
+</tdevelop>
diff --git a/languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate b/languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate
index e3c100d8..5081e992 100644
--- a/languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate
+++ b/languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate
@@ -65,8 +65,8 @@ Archive=sqlsimple.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
+Source=%{src}/app.tdevelop
+Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp
index cf92721b..b1881811 100644
--- a/languages/sql/sqlactions.cpp
+++ b/languages/sql/sqlactions.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Harald Fernengel                                *
- *   harry@kdevelop.org                                                    *
+ *   harry@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/sql/sqlactions.h b/languages/sql/sqlactions.h
index 840e43db..70a2223d 100644
--- a/languages/sql/sqlactions.h
+++ b/languages/sql/sqlactions.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Harald Fernengel                                *
- *   harry@kdevelop.org                                                    *
+ *   harry@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -12,7 +12,7 @@
 #ifndef _SQLACTION_H_
 #define _SQLACTION_H_
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kxmlguiclient.h>
 #include <kaction.h>
 
diff --git a/languages/sql/sqloutputwidget.cpp b/languages/sql/sqloutputwidget.cpp
index 65f95479..548ba0e8 100644
--- a/languages/sql/sqloutputwidget.cpp
+++ b/languages/sql/sqloutputwidget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Harald Fernengel                                *
- *   harry@kdevelop.org                                                    *
+ *   harry@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/languages/sql/sqloutputwidget.h b/languages/sql/sqloutputwidget.h
index 3c3b6846..197952d1 100644
--- a/languages/sql/sqloutputwidget.h
+++ b/languages/sql/sqloutputwidget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Harald Fernengel                                *
- *   harry@kdevelop.org                                                    *
+ *   harry@tdevelop.org                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *