diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4dc4db5..92f2a55e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,7 +175,7 @@ install( FILES
   DESTINATION ${MIME_INSTALL_DIR}/application )
 
 install( PROGRAMS
-    kdevprj2tdevelop
+    kdevprj2kdevelop
   DESTINATION ${BIN_INSTALL_DIR} )
 
 
diff --git a/ChangeLog b/ChangeLog
index 3184e715..7895b404 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -556,7 +556,7 @@
       by vcs/cvsservice plugin only).
 
 2003-11-13 Amilcar Lucas <amilcar@kdevelop.org>
-    * Readded a even cleaner tdevelop.tdevelop file.
+    * Readded a even cleaner tdevelop.kdevelop file.
     PLEASE do _not_ commit changes to this file.
     We have until mid January 2004 to make the necessary code changes that create a more "cvs friendly" file by moving some of the options to the .kdevses file.
     For info on how to do it, read:
@@ -1483,8 +1483,8 @@
 
 2002-12-05 F@lk Brettschneider <falk@kdevelop.org>
     * now also parts can load/save the project-related session by overriding the base class method in KDevPlugin
-    * as an example, I moved changed some c++-debugger stuff to write to .kdevses instead of .tdevelop
-      (since every user has its own settings and the .tdevelop file would conflict in CVS)
+    * as an example, I moved changed some c++-debugger stuff to write to .kdevses instead of .kdevelop
+      (since every user has its own settings and the .kdevelop file would conflict in CVS)
 
 2002-12-04 Caleb Tennis <caleb@aei-tech.com>
     * Added ability to open ui.h files easily in QMake Manager with right click popupmenu.
@@ -1936,7 +1936,7 @@
 
 2002-05-31  Bernd Gehrmann  <bernd@mail.berlios.de>
 
-        * kdevprj2tdevelop for converting project files
+        * kdevprj2kdevelop for converting project files
           and creating file lists
 
 2002-05-30  Bernd Gehrmann  <bernd@mail.berlios.de>
diff --git a/Makefile.am b/Makefile.am
index 25b1050d..10a75db6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ xdg_directory_DATA = tde-development-tdevelop.directory
 mime_DATA = x-tdevelop.desktop
 mimedir = $(kde_mimedir)/application
 
-kde_bin_SCRIPTS = kdevprj2tdevelop
+kde_bin_SCRIPTS = kdevprj2kdevelop
 
 $(top_srcdir)/acinclude.m4: $(top_srcdir)/tdevelop.m4.in
 
diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp
index 902055ec..a9e5a2d4 100644
--- a/buildtools/ant/antprojectpart.cpp
+++ b/buildtools/ant/antprojectpart.cpp
@@ -97,7 +97,7 @@ void AntProjectPart::openProject(const TQString &dirName, const TQString &projec
 
   fillMenu();
 
-  TQFile f(dirName + "/" + projectName.lower() + ".tdevelop" + ".filelist");
+  TQFile f(dirName + "/" + projectName.lower() + ".kdevelop" + ".filelist");
   if (f.open(IO_ReadOnly))
   {
     TQTextStream stream(&f);
@@ -164,7 +164,7 @@ void AntProjectPart::closeProject()
 
   m_antOptions = AntOptions();
 
-  TQFile f(m_projectDirectory + "/" + m_projectName.lower() + ".tdevelop" + ".filelist");
+  TQFile f(m_projectDirectory + "/" + m_projectName.lower() + ".kdevelop" + ".filelist");
   if (!f.open(IO_WriteOnly))
     return;
 
diff --git a/buildtools/autotools/README.dox b/buildtools/autotools/README.dox
index b80730ba..8e3c6e59 100644
--- a/buildtools/autotools/README.dox
+++ b/buildtools/autotools/README.dox
@@ -17,7 +17,7 @@ reconfigure subprojects**.
 
 \bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=autoproject&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number"> autoproject component at Bugzilla database</a>
 \bug Lower Automake Manager view does not update it's view when adding a subproject (and targets, etc to the new subproject)
-\bug If removing the Active Target, update the .tdevelop file, too!
+\bug If removing the Active Target, update the .kdevelop file, too!
 
 
 \note
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index c737f941..f61782ae 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -421,14 +421,14 @@ void CustomProjectPart::openProject( const TQString &dirName, const TQString &pr
         m_filelistDir = dirName;
 
     if ( TQFileInfo( m_filelistDir + "/" + projectName.lower() +
-                    ".tdevelop.filelist" ).exists() )
+                    ".kdevelop.filelist" ).exists() )
     {
         TQDir( m_filelistDir ).rename(
-            projectName.lower() + ".tdevelop.filelist",
-            projectName + ".tdevelop.filelist" );
+            projectName.lower() + ".kdevelop.filelist",
+            projectName + ".kdevelop.filelist" );
     }
 
-    TQFile f( m_filelistDir + "/" + projectName + ".tdevelop.filelist" );
+    TQFile f( m_filelistDir + "/" + projectName + ".kdevelop.filelist" );
     if ( f.open( IO_ReadOnly ) )
     {
         TQTextStream stream( &f );
@@ -588,7 +588,7 @@ void CustomProjectPart::closeProject()
 
 void CustomProjectPart::saveProject()
 {
-    TQFile f( m_filelistDir + "/" + m_projectName + ".tdevelop.filelist" );
+    TQFile f( m_filelistDir + "/" + m_projectName + ".kdevelop.filelist" );
     if ( !f.open( IO_WriteOnly ) )
         return;
 
diff --git a/doc/api/HighPriTasks.dox b/doc/api/HighPriTasks.dox
index 850053f9..1158d82c 100644
--- a/doc/api/HighPriTasks.dox
+++ b/doc/api/HighPriTasks.dox
@@ -5,11 +5,11 @@
 
 \section fixMajBugs Fixing major/annoying bugs
 
-  - Fix the mess of .tdevelop and .kdevses file.
-    - All project wide setings should go into .tdevelop and
+  - Fix the mess of .kdevelop and .kdevses file.
+    - All project wide setings should go into .kdevelop and
     - all session (and personal) options should go into .kdevses file
     .
-    This way the .tdevelop file can be shared in teams of developers.
+    This way the .kdevelop file can be shared in teams of developers.
 
 
 \section TDevelop2compat TDevelop 2 compatibility
diff --git a/doc/api/HowToAddApplicationTemplates.dox b/doc/api/HowToAddApplicationTemplates.dox
index 4b77b9e2..e1b9c223 100644
--- a/doc/api/HowToAddApplicationTemplates.dox
+++ b/doc/api/HowToAddApplicationTemplates.dox
@@ -36,7 +36,7 @@ Create a directory <code>template-khello</code> with the files
     - template-khello/app.cpp
     - template-khello/app.h
     - template-khello/app.desktop
-    - template-khello/app.tdevelop
+    - template-khello/app.kdevelop
     - template-khello/appui.rc
     - template-khello/khello
     - template-khello/main.cpp
@@ -192,14 +192,14 @@ information from the script file will need to be moved into the ini file.
 The example is as follows:
 \code
 install(
-"${src}/template-chello/app.tdevelop","${dest}/${APPNAMELC}.tdevelop" );
+"${src}/template-chello/app.kdevelop","${dest}/${APPNAMELC}.kdevelop" );
 \endcode
 becomes
 \code
 [PROJECT]
 Type=install
-Source=%{src}/template-chello/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/template-chello/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 \endcode
 
 Things like <code>installIncAdmin();</code> and <code>installGNU();</code> now involve unpacking
diff --git a/doc/api/HowToAddPlugins.dox b/doc/api/HowToAddPlugins.dox
index 012cb5d0..3f9d1b20 100644
--- a/doc/api/HowToAddPlugins.dox
+++ b/doc/api/HowToAddPlugins.dox
@@ -119,11 +119,11 @@ developers (e.g. via version control application CVS). So some user preferences
 very individual, and some may be valid for all of the team - project-wide so to speak.
 
 That's why the TDevelop architecture makes a difference here and supports two files
-which will be stored in the project root directory. They are the project file (*.tdevelop)
+which will be stored in the project root directory. They are the project file (*.kdevelop)
 and the session (*.kdevses) file. The later is for individual settings, not to be thought
 to be shared.
 
-\subsection domProject Project file (*.tdevelop)
+\subsection domProject Project file (*.kdevelop)
 
 For your convenience, you don't have to use the quite complex DOM API. Strings
 can very easily be read from and written to this document using the
diff --git a/doc/api/HowToAddProgrammingLanguages.dox b/doc/api/HowToAddProgrammingLanguages.dox
index 1926d811..9ef228e2 100644
--- a/doc/api/HowToAddProgrammingLanguages.dox
+++ b/doc/api/HowToAddProgrammingLanguages.dox
@@ -137,7 +137,7 @@ and look at <code>languages/ruby/app_templates/rubyhello</code>, <code>languages
 \subsubsection sectionApplicationImportTemplates Application import templates
 
 TDevelop has the ability to <b>create a new project from existing projects or source code</b>.
-It scans for project files ('*.tdevelop, *.kdevprj, *.studio, *.pro) and if
+It scans for project files ('*.kdevelop, *.kdevprj, *.studio, *.pro) and if
   - it finds a project it extracts the necessary information
   - it does not find project files it scans for source files (*.cpp, *.java, *.pl, *.py, ...)
   .
diff --git a/doc/tdevelop/app-files.docbook b/doc/tdevelop/app-files.docbook
index 547010ec..dc1a33a9 100644
--- a/doc/tdevelop/app-files.docbook
+++ b/doc/tdevelop/app-files.docbook
@@ -96,7 +96,7 @@ There are quite a lot of default configuration subdirectories in <filename class
     <listitem id="app-files-default-appwizard">
       <para><filename class="directory">kdevappwizard/</filename> &mdash; contains files used by the &appwizard; part:</para>
       <itemizedlist>
-        <listitem><para><filename class="directory">importfiles/</filename> &mdash; contains <filename>.tdevelop</filename> project files which control the initialization of a new project.</para></listitem>
+        <listitem><para><filename class="directory">importfiles/</filename> &mdash; contains <filename>.kdevelop</filename> project files which control the initialization of a new project.</para></listitem>
         <listitem><para><filename class="directory">imports/</filename> &mdash; contains templates to set up project specific <filename>.desktop</filename> files.</para></listitem>
         <listitem><para><filename class="directory">template-common/</filename> &mdash; contains various files commonly included in the project source directories.</para></listitem>
         <listitem><para><filename class="directory">templates/</filename> &mdash; contains configuration files which describe the information to be included in a given project source directory.</para></listitem>
@@ -399,10 +399,10 @@ There are two groups of &tdevelop; configuration files in the <filename class="d
 <title>Project Dependent Configuration</title>
 
 <para>
-Most project dependend configuration is kept in the <filename>&lt;project-name&gt;.tdevelop</filename> and <filename>&lt;project-name&gt;.kdevses</filename> &tdevelop; project configuration files rather than in separate files as the other, more global, configuration settings. In short, those files are meant for:
+Most project dependend configuration is kept in the <filename>&lt;project-name&gt;.kdevelop</filename> and <filename>&lt;project-name&gt;.kdevses</filename> &tdevelop; project configuration files rather than in separate files as the other, more global, configuration settings. In short, those files are meant for:
 </para>
 <simplelist>
-  <member><filename>&lt;project-name&gt;.tdevelop</filename> &mdash; global project configuration information.</member>
+  <member><filename>&lt;project-name&gt;.kdevelop</filename> &mdash; global project configuration information.</member>
   <member><filename>&lt;project-name&gt;.kdevses</filename> &mdash; configuration information needed to restore the specific behaviours of the running session.</member>
 </simplelist>
 <para>
@@ -412,7 +412,7 @@ Both are &XML; coded files. They can be viewed and (cautiously) altered using an
 <sect2>
 <title>Persistent Code Store Files</title>
 
-<para>There is a third project dependend configuration file, the <filename>&lt;project-name&gt;.tdevelop.pcs</filename> Persistant Code Store. This is a binary coded file holding an internal parser cache for the most part in order to speed up the loading sequence of the project. Additionally, this Persistant Code Store keeps information use by the <guilabel>Code Completion</guilabel> facility of &tdevelop;.
+<para>There is a third project dependend configuration file, the <filename>&lt;project-name&gt;.kdevelop.pcs</filename> Persistant Code Store. This is a binary coded file holding an internal parser cache for the most part in order to speed up the loading sequence of the project. Additionally, this Persistant Code Store keeps information use by the <guilabel>Code Completion</guilabel> facility of &tdevelop;.
 </para>
 
 <note><para>
diff --git a/doc/tdevelop/getting-started.docbook b/doc/tdevelop/getting-started.docbook
index a805f393..e7864fc8 100644
--- a/doc/tdevelop/getting-started.docbook
+++ b/doc/tdevelop/getting-started.docbook
@@ -1121,12 +1121,12 @@ binaries.</para>
 <title>&tdevelop; Control Files</title>
 <para>&tdevelop; needs some control and administration data on its own. These
 are located in the project root directory, in our example
-<filename>hello.tdevelop</filename>, <filename>hello.tdevelop.pcs</filename>,
+<filename>hello.kdevelop</filename>, <filename>hello.kdevelop.pcs</filename>,
 and <filename>hello.kdevses</filename>.</para>
 </formalpara>
 
 <para>Of particular importance in each project is the
-<filename>xxx.tdevelop</filename> (where <quote>xxx</quote> denotes the project
+<filename>xxx.kdevelop</filename> (where <quote>xxx</quote> denotes the project
 name) file. It is the main <emphasis>KDevelop 3 Project File</emphasis> and
 needed if you later want load this project into the &IDE;.</para>
 
diff --git a/kdevprj2tdevelop b/kdevprj2kdevelop
similarity index 98%
rename from kdevprj2tdevelop
rename to kdevprj2kdevelop
index 09d3ebaa..c30628a9 100755
--- a/kdevprj2tdevelop
+++ b/kdevprj2kdevelop
@@ -124,12 +124,12 @@ if ($project_type =~ /normal_kde|mini_kde|normalogl_kde|normal_kde2|mini_kde2|md
 ##
 
 $projectfilename = $filename;
-$projectfilename =~ s/^(.*)\.kdevprj$/$1.tdevelop/;
+$projectfilename =~ s/^(.*)\.kdevprj$/$1.kdevelop/;
 open(FILE, ">$projectfilename");
 
 print FILE <<EOF;
-<!DOCTYPE tdevelop>
-<tdevelop>
+<!DOCTYPE kdevelop>
+<kdevelop>
  <general>
   <author>$author</author>
   <email>$email</email>
@@ -233,7 +233,7 @@ EOF
 }
 
 print FILE <<EOF;
-</tdevelop>
+</kdevelop>
 EOF
 close FILE;
 
diff --git a/languages/ada/app_templates/adahello/CMakeLists.txt b/languages/ada/app_templates/adahello/CMakeLists.txt
index cbd00e6e..5c0dbc7a 100644
--- a/languages/ada/app_templates/adahello/CMakeLists.txt
+++ b/languages/ada/app_templates/adahello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( adahello.tar.gz ALL
   COMMAND
-    tar zcf adahello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} main.adb app.tdevelop ada-Makefile app.tdevelop.filelist )
+    tar zcf adahello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} main.adb app.kdevelop ada-Makefile app.kdevelop.filelist )
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/adahello.tar.gz adahello.png
diff --git a/languages/ada/app_templates/adahello/Makefile.am b/languages/ada/app_templates/adahello/Makefile.am
index 5a970c91..45e04df7 100644
--- a/languages/ada/app_templates/adahello/Makefile.am
+++ b/languages/ada/app_templates/adahello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.adb app.tdevelop ada-Makefile app.tdevelop.filelist
+dataFiles = main.adb app.kdevelop ada-Makefile app.kdevelop.filelist
 
 ### no need to change below:
 template_DATA = adahello.kdevtemplate
diff --git a/languages/ada/app_templates/adahello/adahello.kdevtemplate b/languages/ada/app_templates/adahello/adahello.kdevtemplate
index 0cc09da2..3079b840 100644
--- a/languages/ada/app_templates/adahello/adahello.kdevtemplate
+++ b/languages/ada/app_templates/adahello/adahello.kdevtemplate
@@ -75,8 +75,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
@@ -85,8 +85,8 @@ Dest=%{dest}/Makefile
 
 [FILE3]
 Type=install
-Source=%{src}/app.tdevelop.filelist
-Dest=%{dest}/%{APPNAMELC}.tdevelop.filelist
+Source=%{src}/app.kdevelop.filelist
+Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist
 
 [MkDir1]
 Type=mkdir
diff --git a/languages/ada/app_templates/adahello/app.tdevelop b/languages/ada/app_templates/adahello/app.kdevelop
similarity index 98%
rename from languages/ada/app_templates/adahello/app.tdevelop
rename to languages/ada/app_templates/adahello/app.kdevelop
index a94f7e34..b430f6e8 100644
--- a/languages/ada/app_templates/adahello/app.tdevelop
+++ b/languages/ada/app_templates/adahello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -81,4 +81,4 @@
    <type ext="ada"/>
   </useglobaltypes>
  </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/languages/ada/app_templates/adahello/app.tdevelop.filelist b/languages/ada/app_templates/adahello/app.kdevelop.filelist
similarity index 100%
rename from languages/ada/app_templates/adahello/app.tdevelop.filelist
rename to languages/ada/app_templates/adahello/app.kdevelop.filelist
diff --git a/languages/bash/app_templates/bashhello/CMakeLists.txt b/languages/bash/app_templates/bashhello/CMakeLists.txt
index 69abf15c..3e7aba81 100644
--- a/languages/bash/app_templates/bashhello/CMakeLists.txt
+++ b/languages/bash/app_templates/bashhello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( bashhello.tar.gz ALL
   COMMAND
-    tar zcf bashhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} app.sh app.tdevelop )
+    tar zcf bashhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} app.sh app.kdevelop )
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/bashhello.tar.gz bashhello.png
diff --git a/languages/bash/app_templates/bashhello/Makefile.am b/languages/bash/app_templates/bashhello/Makefile.am
index b26692b4..45e403b8 100644
--- a/languages/bash/app_templates/bashhello/Makefile.am
+++ b/languages/bash/app_templates/bashhello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.sh app.tdevelop
+dataFiles = app.sh app.kdevelop
 templateName = bashhello
 
 ### no need to change below:
diff --git a/languages/bash/app_templates/bashhello/app.tdevelop b/languages/bash/app_templates/bashhello/app.kdevelop
similarity index 98%
rename from languages/bash/app_templates/bashhello/app.tdevelop
rename to languages/bash/app_templates/bashhello/app.kdevelop
index cab08799..40e783a4 100644
--- a/languages/bash/app_templates/bashhello/app.tdevelop
+++ b/languages/bash/app_templates/bashhello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -79,4 +79,4 @@
 			<type ext="sh"/>
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/languages/bash/app_templates/bashhello/bashhello.kdevtemplate b/languages/bash/app_templates/bashhello/bashhello.kdevtemplate
index b9e7bd11..e62b1514 100644
--- a/languages/bash/app_templates/bashhello/bashhello.kdevtemplate
+++ b/languages/bash/app_templates/bashhello/bashhello.kdevtemplate
@@ -69,8 +69,8 @@ Archive=bashhello.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/automakeempty/CMakeLists.txt b/languages/cpp/app_templates/automakeempty/CMakeLists.txt
index 6785106a..9639ee4e 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.tdevelop
+    configure.in automakeempty.png app.kdevelop
 )
 
 
diff --git a/languages/cpp/app_templates/automakeempty/Makefile.am b/languages/cpp/app_templates/automakeempty/Makefile.am
index 06f9a94c..461e4322 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.tdevelop
+	configure.in automakeempty.png app.kdevelop
 templateName = automakeempty
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/automakeempty/app.tdevelop b/languages/cpp/app_templates/automakeempty/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/automakeempty/app.tdevelop
rename to languages/cpp/app_templates/automakeempty/app.kdevelop
index ab12095d..158ae529 100644
--- a/languages/cpp/app_templates/automakeempty/app.tdevelop
+++ b/languages/cpp/app_templates/automakeempty/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -98,4 +98,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate b/languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate
index a1ced086..3a08381b 100644
--- a/languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate
+++ b/languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate
@@ -48,8 +48,8 @@ Archive=automakeempty.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [INCADMIN]
 Type=include
diff --git a/languages/cpp/app_templates/chello/CMakeLists.txt b/languages/cpp/app_templates/chello/CMakeLists.txt
index 5d792072..afe494d9 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.tdevelop
+    configure.in chello.png app.kdevelop
 )
 
 
diff --git a/languages/cpp/app_templates/chello/Makefile.am b/languages/cpp/app_templates/chello/Makefile.am
index 0a51e6fd..f7c9742a 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.tdevelop
+	configure.in chello.png app.kdevelop
 
 templateName = chello
 
diff --git a/languages/cpp/app_templates/chello/app.tdevelop b/languages/cpp/app_templates/chello/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/chello/app.tdevelop
rename to languages/cpp/app_templates/chello/app.kdevelop
index 41866d9f..7956edf8 100644
--- a/languages/cpp/app_templates/chello/app.tdevelop
+++ b/languages/cpp/app_templates/chello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -104,4 +104,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/chello/chello.kdevtemplate b/languages/cpp/app_templates/chello/chello.kdevtemplate
index 6dc5fb77..35577b74 100644
--- a/languages/cpp/app_templates/chello/chello.kdevtemplate
+++ b/languages/cpp/app_templates/chello/chello.kdevtemplate
@@ -219,8 +219,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/chello_gba/CMakeLists.txt b/languages/cpp/app_templates/chello_gba/CMakeLists.txt
index b11230fe..3011e87e 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.tdevelop main.h gba.h font.bmp README.devel
+    app.kdevelop 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 fbc6c2b4..2a72573e 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.tdevelop \
+	c-Makefile.cvs configure.in chellogba.png app.kdevelop \
 	main.h gba.h font.bmp README.devel
 templateName = chellogba
 
