diff --git a/klinkstatus/klinkstatus.tdevelop b/klinkstatus/klinkstatus.tdevelop
index 3b4a0083..93d693d6 100644
--- a/klinkstatus/klinkstatus.tdevelop
+++ b/klinkstatus/klinkstatus.tdevelop
@@ -19,7 +19,7 @@
     <secondaryLanguages/>
     <versioncontrol/>
   </general>
-  <kdevautoproject>
+  <tdevautoproject>
     <general>
       <activetarget>src/klinkstatus</activetarget>
       <useconfiguration>default</useconfiguration>
@@ -36,17 +36,17 @@
     <configurations>
       <optimized>
         <builddir>optimized</builddir>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevg77options</f77compiler>
+        <ccompiler>tdevgccoptions</ccompiler>
+        <cxxcompiler>tdevgppoptions</cxxcompiler>
+        <f77compiler>tdevg77options</f77compiler>
         <cxxflags>-O2 -g0</cxxflags>
       </optimized>
       <debug>
         <configargs>--enable-debug=full</configargs>
         <builddir>debug</builddir>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevg77options</f77compiler>
+        <ccompiler>tdevgccoptions</ccompiler>
+        <cxxcompiler>tdevgppoptions</cxxcompiler>
+        <f77compiler>tdevg77options</f77compiler>
         <cxxflags>-DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_FATAL_ASSERT</cxxflags>
         <topsourcedir>..</topsourcedir>
         <cppflags/>
@@ -69,9 +69,9 @@
         <topsourcedir>..</topsourcedir>
         <cppflags></cppflags>
         <ldflags></ldflags>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevg77options</f77compiler>
+        <ccompiler>tdevgccoptions</ccompiler>
+        <cxxcompiler>tdevgppoptions</cxxcompiler>
+        <f77compiler>tdevg77options</f77compiler>
         <ccompilerbinary></ccompilerbinary>
         <cxxcompilerbinary></cxxcompilerbinary>
         <f77compilerbinary></f77compilerbinary>
@@ -92,8 +92,8 @@
       <prio>0</prio>
       <runmultiplejobs>false</runmultiplejobs>
     </make>
-  </kdevautoproject>
-  <kdevfileview>
+  </tdevautoproject>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h;*.H" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -108,8 +108,8 @@
       <hidenonprojectfiles>true</hidenonprojectfiles>
       <showvcsfields>false</showvcsfields>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -151,8 +151,8 @@
     <ignoredoxygen/>
     <ignorekdocs/>
     <ignoredevhelp/>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
       <programargs></programargs>
@@ -169,22 +169,22 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </kdevdebugger>
-  <kdevfilecreate>
+  </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
       <includeTypes>true</includeTypes>
@@ -214,7 +214,7 @@
       <inlineGet>true</inlineGet>
       <inlineSet>true</inlineSet>
     </creategettersetter>
-  </kdevcppsupport>
+  </tdevcppsupport>
   <dist>
     <custom>false</custom>
     <bzip>false</bzip>
@@ -239,14 +239,14 @@
     <appskde>false</appskde>
     <url/>
   </dist>
-  <kdevcvsservice>
+  <tdevcvsservice>
     <recursivewhenupdate>true</recursivewhenupdate>
     <prunedirswhenupdate>true</prunedirswhenupdate>
     <createdirswhenupdate>true</createdirswhenupdate>
     <recursivewhencommitremove>true</recursivewhencommitremove>
     <revertoptions>-C</revertoptions>
-  </kdevcvsservice>
-  <kdevcvs>
+  </tdevcvsservice>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions/>
     <addoptions/>
@@ -256,12 +256,12 @@
     <revertoptions>-C -d -P</revertoptions>
     <diffoptions>-u3 -p</diffoptions>
     <rshoptions/>
-  </kdevcvs>
-  <kdevdocumentation>
+  </tdevcvs>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem/>
       <docurl/>
       <usermanualurl/>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/kommander/kommander-editor.tdevelop b/kommander/kommander-editor.tdevelop
index 54064ca0..e2d7300c 100644
--- a/kommander/kommander-editor.tdevelop
+++ b/kommander/kommander-editor.tdevelop
@@ -18,7 +18,7 @@
     <defaultencoding/>
     <projectname>kommander-editor</projectname>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -33,8 +33,8 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <showvcsfields>false</showvcsfields>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>gtk</toc>
       <toc>gnustep</toc>
