diff --git a/app_templates/kcontrol_module/doc/en/index.docbook b/app_templates/kcontrol_module/doc/en/index.docbook
index 325987f..838e76f 100644
--- a/app_templates/kcontrol_module/doc/en/index.docbook
+++ b/app_templates/kcontrol_module/doc/en/index.docbook
@@ -488,7 +488,7 @@ application -->
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
 kdelibs, or kdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
diff --git a/app_templates/kcontrol_module/src/kcontrol_module.py b/app_templates/kcontrol_module/src/kcontrol_module.py
index b435287..643d07a 100755
--- a/app_templates/kcontrol_module/src/kcontrol_module.py
+++ b/app_templates/kcontrol_module/src/kcontrol_module.py
@@ -17,8 +17,8 @@
 
 import sys
 from qt import *
-from kdecore import *
-from kdeui import *
+from tdecore import *
+from tdeui import *
 
 import kdedesigner
 from KcontrolModuleWidgetUI import *
diff --git a/app_templates/kdeapp/doc/en/index.docbook b/app_templates/kdeapp/doc/en/index.docbook
index 325987f..838e76f 100644
--- a/app_templates/kdeapp/doc/en/index.docbook
+++ b/app_templates/kdeapp/doc/en/index.docbook
@@ -488,7 +488,7 @@ application -->
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
 kdelibs, or kdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
diff --git a/app_templates/kdeapp/src/kdeapp.py b/app_templates/kdeapp/src/kdeapp.py
index 6c9b921..ccf3124 100755
--- a/app_templates/kdeapp/src/kdeapp.py
+++ b/app_templates/kdeapp/src/kdeapp.py
@@ -16,8 +16,8 @@
 ###########################################################################
 
 from qt import *
-from kdecore import *
-from kdeui import *
+from tdecore import *
+from tdeui import *
 import sys
 from prefdialog import *
 from kdeappview import *
diff --git a/app_templates/kdeapp/src/kdeappview.py b/app_templates/kdeapp/src/kdeappview.py
index af28a44..16de315 100644
--- a/app_templates/kdeapp/src/kdeappview.py
+++ b/app_templates/kdeapp/src/kdeappview.py
@@ -16,8 +16,8 @@
 ###########################################################################
 
 from qt import *
-from kdecore import *
-from kdeui import *
+from tdecore import *
+from tdeui import *
 from kio import *
 from khtml import *
 from kparts import *
diff --git a/app_templates/kdeapp/src/prefdialog.py b/app_templates/kdeapp/src/prefdialog.py
index 7932f84..0a6c96a 100644
--- a/app_templates/kdeapp/src/prefdialog.py
+++ b/app_templates/kdeapp/src/prefdialog.py
@@ -16,8 +16,8 @@
 ###########################################################################
 
 from qt import *
-from kdecore import *
-from kdeui import *
+from tdecore import *
+from tdeui import *
 
 class TestAppPrefDialog(KDialogBase):
     def __init__(self):
diff --git a/app_templates/kdeutility/doc/en/index.docbook b/app_templates/kdeutility/doc/en/index.docbook
index 325987f..838e76f 100644
--- a/app_templates/kdeutility/doc/en/index.docbook
+++ b/app_templates/kdeutility/doc/en/index.docbook
@@ -488,7 +488,7 @@ application -->
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
 kdelibs, or kdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
diff --git a/app_templates/kdeutility/src/kdeutility.py b/app_templates/kdeutility/src/kdeutility.py
index e2849fe..83a997c 100755
--- a/app_templates/kdeutility/src/kdeutility.py
+++ b/app_templates/kdeutility/src/kdeutility.py
@@ -17,8 +17,8 @@
 
 import sys
 from qt import *
-from kdecore import *
-from kdeui import *
+from tdecore import *
+from tdeui import *
 import kdedesigner
 from KDEUtilityDialogUI import *
 
diff --git a/app_templates/kioslave/doc/en/index.docbook b/app_templates/kioslave/doc/en/index.docbook
index 325987f..838e76f 100644
--- a/app_templates/kioslave/doc/en/index.docbook
+++ b/app_templates/kioslave/doc/en/index.docbook
@@ -488,7 +488,7 @@ application -->
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
 kdelibs, or kdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
diff --git a/app_templates/kioslave/src/kioslave.py b/app_templates/kioslave/src/kioslave.py
index 63e34f0..641059a 100755
--- a/app_templates/kioslave/src/kioslave.py
+++ b/app_templates/kioslave/src/kioslave.py
@@ -18,7 +18,7 @@
 # Import the required Qt and KDE modules.
 from qt import *
 from kio import *
-from kdecore import *
+from tdecore import *
 import os, time
 
 # For debugging purposes, import the sys and traceback modules.
@@ -188,7 +188,7 @@ class SlaveClass(KIO.SlaveBase):
     ########################################################################
     # KIO.SlaveBase method
     def listDir(self, url):
-        # The "url" argument is a kdecore.KURL object.
+        # The "url" argument is a tdecore.KURL object.
         self.debug("listDir: %s" % str(url.prettyURL(0)))
         self.openConnection()
         
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index c2ff2f5..9f347d4 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -276,7 +276,7 @@ your user interface files as though they were normal Python files.
 
 <programlisting>
 #!/usr/bin/env python