diff --git a/languages/cpp/app_templates/chello_gba/app.tdevelop b/languages/cpp/app_templates/chello_gba/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/chello_gba/app.tdevelop
rename to languages/cpp/app_templates/chello_gba/app.kdevelop
index 2f59c978..b9830c51 100644
--- a/languages/cpp/app_templates/chello_gba/app.tdevelop
+++ b/languages/cpp/app_templates/chello_gba/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -97,4 +97,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate b/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate
index ef89357f..3e58b178 100644
--- a/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate
+++ b/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate
@@ -77,8 +77,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/clanlib/CMakeLists.txt b/languages/cpp/app_templates/clanlib/CMakeLists.txt
index e0b99cc2..955dcc81 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.tdevelop
+    src-Makefile.am app-Makefile.am main.cpp app.kdevelop
     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 84e0459b..f4a650af 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.tdevelop \
+dataFiles = src-Makefile.am app-Makefile.am main.cpp app.kdevelop \
 	app-configure.in app-autogen.sh
 templateName = clanlib
 
diff --git a/languages/cpp/app_templates/clanlib/app.tdevelop b/languages/cpp/app_templates/clanlib/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/clanlib/app.tdevelop
rename to languages/cpp/app_templates/clanlib/app.kdevelop
index d2e9e430..0e268e7b 100644
--- a/languages/cpp/app_templates/clanlib/app.tdevelop
+++ b/languages/cpp/app_templates/clanlib/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -103,4 +103,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/clanlib/clanlib.kdevtemplate b/languages/cpp/app_templates/clanlib/clanlib.kdevtemplate
index 1b39badc..7c4c3b21 100644
--- a/languages/cpp/app_templates/clanlib/clanlib.kdevtemplate
+++ b/languages/cpp/app_templates/clanlib/clanlib.kdevtemplate
@@ -73,8 +73,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt b/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt
index ccb2dd4a..1bfd8cd0 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.tdevelop
+    app-configure.in app.kdevelop
 )
 
 
diff --git a/languages/cpp/app_templates/cppcurseshello/Makefile.am b/languages/cpp/app_templates/cppcurseshello/Makefile.am
index ef3623f6..3f6f64af 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.tdevelop
+	app-configure.in app.kdevelop
 templateName = cppcurseshello
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/cpphello/app.tdevelop b/languages/cpp/app_templates/cppcurseshello/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/cpphello/app.tdevelop
rename to languages/cpp/app_templates/cppcurseshello/app.kdevelop
index 98919071..3f1a2b87 100644
--- a/languages/cpp/app_templates/cpphello/app.tdevelop
+++ b/languages/cpp/app_templates/cppcurseshello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -102,4 +102,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate b/languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate
index 27f85c21..7dcd7282 100644
--- a/languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate
+++ b/languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate
@@ -77,8 +77,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/cpphello/CMakeLists.txt b/languages/cpp/app_templates/cpphello/CMakeLists.txt
index d77effea..d8f7f8cc 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.tdevelop
+    configure.in cpphello.png app.kdevelop
 )
 
 
diff --git a/languages/cpp/app_templates/cpphello/Makefile.am b/languages/cpp/app_templates/cpphello/Makefile.am
index 2ba017c2..49bd1b67 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.tdevelop
+	configure.in cpphello.png app.kdevelop
 templateName = cpphello
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/cppcurseshello/app.tdevelop b/languages/cpp/app_templates/cpphello/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/cppcurseshello/app.tdevelop
rename to languages/cpp/app_templates/cpphello/app.kdevelop
index 98919071..3f1a2b87 100644
--- a/languages/cpp/app_templates/cppcurseshello/app.tdevelop
+++ b/languages/cpp/app_templates/cpphello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -102,4 +102,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/cpphello/cpphello.kdevtemplate b/languages/cpp/app_templates/cpphello/cpphello.kdevtemplate
index ee529159..a19f0a9d 100644
--- a/languages/cpp/app_templates/cpphello/cpphello.kdevtemplate
+++ b/languages/cpp/app_templates/cpphello/cpphello.kdevtemplate
@@ -78,8 +78,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt b/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt
index b5e16259..6373f0f0 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.tdevelop acinclude.m4
+    configure.in cppsdlhello.png app.kdevelop acinclude.m4
 )
 
 
diff --git a/languages/cpp/app_templates/cppsdlhello/Makefile.am b/languages/cpp/app_templates/cppsdlhello/Makefile.am
index c0357370..e17785a4 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.tdevelop acinclude.m4
+dataFiles = main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs 		configure.in cppsdlhello.png app.kdevelop acinclude.m4
 templateName = cppsdlhello
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/cppsdlhello/app.tdevelop b/languages/cpp/app_templates/cppsdlhello/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/cppsdlhello/app.tdevelop
rename to languages/cpp/app_templates/cppsdlhello/app.kdevelop
index 3a60526f..67566b8c 100644
--- a/languages/cpp/app_templates/cppsdlhello/app.tdevelop
+++ b/languages/cpp/app_templates/cppsdlhello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -100,4 +100,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate b/languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate
index 5e559acb..975b93f5 100644
--- a/languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate
+++ b/languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate
@@ -78,8 +78,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/dcopservice/CMakeLists.txt b/languages/cpp/app_templates/dcopservice/CMakeLists.txt
index c3a2397b..91f82605 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.tdevelop subdirs
+    dcopservice.kdevelop subdirs
 )
 
 
diff --git a/languages/cpp/app_templates/dcopservice/Makefile.am b/languages/cpp/app_templates/dcopservice/Makefile.am
index dddb4916..00875115 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.tdevelop \
+	src-Makefile.am main.cpp dcopservice.cpp dcopservice.kdevelop \
 	subdirs
 templateName = dcopservice
 
diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop b/languages/cpp/app_templates/dcopservice/dcopservice.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/dcopservice/dcopservice.tdevelop
rename to languages/cpp/app_templates/dcopservice/dcopservice.kdevelop
index 59569583..72d98c4e 100644
--- a/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop
+++ b/languages/cpp/app_templates/dcopservice/dcopservice.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -106,4 +106,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate b/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate
index a4c08a28..caa3dd4f 100644
--- a/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate
+++ b/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate
@@ -102,8 +102,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/dcopservice.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/dcopservice.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir3]
 Type=mkdir
diff --git a/languages/cpp/app_templates/generichello/Makefile.am b/languages/cpp/app_templates/generichello/Makefile.am
index 75bad862..b558eecd 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.tdevelop app.prj
+dataFiles = main.cpp cpphello.png app.kdevelop app.prj
 templateName = cppgenerichello
 
 # BELOW is not the GENERIC Template-Template;
diff --git a/languages/cpp/app_templates/generichello/app.tdevelop b/languages/cpp/app_templates/generichello/app.kdevelop
similarity index 98%
rename from languages/cpp/app_templates/generichello/app.tdevelop
rename to languages/cpp/app_templates/generichello/app.kdevelop
index 63f5ce16..c0b6cc1e 100644
--- a/languages/cpp/app_templates/generichello/app.tdevelop
+++ b/languages/cpp/app_templates/generichello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -58,4 +58,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/generichello/generichello.kdevtemplate b/languages/cpp/app_templates/generichello/generichello.kdevtemplate
index f30eea5b..92bed6fc 100644
--- a/languages/cpp/app_templates/generichello/generichello.kdevtemplate
+++ b/languages/cpp/app_templates/generichello/generichello.kdevtemplate
@@ -73,8 +73,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/gnome2mmapp/Makefile.am b/languages/cpp/app_templates/gnome2mmapp/Makefile.am
index 9d73ddd6..f86ae76c 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.tdevelop gnome2mm.cc gnome2mmapp main_window_glade.cc\
+	app.kdevelop 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.tdevelop b/languages/cpp/app_templates/gnome2mmapp/app.kdevelop
similarity index 98%
rename from languages/cpp/app_templates/gnome2mmapp/app.tdevelop
rename to languages/cpp/app_templates/gnome2mmapp/app.kdevelop
index 19fbacb7..8ccf488a 100644
--- a/languages/cpp/app_templates/gnome2mmapp/app.tdevelop
+++ b/languages/cpp/app_templates/gnome2mmapp/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -66,4 +66,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate b/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate
index f692d342..bdca1da9 100644
--- a/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate
+++ b/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate
@@ -80,8 +80,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt
index 45544ac9..b81f3833 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.tdevelop
+    configure.in gtk2mm.gladep main_window.hh app.kdevelop
     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 c44ba568..2069ade7 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.tdevelop gtk2mm.cc main_window_glade.cc\
+	app.kdevelop gtk2mm.cc main_window_glade.cc\
 	src-Makefile.am config.h gtk2mmapp.png
 
 templateName = gtk2mmapp
diff --git a/languages/cpp/app_templates/gtk2mmapp/app.tdevelop b/languages/cpp/app_templates/gtk2mmapp/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/gtk2mmapp/app.tdevelop
rename to languages/cpp/app_templates/gtk2mmapp/app.kdevelop
index 6f691439..82770a31 100644
--- a/languages/cpp/app_templates/gtk2mmapp/app.tdevelop
+++ b/languages/cpp/app_templates/gtk2mmapp/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate
index a8948d26..16006e0f 100644
--- a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate
+++ b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate
@@ -68,8 +68,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/kapp/CMakeLists.txt b/languages/cpp/app_templates/kapp/CMakeLists.txt
index bfe6d93d..6b736681 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.tdevelop subdirs README
+    kapp.png app.kdevelop subdirs README
 )
 
 
diff --git a/languages/cpp/app_templates/kapp/Makefile.am b/languages/cpp/app_templates/kapp/Makefile.am
index 145551d3..efe532d3 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.tdevelop subdirs README
+	kapp.png app.kdevelop subdirs README
 
 templateName = kapp
 
diff --git a/languages/cpp/app_templates/kapp/app.tdevelop b/languages/cpp/app_templates/kapp/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kapp/app.tdevelop
rename to languages/cpp/app_templates/kapp/app.kdevelop
index 6a53f237..bab312f9 100644
--- a/languages/cpp/app_templates/kapp/app.tdevelop
+++ b/languages/cpp/app_templates/kapp/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -165,4 +165,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kapp/kapp.kdevtemplate b/languages/cpp/app_templates/kapp/kapp.kdevtemplate
index 86675a50..2a908311 100644
--- a/languages/cpp/app_templates/kapp/kapp.kdevtemplate
+++ b/languages/cpp/app_templates/kapp/kapp.kdevtemplate
@@ -100,8 +100,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/cpp/app_templates/kateplugin/CMakeLists.txt b/languages/cpp/app_templates/kateplugin/CMakeLists.txt
index 354218ad..5016f4f3 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.tdevelop subdirs plugin.desktop
+    kateplugin.png plugin.kdevelop subdirs plugin.desktop
 )
 
 
diff --git a/languages/cpp/app_templates/kateplugin/Makefile.am b/languages/cpp/app_templates/kateplugin/Makefile.am
index 81c1a586..62da4d60 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.tdevelop subdirs plugin.desktop
+		plugin.kdevelop 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 3c308223..d50cc110 100644
--- a/languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate
+++ b/languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate
@@ -100,8 +100,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/plugin.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/plugin.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/cpp/app_templates/kateplugin/plugin.tdevelop b/languages/cpp/app_templates/kateplugin/plugin.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kateplugin/plugin.tdevelop
rename to languages/cpp/app_templates/kateplugin/plugin.kdevelop
index 799ac6d5..a2f2de8b 100644
--- a/languages/cpp/app_templates/kateplugin/plugin.tdevelop
+++ b/languages/cpp/app_templates/kateplugin/plugin.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kateplugin2/CMakeLists.txt b/languages/cpp/app_templates/kateplugin2/CMakeLists.txt
index c4a47fba..b2b725d2 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.tdevelop subdirs plugin.desktop
+    kateplugin2.png plugin.kdevelop subdirs plugin.desktop
 )
 
 
diff --git a/languages/cpp/app_templates/kateplugin2/Makefile.am b/languages/cpp/app_templates/kateplugin2/Makefile.am
index b12a6477..29aea978 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.tdevelop subdirs plugin.desktop
+	kateplugin2.png plugin.kdevelop subdirs plugin.desktop
 
 templateName = kateplugin2
 
diff --git a/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate b/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate
index 3da42f23..832c2171 100644
--- a/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate
+++ b/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate
@@ -101,8 +101,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/plugin.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/plugin.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/cpp/app_templates/kateplugin2/plugin.tdevelop b/languages/cpp/app_templates/kateplugin2/plugin.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kateplugin2/plugin.tdevelop
rename to languages/cpp/app_templates/kateplugin2/plugin.kdevelop
index 831365dc..ef5f0479 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin.tdevelop
+++ b/languages/cpp/app_templates/kateplugin2/plugin.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -111,4 +111,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kde4app/CMakeLists.txt b/languages/cpp/app_templates/kde4app/CMakeLists.txt
index 0399f045..078366fe 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.tdevelop
-    kde4app.tdevelop.filelist
+    settings.kcfgc kde4app.png README kde4app.kdevelop
+    kde4app.kdevelop.filelist
 )
 
 
diff --git a/languages/cpp/app_templates/kde4app/Makefile.am b/languages/cpp/app_templates/kde4app/Makefile.am
index 455acd8d..2b39fcb4 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.tdevelop kde4app.tdevelop.filelist
+	kde4app.png README kde4app.kdevelop kde4app.kdevelop.filelist
 
 templateName = kde4app
 
diff --git a/languages/cpp/app_templates/kde4app/kde4app.tdevelop b/languages/cpp/app_templates/kde4app/kde4app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kde4app/kde4app.tdevelop
rename to languages/cpp/app_templates/kde4app/kde4app.kdevelop
index d332fa06..5168efbe 100644
--- a/languages/cpp/app_templates/kde4app/kde4app.tdevelop
+++ b/languages/cpp/app_templates/kde4app/kde4app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -202,4 +202,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kde4app/kde4app.tdevelop.filelist b/languages/cpp/app_templates/kde4app/kde4app.kdevelop.filelist
similarity index 100%
rename from languages/cpp/app_templates/kde4app/kde4app.tdevelop.filelist
rename to languages/cpp/app_templates/kde4app/kde4app.kdevelop.filelist
diff --git a/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate b/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate
index 1516e92e..2a7269fd 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.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/kde4app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE15]
 Type=install
-Source=%{src}/kde4app.tdevelop.filelist
-Dest=%{dest}/%{APPNAMELC}.tdevelop.filelist
+Source=%{src}/kde4app.kdevelop.filelist
+Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist
 
 [MKDIR1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/kdedcop/CMakeLists.txt b/languages/cpp/app_templates/kdedcop/CMakeLists.txt
index 0b7e9a3f..cca04f6a 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.tdevelop main.cpp
+    app.cpp app.h app_iface.h app.kdevelop 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 21c39778..87697fcd 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.tdevelop main.cpp mainclass.cpp \
+dataFiles = app.cpp app.h app_iface.h app.kdevelop main.cpp mainclass.cpp \
 	mainclass.h kdedcop.png src-Makefile.am subdirs
 
 templateName = kdedcop
diff --git a/languages/cpp/app_templates/kdedcop/app.tdevelop b/languages/cpp/app_templates/kdedcop/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kdedcop/app.tdevelop
rename to languages/cpp/app_templates/kdedcop/app.kdevelop
index 991381c5..50026f89 100644
--- a/languages/cpp/app_templates/kdedcop/app.tdevelop
+++ b/languages/cpp/app_templates/kdedcop/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -113,4 +113,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate b/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate
index ff6a91c1..ea276243 100644
--- a/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate
+++ b/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate
@@ -100,8 +100,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/cpp/app_templates/kdevlang/CMakeLists.txt b/languages/cpp/app_templates/kdevlang/CMakeLists.txt
index 483f85d9..854ca21e 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.tdevelop
+    kdevlang.rc kdevlang.desktop app.kdevelop
     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 7afa5be8..972dd511 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.tdevelop kdevlang-configure.in.in README.dox
+	kdevlang.desktop app.kdevelop kdevlang-configure.in.in README.dox
 templateName = kdevlang
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/kdevlang/app.tdevelop b/languages/cpp/app_templates/kdevlang/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kdevlang/app.tdevelop
rename to languages/cpp/app_templates/kdevlang/app.kdevelop
index 3f477a08..bf5ac56f 100644
--- a/languages/cpp/app_templates/kdevlang/app.tdevelop
+++ b/languages/cpp/app_templates/kdevlang/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -112,4 +112,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate b/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate
index 6d852324..8e493769 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate
+++ b/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate
@@ -73,8 +73,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/kdevpart/CMakeLists.txt b/languages/cpp/app_templates/kdevpart/CMakeLists.txt
index 53293ea9..aa4a738e 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.tdevelop README.dox
+    kdevpart.desktop app.kdevelop 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 11c12dfe..d1541685 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.tdevelop README.dox globalconfigbase.ui globalconfig.h \
+	kdevpart.desktop app.kdevelop README.dox globalconfigbase.ui globalconfig.h \
 	globalconfig.cpp projectconfigbase.ui projectconfig.h projectconfig.cpp
 templateName = kdevpart
 
diff --git a/languages/cpp/app_templates/kdevpart/app.tdevelop b/languages/cpp/app_templates/kdevpart/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kdevpart/app.tdevelop
rename to languages/cpp/app_templates/kdevpart/app.kdevelop
index d16492cd..516282e9 100644
--- a/languages/cpp/app_templates/kdevpart/app.tdevelop
+++ b/languages/cpp/app_templates/kdevpart/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -113,4 +113,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate b/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate
index c1860597..75a13528 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.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/kdevpart2/CMakeLists.txt b/languages/cpp/app_templates/kdevpart2/CMakeLists.txt
index 080603a8..2414bc80 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.tdevelop kdevpart-configure.in.in
+    kdevpart.desktop app.kdevelop 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 436f919c..6e58fa02 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.tdevelop \
+	kdevpart_part.rc kdevpart.desktop app.kdevelop \
 	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/app.tdevelop b/languages/cpp/app_templates/kdevpart2/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kdevpart2/app.tdevelop
rename to languages/cpp/app_templates/kdevpart2/app.kdevelop
index 1b7aab6e..a51a0e3a 100644
--- a/languages/cpp/app_templates/kdevpart2/app.tdevelop
+++ b/languages/cpp/app_templates/kdevpart2/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -145,4 +145,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate b/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate
index 5aeda5d1..37fb5d98 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate
@@ -142,8 +142,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/khello/CMakeLists.txt b/languages/cpp/app_templates/khello/CMakeLists.txt
index 360e792e..f51a2100 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.tdevelop subdirs app.desktop khello.png
+    app.kdevelop subdirs app.desktop khello.png
 )
 
 
diff --git a/languages/cpp/app_templates/khello/Makefile.am b/languages/cpp/app_templates/khello/Makefile.am
index 56df4792..6f788f99 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.tdevelop \
+dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.kdevelop \
 	subdirs app.desktop khello.png
 templateName = khello
 
diff --git a/languages/cpp/app_templates/khello/app.tdevelop b/languages/cpp/app_templates/khello/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/khello/app.tdevelop
rename to languages/cpp/app_templates/khello/app.kdevelop
index 9c25500e..09e9347f 100644
--- a/languages/cpp/app_templates/khello/app.tdevelop
+++ b/languages/cpp/app_templates/khello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -112,4 +112,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>  
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/khello/khello.kdevtemplate b/languages/cpp/app_templates/khello/khello.kdevtemplate
index 81d20c5a..a51d0856 100644
--- a/languages/cpp/app_templates/khello/khello.kdevtemplate
+++ b/languages/cpp/app_templates/khello/khello.kdevtemplate
@@ -101,8 +101,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/cpp/app_templates/khello2/CMakeLists.txt b/languages/cpp/app_templates/khello2/CMakeLists.txt
index 8e9fdb9d..e8a178bc 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.tdevelop subdirs app.desktop khello2.png widget.cpp
+    app.kdevelop 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 14445170..8ac1b18d 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.tdevelop \
+dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.kdevelop \
 	subdirs app.desktop khello2.png widget.cpp widget.h widgetbase.ui
 
 templateName = khello2
diff --git a/languages/cpp/app_templates/khello2/app.tdevelop b/languages/cpp/app_templates/khello2/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/khello2/app.tdevelop
rename to languages/cpp/app_templates/khello2/app.kdevelop
index a079670d..f0d64fa9 100644
--- a/languages/cpp/app_templates/khello2/app.tdevelop
+++ b/languages/cpp/app_templates/khello2/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -112,4 +112,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/khello2/khello2.kdevtemplate b/languages/cpp/app_templates/khello2/khello2.kdevtemplate
index b85e11fb..ebe6a6f6 100644
--- a/languages/cpp/app_templates/khello2/khello2.kdevtemplate
+++ b/languages/cpp/app_templates/khello2/khello2.kdevtemplate
@@ -97,8 +97,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/cpp/app_templates/kicker/CMakeLists.txt b/languages/cpp/app_templates/kicker/CMakeLists.txt
index c1a1d7d5..703f49c4 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.tdevelop
+    applet.cpp applet.h applet.desktop applet.kdevelop
     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 82095d72..168a93c9 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.tdevelop \