@@ -56,7 +56,7 @@
       <toc>java_bugs_gcc</toc>
       <toc>java_bugs_sun</toc>
       <toc>kde2book</toc>
-      <toc>kdev3api</toc>
+      <toc>tdev3api</toc>
       <toc>libc</toc>
       <toc>libstdc++</toc>
       <toc>opengl</toc>
@@ -99,8 +99,8 @@
       <toc>pango</toc>
       <toc>gdk-pixbuf</toc>
     </ignoredevhelp>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell/>
       <programargs/>
@@ -119,16 +119,16 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </kdevdebugger>
-  <kdevfilecreate>
+  </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevautoproject>
+  </tdevfilecreate>
+  <tdevautoproject>
     <make>
       <envvars>
         <envvar value="1" name="WANT_AUTOCONF_2_5" />
@@ -152,9 +152,9 @@
         <topsourcedir>/data/development/sources/kde-3.5/tdewebdev/</topsourcedir>
         <cppflags/>
         <ldflags/>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevpgf77options</f77compiler>
+        <ccompiler>tdevgccoptions</ccompiler>
+        <cxxcompiler>tdevgppoptions</cxxcompiler>
+        <f77compiler>tdevpgf77options</f77compiler>
         <ccompilerbinary/>
         <cxxcompilerbinary/>
         <f77compilerbinary/>
@@ -170,9 +170,9 @@
         <topsourcedir/>
         <cppflags/>
         <ldflags/>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevpgf77options</f77compiler>
+        <ccompiler>tdevgccoptions</ccompiler>
+        <cxxcompiler>tdevgppoptions</cxxcompiler>
+        <f77compiler>tdevpgf77options</f77compiler>
         <ccompilerbinary/>
         <cxxcompilerbinary/>
         <f77compilerbinary/>
@@ -195,7 +195,7 @@
       <autoinstall>false</autoinstall>
       <autotdesu>false</autotdesu>
     </run>
-  </kdevautoproject>
+  </tdevautoproject>
   <cppsupportpart>
     <codecompletion/>
     <filetemplates>
@@ -207,11 +207,11 @@
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevclassview>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevcvs>
+  </tdevclassview>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions/>
     <updateoptions>-dP</updateoptions>
@@ -221,8 +221,8 @@
     <logoptions/>
     <rshoptions/>
     <revertoptions>-C -d -P</revertoptions>
-  </kdevcvs>
-  <kdevcppsupport>
+  </tdevcvs>
+  <tdevcppsupport>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
       <includeTypes>true</includeTypes>
@@ -274,12 +274,12 @@
       <synchronize>true</synchronize>
       <orientation>Vertical</orientation>
     </splitheadersource>
-  </kdevcppsupport>
-  <kdevcvsservice>
+  </tdevcppsupport>
+  <tdevcvsservice>
     <recursivewhenupdate>true</recursivewhenupdate>
     <prunedirswhenupdate>true</prunedirswhenupdate>
     <createdirswhenupdate>true</createdirswhenupdate>
     <recursivewhencommitremove>true</recursivewhencommitremove>
     <revertoptions>-C</revertoptions>
-  </kdevcvsservice>
+  </tdevcvsservice>
 </tdevelop>
diff --git a/kommander/kommander.tdevelop b/kommander/kommander.tdevelop
index 268b3b74..91a37354 100644
--- a/kommander/kommander.tdevelop
+++ b/kommander/kommander.tdevelop
@@ -18,7 +18,7 @@
     <defaultencoding/>
     <projectname>kommander</projectname>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -33,8 +33,8 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <showvcsfields>false</showvcsfields>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>gtk</toc>
       <toc>gnustep</toc>
@@ -98,8 +98,8 @@
       <toc>ORBit2</toc>
       <toc>gdk-pixbuf</toc>
     </ignoredevhelp>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell/>
       <programargs>/opt/trinity/bin/DVDAuthorWizard.kmdr</programargs>
@@ -118,16 +118,16 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </kdevdebugger>
-  <kdevfilecreate>
+  </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevautoproject>
+  </tdevfilecreate>
+  <tdevautoproject>
     <make>
       <envvars>
         <envvar value="no" name="UNSERMAKE" />