-from kdeui import *
+from tdeui import *
 
 import kdedesigner     # This module lets us import .ui file directly.
 from MyWindow import * # Loads MyWindow.ui
diff --git a/src/kdedistutils.py b/src/kdedistutils.py
index 6e9003a..00e1d1b 100644
--- a/src/kdedistutils.py
+++ b/src/kdedistutils.py
@@ -621,7 +621,7 @@ class BuildKControlModule(Command):
             # PyKDE dir
             if self.pykde_dir is None:
                 self.pykde_dir = sysconfig.get_python_lib()
-            if (FindFileInPaths("libtdecorecmodule*",[self.pykde_dir]) is None) and (FindFileInPaths("kdecore*",[self.pykde_dir]) is None):
+            if (FindFileInPaths("libtdecorecmodule*",[self.pykde_dir]) is None) and (FindFileInPaths("tdecore*",[self.pykde_dir]) is None):
                 raise SystemExit, "Failed to find the PyKDE directory: %s" % self.pykde_dir
             self.announce("Using %s for PyKDE modules" % self.pykde_dir)
             
@@ -805,16 +805,16 @@ class BuildKControlModule(Command):
             # PyQt libs
             linklist.append(self.pyqt_dir+"/qt.so")
             # PyKDE libs
-            linklist.append(self.pykde_dir+"/kdecore.so")
-            linklist.append(self.pykde_dir+"/kdeui.so")
+            linklist.append(self.pykde_dir+"/tdecore.so")
+            linklist.append(self.pykde_dir+"/tdeui.so")
             
 #            linklist.append("-L"+self.sip_dir); linklist.append("-lsip")
 #            # PyQt libs
 #            linklist.append("-L"+self.pyqt_dir); linklist.append("-lqtcmodule")
 #            # PyKDE libs
-#            linklist.append("-L"+self.pykde_dir); linklist.append("-lkdecorecmodule"); linklist.append("-lkdeuicmodule")
+#            linklist.append("-L"+self.pykde_dir); linklist.append("-ltdecorecmodule"); linklist.append("-ltdeuicmodule")
             
-            linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize")
+            linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-ltdecore"); linklist.append("-lpythonize")
             linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt")
             linklist.append("-lm")
             linklist.append("-lstdc++")
@@ -1549,7 +1549,7 @@ class BuildKioslave(Command):
             # PyKDE dir
             if self.pykde_dir is None:
                 self.pykde_dir = sysconfig.get_python_lib()
-            if (FindFileInPaths("libtdecorecmodule*",[self.pykde_dir]) is None) and (FindFileInPaths("kdecore*",[self.pykde_dir]) is None):
+            if (FindFileInPaths("libtdecorecmodule*",[self.pykde_dir]) is None) and (FindFileInPaths("tdecore*",[self.pykde_dir]) is None):
                 raise SystemExit, "Failed to find the PyKDE directory: %s" % self.pykde_dir
             self.announce("Using %s for PyKDE modules" % self.pykde_dir)
             
@@ -1718,15 +1718,15 @@ class BuildKioslave(Command):
             # PyQt libs
             linklist.append(self.pyqt_dir+"/qt.so")
             # PyKDE libs
-            linklist.append(self.pykde_dir+"/kdecore.so")
+            linklist.append(self.pykde_dir+"/tdecore.so")
             
 #            linklist.append("-L"+self.sip_dir); linklist.append("-lsip")
 #            # PyQt libs
 #            linklist.append("-L"+self.pyqt_dir); linklist.append("-lqtcmodule")
 #            # PyKDE libs
-#            linklist.append("-L"+self.pykde_dir); linklist.append("-lkdecorecmodule"); linklist.append("-lkdeuicmodule")
+#            linklist.append("-L"+self.pykde_dir); linklist.append("-ltdecorecmodule"); linklist.append("-ltdeuicmodule")
             
-            linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize")
+            linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-ltdecore"); linklist.append("-lpythonize")
             linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt")
             linklist.append("-lm")
             linklist.append("-lstdc++")
@@ -2007,7 +2007,7 @@ class CheckPyKDE(Command):
         self.announce("Checking for a working PyKDE...")
         
         # Try to import modules one by one. 
-        for k_module in ('dcop', 'kdecore', 'kdeui', 'kio', 'kfile', 'kparts', 'khtml', 'kspell'):
+        for k_module in ('dcop', 'tdecore', 'tdeui', 'kio', 'kfile', 'kparts', 'khtml', 'kspell'):
             self.announce(k_module)
             try:
                 exec('import ' + k_module)
diff --git a/src/qtuicompiler.py b/src/qtuicompiler.py
index 4d590aa..90b4eb1 100644
--- a/src/qtuicompiler.py
+++ b/src/qtuicompiler.py
@@ -61,7 +61,7 @@ def CompileUI(ui_file_name, py_file_name=None, kde=False):
     for line in input.readlines():
         if kde and string.strip(line) == 'from qt import *':
             output.write(line)
-            output.write('from kdecore import *\nfrom kdeui import *\n\n')
+            output.write('from tdecore import *\nfrom tdeui import *\n\n')
         elif kde and string.find(line, " = KDatePicker(") != -1:
             o = string.find(line, ",")
             output.write(line[:o] + ",QDate.currentDate()" + line[o:])