4 files changed, 22 insertions, 22 deletions
diff --git a/languages/cpp/app_templates/kpartapp/CMakeLists.txt b/languages/cpp/app_templates/kpartapp/CMakeLists.txt
index ab0ed3b0..9f3d8119 100644
--- a/languages/cpp/app_templates/kpartapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/kpartapp/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( kpartapp.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kpartapp.tar.gz kpartapp.png
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    kpartapp.tdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+    kpartapp.kdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kpartapp/Makefile.am b/languages/cpp/app_templates/kpartapp/Makefile.am
index 45c41564..bfb8ceed 100644
--- a/languages/cpp/app_templates/kpartapp/Makefile.am
+++ b/languages/cpp/app_templates/kpartapp/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = src-Makefile.am app.cpp app.h app_part.cpp\
 	kpartapp.png app.tdevelop subdirs
 templateName = kpartapp
 ### 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/kpartapp/app.tdevelop b/languages/cpp/app_templates/kpartapp/app.tdevelop
index 56e6f467..a8628fe3 100644
--- a/languages/cpp/app_templates/kpartapp/app.tdevelop
+++ b/languages/cpp/app_templates/kpartapp/app.tdevelop
@@ -13,16 +13,16 @@
    <keyword>TDE</keyword>
   </keywords>
  </general>
-  <tdevcppsupport>
+  <kdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedTDevDesigner</designerintegration>
+      <designerintegration>EmbeddedKDevDesigner</designerintegration>
     </qt>
-  </tdevcppsupport>
+  </kdevcppsupport>
 
- <tdevautoproject>
+ <kdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -47,8 +47,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
-</tdevautoproject>
- <tdevfileview>
+</kdevautoproject>
+ <kdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -56,8 +56,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </tdevfileview>
- <tdevdoctreeview>
+ </kdevfileview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -92,24 +92,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </tdevdebugger>
-  <tdevfilecreate>
+ </kdevdebugger>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
-  <tdevdocumentation>
+  </kdevfilecreate>
+  <kdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </tdevdocumentation>
+  </kdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kpartapp/kpartapp.tdevtemplate b/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate
index 11aaaabb..773cc0d8 100644
--- a/languages/cpp/app_templates/kpartapp/kpartapp.tdevtemplate
+++ b/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate
@@ -65,11 +65,11 @@ Archive=kpartapp.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.tdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.tdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir