4 files changed, 21 insertions, 21 deletions
diff --git a/languages/cpp/app_templates/opietoday/CMakeLists.txt b/languages/cpp/app_templates/opietoday/CMakeLists.txt
index 2f9e0dd1..6c7c4d66 100644
--- a/languages/cpp/app_templates/opietoday/CMakeLists.txt
+++ b/languages/cpp/app_templates/opietoday/CMakeLists.txt
@@ -20,9 +20,9 @@ add_custom_target( opietoday.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/opietoday.tar.gz opietoday.png
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    opietoday.tdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+    opietoday.kdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/opietoday/Makefile.am b/languages/cpp/app_templates/opietoday/Makefile.am
index 8c9ec514..6c999369 100644
--- a/languages/cpp/app_templates/opietoday/Makefile.am
+++ b/languages/cpp/app_templates/opietoday/Makefile.am
@@ -5,10 +5,10 @@ dataFiles = Makefile.am Example.png  app.tdevelop  app.pro exampleplugin.cpp \
 templateName = opietoday
 
 ### 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/opietoday/app.tdevelop b/languages/cpp/app_templates/opietoday/app.tdevelop
index 043326d3..c387911b 100644
--- a/languages/cpp/app_templates/opietoday/app.tdevelop
+++ b/languages/cpp/app_templates/opietoday/app.tdevelop
@@ -13,7 +13,7 @@
     </keywords>
     <ignoreparts/>
   </general>
-  <tdevfileview>
+  <kdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -24,8 +24,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </tdevfileview>
-  <tdevdoctreeview>
+  </kdevfileview>
+  <kdevdoctreeview>
     <ignoretocs>
       <toc>gtk</toc>
       <toc>gnustep</toc>
@@ -52,8 +52,8 @@
       <toc>libbonobo</toc>
       <toc>libbonoboui</toc>
     </ignoredevhelp>
-  </tdevdoctreeview>
-  <tdevdebugger>
+  </kdevdoctreeview>
+  <kdevdebugger>
     <general>
       <dbgshell></dbgshell>
       <programargs>-qws</programargs>
@@ -66,8 +66,8 @@
       <staticmembers>false</staticmembers>
       <demanglenames>true</demanglenames>
     </display>
-  </tdevdebugger>
-  <tdevtrollproject>
+  </kdevdebugger>
+  <kdevtrollproject>
     <opie>
 	<quick_app>false</quick_app>
     </opie>
@@ -93,15 +93,15 @@
       <programargs>-qws</programargs>
     </run>
     <envvars/>
-  </tdevtrollproject>
-  <tdevfilecreate>
+  </kdevtrollproject>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
 	<type ext="ui" />
 	<type ext="cpp" />
 	<type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
   <cppsupportpart>
     <codecompletion>
       <codehinting outputview="1" enablech="0" selectview="0" />
@@ -120,11 +120,11 @@
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <tdevclassview>
+  <kdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </tdevclassview>
-  <tdevcvs>
+  </kdevclassview>
+  <kdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions></commitoptions>
     <updateoptions>-dP</updateoptions>
@@ -133,11 +133,11 @@
     <diffoptions>-u3 -p</diffoptions>
     <logoptions></logoptions>
     <rshoptions></rshoptions>
-  </tdevcvs>
-  <tdevdocumentation>
+  </kdevcvs>
+  <kdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </tdevdocumentation>
+  </kdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/opietoday/opietoday.tdevtemplate b/languages/cpp/app_templates/opietoday/opietoday.kdevtemplate
index 91bb39be..91bb39be 100644
--- a/languages/cpp/app_templates/opietoday/opietoday.tdevtemplate
+++ b/languages/cpp/app_templates/opietoday/opietoday.kdevtemplate