4 files changed, 22 insertions, 22 deletions
diff --git a/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt b/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt
index b1149d88..eae96197 100644
--- a/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( tdescreensaver.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/tdescreensaver.tar.gz tdescreensaver.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    tdescreensaver.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    tdescreensaver.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/tdescreensaver/Makefile.am b/languages/cpp/app_templates/tdescreensaver/Makefile.am
index bee93bbc..1f9e6179 100644
--- a/languages/cpp/app_templates/tdescreensaver/Makefile.am
+++ b/languages/cpp/app_templates/tdescreensaver/Makefile.am
@@ -5,10 +5,10 @@ dataFiles = tdescreensaver.desktop tdescreensaver.png tdescreensaver.h \
 templateName= tdescreensaver
 
 ### 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/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop
index 28e0a678..c3ae15db 100644
--- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop
@@ -14,16 +14,16 @@
    <keyword>tdeioslave</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
-<kdevautoproject>
+<tdevautoproject>
   <general>
    <activetarget>src/lib%{APPNAMELC}.la</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -45,15 +45,15 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -90,24 +90,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/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevtemplate
index 91510f04..0500fdd5 100644
--- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevtemplate
@@ -68,11 +68,11 @@ Archive=tdescreensaver.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
 
 [MKDIR_DOCBOOK1]
 Type=mkdir