+dataFiles = applet.cpp applet.h applet.desktop applet.kdevelop \
 	src-Makefile.am kicker.png subdirs
 templateName = kicker
 
diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevelop b/languages/cpp/app_templates/kicker/applet.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevelop
rename to languages/cpp/app_templates/kicker/applet.kdevelop
index 929b3c49..c31bf875 100644
--- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevelop
+++ b/languages/cpp/app_templates/kicker/applet.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -112,4 +112,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kicker/kicker.kdevtemplate b/languages/cpp/app_templates/kicker/kicker.kdevtemplate
index 5185eb20..b887bb3d 100644
--- a/languages/cpp/app_templates/kicker/kicker.kdevtemplate
+++ b/languages/cpp/app_templates/kicker/kicker.kdevtemplate
@@ -98,8 +98,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/applet.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/applet.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir3]
 Type=mkdir
diff --git a/languages/cpp/app_templates/kmake/Makefile.am b/languages/cpp/app_templates/kmake/Makefile.am
index b7bd96f9..87d660e0 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.tdevelop app.pro src.pro
+dataFiles = appui.rc app.desktop app.cpp mainviewimp.cpp mainviewimp.h mainview.ui app.kdevelop app.pro src.pro
 templateName = kmake
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/kmake/app.tdevelop b/languages/cpp/app_templates/kmake/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kmake/app.tdevelop
rename to languages/cpp/app_templates/kmake/app.kdevelop
index ba82ff4b..641971d0 100644
--- a/languages/cpp/app_templates/kmake/app.tdevelop
+++ b/languages/cpp/app_templates/kmake/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -108,4 +108,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kmake/kmake.kdevtemplate b/languages/cpp/app_templates/kmake/kmake.kdevtemplate
index 7c2688d9..6b543363 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.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/kmod/CMakeLists.txt b/languages/cpp/app_templates/kmod/CMakeLists.txt
index af575a10..b67f3b01 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.tdevelop kmod-driver.c
+    src-Makefile kmod.kdevelop kmod-driver.c
 )
 
 
diff --git a/languages/cpp/app_templates/kmod/Makefile.am b/languages/cpp/app_templates/kmod/Makefile.am
index f4b1ec98..76afcd5a 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.tdevelop kmod-driver.c
+dataFiles = src-Makefile kmod.kdevelop kmod-driver.c
 
 templateName = kmod
 
diff --git a/languages/cpp/app_templates/kmod/kmod.tdevelop b/languages/cpp/app_templates/kmod/kmod.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kmod/kmod.tdevelop
rename to languages/cpp/app_templates/kmod/kmod.kdevelop
index 6ce5f390..810907cc 100644
--- a/languages/cpp/app_templates/kmod/kmod.tdevelop
+++ b/languages/cpp/app_templates/kmod/kmod.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -90,4 +90,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kmod/kmod.kdevtemplate b/languages/cpp/app_templates/kmod/kmod.kdevtemplate
index 069d5103..68fcee7c 100644
--- a/languages/cpp/app_templates/kmod/kmod.kdevtemplate
+++ b/languages/cpp/app_templates/kmod/kmod.kdevtemplate
@@ -71,8 +71,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/kmod.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/kmod.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/kofficepart/CMakeLists.txt b/languages/cpp/app_templates/kofficepart/CMakeLists.txt
index 955225bc..10fa5604 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.tdevelop kopart_aboutdata.h kopart_part.cpp
+    kopart.kdevelop 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 a38746b1..431a7b7a 100644
--- a/languages/cpp/app_templates/kofficepart/Makefile.am
+++ b/languages/cpp/app_templates/kofficepart/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = kopart.tdevelop kopart_aboutdata.h kopart_part.cpp kopart_view.h \
+dataFiles = kopart.kdevelop 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 tde-configure.in.in \
diff --git a/languages/cpp/app_templates/kofficepart/kopart.tdevelop b/languages/cpp/app_templates/kofficepart/kopart.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kofficepart/kopart.tdevelop
rename to languages/cpp/app_templates/kofficepart/kopart.kdevelop
index 194157d7..8f270240 100644
--- a/languages/cpp/app_templates/kofficepart/kopart.tdevelop
+++ b/languages/cpp/app_templates/kofficepart/kopart.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate b/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate
index 0273e0ca..6b5d7852 100644
--- a/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate
+++ b/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate
@@ -96,8 +96,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/kopart.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/kopart.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir3]
 Type=mkdir
diff --git a/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt b/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt
index e38fc279..89bf20db 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.tdevelop src-Makefile.am konqnavpanel.png
+    konqnavpanel.kdevelop 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 6fccbf38..7a3ae56b 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.tdevelop src-Makefile.am \
+	konqnavpanel.kdevelop src-Makefile.am \
 	konqnavpanel.png subdirs
 templateName = konqnavpanel
 
diff --git a/languages/cpp/app_templates/kicker/applet.tdevelop b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kicker/applet.tdevelop
rename to languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevelop
index 929b3c49..c31bf875 100644
--- a/languages/cpp/app_templates/kicker/applet.tdevelop
+++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -112,4 +112,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate
index e6f1a23e..5afbebb2 100644
--- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate
+++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate
@@ -98,8 +98,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/konqnavpanel.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/konqnavpanel.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir3]
 Type=mkdir
diff --git a/languages/cpp/app_templates/kpartapp/CMakeLists.txt b/languages/cpp/app_templates/kpartapp/CMakeLists.txt
index 9f3d8119..80d44525 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.tdevelop
+    main.cpp app_part.rc app_shell.rc kpartapp.png app.kdevelop
     subdirs
 )
 
diff --git a/languages/cpp/app_templates/kpartapp/Makefile.am b/languages/cpp/app_templates/kpartapp/Makefile.am
index bfb8ceed..9b69f17d 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.tdevelop subdirs
+	kpartapp.png app.kdevelop subdirs
 templateName = kpartapp
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/cpp/app_templates/kpartapp/app.tdevelop b/languages/cpp/app_templates/kpartapp/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kpartapp/app.tdevelop
rename to languages/cpp/app_templates/kpartapp/app.kdevelop
index a8628fe3..1e26accc 100644
--- a/languages/cpp/app_templates/kpartapp/app.tdevelop
+++ b/languages/cpp/app_templates/kpartapp/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -112,4 +112,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate b/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate
index 773cc0d8..883679a8 100644
--- a/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate
+++ b/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate
@@ -98,8 +98,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/cpp/app_templates/kpartplugin/CMakeLists.txt b/languages/cpp/app_templates/kpartplugin/CMakeLists.txt
index 00f4c664..0de10864 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.tdevelop subdirs
+    kpartplugin.png plugin.kdevelop subdirs
 )
 
 
diff --git a/languages/cpp/app_templates/kpartplugin/Makefile.am b/languages/cpp/app_templates/kpartplugin/Makefile.am
index 057be667..170bdd6d 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.tdevelop subdirs
+	kpartplugin.png plugin.kdevelop subdirs
 	
 templateName = kpartplugin
 
diff --git a/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate b/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate
index 59ca51d8..c7edd347 100644
--- a/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate
+++ b/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate
@@ -97,8 +97,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/plugin.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/plugin.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/cpp/app_templates/kpartplugin/plugin.tdevelop b/languages/cpp/app_templates/kpartplugin/plugin.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kpartplugin/plugin.tdevelop
rename to languages/cpp/app_templates/kpartplugin/plugin.kdevelop
index c94ba886..fed25a3c 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin.tdevelop
+++ b/languages/cpp/app_templates/kpartplugin/plugin.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -111,4 +111,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt b/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt
index bf1be9f6..dae6dd3b 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.tdevelop appview.h
+    app.cpp app.h main.cpp appui.rc app.kdevelop 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/Makefile.am b/languages/cpp/app_templates/kscons_kxt/Makefile.am
index 59a58ee1..8cce001c 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.tdevelop \
+dataFiles = app.cpp app.h main.cpp appui.rc app.kdevelop \
 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/kxt/app.tdevelop b/languages/cpp/app_templates/kscons_kxt/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kxt/app.tdevelop
rename to languages/cpp/app_templates/kscons_kxt/app.kdevelop
index 317a4cbc..5e7787bc 100644
--- a/languages/cpp/app_templates/kxt/app.tdevelop
+++ b/languages/cpp/app_templates/kscons_kxt/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -166,4 +166,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate b/languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate
index 20d35070..62676931 100644
--- a/languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate
+++ b/languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate
@@ -89,8 +89,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE4]
 Type=install
diff --git a/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt b/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt
index c05f1bb1..b393b5ff 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt
+++ b/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( kscons_tdemdi.tar.gz ALL
   COMMAND tar zcf kscons_tdemdi.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.kcfg app.tdevelop apptdemdi.cpp apptdemdi.h apptdemdiView.cpp
+    app.kcfg app.kdevelop apptdemdi.cpp apptdemdi.h apptdemdiView.cpp
     apptdemdiView.h INSTALL tdemdikonsole.cpp tdemdikonsole.h
     main.cpp messages.sh prefs.ui QUICKSTART README
     SConscript-doc SConscript-src SConstruct settings.kcfgc
diff --git a/languages/cpp/app_templates/kscons_tdemdi/Makefile.am b/languages/cpp/app_templates/kscons_tdemdi/Makefile.am
index 191ea8ee..5c3faab6 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/Makefile.am
+++ b/languages/cpp/app_templates/kscons_tdemdi/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.kcfg app.tdevelop apptdemdi.cpp apptdemdi.h apptdemdiView.cpp \
+dataFiles = app.kcfg app.kdevelop apptdemdi.cpp apptdemdi.h apptdemdiView.cpp \
 apptdemdiView.h INSTALL tdemdikonsole.cpp tdemdikonsole.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_kxt/app.tdevelop b/languages/cpp/app_templates/kscons_tdemdi/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kscons_kxt/app.tdevelop
rename to languages/cpp/app_templates/kscons_tdemdi/app.kdevelop
index 317a4cbc..5e7787bc 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.tdevelop
+++ b/languages/cpp/app_templates/kscons_tdemdi/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -166,4 +166,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate
index 2a297d60..234fa605 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate
+++ b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate
@@ -88,8 +88,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE3]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE4]
 Type=install
diff --git a/languages/cpp/app_templates/kxt/CMakeLists.txt b/languages/cpp/app_templates/kxt/CMakeLists.txt
index 4b203750..25505013 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.tdevelop subdirs app.desktop preview.png appview.h
+    app.kdevelop 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 8321742a..07767961 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.tdevelop \
+dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.kdevelop \
 	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/kscons_tdemdi/app.tdevelop b/languages/cpp/app_templates/kxt/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/kscons_tdemdi/app.tdevelop
rename to languages/cpp/app_templates/kxt/app.kdevelop
index 317a4cbc..5e7787bc 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop
+++ b/languages/cpp/app_templates/kxt/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -166,4 +166,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kxt/kxt.kdevtemplate b/languages/cpp/app_templates/kxt/kxt.kdevtemplate
index 79789759..2c56369d 100644
--- a/languages/cpp/app_templates/kxt/kxt.kdevtemplate
+++ b/languages/cpp/app_templates/kxt/kxt.kdevtemplate
@@ -100,8 +100,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/cpp/app_templates/makefileempty/CMakeLists.txt b/languages/cpp/app_templates/makefileempty/CMakeLists.txt
index 48a6e3dd..04cc2b33 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.tdevelop
+    makefileempty-Makefile makefileempty.png app.kdevelop
 )
 
 
diff --git a/languages/cpp/app_templates/makefileempty/Makefile.am b/languages/cpp/app_templates/makefileempty/Makefile.am
index ec381a04..87f1db69 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.tdevelop
+	makefileempty.png app.kdevelop
 templateName = makefileempty
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/makefileempty/app.tdevelop b/languages/cpp/app_templates/makefileempty/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/makefileempty/app.tdevelop
rename to languages/cpp/app_templates/makefileempty/app.kdevelop
index da576369..5c45d444 100644
--- a/languages/cpp/app_templates/makefileempty/app.tdevelop
+++ b/languages/cpp/app_templates/makefileempty/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -98,4 +98,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate b/languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate
index b69317d7..39b356ae 100644
--- a/languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate
+++ b/languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate
@@ -48,8 +48,8 @@ Archive=makefileempty.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [GNU]
 Type=include
diff --git a/languages/cpp/app_templates/noatunui/CMakeLists.txt b/languages/cpp/app_templates/noatunui/CMakeLists.txt
index 332a960a..506cd194 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.tdevelop
+    plugin_impl.h noatunui.png plugin.plugin plugin.kdevelop
     subdirs
 )
 
diff --git a/languages/cpp/app_templates/noatunui/Makefile.am b/languages/cpp/app_templates/noatunui/Makefile.am
index a222f235..29358f2f 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.tdevelop subdirs
+	noatunui.png plugin.plugin plugin.kdevelop 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 a91349c3..94cd2411 100644
--- a/languages/cpp/app_templates/noatunui/noatunui.kdevtemplate
+++ b/languages/cpp/app_templates/noatunui/noatunui.kdevtemplate
@@ -96,8 +96,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/plugin.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/plugin.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/cpp/app_templates/noatunui/plugin.tdevelop b/languages/cpp/app_templates/noatunui/plugin.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/noatunui/plugin.tdevelop
rename to languages/cpp/app_templates/noatunui/plugin.kdevelop
index 66986f2a..a053e017 100644
--- a/languages/cpp/app_templates/noatunui/plugin.tdevelop
+++ b/languages/cpp/app_templates/noatunui/plugin.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -108,4 +108,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/noatunvisual/CMakeLists.txt b/languages/cpp/app_templates/noatunvisual/CMakeLists.txt
index 8b5668ec..5a92db6f 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.tdevelop subdirs noatunvisual-configure.in.in
+    plugin.kdevelop subdirs noatunvisual-configure.in.in
 )
 
 
diff --git a/languages/cpp/app_templates/noatunvisual/Makefile.am b/languages/cpp/app_templates/noatunvisual/Makefile.am
index d7466e24..0d6a43eb 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.tdevelop \
+	plugin_impl.h noatunvisual.png plugin.plugin plugin.kdevelop \
 	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 c747925c..651cea78 100644
--- a/languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate
+++ b/languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate
@@ -100,8 +100,8 @@ Dest=%{dest}/doc/en/index.docbook
 
 [FILE4]
 Type=install
-Source=%{src}/plugin.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/plugin.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/cpp/app_templates/noatunvisual/plugin.tdevelop b/languages/cpp/app_templates/noatunvisual/plugin.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/noatunvisual/plugin.tdevelop
rename to languages/cpp/app_templates/noatunvisual/plugin.kdevelop
index 78193361..50cfe61b 100644
--- a/languages/cpp/app_templates/noatunvisual/plugin.tdevelop
+++ b/languages/cpp/app_templates/noatunvisual/plugin.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -115,4 +115,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/opieapp/CMakeLists.txt b/languages/cpp/app_templates/opieapp/CMakeLists.txt
index 4f2b2824..1e8ce9db 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.tdevelop example.desktop Makefile.am
+    Example.png app.kdevelop 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 10a1f2a1..643a1c29 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.tdevelop  example.desktop   Makefile.am  \
+dataFiles = Example.png  app.kdevelop  example.desktop   Makefile.am  \
 	app.pro example.cpp example.h examplebase.ui
 
 templateName = opieapp
diff --git a/languages/cpp/app_templates/opieapp/app.tdevelop b/languages/cpp/app_templates/opieapp/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/opieapp/app.tdevelop
rename to languages/cpp/app_templates/opieapp/app.kdevelop
index 9bdb127e..69b6f2bc 100644
--- a/languages/cpp/app_templates/opieapp/app.tdevelop
+++ b/languages/cpp/app_templates/opieapp/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -140,4 +140,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/opieapp/opieapp.kdevtemplate b/languages/cpp/app_templates/opieapp/opieapp.kdevtemplate
index fc492b55..ee99b7b6 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.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir0]
 Type=mkdir
diff --git a/languages/cpp/app_templates/opieapplet/CMakeLists.txt b/languages/cpp/app_templates/opieapplet/CMakeLists.txt
index e4dc42f0..de20130d 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.tdevelop app.pro simpleimpl.cpp
+    Makefile.am Example.png app.kdevelop 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 6bbb09ac..8faf4e32 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.tdevelop  app.pro \
+dataFiles = Makefile.am Example.png  app.kdevelop  app.pro \
 	simpleimpl.cpp simpleimpl.h
 
 templateName = opieapplet
diff --git a/languages/cpp/app_templates/opieapplet/app.tdevelop b/languages/cpp/app_templates/opieapplet/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/opieapplet/app.tdevelop
rename to languages/cpp/app_templates/opieapplet/app.kdevelop
index c5544656..eee2c55a 100644
--- a/languages/cpp/app_templates/opieapplet/app.tdevelop
+++ b/languages/cpp/app_templates/opieapplet/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -155,4 +155,4 @@ fi
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate b/languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate
index e6cec5eb..662350f6 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.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir0]
 Type=mkdir
diff --git a/languages/cpp/app_templates/opieinput/CMakeLists.txt b/languages/cpp/app_templates/opieinput/CMakeLists.txt
index f7bba492..e942fb09 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.tdevelop app.pro simpleimpl.cpp
+    Makefile.am Example.png app.kdevelop 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 9a3e5ffd..d748092c 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.tdevelop app.pro \
+dataFiles = Makefile.am Example.png app.kdevelop app.pro \
 	simpleimpl.cpp simpleimpl.h
 templateName = opieinput
 
diff --git a/languages/cpp/app_templates/opieinput/app.tdevelop b/languages/cpp/app_templates/opieinput/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/opieinput/app.tdevelop
rename to languages/cpp/app_templates/opieinput/app.kdevelop
index cc61122f..639a3215 100644
--- a/languages/cpp/app_templates/opieinput/app.tdevelop
+++ b/languages/cpp/app_templates/opieinput/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -156,4 +156,4 @@ fi
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/opieinput/opieinput.kdevtemplate b/languages/cpp/app_templates/opieinput/opieinput.kdevtemplate
index 19b721bf..72c91a5e 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.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir0]
 Type=mkdir
diff --git a/languages/cpp/app_templates/opiemenu/CMakeLists.txt b/languages/cpp/app_templates/opiemenu/CMakeLists.txt
index c321604c..8567a4f8 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.tdevelop app.pro simpleimpl.cpp
+    Makefile.am Example.png app.kdevelop 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 343a2bfa..c44b3f96 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.tdevelop  app.pro \
+dataFiles = Makefile.am Example.png  app.kdevelop  app.pro \
 	simpleimpl.cpp simpleimpl.h
 
 templateName = opiemenu
diff --git a/languages/cpp/app_templates/opiemenu/app.tdevelop b/languages/cpp/app_templates/opiemenu/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/opiemenu/app.tdevelop
rename to languages/cpp/app_templates/opiemenu/app.kdevelop
index c5544656..eee2c55a 100644
--- a/languages/cpp/app_templates/opiemenu/app.tdevelop
+++ b/languages/cpp/app_templates/opiemenu/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -155,4 +155,4 @@ fi
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate b/languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate
index 204cf5d8..d65e3a87 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.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir0]
 Type=mkdir
diff --git a/languages/cpp/app_templates/opienet/CMakeLists.txt b/languages/cpp/app_templates/opienet/CMakeLists.txt
index a08e71be..1c95a265 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.tdevelop app.pro
+    Makefile.am Example.png app.kdevelop 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 5245c17e..47dc4231 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.tdevelop  app.pro \
+dataFiles = Makefile.am Example.png  app.kdevelop  app.pro \
 	simpleiface.cpp simpleiface.h simplemodule.h \
 	simplemodule.cpp
 
diff --git a/languages/cpp/app_templates/opienet/app.tdevelop b/languages/cpp/app_templates/opienet/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/opienet/app.tdevelop
rename to languages/cpp/app_templates/opienet/app.kdevelop
index 7717a098..660b7bee 100644
--- a/languages/cpp/app_templates/opienet/app.tdevelop
+++ b/languages/cpp/app_templates/opienet/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -140,4 +140,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/opienet/opienet.kdevtemplate b/languages/cpp/app_templates/opienet/opienet.kdevtemplate
index 23223d28..3e1c458d 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.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir0]
 Type=mkdir
diff --git a/languages/cpp/app_templates/opietoday/CMakeLists.txt b/languages/cpp/app_templates/opietoday/CMakeLists.txt
index 6c7c4d66..3d86b992 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.tdevelop
+    Makefile.am Example.png app.kdevelop
     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 6c999369..8854404d 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.tdevelop  app.pro exampleplugin.cpp \
+dataFiles = Makefile.am Example.png  app.kdevelop  app.pro exampleplugin.cpp \
 	examplepluginimpl.cpp  examplepluginwidget.cpp exampleplugin.h \
 	examplepluginimpl.h  examplepluginwidget.h
 
diff --git a/languages/cpp/app_templates/opietoday/app.tdevelop b/languages/cpp/app_templates/opietoday/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/opietoday/app.tdevelop
rename to languages/cpp/app_templates/opietoday/app.kdevelop
index c387911b..f6e57207 100644
--- a/languages/cpp/app_templates/opietoday/app.tdevelop
+++ b/languages/cpp/app_templates/opietoday/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -140,4 +140,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/opietoday/opietoday.kdevtemplate b/languages/cpp/app_templates/opietoday/opietoday.kdevtemplate
index 91bb39be..9a5be409 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.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir0]
 Type=mkdir
