Rename a number of libraries and executables to avoid conflicts with KDE4

224 files changed, 549 insertions, 549 deletions

diff --git a/ChangeLog b/ChangeLog
index 45a74e29..ff5fbb5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -546,7 +546,7 @@
 
 2003-11-20 F@lk Brettschneider <[email protected]>
    * latest sync with KMdi of tdelibs-cvsHead (fixes some crashes)
-   * enabled kmdiguiclient.h/cpp for KDE less version 3.2 too
+   * enabled tdemdiguiclient.h/cpp for KDE less version 3.2 too
    (-> this introduces KDE-accels Ctrl+Shift+Alt+L/R/B/T for IDEAl-docks and Ctrl+Alt+CursorLeft/CursorRight for cycling IDEAl-toolviews)
    * bugfix: proper names of View menu
    * now save the docking state to another section of tdeveloprc (to let people (who tried KMdi alpha versions) escape a vicious cycle)
@@ -567,7 +567,7 @@
 2003-11-09 F@lk Brettschneider <[email protected]>
     * as planned and decided months ago, now I
       removed KDevelop's own special implementation of IDEAl UI mode.
-      This has been replaced by KDE's IDEAl UI mode, globally implemented in tdelibs/kmdi.
+      This has been replaced by KDE's IDEAl UI mode, globally implemented in tdelibs/tdemdi.
       Now we increase maintainance, KDE-comformity and can switch all KDevelop UI modes on the fly.
 
 2003-10-29 Alexander Dymo <[email protected]>
@@ -1986,14 +1986,14 @@
 
 2002-05-20  Matthias Hlzer-Klpfel <[email protected]>
         * Welcome in the 2000's: the Tools menu config
-          now uses ksycoca...
+          now uses tdesycoca...
 
 2002-05-20  Harald Fernengel  <[email protected]>
         * Outputviews: Uses bright font colors if widget background is dark
         * Extended Tools Config: Show App-Tree to make it more comfortable
 
 2002-05-20  Roberto Raggi  <[email protected]>
-        * Ported qeditor to ktexteditor interface
+        * Ported qeditor to tdetexteditor interface
         * Fixed text insertion in abbreviation part
 
 2002-05-20  Bernd Gehrmann  <[email protected]>
diff --git a/Doxyfile b/Doxyfile
index fe8215aa..1ef8ee85 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -235,12 +235,12 @@ TAGFILES               = $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/dcop/dc
                          $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdecore/tdecore.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdecore/html/ \
                          $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdefx/tdefx.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdefx/html/ \
                          $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeui/tdeui.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeui/html/ \
-                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/khtml/khtml.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/khtml/html/ \
+                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdehtml/tdehtml.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdehtml/html/ \
                          $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kio/kio.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kio/html/ \
                          $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kjs/kjs.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kjs/html/ \
-                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kparts/kparts.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kparts/html/ \
-                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kmdi/kmdi.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kmdi/html/ \
-                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kutils/kutils.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kutils/html/ \
+                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeparts/tdeparts.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeparts/html/ \
+                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdemdi/tdemdi.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdemdi/html/ \
+                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeutils/tdeutils.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeutils/html/ \
                          $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/qt/qt.tag=$(QTDIR)/doc/html
 GENERATE_TAGFILE       = 
 ALLEXTERNALS           = NO
diff --git a/buildtools/ada/adaproject_widget.cpp b/buildtools/ada/adaproject_widget.cpp
index 2e5d818a..f5016e8c 100644
--- a/buildtools/ada/adaproject_widget.cpp
+++ b/buildtools/ada/adaproject_widget.cpp
@@ -1,4 +1,4 @@
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index 0375c6f2..0e665eb7 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -40,7 +40,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <tdeversion.h>
 #include <kprocess.h>
 
diff --git a/buildtools/autotools/kfilednddetailview.cpp b/buildtools/autotools/kfilednddetailview.cpp
index 915891dc..405ff249 100644
--- a/buildtools/autotools/kfilednddetailview.cpp
+++ b/buildtools/autotools/kfilednddetailview.cpp
@@ -160,7 +160,7 @@ void KFileDnDDetailView::startDrag(){
 	}
 	TQPixmap pixmap;
 	if( urls.count() > 1 ){
-		pixmap = DesktopIcon( "kmultiple", 16 );
+		pixmap = DesktopIcon( "tdemultiple", 16 );
 	}
 	if( pixmap.isNull() )
 		pixmap = currentFileItem()->pixmap( 16 );	
diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/kfiledndiconview.cpp
index c68a1f58..e7b727e5 100644
--- a/buildtools/autotools/kfiledndiconview.cpp
+++ b/buildtools/autotools/kfiledndiconview.cpp
@@ -149,7 +149,7 @@ TQDragObject* KFileDnDIconView::dragObject() {
 	}
 	TQPixmap pixmap;
 	if( urls.count() > 1 )
-		pixmap = DesktopIcon( "kmultiple", iconSize() );
+		pixmap = DesktopIcon( "tdemultiple", iconSize() );
 	if( pixmap.isNull() )
 		pixmap = currentFileItem()->pixmap( iconSize() );	
 	TQPoint hotspot;
diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp
index 9f6e1cb5..71d6cf09 100644
--- a/buildtools/autotools/misc.cpp
+++ b/buildtools/autotools/misc.cpp
@@ -16,7 +16,7 @@
 #include <tqdict.h>
 
 #include <kdebug.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kservice.h>
 
 #include "misc.h"
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index e7883961..b39dc00f 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -36,7 +36,7 @@
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kmessagebox.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kpopupmenu.h>
 #include <tdeversion.h>
 #include <kprocess.h>
diff --git a/buildtools/lib/base/Makefile.am b/buildtools/lib/base/Makefile.am
index be6b9576..dbb9850b 100644
--- a/buildtools/lib/base/Makefile.am
+++ b/buildtools/lib/base/Makefile.am
@@ -9,7 +9,7 @@ libkdevbuildbase_la_SOURCES = kdevbuildtool.cpp
 tdevelopbuildtoolsincludedir = $(includedir)/tdevelop/buildtools/base
 tdevelopbuildtoolsinclude_HEADERS = kdevbuildtool.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces kdevextensions
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions
 DOXYGEN_PROJECTNAME = KDevelop Buildtool Base Library
 DOXYGEN_DOCDIRPREFIX = kdevbt
 include ../../../Doxyfile.am
diff --git a/buildtools/lib/parsers/autotools/Makefile.am b/buildtools/lib/parsers/autotools/Makefile.am
index 929f089a..fc8cdc9a 100644
--- a/buildtools/lib/parsers/autotools/Makefile.am
+++ b/buildtools/lib/parsers/autotools/Makefile.am
@@ -18,7 +18,7 @@ parser:
 
 EXTRA_DIST = autotools.yy autotools.ll
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils
 DOXYGEN_PROJECTNAME = KDevelop AutoTools Parser
 DOXYGEN_DOCDIRPREFIX = kdevparser
 include ../../../../Doxyfile.am
diff --git a/buildtools/lib/parsers/qmake/Makefile.am b/buildtools/lib/parsers/qmake/Makefile.am
index 8dde1ed2..5f7ec787 100644
--- a/buildtools/lib/parsers/qmake/Makefile.am
+++ b/buildtools/lib/parsers/qmake/Makefile.am
@@ -23,7 +23,7 @@ parser:
 
 EXTRA_DIST = qmake.yy qmake.ll
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils
 DOXYGEN_PROJECTNAME = KDevelop QMake parser
 DOXYGEN_DOCDIRPREFIX = kdevparser
 include ../../../../Doxyfile.am
diff --git a/buildtools/lib/widgets/Makefile.am b/buildtools/lib/widgets/Makefile.am
index d640a831..5528ab85 100644
--- a/buildtools/lib/widgets/Makefile.am
+++ b/buildtools/lib/widgets/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
 lib_LTLIBRARIES = libkdevbuildtoolswidgets.la
 libkdevbuildtoolswidgets_la_LDFLAGS = $(all_libraries)
 libkdevbuildtoolswidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \
-	$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -lktexteditor
+	$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -ltdetexteditor
 libkdevbuildtoolswidgets_la_SOURCES = addenvvardlg.cpp addfilesdialog.cpp \
 	environmentdisplaydialog.cpp environmentdisplaydialogbase.ui environmentvariableswidget.cpp \
 	environmentvariableswidgetbase.ui envvartools.cpp makeoptionswidget.cpp makeoptionswidgetbase.ui \
@@ -23,7 +23,7 @@ tdevelopbuildtoolsinclude_HEADERS = addenvvardlg.h addfilesdialog.h \
 	makeoptionswidgetbase.h removesubprojectdialog.h removesubprojectdlgbase.h runoptionswidget.h \
 	runoptionswidgetbase.h subclassesdlg.h subclassesdlgbase.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces kdevutil
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevutil
 DOXYGEN_PROJECTNAME = KDevelop Buildtool Widgets Library
 DOXYGEN_DOCDIRPREFIX = kdevbt
 include ../../../Doxyfile.am
diff --git a/buildtools/pascal/pascalproject_widget.cpp b/buildtools/pascal/pascalproject_widget.cpp
index 9e0c533c..a8671023 100644
--- a/buildtools/pascal/pascalproject_widget.cpp
+++ b/buildtools/pascal/pascalproject_widget.cpp
@@ -1,4 +1,4 @@
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index 7086ae1e..58c4ba22 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -29,7 +29,7 @@
 #include <tqmessagebox.h>
 #include <kdevgenericfactory.h>
 #include <kaction.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kprocess.h>
 #include <kconfig.h>
 #include <kapplication.h>
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 86a485f6..5b1f528b 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -49,7 +49,7 @@
 #include <kurl.h>
 #include <tqmessagebox.h>
 #include <iostream>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kaction.h>
 #include <kprocess.h>
 #include <kinputdialog.h>
diff --git a/doc/api/FutureTasks.dox b/doc/api/FutureTasks.dox
index 5e2b8268..c738a3f3 100644
--- a/doc/api/FutureTasks.dox
+++ b/doc/api/FutureTasks.dox
@@ -99,7 +99,7 @@
       - cd's when selecting a file, but doesn't when selecting a dir,
         desired: a menu option to "cd" to that directory
     - QEditor
-      - Replace editors/qeditor/koReplace.* and editors/qeditor/koFind.* with tdelibs/kutils/kreplace.* and tdelibs/kutils/kfind.*
+      - Replace editors/qeditor/koReplace.* and editors/qeditor/koFind.* with tdelibs/tdeutils/kreplace.* and tdelibs/tdeutils/kfind.*
 
     
 \section extensiontodo Extensions / New Functionality:
diff --git a/doc/kde_app_devel/index.docbook b/doc/kde_app_devel/index.docbook
index bfade594..a73c681a 100644
--- a/doc/kde_app_devel/index.docbook
+++ b/doc/kde_app_devel/index.docbook
@@ -542,7 +542,7 @@ Additionally, for specific solutions KDE offers the following libraries:
 the tdefx library, containing pixmaps, image effects the KStyle extension to QStyle
 </para></listitem>
 <listitem><para>
-the khtml library, containing KDE's html component
+the tdehtml library, containing KDE's html component
 </para></listitem>
 <listitem><para>
 the kjs library, containing KDE's Javascript support
@@ -551,7 +551,7 @@ the kjs library, containing KDE's Javascript support
 the kio library, containing low level access to network files
 </para></listitem>
 <listitem><para>
-the kparts library, containing support for re-usable embeddable extendable applications
+the tdeparts library, containing support for re-usable embeddable extendable applications
 </para></listitem>
 </itemizedlist>
 </para>
@@ -1131,7 +1131,7 @@ KIconView: a graphical viewer of icon files
 </orderedlist>
 </para>
 <para>
-The khtml library, on the other hand, offers a complete HTML-interpreting widget that is ready to use.
+The tdehtml library, on the other hand, offers a complete HTML-interpreting widget that is ready to use.
 It is scrollable already, so you don't even have to take care for that. A possible use could be to
 integrate it as a preview widget for an HTML editor; used by applications such as Konqueror to display HTML files. 
 </para>
diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook
index e5942974..7bccb9fa 100644
--- a/doc/kdearch/index.docbook
+++ b/doc/kdearch/index.docbook
@@ -87,9 +87,9 @@ The <literal>kjs</literal> library provides an implementation of JavaScript.
 </varlistentry>
 
 <varlistentry>
-<term><ulink url="kdeapi:khtml/index.html">khtml</ulink></term>
+<term><ulink url="kdeapi:tdehtml/index.html">tdehtml</ulink></term>
 <listitem><para>
-The <literal>khtml</literal> library contains the KHTML part, a HTML browsing
+The <literal>tdehtml</literal> library contains the KHTML part, a HTML browsing
 widget, DOM API and parser, including interfaces to Java and JavaScript.
 </para></listitem>
 </varlistentry>
@@ -592,7 +592,7 @@ A GUI fragment consisting of an action collection and a DOM tree representing th
 </para>
 </formalpara></listitem>
 
-<listitem><formalpara><title><ulink url="kdeapi:kparts/KPartManager">KPartManager</ulink></title>
+<listitem><formalpara><title><ulink url="kdeapi:tdeparts/KPartManager">KPartManager</ulink></title>
 <para>
 Manages the activation of XMLGUI clients.
 </para>
@@ -2004,9 +2004,9 @@ The type of the factory class <classname>DoxygenFactory</classname> depends on
 the specific service type the service implements. In our example of a TDevelop
 plugin, the factory must be a <classname>KDevFactory</classname> (which
 inherits <classname>KLibFactory</classname>). More common examples are
-<ulink url="kdeapi:kparts/KParts::Factory">KParts::Factory</ulink>
+<ulink url="kdeapi:tdeparts/KParts::Factory">KParts::Factory</ulink>
 which is supposed to produce 
-<ulink url="kdeapi:kparts/KParts::ReadOnlyPart">KParts::ReadOnlyPart</ulink>
+<ulink url="kdeapi:tdeparts/KParts::ReadOnlyPart">KParts::ReadOnlyPart</ulink>
 objects or in most cases the generic
 <ulink url="kdeapi:tdecore/KLibFactory">KLibFactory</ulink>.
 </para>
diff --git a/doc/tdevelop/setup.docbook b/doc/tdevelop/setup.docbook
index 366f25a7..0c078a3b 100644
--- a/doc/tdevelop/setup.docbook
+++ b/doc/tdevelop/setup.docbook
@@ -540,7 +540,7 @@ The active toolview window must be shown fixed (non-overlap mode), sharing the w
 </screenshot>
 
 <para>
-To select a new editor, click on the arrow on the drop down list field. Depending on the editor parts interfaces your &kde; version has compiled in you will be provided with a list of editors you may select from (see the <link linkend="setup-editor-kparts">Important</link> note below for this). Click on the editor of your liking and click <guilabel>OK</guilabel>. Currently there are two possibilities:
+To select a new editor, click on the arrow on the drop down list field. Depending on the editor parts interfaces your &kde; version has compiled in you will be provided with a list of editors you may select from (see the <link linkend="setup-editor-tdeparts">Important</link> note below for this). Click on the editor of your liking and click <guilabel>OK</guilabel>. Currently there are two possibilities:
 </para>
 
 <variablelist>
@@ -567,7 +567,7 @@ These editor interfaces are fully integrated in the &tdevelop; IDE concept. Part
 Changing the editor will not effect already open files. There are two possibilities to proceed. Either close all open text windows and reopen them one by one. Or simply close the whole project and reopen it again. The windows will then automatically open under the new text editor interface.
 </para></note>
 
-<important id="setup-editor-kparts"><para>
+<important id="setup-editor-tdeparts"><para>
 KDevelop lets you use editor interfaces which have registered with &kde; and that provide a KatePart interface. If you miss one one of the selections shown above check your &kde; installation if the corresponding KPart was correctly installed.
 </para></important>
 
