4 files changed, 22 insertions, 22 deletions
diff --git a/languages/cpp/app_templates/tdeioslave/CMakeLists.txt b/languages/cpp/app_templates/tdeioslave/CMakeLists.txt
index 730f65e2..584bdc19 100644
--- a/languages/cpp/app_templates/tdeioslave/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdeioslave/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( tdeioslave.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/tdeioslave.tar.gz tdeioslave.png
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    tdeioslave.tdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+    tdeioslave.kdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/tdeioslave/Makefile.am b/languages/cpp/app_templates/tdeioslave/Makefile.am
index 003040b4..bee7ddb6 100644
--- a/languages/cpp/app_templates/tdeioslave/Makefile.am
+++ b/languages/cpp/app_templates/tdeioslave/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = slave.cpp slave.h slave.protocol slave.tdevelop \
 templateName = tdeioslave
 
 ### 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/tdeioslave/slave.tdevelop b/languages/cpp/app_templates/tdeioslave/slave.tdevelop
index 5cbbe5e0..cb257385 100644
--- a/languages/cpp/app_templates/tdeioslave/slave.tdevelop
+++ b/languages/cpp/app_templates/tdeioslave/slave.tdevelop
@@ -14,16 +14,16 @@
    <keyword>tdeioslave</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/lib%{APPNAMELC}.la</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -45,15 +45,15 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </tdevautoproject>
- <tdevfileview>
+ </kdevautoproject>
+ <kdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </tdevfileview>
- <tdevdoctreeview>
+ </kdevfileview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -91,23 +91,23 @@
       <toc>Qt Designer Manual</toc>
       <toc>Qt Reference Documentation</toc>
     </ignoreqt_xml>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </tdevdebugger>
-  <tdevfilecreate>
+ </kdevdebugger>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <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/tdeioslave/tdeioslave.tdevtemplate b/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate
index 6ced25c6..2ff27786 100644
--- a/languages/cpp/app_templates/tdeioslave/tdeioslave.tdevtemplate
+++ b/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate
@@ -56,11 +56,11 @@ Archive=tdeioslave.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