diff --git a/languages/cpp/app_templates/prc-tool/Makefile.am b/languages/cpp/app_templates/prc-tool/Makefile.am
index 06f097a4..3d4b5610 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.tdevelop callback.h \
+dataFiles = prc-tool.png src-Makefile prc-tool.kdevelop callback.h \
 	palmhello.c palmhello.pbitm palmhello.rcp palmhelloRsc.h
 templateName = prc-tool
 
diff --git a/languages/cpp/app_templates/prc-tool/prc-tool.tdevelop b/languages/cpp/app_templates/prc-tool/prc-tool.kdevelop
similarity index 98%
rename from languages/cpp/app_templates/prc-tool/prc-tool.tdevelop
rename to languages/cpp/app_templates/prc-tool/prc-tool.kdevelop
index 9015718f..2c5a6c0a 100644
--- a/languages/cpp/app_templates/prc-tool/prc-tool.tdevelop
+++ b/languages/cpp/app_templates/prc-tool/prc-tool.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -48,4 +48,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate b/languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate
index 8cfea15f..81007be7 100644
--- a/languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate
+++ b/languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate
@@ -70,8 +70,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/prc-tool.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/prc-tool.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/qmakeapp/CMakeLists.txt b/languages/cpp/app_templates/qmakeapp/CMakeLists.txt
index 4af3dc73..febda6f6 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.tdevelop qmakeapp.pro src.pro filesave.xpm
+    qmakeapp.kdevelop 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 233717d7..c70050fa 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.tdevelop \
+dataFiles = main.cpp qmakeapp.cpp qmakeapp.h qmakeapp.png qmakeapp.kdevelop \
 	qmakeapp.pro src.pro filesave.xpm fileopen.xpm fileprint.xpm
 
 templateName = qmakeapp
diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop
rename to languages/cpp/app_templates/qmakeapp/qmakeapp.kdevelop
index 48a9bd99..2fa79421 100644
--- a/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop
+++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -109,4 +109,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate
index b89e8a52..8ac87635 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.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/qmakeapp.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/qmakeempty/CMakeLists.txt b/languages/cpp/app_templates/qmakeempty/CMakeLists.txt
index bc109590..d6424957 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.tdevelop qmakeempty.pro qmakeempty.png
+    qmakeempty.kdevelop qmakeempty.pro qmakeempty.png
 )
 
 
diff --git a/languages/cpp/app_templates/qmakeempty/Makefile.am b/languages/cpp/app_templates/qmakeempty/Makefile.am
index 9d62ad0a..57677d88 100644
--- a/languages/cpp/app_templates/qmakeempty/Makefile.am
+++ b/languages/cpp/app_templates/qmakeempty/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = qmakeempty.tdevelop \
+dataFiles = qmakeempty.kdevelop \
 	qmakeempty.pro qmakeempty.png
 
 templateName = qmakeempty
diff --git a/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevelop b/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/qmakeempty/qmakeempty.tdevelop
rename to languages/cpp/app_templates/qmakeempty/qmakeempty.kdevelop
index 3dc8acbb..74dee1ae 100644
--- a/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevelop
+++ b/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate b/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate
index 19c03688..58a84237 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.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/qmakeempty.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/qmakesimple/CMakeLists.txt b/languages/cpp/app_templates/qmakesimple/CMakeLists.txt
index 64b3b0bd..3693890b 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.tdevelop app.pro src.pro
+    main.cpp qmakesimple.png app.kdevelop app.pro src.pro
 )
 
 
diff --git a/languages/cpp/app_templates/qmakesimple/Makefile.am b/languages/cpp/app_templates/qmakesimple/Makefile.am
index ac17219f..a187172f 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.tdevelop app.pro src.pro
+dataFiles = main.cpp qmakesimple.png app.kdevelop app.pro src.pro
 templateName = qmakesimple
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/qmakesimple/app.tdevelop b/languages/cpp/app_templates/qmakesimple/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/qmakesimple/app.tdevelop
rename to languages/cpp/app_templates/qmakesimple/app.kdevelop
index 2af4f7ad..31180af7 100644
--- a/languages/cpp/app_templates/qmakesimple/app.tdevelop
+++ b/languages/cpp/app_templates/qmakesimple/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -97,4 +97,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate
index 8f2dbee7..d9d03936 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.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/qt4hello/CMakeLists.txt b/languages/cpp/app_templates/qt4hello/CMakeLists.txt
index 7ec55256..9ee76557 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.tdevelop qt4hello.pro
+    main.cpp qt4hello.png qt4hello.kdevelop qt4hello.pro
     src.pro ReadMe
 )
 
diff --git a/languages/cpp/app_templates/qt4hello/Makefile.am b/languages/cpp/app_templates/qt4hello/Makefile.am
index 3f735466..b285f781 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.tdevelop \
+dataFiles = main.cpp qt4hello.png qt4hello.kdevelop \
 	qt4hello.pro src.pro ReadMe
 
 templateName = qt4hello
diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevelop b/languages/cpp/app_templates/qt4hello/qt4hello.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevelop
rename to languages/cpp/app_templates/qt4hello/qt4hello.kdevelop
index 3dc8acbb..74dee1ae 100644
--- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevelop
+++ b/languages/cpp/app_templates/qt4hello/qt4hello.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate b/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate
index 2ea95b83..02762b7c 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.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/qt4hello.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt b/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt
index 422740dc..9b294a7b 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.tdevelop qt4makeapp.pro src.pro application.qrc
+    qt4makeapp.kdevelop 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 68f78acb..62c4c120 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.tdevelop \
+dataFiles = main.cpp qt4makeapp.cpp qt4makeapp.h qt4makeapp.png qt4makeapp.kdevelop \
 	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/qt4hello/qt4hello.tdevelop b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/qt4hello/qt4hello.tdevelop
rename to languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevelop
index 3dc8acbb..74dee1ae 100644
--- a/languages/cpp/app_templates/qt4hello/qt4hello.tdevelop
+++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate
index 1aea3b21..3bbadff1 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.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/qt4makeapp.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/qtopia4app/CMakeLists.txt b/languages/cpp/app_templates/qtopia4app/CMakeLists.txt
index 57849362..70331f8f 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.tdevelop example.desktop example.html
+    Example.png app.kdevelop 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 324291bb..57785690 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.tdevelop example.desktop \
+dataFiles = Example.png app.kdevelop 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.tdevelop b/languages/cpp/app_templates/qtopia4app/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/qtopia4app/app.tdevelop
rename to languages/cpp/app_templates/qtopia4app/app.kdevelop
index b890135e..e6dd32b1 100644
--- a/languages/cpp/app_templates/qtopia4app/app.tdevelop
+++ b/languages/cpp/app_templates/qtopia4app/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -160,4 +160,4 @@
       <designerpluginpaths/>
     </qt>
   </kdevcppsupport>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate b/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate
index e6a7ec9e..72a961c0 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.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt b/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt
index 424d19bc..959515e9 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.tdevelop example.control example.desktop
+    Example.png app.kdevelop 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 afaaf294..c250d5fa 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.tdevelop example.control example.desktop \
+dataFiles = Example.png app.kdevelop 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.tdevelop b/languages/cpp/app_templates/qtopiaapp/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/qtopiaapp/app.tdevelop
rename to languages/cpp/app_templates/qtopiaapp/app.kdevelop
index 962f4622..5e022527 100644
--- a/languages/cpp/app_templates/qtopiaapp/app.tdevelop
+++ b/languages/cpp/app_templates/qtopiaapp/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -128,4 +128,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate b/languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate
index 5c7dcc36..e1bb67f9 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.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/tdecmodule/CMakeLists.txt b/languages/cpp/app_templates/tdecmodule/CMakeLists.txt
index 072f5f5e..0cbea67f 100644
--- a/languages/cpp/app_templates/tdecmodule/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdecmodule/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( tdecmodule.tar.gz ALL
   COMMAND tar zcf tdecmodule.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    module.cpp module.h module.desktop module.tdevelop
+    module.cpp module.h module.desktop module.kdevelop
     src-Makefile.am tdecmodule.png subdirs
 )
 
diff --git a/languages/cpp/app_templates/tdecmodule/Makefile.am b/languages/cpp/app_templates/tdecmodule/Makefile.am
index b3b19611..e2931cf3 100644
--- a/languages/cpp/app_templates/tdecmodule/Makefile.am
+++ b/languages/cpp/app_templates/tdecmodule/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = module.cpp module.h module.desktop module.tdevelop \
+dataFiles = module.cpp module.h module.desktop module.kdevelop \
 	src-Makefile.am tdecmodule.png subdirs
 templateName = tdecmodule
 
diff --git a/languages/cpp/app_templates/tdecmodule/module.tdevelop b/languages/cpp/app_templates/tdecmodule/module.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/tdecmodule/module.tdevelop
rename to languages/cpp/app_templates/tdecmodule/module.kdevelop
index 7b5a57c0..e5cf723b 100644
--- a/languages/cpp/app_templates/tdecmodule/module.tdevelop
+++ b/languages/cpp/app_templates/tdecmodule/module.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate b/languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate
index 1e0c8bc4..329bb1e4 100644
--- a/languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate
+++ b/languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate
@@ -102,8 +102,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/module.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/module.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir3]
 Type=mkdir
diff --git a/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt b/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt
index 32dd830c..ec41c568 100644
--- a/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( tdeconfig35.tar.gz ALL
   COMMAND tar zcf tdeconfig35.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     src-Makefile.am app.cpp app.h main.cpp appui.rc
-    app.tdevelop subdirs app.desktop kxt35.png appview.h
+    app.kdevelop 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/tdeconfig35/Makefile.am b/languages/cpp/app_templates/tdeconfig35/Makefile.am
index a172f05f..ed4c5615 100644
--- a/languages/cpp/app_templates/tdeconfig35/Makefile.am
+++ b/languages/cpp/app_templates/tdeconfig35/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \
+dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.kdevelop \
 	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/tdeconfig35/app.tdevelop b/languages/cpp/app_templates/tdeconfig35/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/tdeconfig35/app.tdevelop
rename to languages/cpp/app_templates/tdeconfig35/app.kdevelop
index 6a53f237..bab312f9 100644
--- a/languages/cpp/app_templates/tdeconfig35/app.tdevelop
+++ b/languages/cpp/app_templates/tdeconfig35/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -165,4 +165,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate b/languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate
index b9edfb7a..9248f403 100644
--- a/languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate
+++ b/languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate
@@ -85,8 +85,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt b/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt
index 5462742c..4d781998 100644
--- a/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( tdefileplugin.tar.gz ALL
   COMMAND tar zcf tdefileplugin.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     README.devel tdefile_plugin.cpp tdefile_plugin.desktop
-    tdefile_plugin.h plugin.tdevelop tdefileplugin tdefileplugin.png
+    tdefile_plugin.h plugin.kdevelop tdefileplugin tdefileplugin.png
     src-Makefile.am subdirs
 )
 
diff --git a/languages/cpp/app_templates/tdefileplugin/Makefile.am b/languages/cpp/app_templates/tdefileplugin/Makefile.am
index 019d2d7c..ca98b6a4 100644
--- a/languages/cpp/app_templates/tdefileplugin/Makefile.am
+++ b/languages/cpp/app_templates/tdefileplugin/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = README.devel tdefile_plugin.cpp tdefile_plugin.desktop \
-	tdefile_plugin.h plugin.tdevelop tdefileplugin tdefileplugin.png \
+	tdefile_plugin.h plugin.kdevelop tdefileplugin tdefileplugin.png \
 	src-Makefile.am subdirs
 templateName = tdefileplugin
 
diff --git a/languages/cpp/app_templates/tdefileplugin/plugin.tdevelop b/languages/cpp/app_templates/tdefileplugin/plugin.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/tdefileplugin/plugin.tdevelop
rename to languages/cpp/app_templates/tdefileplugin/plugin.kdevelop
index f09030c1..7316ac29 100644
--- a/languages/cpp/app_templates/tdefileplugin/plugin.tdevelop
+++ b/languages/cpp/app_templates/tdefileplugin/plugin.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -111,4 +111,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate b/languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate
index 2e53acc7..38097fff 100644
--- a/languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate
+++ b/languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate
@@ -98,8 +98,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/plugin.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/plugin.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/cpp/app_templates/tdeioslave/CMakeLists.txt b/languages/cpp/app_templates/tdeioslave/CMakeLists.txt
index 584bdc19..934e60c5 100644
--- a/languages/cpp/app_templates/tdeioslave/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdeioslave/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( tdeioslave.tar.gz ALL
   COMMAND tar zcf tdeioslave.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    slave.cpp slave.h slave.protocol slave.tdevelop
+    slave.cpp slave.h slave.protocol slave.kdevelop
     src-Makefile.am tdeioslave.png subdirs
 )
 
diff --git a/languages/cpp/app_templates/tdeioslave/Makefile.am b/languages/cpp/app_templates/tdeioslave/Makefile.am
index bee7ddb6..3b8987c7 100644
--- a/languages/cpp/app_templates/tdeioslave/Makefile.am
+++ b/languages/cpp/app_templates/tdeioslave/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = slave.cpp slave.h slave.protocol slave.tdevelop \
+dataFiles = slave.cpp slave.h slave.protocol slave.kdevelop \
 	src-Makefile.am  tdeioslave.png subdirs
 templateName = tdeioslave
 
diff --git a/languages/cpp/app_templates/tdeioslave/slave.tdevelop b/languages/cpp/app_templates/tdeioslave/slave.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/tdeioslave/slave.tdevelop
rename to languages/cpp/app_templates/tdeioslave/slave.kdevelop
index cb257385..9d4ff189 100644
--- a/languages/cpp/app_templates/tdeioslave/slave.tdevelop
+++ b/languages/cpp/app_templates/tdeioslave/slave.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate b/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate
index 2ff27786..96d6ac6d 100644
--- a/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate
+++ b/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate
@@ -89,8 +89,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/slave.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/slave.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir3]
 Type=mkdir
diff --git a/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt b/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt
index b1149d88..587daea4 100644
--- a/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( tdescreensaver.tar.gz ALL
   COMMAND tar zcf tdescreensaver.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     tdescreensaver.desktop tdescreensaver.png tdescreensaver.h
     tdescreensaverui.ui src-Makefile.am tdescreensaver.cpp
-    tdescreensaver.tdevelop subdirs
+    tdescreensaver.kdevelop subdirs
 )
 
 
diff --git a/languages/cpp/app_templates/tdescreensaver/Makefile.am b/languages/cpp/app_templates/tdescreensaver/Makefile.am
index bee93bbc..4893c7af 100644
--- a/languages/cpp/app_templates/tdescreensaver/Makefile.am
+++ b/languages/cpp/app_templates/tdescreensaver/Makefile.am
@@ -1,6 +1,6 @@
 dataFiles = tdescreensaver.desktop tdescreensaver.png tdescreensaver.h \
 	tdescreensaverui.ui src-Makefile.am tdescreensaver.cpp \
-	tdescreensaver.tdevelop subdirs
+	tdescreensaver.kdevelop subdirs
 
 templateName= tdescreensaver
 
diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop
rename to languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevelop
index 28e0a678..4dcb2fe7 100644
--- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate
index 91510f04..9238cf40 100644
--- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate
@@ -102,8 +102,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/tdescreensaver.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/tdescreensaver.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir3]
 Type=mkdir
diff --git a/languages/cpp/app_templates/win32gui/CMakeLists.txt b/languages/cpp/app_templates/win32gui/CMakeLists.txt
index 09d0bc52..9aa12a42 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.tdevelop
+    app.kdevelop
 )
 
 
diff --git a/languages/cpp/app_templates/win32gui/Makefile.am b/languages/cpp/app_templates/win32gui/Makefile.am
index a29fa6a8..66931bfd 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.tdevelop
+	win32gui-configure.in win32gui.png app.kdevelop
 
 templateName = win32gui
 
diff --git a/languages/cpp/app_templates/win32gui/app.tdevelop b/languages/cpp/app_templates/win32gui/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/win32gui/app.tdevelop
rename to languages/cpp/app_templates/win32gui/app.kdevelop
index eb9bbdbd..d219ec2c 100644
--- a/languages/cpp/app_templates/win32gui/app.tdevelop
+++ b/languages/cpp/app_templates/win32gui/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -189,4 +189,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate b/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate
index dec00262..31f528d3 100644
--- a/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate
+++ b/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate
@@ -73,8 +73,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/win32hello/CMakeLists.txt b/languages/cpp/app_templates/win32hello/CMakeLists.txt
index bc1c8d80..d3d7d6ec 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.tdevelop
+    app.kdevelop
 )
 
 
diff --git a/languages/cpp/app_templates/win32hello/Makefile.am b/languages/cpp/app_templates/win32hello/Makefile.am
index a55bcebc..d6c7dfad 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.tdevelop
+	win32-configure.in win32hello.png app.kdevelop
 
 templateName = win32hello
 
diff --git a/languages/cpp/app_templates/win32hello/app.tdevelop b/languages/cpp/app_templates/win32hello/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/win32hello/app.tdevelop
rename to languages/cpp/app_templates/win32hello/app.kdevelop
index 672646c4..9bfbc181 100644
--- a/languages/cpp/app_templates/win32hello/app.tdevelop
+++ b/languages/cpp/app_templates/win32hello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -161,4 +161,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/win32hello/win32hello.kdevtemplate b/languages/cpp/app_templates/win32hello/win32hello.kdevtemplate
index 3b5f4f3e..970f00e5 100644
--- a/languages/cpp/app_templates/win32hello/win32hello.kdevtemplate
+++ b/languages/cpp/app_templates/win32hello/win32hello.kdevtemplate
@@ -72,8 +72,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/wxhello/CMakeLists.txt b/languages/cpp/app_templates/wxhello/CMakeLists.txt
index f1a8ffec..57ec33db 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.tdevelop subdirs
+    src-Makefile.am app.cpp app.h app.kdevelop subdirs
     app.desktop wxhello.png
 )
 
diff --git a/languages/cpp/app_templates/wxhello/Makefile.am b/languages/cpp/app_templates/wxhello/Makefile.am
index c45b1d10..5f1a213a 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.tdevelop subdirs \
+dataFiles = src-Makefile.am app.cpp app.h app.kdevelop subdirs \
 	app.desktop wxhello.png
 
 templateName = wxhello
diff --git a/languages/cpp/app_templates/wxhello/app.tdevelop b/languages/cpp/app_templates/wxhello/app.kdevelop
similarity index 99%
rename from languages/cpp/app_templates/wxhello/app.tdevelop
rename to languages/cpp/app_templates/wxhello/app.kdevelop
index 9de4fa75..d0b42d14 100644
--- a/languages/cpp/app_templates/wxhello/app.tdevelop
+++ b/languages/cpp/app_templates/wxhello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -111,4 +111,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/app_templates/wxhello/wxhello b/languages/cpp/app_templates/wxhello/wxhello
index ac2672ad..ffce6780 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.tdevelop
-Dest=%{dest}/${APPNAMELC}.tdevelop
+Source=%{src}/template-wxhello/app.kdevelop
+Dest=%{dest}/${APPNAMELC}.kdevelop
 
 [WXMAKEFILE.AM]
 Type=install