diff --git a/kdevdesigner/designer/CMakeLists.txt b/kdevdesigner/designer/CMakeLists.txt
index c0f54fe8..298fb20d 100644
--- a/kdevdesigner/designer/CMakeLists.txt
+++ b/kdevdesigner/designer/CMakeLists.txt
@@ -102,6 +102,6 @@ tde_add_kpart( libkdevdesignerpart AUTOMOC
   SOURCES ${SRCS}
   LINK
     kdevqui-static shared-static kinterfacedesigner-shared
-    kio-shared kparts-shared qassistantclient
+    kio-shared tdeparts-shared qassistantclient
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h
index 32537653..48c0205e 100644
--- a/kdevdesigner/designer/kdevdesigner_part.h
+++ b/kdevdesigner/designer/kdevdesigner_part.h
@@ -23,8 +23,8 @@
 
 #include <tqmap.h>
 
-#include <kparts/part.h>
-#include <kparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
 
 #include "designer.h"
 
diff --git a/kdevdesigner/src/CMakeLists.txt b/kdevdesigner/src/CMakeLists.txt
index 726a91d1..c232cd2f 100644
--- a/kdevdesigner/src/CMakeLists.txt
+++ b/kdevdesigner/src/CMakeLists.txt
@@ -31,6 +31,6 @@ install( FILES kdevdesigner_shell.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdesigne
 
 tde_add_executable( kdevdesigner AUTOMOC
   SOURCES main.cpp kdevdesigner.cpp
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdevdesigner/src/Makefile.am b/kdevdesigner/src/Makefile.am
index a241ff66..be773bda 100644
--- a/kdevdesigner/src/Makefile.am
+++ b/kdevdesigner/src/Makefile.am
@@ -21,7 +21,7 @@ bin_PROGRAMS = kdevdesigner
 
 # the application source, library search path, and link libraries
 kdevdesigner_SOURCES = main.cpp kdevdesigner.cpp
-kdevdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kdevdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kdevdesigner_LDADD   = $(LIB_KPARTS)
 
 # this is where the desktop file will go 
diff --git a/kdevdesigner/src/kdevdesigner.h b/kdevdesigner/src/kdevdesigner.h
index 5930cf2a..2fda0a78 100644
--- a/kdevdesigner/src/kdevdesigner.h
+++ b/kdevdesigner/src/kdevdesigner.h
@@ -27,7 +27,7 @@
 
 #include <kxmlguiclient.h>
 #include <kapplication.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 class KToggleAction;
 
diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp
index d27d0796..cf816ca1 100644
--- a/languages/ada/problemreporter.cpp
+++ b/languages/ada/problemreporter.cpp
@@ -27,12 +27,12 @@
 #include <tqfileinfo.h>
 
 #include <tdeversion.h>
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/markinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/markinterface.h>
 
-#include <ktexteditor/markinterfaceextension.h>
+#include <tdetexteditor/markinterfaceextension.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp
index ebd483a4..4ac60e3e 100644
--- a/languages/bash/bashsupport_part.cpp
+++ b/languages/bash/bashsupport_part.cpp
@@ -18,7 +18,7 @@
 #include <kprocess.h>
 #include <kdebug.h>
 #include <kaction.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdialogbase.h>
 
 
diff --git a/languages/bash/bashsupport_part.h b/languages/bash/bashsupport_part.h
index 5c1dce74..284e4f4c 100644
--- a/languages/bash/bashsupport_part.h
+++ b/languages/bash/bashsupport_part.h
@@ -16,9 +16,9 @@
 #include <kdevplugin.h>
 #include <kdevlanguagesupport.h>
 
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 
 //class BashSupportWidget;
 
diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp
index 8d12b40f..885aad6d 100644
--- a/languages/cpp/addattributedialog.cpp
+++ b/languages/cpp/addattributedialog.cpp
@@ -28,8 +28,8 @@
 #include <codemodel.h>
 
 #include <kfiledialog.h>
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
 #include <klineedit.h>
 
 #include <tqfileinfo.h>
diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp
index 07ecde2b..ae4b5a61 100644
--- a/languages/cpp/addmethoddialog.cpp
+++ b/languages/cpp/addmethoddialog.cpp
@@ -29,8 +29,8 @@
 
 #include <klocale.h>
 #include <kfiledialog.h>
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
 #include <kdebug.h>
 #include <klineedit.h>
 
diff --git a/languages/cpp/app_templates/CMakeLists.txt b/languages/cpp/app_templates/CMakeLists.txt
index c8c21605..94a914ac 100644
--- a/languages/cpp/app_templates/CMakeLists.txt
+++ b/languages/cpp/app_templates/CMakeLists.txt
@@ -19,7 +19,7 @@ add_subdirectory( kdevpart )
 add_subdirectory( kdevpart2 )
 add_subdirectory( chello )
 add_subdirectory( cpphello )
-add_subdirectory( kscreensaver )
+add_subdirectory( tdescreensaver )
 add_subdirectory( kofficepart )
 add_subdirectory( chello_gba )
 add_subdirectory( dcopservice )
@@ -58,7 +58,7 @@ add_subdirectory( cmakesimplec )
 add_subdirectory( cmakelibcpp )
 add_subdirectory( cmakelibc )
 add_subdirectory( kscons_kxt )
-add_subdirectory( kscons_kmdi )
+add_subdirectory( kscons_tdemdi )
 add_subdirectory( qt4hello )
 add_subdirectory( qmakeempty )
 add_subdirectory( automakeempty )
diff --git a/languages/cpp/app_templates/Makefile.am b/languages/cpp/app_templates/Makefile.am
index d77ef765..09e63e1a 100644
--- a/languages/cpp/app_templates/Makefile.am
+++ b/languages/cpp/app_templates/Makefile.am
@@ -1,4 +1,4 @@
-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
+SUBDIRS = kapp kpartapp kpartplugin tdecmodule kicker kioslave kdevpart kdevpart2 chello cpphello tdescreensaver 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_tdemdi 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/chello_gba/app.tdevelop b/languages/cpp/app_templates/chello_gba/app.tdevelop
index 2f59c978..88e5395f 100644
--- a/languages/cpp/app_templates/chello_gba/app.tdevelop
+++ b/languages/cpp/app_templates/chello_gba/app.tdevelop
@@ -24,7 +24,7 @@
   <configurations>
    <default>
     <configargs>--host=arm-gcc-elf --build=i386</configargs>
-    <ldflags>-T lnkscript crt0.o</ldflags>
+    <ldflags>-T lntdescript crt0.o</ldflags>
     <ccompiler>kdevgccoptions</ccompiler>
     <cxxcompiler>kdevgppoptions</cxxcompiler>
     <f77compiler>kdevg77options</f77compiler>
diff --git a/languages/cpp/app_templates/kapp/README b/languages/cpp/app_templates/kapp/README
index 1db7896b..1ddb40a1 100644
--- a/languages/cpp/app_templates/kapp/README
+++ b/languages/cpp/app_templates/kapp/README
@@ -53,7 +53,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
 in your app.
 
 For more details, consult :
-http://www-106.ibm.com/developerworks/library/l-kparts/
+http://www-106.ibm.com/developerworks/library/l-tdeparts/
 http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
 http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html
 
diff --git a/languages/cpp/app_templates/kapp/appview.h b/languages/cpp/app_templates/kapp/appview.h
index be484fec..79513a9d 100644
--- a/languages/cpp/app_templates/kapp/appview.h
+++ b/languages/cpp/app_templates/kapp/appview.h
@@ -4,7 +4,7 @@
 #define _%{APPNAMEUC}VIEW_H_
 
 #include <tqwidget.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <%{APPNAMELC}iface.h>
 
 class TQPainter;
diff --git a/languages/cpp/app_templates/kconfig35/README b/languages/cpp/app_templates/kconfig35/README
index 6f91629b..a27cdb29 100644
--- a/languages/cpp/app_templates/kconfig35/README
+++ b/languages/cpp/app_templates/kconfig35/README
@@ -62,7 +62,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
 in your app.
 
 For more details, consult :
-http://www-106.ibm.com/developerworks/library/l-kparts/
+http://www-106.ibm.com/developerworks/library/l-tdeparts/
 http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
 http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html
 
diff --git a/languages/cpp/app_templates/kdecpp.appwizard b/languages/cpp/app_templates/kdecpp.appwizard
index ad9bb0d2..1823e891 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,tdecmodule,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,tdescreensaver,kscons_kxt,kscons_tdemdi
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp
index 1fe3558c..65bb996e 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp
+++ b/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp
@@ -3,7 +3,7 @@
 
 #include <kurl.h>
 #include <klibloader.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include <kdevcore.h>
 
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp
index 1fe3558c..65bb996e 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp
@@ -3,7 +3,7 @@
 
 #include <kurl.h>
 #include <klibloader.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include <kdevcore.h>
 
diff --git a/languages/cpp/app_templates/kpartapp/app.h b/languages/cpp/app_templates/kpartapp/app.h
index 91207694..6b470b92 100644
--- a/languages/cpp/app_templates/kpartapp/app.h
+++ b/languages/cpp/app_templates/kpartapp/app.h
@@ -7,7 +7,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 class KToggleAction;
 
diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h
index 418d7327..6ea44663 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.h
+++ b/languages/cpp/app_templates/kpartapp/app_part.h
@@ -2,8 +2,8 @@
 #ifndef _%{APPNAMEUC}PART_H_
 #define _%{APPNAMEUC}PART_H_
 
-#include <kparts/part.h>
-#include <kparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
 
 class TQWidget;
 class TQPainter;
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
index c5bdb434..c9717c29 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
@@ -1,7 +1,7 @@
 
 #include "plugin_%{APPNAMELC}.h"
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kaction.h>
 #include <kinstance.h>
 #include <kmessagebox.h>
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h
index 132ce724..16142b33 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.h
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h
@@ -2,8 +2,8 @@
 #ifndef _PLUGIN_%{APPNAMEUC}_H_
 #define _PLUGIN_%{APPNAMEUC}_H_
 
-#include <kparts/plugin.h>
-#include <kparts/factory.h>
+#include <tdeparts/plugin.h>
+#include <tdeparts/factory.h>
 
 class Plugin%{APPNAME} : public KParts::Plugin
 {
diff --git a/languages/cpp/app_templates/kpartplugin/src-Makefile.am b/languages/cpp/app_templates/kpartplugin/src-Makefile.am
index 633ca883..a0da7254 100644
--- a/languages/cpp/app_templates/kpartplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/kpartplugin/src-Makefile.am
@@ -14,7 +14,7 @@ lib%{APPNAMELC}plugin_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PL
 
 # Install the .rc file in the Part's directory (in this case, the part
 # is KHTMLPart)
-pluginsdir = $(kde_datadir)/khtml/kpartplugins
+pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
 plugins_DATA = plugin_%{APPNAMELC}.rc
 
 messages: rc.cpp
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h
deleted file mode 100644
index d0fde2f8..00000000
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h
+++ /dev/null
@@ -1,30 +0,0 @@
-%{H_TEMPLATE}
-
-#ifndef _%{APPNAMEUC}KMDIVIEW_H
-#define _%{APPNAMEUC}KMDIVIEW_H
-
-#include <kparts/part.h>
-#include <kmdichildview.h>
-#include <kmdichildfrm.h>
-
-/**
- * This class serves as the %{APPNAMELC}kmdi view.
- *
- * @short main view class
- */
-class %{APPNAMELC}kmdiView : public KMdiChildView 
-{
-	Q_OBJECT
-  
-	public:
-		%{APPNAMELC}kmdiView( TQWidget *parentWidget=0L, const char *name=0L );
-		virtual ~%{APPNAMELC}kmdiView();
-
-		KParts::ReadWritePart *part() { return m_part; }
-
-	private:
-		KParts::ReadWritePart *m_part;
-};
-
-#endif // _%{APPNAMEUC}KMDIVIEW_H
-
diff --git a/languages/cpp/app_templates/kscons_kxt/README b/languages/cpp/app_templates/kscons_kxt/README
index bf4edf71..e7aa2647 100644
--- a/languages/cpp/app_templates/kscons_kxt/README
+++ b/languages/cpp/app_templates/kscons_kxt/README
@@ -83,7 +83,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
 in your app.
 
 For more details, consult :
-http://www-106.ibm.com/developerworks/library/l-kparts/
+http://www-106.ibm.com/developerworks/library/l-tdeparts/
 http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
 http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html
 
diff --git a/languages/cpp/app_templates/kscons_kmdi/CMakeLists.txt b/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt
index c42fac4f..c05f1bb1 100644
--- a/languages/cpp/app_templates/kscons_kmdi/CMakeLists.txt
+++ b/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt
@@ -9,10 +9,10 @@
 #
 #################################################
 
-add_custom_target( kscons_kmdi.tar.gz ALL
-  COMMAND tar zcf kscons_kmdi.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.kcfg app.tdevelop appkmdi.cpp appkmdi.h appkmdiView.cpp
-    appkmdiView.h INSTALL kmdikonsole.cpp kmdikonsole.h
+add_custom_target( kscons_tdemdi.tar.gz ALL
+  COMMAND tar zcf kscons_tdemdi.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+    app.kcfg app.tdevelop apptdemdi.cpp apptdemdi.h apptdemdiView.cpp
+    apptdemdiView.h INSTALL tdemdikonsole.cpp tdemdikonsole.h
     main.cpp messages.sh prefs.ui QUICKSTART README
     SConscript-doc SConscript-src SConstruct settings.kcfgc
     tips VERSION app_part.cpp app_part.h app_part.rc
@@ -21,10 +21,10 @@ add_custom_target( kscons_kmdi.tar.gz ALL
 
 
 install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kscons_kmdi.tar.gz kscons_kmdi.png
+    ${CMAKE_CURRENT_BINARY_DIR}/kscons_tdemdi.tar.gz kscons_tdemdi.png
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    kscons_kmdi.kdevtemplate
+    kscons_tdemdi.kdevtemplate
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kscons_kmdi/INSTALL b/languages/cpp/app_templates/kscons_tdemdi/INSTALL
index e61a3acc..e61a3acc 100644
--- a/languages/cpp/app_templates/kscons_kmdi/INSTALL
+++ b/languages/cpp/app_templates/kscons_tdemdi/INSTALL
diff --git a/languages/cpp/app_templates/kscons_kmdi/Makefile.am b/languages/cpp/app_templates/kscons_tdemdi/Makefile.am
index e349e104..191ea8ee 100644
--- a/languages/cpp/app_templates/kscons_kmdi/Makefile.am
+++ b/languages/cpp/app_templates/kscons_tdemdi/Makefile.am
@@ -1,10 +1,10 @@
-dataFiles = app.kcfg app.tdevelop appkmdi.cpp appkmdi.h appkmdiView.cpp \
-appkmdiView.h INSTALL kmdikonsole.cpp kmdikonsole.h main.cpp \
+dataFiles = app.kcfg app.tdevelop apptdemdi.cpp apptdemdi.h apptdemdiView.cpp \
+apptdemdiView.h INSTALL tdemdikonsole.cpp tdemdikonsole.h main.cpp \
 messages.sh prefs.ui QUICKSTART README SConscript-doc SConscript-src \
 SConstruct settings.kcfgc tips VERSION \
 app_part.cpp app_part.h app_part.rc app_shell.rc
 
-templateName= kscons_kmdi
+templateName= kscons_tdemdi
 
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART
index a5fbba33..a5fbba33 100644
--- a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART
+++ b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART
diff --git a/languages/cpp/app_templates/kscons_kmdi/README b/languages/cpp/app_templates/kscons_tdemdi/README
index bf4edf71..e7aa2647 100644
--- a/languages/cpp/app_templates/kscons_kmdi/README
+++ b/languages/cpp/app_templates/kscons_tdemdi/README
@@ -83,7 +83,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
 in your app.
 
 For more details, consult :
-http://www-106.ibm.com/developerworks/library/l-kparts/
+http://www-106.ibm.com/developerworks/library/l-tdeparts/
 http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
 http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html
 
diff --git a/languages/cpp/app_templates/kscons_kmdi/SConscript-doc b/languages/cpp/app_templates/kscons_tdemdi/SConscript-doc
index 0c3e07e7..0c3e07e7 100644
--- a/languages/cpp/app_templates/kscons_kmdi/SConscript-doc
+++ b/languages/cpp/app_templates/kscons_tdemdi/SConscript-doc
diff --git a/languages/cpp/app_templates/kscons_kmdi/SConscript-src b/languages/cpp/app_templates/kscons_tdemdi/SConscript-src
index c1f9742d..97f5140c 100644
--- a/languages/cpp/app_templates/kscons_kmdi/SConscript-src
+++ b/languages/cpp/app_templates/kscons_tdemdi/SConscript-src
@@ -13,16 +13,16 @@ myenv=env.Copy()
 
 %{APPNAMELC}_sources="""
 main.cpp
-%{APPNAMELC}kmdi.cpp
-%{APPNAMELC}kmdiView.cpp
-kmdikonsole.cpp
+%{APPNAMELC}tdemdi.cpp
+%{APPNAMELC}tdemdiView.cpp
+tdemdikonsole.cpp
 settings.kcfgc
 prefs.ui
 """
 # Now that we have our list of sources we can build the program
 myenv.TDEprogram( '%{APPNAMELC}', %{APPNAMELC}_sources ) # main program
 myenv.TDEaddpaths_includes( './ ../' ) # additional paths
-myenv.TDEaddlibs( 'qt-mt tdecore kio kparts kmdi' ) # additional libraries
+myenv.TDEaddlibs( 'qt-mt tdecore kio tdeparts tdemdi' ) # additional libraries
 
 ## Next, the kpart library
 ## using TDEshlib, the .so and .la are installed automatically when needed
@@ -31,7 +31,7 @@ myenv2=env.Copy()
 %{APPNAMELC}part_sources = '%{APPNAMELC}_part.cpp'
 myenv2.TDEshlib( 'lib%{APPNAMELC}part', %{APPNAMELC}part_sources)
 myenv2.TDEaddpaths_includes( './ #/' ) # the '#' means the top-level directory
-myenv2.TDEaddlibs( 'qt-mt kio tdecore tdeprint kparts' )
+myenv2.TDEaddlibs( 'qt-mt kio tdecore tdeprint tdeparts' )
 # myenv2.TDEaddflags_link( '-DQT_THREAD_SUPPORT' )
 
 #############################
diff --git a/languages/cpp/app_templates/kscons_kmdi/SConstruct b/languages/cpp/app_templates/kscons_tdemdi/SConstruct
index 3954247c..3954247c 100644
--- a/languages/cpp/app_templates/kscons_kmdi/SConstruct
+++ b/languages/cpp/app_templates/kscons_tdemdi/SConstruct
diff --git a/languages/cpp/app_templates/kscons_kmdi/VERSION b/languages/cpp/app_templates/kscons_tdemdi/VERSION
index 2e293c30..2e293c30 100644
--- a/languages/cpp/app_templates/kscons_kmdi/VERSION
+++ b/languages/cpp/app_templates/kscons_tdemdi/VERSION
diff --git a/languages/cpp/app_templates/kscons_kmdi/app.kcfg b/languages/cpp/app_templates/kscons_tdemdi/app.kcfg
index f2c46b64..f2c46b64 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app.kcfg
+++ b/languages/cpp/app_templates/kscons_tdemdi/app.kcfg
diff --git a/languages/cpp/app_templates/kscons_kmdi/app.tdevelop b/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop
index 317a4cbc..317a4cbc 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app.tdevelop
+++ b/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
index 70f13d98..2bdb725d 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
@@ -2,7 +2,7 @@
 
 #include "%{APPNAMELC}_part.h"
 
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 #include <kinstance.h>
 #include <kaction.h>
 #include <kstdaction.h>
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_tdemdi/app_part.h
index 42d1b22c..13f773a1 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.h
+++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.h
@@ -3,8 +3,8 @@
 #ifndef _%{APPNAMEUC}PART_H_
 #define _%{APPNAMEUC}PART_H_
 
-#include <kparts/part.h>
-#include <kparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
 
 class TQMultiLineEdit;
 class TQWidget;
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.rc b/languages/cpp/app_templates/kscons_tdemdi/app_part.rc
index cec8ec5c..cec8ec5c 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.rc
+++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.rc
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_shell.rc b/languages/cpp/app_templates/kscons_tdemdi/app_shell.rc
index c8b2bb98..c8b2bb98 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_shell.rc
+++ b/languages/cpp/app_templates/kscons_tdemdi/app_shell.rc
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
index 30e6647c..0ef16672 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
@@ -10,8 +10,8 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <ktip.h>
-#include <kparts/part.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/part.h>
+#include <tdeparts/partmanager.h>
 
 #include <kio/netaccess.h>
 #include <kurl.h>
@@ -40,11 +40,11 @@
 
 #include "settings.h"
 #include "prefs.h"
-#include "%{APPNAMELC}kmdiView.h"
-#include "kmdikonsole.h"
-#include "%{APPNAMELC}kmdi.h"
+#include "%{APPNAMELC}tdemdiView.h"
+#include "tdemdikonsole.h"
+#include "%{APPNAMELC}tdemdi.h"
 
-%{APPNAMELC}kmdi::%{APPNAMELC}kmdi(KMdi::MdiMode mode)
+%{APPNAMELC}tdemdi::%{APPNAMELC}tdemdi(KMdi::MdiMode mode)
 	: KMdiMainFrm( 0, "%{APPNAMELC}", mode )
 {
 	resize( 800, 600 ); // start at 800x600 the first time
@@ -79,7 +79,7 @@
 
 	connect( this, TQT_SIGNAL( viewActivated( KMdiChildView * ) ), this, TQT_SLOT( currentChanged( KMdiChildView * ) ) );
 
-	m_console = new kmdikonsole(this, "konsole");
+	m_console = new tdemdikonsole(this, "konsole");
 	m_console->setIcon( SmallIcon("konsole") );
 	m_console->setCaption( i18n("Terminal") );
 	addToolWindow( m_console, KDockWidget::DockBottom, getMainDockWidget(), 20 );
@@ -102,7 +102,7 @@
 	// position, icon size, etc.
 	setAutoSaveSettings();
 
-	// Read the dock config only if the app was started at least only once - kmdi is tricky
+	// Read the dock config only if the app was started at least only once - tdemdi is tricky
         TDEConfig *cfg = new TDEConfig("%{APPNAMELC}_dockposrc");
         if (cfg->readNumEntry("%{APPNAMELC}_main_dock_settings", 0) == 1) manager()->readConfig(cfg);
         cfg->writeEntry("%{APPNAMELC}_main_dock_settings", 1);
@@ -111,7 +111,7 @@
 	showTipOnStart();
 }
 
-%{APPNAMELC}kmdi::~%{APPNAMELC}kmdi()
+%{APPNAMELC}tdemdi::~%{APPNAMELC}tdemdi()
 {
 	// Write the dock config on exit
         TDEConfig *cfg = new TDEConfig("%{APPNAMELC}_dockposrc");
@@ -120,7 +120,7 @@
 	delete m_console;
 }
 
-void %{APPNAMELC}kmdi::setupActions()
+void %{APPNAMELC}tdemdi::setupActions()
 {
 	setXMLFile("%{APPNAMELC}_shell.rc");
 
@@ -144,19 +144,19 @@ void %{APPNAMELC}kmdi::setupActions()
 	createGUI( NULL );
 }
 
-void %{APPNAMELC}kmdi::showTip() 
+void %{APPNAMELC}tdemdi::showTip() 
 {
 	KTipDialog::showTip(this,TQString(),true);
 }
 
-void %{APPNAMELC}kmdi::showTipOnStart()
+void %{APPNAMELC}tdemdi::showTipOnStart()
 {
 	KTipDialog::showTip(this);
 }
 
-void %{APPNAMELC}kmdi::slotFileNew()
+void %{APPNAMELC}tdemdi::slotFileNew()
 {
-	%{APPNAMELC}kmdiView *view = new %{APPNAMELC}kmdiView(this);
+	%{APPNAMELC}tdemdiView *view = new %{APPNAMELC}tdemdiView(this);
 	m_manager->addPart( view->part() );
 
 	addWindow( view );
@@ -167,14 +167,14 @@ void %{APPNAMELC}kmdi::slotFileNew()
 	currentChanged( view );
 }
 
-void %{APPNAMELC}kmdi::openURL(const KURL & url)
+void %{APPNAMELC}tdemdi::openURL(const KURL & url)
 {
 	// check if the url is not already opened first
-	TQValueList<%{APPNAMELC}kmdiView*>::iterator it  = m_views.begin();
-	TQValueList<%{APPNAMELC}kmdiView*>::iterator end = m_views.end();
+	TQValueList<%{APPNAMELC}tdemdiView*>::iterator it  = m_views.begin();
+	TQValueList<%{APPNAMELC}tdemdiView*>::iterator end = m_views.end();
 	for (; it != end; ++it)
 	{
-		%{APPNAMELC}kmdiView *view = *it;
+		%{APPNAMELC}tdemdiView *view = *it;
 		if (view->part()->url() == url)
 		{
 			activateView(view);
@@ -182,7 +182,7 @@ void %{APPNAMELC}kmdi::openURL(const KURL & url)
 		}
 	}
 
-	%{APPNAMELC}kmdiView *view = new %{APPNAMELC}kmdiView(this);
+	%{APPNAMELC}tdemdiView *view = new %{APPNAMELC}tdemdiView(this);
 	m_manager->addPart( view->part() );
 
 	addWindow( view );
@@ -193,7 +193,7 @@ void %{APPNAMELC}kmdi::openURL(const KURL & url)
 	currentChanged( view );
 }
 
-void %{APPNAMELC}kmdi::currentChanged( KMdiChildView *current )
+void %{APPNAMELC}tdemdi::currentChanged( KMdiChildView *current )
 {
 	//kdWarning()<<"current view changed"<<endl;
 	if (!current)
@@ -204,20 +204,20 @@ void %{APPNAMELC}kmdi::currentChanged( KMdiChildView *current )
 	}
 
 	// switch to the corresponding document
-	if ( m_views.contains( (%{APPNAMELC}kmdiView*) current ) )
+	if ( m_views.contains( (%{APPNAMELC}tdemdiView*) current ) )
 	{
-		%{APPNAMELC}kmdiView *view = (%{APPNAMELC}kmdiView*) current;
+		%{APPNAMELC}tdemdiView *view = (%{APPNAMELC}tdemdiView*) current;
 		//view->updateCaption();
 		m_manager->setActivePart( view->part() );
 	}
 }
 
-void %{APPNAMELC}kmdi::slotFileClose()
+void %{APPNAMELC}tdemdi::slotFileClose()
 {
 	requestClose( activeWindow() );
 }
 
-bool %{APPNAMELC}kmdi::requestClose(KMdiChildView* v)
+bool %{APPNAMELC}tdemdi::requestClose(KMdiChildView* v)
 {
 	//    kdWarning()<<"closing view"<<v<<endl;
 	//    if (view == NULL)
@@ -227,7 +227,7 @@ bool %{APPNAMELC}kmdi::requestClose(KMdiChildView* v)
 	{
 		if ( m_views.count() == 1)
 		{
-			%{APPNAMELC}kmdiView *view = m_views[0];
+			%{APPNAMELC}tdemdiView *view = m_views[0];
 			if (view->part()->queryClose())
 			{
 				m_manager->removePart( view->part() );
@@ -242,7 +242,7 @@ bool %{APPNAMELC}kmdi::requestClose(KMdiChildView* v)
 		return true;
 	}
 
-	%{APPNAMELC}kmdiView *view = (%{APPNAMELC}kmdiView*) v;
+	%{APPNAMELC}tdemdiView *view = (%{APPNAMELC}tdemdiView*) v;
 	if ( m_views.contains( view ) )
 	{
 		m_views.remove( view );
@@ -258,12 +258,12 @@ bool %{APPNAMELC}kmdi::requestClose(KMdiChildView* v)
 	return true;
 }
 
-void %{APPNAMELC}kmdi::slotFileQuit()
+void %{APPNAMELC}tdemdi::slotFileQuit()
 {
 	close();
 }
 
-void %{APPNAMELC}kmdi::optionsShowToolbar()
+void %{APPNAMELC}tdemdi::optionsShowToolbar()
 {
 	if (m_toolbarAction->isChecked())
 		toolBar()->show();
@@ -271,7 +271,7 @@ void %{APPNAMELC}kmdi::optionsShowToolbar()
 		toolBar()->hide();
 }
 
-void %{APPNAMELC}kmdi::optionsShowStatusbar()
+void %{APPNAMELC}tdemdi::optionsShowStatusbar()
 {
 	if (m_statusbarAction->isChecked())
 		statusBar()->show();
@@ -279,7 +279,7 @@ void %{APPNAMELC}kmdi::optionsShowStatusbar()
 		statusBar()->hide();
 }
 
-void %{APPNAMELC}kmdi::optionsConfigureKeys()
+void %{APPNAMELC}tdemdi::optionsConfigureKeys()
 {
 	//KKeyDialog::configure(actionCollection());
 	KKeyDialog dlg( false, this );
@@ -296,12 +296,12 @@ void %{APPNAMELC}kmdi::optionsConfigureKeys()
 	}
 }
 
-void %{APPNAMELC}kmdi::optionsConfigureToolbars()
+void %{APPNAMELC}tdemdi::optionsConfigureToolbars()
 {
 	//saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 }
 
-void %{APPNAMELC}kmdi::newToolbarConfig()
+void %{APPNAMELC}tdemdi::newToolbarConfig()
 {
 	// This slot is called when user clicks "Ok" or "Apply" in the toolbar editor.
 	// recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.)
@@ -309,7 +309,7 @@ void %{APPNAMELC}kmdi::newToolbarConfig()
 	//applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 }
 
-void %{APPNAMELC}kmdi::optionsPreferences()
+void %{APPNAMELC}tdemdi::optionsPreferences()
 {
 	// The preference dialog is derived from prefs-base.ui which is subclassed into Prefs
 	//
@@ -324,31 +324,31 @@ void %{APPNAMELC}kmdi::optionsPreferences()
 	dialog->show();
 }
 
-void %{APPNAMELC}kmdi::settingsChanged()
+void %{APPNAMELC}tdemdi::settingsChanged()
 {
 	// propagate the changes to our views
-	/*TQValueList<%{APPNAMELC}kmdiView*>::iterator it  = m_views.begin();
-	  TQValueList<%{APPNAMELC}kmdiView*>::iterator end = m_views.end();
+	/*TQValueList<%{APPNAMELC}tdemdiView*>::iterator it  = m_views.begin();
+	  TQValueList<%{APPNAMELC}tdemdiView*>::iterator end = m_views.end();
 	  for (; it != end; ++it)
 	  {
-	  %{APPNAMELC}kmdiView *view = *it;
+	  %{APPNAMELC}tdemdiView *view = *it;
 	  view->settingsChanged();
 	  }*/
 }
 
-void %{APPNAMELC}kmdi::changeStatusbar(const TQString& text)
+void %{APPNAMELC}tdemdi::changeStatusbar(const TQString& text)
 {
 	// display the text on the statusbar
 	statusBar()->message(text, 2000);
 }
 
-void %{APPNAMELC}kmdi::dragEnterEvent(TQDragEnterEvent *event)
+void %{APPNAMELC}tdemdi::dragEnterEvent(TQDragEnterEvent *event)
 {
 	// accept uri drops only
 	event->accept(KURLDrag::canDecode(event));
 }
 
-void %{APPNAMELC}kmdi::dropEvent(TQDropEvent *event)
+void %{APPNAMELC}tdemdi::dropEvent(TQDropEvent *event)
 {
 	KURL::List urls;
 
@@ -363,15 +363,15 @@ void %{APPNAMELC}kmdi::dropEvent(TQDropEvent *event)
 	}
 }
 
-bool %{APPNAMELC}kmdi::queryClose()
+bool %{APPNAMELC}tdemdi::queryClose()
 {
-	TQValueList<%{APPNAMELC}kmdiView*>::iterator it;
+	TQValueList<%{APPNAMELC}tdemdiView*>::iterator it;
 
 	// check if we can close all documents
 	for (it = m_views.begin(); it != m_views.end(); ++it)
 	{
 		// kdWarning()<<"searching for the part"<<endl;
-		%{APPNAMELC}kmdiView *view = *it;
+		%{APPNAMELC}tdemdiView *view = *it;
 		if (!view->part()->queryClose())
 		{
 			return false;
@@ -382,7 +382,7 @@ bool %{APPNAMELC}kmdi::queryClose()
 	for (it = m_views.begin(); it != m_views.end(); ++it)
 	{
 		// now close all views
-		%{APPNAMELC}kmdiView *view = *it;
+		%{APPNAMELC}tdemdiView *view = *it;
 
 		m_manager->removePart( view->part() );
 		closeWindow( view );
@@ -391,4 +391,4 @@ bool %{APPNAMELC}kmdi::queryClose()
 	return true;
 }
 
-#include "%{APPNAMELC}kmdi.moc"
+#include "%{APPNAMELC}tdemdi.moc"
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.h b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h
index fc4d73aa..02d26d0c 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.h
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h
@@ -6,32 +6,32 @@
 #include <tqvaluelist.h>
 
 #include <kapplication.h>
-#include <kmdimainfrm.h>
+#include <tdemdimainfrm.h>
 #include <kurl.h>
 
 class KToggleAction;
 class KRecentFilesAction;
 
-class kmdikonsole;
+class tdemdikonsole;
 class KMdiChildView;
 class TQWidgetStack;
-class %{APPNAMELC}kmdiView;
+class %{APPNAMELC}tdemdiView;
 class TextProperties;
 class MiscProperties;
 
 /**
- * This class serves as the main window for %{APPNAMELC}kmdi.  It handles the
+ * This class serves as the main window for %{APPNAMELC}tdemdi.  It handles the
  * menus, toolbars, and status bars.
  *
  * @short Main window class
  */
-class %{APPNAMELC}kmdi : public KMdiMainFrm
+class %{APPNAMELC}tdemdi : public KMdiMainFrm
 {
 	Q_OBJECT
   
 	public:
-		%{APPNAMELC}kmdi( KMdi::MdiMode mode );
-		virtual ~%{APPNAMELC}kmdi();
+		%{APPNAMELC}tdemdi( KMdi::MdiMode mode );
+		virtual ~%{APPNAMELC}tdemdi();
 		void showTipOnStart();
 
 	public slots:
@@ -69,14 +69,14 @@ class %{APPNAMELC}kmdi : public KMdiMainFrm
 		void setupAccel();
 		void setupActions();
 
-		TQValueList<%{APPNAMELC}kmdiView*> m_views;
+		TQValueList<%{APPNAMELC}tdemdiView*> m_views;
 
 		KToggleAction *m_toolbarAction;
 		KToggleAction *m_statusbarAction;
 
 		KParts::PartManager *m_manager;
 
-		kmdikonsole *m_console;
+		tdemdikonsole *m_console;
 };
 
 #endif // _%{APPNAMEUC}KMDI_H
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp
index d7c00001..a9b9845e 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp
@@ -5,15 +5,15 @@
 
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kmdichildview.h>
+#include <tdemdichildview.h>
 #include <kdebug.h>
 #include <klibloader.h>
 #include <kmessagebox.h>
 
-#include "%{APPNAMELC}kmdiView.h"
+#include "%{APPNAMELC}tdemdiView.h"
 
 
-	%{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *parentWidget, const char *name )
+	%{APPNAMELC}tdemdiView::%{APPNAMELC}tdemdiView( TQWidget *parentWidget, const char *name )
 : KMdiChildView( parentWidget, name )
 {
 	m_part = NULL;
@@ -55,9 +55,9 @@
 	}
 }
 
-%{APPNAMELC}kmdiView::~%{APPNAMELC}kmdiView()
+%{APPNAMELC}tdemdiView::~%{APPNAMELC}tdemdiView()
 {
 	delete m_part->widget();
 }
 
-#include "%{APPNAMELC}kmdiView.moc"
+#include "%{APPNAMELC}tdemdiView.moc"
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h
new file mode 100644
index 00000000..00109fdb
--- /dev/null
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h
@@ -0,0 +1,30 @@
+%{H_TEMPLATE}
+
+#ifndef _%{APPNAMEUC}KMDIVIEW_H
+#define _%{APPNAMEUC}KMDIVIEW_H
+
+#include <tdeparts/part.h>
+#include <tdemdichildview.h>
+#include <tdemdichildfrm.h>
+
+/**
+ * This class serves as the %{APPNAMELC}tdemdi view.
+ *
+ * @short main view class
+ */
+class %{APPNAMELC}tdemdiView : public KMdiChildView 
+{
+	Q_OBJECT
+  
+	public:
+		%{APPNAMELC}tdemdiView( TQWidget *parentWidget=0L, const char *name=0L );
+		virtual ~%{APPNAMELC}tdemdiView();
+
+		KParts::ReadWritePart *part() { return m_part; }
+
+	private:
+		KParts::ReadWritePart *m_part;
+};
+
+#endif // _%{APPNAMEUC}KMDIVIEW_H
+
diff --git a/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate
index 8f8fb599..635d40d8 100644
--- a/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate
+++ b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate
@@ -30,7 +30,7 @@ Name[tr]=Scons tabanlı KMDI uygulaması
 Name[zh_CN]=基于 Scons 的 KMDI 应用程序
 Name[zh_TW]=Scons 為基礎的 KMDI 應用程式
 Category=C++/TDE
-Icon=kscons_kmdi.png
+Icon=kscons_tdemdi.png
 Comment=Generates a complex KMDI application. Scons scripts are provided for compiling and installing the application.
 Comment[ca]=Genera una complexa aplicació per a KMDI. Els scripts en Scons són proveïts per a compilar i instal·lar l'aplicació.
 Comment[da]=Genererer et komplekst TDE-program. Der sørges for scons-scripter til at kompilere og installere programmet.
@@ -60,7 +60,7 @@ Comment[zh_CN]=生成一个复杂的 KMDI 应用程序。此时会提供 Scons �
 Comment[zh_TW]=產生一個複雜的 KMDI 應用程式。Scons 文稿是用於編譯與安裝應用程式。
 FileTemplates=h,CStyle,cpp,CStyle
 ShowFilesAfterGeneration=%{dest}/QUICKSTART
-Archive=kscons_kmdi.tar.gz
+Archive=kscons_tdemdi.tar.gz
 
 [SCONS]
 Type=include
@@ -128,13 +128,13 @@ Dest=%{dest}/src/SConscript
 
 [FILE11]
 Type=install
-Source=%{src}/appkmdi.cpp
-Dest=%{dest}/src/%{APPNAMELC}kmdi.cpp
+Source=%{src}/apptdemdi.cpp
+Dest=%{dest}/src/%{APPNAMELC}tdemdi.cpp
 
 [FILE12]
 Type=install
-Source=%{src}/appkmdi.h
-Dest=%{dest}/src/%{APPNAMELC}kmdi.h
+Source=%{src}/apptdemdi.h
+Dest=%{dest}/src/%{APPNAMELC}tdemdi.h
 
 [FILE13]
 Type=install
@@ -144,13 +144,13 @@ Dest=%{dest}/src/prefs.ui
 
 [FILE14]
 Type=install
-Source=%{src}/appkmdiView.cpp
-Dest=%{dest}/src/%{APPNAMELC}kmdiView.cpp
+Source=%{src}/apptdemdiView.cpp
+Dest=%{dest}/src/%{APPNAMELC}tdemdiView.cpp
 
 [FILE15]
 Type=install
-Source=%{src}/appkmdiView.h
-Dest=%{dest}/src/%{APPNAMELC}kmdiView.h
+Source=%{src}/apptdemdiView.h
+Dest=%{dest}/src/%{APPNAMELC}tdemdiView.h
 
 [FILE19]
 Type=install
@@ -205,13 +205,13 @@ Dest=%{dest}/po/messages.sh
 
 [FILE31]
 Type=install
-Source=%{src}/kmdikonsole.cpp
-Dest=%{dest}/src/kmdikonsole.cpp
+Source=%{src}/tdemdikonsole.cpp
+Dest=%{dest}/src/tdemdikonsole.cpp
 
 [FILE32]
 Type=install
-Source=%{src}/kmdikonsole.h
-Dest=%{dest}/src/kmdikonsole.h
+Source=%{src}/tdemdikonsole.h
+Dest=%{dest}/src/tdemdikonsole.h
 
 [FILE34]
 Type=install
diff --git a/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.png b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.png
index 72a347ee..72a347ee 100644
--- a/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.png
+++ b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.png
diff --git a/languages/cpp/app_templates/kscons_kmdi/main.cpp b/languages/cpp/app_templates/kscons_tdemdi/main.cpp
index dca1e7a6..ccfc4fac 100644
--- a/languages/cpp/app_templates/kscons_kmdi/main.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/main.cpp
@@ -6,10 +6,10 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 
-#include "%{APPNAMELC}kmdi.h"
+#include "%{APPNAMELC}tdemdi.h"
 
 static const char description[] =
-I18N_NOOP("A simple kmdi app");
+I18N_NOOP("A simple tdemdi app");
 
 static const char version[] = "0.0.1";
 
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
 		// no session.. just start up normally
 		TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-		%{APPNAMELC}kmdi *widget = new %{APPNAMELC}kmdi( KMdi::IDEAlMode );
+		%{APPNAMELC}tdemdi *widget = new %{APPNAMELC}tdemdi( KMdi::IDEAlMode );
 
 		if (args->count() != 0)
 		{
diff --git a/languages/cpp/app_templates/kscons_kmdi/messages.sh b/languages/cpp/app_templates/kscons_tdemdi/messages.sh
index a0ce678a..a0ce678a 100755
--- a/languages/cpp/app_templates/kscons_kmdi/messages.sh
+++ b/languages/cpp/app_templates/kscons_tdemdi/messages.sh
diff --git a/languages/cpp/app_templates/kscons_kmdi/prefs.ui b/languages/cpp/app_templates/kscons_tdemdi/prefs.ui
index 7830280b..7830280b 100644
--- a/languages/cpp/app_templates/kscons_kmdi/prefs.ui
+++ b/languages/cpp/app_templates/kscons_tdemdi/prefs.ui
diff --git a/languages/cpp/app_templates/kscons_kmdi/settings.kcfgc b/languages/cpp/app_templates/kscons_tdemdi/settings.kcfgc
index 384510cd..384510cd 100644
--- a/languages/cpp/app_templates/kscons_kmdi/settings.kcfgc
+++ b/languages/cpp/app_templates/kscons_tdemdi/settings.kcfgc
diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
index 5bd6b949..0eab6525 100644
--- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
@@ -3,26 +3,26 @@
 #include <tqfileinfo.h>
 #include <tqframe.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kate/document.h>
 #include <kate/view.h>
 #include <klocale.h>
 #include <klibloader.h>
 #include <kurl.h>
 
-#include "kmdikonsole.h"
+#include "tdemdikonsole.h"
 
-kmdikonsole::kmdikonsole(TQWidget *parent, const char *name) : TQVBox(parent, name)
+tdemdikonsole::tdemdikonsole(TQWidget *parent, const char *name) : TQVBox(parent, name)
 {
 	m_haskonsole = false;
 	respawn();
 }
 
-kmdikonsole::~kmdikonsole()
+tdemdikonsole::~tdemdikonsole()
 {
 }
 
-void kmdikonsole::respawn()
+void tdemdikonsole::respawn()
 {
 	KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
 
@@ -41,7 +41,7 @@ void kmdikonsole::respawn()
 	show();
 }
 
-void kmdikonsole::setDirectory(const TQString &dirname)
+void tdemdikonsole::setDirectory(const TQString &dirname)
 {
 	if (m_haskonsole)
 	{
@@ -51,13 +51,13 @@ void kmdikonsole::setDirectory(const TQString &dirname)
 	}
 }
 
-void kmdikonsole::showEvent(TQShowEvent *ev)
+void tdemdikonsole::showEvent(TQShowEvent *ev)
 {
 	TQWidget::showEvent(ev);
 	activate();
 }
 
-void kmdikonsole::activate()
+void tdemdikonsole::activate()
 {
 	if (m_haskonsole)
 	{
@@ -67,10 +67,10 @@ void kmdikonsole::activate()
 	}
 }
 
-void kmdikonsole::slotDestroyed()
+void tdemdikonsole::slotDestroyed()
 {
 	m_haskonsole=false;
 	respawn();
 }
 
-#include "kmdikonsole.moc"
+#include "tdemdikonsole.moc"
diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h
index df3a1526..db4a4323 100644
--- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h
+++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h
@@ -5,14 +5,14 @@
 
 #include <tqvbox.h>
 
-class kmdikonsole : public TQVBox
+class tdemdikonsole : public TQVBox
 {
 	Q_OBJECT
   
 
 	public:
-		kmdikonsole( TQWidget* parent, const char* name=0);
-		~kmdikonsole();
+		tdemdikonsole( TQWidget* parent, const char* name=0);
+		~tdemdikonsole();
 
 	public slots:
 		void setDirectory(const TQString & dir);
diff --git a/languages/cpp/app_templates/kscons_kmdi/tips b/languages/cpp/app_templates/kscons_tdemdi/tips
index b9618b42..b9618b42 100644
--- a/languages/cpp/app_templates/kscons_kmdi/tips
+++ b/languages/cpp/app_templates/kscons_tdemdi/tips
diff --git a/languages/cpp/app_templates/kxt/README b/languages/cpp/app_templates/kxt/README
index a7775d6a..a24ad60a 100644
--- a/languages/cpp/app_templates/kxt/README
+++ b/languages/cpp/app_templates/kxt/README
@@ -58,7 +58,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
 in your app.
 
 For more details, consult :
-http://www-106.ibm.com/developerworks/library/l-kparts/
+http://www-106.ibm.com/developerworks/library/l-tdeparts/
 http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
 http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html
 
diff --git a/languages/cpp/app_templates/tdecmodule/module.cpp b/languages/cpp/app_templates/tdecmodule/module.cpp
index 2c8d9271..52203d1a 100644
--- a/languages/cpp/app_templates/tdecmodule/module.cpp
+++ b/languages/cpp/app_templates/tdecmodule/module.cpp
@@ -4,7 +4,7 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 
 #include "%{APPNAMELC}.h"
 
diff --git a/languages/cpp/app_templates/kscreensaver/.kdev_ignore b/languages/cpp/app_templates/tdescreensaver/.kdev_ignore
index e69de29b..e69de29b 100644
--- a/languages/cpp/app_templates/kscreensaver/.kdev_ignore
+++ b/languages/cpp/app_templates/tdescreensaver/.kdev_ignore
diff --git a/languages/cpp/app_templates/kscreensaver/CMakeLists.txt b/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt
index a74c003c..b1149d88 100644
--- a/languages/cpp/app_templates/kscreensaver/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt
@@ -9,19 +9,19 @@
 #
 #################################################
 
-add_custom_target( kscreensaver.tar.gz ALL
-  COMMAND tar zcf kscreensaver.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    kscreensaver.desktop kscreensaver.png kscreensaver.h
-    kscreensaverui.ui src-Makefile.am kscreensaver.cpp
-    kscreensaver.tdevelop subdirs
+add_custom_target( tdescreensaver.tar.gz ALL
+  COMMAND tar zcf tdescreensaver.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+    tdescreensaver.desktop tdescreensaver.png tdescreensaver.h
+    tdescreensaverui.ui src-Makefile.am tdescreensaver.cpp
+    tdescreensaver.tdevelop subdirs
 )
 
 
 install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kscreensaver.tar.gz kscreensaver.png
+    ${CMAKE_CURRENT_BINARY_DIR}/tdescreensaver.tar.gz tdescreensaver.png
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    kscreensaver.kdevtemplate
+    tdescreensaver.kdevtemplate
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kscreensaver/Makefile.am b/languages/cpp/app_templates/tdescreensaver/Makefile.am
index a304c27a..bee93bbc 100644
--- a/languages/cpp/app_templates/kscreensaver/Makefile.am
+++ b/languages/cpp/app_templates/tdescreensaver/Makefile.am
@@ -1,8 +1,8 @@
-dataFiles = kscreensaver.desktop kscreensaver.png kscreensaver.h \
-	kscreensaverui.ui src-Makefile.am kscreensaver.cpp \
-	kscreensaver.tdevelop subdirs
+dataFiles = tdescreensaver.desktop tdescreensaver.png tdescreensaver.h \
+	tdescreensaverui.ui src-Makefile.am tdescreensaver.cpp \
+	tdescreensaver.tdevelop subdirs
 
-templateName= kscreensaver
+templateName= tdescreensaver
 
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/cpp/app_templates/kscreensaver/src-Makefile.am b/languages/cpp/app_templates/tdescreensaver/src-Makefile.am
index 83c32868..5e2caf20 100644
--- a/languages/cpp/app_templates/kscreensaver/src-Makefile.am
+++ b/languages/cpp/app_templates/tdescreensaver/src-Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 
 INCLUDES = $(all_includes)
 LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
-LDADD = $(LIB_TDEUI) -lkscreensaver -lm
+LDADD = $(LIB_TDEUI) -ltdescreensaver -lm
 bin_PROGRAMS = %{APPNAMELC}.kss
 
 %{APPNAMELC}_kss_SOURCES = %{APPNAMELC}ui.ui %{APPNAMELC}.cpp
diff --git a/languages/cpp/app_templates/kscreensaver/subdirs b/languages/cpp/app_templates/tdescreensaver/subdirs
index 0e678106..0e678106 100644
--- a/languages/cpp/app_templates/kscreensaver/subdirs
+++ b/languages/cpp/app_templates/tdescreensaver/subdirs
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
index 12699c32..f8e88db8 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
@@ -11,7 +11,7 @@
 #include "%{APPNAMELC}.h"
 #include "%{APPNAMELC}ui.h"
 
-//! libkscreensaver interface
+//! libtdescreensaver interface
 extern "C"
 {
     const char *kss_applicationName = "%{APPNAMELC}.kss";
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.desktop b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop
index 046eb9a2..b4ec0186 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.desktop
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=%{APPNAMELC}.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=Miscellaneous
@@ -43,7 +43,7 @@ Name[sv]=Inställning...
 Name[tr]=Kurulum...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=%{APPNAMELC}.kss -window-id %w
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.h b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.h
index 881137c5..e066852a 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.h
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.h
@@ -3,7 +3,7 @@
 #ifndef %{APPNAME}_H__
 #define %{APPNAME}_H__
 
-#include "kscreensaver.h"
+#include "tdescreensaver.h"
 #include "%{APPNAMELC}ui.h"
 
 class %{APPNAME} : public KScreenSaver
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate
index 24b96770..df27d577 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate
@@ -31,7 +31,7 @@ Name[sv]=TDE-skärmsläckare
 Name[tr]=TDE Ekran Koruyucusu
 Name[zh_CN]= TDE 屏幕保护程序
 Name[zh_TW]=TDE 螢幕保護程式
-Icon=kscreensaver.png
+Icon=tdescreensaver.png
 Category=C++/TDE
 Comment=Generates a framework for a TDE screensaver.
 Comment[ca]=Genera una infraestructura per a un salvapantalles de TDE.
@@ -64,7 +64,7 @@ Comment[zh_CN]=生成 TDE 屏幕保护程序框架。
 Comment[zh_TW]=產生一個 TDE 螢幕保護程式的框架
 FileTemplates=h,CStyle,cpp,CStyle
 ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp
-Archive=kscreensaver.tar.gz
+Archive=tdescreensaver.tar.gz
 
 [ADMIN]
 Type=include
@@ -102,7 +102,7 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/kscreensaver.tdevelop
+Source=%{src}/tdescreensaver.tdevelop
 Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir3]
@@ -150,23 +150,23 @@ Dest=%{dest}/src/Makefile.am
 
 [FILE12]
 Type=install
-Source=%{src}/kscreensaver.cpp
+Source=%{src}/tdescreensaver.cpp
 Dest=%{dest}/src/%{APPNAMELC}.cpp
 
 [FILE13]
 Type=install
-Source=%{src}/kscreensaver.h
+Source=%{src}/tdescreensaver.h
 Dest=%{dest}/src/%{APPNAMELC}.h
 
 [FILE14]
 Type=install
-Source=%{src}/kscreensaver.desktop
+Source=%{src}/tdescreensaver.desktop
 Dest=%{dest}/src/%{APPNAMELC}.desktop
 
 [FILE15]
 Type=install
 EscapeXML=true
-Source=%{src}/kscreensaverui.ui
+Source=%{src}/tdescreensaverui.ui
 Dest=%{dest}/src/%{APPNAMELC}ui.ui
 
 [MSG]
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.png b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.png
index e91ec2e2..e91ec2e2 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.png
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.png
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.tdevelop b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop
index 38429f89..38429f89 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.tdevelop
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui b/languages/cpp/app_templates/tdescreensaver/tdescreensaverui.ui
index e83bcda9..e83bcda9 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaverui.ui
diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp
index f6d19c2a..48eb7bb9 100644
--- a/languages/cpp/ast_utils.cpp
+++ b/languages/cpp/ast_utils.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <kapplication.h>
 
-#include <ktexteditor/editinterface.h>
+#include <tdetexteditor/editinterface.h>
 
 #include "cppsupport_utils.h"
 
diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp
index ab89713f..a19d3289 100644
--- a/languages/cpp/backgroundparser.cpp
+++ b/languages/cpp/backgroundparser.cpp
@@ -20,10 +20,10 @@
 
 #include <tqmutex.h>
 
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
 
 #include <kdevpartcontroller.h>
 #include <kdevproject.h>
diff --git a/languages/cpp/codecompletionentry.h b/languages/cpp/codecompletionentry.h
index e510b765..a219fe7a 100644
--- a/languages/cpp/codecompletionentry.h
+++ b/languages/cpp/codecompletionentry.h
@@ -24,7 +24,7 @@
 #ifndef __CODECOMPLETIONENTRY_H__
 #define __CODECOMPLETIONENTRY_H__
 
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 
 //this is just a little helper-class to allow custom sorting, it must stay binary compatible with KTextEditor::CompletionEntry!!
 class CodeCompletionEntry : public KTextEditor::CompletionEntry
diff --git a/languages/cpp/codeinformationrepository.h b/languages/cpp/codeinformationrepository.h
index 961af5ef..07655dac 100644
--- a/languages/cpp/codeinformationrepository.h
+++ b/languages/cpp/codeinformationrepository.h
@@ -16,7 +16,7 @@
 #include "cppcodecompletion.h"
 #include <tqmap.h>
 
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 
 struct TypeProcessor {
     virtual TQString processType( const TQString& type ) = 0;
diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index 56e8a644..7ef40424 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -44,9 +44,9 @@ email                : [email protected]
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kmessagebox.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kstatusbar.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/document.h>
 #include <kaction.h>
 
 #include <tqdatastream.h>
diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h
index 297f2692..24877215 100644
--- a/languages/cpp/cppcodecompletion.h
+++ b/languages/cpp/cppcodecompletion.h
@@ -27,12 +27,12 @@
 #include <codemodel.h>
 #include <set>
 
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/codecompletioninterface.h>
-#include <ktexteditor/texthintinterface.h>
-#include <ktexteditor/cursorinterface.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
+#include <tdetexteditor/texthintinterface.h>
+#include <tdetexteditor/cursorinterface.h>
+#include <tdetexteditor/view.h>
 
 #include <tqobject.h>
 #include <tqmutex.h>
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index 94eab619..f0ec6fa9 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -41,7 +41,7 @@
 #include "kdevcreatefile.h"
 #include "qtbuildconfig.h"
 #include "kdeveditorutil.h"
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
 #include <kpopupmenu.h>
 // wizards
 #include "cppnewclassdlg.h"
@@ -85,13 +85,13 @@
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/clipboardinterface.h>
-#include <ktexteditor/texthintinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/clipboardinterface.h>
+#include <tdetexteditor/texthintinterface.h>
 
 #include <kdevcore.h>
 #include <kdevproject.h>
diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp
index 35331654..5c747144 100644
--- a/languages/cpp/createpcsdialog.cpp
+++ b/languages/cpp/createpcsdialog.cpp
@@ -20,7 +20,7 @@
 #include <kdevpcsimporter.h>
 #include <kdevcoderepository.h>
 
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <ktrader.h>
 #include <kdebug.h>
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index 699b28dd..9c2ade95 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -28,8 +28,8 @@
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kstatusbar.h>
-#include <kparts/part.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/viewcursorinterface.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <dcopclient.h>
diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc
index e0b4db61..1156df06 100644
--- a/languages/cpp/doc/kde2book.toc
+++ b/languages/cpp/doc/kde2book.toc
@@ -1534,10 +1534,10 @@
 <entry name="ksimplebrowser.cpp class definition (simple browser application)" url="ch10.html"/>
 <entry name="ksimplebrowser.h class declaration (simple browser application)" url="ch10.html"/>
 <entry name="KSpellConfig configuration dialog box" url="ch10lev1sec3.html"/>
-<entry name="kspelldemo.cpp class declaration (KSpellDemo)" url="ch10lev1sec3.html"/>
-<entry name="kspelldemo.h class definition (KSpellDemo)" url="ch10lev1sec3.html"/>
-<entry name="KSpellDemo (spell-checking application), kspelldemo.cpp class declaration" url="ch10lev1sec3.html"/>
-<entry name="KSpellDemo (spell-checking application), kspelldemo.h class definition" url="ch10lev1sec3.html"/>
+<entry name="tdespelldemo.cpp class declaration (KSpellDemo)" url="ch10lev1sec3.html"/>
+<entry name="tdespelldemo.h class definition (KSpellDemo)" url="ch10lev1sec3.html"/>
+<entry name="KSpellDemo (spell-checking application), tdespelldemo.cpp class declaration" url="ch10lev1sec3.html"/>
+<entry name="KSpellDemo (spell-checking application), tdespelldemo.h class definition" url="ch10lev1sec3.html"/>
 <entry name="KSpellDemo (spell-checking application), main() method" url="ch10lev1sec3.html"/>
 <entry name="KSpell (spell-checking), configuring" url="ch10lev1sec3.html"/>
 <entry name="KSpell (spell-checking), methods" url="ch10lev1sec3.html"/>
@@ -1725,8 +1725,8 @@
 <entry name="listings, KSimpleBrowser, ksimplebrowser.cpp class definition" url="ch10.html"/>
 <entry name="listings, KSimpleBrowser, ksimplebrowser.h class declaration" url="ch10.html"/>
 <entry name="listings, KSimpleBrowser, main() method" url="ch10.html"/>
-<entry name="listings, KSpellDemo (spell-checking application), kspelldemo.cpp class declaration" url="ch10lev1sec3.html"/>
-<entry name="listings, KSpellDemo (spell-checking application), kspelldemo.h class definition" url="ch10lev1sec3.html"/>
+<entry name="listings, KSpellDemo (spell-checking application), tdespelldemo.cpp class declaration" url="ch10lev1sec3.html"/>
+<entry name="listings, KSpellDemo (spell-checking application), tdespelldemo.h class definition" url="ch10lev1sec3.html"/>
 <entry name="listings, KSpellDemo (spell-checking application), main() method" url="ch10lev1sec3.html"/>
 <entry name="listings, KStandardDialogs main.cpp" url="ch05lev1sec3.html"/>
 <entry name="listings, KStatusBarDemo widget, kstatusbardemo.cpp class definition" url="ch05.html"/>
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp
index c3e7ca0c..174219a3 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp
+++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp
@@ -62,8 +62,8 @@ TQStringList KDevKDELibsImporter::fileList()
 		files += fileList( m_settings->kdeDir() + "/tdesu" );
 		files += fileList( m_settings->kdeDir() + "/kio" );
 		files += fileList( m_settings->kdeDir() + "/kjs" );
-		files += fileList( m_settings->kdeDir() + "/kparts" );
-		files += fileList( m_settings->kdeDir() + "/ktexteditor" );
+		files += fileList( m_settings->kdeDir() + "/tdeparts" );
+		files += fileList( m_settings->kdeDir() + "/tdetexteditor" );
 	}
 	else if ( scope == 1 )
 	{
diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp
index 27b139f0..6f87771f 100644
--- a/languages/cpp/problemreporter.cpp
+++ b/languages/cpp/problemreporter.cpp
@@ -26,13 +26,13 @@
 #include <kdevproject.h>
 
 #include <tdeversion.h>
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/markinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/markinterface.h>
 
-#include <ktexteditor/markinterfaceextension.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/markinterfaceextension.h>
+#include <tdetexteditor/view.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp
index 32d407a4..c87d0266 100644
--- a/languages/cpp/qtdesignercppintegration.cpp
+++ b/languages/cpp/qtdesignercppintegration.cpp
@@ -27,9 +27,9 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/viewcursorinterface.h>
 
 #include <domutil.h>
 #include <kdevpartcontroller.h>
diff --git a/languages/cpp/typedesc.h b/languages/cpp/typedesc.h
index de2417a1..0229c781 100644
--- a/languages/cpp/typedesc.h
+++ b/languages/cpp/typedesc.h
@@ -15,7 +15,7 @@
 #ifndef __TYPEDESC_H__
 #define __TYPEDESC_H__
 
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 #include <ksharedptr.h>
 
 #include "includefiles.h"
diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp
index 86b193c8..29173e45 100644
--- a/languages/java/backgroundparser.cpp
+++ b/languages/java/backgroundparser.cpp
@@ -18,10 +18,10 @@
 
 #include <tqmutex.h>
 
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
 
 #include <kdevpartcontroller.h>
 #include <kdevproject.h>
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index c1e45273..4ab43d38 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -54,14 +54,14 @@
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/clipboardinterface.h>
-
-#include <ktexteditor/texthintinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/clipboardinterface.h>
+
+#include <tdetexteditor/texthintinterface.h>
 
 #include <kdevcore.h>
 #include <kdevproject.h>
diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp
index 43aefed0..5dffdecd 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -25,13 +25,13 @@
 #include <kdevmainwindow.h>
 
 #include <tdeversion.h>
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/markinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/markinterface.h>
 
-#include <ktexteditor/markinterfaceextension.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/markinterfaceextension.h>
+#include <tdetexteditor/view.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp
index 24eeda70..032d861b 100644
--- a/languages/kjssupport/jscodecompletion.cpp
+++ b/languages/kjssupport/jscodecompletion.cpp
@@ -24,7 +24,7 @@
 #include <kprocess.h>
 #include <kdebug.h>
 #include <kaction.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdialogbase.h>
 
 
diff --git a/languages/kjssupport/jscodecompletion.h b/languages/kjssupport/jscodecompletion.h
index 5aa14198..f1d18a70 100644
--- a/languages/kjssupport/jscodecompletion.h
+++ b/languages/kjssupport/jscodecompletion.h
@@ -17,9 +17,9 @@
 #include <tdevelop/kdevplugin.h>
 #include <tdevelop/kdevlanguagesupport.h>
 
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 
 /**
 The code completion engine for Javascript.
diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp
index 44a3659b..c73d51bb 100644
--- a/languages/kjssupport/kjssupport_part.cpp
+++ b/languages/kjssupport/kjssupport_part.cpp
@@ -31,7 +31,7 @@
 #include <kdevmainwindow.h>
 #include <domutil.h>
 #include <codemodel.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 
 #include <kdevproject.h>
diff --git a/languages/lib/debugger/CMakeLists.txt b/languages/lib/debugger/CMakeLists.txt
index 0f980a45..c159528b 100644
--- a/languages/lib/debugger/CMakeLists.txt
+++ b/languages/lib/debugger/CMakeLists.txt
@@ -33,6 +33,6 @@ install( FILES
 tde_add_library( lang_debugger SHARED AUTOMOC
   SOURCES kdevdebugger.cpp debugger.cpp
   VERSION 0.0.0
-  LINK ktexteditor-shared
+  LINK tdetexteditor-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/languages/lib/debugger/Makefile.am b/languages/lib/debugger/Makefile.am
index 70484a34..1a6b7d2e 100644
--- a/languages/lib/debugger/Makefile.am
+++ b/languages/lib/debugger/Makefile.am
@@ -2,12 +2,12 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
 lib_LTLIBRARIES = liblang_debugger.la
 liblang_debugger_la_LDFLAGS = $(all_libraries)
-liblang_debugger_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KPARTS) -lktexteditor
+liblang_debugger_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KPARTS) -ltdetexteditor
 liblang_debugger_la_SOURCES = kdevdebugger.cpp debugger.cpp
 langincludedirdir = $(includedir)/tdevelop/languages/debugger
 langincludedir_HEADERS = debugger.h kdevdebugger.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces kdevutil
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces kdevutil
 DOXYGEN_PROJECTNAME = KDevelop Debugger Support Library
 DOXYGEN_DOCDIRPREFIX = kdevlang
 include ../../../Doxyfile.am
diff --git a/languages/lib/debugger/debugger.cpp b/languages/lib/debugger/debugger.cpp
index 5d33ee8c..69b7a128 100644
--- a/languages/lib/debugger/debugger.cpp
+++ b/languages/lib/debugger/debugger.cpp
@@ -3,7 +3,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/document.h>
 
 // #include "editorproxy.h"
 #include <kdevpartcontroller.h>
diff --git a/languages/lib/debugger/debugger.h b/languages/lib/debugger/debugger.h
index b7c48964..d4112490 100644
--- a/languages/lib/debugger/debugger.h
+++ b/languages/lib/debugger/debugger.h
@@ -5,11 +5,11 @@
 
 #include "kdevdebugger.h"
 
-#include <kparts/part.h>
-#include <ktexteditor/markinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/markinterface.h>
 
 #include <tdeversion.h>
-#include <ktexteditor/markinterfaceextension.h>
+#include <tdetexteditor/markinterfaceextension.h>
 
 class KDevPartController;
 
diff --git a/languages/lib/designer_integration/Makefile.am b/languages/lib/designer_integration/Makefile.am
index 3ba9afb5..250b8be6 100644
--- a/languages/lib/designer_integration/Makefile.am
+++ b/languages/lib/designer_integration/Makefile.am
@@ -11,6 +11,6 @@ libdesignerintegration_la_SOURCES = implementationwidgetbase.ui \
 langincludedirdir = $(includedir)/tdevelop/languages/designer_integration
 langincludedir_HEADERS = qtdesignerintegration.h implementationwidget.h implementationwidgetbase.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces kdevutil
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces kdevutil
 DOXYGEN_PROJECTNAME = KDevelop Designer Integration Support Library
 include ../../../Doxyfile.am
diff --git a/languages/lib/interfaces/Makefile.am b/languages/lib/interfaces/Makefile.am
index d469eaa6..3edd1097 100644
--- a/languages/lib/interfaces/Makefile.am
+++ b/languages/lib/interfaces/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = $(all_includes)
 servicetypedir = $(kde_servicetypesdir)
 servicetype_DATA = tdeveloppcsimporter.desktop
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces kdevutil
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces kdevutil
 DOXYGEN_PROJECTNAME = KDevelop Language Support Interfaces Library
 DOXYGEN_DOCDIRPREFIX = kdevlang
 include ../../../Doxyfile.am
diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp
index 1618ba11..3b2ffbc4 100644
--- a/languages/pascal/problemreporter.cpp
+++ b/languages/pascal/problemreporter.cpp
@@ -24,12 +24,12 @@
 #include "backgroundparser.h"
 
 #include <tdeversion.h>
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/markinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/markinterface.h>
 
-#include <ktexteditor/markinterfaceextension.h>
+#include <tdetexteditor/markinterfaceextension.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/languages/php/phpcodecompletion.h b/languages/php/phpcodecompletion.h
index f922b09b..0874430e 100644
--- a/languages/php/phpcodecompletion.h
+++ b/languages/php/phpcodecompletion.h
@@ -25,15 +25,15 @@
 
 #include <tqobject.h>
 #include <kregexp.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include <kdevmainwindow.h>
 #include <kstatusbar.h>
 
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/codecompletioninterface.h>
-#include <ktexteditor/selectioninterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
+#include <tdetexteditor/selectioninterface.h>
 
 
 class KDevCore;
diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp
index efc63d70..47d869b7 100644
--- a/languages/php/phperrorview.cpp
+++ b/languages/php/phperrorview.cpp
@@ -25,13 +25,13 @@
 #include <kdevproject.h>
 
 #include <tdeversion.h>
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/markinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/markinterface.h>
 
-#include <ktexteditor/markinterfaceextension.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/markinterfaceextension.h>
+#include <tdetexteditor/view.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/languages/php/phpfile.h b/languages/php/phpfile.h
index 470e7159..3cc571fa 100644
--- a/languages/php/phpfile.h
+++ b/languages/php/phpfile.h
@@ -34,8 +34,8 @@
 #include <kdevlanguagesupport.h>
 #include <kdevpartcontroller.h>
 
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
 
 #include "phpsupportpart.h"
 #include "phperrorview.h"
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index 9435c274..f7bde3d0 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -35,13 +35,13 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kregexp.h>
 #include <kstatusbar.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 #include <kdevcore.h>
 #include <kdevproject.h>
diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h
index f7d13122..572be8c8 100644
--- a/languages/php/phpsupportpart.h
+++ b/languages/php/phpsupportpart.h
@@ -29,7 +29,7 @@
 #include <kio/job.h>
 #include <kdevgenericfactory.h>
 
-#include <ktexteditor/editinterface.h>
+#include <tdetexteditor/editinterface.h>
 
 class TQStringList;
 class PHPHTMLView;
diff --git a/languages/python/qtdesignerpythonintegration.cpp b/languages/python/qtdesignerpythonintegration.cpp
index d9503339..4d7b28a5 100644
--- a/languages/python/qtdesignerpythonintegration.cpp
+++ b/languages/python/qtdesignerpythonintegration.cpp
@@ -26,9 +26,9 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/viewcursorinterface.h>
 
 #include <domutil.h>
 #include <kdevpartcontroller.h>
diff --git a/languages/ruby/app_templates/kapp/README b/languages/ruby/app_templates/kapp/README
index 69e9ac5f..f7d35069 100644
--- a/languages/ruby/app_templates/kapp/README
+++ b/languages/ruby/app_templates/kapp/README
@@ -53,7 +53,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
 in your app.
 
 For more details, consult :
-http://www-106.ibm.com/developerworks/library/l-kparts/
+http://www-106.ibm.com/developerworks/library/l-tdeparts/
 http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
 http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html
 
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index 4da31204..091649e1 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -31,8 +31,8 @@
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kstatusbar.h>
-#include <kparts/part.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/viewcursorinterface.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <dcopclient.h>
diff --git a/languages/ruby/qtdesignerrubyintegration.cpp b/languages/ruby/qtdesignerrubyintegration.cpp
index 1b4da06d..f2412739 100644
--- a/languages/ruby/qtdesignerrubyintegration.cpp
+++ b/languages/ruby/qtdesignerrubyintegration.cpp
@@ -27,9 +27,9 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/viewcursorinterface.h>
 
 #include <domutil.h>
 #include <kdevpartcontroller.h>
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index 9de81db4..7111ffca 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -28,12 +28,12 @@
 #include <kprocess.h>
 #include <kdebug.h>
 #include <kaction.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdialogbase.h>
 #include <kapplication.h>
 #include <klibloader.h>
 
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
 
 #include <codemodel_utils.h>
 
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index 78c1c1f2..580d99c5 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -11,9 +11,9 @@
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <kaction.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdialogbase.h>
-#include <ktexteditor/editinterface.h>
+#include <tdetexteditor/editinterface.h>
 #include <kmessagebox.h>
 
 #include "kdevcore.h"
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 025e1819..0398ddf0 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -34,6 +34,6 @@ tde_add_library( tdevelop SHARED
   EMBED kdevutil-static kdevinterfaces-static
   LINK
     kdevpropertyeditor-shared
-    kscript-shared kparts-shared ktexteditor-shared
+    tdescript-shared tdeparts-shared tdetexteditor-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4e722350..2314d6e7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -11,7 +11,7 @@ libtdevelop_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \
 
 #	$(top_builddir)/lib/util/libkdevutil.la $(top_builddir)/lib/widgets/propeditor/libkdevpropertyeditor.la \
 #	$(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la \
-#	-lktexteditor $(LIB_KPARTS) $(LIB_KIO)  -lkscript
+#	-ltdetexteditor $(LIB_KPARTS) $(LIB_KIO)  -ltdescript
 libtdevelop_la_SOURCES = dummy.cpp
 
 
diff --git a/lib/catalog/Makefile.am b/lib/catalog/Makefile.am
index f9c81448..1aaa40ef 100644
--- a/lib/catalog/Makefile.am
+++ b/lib/catalog/Makefile.am
@@ -7,7 +7,7 @@ libkdevcatalog_la_LIBADD = -l$(DB3LIB) $(LIB_TDECORE) $(LIB_QT)
 kdevcatalogincludedir = $(includedir)/tdevelop/catalog
 kdevcataloginclude_HEADERS = catalog.h tag.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils
 DOXYGEN_PROJECTNAME = TDevelop Catalog Library
 DOXYGEN_DOCDIRPREFIX = kdev
 include ../../Doxyfile.am
diff --git a/lib/cppparser/Makefile.am b/lib/cppparser/Makefile.am
index a40c5518..414fea6f 100644
--- a/lib/cppparser/Makefile.am
+++ b/lib/cppparser/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes)
 AM_CXXFLAGS = -DKDEVELOP_BGPARSER
 lib_LTLIBRARIES = libkdevcppparser.la
 libkdevcppparser_la_LDFLAGS = $(all_libraries)
-libkdevcppparser_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/lib/interfaces/libkdevinterfaces.la -lDCOP $(LIB_TDEUI) $(LIB_KPARTS) -lktexteditor $(LIB_KIO) -lkscript
+libkdevcppparser_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/lib/interfaces/libkdevinterfaces.la -lDCOP $(LIB_TDEUI) $(LIB_KPARTS) -ltdetexteditor $(LIB_KIO) -ltdescript
 libkdevcppparser_la_SOURCES = ast.cpp cachemanager.cpp driver.cpp errors.cpp \
 	lexer.cpp lexercache.cpp lookup.cpp parser.cpp tree_parser.cpp
 
diff --git a/lib/interfaces/Makefile.am b/lib/interfaces/Makefile.am
index 3e8cbc7c..21deec16 100644
--- a/lib/interfaces/Makefile.am
+++ b/lib/interfaces/Makefile.am
@@ -14,7 +14,7 @@ libkdevinterfaces_la_SOURCES = kdevcore.cpp kdevproject.cpp \
 libkdevinterfaces_la_LDFLAGS = -no-undefined $(all_libraries)
 libkdevinterfaces_la_LIBADD = $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la \
 	$(top_builddir)/lib/util/libkdevutil.la \
-	$(LIB_TDEUI) $(LIB_KHTML) $(LIB_KPARTS) -lktexteditor -lkscript -lDCOP
+	$(LIB_TDEUI) $(LIB_KHTML) $(LIB_KPARTS) -ltdetexteditor -ltdescript -lDCOP
 
 tdevelopincludedir = $(includedir)/tdevelop/interfaces
 tdevelopinclude_HEADERS = kdevlanguagesupport.h kdevmainwindow.h \
@@ -33,7 +33,7 @@ METASOURCES = AUTO
 
 SUBDIRS = extensions external extras
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil designer_integration kdevcatalog kdevprofileslib kdevextensions
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil designer_integration kdevcatalog kdevprofileslib kdevextensions
 DOXYGEN_PROJECTNAME = TDevelop Interfaces Library
 DOXYGEN_DOCDIRPREFIX = kdev
 include ../../Doxyfile.am
diff --git a/lib/interfaces/extensions/Makefile.am b/lib/interfaces/extensions/Makefile.am
index 29ab44e4..211439b0 100644
--- a/lib/interfaces/extensions/Makefile.am
+++ b/lib/interfaces/extensions/Makefile.am
@@ -16,7 +16,7 @@ libkdevextensions_la_SOURCES = kdevappfrontend.cpp kdevmakefrontend.cpp
 INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces
 DOXYGEN_PROJECTNAME = KDevelop Extension Interfaces Library
 DOXYGEN_DOCDIRPREFIX = kdev
 include ../../../Doxyfile.am
diff --git a/lib/interfaces/external/CMakeLists.txt b/lib/interfaces/external/CMakeLists.txt
index cee645d0..353721fd 100644
--- a/lib/interfaces/external/CMakeLists.txt
+++ b/lib/interfaces/external/CMakeLists.txt
@@ -27,7 +27,7 @@ install( FILES
 
 tde_add_library( kinterfacedesigner SHARED AUTOMOC
   SOURCES designer.cpp
-  LINK kparts-shared tdeui-shared
+  LINK tdeparts-shared tdeui-shared
   VERSION 0.0.0
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/lib/interfaces/external/Makefile.am b/lib/interfaces/external/Makefile.am
index 63e15465..8d022993 100644
--- a/lib/interfaces/external/Makefile.am
+++ b/lib/interfaces/external/Makefile.am
@@ -10,6 +10,6 @@ libkinterfacedesigner_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDEUI)
 libkinterfacedesigner_la_LDFLAGS = $(all_libraries)
 libkinterfacedesigner_la_SOURCES =  designer.cpp
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils
 DOXYGEN_PROJECTNAME = KInterfaceDesigner Library
 include ../../../Doxyfile.am
diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h
index 4396c1ab..b84e2268 100644
--- a/lib/interfaces/external/designer.h
+++ b/lib/interfaces/external/designer.h
@@ -19,7 +19,7 @@
 #ifndef KINTERFACEDESIGNER_FORMEDITOR_H
 #define KINTERFACEDESIGNER_FORMEDITOR_H
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 /**Contains KInterfaceDesigner classes.*/
 namespace KInterfaceDesigner{
diff --git a/lib/interfaces/extras/Makefile.am b/lib/interfaces/extras/Makefile.am
index 49107f8f..a554ad30 100644
--- a/lib/interfaces/extras/Makefile.am
+++ b/lib/interfaces/extras/Makefile.am
@@ -12,7 +12,7 @@ libkdevextras_la_SOURCES = kdevcompileroptions.cpp kdevvcsintegrator.cpp
 servicetype_DATA = tdevelopcompileroptions.desktop \
 	tdevelopvcsintegrator.desktop
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces
 DOXYGEN_PROJECTNAME = TDevelop Extra Interfaces Library
 DOXYGEN_DOCDIRPREFIX = kdev
 include ../../../Doxyfile.am
diff --git a/lib/interfaces/kdevpartcontroller.h b/lib/interfaces/kdevpartcontroller.h
index 8c237bf3..0e24c8fc 100644
--- a/lib/interfaces/kdevpartcontroller.h
+++ b/lib/interfaces/kdevpartcontroller.h
@@ -26,7 +26,7 @@
 #define KDEV_PARTCONTROLLER_H
 
 #include <kurl.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
 #include <ktrader.h>
 
 /**
diff --git a/lib/util/CMakeLists.txt b/lib/util/CMakeLists.txt
index 378c4dca..1eb17f35 100644
--- a/lib/util/CMakeLists.txt
+++ b/lib/util/CMakeLists.txt
@@ -22,7 +22,7 @@ include_directories(
 
 install( FILES
     domutil.h execcommand.h filetemplate.h urlutil.h
-    configwidgetproxy.h rurl.h kscriptactionmanager.h
+    configwidgetproxy.h rurl.h tdescriptactionmanager.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/util )
 
 
@@ -33,6 +33,6 @@ tde_add_library( kdevutil STATIC_PIC AUTOMOC
     blockingkprocess.cpp configwidgetproxy.cpp
     domutil.cpp execcommand.cpp filetemplate.cpp
     kdeveditorutil.cpp kdevjobtimer.cpp
-    kdevshellwidget.cpp kscriptactionmanager.cpp
+    kdevshellwidget.cpp tdescriptactionmanager.cpp
     rurl.cpp settings.cpp urlutil.cpp
 )
diff --git a/lib/util/Makefile.am b/lib/util/Makefile.am
index 3a31f258..4dbaa33b 100644
--- a/lib/util/Makefile.am
+++ b/lib/util/Makefile.am
@@ -4,15 +4,15 @@ noinst_LTLIBRARIES = libkdevutil.la
 
 libkdevutil_la_SOURCES = blockingkprocess.cpp configwidgetproxy.cpp domutil.cpp \
 	execcommand.cpp filetemplate.cpp kdeveditorutil.cpp kdevjobtimer.cpp \
-	kdevshellwidget.cpp kscriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp
+	kdevshellwidget.cpp tdescriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp
 
 METASOURCES = AUTO
 
 tdevelopincludedir = $(includedir)/tdevelop/util
 tdevelopinclude_HEADERS = domutil.h execcommand.h filetemplate.h urlutil.h \
-	configwidgetproxy.h rurl.h kscriptactionmanager.h
+	configwidgetproxy.h rurl.h tdescriptactionmanager.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevextensions kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevextensions kdevinterfaces
 DOXYGEN_PROJECTNAME = KDevelop Utility Library
 DOXYGEN_DOCDIRPREFIX = kdev
 include ../../Doxyfile.am
diff --git a/lib/util/kdeveditorutil.cpp b/lib/util/kdeveditorutil.cpp
index 3c01f780..198e9a42 100644
--- a/lib/util/kdeveditorutil.cpp
+++ b/lib/util/kdeveditorutil.cpp
@@ -11,11 +11,11 @@
 
 #include "kdeveditorutil.h"
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/selectioninterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/selectioninterface.h>
 
 bool KDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * col, KTextEditor::Document * doc, KTextEditor::View * view )
 {
diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp
index b85bea80..b9220250 100644
--- a/lib/util/kdevshellwidget.cpp
+++ b/lib/util/kdevshellwidget.cpp
@@ -13,7 +13,7 @@
 #include <tqframe.h>
 
 #include <kdebug.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kde_terminal_interface.h>
 #include <kprocess.h>
diff --git a/lib/util/kscriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp
index 28756841..3b0aa8ac 100644
--- a/lib/util/kscriptactionmanager.cpp
+++ b/lib/util/tdescriptactionmanager.cpp
@@ -17,9 +17,9 @@
 *   Free Software Foundation, Inc.,                                       *
 *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
 ***************************************************************************/
-#include "kscriptactionmanager.h"
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
+#include "tdescriptactionmanager.h"
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
 #include <kapplication.h>
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
@@ -174,4 +174,4 @@ bool KScriptAction::isValid( ) const
   return m_isValid;
 }
 
-#include "kscriptactionmanager.moc"
+#include "tdescriptactionmanager.moc"
diff --git a/lib/util/kscriptactionmanager.h b/lib/util/tdescriptactionmanager.h
index c2e43238..c2e43238 100644
--- a/lib/util/kscriptactionmanager.h
+++ b/lib/util/tdescriptactionmanager.h
diff --git a/lib/widgets/CMakeLists.txt b/lib/widgets/CMakeLists.txt
index b819bc91..d7e92092 100644
--- a/lib/widgets/CMakeLists.txt
+++ b/lib/widgets/CMakeLists.txt
@@ -47,6 +47,6 @@ tde_add_library( kdevwidgets SHARED AUTOMOC
     processlinemaker.cpp processwidget.cpp ksavealldialog.cpp
     fancylistviewitem.cpp
   VERSION 0.0.0
-  LINK kio-shared khtml-shared
+  LINK kio-shared tdehtml-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index f42447e7..ecf57f7f 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -24,7 +24,7 @@ rcdir = $(kde_datadir)/tdevelop
 
 rc_DATA =  kdevhtml_partui.rc
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces
 DOXYGEN_PROJECTNAME = KDevelop Widgets Library
 DOXYGEN_DOCDIRPREFIX = kdev
 include ../../Doxyfile.am
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index abbeebbc..85990989 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -10,8 +10,8 @@
 #include <kpopupmenu.h>
 #include <kiconloader.h>
 #include <kmainwindow.h>
-#include <khtmlview.h>
-#include <khtml_settings.h>
+#include <tdehtmlview.h>
+#include <tdehtml_settings.h>
 #include <kconfig.h>
 
 #include <kdevmainwindow.h>
diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h
index 805134a0..13f155a5 100644
--- a/lib/widgets/kdevhtmlpart.h
+++ b/lib/widgets/kdevhtmlpart.h
@@ -5,7 +5,7 @@
 
 #include <tqdatetime.h>
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 /**
 @file kdevhtmlpart.h
diff --git a/lib/widgets/propeditor/Makefile.am b/lib/widgets/propeditor/Makefile.am
index 00bc07ca..0c037873 100644
--- a/lib/widgets/propeditor/Makefile.am
+++ b/lib/widgets/propeditor/Makefile.am
@@ -13,6 +13,6 @@ pcolorcombo.cpp    pdoublenuminput.cpp  ppixmapedit.cpp   propertylist.cpp    ps
 kdevpropeditorincludedir = $(includedir)/tdevelop/propeditor
 kdevpropeditorinclude_HEADERS = childproperty.h pcombobox.h pdummywidget.h ppointedit.h propertymachinefactory.h pcursoredit.h pfontbutton.h prectedit.h propertywidget.h pdateedit.h pfontcombo.h property.h psizeedit.h pdatetimeedit.h plineedit.h propertyeditor.h psizepolicyedit.h pdoublenuminput.h ppixmapedit.h propertylist.h pspinbox.h propertywidgetproxy.h multiproperty.h pyesnobutton.h purledit.h psymbolcombo.h pstringlistedit.h pcolorcombo.h pcolorbutton.h pcheckbox.h plinestyleedit.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils
 DOXYGEN_PROJECTNAME = KDevelop Property Editing Library
 include ../../../Doxyfile.am
diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp
index 5aeeb62c..3abe3b09 100644
--- a/parts/abbrev/abbrevpart.cpp
+++ b/parts/abbrev/abbrevpart.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kstandarddirs.h>
 #include <kdevgenericfactory.h>
 #include <kaction.h>
@@ -31,10 +31,10 @@
 #include <kiconloader.h>
 #include <kdevplugininfo.h>
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 
 #include "kdevcore.h"
 #include "kdevpartcontroller.h"
diff --git a/parts/abbrev/abbrevpart.h b/parts/abbrev/abbrevpart.h
index db2833fc..5fb37e97 100644
--- a/parts/abbrev/abbrevpart.h
+++ b/parts/abbrev/abbrevpart.h
@@ -20,7 +20,7 @@
 #include <tqptrlist.h>
 #include "kdevplugin.h"
 
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 
 class KDialogBase;
 
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index d9725ba4..11552b27 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -51,7 +51,7 @@
 #include <kpopupmenu.h>
 
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kio/netaccess.h>
 #include <tqfile.h>
 #include <kmacroexpander.h>
diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh
index 3506ead3..f5fb19b4 100644
--- a/parts/appwizard/common/incadmin/ltmain.sh
+++ b/parts/appwizard/common/incadmin/ltmain.sh
@@ -7148,7 +7148,7 @@ EOF
 	  k=1
 
 	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	    output=${output_objdir}/${output_la}.lnkscript
+	    output=${output_objdir}/${output_la}.lntdescript
 	    func_verbose "creating GNU ld script: $output"
 	    $ECHO 'INPUT (' > $output
 	    for obj in $save_libobjs
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index c0d05a77..34b5422c 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -34,7 +34,7 @@
 #include <kfile.h>
 #include <kurlrequester.h>
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kprocess.h>
 
 #include "kdevcore.h"
diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp
index 620315d3..18675ad5 100644
--- a/parts/astyle/astyle_part.cpp
+++ b/parts/astyle/astyle_part.cpp
@@ -10,12 +10,12 @@
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kparts/part.h>
-#include <kparts/partmanager.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/selectioninterface.h>
+#include <tdeparts/part.h>
+#include <tdeparts/partmanager.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/selectioninterface.h>
 #include <kprogress.h>
 #include <kdevcore.h>
 #include <kdevapi.h>
diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h
index 3bc36ff2..eed15022 100644
--- a/parts/astyle/astyle_part.h
+++ b/parts/astyle/astyle_part.h
@@ -9,7 +9,7 @@
 class KDialogBase;
 #include <kdevsourceformatter.h>
 #include <kaction.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdevplugin.h>
 #include <kdebug.h>
 #include <tqmap.h>
diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp
index 965b359b..733d2010 100644
--- a/parts/bookmarks/bookmarks_part.cpp
+++ b/parts/bookmarks/bookmarks_part.cpp
@@ -19,9 +19,9 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdevgenericfactory.h>
-#include <ktexteditor/markinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/markinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
 #include <kaction.h>
 #include <kdialogbase.h>
 
diff --git a/parts/bookmarks/bookmarks_part.h b/parts/bookmarks/bookmarks_part.h
index 311f66f8..f51603d7 100644
--- a/parts/bookmarks/bookmarks_part.h
+++ b/parts/bookmarks/bookmarks_part.h
@@ -19,7 +19,7 @@
 #include <tqdict.h>
 #include <tqpair.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kurl.h>
 
 #include <kdevplugin.h>
diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp
index e4fb531c..a5eec6a3 100644
--- a/parts/bookmarks/bookmarks_widget.cpp
+++ b/parts/bookmarks/bookmarks_widget.cpp
@@ -15,7 +15,7 @@
 #include <tqpair.h>
 #include <tqstylesheet.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp
index 649db134..a30f6158 100644
--- a/parts/classview/classviewpart.cpp
+++ b/parts/classview/classviewpart.cpp
@@ -50,12 +50,12 @@
 
 #include "klistviewaction.h"
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/clipboardinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/clipboardinterface.h>
 
 
 class FunctionCompletion : public CustomCompleter {
diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp
index 5379119c..b24917df 100644
--- a/parts/classview/navigator.cpp
+++ b/parts/classview/navigator.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
 
 #include <kcomboview.h>
 #include <klistviewaction.h>
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index 3b9d2768..fef1372e 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -19,10 +19,10 @@
 #include <klistview.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kparts/part.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <kstringhandler.h>
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 97adaf4f..2f899828 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -22,8 +22,8 @@
 #include <kprocess.h>
 #include <kio/jobclasses.h>
 #include <kio/job.h>
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index 681c09d1..539108e1 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -25,8 +25,8 @@
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 
-#include <kparts/componentfactory.h>
-#include <kparts/part.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/part.h>
 
 #include <kio/jobclasses.h>
 #include <kio/job.h>
diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp
index 90f66120..40d482b5 100644
--- a/parts/distpart/distpart_widget.cpp
+++ b/parts/distpart/distpart_widget.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "distpart_widget.h"
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/parts/documentation/CMakeLists.txt b/parts/documentation/CMakeLists.txt
index 0fa6cdca..accc3401 100644
--- a/parts/documentation/CMakeLists.txt
+++ b/parts/documentation/CMakeLists.txt
@@ -53,6 +53,6 @@ tde_add_kpart( libkdevdocumentation AUTOMOC
     docprojectconfigwidget.cpp KDevDocumentationIface.cpp
     KDevDocumentationIface.skel addcatalogdlgbase.ui
     addcatalogdlg.cpp
-  LINK documentation_interfaces-shared tdevelop-shared khtml-shared
+  LINK documentation_interfaces-shared tdevelop-shared tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp
index 6ee782ee..0ca74f43 100644
--- a/parts/documentation/bookmarkview.cpp
+++ b/parts/documentation/bookmarkview.cpp
@@ -30,8 +30,8 @@
 #include <kpushbutton.h>
 #include <kurlrequester.h>
 #include <kpopupmenu.h>
-#include <kparts/part.h>
-#include <khtml_part.h>
+#include <tdeparts/part.h>
+#include <tdehtml_part.h>
 #include <dom/html_document.h>
 
 #include <kdevpartcontroller.h>
diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp
index 0b04548d..21fc1b5b 100644
--- a/parts/documentation/docglobalconfigwidget.cpp
+++ b/parts/documentation/docglobalconfigwidget.cpp
@@ -35,8 +35,8 @@
 #include <kapplication.h>
 #include <kurlrequester.h>
 #include <kfontcombo.h>
-#include <khtml_part.h>
-#include <khtml_settings.h>
+#include <tdehtml_part.h>
+#include <tdehtml_settings.h>
 
 #include "kdevdocumentationplugin.h"
 #include "kdevpartcontroller.h"
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 32b08323..77b4e6b2 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <ktrader.h>
 #include <kdebug.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kservice.h>
 #include <kdialogbase.h>
 #include <kaction.h>
@@ -46,7 +46,7 @@
 #include <kstringhandler.h>
 #include <kconfig.h>
 #include <twin.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/document.h>
 
 #include "kdevplugininfo.h"
 #include "kdevcore.h"
diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp
index 84d8eada..567237e2 100644
--- a/parts/documentation/documentation_widget.cpp
+++ b/parts/documentation/documentation_widget.cpp
@@ -23,7 +23,7 @@
 #include <tqtoolbox.h>
 
 #include <klineedit.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <klocale.h>
diff --git a/parts/documentation/interfaces/Makefile.am b/parts/documentation/interfaces/Makefile.am
index 93f5e7a0..6e66b46c 100644
--- a/parts/documentation/interfaces/Makefile.am
+++ b/parts/documentation/interfaces/Makefile.am
@@ -10,7 +10,7 @@ partincludedir_HEADERS = kdevdocumentationplugin.h
 servicetypedir = $(kde_servicetypesdir)
 servicetype_DATA = tdevelopdocumentationplugins.desktop
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces
 DOXYGEN_PROJECTNAME = KDevelop Documentation Part Interfaces Library
 DOXYGEN_DOCDIRPREFIX = kdevdoc
 include ../../../Doxyfile.am
diff --git a/parts/documentation/protocols/chm/Makefile.am b/parts/documentation/protocols/chm/Makefile.am
index eba29efd..d68f20bd 100644
--- a/parts/documentation/protocols/chm/Makefile.am
+++ b/parts/documentation/protocols/chm/Makefile.am
@@ -9,7 +9,7 @@ kio_chm_la_LIBADD = $(LIB_KIO)
 kio_chm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 libkchmpart_la_SOURCES = kchmpart.cpp
-libkchmpart_la_LIBADD = -lkhtml $(LIB_KPARTS) $(top_builddir)/lib/widgets/libkdevwidgets.la
+libkchmpart_la_LIBADD = -ltdehtml $(LIB_KPARTS) $(top_builddir)/lib/widgets/libkdevwidgets.la
 libkchmpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
 noinst_HEADERS = chm.h chmfile.h decompress.h kchmpart.h
diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h
index 1ec2eaf8..f8779d75 100644
--- a/parts/documentation/protocols/chm/kchmpart.h
+++ b/parts/documentation/protocols/chm/kchmpart.h
@@ -17,10 +17,10 @@
 #ifndef __kchmpart_h__
 #define __kchmpart_h__
 
-#include <kparts/factory.h>
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
-#include <khtml_part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdehtml_part.h>
 #include <kio/job.h>
 #include <kio/jobclasses.h>
 #include <kdevhtmlpart.h>
diff --git a/parts/documentation/tools/htdig/Makefile.am b/parts/documentation/tools/htdig/Makefile.am
index b46c07e7..303ff645 100644
--- a/parts/documentation/tools/htdig/Makefile.am
+++ b/parts/documentation/tools/htdig/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 METASOURCES = AUTO
 bin_PROGRAMS =  tdevelop-htdig
-tdevelop_htdig_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+tdevelop_htdig_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 tdevelop_htdig_SOURCES = htdigindex.cpp
 noinst_HEADERS =  htdigindex.h
diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp
index f267fec9..50c916f2 100644
--- a/parts/doxygen/doxygenpart.cpp
+++ b/parts/doxygen/doxygenpart.cpp
@@ -31,10 +31,10 @@
 #include <kaction.h>
 #include <kmessagebox.h>
 #include <kmainwindow.h>
-#include <kparts/part.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
 #include <partcontroller.h>
 #include <kdialogbase.h>
 #include <kdevplugininfo.h>
diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp
index f2d67f25..59ec1a33 100644
--- a/parts/filecreate/filecreate_widget2.cpp
+++ b/parts/filecreate/filecreate_widget2.cpp
@@ -12,7 +12,7 @@
 #include <tqtimer.h>
 #include <tqwhatsthis.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp
index 5d307bff..2bc308b6 100644
--- a/parts/filecreate/filecreate_widget3.cpp
+++ b/parts/filecreate/filecreate_widget3.cpp
@@ -12,7 +12,7 @@
 #include <tqptrlist.h>
 #include <tqwhatsthis.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp
index 4898440d..93769573 100644
--- a/parts/filelist/filelist_widget.cpp
+++ b/parts/filelist/filelist_widget.cpp
@@ -14,7 +14,7 @@
 #include <tqheader.h>
 #include <tqpixmap.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp
index 45d186ae..62cae2b0 100644
--- a/parts/filelist/projectviewpart.cpp
+++ b/parts/filelist/projectviewpart.cpp
@@ -43,9 +43,9 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/encodinginterface.h>
-#include <kparts/part.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/encodinginterface.h>
+#include <tdeparts/part.h>
 #include <kxmlguibuilder.h>
 #include <kdebug.h>
 #include <kconfig.h>
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index d2d8ffff..cfa72b6c 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -48,7 +48,7 @@
 #include <tqdockarea.h>
 #include <tqtimer.h>
 
-#include <ktexteditor/document.h>
+#include <tdetexteditor/document.h>
 
 #include <kmainwindow.h>
 #include <kapplication.h>
diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp
index 496dc197..aa10c559 100644
--- a/parts/filter/filterpart.cpp
+++ b/parts/filter/filterpart.cpp
@@ -14,10 +14,10 @@
 #include <kaction.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
 
 #include "kdevcore.h"
 #include "kdevpartcontroller.h"
diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp
index bc6948fd..e792b04b 100644
--- a/parts/grepview/grepdlg.cpp
+++ b/parts/grepview/grepdlg.cpp
@@ -33,7 +33,7 @@
 #include <kurlcompletion.h>
 #include <kurlrequester.h>
 #include <kstdguiitem.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdevpartcontroller.h>
 #include <klineedit.h>
 
diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp
index 11ffbd77..7b2822ec 100644
--- a/parts/grepview/grepviewpart.cpp
+++ b/parts/grepview/grepviewpart.cpp
@@ -21,7 +21,7 @@
 #include <kiconloader.h>
 #include <kprocess.h>
 #include <kstringhandler.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/document.h>
 
 #include "kdevcore.h"
 #include "kdevpartcontroller.h"
diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp
index 43981f6d..65ddf9e3 100644
--- a/parts/grepview/grepviewwidget.cpp
+++ b/parts/grepview/grepviewwidget.cpp
@@ -17,8 +17,8 @@
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kprocess.h>
-#include <kparts/part.h>
-#include <ktexteditor/selectioninterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/selectioninterface.h>
 #include <kaction.h>
 #include <kpopupmenu.h>
 #include <ktabwidget.h>
diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp
index 8c9e517b..a9f84bb6 100644
--- a/parts/konsole/konsoleviewwidget.cpp
+++ b/parts/konsole/konsoleviewwidget.cpp
@@ -13,7 +13,7 @@
 #include <tqframe.h>
 #include <tqdir.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
index 5bdb2cd9..5e1e92bc 100644
--- a/parts/outputviews/appoutputviewpart.cpp
+++ b/parts/outputviews/appoutputviewpart.cpp
@@ -17,7 +17,7 @@
 #include <klocale.h>
 #include <kaction.h>
 #include <kiconloader.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <kapplication.h>
diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp
index 5c8e7c6c..a1b1cb70 100644
--- a/parts/outputviews/makeactionfilter.cpp
+++ b/parts/outputviews/makeactionfilter.cpp
@@ -234,7 +234,7 @@ void MakeActionFilter::test()
 		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libkfilereplacepart.la.closure libkfilereplacepart_la_closure.lo "
 		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib  -version-info 1:0:0 kfilereplacepart.lo kfilereplacedoc.lo "
 		"kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo "
-		"klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml",
+		"klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -ltdeparts -ltdehtml",
 		"linking", "libtool", "libkfilereplacepart.la.closure")
 	<< TestItem( //libtool, linking 3
 		"/bin/sh ../libtool --silent --mode=link --tag=CXX g++  -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic "
@@ -242,7 +242,7 @@ void MakeActionFilter::test()
 		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libkfilereplacepart.la -rpath /opt/trinity/lib/trinity "
 		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib  -version-info 1:0:0 kfilereplacepart.lo "
 		"kfilereplacedoc.lo kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo "
-		"kfilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml",
+		"kfilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -ltdeparts -ltdehtml",
 		"linking", "libtool", "libkfilereplacepart.la")
 	<< TestItem( //automake, builddir!=srcdir, libtool=no, compiling
 		" g++ -DHAVE_CONFIG_H -I. -I/home/andris/cvs-developement/head/quanta/quanta/project "
diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp
index e6ae4609..e9d53ab1 100644
--- a/parts/outputviews/makeitem.cpp
+++ b/parts/outputviews/makeitem.cpp
@@ -16,7 +16,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-#include "ktexteditor/cursorinterface.h"
+#include "tdetexteditor/cursorinterface.h"
 
 MakeItem::MakeItem()
 {
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index ad106ef0..07204c8c 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -17,9 +17,9 @@
 #include "processlinemaker.h"
 #include "makeviewpart.h"
 #include "makeitem.h"
-#include "ktexteditor/document.h"
-#include "ktexteditor/cursorinterface.h"
-#include "ktexteditor/editinterface.h"
+#include "tdetexteditor/document.h"
+#include "tdetexteditor/cursorinterface.h"
+#include "tdetexteditor/editinterface.h"
 #include "urlutil.h"
 
 #include <kdebug.h>
diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp
index 04f19c8d..cd95f64a 100644
--- a/parts/quickopen/quickopen_part.cpp
+++ b/parts/quickopen/quickopen_part.cpp
@@ -32,8 +32,8 @@
 
 #include <kmainwindow.h>
 
-#include <kparts/part.h>
-#include <ktexteditor/document.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/document.h>
 
 #include <kdevmainwindow.h>
 #include <kdevcore.h>
diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp
index ecc201b4..95988bde 100644
--- a/parts/regexptest/regexptestdlg.cpp
+++ b/parts/regexptest/regexptestdlg.cpp
@@ -26,10 +26,10 @@
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
-#include <kparts/part.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 
 #include "kdevplugin.h"
diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp
index b24949ab..a677b292 100644
--- a/parts/replace/replace_widget.cpp
+++ b/parts/replace/replace_widget.cpp
@@ -13,19 +13,19 @@
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
 #include <klibloader.h>
 #include <ktrader.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kdebug.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/editor.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/selectioninterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/editor.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/selectioninterface.h>
 #include <kdevpartcontroller.h>
 #include <kdevcore.h>
 #include <kdevmainwindow.h>
diff --git a/parts/replace/replace_widget.h b/parts/replace/replace_widget.h
index 227f8775..c9063928 100644
--- a/parts/replace/replace_widget.h
+++ b/parts/replace/replace_widget.h
@@ -12,7 +12,7 @@
 #ifndef __REPLACE_WIDGET_H__
 #define __REPLACE_WIDGET_H__
 
-#include <ktexteditor/editinterface.h>
+#include <tdetexteditor/editinterface.h>
 
 #include <tqwidget.h>
 #include <tqstring.h>
diff --git a/parts/replace/replacedlgimpl.cpp b/parts/replace/replacedlgimpl.cpp
index 0ee78577..87432791 100644
--- a/parts/replace/replacedlgimpl.cpp
+++ b/parts/replace/replacedlgimpl.cpp
@@ -5,7 +5,7 @@
 #include <tqlabel.h>
 
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 #include <kurlrequester.h>
 #include <kurlcompletion.h>
diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
index f12625f8..35b0f9b0 100644
--- a/parts/scripting/scriptingpart.cpp
+++ b/parts/scripting/scriptingpart.cpp
@@ -38,7 +38,7 @@
 #include <kapplication.h>
 #include <kconfig.h>
 #include "scriptingglobalconfig.h"
-#include "kscriptactionmanager.h"
+#include "tdescriptactionmanager.h"
 
 typedef KDevGenericFactory<scriptingPart> scriptingFactory;
 KDevPluginInfo data("kdevscripting");
diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index 1cf8a398..8e54fd75 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -6,7 +6,7 @@
  *  Copyright: See COPYING file that comes with this distribution
  */
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
@@ -19,10 +19,10 @@
 #include <ktextedit.h>
 #include <kmessagebox.h>
 #include <tqsplitter.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/editor.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/editor.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/document.h>
 #include <kconfig.h>
 #include <tqtooltip.h>
 #include <kpopupmenu.h>
diff --git a/parts/snippet/snippet_widget.h b/parts/snippet/snippet_widget.h
index 1a0ef8c1..29bb1dc9 100644
--- a/parts/snippet/snippet_widget.h
+++ b/parts/snippet/snippet_widget.h
@@ -15,8 +15,8 @@
 #include <tqtooltip.h>
 #include <tqrect.h>
 
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/view.h>
 #include "snippetconfig.h"
 
 class KDevProject;
diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp
index deb88ff3..0450782f 100644
--- a/parts/texttools/texttoolspart.cpp
+++ b/parts/texttools/texttoolspart.cpp
@@ -16,7 +16,7 @@
 #include <klocale.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
-#include <ktexteditor/editinterface.h>
+#include <tdetexteditor/editinterface.h>
 
 #include "kdevpartcontroller.h"
 #include "kdevmainwindow.h"
diff --git a/parts/texttools/texttoolspart.h b/parts/texttools/texttoolspart.h
index 46f9b7cc..5ebee704 100644
--- a/parts/texttools/texttoolspart.h
+++ b/parts/texttools/texttoolspart.h
@@ -13,7 +13,7 @@
 #define _TEXTTOOLSPART_H_
 
 #include <tqguardedptr.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include "kdevplugin.h"
 
 class TextToolsWidget;
diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp
index a358fb07..f655511f 100644
--- a/parts/texttools/texttoolswidget.cpp
+++ b/parts/texttools/texttoolswidget.cpp
@@ -16,11 +16,11 @@
 #include <tqtimer.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kpopupmenu.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/editinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/editinterface.h>
 
 #include "kdevmainwindow.h"
 #include "kdevpartcontroller.h"
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp
index edf89043..287e5b40 100644
--- a/parts/tools/kapplicationtree.cpp
+++ b/parts/tools/kapplicationtree.cpp
@@ -53,7 +53,7 @@
 #include <kmimetype.h>
 #include <kservicegroup.h>
 #include <klistview.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 #include <kdebug.h>
 
 #include "kapplicationtree.h"
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index b414fbbb..b35ac551 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -15,9 +15,9 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kprocess.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/document.h>
 
 #include "kdevcore.h"
 #include "kdevproject.h"
diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp
index 074a2c38..e3d36291 100644
--- a/parts/valgrind/valgrind_widget.cpp
+++ b/parts/valgrind/valgrind_widget.cpp
@@ -2,7 +2,7 @@
 #include <tqpainter.h>
 #include <tqpopupmenu.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index 701fcbb1..4cf58098 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ libkdevshell_la_LDFLAGS = $(all_libraries) -ltdevelop -L../lib/.libs -L../lib/in
 libkdevshell_la_LIBADD = \
 	$(top_builddir)/src/profileengine/lib/libprofileengine.la $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la \
-	$(top_builddir)/src/newui/libd.la $(LIB_KHTML) -lktexteditor -L../lib/interfaces/external/.libs -lkinterfacedesigner
+	$(top_builddir)/src/newui/libd.la $(LIB_KHTML) -ltdetexteditor -L../lib/interfaces/external/.libs -lkinterfacedesigner
 libkdevshell_la_SOURCES = api.cpp core.cpp documentationpart.cpp \
 	editorproxy.cpp generalinfowidget.cpp generalinfowidgetbase.ui languageselectwidget.cpp \
 	mainwindowshare.cpp mimewarningdialog.ui multibuffer.cpp partcontroller.cpp \
@@ -24,7 +24,7 @@ bin_PROGRAMS = tdevelop kdevassistant
 tdevelop_SOURCES = main.cpp kdevideextension.cpp settingswidget.ui
 
 tdevelop_METASOURCES = AUTO
-tdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner
+tdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner
 tdevelop_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner
 
 rcdir = $(kde_datadir)/tdevelop
@@ -35,7 +35,7 @@ tdevelopdatadir = $(kde_confdir)
 tdevelopdata_DATA = tdeveloprc kdevassistantrc
 
 SUBDIRS = profiles profileengine newui kconf_update
-kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner
+kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner
 kdevassistant_SOURCES = main_assistant.cpp kdevassistantextension.cpp
 kdevassistant_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner
 
@@ -48,7 +48,7 @@ shellinclude_HEADERS = api.h core.h documentationpart.h editorproxy.h \
 	statusbar.h toplevel.h generalinfowidgetbase.h mimewarningdialog.h settingswidget.h \
 	simplemainwindow.h multibuffer.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces kdevextensions
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions
 DOXYGEN_PROJECTNAME = KDevelop Generic Shell
 DOXYGEN_DOCDIRPREFIX = kdevshell
 include ../Doxyfile.am
diff --git a/src/core.h b/src/core.h
index 2588e232..b30549ca 100644
--- a/src/core.h
+++ b/src/core.h
@@ -4,7 +4,7 @@
 #include <tqregexp.h>
 #include <kxmlguiclient.h>
 
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
 
 
 #include "kdevcore.h"
diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp
index 34860c26..55861014 100644
--- a/src/editorproxy.cpp
+++ b/src/editorproxy.cpp
@@ -7,15 +7,15 @@
 #include <kconfig.h>
 #include <kapplication.h>
 
-#include <kparts/part.h>
-
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/popupmenuinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/view.h>
+#include <tdeparts/part.h>
+
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/popupmenuinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/view.h>
 #include <kxmlguiclient.h>
 #include <kxmlguifactory.h>
 #include <kmainwindow.h>
@@ -115,7 +115,7 @@ void EditorProxy::installPopup( KParts::Part * part )
 		{
 			KTextEditor::View * view = static_cast<KTextEditor::View*>( part->widget() );
 
-			TQPopupMenu * popup = static_cast<TQPopupMenu*>( part->factory()->container("ktexteditor_popup", view ) );
+			TQPopupMenu * popup = static_cast<TQPopupMenu*>( part->factory()->container("tdetexteditor_popup", view ) );
 
 			if (!popup)
 			{
@@ -225,7 +225,7 @@ void EditorProxy::showPopup( )
 		if ( iface )
 		{
 			KTextEditor::View * view = static_cast<KTextEditor::View*>( part->widget() );
-			TQPopupMenu * popup = static_cast<TQPopupMenu*>( view->factory()->container("ktexteditor_popup", view ) );
+			TQPopupMenu * popup = static_cast<TQPopupMenu*>( view->factory()->container("tdetexteditor_popup", view ) );
 
 			if ( popup )
 			{
diff --git a/src/editorproxy.h b/src/editorproxy.h
index d71d4cda..7cbd9ec9 100644
--- a/src/editorproxy.h
+++ b/src/editorproxy.h
@@ -10,10 +10,10 @@ class TQPopupMenu;
 class MultiBuffer;
 class TQTimer;
 
-#include <kparts/part.h>
-#include <ktexteditor/markinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/markinterface.h>
 #include <tdeversion.h>
-# include <ktexteditor/markinterfaceextension.h>
+# include <tdetexteditor/markinterfaceextension.h>
 
 class EditorProxy : public TQObject
 {
diff --git a/src/kconf_update/Makefile.am b/src/kconf_update/Makefile.am
index 7b072c71..e7317f2b 100644
--- a/src/kconf_update/Makefile.am
+++ b/src/kconf_update/Makefile.am
@@ -11,7 +11,7 @@ kconf_PROGRAMS = kdev-gen-settings-kconf_update
 kconfdir = $(libdir)/kconf_update_bin
 
 kdev_gen_settings_kconf_update_SOURCES = kdev-gen-settings-kconf_update.cpp
-kdev_gen_settings_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kdev_gen_settings_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kdev_gen_settings_kconf_update_LDADD   = $(LIB_QT)
 
 # vim: set noet:
diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp
index 1d67217b..d03fffed 100644
--- a/src/mainwindowshare.cpp
+++ b/src/mainwindowshare.cpp
@@ -29,7 +29,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kstatusbar.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 #include <kdialogbase.h>
 #include <kconfig.h>
 #include <kkeydialog.h>
@@ -40,10 +40,10 @@
 #include <kpopupmenu.h>
 #include <kiconloader.h>
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/configinterface.h>
-#include <kparts/partmanager.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/configinterface.h>
+#include <tdeparts/partmanager.h>
 #include <tdeversion.h>
 #include <kdebug.h>
 #include <knotifydialog.h>
diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp
index 87707e84..403eee1a 100644
--- a/src/multibuffer.cpp
+++ b/src/multibuffer.cpp
@@ -23,7 +23,7 @@
 // doesn't need to be rearchitected for multiple views before the lazy view
 // creation can go in
 #define protected public
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #undef protected
 
 #include "multibuffer.h"
@@ -39,11 +39,11 @@
 #include <kmainwindow.h>
 #include <kapplication.h>
 
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
 
-#include <ktexteditor/view.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/viewcursorinterface.h>
 
 MultiBuffer::MultiBuffer( TQWidget *parent )
         : TQSplitter( parent, "MultiBuffer" ),
diff --git a/src/newui/CMakeLists.txt b/src/newui/CMakeLists.txt
index 046c2c7f..b1f89a56 100644
--- a/src/newui/CMakeLists.txt
+++ b/src/newui/CMakeLists.txt
@@ -22,7 +22,7 @@ tde_add_library( d SHARED AUTOMOC
   SOURCES
     dmainwindow.cpp buttonbar.cpp button.cpp ddockwindow.cpp
     docksplitter.cpp dtabwidget.cpp
-  LINK kparts-shared tdecore-shared tdeui-shared
+  LINK tdeparts-shared tdecore-shared tdeui-shared
   VERSION 0.0.0
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/src/newui/dmainwindow.h b/src/newui/dmainwindow.h
index 2f1c2ed5..37caa50d 100644
--- a/src/newui/dmainwindow.h
+++ b/src/newui/dmainwindow.h
@@ -21,7 +21,7 @@
 #define DMAINWINDOW_H
 
 #include <kxmlguiclient.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 #include "ddockwindow.h"
 
diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp
index 0bd2e404..ab13eff5 100644
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@@ -19,16 +19,16 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kparts/part.h>
-#include <kparts/factory.h>
-#include <kparts/partmanager.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/partmanager.h>
+#include <tdeparts/browserextension.h>
 #include <kfiledialog.h>
 #include <kmainwindow.h>
 #include <kaction.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kpopupmenu.h>
 #include <kio/netaccess.h>
 #include <kdialogbase.h>
@@ -42,10 +42,10 @@
 #include <kencodingfiledialog.h>
 #include <ksqueezedtextlabel.h>
 
-#include <ktexteditor/view.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/encodinginterface.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/encodinginterface.h>
 
 #include "toplevel.h"
 #include "api.h"
diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp
index e598b456..18440daa 100644
--- a/src/plugincontroller.cpp
+++ b/src/plugincontroller.cpp
@@ -10,7 +10,7 @@
 #include <kconfig.h>
 #include <klocale.h>
 #include <kmainwindow.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <assert.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/src/profileengine/lib/Makefile.am b/src/profileengine/lib/Makefile.am
index 4bbdbbf5..5a37fdf5 100644
--- a/src/profileengine/lib/Makefile.am
+++ b/src/profileengine/lib/Makefile.am
@@ -10,7 +10,7 @@ libprofileengine_la_SOURCES = profileengine.cpp profile.cpp
 profileincludedir = $(includedir)/tdevelop/shell/profileengine
 profileinclude_HEADERS = profileengine.h profile.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces
 DOXYGEN_PROJECTNAME = KDevelop Shell Profiles Library
 DOXYGEN_DOCDIRPREFIX = kdevprofiles
 include ../../../Doxyfile.am
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index bd4ee23e..dffe9b92 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -17,7 +17,7 @@ class TQDomDocument;
 #include <ktrader.h>
 #include <kfiledialog.h>
 #include <kmainwindow.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
diff --git a/src/projectsession.cpp b/src/projectsession.cpp
index 84626536..0448521c 100644
--- a/src/projectsession.cpp
+++ b/src/projectsession.cpp
@@ -20,14 +20,14 @@
 #include <tqfile.h>
 #include <tqtimer.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kinstance.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/encodinginterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/encodinginterface.h>
 
 #include "api.h"
 #include "partcontroller.h"
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index 6c733c5e..3f685c3c 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -23,15 +23,15 @@
 
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kpopupmenu.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kedittoolbar.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/document.h>
 #include <kapplication.h>
 #include <kurldrag.h>
 #include <kconfig.h>
diff --git a/src/statusbar.cpp b/src/statusbar.cpp
index ff1502bc..08a5cab2 100644
--- a/src/statusbar.cpp
+++ b/src/statusbar.cpp
@@ -18,11 +18,11 @@
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
-#include <kparts/part.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/viewcursorinterface.h>
 #include <tdeversion.h>
 
-#include <ktexteditor/viewstatusmsginterface.h>
+#include <tdetexteditor/viewstatusmsginterface.h>
 
 #include "statusbar.h"
 #include "partcontroller.h"
diff --git a/vcs/cvsservice/CMakeLists.txt b/vcs/cvsservice/CMakeLists.txt
index b02db663..dc50d646 100644
--- a/vcs/cvsservice/CMakeLists.txt
+++ b/vcs/cvsservice/CMakeLists.txt
@@ -53,6 +53,6 @@ tde_add_kpart( libkdevcvsservice AUTOMOC
     annotatepage.cpp annotateview.cpp
   LINK
     kdevextensions-static kdevwidgets-shared tdevelop-shared
-    cvsservice khtml-shared
+    cvsservice tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp
index 9df91a9b..89854b1b 100644
--- a/vcs/cvsservice/cvspart.cpp
+++ b/vcs/cvsservice/cvspart.cpp
@@ -36,7 +36,7 @@
 #include <cvsservice_stub.h>
 #include <cvsjob_stub.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdevpartcontroller.h>
 #include <kdevgenericfactory.h>
 
diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp
index d4a2dc55..fae85d9d 100644
--- a/vcs/cvsservice/diffwidget.cpp
+++ b/vcs/cvsservice/diffwidget.cpp
@@ -25,8 +25,8 @@
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 
-#include <kparts/componentfactory.h>
-#include <kparts/part.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/part.h>
 
 #include <kio/jobclasses.h>
 #include <kio/job.h>
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index 06d55ec9..45ea039b 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <kaction.h>
 #include <kurl.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include "kdevpartcontroller.h"
 #include "kdevcore.h"
diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp
index 4a647b34..9f517c07 100644
--- a/vcs/subversion/subversion_core.cpp
+++ b/vcs/subversion/subversion_core.cpp
@@ -17,7 +17,7 @@
 	 Boston, MA 02110-1301, USA.
 	 */
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdevcore.h>
 #include <kdevproject.h>
 #include "subversion_part.h"
diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
index af58f7c8..7c41c29b 100644
--- a/vcs/subversion/subversion_part.cpp
+++ b/vcs/subversion/subversion_part.cpp
@@ -42,7 +42,7 @@
 #include "urlutil.h"
 #include <tqvbox.h>
 #include <kdialogbase.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdevpartcontroller.h>
 #include <kdevproject.h>
 #include <domutil.h>
diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp
index 0f66a844..e635d600 100644
--- a/vcs/subversion/subversion_widget.cpp
+++ b/vcs/subversion/subversion_widget.cpp
@@ -17,7 +17,7 @@
 	 Boston, MA 02110-1301, USA.
 	 */
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdevcore.h>
 #include <kdebug.h>
 #include <klineedit.h>