diff --git a/ChangeLog b/ChangeLog
index e63071e3..45a74e29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2706,7 +2706,7 @@
         * Added cast methods to the editor interfaces, so
           you don't have to pass strings around any longer
 2001-05-19  Bernd Gehrmann  <bernd@physik.hu-berlin.de>
-        * Added kicker, kioslave and kcmodule templates
+        * Added kicker, kioslave and tdecmodule templates
         * Each template can define an icon which is
           shown in the app wizard
         * The Big TDEInstance Cleanup
diff --git a/languages/cpp/app_templates/CMakeLists.txt b/languages/cpp/app_templates/CMakeLists.txt
index 8c5a8667..c8c21605 100644
--- a/languages/cpp/app_templates/CMakeLists.txt
+++ b/languages/cpp/app_templates/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_subdirectory( kapp )
 add_subdirectory( kpartapp )
 add_subdirectory( kpartplugin )
-add_subdirectory( kcmodule )
+add_subdirectory( tdecmodule )
 add_subdirectory( kicker )
 add_subdirectory( kioslave )
 add_subdirectory( kdevpart )
diff --git a/languages/cpp/app_templates/Makefile.am b/languages/cpp/app_templates/Makefile.am
index e862a3c7..d77ef765 100644
--- a/languages/cpp/app_templates/Makefile.am
+++ b/languages/cpp/app_templates/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = kapp kpartapp kpartplugin kcmodule kicker kioslave kdevpart kdevpart2 chello cpphello kscreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello kconfig35 kdevlang noatunvisual noatunui kmod kfileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_kmdi qt4hello qmakeempty automakeempty makefileempty qtopia4app kde4app
+SUBDIRS = kapp kpartapp kpartplugin tdecmodule kicker kioslave kdevpart kdevpart2 chello cpphello kscreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello kconfig35 kdevlang noatunvisual noatunui kmod kfileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_kmdi qt4hello qmakeempty automakeempty makefileempty qtopia4app kde4app
 
 profilescdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE
 profilesc_DATA = c.appwizard
diff --git a/languages/cpp/app_templates/kdecpp.appwizard b/languages/cpp/app_templates/kdecpp.appwizard
index aa36123a..ad9bb0d2 100644
--- a/languages/cpp/app_templates/kdecpp.appwizard
+++ b/languages/cpp/app_templates/kdecpp.appwizard
@@ -1,2 +1,2 @@
 [General]
-List=kdedcop,kioslave,kxt,kdevlang,kmake,kapp,kconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,kfileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,kcmodule,kicker,kscreensaver,kscons_kxt,kscons_kmdi
+List=kdedcop,kioslave,kxt,kdevlang,kmake,kapp,kconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,kfileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,tdecmodule,kicker,kscreensaver,kscons_kxt,kscons_kmdi
diff --git a/languages/cpp/app_templates/kcmodule/.kdev_ignore b/languages/cpp/app_templates/tdecmodule/.kdev_ignore
similarity index 100%
rename from languages/cpp/app_templates/kcmodule/.kdev_ignore
rename to languages/cpp/app_templates/tdecmodule/.kdev_ignore
diff --git a/languages/cpp/app_templates/kcmodule/CMakeLists.txt b/languages/cpp/app_templates/tdecmodule/CMakeLists.txt
similarity index 65%
rename from languages/cpp/app_templates/kcmodule/CMakeLists.txt
rename to languages/cpp/app_templates/tdecmodule/CMakeLists.txt
index 76c3429d..072f5f5e 100644
--- a/languages/cpp/app_templates/kcmodule/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdecmodule/CMakeLists.txt
@@ -9,18 +9,18 @@
 #
 #################################################
 
