4 files changed, 21 insertions, 21 deletions
diff --git a/languages/cpp/app_templates/win32hello/CMakeLists.txt b/languages/cpp/app_templates/win32hello/CMakeLists.txt
index 9cc35db0..bc1c8d80 100644
--- a/languages/cpp/app_templates/win32hello/CMakeLists.txt
+++ b/languages/cpp/app_templates/win32hello/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( win32hello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/win32hello.tar.gz win32hello.png
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    win32hello.tdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+    win32hello.kdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/win32hello/Makefile.am b/languages/cpp/app_templates/win32hello/Makefile.am
index 813c591f..a55bcebc 100644
--- a/languages/cpp/app_templates/win32hello/Makefile.am
+++ b/languages/cpp/app_templates/win32hello/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = app.cpp src-Makefile.am win32-Makefile.am win32-Makefile.cvs \
 templateName = win32hello
 
 ### no need to change below:
-template_DATA = $(templateName).tdevtemplate
+template_DATA = $(templateName).kdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/tdevappwizard
+appwizarddatadir = ${kde_datadir}/kdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/win32hello/app.tdevelop b/languages/cpp/app_templates/win32hello/app.tdevelop
index 3ee2b1af..672646c4 100644
--- a/languages/cpp/app_templates/win32hello/app.tdevelop
+++ b/languages/cpp/app_templates/win32hello/app.tdevelop
@@ -16,7 +16,7 @@
     <ignoreparts/>
     <secondaryLanguages/>
   </general>
-  <tdevautoproject>
+  <kdevautoproject>
     <general>
       <activetarget>src/%{APPNAMELC}</activetarget>
       <useconfiguration>default</useconfiguration>
@@ -75,8 +75,8 @@
       <makebin/>
       <prio>0</prio>
     </make>
-  </tdevautoproject>
-  <tdevdoctreeview>
+  </kdevautoproject>
+  <kdevdoctreeview>
     <ignoretocs>
       <toc>clanlib</toc>
       <toc>opengl</toc>
@@ -92,15 +92,15 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </tdevdoctreeview>
-  <tdevfilecreate>
+  </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
-  <tdevfileview>
+  </kdevfilecreate>
+  <kdevfileview>
     <groups>
       <group pattern="*.h" name="Header files" />
       <group pattern="*.cpp" name="Source files" />
@@ -111,14 +111,14 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </tdevfileview>
+  </kdevfileview>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-  <tdevcppsupport>
+  <kdevcppsupport>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
       <includeTypes>true</includeTypes>
@@ -136,8 +136,8 @@
       <pcs>TDElibs</pcs>
       <pcs>ksjembed</pcs>
     </references>
-  </tdevcppsupport>
-  <tdevdebugger>
+  </kdevcppsupport>
+  <kdevdebugger>
     <general>
       <programargs></programargs>
       <gdbpath></gdbpath>
@@ -154,11 +154,11 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </tdevdebugger>
-  <tdevdocumentation>
+  </kdevdebugger>
+  <kdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </tdevdocumentation>
+  </kdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/win32hello/win32hello.tdevtemplate b/languages/cpp/app_templates/win32hello/win32hello.kdevtemplate
index ce8804a7..3b5f4f3e 100644
--- a/languages/cpp/app_templates/win32hello/win32hello.tdevtemplate
+++ b/languages/cpp/app_templates/win32hello/win32hello.kdevtemplate
@@ -63,11 +63,11 @@ Archive=win32hello.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{tdevelop}/template-common/incadmin.tdevtemplate
+File=%{tdevelop}/template-common/incadmin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.tdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install