diff --git a/app_templates/kcontrol_module/doc/en/index.docbook b/app_templates/kcontrol_module/doc/en/index.docbook
index 838e76f..eff207c 100644
--- a/app_templates/kcontrol_module/doc/en/index.docbook
+++ b/app_templates/kcontrol_module/doc/en/index.docbook
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY appname "<application>MyApplicaition 0.1</application>">
   <!ENTITY kappname "&appname;"><!-- Do *not* replace kappname-->
-  <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
+  <!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
   
@@ -489,7 +489,7 @@ application -->
 <!--
 List any special requirements for your application here. This should include:
 .Libraries or other software that is not included in tdesupport,
-kdelibs, or kdebase.
+tdelibs, or tdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
 .Operating systems the app will run on. If your app is designed only for a
diff --git a/app_templates/kdeapp/doc/en/index.docbook b/app_templates/kdeapp/doc/en/index.docbook
index 838e76f..eff207c 100644
--- a/app_templates/kdeapp/doc/en/index.docbook
+++ b/app_templates/kdeapp/doc/en/index.docbook
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY appname "<application>MyApplicaition 0.1</application>">
   <!ENTITY kappname "&appname;"><!-- Do *not* replace kappname-->
-  <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
+  <!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
   
@@ -489,7 +489,7 @@ application -->
 <!--
 List any special requirements for your application here. This should include:
 .Libraries or other software that is not included in tdesupport,
-kdelibs, or kdebase.
+tdelibs, or tdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
 .Operating systems the app will run on. If your app is designed only for a
diff --git a/app_templates/kdeutility/doc/en/index.docbook b/app_templates/kdeutility/doc/en/index.docbook
index 838e76f..eff207c 100644
--- a/app_templates/kdeutility/doc/en/index.docbook
+++ b/app_templates/kdeutility/doc/en/index.docbook
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY appname "<application>MyApplicaition 0.1</application>">
   <!ENTITY kappname "&appname;"><!-- Do *not* replace kappname-->
-  <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
+  <!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
   
@@ -489,7 +489,7 @@ application -->
 <!--
 List any special requirements for your application here. This should include:
 .Libraries or other software that is not included in tdesupport,
-kdelibs, or kdebase.
+tdelibs, or tdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
 .Operating systems the app will run on. If your app is designed only for a
diff --git a/app_templates/kioslave/doc/en/index.docbook b/app_templates/kioslave/doc/en/index.docbook
index 838e76f..eff207c 100644
--- a/app_templates/kioslave/doc/en/index.docbook
+++ b/app_templates/kioslave/doc/en/index.docbook
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY appname "<application>MyApplicaition 0.1</application>">
   <!ENTITY kappname "&appname;"><!-- Do *not* replace kappname-->
-  <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
+  <!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
   
@@ -489,7 +489,7 @@ application -->
 <!--
 List any special requirements for your application here. This should include:
 .Libraries or other software that is not included in tdesupport,
-kdelibs, or kdebase.
+tdelibs, or tdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
 .Operating systems the app will run on. If your app is designed only for a
diff --git a/app_templates/kioslave/src/kioslave.py b/app_templates/kioslave/src/kioslave.py
index 641059a..2d013b0 100755
--- a/app_templates/kioslave/src/kioslave.py
+++ b/app_templates/kioslave/src/kioslave.py
@@ -31,7 +31,7 @@ DEBUG = 1
 class SlaveClass(KIO.SlaveBase):
     """SlaveClass(KIO.SlaveBase)
     
-    See kdelibs/kio/kio/slavebase.h for virtual functions to override.
+    See tdelibs/kio/kio/slavebase.h for virtual functions to override.
     """
     
     ########################################################################
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 9f347d4..cce3314 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY appname "<application>PyKDE Extensions</application>">
   <!ENTITY kappname "&appname;"><!-- Do *not* replace kappname-->
-  <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
+  <!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
   
diff --git a/src/kdedistutils.py b/src/kdedistutils.py
index 00e1d1b..ff44670 100644
--- a/src/kdedistutils.py
+++ b/src/kdedistutils.py
@@ -853,9 +853,9 @@ class BuildKControlModule(Command):
 #include <sip.h>
 
 #define MODULE_DIR "%(moduledir)s"
-#define EXTRA_MODULE_DIR "/opt/trinity/share/python-support/kde-guidance-trinity"
+#define EXTRA_MODULE_DIR "/opt/trinity/share/python-support/tde-guidance-trinity"
 #define EXTRA_MODULE_DIR_TWO "/opt/trinity/share/python-support/guidance-backends-trinity"
-#define EXTRA_MODULE_DIR_THREE "/opt/trinity/share/python-support/kde-guidance-powermanager-trinity"
+#define EXTRA_MODULE_DIR_THREE "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity"
 #define MODULE_NAME "%(modulename)s"
 #define FACTORY "%(factoryfunction)s"
 #define CPP_FACTORY %(factoryfunction)s