@@ -152,9 +152,9 @@
         <topsourcedir>/data/development/sources/kde-3.5/tdewebdev/</topsourcedir>
         <cppflags/>
         <ldflags/>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevpgf77options</f77compiler>
+        <ccompiler>tdevgccoptions</ccompiler>
+        <cxxcompiler>tdevgppoptions</cxxcompiler>
+        <f77compiler>tdevpgf77options</f77compiler>
         <ccompilerbinary/>
         <cxxcompilerbinary/>
         <f77compilerbinary/>
@@ -178,7 +178,7 @@
       <globalcwd>/data/development/build/kde-3.5/tdewebdev/</globalcwd>
       <useglobalprogram>true</useglobalprogram>
     </run>
-  </kdevautoproject>
+  </tdevautoproject>
   <cppsupportpart>
     <codecompletion/>
     <filetemplates>
@@ -190,11 +190,11 @@
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevclassview>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevcvs>
+  </tdevclassview>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions/>
     <updateoptions>-dP</updateoptions>
@@ -203,8 +203,8 @@
     <diffoptions>-u3 -p</diffoptions>
     <logoptions/>
     <rshoptions/>
-  </kdevcvs>
-  <kdevcppsupport>
+  </tdevcvs>
+  <tdevcppsupport>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
       <includeTypes>true</includeTypes>
@@ -261,19 +261,19 @@
       <synchronize>true</synchronize>
       <orientation>Vertical</orientation>
     </splitheadersource>
-  </kdevcppsupport>
-  <kdevcvsservice>
+  </tdevcppsupport>
+  <tdevcvsservice>
     <recursivewhenupdate>true</recursivewhenupdate>
     <prunedirswhenupdate>true</prunedirswhenupdate>
     <createdirswhenupdate>true</createdirswhenupdate>
     <recursivewhencommitremove>true</recursivewhencommitremove>
     <revertoptions>-C</revertoptions>
-  </kdevcvsservice>
-  <kdevdocumentation>
+  </tdevcvsservice>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem/>
       <docurl/>
       <usermanualurl/>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/kommander/working/plugintemplate/Makefile.am b/kommander/working/plugintemplate/Makefile.am
index 06a26086..037be656 100644
--- a/kommander/working/plugintemplate/Makefile.am
+++ b/kommander/working/plugintemplate/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = src-Makefile.am plugin.cpp  \
 templateName = kommanderplugin
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/kommander/working/plugintemplate/app.tdevelop b/kommander/working/plugintemplate/app.tdevelop
index 89685ef6..c86ca64c 100644
--- a/kommander/working/plugintemplate/app.tdevelop
+++ b/kommander/working/plugintemplate/app.tdevelop
@@ -14,16 +14,16 @@
    <keyword>KDevelop</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
       <designerintegration>EmbeddedKDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -34,22 +34,22 @@
      <configurations>
       <optimized>
         <builddir>optimized</builddir>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevg77options</f77compiler>
+        <ccompiler>tdevgccoptions</ccompiler>
+        <cxxcompiler>tdevgppoptions</cxxcompiler>
+        <f77compiler>tdevg77options</f77compiler>
         <cxxflags>-O2 -g0</cxxflags>
       </optimized>
       <debug>
         <configargs>--enable-debug=full</configargs>
         <builddir>debug</builddir>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevg77options</f77compiler>
+        <ccompiler>tdevgccoptions</ccompiler>
+        <cxxcompiler>tdevgppoptions</cxxcompiler>
+        <f77compiler>tdevg77options</f77compiler>
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
-</kdevautoproject>
- <kdevfileview>
+</tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -57,8 +57,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -93,24 +93,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/kommander/working/plugintemplate/kommanderplugin.kdevtemplate b/kommander/working/plugintemplate/kommanderplugin.tdevtemplate
similarity index 91%
rename from kommander/working/plugintemplate/kommanderplugin.kdevtemplate
rename to kommander/working/plugintemplate/kommanderplugin.tdevtemplate
index b5c3c303..3aad17f7 100644
--- a/kommander/working/plugintemplate/kommanderplugin.kdevtemplate
+++ b/kommander/working/plugintemplate/kommanderplugin.tdevtemplate
@@ -9,11 +9,11 @@ Archive=kommanderplugin.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MkDir1]
 Type=mkdir