diff --git a/languages/cpp/app_templates/wxhello/wxhello.kdevtemplate b/languages/cpp/app_templates/wxhello/wxhello.kdevtemplate
index ed1cbc6a..6ffb5e0e 100644
--- a/languages/cpp/app_templates/wxhello/wxhello.kdevtemplate
+++ b/languages/cpp/app_templates/wxhello/wxhello.kdevtemplate
@@ -101,8 +101,8 @@ File=%{tdevelop}/template-common/wx.kdevtemplate
 
 [FILE4]
 Type=install
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/cpp/bithelpers.h b/languages/cpp/bithelpers.h
index 4ca54950..3cb74420 100644
--- a/languages/cpp/bithelpers.h
+++ b/languages/cpp/bithelpers.h
@@ -1,7 +1,7 @@
 
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/completiondebug.cpp b/languages/cpp/completiondebug.cpp
index 8774d9e8..dc73329e 100644
--- a/languages/cpp/completiondebug.cpp
+++ b/languages/cpp/completiondebug.cpp
@@ -1,7 +1,7 @@
 
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/completiondebug.h b/languages/cpp/completiondebug.h
index 75823296..325ad193 100644
--- a/languages/cpp/completiondebug.h
+++ b/languages/cpp/completiondebug.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 copyright            : (C) 2006 by David Nolden
-email                : david.nolden.tdevelop@art-master.de
+email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 /***************************************************************************
  *                                                                         *
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index 11a949a8..582fef1b 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -1468,19 +1468,19 @@ bool CppSupportPart::parseProject( bool force )
 
 	_jd = new JobData;
 	if( TQFileInfo( project() ->projectDirectory() + "/" + project()->projectName().lower()
-				+ ".tdevelop.pcs" ).exists())
+				+ ".kdevelop.pcs" ).exists())
 	{
 		TQDir d( project() ->projectDirectory());
-		d.rename(project() ->projectName().lower() + ".tdevelop.pcs",
-					project() ->projectName() +".tdevelop.pcs");
+		d.rename(project() ->projectName().lower() + ".kdevelop.pcs",
+					project() ->projectName() +".kdevelop.pcs");
 	}
 	_jd->file.setName( project() ->projectDirectory() + "/" + project()->projectName()
-			+ ".tdevelop.pcs" );
+			+ ".kdevelop.pcs" );
 
 	TQString skip_file_name = project() ->projectDirectory() + "/" +
-		project() ->projectName() + ".tdevelop.ignore_pcs";
+		project() ->projectName() + ".kdevelop.ignore_pcs";
 	TQString skip_lower_file_name = project() ->projectDirectory() + "/" +
-		project() ->projectName().lower() + ".tdevelop.ignore_pcs";
+		project() ->projectName().lower() + ".kdevelop.ignore_pcs";
 
 	if ( !force && !TQFile::exists( skip_file_name ) &&
 			!TQFile::exists( skip_lower_file_name ) && _jd->file.open( IO_ReadOnly ) )
@@ -1620,10 +1620,10 @@ void CppSupportPart::slotParseFiles()
 				mainWindow( ) ->statusBar( ) ->message( i18n( "Done" ), 2000 );
 				TQFile::remove( project() ->projectDirectory()
 						+ "/" + project() ->projectName()
-						+ ".tdevelop.ignore_pcs" );
+						+ ".kdevelop.ignore_pcs" );
 				TQFile::remove( project() ->projectDirectory()
 						+ "/" + project() ->projectName().lower()
-						+ ".tdevelop.ignore_pcs" );
+						+ ".kdevelop.ignore_pcs" );
 
 			}
 			else
@@ -2160,7 +2160,7 @@ void CppSupportPart::saveProjectSourceInfo()
 		return ;
 
 	TQFile f( project() ->projectDirectory() + "/"
-			+ project() ->projectName() + ".tdevelop.pcs" );
+			+ project() ->projectName() + ".kdevelop.pcs" );
 	if ( !f.open( IO_WriteOnly ) )
 		return ;
 
@@ -2201,9 +2201,9 @@ void CppSupportPart::saveProjectSourceInfo()
 	}
 
 	TQFile::remove(  project() ->projectDirectory() + "/"
-			+ project() ->projectName() + ".tdevelop.ignore_pcs" );
+			+ project() ->projectName() + ".kdevelop.ignore_pcs" );
 	TQFile::remove(  project() ->projectDirectory() + "/"
-			+ project() ->projectName().lower() + ".tdevelop.ignore_pcs" );
+			+ project() ->projectName().lower() + ".kdevelop.ignore_pcs" );
 
 	m_backgroundParser->unlock();
 }
@@ -2714,7 +2714,7 @@ void CppSupportPart::createIgnorePCSFile( )
 	static TQCString skip_me( "ignore me\n" );
 
 	TQString skip_file_name = project() ->projectDirectory() + "/"
-		+ project() ->projectName() + ".tdevelop.ignore_pcs";
+		+ project() ->projectName() + ".kdevelop.ignore_pcs";
 	TQFile skip_pcs_file( skip_file_name );
 	if ( skip_pcs_file.open( IO_WriteOnly ) )
 	{
diff --git a/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop b/languages/cpp/debugger/tests/breakpoints/breakpoints.kdevelop
similarity index 99%
rename from languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop
rename to languages/cpp/debugger/tests/breakpoints/breakpoints.kdevelop
index 54214a1b..4b3b07c9 100644
--- a/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop
+++ b/languages/cpp/debugger/tests/breakpoints/breakpoints.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>Vladimir Prus</author>
     <email>ghost@ghostwalk</email>
@@ -160,4 +160,4 @@
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/debugger/tests/dll/dll.tdevelop b/languages/cpp/debugger/tests/dll/dll.kdevelop
similarity index 99%
rename from languages/cpp/debugger/tests/dll/dll.tdevelop
rename to languages/cpp/debugger/tests/dll/dll.kdevelop
index f92f1d08..dbeb12b3 100644
--- a/languages/cpp/debugger/tests/dll/dll.tdevelop
+++ b/languages/cpp/debugger/tests/dll/dll.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>Vladimir Prus</author>
     <email>ghost@ghostwalk</email>
@@ -155,4 +155,4 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
   </kdevfileview>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop b/languages/cpp/debugger/tests/infinite_loop/infinite_loop.kdevelop
similarity index 99%
rename from languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop
rename to languages/cpp/debugger/tests/infinite_loop/infinite_loop.kdevelop
index 267a73d8..24055c6f 100644
--- a/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop
+++ b/languages/cpp/debugger/tests/infinite_loop/infinite_loop.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>Vladimir Prus</author>
     <email>ghost@zigzag</email>
@@ -106,4 +106,4 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
   </kdevfileview>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop b/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop
similarity index 99%
rename from languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop
rename to languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop
index a838d09d..03faba9a 100644
--- a/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop
+++ b/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>Vladimir Prus</author>
     <email>ghost@cs.msu.su</email>
@@ -215,4 +215,4 @@
     <graphicFilter>-f0</graphicFilter>
     <scaling>-1</scaling>
   </kdevvisualadvance>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/debugger/tests/segfault/segfault.tdevelop b/languages/cpp/debugger/tests/segfault/segfault.kdevelop
similarity index 99%
rename from languages/cpp/debugger/tests/segfault/segfault.tdevelop
rename to languages/cpp/debugger/tests/segfault/segfault.kdevelop
index 4eccf2e1..0135e84b 100644
--- a/languages/cpp/debugger/tests/segfault/segfault.tdevelop
+++ b/languages/cpp/debugger/tests/segfault/segfault.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>Vladimir Prus</author>
     <email>ghost@zigzag</email>
@@ -160,4 +160,4 @@
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/debugger/tests/threads/threads.tdevelop b/languages/cpp/debugger/tests/threads/threads.kdevelop
similarity index 99%
rename from languages/cpp/debugger/tests/threads/threads.tdevelop
rename to languages/cpp/debugger/tests/threads/threads.kdevelop
index 048b3aed..3cd806b8 100644
--- a/languages/cpp/debugger/tests/threads/threads.tdevelop
+++ b/languages/cpp/debugger/tests/threads/threads.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>Vladimir Prus</author>
     <email>ghost@zigzag</email>
@@ -98,4 +98,4 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
   </kdevfileview>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/debugger/tests/tracing/tracing.tdevelop b/languages/cpp/debugger/tests/tracing/tracing.kdevelop
similarity index 99%
rename from languages/cpp/debugger/tests/tracing/tracing.tdevelop
rename to languages/cpp/debugger/tests/tracing/tracing.kdevelop
index 56743de1..94d39c6f 100644
--- a/languages/cpp/debugger/tests/tracing/tracing.tdevelop
+++ b/languages/cpp/debugger/tests/tracing/tracing.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>Vladimir Prus</author>
     <email>ghost@ghostwalk</email>
@@ -160,4 +160,4 @@
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/debugger/tests/two_module/two_module.tdevelop b/languages/cpp/debugger/tests/two_module/two_module.kdevelop
similarity index 99%
rename from languages/cpp/debugger/tests/two_module/two_module.tdevelop
rename to languages/cpp/debugger/tests/two_module/two_module.kdevelop
index a6d22c2a..a9ecc5ad 100644
--- a/languages/cpp/debugger/tests/two_module/two_module.tdevelop
+++ b/languages/cpp/debugger/tests/two_module/two_module.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>Vladimir Prus</author>
     <email>ghost@ghostwalk</email>
@@ -160,4 +160,4 @@
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-</tdevelop>
+</kdevelop>
diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp
index 089b57ec..cc3f3244 100644
--- a/languages/cpp/includepathresolver.cpp
+++ b/languages/cpp/includepathresolver.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2007 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/includepathresolver.h b/languages/cpp/includepathresolver.h
index f7e32b0d..1fa08d91 100644
--- a/languages/cpp/includepathresolver.h
+++ b/languages/cpp/includepathresolver.h
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2007 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/safetycounter.h b/languages/cpp/safetycounter.h
index a885e31a..d4333176 100644
--- a/languages/cpp/safetycounter.h
+++ b/languages/cpp/safetycounter.h
@@ -1,7 +1,7 @@
 
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp
index db3f9c79..da73f252 100644
--- a/languages/cpp/simpletype.cpp
+++ b/languages/cpp/simpletype.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
   copyright            : (C) 2006 by David Nolden
-  email                : david.nolden.tdevelop@art-master.de
+  email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletype.h b/languages/cpp/simpletype.h
index c6652be1..1e9a0157 100644
--- a/languages/cpp/simpletype.h
+++ b/languages/cpp/simpletype.h
@@ -1,7 +1,7 @@
 
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletypecachebinder.h b/languages/cpp/simpletypecachebinder.h
index 6b6898fb..3f950cbf 100644
--- a/languages/cpp/simpletypecachebinder.h
+++ b/languages/cpp/simpletypecachebinder.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  copyright            : (C) 2006 by David Nolden
- email                : david.nolden.tdevelop@art-master.de
+ email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletypecatalog.cpp b/languages/cpp/simpletypecatalog.cpp
index edf4dfbb..f662acc5 100644
--- a/languages/cpp/simpletypecatalog.cpp
+++ b/languages/cpp/simpletypecatalog.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletypecatalog.h b/languages/cpp/simpletypecatalog.h
index ba674d16..e22a3fcf 100644
--- a/languages/cpp/simpletypecatalog.h
+++ b/languages/cpp/simpletypecatalog.h
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletypefunction.cpp b/languages/cpp/simpletypefunction.cpp
index b6367d4d..0af7bdc8 100644
--- a/languages/cpp/simpletypefunction.cpp
+++ b/languages/cpp/simpletypefunction.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletypefunction.h b/languages/cpp/simpletypefunction.h
index 72afa4e7..90b5fcab 100644
--- a/languages/cpp/simpletypefunction.h
+++ b/languages/cpp/simpletypefunction.h
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletypenamespace.cpp b/languages/cpp/simpletypenamespace.cpp
index d5206810..f7937db1 100644
--- a/languages/cpp/simpletypenamespace.cpp
+++ b/languages/cpp/simpletypenamespace.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 copyright            : (C) 2006 by David Nolden
-email                : david.nolden.tdevelop@art-master.de
+email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/simpletypenamespace.h b/languages/cpp/simpletypenamespace.h
index b0a645ec..b465cfb6 100644
--- a/languages/cpp/simpletypenamespace.h
+++ b/languages/cpp/simpletypenamespace.h
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/stringhelpers.cpp b/languages/cpp/stringhelpers.cpp
index 0d9cba0f..bc267c15 100644
--- a/languages/cpp/stringhelpers.cpp
+++ b/languages/cpp/stringhelpers.cpp
@@ -1,7 +1,7 @@
 
 /***************************************************************************
 k   copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/stringhelpers.h b/languages/cpp/stringhelpers.h
index 8f781073..33e01827 100644
--- a/languages/cpp/stringhelpers.h
+++ b/languages/cpp/stringhelpers.h
@@ -1,7 +1,7 @@
 
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/typedecoration.h b/languages/cpp/typedecoration.h
index ecb8e3b1..e142d837 100644
--- a/languages/cpp/typedecoration.h
+++ b/languages/cpp/typedecoration.h
@@ -1,6 +1,6 @@
 /***************************************************************************
   copyright            : (C) 2006 by David Nolden
-  email                : david.nolden.tdevelop@art-master.de
+  email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/typedesc.cpp b/languages/cpp/typedesc.cpp
index c4b90f51..f63f8361 100644
--- a/languages/cpp/typedesc.cpp
+++ b/languages/cpp/typedesc.cpp
@@ -2,7 +2,7 @@
                         cppcodecompletion.cpp  -  description
                            -------------------
   copyright            : (C) 2006 by David Nolden
-  email                : david.nolden.tdevelop@art-master.de
+  email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/cpp/typedesc.h b/languages/cpp/typedesc.h
index f2746a03..77af4e00 100644
--- a/languages/cpp/typedesc.h
+++ b/languages/cpp/typedesc.h
@@ -1,6 +1,6 @@
 /***************************************************************************
   copyright            : (C) 2006 by David Nolden
-  email                : david.nolden.tdevelop@art-master.de
+  email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/languages/fortran/app_templates/fortranhello/CMakeLists.txt b/languages/fortran/app_templates/fortranhello/CMakeLists.txt
index 74709631..f0b40cf6 100644
--- a/languages/fortran/app_templates/fortranhello/CMakeLists.txt
+++ b/languages/fortran/app_templates/fortranhello/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( fortranhello.tar.gz ALL
   COMMAND tar zcf fortranhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     main.f src-Makefile.am fortran-Makefile.am
     fortran-Makefile.cvs configure.in fortranhello.png
-    app.tdevelop
+    app.kdevelop
 )
 
 
diff --git a/languages/fortran/app_templates/fortranhello/Makefile.am b/languages/fortran/app_templates/fortranhello/Makefile.am
index 3bf32575..ba97453d 100644
--- a/languages/fortran/app_templates/fortranhello/Makefile.am
+++ b/languages/fortran/app_templates/fortranhello/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = main.f src-Makefile.am fortran-Makefile.am fortran-Makefile.cvs \
-	configure.in fortranhello.png app.tdevelop
+	configure.in fortranhello.png app.kdevelop
 templateName = fortranhello
 
 ### no need to change below:
diff --git a/languages/fortran/app_templates/fortranhello/app.tdevelop b/languages/fortran/app_templates/fortranhello/app.kdevelop
similarity index 99%
rename from languages/fortran/app_templates/fortranhello/app.tdevelop
rename to languages/fortran/app_templates/fortranhello/app.kdevelop
index f97fd76a..b4abc5ae 100644
--- a/languages/fortran/app_templates/fortranhello/app.tdevelop
+++ b/languages/fortran/app_templates/fortranhello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -110,4 +110,4 @@
       <group pattern="*.F;*.fpp;*.FPP" name="Fortran77 source files" />
     </groups>
   </kdevfileview>
-</tdevelop>
+</kdevelop>
diff --git a/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate b/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate
index e4c5cb33..117a0f50 100644
--- a/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate
+++ b/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate
@@ -76,8 +76,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/java/app_templates/javahello/CMakeLists.txt b/languages/java/app_templates/javahello/CMakeLists.txt
index 8129bbc1..bbfc746f 100644
--- a/languages/java/app_templates/javahello/CMakeLists.txt
+++ b/languages/java/app_templates/javahello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( javahello.tar.gz ALL
   COMMAND tar zcf javahello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    Main.java build.xml javahello.filelist javahello.tdevelop
+    Main.java build.xml javahello.filelist javahello.kdevelop
 )
 
 
diff --git a/languages/java/app_templates/javahello/Makefile.am b/languages/java/app_templates/javahello/Makefile.am
index f47e7056..8551a6ac 100644
--- a/languages/java/app_templates/javahello/Makefile.am
+++ b/languages/java/app_templates/javahello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = Main.java build.xml javahello.filelist javahello.tdevelop
+dataFiles = Main.java build.xml javahello.filelist javahello.kdevelop
 templateName= javahello
 
 ### no need to change below:
diff --git a/languages/java/app_templates/javahello/javahello.tdevelop b/languages/java/app_templates/javahello/javahello.kdevelop
similarity index 98%
rename from languages/java/app_templates/javahello/javahello.tdevelop
rename to languages/java/app_templates/javahello/javahello.kdevelop
index a41fae72..c3eb6898 100644
--- a/languages/java/app_templates/javahello/javahello.tdevelop
+++ b/languages/java/app_templates/javahello/javahello.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -66,4 +66,4 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
   </kdevfileview>
-</tdevelop>
+</kdevelop>
diff --git a/languages/java/app_templates/javahello/javahello.kdevtemplate b/languages/java/app_templates/javahello/javahello.kdevtemplate
index 62fcffc5..a7427704 100644
--- a/languages/java/app_templates/javahello/javahello.kdevtemplate
+++ b/languages/java/app_templates/javahello/javahello.kdevtemplate
@@ -73,8 +73,8 @@ Archive=javahello.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/javahello.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/javahello.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/java/app_templates/kappjava/CMakeLists.txt b/languages/java/app_templates/kappjava/CMakeLists.txt
index 042872fd..3b4abe1e 100644
--- a/languages/java/app_templates/kappjava/CMakeLists.txt
+++ b/languages/java/app_templates/kappjava/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( kappjava.tar.gz ALL
   COMMAND tar zcf kappjava.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     app.java pref.java appview.java app_client.java appui.rc
-    src-Makefile.am kappjava.png app.tdevelop subdirs
+    src-Makefile.am kappjava.png app.kdevelop subdirs
 )
 
 
diff --git a/languages/java/app_templates/kappjava/Makefile.am b/languages/java/app_templates/kappjava/Makefile.am
index edbd4468..4cda2ef7 100644
--- a/languages/java/app_templates/kappjava/Makefile.am
+++ b/languages/java/app_templates/kappjava/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = app.java pref.java appview.java  app_client.java appui.rc \
-	src-Makefile.am kappjava.png app.tdevelop subdirs
+	src-Makefile.am kappjava.png app.kdevelop subdirs
 templateName = kappjava
 
 ### no need to change below:
diff --git a/languages/java/app_templates/kappjava/app.tdevelop b/languages/java/app_templates/kappjava/app.kdevelop
similarity index 98%
rename from languages/java/app_templates/kappjava/app.tdevelop
rename to languages/java/app_templates/kappjava/app.kdevelop
index 7ee74558..078f5c1a 100644
--- a/languages/java/app_templates/kappjava/app.tdevelop
+++ b/languages/java/app_templates/kappjava/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -85,4 +85,4 @@
       <type ext="java"/>
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/languages/java/app_templates/kappjava/kappjava.kdevtemplate b/languages/java/app_templates/kappjava/kappjava.kdevtemplate
index 92cf4710..9f444195 100644
--- a/languages/java/app_templates/kappjava/kappjava.kdevtemplate
+++ b/languages/java/app_templates/kappjava/kappjava.kdevtemplate
@@ -78,8 +78,8 @@ File=%{tdevelop}/template-common/dockbook.kdevtemplate
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/java/app_templates/superwaba/CMakeLists.txt b/languages/java/app_templates/superwaba/CMakeLists.txt
index 58932352..160b1a14 100644
--- a/languages/java/app_templates/superwaba/CMakeLists.txt
+++ b/languages/java/app_templates/superwaba/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( superwaba.tar.gz ALL
   COMMAND tar zcf superwaba.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    superwaba.png sw.java src-Makefile sw.tdevelop sw.filelist
+    superwaba.png sw.java src-Makefile sw.kdevelop sw.filelist
 )
 
 
diff --git a/languages/java/app_templates/superwaba/Makefile.am b/languages/java/app_templates/superwaba/Makefile.am
index bc706fe6..8c27b8d5 100644
--- a/languages/java/app_templates/superwaba/Makefile.am
+++ b/languages/java/app_templates/superwaba/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = superwaba.png sw.java src-Makefile sw.tdevelop sw.filelist
+dataFiles = superwaba.png sw.java src-Makefile sw.kdevelop sw.filelist
 templateName = superwaba
 
 ### no need to change below:
diff --git a/languages/java/app_templates/superwaba/superwaba b/languages/java/app_templates/superwaba/superwaba
index 17183f35..779df155 100644
--- a/languages/java/app_templates/superwaba/superwaba
+++ b/languages/java/app_templates/superwaba/superwaba
@@ -31,8 +31,8 @@ Dest=%{dest}
 
 [PROJECT]
 Type=install
-Source=%{src}/sw.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/sw.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILELIST]
 Type=install
diff --git a/languages/java/app_templates/superwaba/superwaba.kdevtemplate b/languages/java/app_templates/superwaba/superwaba.kdevtemplate
index 27257770..1ea0a785 100644
--- a/languages/java/app_templates/superwaba/superwaba.kdevtemplate
+++ b/languages/java/app_templates/superwaba/superwaba.kdevtemplate
@@ -110,8 +110,8 @@ Dest=%{dest}
 [PROJECT]
 Type=install
 EscapeXML=true
-Source=%{src}/sw.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/sw.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILELIST]
 Type=install
diff --git a/languages/java/app_templates/superwaba/sw.tdevelop b/languages/java/app_templates/superwaba/sw.kdevelop
similarity index 99%
rename from languages/java/app_templates/superwaba/sw.tdevelop
rename to languages/java/app_templates/superwaba/sw.kdevelop
index 11db7411..bddee282 100644
--- a/languages/java/app_templates/superwaba/sw.tdevelop
+++ b/languages/java/app_templates/superwaba/sw.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -91,4 +91,4 @@
    <type ext="java"/>
   </useglobaltypes>
  </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index c4aa7390..f9bbbd88 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -508,12 +508,12 @@ JavaSupportPart::parseProject( )
     TQMap< TQString, TQPair<uint, uint> > pcs;
 
     if( TQFileInfo( project()->projectDirectory() + "/" +
-			    project()->projectName().lower() + ".tdevelop.pcs" ).exists() )
+			    project()->projectName().lower() + ".kdevelop.pcs" ).exists() )
     {
-        d.rename(project()->projectName().lower() + ".tdevelop.pcs",
-			project()->projectName() + ".tdevelop.pcs");
+        d.rename(project()->projectName().lower() + ".kdevelop.pcs",
+			project()->projectName() + ".kdevelop.pcs");
     }
-    TQFile f(project()->projectDirectory() + "/" + project()->projectName() + ".tdevelop.pcs");
+    TQFile f(project()->projectDirectory() + "/" + project()->projectName() + ".kdevelop.pcs");
     if( f.open(IO_ReadOnly) ){
 	stream.setDevice( &f );
 
@@ -846,7 +846,7 @@ void JavaSupportPart::saveProjectSourceInfo( )
 	return;
 
     TQFile f( project()->projectDirectory() + "/" +
-		    project()->projectName() + ".tdevelop.pcs" );
+		    project()->projectName() + ".kdevelop.pcs" );
     if( !f.open( IO_WriteOnly ) )
 	return;
 
diff --git a/languages/kjssupport/template/Makefile.am b/languages/kjssupport/template/Makefile.am
index 284227b7..3244188a 100644
--- a/languages/kjssupport/template/Makefile.am
+++ b/languages/kjssupport/template/Makefile.am
@@ -3,7 +3,7 @@ commondatadir = ${appwizarddatadir}/template-common
 jshellodir = ${appwizarddatadir}/template-jshello
 templatedir = ${appwizarddatadir}/templates
 
-jshello_DATA = app.js app.tdevelop
+jshello_DATA = app.js app.kdevelop
 template_DATA = jshello
 
 DISTCLEANFILES = script.local
diff --git a/languages/kjssupport/template/app.tdevelop b/languages/kjssupport/template/app.kdevelop
similarity index 97%
rename from languages/kjssupport/template/app.tdevelop
rename to languages/kjssupport/template/app.kdevelop
index cbef8262..2bb39a0a 100644
--- a/languages/kjssupport/template/app.tdevelop
+++ b/languages/kjssupport/template/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>$AUTHOR$</author>
   <email>$EMAIL$</email>
@@ -42,4 +42,4 @@
 			<type ext="js"/>
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/languages/kjssupport/template/script b/languages/kjssupport/template/script
index 1473d762..d3a808c5 100644
--- a/languages/kjssupport/template/script
+++ b/languages/kjssupport/template/script
@@ -5,7 +5,7 @@ use gideon;
 initGideon();
 
 print "Installing project file\n";
-installHTML( "${src}/template-jshello/app.tdevelop", "${dest}/${APPNAMELC}.tdevelop" );
+installHTML( "${src}/template-jshello/app.kdevelop", "${dest}/${APPNAMELC}.kdevelop" );
 
 print "Installing application sources\n";
 install( "${src}/template-jshello/app.js",       "${dest}/${APPNAMELC}.js" );
diff --git a/languages/pascal/app_templates/fpcgtk/CMakeLists.txt b/languages/pascal/app_templates/fpcgtk/CMakeLists.txt
index eb16e978..8a154204 100644
--- a/languages/pascal/app_templates/fpcgtk/CMakeLists.txt
+++ b/languages/pascal/app_templates/fpcgtk/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( fpcgtk.tar.gz ALL
   COMMAND tar zcf fpcgtk.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    main.pp app.tdevelop
+    main.pp app.kdevelop
 )
 
 
diff --git a/languages/pascal/app_templates/fpcgtk/Makefile.am b/languages/pascal/app_templates/fpcgtk/Makefile.am
index 5c4c116f..252cbf27 100644
--- a/languages/pascal/app_templates/fpcgtk/Makefile.am
+++ b/languages/pascal/app_templates/fpcgtk/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.pp app.tdevelop
+dataFiles = main.pp app.kdevelop
 templateName = fpcgtk
 
 ### no need to change below:
diff --git a/languages/pascal/app_templates/fpcgtk/app.tdevelop b/languages/pascal/app_templates/fpcgtk/app.kdevelop
similarity index 98%
rename from languages/pascal/app_templates/fpcgtk/app.tdevelop
rename to languages/pascal/app_templates/fpcgtk/app.kdevelop
index e7b3a147..995d340b 100644
--- a/languages/pascal/app_templates/fpcgtk/app.tdevelop
+++ b/languages/pascal/app_templates/fpcgtk/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -83,4 +83,4 @@
    <type ext="dpr"/>
   </useglobaltypes>
  </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate b/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate
index 45bb7eea..42e2be9d 100644
--- a/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate
+++ b/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate
@@ -69,8 +69,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir1]
 Type=mkdir
diff --git a/languages/pascal/app_templates/fpchello/CMakeLists.txt b/languages/pascal/app_templates/fpchello/CMakeLists.txt
index 12941440..f51b2517 100644
--- a/languages/pascal/app_templates/fpchello/CMakeLists.txt
+++ b/languages/pascal/app_templates/fpchello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( fpchello.tar.gz ALL
   COMMAND tar zcf fpchello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    main.pp app.tdevelop
+    main.pp app.kdevelop
 )
 
 
diff --git a/languages/pascal/app_templates/fpchello/Makefile.am b/languages/pascal/app_templates/fpchello/Makefile.am
index 744bc214..e09141dc 100644
--- a/languages/pascal/app_templates/fpchello/Makefile.am
+++ b/languages/pascal/app_templates/fpchello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.pp app.tdevelop
+dataFiles = main.pp app.kdevelop
 templateName = fpchello
 
 ### no need to change below:
diff --git a/languages/pascal/app_templates/fpchello/app.tdevelop b/languages/pascal/app_templates/fpchello/app.kdevelop
similarity index 98%
rename from languages/pascal/app_templates/fpchello/app.tdevelop
rename to languages/pascal/app_templates/fpchello/app.kdevelop
index a2f83092..f0a07582 100644
--- a/languages/pascal/app_templates/fpchello/app.tdevelop
+++ b/languages/pascal/app_templates/fpchello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -83,4 +83,4 @@
    <type ext="dpr"/>
   </useglobaltypes>
  </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/languages/pascal/app_templates/fpchello/fpchello.kdevtemplate b/languages/pascal/app_templates/fpchello/fpchello.kdevtemplate
index 65c46115..77c79101 100644
--- a/languages/pascal/app_templates/fpchello/fpchello.kdevtemplate
+++ b/languages/pascal/app_templates/fpchello/fpchello.kdevtemplate
@@ -70,8 +70,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir1]
 Type=mkdir
diff --git a/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt b/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt
index 52a5e4f7..de4923f3 100644
--- a/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt
+++ b/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( fpcsharedlib.tar.gz ALL
   COMMAND tar zcf fpcsharedlib.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    main.pp app.tdevelop
+    main.pp app.kdevelop
 )
 
 
diff --git a/languages/pascal/app_templates/fpcsharedlib/Makefile.am b/languages/pascal/app_templates/fpcsharedlib/Makefile.am
index d1d0eef4..6a7f1a85 100644
--- a/languages/pascal/app_templates/fpcsharedlib/Makefile.am
+++ b/languages/pascal/app_templates/fpcsharedlib/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.pp app.tdevelop
+dataFiles = main.pp app.kdevelop
 templateName = fpcsharedlib
 
 ### no need to change below:
diff --git a/languages/pascal/app_templates/fpcsharedlib/app.tdevelop b/languages/pascal/app_templates/fpcsharedlib/app.kdevelop
similarity index 95%
rename from languages/pascal/app_templates/fpcsharedlib/app.tdevelop
rename to languages/pascal/app_templates/fpcsharedlib/app.kdevelop
index 8249e017..bdf974e9 100644
--- a/languages/pascal/app_templates/fpcsharedlib/app.tdevelop
+++ b/languages/pascal/app_templates/fpcsharedlib/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -83,4 +83,4 @@
    <type ext="dpr"/>
   </useglobaltypes>
  </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate b/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate
index 35835599..f6b91c4d 100644
--- a/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate
+++ b/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate
@@ -70,8 +70,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir1]
 Type=mkdir
diff --git a/languages/pascal/app_templates/pascalhello/CMakeLists.txt b/languages/pascal/app_templates/pascalhello/CMakeLists.txt
index 3422a8ff..0c130705 100644
--- a/languages/pascal/app_templates/pascalhello/CMakeLists.txt
+++ b/languages/pascal/app_templates/pascalhello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( pascalhello.tar.gz ALL
   COMMAND tar zcf pascalhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    main.pp app.tdevelop
+    main.pp app.kdevelop
 )
 
 
diff --git a/languages/pascal/app_templates/pascalhello/Makefile.am b/languages/pascal/app_templates/pascalhello/Makefile.am
index 3e72435c..02924e72 100644
--- a/languages/pascal/app_templates/pascalhello/Makefile.am
+++ b/languages/pascal/app_templates/pascalhello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.pp app.tdevelop
+dataFiles = main.pp app.kdevelop
 templateName = pascalhello
 
 ### no need to change below:
diff --git a/languages/pascal/app_templates/pascalhello/app.tdevelop b/languages/pascal/app_templates/pascalhello/app.kdevelop
similarity index 98%
rename from languages/pascal/app_templates/pascalhello/app.tdevelop
rename to languages/pascal/app_templates/pascalhello/app.kdevelop
index 51e8c65e..fcb75f33 100644
--- a/languages/pascal/app_templates/pascalhello/app.tdevelop
+++ b/languages/pascal/app_templates/pascalhello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -80,4 +80,4 @@
    <type ext="dpr"/>
   </useglobaltypes>
  </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate b/languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate
index ed7104cb..5f2bb852 100644
--- a/languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate
+++ b/languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate
@@ -72,8 +72,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir1]
 Type=mkdir
diff --git a/languages/perl/app_templates/perlhello/CMakeLists.txt b/languages/perl/app_templates/perlhello/CMakeLists.txt
index bf51d851..820fda1e 100644
--- a/languages/perl/app_templates/perlhello/CMakeLists.txt
+++ b/languages/perl/app_templates/perlhello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( perlhello.tar.gz ALL
   COMMAND tar zcf perlhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.pl app.tdevelop
+    app.pl app.kdevelop
 )
 
 
diff --git a/languages/perl/app_templates/perlhello/Makefile.am b/languages/perl/app_templates/perlhello/Makefile.am
index b483b35b..1c1d7b33 100644
--- a/languages/perl/app_templates/perlhello/Makefile.am
+++ b/languages/perl/app_templates/perlhello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.pl app.tdevelop 
+dataFiles = app.pl app.kdevelop 
 templateName = perlhello
 
 ### no need to change below:
diff --git a/languages/perl/app_templates/perlhello/app.tdevelop b/languages/perl/app_templates/perlhello/app.kdevelop
similarity index 98%
rename from languages/perl/app_templates/perlhello/app.tdevelop
rename to languages/perl/app_templates/perlhello/app.kdevelop
index a83391b7..c781322d 100644
--- a/languages/perl/app_templates/perlhello/app.tdevelop
+++ b/languages/perl/app_templates/perlhello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -74,4 +74,4 @@
       <type ext="pm" />
     </useglobaltypes>
  </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/languages/perl/app_templates/perlhello/perlhello.kdevtemplate b/languages/perl/app_templates/perlhello/perlhello.kdevtemplate
index 8ec5a560..ead7b5b8 100644
--- a/languages/perl/app_templates/perlhello/perlhello.kdevtemplate
+++ b/languages/perl/app_templates/perlhello/perlhello.kdevtemplate
@@ -67,8 +67,8 @@ Archive=perlhello.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/php/app_templates/phphello/CMakeLists.txt b/languages/php/app_templates/phphello/CMakeLists.txt
index 4e534e08..ae644c70 100644
--- a/languages/php/app_templates/phphello/CMakeLists.txt
+++ b/languages/php/app_templates/phphello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( phphello.tar.gz ALL
   COMMAND tar zcf phphello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.php app.tdevelop
+    app.php app.kdevelop
 )
 
 
diff --git a/languages/php/app_templates/phphello/Makefile.am b/languages/php/app_templates/phphello/Makefile.am
index bc983960..12d29f1b 100644
--- a/languages/php/app_templates/phphello/Makefile.am
+++ b/languages/php/app_templates/phphello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.php app.tdevelop
+dataFiles = app.php app.kdevelop
 templateName = phphello
 
 ### no need to change below:
diff --git a/languages/php/app_templates/phphello/app.tdevelop b/languages/php/app_templates/phphello/app.kdevelop
similarity index 98%
rename from languages/php/app_templates/phphello/app.tdevelop
rename to languages/php/app_templates/phphello/app.kdevelop
index 2cdb1c70..c8844e1e 100644
--- a/languages/php/app_templates/phphello/app.tdevelop
+++ b/languages/php/app_templates/phphello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -84,4 +84,4 @@
       <group pattern="*.inc" name="Include files" />
     </groups>
   </kdevfileview>
-</tdevelop>
+</kdevelop>
diff --git a/languages/php/app_templates/phphello/phphello b/languages/php/app_templates/phphello/phphello
index 7ba99d9c..f9f1a69f 100644
--- a/languages/php/app_templates/phphello/phphello
+++ b/languages/php/app_templates/phphello/phphello
@@ -12,8 +12,8 @@ Archive=phphello.tar.gz
 
 [PROJECT]
 Type=install
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [APP.PHP]
 Type=install
diff --git a/languages/php/app_templates/phphello/phphello.kdevtemplate b/languages/php/app_templates/phphello/phphello.kdevtemplate
index 481f2748..8d52f490 100644
--- a/languages/php/app_templates/phphello/phphello.kdevtemplate
+++ b/languages/php/app_templates/phphello/phphello.kdevtemplate
@@ -67,8 +67,8 @@ Archive=phphello.tar.gz
 [PROJECT]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [APP.PHP]
 Type=install
diff --git a/languages/python/app_templates/pyqt/CMakeLists.txt b/languages/python/app_templates/pyqt/CMakeLists.txt
index 672d6652..131e2165 100644
--- a/languages/python/app_templates/pyqt/CMakeLists.txt
+++ b/languages/python/app_templates/pyqt/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( pyqt.tar.gz ALL
   COMMAND tar zcf pyqt.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.py app.tdevelop fileopen.pyxpm fileprint.pyxpm
+    app.py app.kdevelop fileopen.pyxpm fileprint.pyxpm
     filesave.pyxpm app-Makefile.am app-autogen.sh
     app-configure.ac documentdetails.ui missing install-sh
     mkinstalldirs pyqt-am-preproc.py templates-ui-dialog
diff --git a/languages/python/app_templates/pyqt/Makefile.am b/languages/python/app_templates/pyqt/Makefile.am
index dc12ca69..ea9502cc 100644
--- a/languages/python/app_templates/pyqt/Makefile.am
+++ b/languages/python/app_templates/pyqt/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.py app.tdevelop fileopen.pyxpm fileprint.pyxpm  \
+dataFiles = app.py app.kdevelop fileopen.pyxpm fileprint.pyxpm  \
 	filesave.pyxpm app-Makefile.am app-autogen.sh app-configure.ac \
 	documentdetails.ui missing install-sh mkinstalldirs \
 	pyqt-am-preproc.py templates-ui-dialog templates-ui-mainwin \
diff --git a/languages/python/app_templates/pyqt/app.tdevelop b/languages/python/app_templates/pyqt/app.kdevelop
similarity index 98%
rename from languages/python/app_templates/pyqt/app.tdevelop
rename to languages/python/app_templates/pyqt/app.kdevelop
index 2abb394e..a8fb1726 100644
--- a/languages/python/app_templates/pyqt/app.tdevelop
+++ b/languages/python/app_templates/pyqt/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -78,4 +78,4 @@
       <type ext="ui"/>
     </useglobaltypes>
   </kdevfilecreate>  
-</tdevelop>
+</kdevelop>
diff --git a/languages/python/app_templates/pyqt/pyqt.kdevtemplate b/languages/python/app_templates/pyqt/pyqt.kdevtemplate
index f19e263c..5d6cf569 100644
--- a/languages/python/app_templates/pyqt/pyqt.kdevtemplate
+++ b/languages/python/app_templates/pyqt/pyqt.kdevtemplate
@@ -71,8 +71,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/python/app_templates/pythonhello/CMakeLists.txt b/languages/python/app_templates/pythonhello/CMakeLists.txt
index dfdbbc3b..84dfc7b0 100644
--- a/languages/python/app_templates/pythonhello/CMakeLists.txt
+++ b/languages/python/app_templates/pythonhello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( pythonhello.tar.gz ALL
   COMMAND tar zcf pythonhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.py app.tdevelop pythonhello.png
+    app.py app.kdevelop pythonhello.png
 )
 
 
diff --git a/languages/python/app_templates/pythonhello/Makefile.am b/languages/python/app_templates/pythonhello/Makefile.am
index 2dc4f559..3d66b1a7 100644
--- a/languages/python/app_templates/pythonhello/Makefile.am
+++ b/languages/python/app_templates/pythonhello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.py app.tdevelop pythonhello.png
+dataFiles = app.py app.kdevelop pythonhello.png
 templateName = pythonhello
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/python/app_templates/pythonhello/app.tdevelop b/languages/python/app_templates/pythonhello/app.kdevelop
similarity index 98%
rename from languages/python/app_templates/pythonhello/app.tdevelop
rename to languages/python/app_templates/pythonhello/app.kdevelop
index 9826d145..2c494d6a 100644
--- a/languages/python/app_templates/pythonhello/app.tdevelop
+++ b/languages/python/app_templates/pythonhello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -81,4 +81,4 @@
       <type ext="py"/>
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/languages/python/app_templates/pythonhello/pythonhello.kdevtemplate b/languages/python/app_templates/pythonhello/pythonhello.kdevtemplate
index 0e130571..6d52cf8a 100644
--- a/languages/python/app_templates/pythonhello/pythonhello.kdevtemplate
+++ b/languages/python/app_templates/pythonhello/pythonhello.kdevtemplate
@@ -66,8 +66,8 @@ Archive=pythonhello.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/python/app_templates/pytk/CMakeLists.txt b/languages/python/app_templates/pytk/CMakeLists.txt
index 1a28ddad..ad5572b7 100644
--- a/languages/python/app_templates/pytk/CMakeLists.txt
+++ b/languages/python/app_templates/pytk/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( pytk.tar.gz ALL
   COMMAND tar zcf pytk.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.py app.tdevelop pytk.png
+    app.py app.kdevelop pytk.png
 )
 
 
diff --git a/languages/python/app_templates/pytk/Makefile.am b/languages/python/app_templates/pytk/Makefile.am
index d1ebe715..0639ee15 100644
--- a/languages/python/app_templates/pytk/Makefile.am
+++ b/languages/python/app_templates/pytk/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.py app.tdevelop pytk.png
+dataFiles = app.py app.kdevelop pytk.png
 templateName = pytk
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/python/app_templates/pytk/app.tdevelop b/languages/python/app_templates/pytk/app.kdevelop
similarity index 98%
rename from languages/python/app_templates/pytk/app.tdevelop
rename to languages/python/app_templates/pytk/app.kdevelop
index 1482b842..044ea0b7 100644
--- a/languages/python/app_templates/pytk/app.tdevelop
+++ b/languages/python/app_templates/pytk/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -79,4 +79,4 @@
       <type ext="py"/>
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/languages/python/app_templates/pytk/pytk.kdevtemplate b/languages/python/app_templates/pytk/pytk.kdevtemplate
index 3b8ac6bc..3756df01 100644
--- a/languages/python/app_templates/pytk/pytk.kdevtemplate
+++ b/languages/python/app_templates/pytk/pytk.kdevtemplate
@@ -66,8 +66,8 @@ Archive=pytk.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/ruby/app_templates/dcopservice/CMakeLists.txt b/languages/ruby/app_templates/dcopservice/CMakeLists.txt
index f673e72c..3e6b459b 100644
--- a/languages/ruby/app_templates/dcopservice/CMakeLists.txt
+++ b/languages/ruby/app_templates/dcopservice/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( dcopserviceruby.tar.gz ALL
   COMMAND tar zcf dcopserviceruby.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     dcopservice.desktop app.cpp app-configure.in.in
-    src-Makefile.am main.rb dcopservice.rb dcopservice.tdevelop
+    src-Makefile.am main.rb dcopservice.rb dcopservice.kdevelop
     subdirs
 )
 
diff --git a/languages/ruby/app_templates/dcopservice/Makefile.am b/languages/ruby/app_templates/dcopservice/Makefile.am
index a7193d6a..441e9ceb 100644
--- a/languages/ruby/app_templates/dcopservice/Makefile.am
+++ b/languages/ruby/app_templates/dcopservice/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = dcopservice.desktop app.cpp app-configure.in.in \
-	src-Makefile.am main.rb dcopservice.rb dcopservice.tdevelop \
+	src-Makefile.am main.rb dcopservice.rb dcopservice.kdevelop \
 	subdirs
 templateName = dcopserviceruby
 
diff --git a/languages/ruby/app_templates/dcopservice/dcopservice.tdevelop b/languages/ruby/app_templates/dcopservice/dcopservice.kdevelop
similarity index 98%
rename from languages/ruby/app_templates/dcopservice/dcopservice.tdevelop
rename to languages/ruby/app_templates/dcopservice/dcopservice.kdevelop
index 437aa315..6b15380e 100644
--- a/languages/ruby/app_templates/dcopservice/dcopservice.tdevelop
+++ b/languages/ruby/app_templates/dcopservice/dcopservice.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -88,4 +88,4 @@
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
-</tdevelop>
+</kdevelop>
diff --git a/languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate b/languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate
index fbadd4e3..9f62290b 100644
--- a/languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate
+++ b/languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate
@@ -99,8 +99,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/dcopservice.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/dcopservice.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir3]
 Type=mkdir
diff --git a/languages/ruby/app_templates/kapp/CMakeLists.txt b/languages/ruby/app_templates/kapp/CMakeLists.txt
index 6817278b..41c2de16 100644
--- a/languages/ruby/app_templates/kapp/CMakeLists.txt
+++ b/languages/ruby/app_templates/kapp/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( kappruby.tar.gz ALL
   COMMAND tar zcf kappruby.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     app_client.rb appiface.rb app.rb appview.rb main.rb pref.rb
-    app.cpp appui.rc app.desktop app.tdevelop app-Makefile.am
+    app.cpp appui.rc app.desktop app.kdevelop app-Makefile.am
     app-configure.in.in src-Makefile.am subdirs README
 )
 
diff --git a/languages/ruby/app_templates/kapp/Makefile.am b/languages/ruby/app_templates/kapp/Makefile.am
index 9dbc37b5..20cf1f3f 100644
--- a/languages/ruby/app_templates/kapp/Makefile.am
+++ b/languages/ruby/app_templates/kapp/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = app_client.rb appiface.rb app.rb appview.rb main.rb pref.rb app.cpp  \
-			appui.rc app.desktop app.tdevelop app-Makefile.am app-configure.in.in \
+			appui.rc app.desktop app.kdevelop app-Makefile.am app-configure.in.in \
 			src-Makefile.am subdirs README
 
 templateName = kappruby
diff --git a/languages/ruby/app_templates/kapp/app.tdevelop b/languages/ruby/app_templates/kapp/app.kdevelop
similarity index 98%
rename from languages/ruby/app_templates/kapp/app.tdevelop
rename to languages/ruby/app_templates/kapp/app.kdevelop
index 5c57b8fb..3a1efdd9 100644
--- a/languages/ruby/app_templates/kapp/app.tdevelop
+++ b/languages/ruby/app_templates/kapp/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
 	<general>
 		<author>%{AUTHOR}</author>
 		<email>%{EMAIL}</email>
@@ -87,4 +87,4 @@
 			<mainprogram>src/main.rb</mainprogram>
 		</run>
 	</kdevrubysupport>
-</tdevelop>
+</kdevelop>
diff --git a/languages/ruby/app_templates/kapp/kappruby.kdevtemplate b/languages/ruby/app_templates/kapp/kappruby.kdevtemplate
index 368e0705..26c5c90a 100644
--- a/languages/ruby/app_templates/kapp/kappruby.kdevtemplate
+++ b/languages/ruby/app_templates/kapp/kappruby.kdevtemplate
@@ -97,8 +97,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/ruby/app_templates/kxt/CMakeLists.txt b/languages/ruby/app_templates/kxt/CMakeLists.txt
index 539cfdb6..2543047d 100644
--- a/languages/ruby/app_templates/kxt/CMakeLists.txt
+++ b/languages/ruby/app_templates/kxt/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( kxtruby.tar.gz ALL
   COMMAND tar zcf kxtruby.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     app.rb main.rb prefs.rb app.cpp appview.rb appview_base.ui
-    prefs-base.ui appui.rc app.desktop kxtruby.png app.tdevelop
+    prefs-base.ui appui.rc app.desktop kxtruby.png app.kdevelop
     app-Makefile.am app-configure.in.in app.kcfg settings.kcfgc
     src-Makefile.am subdirs README
 )
diff --git a/languages/ruby/app_templates/kxt/Makefile.am b/languages/ruby/app_templates/kxt/Makefile.am
index 2ea8cf5b..b642b88b 100644
--- a/languages/ruby/app_templates/kxt/Makefile.am
+++ b/languages/ruby/app_templates/kxt/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = app.rb main.rb prefs.rb app.cpp appview.rb appview_base.ui prefs-base.ui \
-			appui.rc app.desktop kxtruby.png app.tdevelop \
+			appui.rc app.desktop kxtruby.png app.kdevelop \
 			app-Makefile.am app-configure.in.in \
 			app.kcfg settings.kcfgc src-Makefile.am subdirs README
 
diff --git a/languages/ruby/app_templates/kxt/app.tdevelop b/languages/ruby/app_templates/kxt/app.kdevelop
similarity index 98%
rename from languages/ruby/app_templates/kxt/app.tdevelop
rename to languages/ruby/app_templates/kxt/app.kdevelop
index 5c57b8fb..3a1efdd9 100644
--- a/languages/ruby/app_templates/kxt/app.tdevelop
+++ b/languages/ruby/app_templates/kxt/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
 	<general>
 		<author>%{AUTHOR}</author>
 		<email>%{EMAIL}</email>
@@ -87,4 +87,4 @@
 			<mainprogram>src/main.rb</mainprogram>
 		</run>
 	</kdevrubysupport>
-</tdevelop>
+</kdevelop>
diff --git a/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate b/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate
index e4756e1d..59201db8 100644
--- a/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate
+++ b/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate
@@ -100,8 +100,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/ruby/app_templates/qtruby/CMakeLists.txt b/languages/ruby/app_templates/qtruby/CMakeLists.txt
index beac7f1f..476f6c65 100644
--- a/languages/ruby/app_templates/qtruby/CMakeLists.txt
+++ b/languages/ruby/app_templates/qtruby/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( qtruby.tar.gz ALL
   COMMAND tar zcf qtruby.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.rb app.tdevelop app-Makefile app.filelist README
+    app.rb app.kdevelop app-Makefile app.filelist README
 )
 
 
diff --git a/languages/ruby/app_templates/qtruby/Makefile.am b/languages/ruby/app_templates/qtruby/Makefile.am
index 919a69f5..68b7bd82 100644
--- a/languages/ruby/app_templates/qtruby/Makefile.am
+++ b/languages/ruby/app_templates/qtruby/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.rb app.tdevelop app-Makefile app.filelist README
+dataFiles = app.rb app.kdevelop app-Makefile app.filelist README
 templateName = qtruby
 
 ### no need to change below:
diff --git a/languages/ruby/app_templates/qtruby/app.tdevelop b/languages/ruby/app_templates/qtruby/app.kdevelop
similarity index 98%
rename from languages/ruby/app_templates/qtruby/app.tdevelop
rename to languages/ruby/app_templates/qtruby/app.kdevelop
index 3b59130c..ec464627 100644
--- a/languages/ruby/app_templates/qtruby/app.tdevelop
+++ b/languages/ruby/app_templates/qtruby/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
 	<general>
 		<author>%{AUTHOR}</author>
 		<email>%{EMAIL}</email>
@@ -82,4 +82,4 @@
 			<terminal>false</terminal>
 		</run>
 	</kdevrubysupport>
-</tdevelop>
+</kdevelop>
diff --git a/languages/ruby/app_templates/qtruby/qtruby.kdevtemplate b/languages/ruby/app_templates/qtruby/qtruby.kdevtemplate
index da8500dc..6e7328ac 100644
--- a/languages/ruby/app_templates/qtruby/qtruby.kdevtemplate
+++ b/languages/ruby/app_templates/qtruby/qtruby.kdevtemplate
@@ -58,8 +58,8 @@ Archive=qtruby.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
@@ -74,7 +74,7 @@ Dest=%{dest}/Makefile
 [FILE4]
 Type=install
 Source=%{src}/app.filelist
-Dest=%{dest}/%{APPNAMELC}.tdevelop.filelist
+Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist
 
 [FILE5]
 Type=install
diff --git a/languages/ruby/app_templates/qtruby4app/CMakeLists.txt b/languages/ruby/app_templates/qtruby4app/CMakeLists.txt
index e5045380..8408f69a 100644
--- a/languages/ruby/app_templates/qtruby4app/CMakeLists.txt
+++ b/languages/ruby/app_templates/qtruby4app/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( qtruby4app.tar.gz ALL
   COMMAND tar zcf qtruby4app.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    main.rb qtruby4app.rb qtruby4app.png qtruby4app.tdevelop
+    main.rb qtruby4app.rb qtruby4app.png qtruby4app.kdevelop
     application.qrc ReadMe filesave.xpm fileopen.xpm
     filenew.xpm editcopy.xpm editpaste.xpm editcut.xpm
     app-Makefile app.filelist
diff --git a/languages/ruby/app_templates/qtruby4app/Makefile.am b/languages/ruby/app_templates/qtruby4app/Makefile.am
index 8f4adecd..2bdc1ef9 100644
--- a/languages/ruby/app_templates/qtruby4app/Makefile.am
+++ b/languages/ruby/app_templates/qtruby4app/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles =  main.rb qtruby4app.rb qtruby4app.png qtruby4app.tdevelop \
+dataFiles =  main.rb qtruby4app.rb qtruby4app.png qtruby4app.kdevelop \
 	application.qrc ReadMe filesave.xpm fileopen.xpm filenew.xpm \
 	editcopy.xpm editpaste.xpm editcut.xpm app-Makefile app.filelist
 
diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.tdevelop b/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevelop
similarity index 98%
rename from languages/ruby/app_templates/qtrubyapp/qtrubyapp.tdevelop
rename to languages/ruby/app_templates/qtruby4app/qtruby4app.kdevelop
index 3df7f3ab..4afe7bca 100644
--- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.tdevelop
+++ b/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -80,4 +80,4 @@
 			<mainprogram>./main.rb</mainprogram>
 		</run>
 	</kdevrubysupport>
-</tdevelop>
+</kdevelop>
diff --git a/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate b/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate
index 70df2248..bd778450 100644
--- a/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate
+++ b/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate
@@ -49,8 +49,8 @@ Archive=qtruby4app.tar.gz
 
 [FILE1]
 Type=install
-Source=%{src}/qtruby4app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/qtruby4app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
@@ -110,7 +110,7 @@ Dest=%{dest}/ReadMe
 [FILE13]
 Type=install
 Source=%{src}/app.filelist
-Dest=%{dest}/%{APPNAMELC}.tdevelop.filelist
+Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist
 
 [MSG]
 Type=message
diff --git a/languages/ruby/app_templates/qtrubyapp/CMakeLists.txt b/languages/ruby/app_templates/qtrubyapp/CMakeLists.txt
index 37f6e5b1..299ac911 100644
--- a/languages/ruby/app_templates/qtrubyapp/CMakeLists.txt
+++ b/languages/ruby/app_templates/qtrubyapp/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( qtrubyapp.tar.gz ALL
   COMMAND tar zcf qtrubyapp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    main.rb qtrubyapp.rb qtrubyapp.png qtrubyapp.tdevelop
+    main.rb qtrubyapp.rb qtrubyapp.png qtrubyapp.kdevelop
     filesave.xpm fileopen.xpm fileprint.xpm app.filelist
     app-Makefile README
 )
diff --git a/languages/ruby/app_templates/qtrubyapp/Makefile.am b/languages/ruby/app_templates/qtrubyapp/Makefile.am
index 7777b886..7fc1c803 100644
--- a/languages/ruby/app_templates/qtrubyapp/Makefile.am
+++ b/languages/ruby/app_templates/qtrubyapp/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.rb qtrubyapp.rb qtrubyapp.png qtrubyapp.tdevelop \
+dataFiles = main.rb qtrubyapp.rb qtrubyapp.png qtrubyapp.kdevelop \
 	filesave.xpm fileopen.xpm fileprint.xpm app.filelist app-Makefile README
 
 templateName = qtrubyapp
diff --git a/languages/ruby/app_templates/qtruby4app/qtruby4app.tdevelop b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevelop
similarity index 98%
rename from languages/ruby/app_templates/qtruby4app/qtruby4app.tdevelop
rename to languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevelop
index 3df7f3ab..4afe7bca 100644
--- a/languages/ruby/app_templates/qtruby4app/qtruby4app.tdevelop
+++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -80,4 +80,4 @@
 			<mainprogram>./main.rb</mainprogram>
 		</run>
 	</kdevrubysupport>
-</tdevelop>
+</kdevelop>
diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate
index 3e2c896a..5fd82925 100644
--- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate
+++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate
@@ -65,8 +65,8 @@ Archive=qtrubyapp.tar.gz
 
 [FILE1]
 Type=install
-Source=%{src}/qtrubyapp.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/qtrubyapp.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
@@ -101,7 +101,7 @@ Dest=%{dest}/Makefile
 [FILE8]
 Type=install
 Source=%{src}/app.filelist
-Dest=%{dest}/%{APPNAMELC}.tdevelop.filelist
+Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist
 
 [FILE9]
 Type=install
diff --git a/languages/ruby/app_templates/rails/CMakeLists.txt b/languages/ruby/app_templates/rails/CMakeLists.txt
index 6f53dd0d..75948f30 100644
--- a/languages/ruby/app_templates/rails/CMakeLists.txt
+++ b/languages/ruby/app_templates/rails/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( rails.tar.gz ALL
   COMMAND tar zcf rails.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.tdevelop
+    app.kdevelop
 )
 
 
diff --git a/languages/ruby/app_templates/rails/Makefile.am b/languages/ruby/app_templates/rails/Makefile.am
index 9d89a708..49d77bdd 100644
--- a/languages/ruby/app_templates/rails/Makefile.am
+++ b/languages/ruby/app_templates/rails/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.tdevelop
+dataFiles = app.kdevelop
 templateName= rails
 
 ### no need to change below:
diff --git a/languages/ruby/app_templates/rails/app.tdevelop b/languages/ruby/app_templates/rails/app.kdevelop
similarity index 99%
rename from languages/ruby/app_templates/rails/app.tdevelop
rename to languages/ruby/app_templates/rails/app.kdevelop
index 17a0e6a1..c02c2057 100644
--- a/languages/ruby/app_templates/rails/app.tdevelop
+++ b/languages/ruby/app_templates/rails/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -104,4 +104,4 @@
 			<mainprogram>script/server</mainprogram>
 		</run>
 	</kdevrubysupport>
-</tdevelop>
+</kdevelop>
diff --git a/languages/ruby/app_templates/rails/rails.kdevtemplate b/languages/ruby/app_templates/rails/rails.kdevtemplate
index 5ed2d78d..e377e1c4 100644
--- a/languages/ruby/app_templates/rails/rails.kdevtemplate
+++ b/languages/ruby/app_templates/rails/rails.kdevtemplate
@@ -39,8 +39,8 @@ Archive=rails.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MSG]
 Type=message
diff --git a/languages/ruby/app_templates/rubyhello/CMakeLists.txt b/languages/ruby/app_templates/rubyhello/CMakeLists.txt
index 74da59e4..3aeb22f1 100644
--- a/languages/ruby/app_templates/rubyhello/CMakeLists.txt
+++ b/languages/ruby/app_templates/rubyhello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( rubyhello.tar.gz ALL
   COMMAND tar zcf rubyhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.rb app.tdevelop
+    app.rb app.kdevelop
 )
 
 
diff --git a/languages/ruby/app_templates/rubyhello/Makefile.am b/languages/ruby/app_templates/rubyhello/Makefile.am
index 5d20526e..ecb3e535 100644
--- a/languages/ruby/app_templates/rubyhello/Makefile.am
+++ b/languages/ruby/app_templates/rubyhello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.rb app.tdevelop
+dataFiles = app.rb app.kdevelop
 templateName= rubyhello
 
 ### no need to change below:
diff --git a/languages/ruby/app_templates/rubyhello/app.tdevelop b/languages/ruby/app_templates/rubyhello/app.kdevelop
similarity index 99%
rename from languages/ruby/app_templates/rubyhello/app.tdevelop
rename to languages/ruby/app_templates/rubyhello/app.kdevelop
index c938d122..2d1d24c5 100644
--- a/languages/ruby/app_templates/rubyhello/app.tdevelop
+++ b/languages/ruby/app_templates/rubyhello/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -88,4 +88,4 @@
                 </run>
         </kdevrubysupport>
 
-</tdevelop>
+</kdevelop>
diff --git a/languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate b/languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate
index bce79ff9..3612becb 100644
--- a/languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate
+++ b/languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate
@@ -65,8 +65,8 @@ Archive=rubyhello.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/sql/app_templates/sqlsimple/CMakeLists.txt b/languages/sql/app_templates/sqlsimple/CMakeLists.txt
index 05ddb17f..3df373a6 100644
--- a/languages/sql/app_templates/sqlsimple/CMakeLists.txt
+++ b/languages/sql/app_templates/sqlsimple/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( sqlsimple.tar.gz ALL
   COMMAND tar zcf sqlsimple.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.sql app.tdevelop
+    app.sql app.kdevelop
 )
 
 
diff --git a/languages/sql/app_templates/sqlsimple/Makefile.am b/languages/sql/app_templates/sqlsimple/Makefile.am
index 6bfae1c4..f7b5a012 100644
--- a/languages/sql/app_templates/sqlsimple/Makefile.am
+++ b/languages/sql/app_templates/sqlsimple/Makefile.am
@@ -1,5 +1,5 @@
 templateName = sqlsimple
-dataFiles = app.sql app.tdevelop
+dataFiles = app.sql app.kdevelop
 
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/sql/app_templates/sqlsimple/app.tdevelop b/languages/sql/app_templates/sqlsimple/app.kdevelop
similarity index 98%
rename from languages/sql/app_templates/sqlsimple/app.tdevelop
rename to languages/sql/app_templates/sqlsimple/app.kdevelop
index 7fc4efc9..78f055cd 100644
--- a/languages/sql/app_templates/sqlsimple/app.tdevelop
+++ b/languages/sql/app_templates/sqlsimple/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -81,4 +81,4 @@
 			<type ext="sql"/>
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate b/languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate
index 5081e992..e3c100d8 100644
--- a/languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate
+++ b/languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate
@@ -65,8 +65,8 @@ Archive=sqlsimple.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/lib/cppparser/cachemanager.cpp b/lib/cppparser/cachemanager.cpp
index 372fc026..966f4440 100644
--- a/lib/cppparser/cachemanager.cpp
+++ b/lib/cppparser/cachemanager.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/lib/cppparser/cachemanager.h b/lib/cppparser/cachemanager.h
index fe8ef197..3804356f 100644
--- a/lib/cppparser/cachemanager.h
+++ b/lib/cppparser/cachemanager.h
@@ -1,7 +1,7 @@
 
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/lib/cppparser/lexercache.cpp b/lib/cppparser/lexercache.cpp
index cbe8640d..230a7de1 100644
--- a/lib/cppparser/lexercache.cpp
+++ b/lib/cppparser/lexercache.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/lib/cppparser/lexercache.h b/lib/cppparser/lexercache.h
index 4d3783c7..cfcc8205 100644
--- a/lib/cppparser/lexercache.h
+++ b/lib/cppparser/lexercache.h
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/lib/cppparser/macro.h b/lib/cppparser/macro.h
index 66ab5844..26f2c2db 100644
--- a/lib/cppparser/macro.h
+++ b/lib/cppparser/macro.h
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/lib/interfaces/extensions/codebrowserfrontend.h b/lib/interfaces/extensions/codebrowserfrontend.h
index e8158fe4..49dd95a8 100644
--- a/lib/interfaces/extensions/codebrowserfrontend.h
+++ b/lib/interfaces/extensions/codebrowserfrontend.h
@@ -1,5 +1,5 @@
 /* This file is part of the KDE project
-   Copyright (C) 2006 David Nolden <david.nolden.tdevelop@art-master.de>
+   Copyright (C) 2006 David Nolden <david.nolden.kdevelop@art-master.de>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/lib/interfaces/hashedstring.cpp b/lib/interfaces/hashedstring.cpp
index 820dba04..72e66b8c 100644
--- a/lib/interfaces/hashedstring.cpp
+++ b/lib/interfaces/hashedstring.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/lib/interfaces/hashedstring.h b/lib/interfaces/hashedstring.h
index c1bfd4ad..b12f0369 100644
--- a/lib/interfaces/hashedstring.h
+++ b/lib/interfaces/hashedstring.h
@@ -1,6 +1,6 @@
 /***************************************************************************
    copyright            : (C) 2006 by David Nolden
-   email                : david.nolden.tdevelop@art-master.de
+   email                : david.nolden.kdevelop@art-master.de
 ***************************************************************************/
 
 /***************************************************************************
diff --git a/lib/widgets/fancylistviewitem.cpp b/lib/widgets/fancylistviewitem.cpp
index f3e686c9..ab448c8c 100644
--- a/lib/widgets/fancylistviewitem.cpp
+++ b/lib/widgets/fancylistviewitem.cpp
@@ -1,5 +1,5 @@
 /* This file is part of the KDE project
-   Copyright (C) 2006 David Nolden <david.nolden.tdevelop@art-master.de>
+   Copyright (C) 2006 David Nolden <david.nolden.kdevelop@art-master.de>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/lib/widgets/fancylistviewitem.h b/lib/widgets/fancylistviewitem.h
index e8eb4596..16a1e69e 100644
--- a/lib/widgets/fancylistviewitem.h
+++ b/lib/widgets/fancylistviewitem.h
@@ -1,5 +1,5 @@
 /* This file is part of the KDE project
-   Copyright (C) 2006 David Nolden <david.nolden.tdevelop@art-master.de>
+   Copyright (C) 2006 David Nolden <david.nolden.kdevelop@art-master.de>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/parts/appwizard/README.dox b/parts/appwizard/README.dox
index 2e58c082..9a97c964 100644
--- a/parts/appwizard/README.dox
+++ b/parts/appwizard/README.dox
@@ -41,7 +41,7 @@ ShowFilesAfterGeneration=README.devel
 DefaultDestinatonDir=HOMEDIR/public_html
 FileTemplates=php,ShellStyle
 
-The template project files (*.tdevelop) defines which parts are
+The template project files (*.kdevelop) defines which parts are
 loaded for the project and how they are configured. The set of
 loaded parts is primarily determined by a set of key words.
 The following keywords are currently used:
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index d5160075..e87cee2d 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -542,7 +542,7 @@ void AppWizardDialog::accept()
 	m_pCurrentAppInfo->dirList.prepend( baseDir );
 
 	// This is too silly for words, but it's either this or reimplementing FileTemplate
-	TQString tempProjectDomSource = "<!DOCTYPE tdevelop><tdevelop><general><author>%1</author><email>%2</email><version>%3</version></general></tdevelop>";
+	TQString tempProjectDomSource = "<!DOCTYPE kdevelop><kdevelop><general><author>%1</author><email>%2</email><version>%3</version></general></kdevelop>";
 	tempProjectDomSource = tempProjectDomSource.arg( author_edit->text() ).arg( email_edit->text() ).arg( version_edit->text() );
 	TQDomDocument tempProjectDom;
 	tempProjectDom.setContent( tempProjectDomSource );
@@ -999,7 +999,7 @@ ApplicationInfo *AppWizardDialog::templateForItem(TQListViewItem *item)
 
 void AppWizardDialog::openAfterGeneration()
 {
-	TQString projectFile( finalLoc_label->text() + "/" + appname_edit->text().lower() + ".tdevelop" );
+	TQString projectFile( finalLoc_label->text() + "/" + appname_edit->text().lower() + ".kdevelop" );
 
 	// Read the DOM of the newly created project
 	TQFile file( projectFile );
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 5f07f5b4..cbe5bec2 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -133,7 +133,7 @@ void ImportDialog::accept()
     TQFileInfo finfo(importNames[project_combo->currentItem()]);
     TQDir importdir(finfo.dir());
     importdir.cdUp();
-    TQFile src(importdir.filePath("importfiles/" + finfo.fileName() + ".tdevelop"));
+    TQFile src(importdir.filePath("importfiles/" + finfo.fileName() + ".kdevelop"));
     kdDebug(9010) << "Import template " << src.name() << endl;
     if (!src.open(IO_ReadOnly)) {
         KMessageBox::sorry(this, i18n("Cannot open project template."));
@@ -188,7 +188,7 @@ void ImportDialog::accept()
 
 
     // write the dom back
-    TQFile dest(dir.filePath(projectName + ".tdevelop"));
+    TQFile dest(dir.filePath(projectName + ".kdevelop"));
     if (!dest.open(IO_WriteOnly)) {
         KMessageBox::sorry(this, i18n("Cannot write the project file."));
         return;
@@ -213,9 +213,9 @@ void ImportDialog::accept()
 //     dest.close();
 //     src.close();
 
-    m_part->core()->openProject(dir.filePath(projectName + ".tdevelop"));
+    m_part->core()->openProject(dir.filePath(projectName + ".kdevelop"));
 
-    kdDebug(9010) << "OPENING PROJECT: " << dir.filePath(projectName + ".tdevelop") << endl;
+    kdDebug(9010) << "OPENING PROJECT: " << dir.filePath(projectName + ".kdevelop") << endl;
 
     TQDialog::accept();
 }
diff --git a/parts/appwizard/imports/CMakeLists.txt b/parts/appwizard/imports/CMakeLists.txt
index e7b303c3..e8059726 100644
--- a/parts/appwizard/imports/CMakeLists.txt
+++ b/parts/appwizard/imports/CMakeLists.txt
@@ -16,10 +16,10 @@ install( FILES
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/imports )
 
 install( FILES
-    c-auto.tdevelop cpp-auto.tdevelop fortran-auto.tdevelop
-    java-auto.tdevelop kde.tdevelop gnome.tdevelop
-    c.tdevelop cpp.tdevelop fortran.tdevelop python.tdevelop
-    php.tdevelop perl.tdevelop java.tdevelop java-ant.tdevelop
-    qttmake.tdevelop qtqmake.tdevelop qt4qmake.tdevelop
-    ruby.tdevelop pascal.tdevelop ada.tdevelop
+    c-auto.kdevelop cpp-auto.kdevelop fortran-auto.kdevelop
+    java-auto.kdevelop kde.kdevelop gnome.kdevelop
+    c.kdevelop cpp.kdevelop fortran.kdevelop python.kdevelop
+    php.kdevelop perl.kdevelop java.kdevelop java-ant.kdevelop
+    qttmake.kdevelop qtqmake.kdevelop qt4qmake.kdevelop
+    ruby.kdevelop pascal.kdevelop ada.kdevelop
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/importfiles )
diff --git a/parts/appwizard/imports/Makefile.am b/parts/appwizard/imports/Makefile.am
index c7f74dcd..5047de18 100644
--- a/parts/appwizard/imports/Makefile.am
+++ b/parts/appwizard/imports/Makefile.am
@@ -3,5 +3,5 @@ importsdir = ${appwizarddatadir}/imports
 importfilesdir = ${appwizarddatadir}/importfiles
 
 imports_DATA = c-auto cpp-auto fortran-auto java-auto kde gnome                    c cpp fortran python php perl java java-ant qttmake qtqmake qt4qmake ruby pascal ada
-importfiles_DATA = c-auto.tdevelop cpp-auto.tdevelop fortran-auto.tdevelop 		   java-auto.tdevelop kde.tdevelop gnome.tdevelop 		   c.tdevelop cpp.tdevelop fortran.tdevelop 		   python.tdevelop php.tdevelop perl.tdevelop 		   java.tdevelop java-ant.tdevelop qttmake.tdevelop qtqmake.tdevelop qt4qmake.tdevelop ruby.tdevelop 		   pascal.tdevelop ada.tdevelop
+importfiles_DATA = c-auto.kdevelop cpp-auto.kdevelop fortran-auto.kdevelop 		   java-auto.kdevelop kde.kdevelop gnome.kdevelop 		   c.kdevelop cpp.kdevelop fortran.kdevelop 		   python.kdevelop php.kdevelop perl.kdevelop 		   java.kdevelop java-ant.kdevelop qttmake.kdevelop qtqmake.kdevelop qt4qmake.kdevelop ruby.kdevelop 		   pascal.kdevelop ada.kdevelop
 
diff --git a/parts/appwizard/imports/ada.tdevelop b/parts/appwizard/imports/ada.kdevelop
similarity index 98%
rename from parts/appwizard/imports/ada.tdevelop
rename to parts/appwizard/imports/ada.kdevelop
index cdb35b40..779c8bbd 100644
--- a/parts/appwizard/imports/ada.tdevelop
+++ b/parts/appwizard/imports/ada.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -70,4 +70,4 @@
    <type ext="ads"/>
   </useglobaltypes>
  </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/c-auto.tdevelop b/parts/appwizard/imports/c-auto.kdevelop
similarity index 99%
rename from parts/appwizard/imports/c-auto.tdevelop
rename to parts/appwizard/imports/c-auto.kdevelop
index 892dd88d..fd5a3f2e 100644
--- a/parts/appwizard/imports/c-auto.tdevelop
+++ b/parts/appwizard/imports/c-auto.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -93,4 +93,4 @@
       <type ext="h" />
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/c.tdevelop b/parts/appwizard/imports/c.kdevelop
similarity index 98%
rename from parts/appwizard/imports/c.tdevelop
rename to parts/appwizard/imports/c.kdevelop
index e0c06089..24e1423d 100644
--- a/parts/appwizard/imports/c.tdevelop
+++ b/parts/appwizard/imports/c.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -73,4 +73,4 @@
       <type ext="h" />
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/cpp-auto.tdevelop b/parts/appwizard/imports/cpp-auto.kdevelop
similarity index 99%
rename from parts/appwizard/imports/cpp-auto.tdevelop
rename to parts/appwizard/imports/cpp-auto.kdevelop
index 74de8db0..8ebabddf 100644
--- a/parts/appwizard/imports/cpp-auto.tdevelop
+++ b/parts/appwizard/imports/cpp-auto.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -90,4 +90,4 @@
       <type ext="h" />
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/cpp.tdevelop b/parts/appwizard/imports/cpp.kdevelop
similarity index 98%
rename from parts/appwizard/imports/cpp.tdevelop
rename to parts/appwizard/imports/cpp.kdevelop
index b351de38..4642acce 100644
--- a/parts/appwizard/imports/cpp.tdevelop
+++ b/parts/appwizard/imports/cpp.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -72,4 +72,4 @@
       <type ext="h" />
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/fortran-auto.tdevelop b/parts/appwizard/imports/fortran-auto.kdevelop
similarity index 98%
rename from parts/appwizard/imports/fortran-auto.tdevelop
rename to parts/appwizard/imports/fortran-auto.kdevelop
index 8fdd5f89..8f7e0637 100644
--- a/parts/appwizard/imports/fortran-auto.tdevelop
+++ b/parts/appwizard/imports/fortran-auto.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -68,4 +68,4 @@
       <type ext="f"/>
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/fortran.tdevelop b/parts/appwizard/imports/fortran.kdevelop
similarity index 98%
rename from parts/appwizard/imports/fortran.tdevelop
rename to parts/appwizard/imports/fortran.kdevelop
index c852870e..cc1b11b9 100644
--- a/parts/appwizard/imports/fortran.tdevelop
+++ b/parts/appwizard/imports/fortran.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -72,4 +72,4 @@
       <type ext="f"/>
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/gnome.tdevelop b/parts/appwizard/imports/gnome.kdevelop
similarity index 99%
rename from parts/appwizard/imports/gnome.tdevelop
rename to parts/appwizard/imports/gnome.kdevelop
index 0b8c5c95..a02ad52f 100644
--- a/parts/appwizard/imports/gnome.tdevelop
+++ b/parts/appwizard/imports/gnome.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -97,4 +97,4 @@
       <type ext="h"/>      
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/java-ant.tdevelop b/parts/appwizard/imports/java-ant.kdevelop
similarity index 98%
rename from parts/appwizard/imports/java-ant.tdevelop
rename to parts/appwizard/imports/java-ant.kdevelop
index a4db806b..73595a85 100644
--- a/parts/appwizard/imports/java-ant.tdevelop
+++ b/parts/appwizard/imports/java-ant.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -65,4 +65,4 @@
       <type ext="java"/>
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/java-auto.tdevelop b/parts/appwizard/imports/java-auto.kdevelop
similarity index 98%
rename from parts/appwizard/imports/java-auto.tdevelop
rename to parts/appwizard/imports/java-auto.kdevelop
index 9a42ec82..a4ccfa24 100644
--- a/parts/appwizard/imports/java-auto.tdevelop
+++ b/parts/appwizard/imports/java-auto.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -60,4 +60,4 @@
       <type ext="java"/>
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/java.tdevelop b/parts/appwizard/imports/java.kdevelop
similarity index 98%
rename from parts/appwizard/imports/java.tdevelop
rename to parts/appwizard/imports/java.kdevelop
index 9a42ec82..a4ccfa24 100644
--- a/parts/appwizard/imports/java.tdevelop
+++ b/parts/appwizard/imports/java.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -60,4 +60,4 @@
       <type ext="java"/>
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/kde.tdevelop b/parts/appwizard/imports/kde.kdevelop
similarity index 98%
rename from parts/appwizard/imports/kde.tdevelop
rename to parts/appwizard/imports/kde.kdevelop
index 5bff727f..310d5367 100644
--- a/parts/appwizard/imports/kde.tdevelop
+++ b/parts/appwizard/imports/kde.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -70,4 +70,4 @@
       <type ext="h" />
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/pascal.tdevelop b/parts/appwizard/imports/pascal.kdevelop
similarity index 98%
rename from parts/appwizard/imports/pascal.tdevelop
rename to parts/appwizard/imports/pascal.kdevelop
index 551ac91e..cc3c8bbd 100644
--- a/parts/appwizard/imports/pascal.tdevelop
+++ b/parts/appwizard/imports/pascal.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -72,4 +72,4 @@
    <type ext="dpr"/>
   </useglobaltypes>
  </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/perl.tdevelop b/parts/appwizard/imports/perl.kdevelop
similarity index 98%
rename from parts/appwizard/imports/perl.tdevelop
rename to parts/appwizard/imports/perl.kdevelop
index bbf18ee3..6a22ce95 100644
--- a/parts/appwizard/imports/perl.tdevelop
+++ b/parts/appwizard/imports/perl.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -66,4 +66,4 @@
       <type ext="perl"/>
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/php.tdevelop b/parts/appwizard/imports/php.kdevelop
similarity index 98%
rename from parts/appwizard/imports/php.tdevelop
rename to parts/appwizard/imports/php.kdevelop
index 64651d3b..53704660 100644
--- a/parts/appwizard/imports/php.tdevelop
+++ b/parts/appwizard/imports/php.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -81,4 +81,4 @@
       <type ext="php"/>
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/python.tdevelop b/parts/appwizard/imports/python.kdevelop
similarity index 98%
rename from parts/appwizard/imports/python.tdevelop
rename to parts/appwizard/imports/python.kdevelop
index 3c6ece1a..fd589a32 100644
--- a/parts/appwizard/imports/python.tdevelop
+++ b/parts/appwizard/imports/python.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -66,4 +66,4 @@
       <type ext="py"/>
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/qt-auto.tdevelop b/parts/appwizard/imports/qt-auto.kdevelop
similarity index 95%
rename from parts/appwizard/imports/qt-auto.tdevelop
rename to parts/appwizard/imports/qt-auto.kdevelop
index b4bba39e..df6c3b91 100644
--- a/parts/appwizard/imports/qt-auto.tdevelop
+++ b/parts/appwizard/imports/qt-auto.kdevelop
@@ -1,5 +1,5 @@
-<!DOCTYPE tdevelop>
-<tdevelop>
+<!DOCTYPE kdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -40,4 +40,4 @@
       <type ext="h" />
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/qt.tdevelop b/parts/appwizard/imports/qt.kdevelop
similarity index 97%
rename from parts/appwizard/imports/qt.tdevelop
rename to parts/appwizard/imports/qt.kdevelop
index 6b716a7b..9ad4b9bc 100644
--- a/parts/appwizard/imports/qt.tdevelop
+++ b/parts/appwizard/imports/qt.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -35,4 +35,4 @@
       <type ext="h" />
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/qt4qmake.tdevelop b/parts/appwizard/imports/qt4qmake.kdevelop
similarity index 98%
rename from parts/appwizard/imports/qt4qmake.tdevelop
rename to parts/appwizard/imports/qt4qmake.kdevelop
index 3be6c94c..dedc866b 100644
--- a/parts/appwizard/imports/qt4qmake.tdevelop
+++ b/parts/appwizard/imports/qt4qmake.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -77,4 +77,4 @@
       <type ext="qrc" />
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/qtqmake.tdevelop b/parts/appwizard/imports/qtqmake.kdevelop
similarity index 98%
rename from parts/appwizard/imports/qtqmake.tdevelop
rename to parts/appwizard/imports/qtqmake.kdevelop
index 2e9b089a..e3ef09b3 100644
--- a/parts/appwizard/imports/qtqmake.tdevelop
+++ b/parts/appwizard/imports/qtqmake.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -76,4 +76,4 @@
       <type ext="h" />
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/qttmake.tdevelop b/parts/appwizard/imports/qttmake.kdevelop
similarity index 98%
rename from parts/appwizard/imports/qttmake.tdevelop
rename to parts/appwizard/imports/qttmake.kdevelop
index 713655b6..b2607be6 100644
--- a/parts/appwizard/imports/qttmake.tdevelop
+++ b/parts/appwizard/imports/qttmake.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -71,4 +71,4 @@
       <type ext="h" />
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/appwizard/imports/ruby.tdevelop b/parts/appwizard/imports/ruby.kdevelop
similarity index 98%
rename from parts/appwizard/imports/ruby.tdevelop
rename to parts/appwizard/imports/ruby.kdevelop
index 90dbe34a..c831d76a 100644
--- a/parts/appwizard/imports/ruby.tdevelop
+++ b/parts/appwizard/imports/ruby.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -79,4 +79,4 @@
 			<type ext="rb"/>
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/parts/filecreate/README.dox b/parts/filecreate/README.dox
index 34a7882d..435b93e9 100644
--- a/parts/filecreate/README.dox
+++ b/parts/filecreate/README.dox
@@ -59,7 +59,7 @@ If a type has subtypes, and no subtypes are specified, then all subtypes are ass
 \endverbatim
 </code>
 
-Usually, this XML forms part of the base .tdevelop file created by the appwizard.
+Usually, this XML forms part of the base .kdevelop file created by the appwizard.
 
 \authors <a href="mailto:kde AT jrockey.com">Julian Rockey</a>
 \authors <a href="mailto:cloudtemple AT mksat.net">Alexander Dymo</a>
diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp
index 7c6fabc4..024891a9 100644
--- a/parts/filecreate/fcconfigwidget.cpp
+++ b/parts/filecreate/fcconfigwidget.cpp
@@ -169,7 +169,7 @@ void FCConfigWidget::loadProjectTemplates(TQListView *view)
 void FCConfigWidget::saveGlobalConfig()
 {
     TQDomDocument globalDom;
-    TQDomElement  element = globalDom.createElement("tdevelop" );
+    TQDomElement  element = globalDom.createElement("kdevelop" );
     globalDom.appendChild(element);
     TQDomElement  apPart  = globalDom.createElement("kdevfilecreate");
     element.appendChild(apPart);
diff --git a/parts/filecreate/template-info.xml b/parts/filecreate/template-info.xml
index 664fa376..bddd5d65 100644
--- a/parts/filecreate/template-info.xml
+++ b/parts/filecreate/template-info.xml
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<tdevelop version="1">
+<kdevelop version="1">
   <kdevfilecreate>
     <sidetab active="no">
     </sidetab>
@@ -178,4 +178,4 @@
       </type>
     </filetypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/src/main.cpp b/src/main.cpp
index 6f27e415..65177e53 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
   } else if( args->count() > 0 ){
       KURL url = args->url( 0 );
       TQString ext = TQFileInfo( url.fileName() ).extension();
-      if( ext == "tdevelop" ){
+      if( ext == "kdevelop" ){
 	  ProjectManager::getInstance()->loadProject( url );
 	  openProject = true;
       }
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index 77c84658..19a88d78 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -55,7 +55,7 @@ class TQDomDocument;
 TQString ProjectInfo::sessionFile() const
 {
     TQString sf = m_projectURL.path(-1);
-    sf.truncate(sf.length() - 8); // without ".tdevelop"
+    sf.truncate(sf.length() - 8); // without ".kdevelop"
     sf += "kdevses"; // suffix for a TDevelop session file
     return sf;
 }
@@ -130,7 +130,7 @@ void ProjectManager::slotOpenProject()
 	TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/");
 
   KURL url = KFileDialog::getOpenURL(defaultProjectsDir,
-		i18n("*.tdevelop|KDevelop 3 Project Files\n"
+		i18n("*.kdevelop|KDevelop 3 Project Files\n"
 		     "*.kdevprj|KDevelop 2 Project Files"),
 		TopLevel::getInstance()->main(), i18n("Open Project") );
 
@@ -379,7 +379,7 @@ bool ProjectManager::loadProjectFile()
     TDEIO::NetAccess::removeTempFile(path);
     return false;
   }
-  if (m_info->m_document.documentElement().nodeName() != "tdevelop")
+  if (m_info->m_document.documentElement().nodeName() != "kdevelop")
   {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
         i18n("This is not a valid project file."));
@@ -411,7 +411,7 @@ bool ProjectManager::saveProjectFile()
     API::getInstance()->projectDom()->save(stream, 2);
     fout.close();
   } else {
-    KTempFile fout(TQString::fromLatin1("tdevelop3"));
+    KTempFile fout(TQString::fromLatin1("kdevelop3"));
     fout.setAutoDelete(true);
     if (fout.status() != 0) {
       KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("Could not write the project file."));
@@ -457,7 +457,7 @@ void ProjectManager::getGeneralInfo()
   if( m_info->m_projectName.isEmpty() )
   {
     m_info->m_projectName = m_info->m_projectURL.filename();
-    m_info->m_projectName = m_info->m_projectName.left(m_info->m_projectName.length()-TQString(".tdevelop").length());
+    m_info->m_projectName = m_info->m_projectName.left(m_info->m_projectName.length()-TQString(".kdevelop").length());
     TQDomElement prjname = m_info->m_document.createElement("projectname");
     prjname.appendChild( m_info->m_document.createTextNode( m_info->m_projectName) );
     generalEl.appendChild( prjname );
@@ -618,9 +618,9 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url )
         return false;
     }
 
-    TQString cmd = TDEGlobal::dirs()->findExe( "kdevprj2tdevelop" );
+    TQString cmd = TDEGlobal::dirs()->findExe( "kdevprj2kdevelop" );
     if (cmd.isEmpty()) {
-        KMessageBox::sorry(0, i18n("You do not have 'kdevprj2tdevelop' installed."));
+        KMessageBox::sorry(0, i18n("You do not have 'kdevprj2kdevelop' installed."));
         return false;
     }
 
@@ -631,7 +631,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url )
     proc << "perl" << cmd << KShellProcess::quote( url.path() );
     proc.start( TDEProcess::Block );
 
-    TQString projectFile = fileInfo.dirPath( true ) + "/" + fileInfo.baseName() + ".tdevelop";
+    TQString projectFile = fileInfo.dirPath( true ) + "/" + fileInfo.baseName() + ".kdevelop";
     return loadProject( KURL(projectFile) );
 }
 
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index b3e02591..f6083feb 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -999,7 +999,7 @@ void SimpleMainWindow::setCaption(const TQString &caption)
     {
         TQString projectname = project->projectName();
 
-        TQString suffix(".tdevelop");
+        TQString suffix(".kdevelop");
         if (projectname.endsWith(suffix))
             projectname.truncate(projectname.length() - suffix.length());
 
diff --git a/x-tdevelop.desktop b/x-tdevelop.desktop
index bdbcba00..c1322a19 100644
--- a/x-tdevelop.desktop
+++ b/x-tdevelop.desktop
@@ -38,4 +38,4 @@ DefaultApp=tdevelop
 Icon=tdevelop_project
 Type=MimeType
 MimeType=application/x-tdevelop
-Patterns=*.tdevelop;
+Patterns=*.kdevelop;