12 files changed, 40 insertions, 40 deletions
diff --git a/languages/python/app_templates/pyqt/CMakeLists.txt b/languages/python/app_templates/pyqt/CMakeLists.txt
index 0beb7976..672d6652 100644
--- a/languages/python/app_templates/pyqt/CMakeLists.txt
+++ b/languages/python/app_templates/pyqt/CMakeLists.txt
@@ -21,9 +21,9 @@ add_custom_target( pyqt.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/pyqt.tar.gz pyqt.png
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    pyqt.tdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+    pyqt.kdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/python/app_templates/pyqt/Makefile.am b/languages/python/app_templates/pyqt/Makefile.am
index 7ace4e15..dc12ca69 100644
--- a/languages/python/app_templates/pyqt/Makefile.am
+++ b/languages/python/app_templates/pyqt/Makefile.am
@@ -6,10 +6,10 @@ dataFiles = app.py app.tdevelop fileopen.pyxpm fileprint.pyxpm  \
 templateName = pyqt
 
 ### 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/python/app_templates/pyqt/app.tdevelop b/languages/python/app_templates/pyqt/app.tdevelop
index 7f2743cb..2abb394e 100644
--- a/languages/python/app_templates/pyqt/app.tdevelop
+++ b/languages/python/app_templates/pyqt/app.tdevelop
@@ -12,15 +12,15 @@
     </keywords>
     <ignoreparts/>
   </general>
-  <tdevautoproject>
+  <kdevautoproject>
     <general>
       <activedir/>
     </general>
     <run>
       <mainprogram>./%{APPNAMELC}.py</mainprogram>
     </run>
-  </tdevautoproject>
-  <tdevdoctreeview>
+  </kdevautoproject>
+  <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -61,8 +61,8 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </tdevdoctreeview>
-  <tdevfileview>
+  </kdevdoctreeview>
+  <kdevfileview>
     <tree>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
@@ -71,11 +71,11 @@
       <group pattern="*.py" name="Python files" />
       <group pattern="*.ui" name="QT Designer files" />
     </groups>
-  </tdevfileview>
-  <tdevfilecreate>
+  </kdevfileview>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="py"/>
       <type ext="ui"/>
     </useglobaltypes>
-  </tdevfilecreate>  
+  </kdevfilecreate>  
 </tdevelop>
diff --git a/languages/python/app_templates/pyqt/pyqt.tdevtemplate b/languages/python/app_templates/pyqt/pyqt.kdevtemplate
index cb0deace..f19e263c 100644
--- a/languages/python/app_templates/pyqt/pyqt.tdevtemplate
+++ b/languages/python/app_templates/pyqt/pyqt.kdevtemplate
@@ -66,7 +66,7 @@ Archive=pyqt.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.tdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/python/app_templates/pythonhello/CMakeLists.txt b/languages/python/app_templates/pythonhello/CMakeLists.txt
index d6c3f09c..dfdbbc3b 100644
--- a/languages/python/app_templates/pythonhello/CMakeLists.txt
+++ b/languages/python/app_templates/pythonhello/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( pythonhello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/pythonhello.tar.gz pythonhello.png
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    pythonhello.tdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+    pythonhello.kdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/python/app_templates/pythonhello/Makefile.am b/languages/python/app_templates/pythonhello/Makefile.am
index 7265f7de..2dc4f559 100644
--- a/languages/python/app_templates/pythonhello/Makefile.am
+++ b/languages/python/app_templates/pythonhello/Makefile.am
@@ -1,10 +1,10 @@
 dataFiles = app.py app.tdevelop pythonhello.png
 templateName = pythonhello
 ### 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/python/app_templates/pythonhello/app.tdevelop b/languages/python/app_templates/pythonhello/app.tdevelop
index a93a999c..9826d145 100644
--- a/languages/python/app_templates/pythonhello/app.tdevelop
+++ b/languages/python/app_templates/pythonhello/app.tdevelop
@@ -11,15 +11,15 @@
   </keywords>
   <ignoreparts/>
  </general>
- <tdevscriptproject>
+ <kdevscriptproject>
   <general>
    <activedir></activedir>
   </general>
   <run>
    <mainprogram>%{APPNAMELC}.py</mainprogram>
   </run>
- </tdevscriptproject>
- <tdevdoctreeview>
+ </kdevscriptproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -66,8 +66,8 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevfileview>
+ </kdevdoctreeview>
+ <kdevfileview>
    <tree>
      <hidenonprojectfiles>false</hidenonprojectfiles>
      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
@@ -75,10 +75,10 @@
    <groups>
      <group pattern="*.py" name="Python files" />
    </groups>
- </tdevfileview>
-  <tdevfilecreate>
+ </kdevfileview>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="py"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/languages/python/app_templates/pythonhello/pythonhello.tdevtemplate b/languages/python/app_templates/pythonhello/pythonhello.kdevtemplate
index 0e130571..0e130571 100644
--- a/languages/python/app_templates/pythonhello/pythonhello.tdevtemplate
+++ b/languages/python/app_templates/pythonhello/pythonhello.kdevtemplate
diff --git a/languages/python/app_templates/pytk/CMakeLists.txt b/languages/python/app_templates/pytk/CMakeLists.txt
index d71c9be1..1a28ddad 100644
--- a/languages/python/app_templates/pytk/CMakeLists.txt
+++ b/languages/python/app_templates/pytk/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( pytk.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/pytk.tar.gz pytk.png
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    pytk.tdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+    pytk.kdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/python/app_templates/pytk/Makefile.am b/languages/python/app_templates/pytk/Makefile.am
index 94fb2122..d1ebe715 100644
--- a/languages/python/app_templates/pytk/Makefile.am
+++ b/languages/python/app_templates/pytk/Makefile.am
@@ -1,10 +1,10 @@
 dataFiles = app.py app.tdevelop pytk.png
 templateName = pytk
 ### 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/python/app_templates/pytk/app.tdevelop b/languages/python/app_templates/pytk/app.tdevelop
index 95144f90..1482b842 100644
--- a/languages/python/app_templates/pytk/app.tdevelop
+++ b/languages/python/app_templates/pytk/app.tdevelop
@@ -11,15 +11,15 @@
   </keywords>
   <ignoreparts/>
  </general>
- <tdevscriptproject>
+ <kdevscriptproject>
   <general>
    <activedir></activedir>
   </general>
   <run>
    <mainprogram>%{APPNAMELC}.py</mainprogram>
   </run>
- </tdevscriptproject>
- <tdevdoctreeview>
+ </kdevscriptproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -64,8 +64,8 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevfileview>
+ </kdevdoctreeview>
+ <kdevfileview>
    <tree>
      <hidenonprojectfiles>false</hidenonprojectfiles>
      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
@@ -73,10 +73,10 @@
    <groups>
      <group pattern="*.py" name="Python files" />
    </groups>
- </tdevfileview>
-  <tdevfilecreate>
+ </kdevfileview>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="py"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/languages/python/app_templates/pytk/pytk.tdevtemplate b/languages/python/app_templates/pytk/pytk.kdevtemplate
index 3b8ac6bc..3b8ac6bc 100644
--- a/languages/python/app_templates/pytk/pytk.tdevtemplate
+++ b/languages/python/app_templates/pytk/pytk.kdevtemplate