diff --git a/quanta/quanta.tdevelop b/quanta/quanta.tdevelop
index 2a70d8f0..472b07a6 100644
--- a/quanta/quanta.tdevelop
+++ b/quanta/quanta.tdevelop
@@ -12,7 +12,7 @@
     <version>3.2-CVS-1</version>
     <description>Quanta Plus Web Development Environment</description>
     <ignoreparts>
-      <part>kdevvalgrind</part>
+      <part>tdevvalgrind</part>
     </ignoreparts>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
@@ -21,7 +21,7 @@
     <defaultencoding/>
     <projectname>quanta</projectname>
   </general>
-  <kdevautoproject>
+  <tdevautoproject>
     <general>
       <mainprogram>quanta</mainprogram>
       <useconfiguration>default</useconfiguration>
@@ -75,9 +75,9 @@
       <default>
         <configargs>--enable-debug=full --prefix=/opt/kde-35 --enable-editors</configargs>
         <builddir>/data/development/build/kde-3.5/tdewebdev</builddir>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevpgf77options</f77compiler>
+        <ccompiler>tdevgccoptions</ccompiler>
+        <cxxcompiler>tdevgppoptions</cxxcompiler>
+        <f77compiler>tdevpgf77options</f77compiler>
         <ccompilerbinary/>
         <cxxcompilerbinary/>
         <f77compilerbinary/>
@@ -95,9 +95,9 @@
         <configargs>--enable-debug=full --prefix=/opt/trinity</configargs>
         <builddir>/data/development/build/kde-head/tdewebdev</builddir>
         <topsourcedir/>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevpgf77options</f77compiler>
+        <ccompiler>tdevgccoptions</ccompiler>
+        <cxxcompiler>tdevgppoptions</cxxcompiler>
+        <f77compiler>tdevpgf77options</f77compiler>
         <ccompilerbinary/>
         <cxxcompilerbinary/>
         <f77compilerbinary/>
@@ -111,9 +111,9 @@
         <configargs>--enable-debug=full --prefix=/opt/trinity --enable-editors</configargs>
         <builddir>/data/development/build/kde-head/tdewebdev</builddir>
         <topsourcedir>/data/development/sources/kde-head/tdewebdev</topsourcedir>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevpgf77options</f77compiler>
+        <ccompiler>tdevgccoptions</ccompiler>
+        <cxxcompiler>tdevgppoptions</cxxcompiler>
+        <f77compiler>tdevpgf77options</f77compiler>
         <ccompilerbinary/>
         <cxxcompilerbinary/>
         <f77compilerbinary/>
@@ -129,9 +129,9 @@
         <topsourcedir/>
         <cppflags/>
         <ldflags/>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevpgf77options</f77compiler>
+        <ccompiler>tdevgccoptions</ccompiler>
+        <cxxcompiler>tdevgppoptions</cxxcompiler>
+        <f77compiler>tdevpgf77options</f77compiler>
         <ccompilerbinary/>
         <cxxcompilerbinary/>
         <f77compilerbinary/>
@@ -145,9 +145,9 @@
         <topsourcedir>/data/development/sources/kde-head/tdewebdev</topsourcedir>
         <cppflags/>
         <ldflags/>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevpgf77options</f77compiler>
+        <ccompiler>tdevgccoptions</ccompiler>
+        <cxxcompiler>tdevgppoptions</cxxcompiler>
+        <f77compiler>tdevpgf77options</f77compiler>
         <ccompilerbinary/>
         <cxxcompilerbinary/>
         <f77compilerbinary/>
@@ -166,8 +166,8 @@
       <subclass uifile="/project/eventeditordlgs.ui" sourcefile="/project/eventeditordlg.cpp" />
       <subclass uifile="/project/eventeditordlgs.ui" sourcefile="/project/eventeditordlg.h" />
     </subclassing>
-  </kdevautoproject>
-  <kdevfileview>
+  </tdevautoproject>
+  <tdevfileview>
     <groups>
       <group pattern="description.rc" name="Tag descriptions" />
       <group pattern=".h;.hxx;.hpp;.H" name="Headers" />
@@ -187,8 +187,8 @@
       <hidepatterns/>
       <showvcsfields>true</showvcsfields>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>gtk</toc>
       <toc>gnustep</toc>
@@ -204,8 +204,8 @@
     <ignoredoxygen/>
     <ignorekdocs/>
     <ignoredevhelp/>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell/>
       <programargs/>
