Additional renaming of kde to tde

249 files changed, 650 insertions, 650 deletions

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