-add_custom_target( kcmodule.tar.gz ALL
-  COMMAND tar zcf kcmodule.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+add_custom_target( tdecmodule.tar.gz ALL
+  COMMAND tar zcf tdecmodule.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     module.cpp module.h module.desktop module.tdevelop
-    src-Makefile.am kcmodule.png subdirs
+    src-Makefile.am tdecmodule.png subdirs
 )
 
 
 install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kcmodule.tar.gz kcmodule.png
+    ${CMAKE_CURRENT_BINARY_DIR}/tdecmodule.tar.gz tdecmodule.png
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    kcmodule.kdevtemplate
+    tdecmodule.kdevtemplate
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kcmodule/Makefile.am b/languages/cpp/app_templates/tdecmodule/Makefile.am
similarity index 84%
rename from languages/cpp/app_templates/kcmodule/Makefile.am
rename to languages/cpp/app_templates/tdecmodule/Makefile.am
index 8542c99c..b3b19611 100644
--- a/languages/cpp/app_templates/kcmodule/Makefile.am
+++ b/languages/cpp/app_templates/tdecmodule/Makefile.am
@@ -1,6 +1,6 @@
 dataFiles = module.cpp module.h module.desktop module.tdevelop \
-	src-Makefile.am kcmodule.png subdirs
-templateName = kcmodule
+	src-Makefile.am tdecmodule.png subdirs
+templateName = tdecmodule
 
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/cpp/app_templates/kcmodule/module.cpp b/languages/cpp/app_templates/tdecmodule/module.cpp
similarity index 100%
rename from languages/cpp/app_templates/kcmodule/module.cpp
rename to languages/cpp/app_templates/tdecmodule/module.cpp
diff --git a/languages/cpp/app_templates/kcmodule/module.desktop b/languages/cpp/app_templates/tdecmodule/module.desktop
similarity index 100%
rename from languages/cpp/app_templates/kcmodule/module.desktop
rename to languages/cpp/app_templates/tdecmodule/module.desktop
diff --git a/languages/cpp/app_templates/kcmodule/module.h b/languages/cpp/app_templates/tdecmodule/module.h
similarity index 96%
rename from languages/cpp/app_templates/kcmodule/module.h
rename to languages/cpp/app_templates/tdecmodule/module.h
index 169ff030..0e07a6e1 100644
--- a/languages/cpp/app_templates/kcmodule/module.h
+++ b/languages/cpp/app_templates/tdecmodule/module.h
@@ -3,7 +3,7 @@
 #ifndef _%{APPNAMEUC}_H_
 #define _%{APPNAMEUC}_H_
 
-#include <kcmodule.h>
+#include <tdecmodule.h>
 #include <kaboutdata.h>
 
 class %{APPNAME}: public TDECModule
diff --git a/languages/cpp/app_templates/kcmodule/module.tdevelop b/languages/cpp/app_templates/tdecmodule/module.tdevelop
similarity index 100%
rename from languages/cpp/app_templates/kcmodule/module.tdevelop
rename to languages/cpp/app_templates/tdecmodule/module.tdevelop
diff --git a/languages/cpp/app_templates/kcmodule/src-Makefile.am b/languages/cpp/app_templates/tdecmodule/src-Makefile.am
similarity index 100%
rename from languages/cpp/app_templates/kcmodule/src-Makefile.am
rename to languages/cpp/app_templates/tdecmodule/src-Makefile.am
diff --git a/languages/cpp/app_templates/kcmodule/subdirs b/languages/cpp/app_templates/tdecmodule/subdirs
similarity index 100%
rename from languages/cpp/app_templates/kcmodule/subdirs
rename to languages/cpp/app_templates/tdecmodule/subdirs
diff --git a/languages/cpp/app_templates/kcmodule/kcmodule.kdevtemplate b/languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate
similarity index 99%
rename from languages/cpp/app_templates/kcmodule/kcmodule.kdevtemplate
rename to languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate
index 77d9094f..6a39f89e 100644
--- a/languages/cpp/app_templates/kcmodule/kcmodule.kdevtemplate
+++ b/languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate
@@ -31,7 +31,7 @@ Name[sv]=Modul i inställningscentralen
 Name[tr]=Kontrol Merkezi Birimi
 Name[zh_CN]=控制中心模块
 Name[zh_TW]=控制中心模組
-Icon=kcmodule.png
+Icon=tdecmodule.png
 Category=C++/TDE
 Comment=Generates a framework for a module which can be embedded into the TDE Control Center.
 Comment[ca]=Genera una infraestructura per a un mòdul que es pugui encastar al Centre de control de TDE.
@@ -65,7 +65,7 @@ Comment[zh_CN]=生成一个可嵌入 TDE 控制中心的模块框架。
 Comment[zh_TW]=產生一個可以嵌入 TDE 控制中心的模組框架。
 FileTemplates=h,CStyle,cpp,CStyle
 ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp
-Archive=kcmodule.tar.gz
+Archive=tdecmodule.tar.gz
 
 [ADMIN]
 Type=include
diff --git a/languages/cpp/app_templates/kcmodule/kcmodule.png b/languages/cpp/app_templates/tdecmodule/tdecmodule.png
similarity index 100%
rename from languages/cpp/app_templates/kcmodule/kcmodule.png
rename to languages/cpp/app_templates/tdecmodule/tdecmodule.png