@@ -224,7 +224,7 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </kdevdebugger>
+  </tdevdebugger>
   <cppsupportpart>
     <codecompletion>
       <codehinting outputview="1" enablech="1" selectview="0" />
@@ -243,11 +243,11 @@
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevclassview>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevcvs>
+  </tdevclassview>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions/>
     <updateoptions>-dP</updateoptions>
@@ -257,8 +257,8 @@
     <logoptions/>
     <rshoptions/>
     <revertoptions>-C -d -P</revertoptions>
-  </kdevcvs>
-  <kdevfilecreate>
+  </tdevcvs>
+  <tdevfilecreate>
     <filetypes>
       <type icon="" ext="h" name="C++ header" create="template" >
         <descr>Quanta speicfic header</descr>
@@ -268,8 +268,8 @@
       </type>
     </filetypes>
     <useglobaltypes/>
-  </kdevfilecreate>
-  <kdevcppsupport>
+  </tdevfilecreate>
+  <tdevcppsupport>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
       <includeTypes>true</includeTypes>
@@ -327,12 +327,12 @@
       <synchronize>true</synchronize>
       <orientation>Vertical</orientation>
     </splitheadersource>
-  </kdevcppsupport>
-  <kdevcvsservice>
+  </tdevcppsupport>
+  <tdevcvsservice>
     <recursivewhenupdate>true</recursivewhenupdate>
     <prunedirswhenupdate>true</prunedirswhenupdate>
     <createdirswhenupdate>true</createdirswhenupdate>
     <recursivewhencommitremove>true</recursivewhencommitremove>
     <revertoptions>-C</revertoptions>
-  </kdevcvsservice>
+  </tdevcvsservice>
 </tdevelop>
diff --git a/tdefilereplace/tdefilereplace.tdevelop b/tdefilereplace/tdefilereplace.tdevelop
index 14e5fe4a..b112d338 100644
--- a/tdefilereplace/tdefilereplace.tdevelop
+++ b/tdefilereplace/tdefilereplace.tdevelop
@@ -15,9 +15,9 @@
     <description/>
     <ignoreparts/>
     <secondaryLanguages/>
-    <versioncontrol>kdevcvsservice</versioncontrol>
+    <versioncontrol>tdevcvsservice</versioncontrol>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -32,8 +32,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -70,8 +70,8 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
       <programargs/>
@@ -88,16 +88,16 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </kdevdebugger>
-  <kdevfilecreate>
+  </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevautoproject>
+  </tdevfilecreate>
+  <tdevautoproject>
     <make>
       <envvars>
         <envvar value="1" name="WANT_AUTOCONF_2_5" />
@@ -132,9 +132,9 @@
         <topsourcedir>/home/andris/development/sources/kde-head/tdewebdev</topsourcedir>
         <cppflags>-DKDE_NO_COMPAT -DQT_NO_COMPAT -DDEBUG_PARSER</cppflags>
         <ldflags/>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevpgf77options</f77compiler>
+        <ccompiler>tdevgccoptions</ccompiler>
+        <cxxcompiler>tdevgppoptions</cxxcompiler>
+        <f77compiler>tdevpgf77options</f77compiler>
         <ccompilerbinary/>
         <cxxcompilerbinary/>
         <f77compilerbinary/>
@@ -143,14 +143,14 @@
         <f77flags/>
       </default>
     </configurations>
-  </kdevautoproject>
+  </tdevautoproject>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
       <includeTypes>true</includeTypes>
@@ -172,19 +172,19 @@
       <inlineGet>true</inlineGet>
       <inlineSet>true</inlineSet>
     </creategettersetter>
-  </kdevcppsupport>
-  <kdevdocumentation>
+  </tdevcppsupport>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem/>
       <docurl/>
       <usermanualurl/>
     </projectdoc>
-  </kdevdocumentation>
-  <kdevcvsservice>
+  </tdevdocumentation>
+  <tdevcvsservice>
     <recursivewhenupdate>true</recursivewhenupdate>
     <prunedirswhenupdate>true</prunedirswhenupdate>
     <createdirswhenupdate>true</createdirswhenupdate>
     <recursivewhencommitremove>true</recursivewhencommitremove>
     <revertoptions>-C</revertoptions>
-  </kdevcvsservice>
+  </tdevcvsservice>
 </tdevelop>