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

1350 files changed, 4137 insertions, 4137 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f20b54c41..7a1f952dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -932,11 +932,11 @@ add_subdirectory( tdecore )
 if( WITH_ELFICON )
   add_subdirectory( tdelfeditor )
 endif( WITH_ELFICON )
-add_subdirectory( kunittest )
+add_subdirectory( tdeunittest )
 add_subdirectory( tdeui )
 add_subdirectory( tdesu )
 add_subdirectory( kjs )
-add_subdirectory( kwallet )
+add_subdirectory( tdewallet )
 add_subdirectory( kio )
 add_subdirectory( kded )
 
@@ -945,34 +945,34 @@ add_subdirectory( kded )
 
 add_subdirectory( kdoctools )
 add_subdirectory( doc )
-add_subdirectory( kparts )
-add_subdirectory( kutils )
-add_subdirectory( kspell2 )
-add_subdirectory( kmdi )
+add_subdirectory( tdeparts )
+add_subdirectory( tdeutils )
+add_subdirectory( tdespell2 )
+add_subdirectory( tdemdi )
 add_subdirectory( kinit )
 add_subdirectory( tdeprint )
 add_subdirectory( kab )
-add_subdirectory( kresources )
+add_subdirectory( tderesources )
 add_subdirectory( kabc )
 add_subdirectory( arts )
 add_subdirectory( interfaces )
 add_subdirectory( kate )
-add_subdirectory( kcert )
+add_subdirectory( tdecert )
 if( XRANDR_FOUND )
-  add_subdirectory( krandr )
+  add_subdirectory( tderandr )
 endif( XRANDR_FOUND )
-add_subdirectory( khtml )
+add_subdirectory( tdehtml )
 add_subdirectory( kcmshell )
 add_subdirectory( kconf_update )
 add_subdirectory( kdewidgets )
 add_subdirectory( kimgio )
 add_subdirectory( kioslave )
 add_subdirectory( kstyles )
-add_subdirectory( libkmid )
-add_subdirectory( libkscreensaver )
+add_subdirectory( libtdemid )
+add_subdirectory( libtdescreensaver )
 add_subdirectory( networkstatus )
 add_subdirectory( knewstuff )
-add_subdirectory( krsync )
+add_subdirectory( tdersync )
 add_subdirectory( licenses )
 add_subdirectory( dnssd )
 add_subdirectory( pics )
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index f23a2443b..c373e83f5 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -28,7 +28,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
 <LI><A HREF="#KHelpMenu">KHelpMenu</A></LI>
 <LI><A HREF="#KToolBar">KToolBar</A></LI>
 <LI><A HREF="#launching">Starting other programs</A></LI>
-<LI><A HREF="#khtmlw">khtmlw</A></LI>
+<LI><A HREF="#tdehtmlw">tdehtmlw</A></LI>
 <LI><A HREF="#KIntegerLine">KIntegerLine, KIntLineEdit</A></LI>
 <LI><A HREF="#KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h</A></LI>
 <LI><A HREF="#TDEConfigBase">TDEConfigBase, TDEConfig, KSimpleConfig</A></LI>
@@ -347,9 +347,9 @@ This makes KRun the recommended way to run another program in KDE 2.
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="khtmlw">khtmlw</A></H3>
+<H3><A NAME="tdehtmlw">tdehtmlw</A></H3>
 
-khtmlw has been replaced with khtml.<BR>
+tdehtmlw has been replaced with tdehtml.<BR>
 <UL>
 	<LI>KHTMLView has vanished. Just use KHTMLWidget, which does scrollbar
   managing for free.
@@ -361,7 +361,7 @@ khtmlw has been replaced with khtml.<BR>
 	w-&gt;openURL(myURL);
   </PRE>
 
-	<LI>khtml uses QString's instead of char *'s now. This means, that most
+	<LI>tdehtml uses QString's instead of char *'s now. This means, that most
   of the api has changed. In all functions:<P>
   <PRE>
      const char * -&gt; QString
@@ -406,7 +406,7 @@ khtmlw has been replaced with khtml.<BR>
 </TR>
 </TABLE><P>
 
-<LI>Don't forget to change the link-flags! (-lkhtml -lkjava instead of -lkhtmlw)
+<LI>Don't forget to change the link-flags! (-ltdehtml -lkjava instead of -ltdehtmlw)
 </UL>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index aa16c489a..645bd7612 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -20,9 +20,9 @@ or <a href="http://doc.trolltech.com/3.0/porting.html">this page online</a>.<P>
 <LI><A HREF="#tdecore">Changes in tdecore</A></LI>
 <LI><A HREF="#tdeui">Changes in tdeui</A></LI>
 <LI><A HREF="#kio">Changes in kio</A></LI>
-<LI><A HREF="#kparts">Changes in kparts</A></LI>
-<LI><A HREF="#kspell">Changes in kspell</A></LI>
-<LI><A HREF="#khtmlpart">API-cleanup in KHTML</A></LI>
+<LI><A HREF="#tdeparts">Changes in tdeparts</A></LI>
+<LI><A HREF="#tdespell">Changes in tdespell</A></LI>
+<LI><A HREF="#tdehtmlpart">API-cleanup in KHTML</A></LI>
 <LI><A HREF="#kfile">Changes in kfile</A></LI>
 <LI><A HREF="#kcontrol">TDE Control Center</A></LI>
 <LI><A HREF="#kicker">Panel Applets and Extensions</A></LI>
@@ -416,7 +416,7 @@ TQString&) is not a slot anymore.
 
 <H4>KOpenWithHandler / KFileOpenWithHandler</H4>
 Those two classes are deprecated, no need to create a KFileOpenWithHandler anymore.
-The merging of libkio, libksycoca, libkfile and libkssl into a single libkio has
+The merging of libkio, libtdesycoca, libkfile and libkssl into a single libkio has
 allowed to fix this dependency problem: KRun can now use the OpenWith dialog directly.
 
 <H4>KMimeType, KService</H4>
@@ -440,7 +440,7 @@ The createFilterDevice method is deprecated. Use deviceForFile instead.
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="kparts">Changes in kparts</A></H3>
+<H3><A NAME="tdeparts">Changes in tdeparts</A></H3>
 
 <H4>KParts::Factory</H4>
 The createPart method is no more virtual and the createPartObject method
@@ -468,7 +468,7 @@ setURLArgs does the job.
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="kspell">Changes in kspell</A></H3>
+<H3><A NAME="tdespell">Changes in tdespell</A></H3>
 
 <H4>KSpell</H4>
 The API has been cleaned up to be in line with the rest of tdelibs, in particular:
@@ -495,7 +495,7 @@ The API has been cleaned up to be in line with the rest of tdelibs, in particula
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="khtmlpart">API-cleanups in KHTML</A></H3>
+<H3><A NAME="tdehtmlpart">API-cleanups in KHTML</A></H3>
 
 There were a few relatively minor API-adjustements in KHTMLPart. In particular:
 <ul><li>enableJScript(bool) has been replaced by setJScriptEnabled(bool)
diff --git a/Mainpage.dox b/Mainpage.dox
index f1d31fae9..ef5745224 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -14,8 +14,8 @@
 	* - <a target="_top" href="tdeui/html/index.html"><b>tdeui</b></a>
         *   (<a target="_top" href="tdeui/html/classes.html">classes</a>)\n
 	*   <i>Trinity User interface classes such as widgets.</i>
-	* - <a target="_top" href="khtml/html/index.html"><b>khtml</b></a>
-        *   (<a target="_top" href="khtml/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tdehtml/html/index.html"><b>tdehtml</b></a>
+        *   (<a target="_top" href="tdehtml/html/classes.html">classes</a>)\n
 	*   <i>The Trinity HTML component.</i>
 	* - <a target="_top" href="kjs/html/index.html"><b>kjs</b></a>
         *   (<a target="_top" href="kjs/html/classes.html">classes</a>)\n
@@ -24,8 +24,8 @@
         *   (<a target="_top" href="kio/kio/html/classes.html">classes</a>)\n
 	*   <i>Low level access to network files. Also provides access to facilities
 	*   such as KDirWatcher which monitors directories for changes.</i>
-	* - <a target="_top" href="kparts/html/index.html"><b>kparts</b></a>
-        *   (<a target="_top" href="kparts/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tdeparts/html/index.html"><b>tdeparts</b></a>
+        *   (<a target="_top" href="tdeparts/html/classes.html">classes</a>)\n
 	*   <i>Support for re-usable, embeddable, extendable applications.</i>
 	* - <a target="_top" href="dcop/html/index.html"><b>dcop</b></a>
         *   (<a target="_top" href="dcop/html/classes.html">classes</a>)\n
@@ -33,17 +33,17 @@
 	* - <a target="_top" href="tdefx/html/index.html"><b>tdefx</b></a>
         *   (<a target="_top" href="tdefx/html/classes.html">classes</a>)\n
 	*   <i>A library with pixmap effects.</i>
-	* - <a target="_top" href="kmdi/html/index.html"><b>kmdi</b></a>
-        *   (<a target="_top" href="kmdi/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tdemdi/html/index.html"><b>tdemdi</b></a>
+        *   (<a target="_top" href="tdemdi/html/classes.html">classes</a>)\n
 	*   <i>MultiDocument Interface library.</i>
-	* - <a target="_top" href="libkmid/html/index.html"><b>libkmid</b></a>
-        *   (<a target="_top" href="libkmid/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="libtdemid/html/index.html"><b>libtdemid</b></a>
+        *   (<a target="_top" href="libtdemid/html/classes.html">classes</a>)\n
 	*   <i>Midi library.</i>
 	* - <a target="_top" href="tdeprint/html/index.html"><b>tdeprint</b></a>
         *   (<a target="_top" href="tdeprint/html/classes.html">classes</a>)\n
 	*   <i>High level  printer control functionality.</i>
-	* - <a target="_top" href="krandr/html/index.html"><b>krandr</b></a>
-        *   (<a target="_top" href="krandr/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tderandr/html/index.html"><b>tderandr</b></a>
+        *   (<a target="_top" href="tderandr/html/classes.html">classes</a>)\n
 	*   <i>High level Xorg configuration via XRandr.</i>
 	* - <a target="_top" href="interfaces/html/index.html"><b>interfaces</b></a>
         *   (<a target="_top" href="interfaces/html/classes.html">classes</a>)\n
@@ -52,11 +52,11 @@
 	* - <a target="_top" href="kabc/html/index.html"><b>kabc</b></a>
         *   (<a target="_top" href="kabc/html/classes.html">classes</a>)\n
 	*   <i>Access to the Trinity address book.</i>
-	* - <a target="_top" href="kresources/html/index.html"><b>kresources</b></a>
-        *   (<a target="_top" href="kresources/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tderesources/html/index.html"><b>tderesources</b></a>
+        *   (<a target="_top" href="tderesources/html/classes.html">classes</a>)\n
 	*   <i>The Trinity resources system.</i>
-	* - <a target="_top" href="kutils/html/index.html"><b>kutils</b></a>
-        *   (<a target="_top" href="kutils/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tdeutils/html/index.html"><b>tdeutils</b></a>
+        *   (<a target="_top" href="tdeutils/html/classes.html">classes</a>)\n
 	*   <i>High-level utils, like search/replace support.</i>
 	* - <a target="_top" href="arts/html/index.html"><b>arts</b></a>
         *   (<a target="_top" href="arts/html/classes.html">classes</a>)\n
@@ -67,8 +67,8 @@
 	* - <a target="_top" href="dnssd/html/index.html"><b>dnssd</b></a>
         *   (<a target="_top" href="dnssd/html/classes.html">classes</a>)\n
 	*   <i>Network sevices publishing and discovery.</i>
-	* - <a target="_top" href="kunittest/html/index.html"><b>kunittest</b></a>
-        *   (<a target="_top" href="kunittest/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tdeunittest/html/index.html"><b>tdeunittest</b></a>
+        *   (<a target="_top" href="tdeunittest/html/classes.html">classes</a>)\n
 	*   <i>Unit testing framework in Trinity.</i>
 
 	*
diff --git a/Makefile.am.in b/Makefile.am.in
index 5690f976a..10e9219dd 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -18,17 +18,17 @@
 #    Boston, MA 02110-1301, USA.
 
 
-COMPILE_FIRST = dcop libltdl tdefx tdecore kunittest tdeui tdesu kjs kwallet kio kded kded_post
+COMPILE_FIRST = dcop libltdl tdefx tdecore tdeunittest tdeui tdesu kjs tdewallet kio kded kded_post
 COMPILE_BEFORE_doc = kdoctools
-COMPILE_AFTER_kparts = kspell2 kmdi tdeprint kinit kate interfaces kcert khtml krandr
-COMPILE_AFTER_tdeprint = kate khtml
-COMPILE_BEFORE_khtml = kutils
-COMPILE_BEFORE_kabc = kab kresources
-COMPILE_BEFORE_kate = interfaces kutils
-COMPILE_BEFORE_kmdi = kutils
-COMPILE_BEFORE_kspell2 = kutils
-COMPILE_BEFORE_kcmshell = kutils
-COMPILE_BEFORE_kdewidgets = kabc khtml
+COMPILE_AFTER_tdeparts = tdespell2 tdemdi tdeprint kinit kate interfaces tdecert tdehtml tderandr
+COMPILE_AFTER_tdeprint = kate tdehtml
+COMPILE_BEFORE_tdehtml = tdeutils
+COMPILE_BEFORE_kabc = kab tderesources
+COMPILE_BEFORE_kate = interfaces tdeutils
+COMPILE_BEFORE_tdemdi = tdeutils
+COMPILE_BEFORE_tdespell2 = tdeutils
+COMPILE_BEFORE_kcmshell = tdeutils
+COMPILE_BEFORE_kdewidgets = kabc tdehtml
 COMPILE_BEFORE_interfaces = arts kabc
 
 $(top_srcdir)/acinclude.m4: $(top_srcdir)/libltdl/ltdl.m4
@@ -54,7 +54,7 @@ messages:
 	find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
 	find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
 	echo ./tdecore/tde-config.cpp.in >> files ;\
-	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
+	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_tdednssd.kcfg > rc.cpp; \
 	: > kde.pot ;\
 	$(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/tdelibs.pot
 	$(XGETTEXT) common_texts.cpp -o kde.pot
diff --git a/README b/README
index bf87f3d51..1392e27c5 100644
--- a/README
+++ b/README
@@ -27,7 +27,7 @@ Here is an alphabetical list:
     communicate with KDE applications. It's also the base for KParts.
 
 * interfaces
-    kparts interface for text editors, mediaplayer and scripting.
+    tdeparts interface for text editors, mediaplayer and scripting.
 
 * kab
     OBSOLETE, see kabc: Used to be the address book library, but now only
@@ -39,7 +39,7 @@ Here is an alphabetical list:
 * kate
     KPart for 'kate', the KDE advanced text editor.
 
-* kcert
+* tdecert
     Personal certification manager.
 
 * kconf_update
@@ -73,7 +73,7 @@ Here is an alphabetical list:
     Contains mostly stuff convert XML docbook files via XSLT into
     human readable stuff.
 
-* khtml
+* tdehtml
     The next generation HTML rendering widget designed for Konqueror.  This
     supports HTML 4, CSS, and a variety of other web related standards.
 
@@ -86,7 +86,7 @@ Here is an alphabetical list:
 
 * kio
     Classes that fetch and decode URLs are contained here. This library also
-    contains "ksycoca", the system configure cache containing services,
+    contains "tdesycoca", the system configure cache containing services,
     applications, servicetypes and mimetypes.
 
 * kioslave
@@ -95,21 +95,21 @@ Here is an alphabetical list:
 * kjs
     Implementation of ECMAScript (aka JavaScript).
 
-* kparts
+* tdeparts
     KDE component model.
 
 * kstyles
     The theme engine lies within. It handles nearly anything relating to
     customizing the appearance of widgets.
 
-* kwallet
+* tdewallet
     Client and backend to store values in encrypted files.
 
-* libkmid
+* libtdemid
     MIDI file handling and midi mapper (manages output of midi files to
     various devices).
 
-* libkscreensaver
+* libtdescreensaver
     Library for making KDE screensavers.
 
 * libltdl
diff --git a/TODO b/TODO
index 57dd5a13c..dcbfec292 100644
--- a/TODO
+++ b/TODO
@@ -152,7 +152,7 @@ that we would like to make for the next binary incompatible release.
   - merge KProcIO into TDEProcess; add setBuffered() for separate channels.
   - use QByteArray for writeStdin(). better than the buf+len arg, as it is ref-counted.
 
-- To discuss: Migrate the about dialog to use qhtml or khtml rather then the current
+- To discuss: Migrate the about dialog to use qhtml or tdehtml rather then the current
   setup of all of the widgets and sub widgets.  Might be a lot simpler, require a lot
   less code and be much more flexible for additions/enhancments.  Sidenote: currently
   the about information seems to be duplicated.
@@ -180,7 +180,7 @@ that we would like to make for the next binary incompatible release.
 
 - KWallet::Wallet::* functions - remove the default = 0 argument for mainwindow for the dialog
 
-- Make libkwalletclient part of libkio and get rid of libkwalletclient.
+- Make libtdewalletclient part of libkio and get rid of libtdewalletclient.
 
 - Get rid of libtdesu dependency in libkio, get rid of SessionData::AuthData*,
   get rid of SlaveInterface::authorizationKey and SlaveInterface::delAuthorization
diff --git a/arts/knotify/Makefile.am b/arts/knotify/Makefile.am
index 115eed4b8..970b75055 100644
--- a/arts/knotify/Makefile.am
+++ b/arts/knotify/Makefile.am
@@ -15,7 +15,7 @@ knotify_la_METASOURCES = AUTO
 check_PROGRAMS		= knotifytest
 knotifytest_SOURCES	= knotifytest.cpp
 knotifytest_LDADD	= $(LIB_TDECORE)
-knotifytest_LDFLAGS	= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+knotifytest_LDFLAGS	= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 noinst_HEADERS	=  knotify.h
 
diff --git a/configure.in.in b/configure.in.in
index 2fe0ee86e..c899ee519 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -255,12 +255,12 @@ AC_SUBST(LIB_TDEUI, '$(top_builddir)/tdeui/libtdeui.la')
 AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la')
 AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la')
 AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la')
-AC_SUBST(LIB_KHTML, '$(top_builddir)/khtml/libkhtml.la')
+AC_SUBST(LIB_KHTML, '$(top_builddir)/tdehtml/libtdehtml.la')
 AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
-AC_SUBST(LIB_KPARTS, '$(top_builddir)/kparts/libkparts.la')
+AC_SUBST(LIB_KPARTS, '$(top_builddir)/tdeparts/libtdeparts.la')
 AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la')
 AC_SUBST(LIB_KNEWSTUFF, '$(top_builddir)/knewstuff/libknewstuff.la')
-AC_SUBST(LIB_KUNITTEST, '$(top_builddir)/kunittest/libkunittest.la')
+AC_SUBST(LIB_KUNITTEST, '$(top_builddir)/tdeunittest/libtdeunittest.la')
 case $host in 
 	*cygwin*) lib_kded='$(top_builddir)/kded/libtdeinit_kded.la' ;;
 	*) lib_kded='' ;;
diff --git a/dcop/Makefile.am b/dcop/Makefile.am
index d59b75cdb..57ce71786 100644
--- a/dcop/Makefile.am
+++ b/dcop/Makefile.am
@@ -50,15 +50,15 @@ dcopserver_la_LIBADD  = libDCOP.la $(LIB_QT)
 
 dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
 
-testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testdcop_SOURCES = testdcop.cpp
 testdcop_LDADD = libDCOP.la
 
-dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp
 dcop_deadlock_test_LDADD = ../tdecore/libtdecore.la
 
-testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testdcopc_SOURCES = testdcopc.c dcopc.c
 testdcopc_LDADD =  KDE-ICE/libkICE.la $(LIBSM)
 
diff --git a/dcop/testdcop.cpp b/dcop/testdcop.cpp
index 5e4cd00c7..1e70171d2 100644
--- a/dcop/testdcop.cpp
+++ b/dcop/testdcop.cpp
@@ -258,12 +258,12 @@ int main(int argc, char **argv)
 	foundApp.data(), foundObj.data());
 
   // Find an object called "object1" in any application.
-  boolResult = client->findObject( "", "ksycoca", "", data, foundApp, foundObj);
+  boolResult = client->findObject( "", "tdesycoca", "", data, foundApp, foundObj);
   tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
 	foundApp.data(), foundObj.data());
 
   // Find ourselves in any application.
-  boolResult = client->findObject( "testdcop", "ksycoca", "", data, foundApp, foundObj);
+  boolResult = client->findObject( "testdcop", "tdesycoca", "", data, foundApp, foundObj);
   tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
 	foundApp.data(), foundObj.data());
 
diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt
index 3df24100b..09d96161d 100644
--- a/dnssd/CMakeLists.txt
+++ b/dnssd/CMakeLists.txt
@@ -31,9 +31,9 @@ install( FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}/dnssd )
 
 
-##### kdnssd ####################################
+##### tdednssd ####################################
 
-set( target kdnssd )
+set( target tdednssd )
 
 set( ${target}_SRCS
   remoteservice.cpp responder.cpp servicebase.cpp
diff --git a/dnssd/Makefile.am b/dnssd/Makefile.am
index c24bdd6ba..25e749d72 100644
--- a/dnssd/Makefile.am
+++ b/dnssd/Makefile.am
@@ -7,16 +7,16 @@ noinst_HEADERS = sdevent.h
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 
-lib_LTLIBRARIES =  libkdnssd.la
+lib_LTLIBRARIES =  libtdednssd.la
 
-libkdnssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \
+libtdednssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \
 				settings.kcfgc publicservice.cpp query.cpp domainbrowser.cpp servicebrowser.cpp
 dnssdincludedir = $(includedir)/dnssd
 dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
 	publicservice.h servicebase.h servicebrowser.h settings.h
-libkdnssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
-libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
+libtdednssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
+libtdednssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
 
-#kde_kcfg_DATA = kcm_kdnssd.kcfg
+#kde_kcfg_DATA = kcm_tdednssd.kcfg
 
 include ../admin/Doxyfile.am
diff --git a/dnssd/README b/dnssd/README
index ffceb8ce9..304a7babb 100644
--- a/dnssd/README
+++ b/dnssd/README
@@ -1,7 +1,7 @@
 Checklist to ensure that zeroconf will work:
 
 1) Install Avahi, at least version 0.3
-2) compile kdnssd-avahi and install it to replace 'stub' libkdnssd.so provided by tdelibs
+2) compile tdednssd-avahi and install it to replace 'stub' libtdednssd.so provided by tdelibs
 3) check /etc/nsswitch.conf and ensure that there is 'mdns' before 'dns' in
 line starting with 'host:'. It should be something like:
 host: files mdns dns
diff --git a/dnssd/kcm_kdnssd.kcfg b/dnssd/kcm_tdednssd.kcfg
index 207ab608c..19cefaafa 100644
--- a/dnssd/kcm_kdnssd.kcfg
+++ b/dnssd/kcm_tdednssd.kcfg
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="kdnssdrc" />
+ <kcfgfile name="tdednssdrc" />
  <group name="browsing" >
   <entry key="DomainList" type="StringList" >
    <label>Additional domains for browsing</label>
diff --git a/dnssd/settings.kcfgc b/dnssd/settings.kcfgc
index 63764fc57..b8454f94b 100644
--- a/dnssd/settings.kcfgc
+++ b/dnssd/settings.kcfgc
@@ -1,5 +1,5 @@
 ClassName=Configuration
-File=kcm_kdnssd.kcfg
+File=kcm_tdednssd.kcfg
 GlobalEnums=false
 Inherits=TDEConfigSkeleton
 ItemAccessors=false
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index f4dc993cf..88a718243 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -10,4 +10,4 @@
 #################################################
 
 add_subdirectory( common )
-add_subdirectory( kspell )
+add_subdirectory( tdespell )
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0531835d1..dd51718e7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,3 @@
 
-SUBDIRS = common kspell tdelibs
+SUBDIRS = common tdespell tdelibs
 
diff --git a/doc/tdelibs/man-kbuildsycoca.8.docbook b/doc/tdelibs/man-kbuildsycoca.8.docbook
index 1b34c896f..670c000c0 100644
--- a/doc/tdelibs/man-kbuildsycoca.8.docbook
+++ b/doc/tdelibs/man-kbuildsycoca.8.docbook
@@ -204,7 +204,7 @@ installations</para>
 <refsect1>
 <title>See Also</title>
 
-<para>ksycoca(3), kblah(4), knogga(6)</para>
+<para>tdesycoca(3), kblah(4), knogga(6)</para>
 
 </refsect1>
 
diff --git a/doc/kspell/CMakeLists.txt b/doc/tdespell/CMakeLists.txt
index 94bc7cff5..6e2539833 100644
--- a/doc/kspell/CMakeLists.txt
+++ b/doc/tdespell/CMakeLists.txt
@@ -9,5 +9,5 @@
 #
 #################################################
 
-tde_create_handbook( SRCDIR ${CMAKE_SOURCE_DIR}/kdoctools DESTINATION kspell )
-add_dependencies( kspell-en-handbook meinproc )
+tde_create_handbook( SRCDIR ${CMAKE_SOURCE_DIR}/kdoctools DESTINATION tdespell )
+add_dependencies( tdespell-en-handbook meinproc )
diff --git a/doc/kspell/Makefile.am b/doc/tdespell/Makefile.am
index ea6c9c3a4..ea6c9c3a4 100644
--- a/doc/kspell/Makefile.am
+++ b/doc/tdespell/Makefile.am
diff --git a/doc/kspell/index.docbook b/doc/tdespell/index.docbook
index e42ba8a73..8942b7ffc 100644
--- a/doc/kspell/index.docbook
+++ b/doc/tdespell/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&kspell;">
+  <!ENTITY kappname "&tdespell;">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
   <!ENTITY % addindex "IGNORE">
 ]>
@@ -8,7 +8,7 @@
 <book lang="&language;">
 
 <bookinfo>
-<title>The &kspell; Handbook</title>
+<title>The &tdespell; Handbook</title>
 
 <authorgroup>
 <author>&David.Sweet; &David.Sweet.mail;</author>
@@ -20,14 +20,14 @@
 <date>2003-02-24</date>
 <releaseinfo>1.00.00</releaseinfo>
 <abstract>
-<para>&kspell; is the spelling checker used by &tde; applications such
+<para>&tdespell; is the spelling checker used by &tde; applications such
 as &kate;, &kmail;, and &kword;. It is a &GUI; frontend to <application>International ISpell</application> and <application>ASpell</application>.</para>
 
 </abstract>
 <keywordset>
 <keyword>spell</keyword>
 <keyword>spelling</keyword>
-<keyword>kspell</keyword>
+<keyword>tdespell</keyword>
 <keyword>ispell</keyword>
 <keyword>aspell</keyword>
 <keyword>check</keyword>
@@ -52,7 +52,7 @@ url="http://aspell.sourceforge.net/">ASpell home page</ulink>.)
 
 <para><anchor id="spelldlg"/>
 The top line in the dialog displays a possibly misspelled word which was found in your
-document. &kspell; attempts to find an appropriate replacement word. One or
+document. &tdespell; attempts to find an appropriate replacement word. One or
 several may be found. The best guess is shown to the right of <guilabel>Replacement:</guilabel>.
 To accept this replacement, click on <guibutton>Replace</guibutton>. You may also select a word
 from the list of <guilabel>Suggestions</guilabel> and then click <guibutton>Replace</guibutton> to replace the
@@ -130,7 +130,7 @@ your dictionary's distribution for more information.</para>
 <title>Spell-checking client</title>
 
 <para>You may choose to use <application>Ispell</application> or <application>Aspell</application> as the spell-checking
-backend for &kspell;. <application>Ispell</application> is more widely available and may
+backend for &tdespell;. <application>Ispell</application> is more widely available and may
 have better international support, but <application>Aspell</application> is gaining
 popularity as it claims to give better suggestions for word replacements.</para>
 </sect1>
@@ -146,8 +146,8 @@ read the International <application>ISpell</application> man page.</para>
 <chapter id="contact-information">
 <title>Contact Information</title>
 
-<para>For more information about &kspell;, visit the <ulink url="http://www.chaos.umd.edu/~dsweet/KDE/KSpell">&kspell; 
-Home Page</ulink>. In particular, you will find information about programming the &kspell; C++ class.</para>
+<para>For more information about &tdespell;, visit the <ulink url="http://www.chaos.umd.edu/~dsweet/KDE/KSpell">&tdespell; 
+Home Page</ulink>. In particular, you will find information about programming the &tdespell; C++ class.</para>
 
 <para>You may email the author/maintainer with questions and/or comments at
 &David.Sweet.mail;.</para>
diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
index 99d359979..1fb53eca4 100644
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
@@ -9,12 +9,12 @@
 #
 #################################################
 
-add_subdirectory( ktexteditor )
-add_subdirectory( kscript )
+add_subdirectory( tdetexteditor )
+add_subdirectory( tdescript )
 add_subdirectory( kregexpeditor )
-add_subdirectory( kmediaplayer )
+add_subdirectory( tdemediaplayer )
 add_subdirectory( kio )
 add_subdirectory( terminal )
 add_subdirectory( khexedit )
-add_subdirectory( kimproxy )
+add_subdirectory( tdeimproxy )
 add_subdirectory( kspeech )
diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am
index 583a7055d..e5eedaf90 100644
--- a/interfaces/Makefile.am
+++ b/interfaces/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = ktexteditor kscript kregexpeditor kmediaplayer kio terminal khexedit kimproxy kspeech
+SUBDIRS = tdetexteditor tdescript kregexpeditor tdemediaplayer kio terminal khexedit tdeimproxy kspeech
 
-DOXYGEN_REFERENCES = tdecore tdefx tdeui kparts dcop
+DOXYGEN_REFERENCES = tdecore tdefx tdeui tdeparts dcop
 DOXYGEN_SET_RECURSIVE = YES
 include ../admin/Doxyfile.am
diff --git a/interfaces/khexedit/Makefile.am b/interfaces/khexedit/Makefile.am
index e2eb8a472..f5f3f23d0 100644
--- a/interfaces/khexedit/Makefile.am
+++ b/interfaces/khexedit/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES= -I$(top_srcdir)/kparts $(all_includes)
+INCLUDES= -I$(top_srcdir)/tdeparts $(all_includes)
 
 # the service type
 servicetypedir = $(kde_servicetypesdir)
diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h
index ae23721ae..3bc5749d2 100644
--- a/interfaces/khexedit/byteseditinterface.h
+++ b/interfaces/khexedit/byteseditinterface.h
@@ -19,7 +19,7 @@
 #define BYTESEDITINTERFACE_H
 
 // kde specific
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <tqwidget.h>
 
diff --git a/interfaces/kimproxy/library/Makefile.am b/interfaces/kimproxy/library/Makefile.am
deleted file mode 100644
index 94f2974ac..000000000
--- a/interfaces/kimproxy/library/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-SUBDIRS = icons
-
-INCLUDES = $(all_includes)
-
-noinst_HEADERS = kimproxyiface.h
-
-METASOURCES = AUTO
-
-AM_CPPFLAGS = $(all_includes)
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kimproxy.pot
-
-kimproxyincludedir = $(includedir)
-kimproxyinclude_HEADERS = kimproxy.h kimproxyiface.h
-
-lib_LTLIBRARIES =  libkimproxy.la
-libkimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
-libkimproxy_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI)
-libkimproxy_la_SOURCES = kimproxy.cpp kimiface.stub kimproxyiface.skel
-
-kimiface_DIR = $(top_srcdir)/interfaces/kimproxy/interface
-
-include $(top_srcdir)/admin/Doxyfile.am
-DOXYGEN_REFERENCES = kabc dcop
-
diff --git a/interfaces/kmediaplayer/Makefile.am b/interfaces/kmediaplayer/Makefile.am
deleted file mode 100644
index 5b26d844e..000000000
--- a/interfaces/kmediaplayer/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-if include_ARTS
-kfileaudiopreview_subdir = kfileaudiopreview
-endif
-
-SUBDIRS = . $(kfileaudiopreview_subdir)
-INCLUDES = -I$(srcdir)/.. $(all_includes)
-
-lib_LTLIBRARIES = libkmediaplayer.la
-
-libkmediaplayer_la_SOURCES = player.cpp playerdcopobject.skel view.cpp
-libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libkmediaplayer_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
-libkmediaplayer_la_METASOURCES = AUTO
-
-kmediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
-kmediaplayerincludedir = $(includedir)/kmediaplayer
-
-kde_servicetypes_DATA = kmediaplayerengine.desktop kmediaplayer.desktop
diff --git a/interfaces/kscript/Makefile.am b/interfaces/kscript/Makefile.am
deleted file mode 100644
index ede5f4fa0..000000000
--- a/interfaces/kscript/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-SUBDIRS = . sample
-
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes)
-
-#lib_LTLIBRARIES = libkscriptloader.la libkscript.la
-lib_LTLIBRARIES = libkscript.la
-#libkscriptloader_la_SOURCES = scriptloader.cpp
-#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-#libkscriptloader_la_LIBADD = $(LIB_KPARTS)
-
-libkscript_la_SOURCES = scriptmanager.cpp
-libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libkscript_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
-
-kscriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
-kscriptincludedir = $(includedir)
-
-METASOURCES = AUTO
-
-servicetypedir = $(kde_servicetypesdir)
-servicetype_DATA = scriptinterface.desktop
diff --git a/interfaces/kspeech/Makefile.am b/interfaces/kspeech/Makefile.am
index f8f2b936d..dc183251d 100644
--- a/interfaces/kspeech/Makefile.am
+++ b/interfaces/kspeech/Makefile.am
@@ -6,5 +6,5 @@ include_HEADERS = kspeech.h kspeechsink.h
 # Define DCOP/Text-to-Speech Service Type.
 kde_servicetypes_DATA = dcoptexttospeech.desktop
 
-DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts
+DOXYGEN_REFERENCES = tdecore dcop kio tdeui tdeparts
 include ../../admin/Doxyfile.am
diff --git a/interfaces/kspeech/kspeech.h b/interfaces/kspeech/kspeech.h
index 4780b169d..d24683517 100644
--- a/interfaces/kspeech/kspeech.h
+++ b/interfaces/kspeech/kspeech.h
@@ -186,7 +186,7 @@
  *
  * There are two methods of making DCOP calls from your application to %KTTSD.
  *
- *   - Manually code them using dcopClient object.  See tdebase/konqueror/kttsplugin/khtmlkttsd.cpp
+ *   - Manually code them using dcopClient object.  See tdebase/konqueror/kttsplugin/tdehtmlkttsd.cpp
  *     for an example.  This method is recommended if you want to make a few simple calls to KTTSD.
  *   - Use kspeech_stub as described below.  This method generates the marshalling code for you
  *     and is recommended for a more complex speech-enabled applications.  kcmkttsmgr in the
diff --git a/interfaces/kimproxy/CMakeLists.txt b/interfaces/tdeimproxy/CMakeLists.txt
index f52118353..f52118353 100644
--- a/interfaces/kimproxy/CMakeLists.txt
+++ b/interfaces/tdeimproxy/CMakeLists.txt
diff --git a/interfaces/kimproxy/Makefile.am b/interfaces/tdeimproxy/Makefile.am
index 105f84291..105f84291 100644
--- a/interfaces/kimproxy/Makefile.am
+++ b/interfaces/tdeimproxy/Makefile.am
diff --git a/interfaces/kimproxy/TODO b/interfaces/tdeimproxy/TODO
index fc66130fe..fc66130fe 100644
--- a/interfaces/kimproxy/TODO
+++ b/interfaces/tdeimproxy/TODO
diff --git a/interfaces/kimproxy/interface/CMakeLists.txt b/interfaces/tdeimproxy/interface/CMakeLists.txt
index d62819ed8..d62819ed8 100644
--- a/interfaces/kimproxy/interface/CMakeLists.txt
+++ b/interfaces/tdeimproxy/interface/CMakeLists.txt
diff --git a/interfaces/kimproxy/interface/Makefile.am b/interfaces/tdeimproxy/interface/Makefile.am
index 348130e46..348130e46 100644
--- a/interfaces/kimproxy/interface/Makefile.am
+++ b/interfaces/tdeimproxy/interface/Makefile.am
diff --git a/interfaces/kimproxy/interface/dcopinstantmessenger.desktop b/interfaces/tdeimproxy/interface/dcopinstantmessenger.desktop
index a69994421..a69994421 100644
--- a/interfaces/kimproxy/interface/dcopinstantmessenger.desktop
+++ b/interfaces/tdeimproxy/interface/dcopinstantmessenger.desktop
diff --git a/interfaces/kimproxy/interface/kcm_instantmessenger.desktop b/interfaces/tdeimproxy/interface/kcm_instantmessenger.desktop
index 860f82944..860f82944 100644
--- a/interfaces/kimproxy/interface/kcm_instantmessenger.desktop
+++ b/interfaces/tdeimproxy/interface/kcm_instantmessenger.desktop
diff --git a/interfaces/kimproxy/interface/kimiface.h b/interfaces/tdeimproxy/interface/kimiface.h
index f3212df6d..f3212df6d 100644
--- a/interfaces/kimproxy/interface/kimiface.h
+++ b/interfaces/tdeimproxy/interface/kimiface.h
diff --git a/interfaces/kimproxy/library/CMakeLists.txt b/interfaces/tdeimproxy/library/CMakeLists.txt
index 347e552a5..9aa1f60ee 100644
--- a/interfaces/kimproxy/library/CMakeLists.txt
+++ b/interfaces/tdeimproxy/library/CMakeLists.txt
@@ -29,17 +29,17 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    kimproxy.h kimproxyiface.h
+    tdeimproxy.h tdeimproxyiface.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
-##### kimproxy ##################################
+##### tdeimproxy ##################################
 
-set( target kimproxy )
+set( target tdeimproxy )
 
 set( ${target}_SRCS
-  kimproxy.cpp kimproxyiface.skel
-  ${CMAKE_SOURCE_DIR}/interfaces/kimproxy/interface/kimiface.stub
+  tdeimproxy.cpp tdeimproxyiface.skel
+  ${CMAKE_SOURCE_DIR}/interfaces/tdeimproxy/interface/kimiface.stub
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/interfaces/tdeimproxy/library/Makefile.am b/interfaces/tdeimproxy/library/Makefile.am
new file mode 100644
index 000000000..743b76424
--- /dev/null
+++ b/interfaces/tdeimproxy/library/Makefile.am
@@ -0,0 +1,26 @@
+SUBDIRS = icons
+
+INCLUDES = $(all_includes)
+
+noinst_HEADERS = tdeimproxyiface.h
+
+METASOURCES = AUTO
+
+AM_CPPFLAGS = $(all_includes)
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/tdeimproxy.pot
+
+tdeimproxyincludedir = $(includedir)
+tdeimproxyinclude_HEADERS = tdeimproxy.h tdeimproxyiface.h
+
+lib_LTLIBRARIES =  libtdeimproxy.la
+libtdeimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
+libtdeimproxy_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI)
+libtdeimproxy_la_SOURCES = tdeimproxy.cpp kimiface.stub tdeimproxyiface.skel
+
+kimiface_DIR = $(top_srcdir)/interfaces/tdeimproxy/interface
+
+include $(top_srcdir)/admin/Doxyfile.am
+DOXYGEN_REFERENCES = kabc dcop
+
diff --git a/interfaces/kimproxy/library/icons/CMakeLists.txt b/interfaces/tdeimproxy/library/icons/CMakeLists.txt
index ac95aa58c..ac95aa58c 100644
--- a/interfaces/kimproxy/library/icons/CMakeLists.txt
+++ b/interfaces/tdeimproxy/library/icons/CMakeLists.txt
diff --git a/interfaces/kimproxy/library/icons/Makefile.am b/interfaces/tdeimproxy/library/icons/Makefile.am
index a4b97f06a..a4b97f06a 100644
--- a/interfaces/kimproxy/library/icons/Makefile.am
+++ b/interfaces/tdeimproxy/library/icons/Makefile.am
diff --git a/interfaces/kimproxy/library/icons/cr16-action-presence_away.png b/interfaces/tdeimproxy/library/icons/cr16-action-presence_away.png
index f96a9c65f..f96a9c65f 100644
--- a/interfaces/kimproxy/library/icons/cr16-action-presence_away.png
+++ b/interfaces/tdeimproxy/library/icons/cr16-action-presence_away.png
diff --git a/interfaces/kimproxy/library/icons/cr16-action-presence_offline.png b/interfaces/tdeimproxy/library/icons/cr16-action-presence_offline.png
index f5c53d711..f5c53d711 100644
--- a/interfaces/kimproxy/library/icons/cr16-action-presence_offline.png
+++ b/interfaces/tdeimproxy/library/icons/cr16-action-presence_offline.png
diff --git a/interfaces/kimproxy/library/icons/cr16-action-presence_online.png b/interfaces/tdeimproxy/library/icons/cr16-action-presence_online.png
index 6cb52496b..6cb52496b 100644
--- a/interfaces/kimproxy/library/icons/cr16-action-presence_online.png
+++ b/interfaces/tdeimproxy/library/icons/cr16-action-presence_online.png
diff --git a/interfaces/kimproxy/library/icons/cr16-action-presence_unknown.png b/interfaces/tdeimproxy/library/icons/cr16-action-presence_unknown.png
index 290bc852a..290bc852a 100644
--- a/interfaces/kimproxy/library/icons/cr16-action-presence_unknown.png
+++ b/interfaces/tdeimproxy/library/icons/cr16-action-presence_unknown.png
diff --git a/interfaces/kimproxy/library/icons/cr32-action-presence_away.png b/interfaces/tdeimproxy/library/icons/cr32-action-presence_away.png
index 086184582..086184582 100644
--- a/interfaces/kimproxy/library/icons/cr32-action-presence_away.png
+++ b/interfaces/tdeimproxy/library/icons/cr32-action-presence_away.png
diff --git a/interfaces/kimproxy/library/icons/cr32-action-presence_offline.png b/interfaces/tdeimproxy/library/icons/cr32-action-presence_offline.png
index caadb14d4..caadb14d4 100644
--- a/interfaces/kimproxy/library/icons/cr32-action-presence_offline.png
+++ b/interfaces/tdeimproxy/library/icons/cr32-action-presence_offline.png
diff --git a/interfaces/kimproxy/library/icons/cr32-action-presence_online.png b/interfaces/tdeimproxy/library/icons/cr32-action-presence_online.png
index 41e79ad9d..41e79ad9d 100644
--- a/interfaces/kimproxy/library/icons/cr32-action-presence_online.png
+++ b/interfaces/tdeimproxy/library/icons/cr32-action-presence_online.png
diff --git a/interfaces/kimproxy/library/icons/cr32-action-presence_unknown.png b/interfaces/tdeimproxy/library/icons/cr32-action-presence_unknown.png
index 52ab79ed5..52ab79ed5 100644
--- a/interfaces/kimproxy/library/icons/cr32-action-presence_unknown.png
+++ b/interfaces/tdeimproxy/library/icons/cr32-action-presence_unknown.png
diff --git a/interfaces/kimproxy/library/icons/cr48-action-presence_away.png b/interfaces/tdeimproxy/library/icons/cr48-action-presence_away.png
index 58e62c1d3..58e62c1d3 100644
--- a/interfaces/kimproxy/library/icons/cr48-action-presence_away.png
+++ b/interfaces/tdeimproxy/library/icons/cr48-action-presence_away.png
diff --git a/interfaces/kimproxy/library/icons/cr48-action-presence_offline.png b/interfaces/tdeimproxy/library/icons/cr48-action-presence_offline.png
index b69630f33..b69630f33 100644
--- a/interfaces/kimproxy/library/icons/cr48-action-presence_offline.png
+++ b/interfaces/tdeimproxy/library/icons/cr48-action-presence_offline.png
diff --git a/interfaces/kimproxy/library/icons/cr48-action-presence_online.png b/interfaces/tdeimproxy/library/icons/cr48-action-presence_online.png
index 52fdad8f9..52fdad8f9 100644
--- a/interfaces/kimproxy/library/icons/cr48-action-presence_online.png
+++ b/interfaces/tdeimproxy/library/icons/cr48-action-presence_online.png
diff --git a/interfaces/kimproxy/library/kimproxy.cpp b/interfaces/tdeimproxy/library/tdeimproxy.cpp
index e8118b8bc..a65388974 100644
--- a/interfaces/kimproxy/library/kimproxy.cpp
+++ b/interfaces/tdeimproxy/library/tdeimproxy.cpp
@@ -1,5 +1,5 @@
 /*    
-	kimproxy.cpp
+	tdeimproxy.cpp
 	
 	IM service library for KDE
 	
@@ -35,7 +35,7 @@
 
 #include "kimiface_stub.h"
 
-#include "kimproxy.h"
+#include "tdeimproxy.h"
 
 static KStaticDeleter<KIMProxy> _staticDeleter;
 
@@ -650,4 +650,4 @@ TQString KIMProxy::preferredApp()
 	return preferredApp;
 }	
 
-#include "kimproxy.moc"
+#include "tdeimproxy.moc"
diff --git a/interfaces/kimproxy/library/kimproxy.h b/interfaces/tdeimproxy/library/tdeimproxy.h
index d4312b341..1a20c4b22 100644
--- a/interfaces/kimproxy/library/kimproxy.h
+++ b/interfaces/tdeimproxy/library/tdeimproxy.h
@@ -1,5 +1,5 @@
 /*
-    kimproxy.h
+    tdeimproxy.h
 
     IM service library for KDE
 
@@ -35,7 +35,7 @@
 #define IM_CLIENT_PREFERENCES_SECTION "InstantMessenger"
 #define IM_CLIENT_PREFERENCES_ENTRY "imClient"
 
-#include "kimproxyiface.h"
+#include "tdeimproxyiface.h"
 
 class DCOPClient;
 class KIMIface_stub;
diff --git a/interfaces/kimproxy/library/kimproxyiface.h b/interfaces/tdeimproxy/library/tdeimproxyiface.h
index fa11183c9..a7d416371 100644
--- a/interfaces/kimproxy/library/kimproxyiface.h
+++ b/interfaces/tdeimproxy/library/tdeimproxyiface.h
@@ -1,5 +1,5 @@
 /*    
-	kimproxyiface.cpp
+	tdeimproxyiface.cpp
 	
 	IM service library for KDE
 	
diff --git a/interfaces/kmediaplayer/CMakeLists.txt b/interfaces/tdemediaplayer/CMakeLists.txt
index 98346388c..00ab7f3d9 100644
--- a/interfaces/kmediaplayer/CMakeLists.txt
+++ b/interfaces/tdemediaplayer/CMakeLists.txt
@@ -33,19 +33,19 @@ link_directories(
 
 install( FILES
     player.h playerdcopobject.h view.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kmediaplayer )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdemediaplayer )
 
 
 ##### other data ################################
 
 install( FILES
-    kmediaplayerengine.desktop kmediaplayer.desktop
+    tdemediaplayerengine.desktop tdemediaplayer.desktop
   DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-##### kmediaplayer ##############################
+##### tdemediaplayer ##############################
 
-set( target kmediaplayer )
+set( target tdemediaplayer )
 
 set( ${target}_SRCS
   player.cpp view.cpp playerdcopobject.skel
@@ -54,7 +54,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${LIB_INSTALL_DIR}
   DEPENDENCIES dcopidl
 )
diff --git a/interfaces/tdemediaplayer/Makefile.am b/interfaces/tdemediaplayer/Makefile.am
new file mode 100644
index 000000000..0b7aded07
--- /dev/null
+++ b/interfaces/tdemediaplayer/Makefile.am
@@ -0,0 +1,18 @@
+if include_ARTS
+kfileaudiopreview_subdir = kfileaudiopreview
+endif
+
+SUBDIRS = . $(kfileaudiopreview_subdir)
+INCLUDES = -I$(srcdir)/.. $(all_includes)
+
+lib_LTLIBRARIES = libtdemediaplayer.la
+
+libtdemediaplayer_la_SOURCES = player.cpp playerdcopobject.skel view.cpp
+libtdemediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+libtdemediaplayer_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
+libtdemediaplayer_la_METASOURCES = AUTO
+
+tdemediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
+tdemediaplayerincludedir = $(includedir)/tdemediaplayer
+
+kde_servicetypes_DATA = tdemediaplayerengine.desktop tdemediaplayer.desktop
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt b/interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt
index 03237da87..17485b65a 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt
+++ b/interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt
@@ -41,6 +41,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kmediaplayer-shared artskde-shared
+  LINK tdemediaplayer-shared artskde-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am
index e4232cd78..4f88a0c87 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am
+++ b/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kfileaudiopreview.la
 
 kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp
 kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
-kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/kmediaplayer/libkmediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
+kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
 
 noinst_HEADERS = kfileaudiopreview.h
 
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
index 2998af9f5..1d83fc590 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
+++ b/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
@@ -9,9 +9,9 @@
 #include <kconfig.h>
 #include <klibloader.h>
 #include <klocale.h>
-#include <kmediaplayer/player.h>
+#include <tdemediaplayer/player.h>
 #include <kmimetype.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <kplayobjectfactory.h>
 
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h b/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h
index de48e4712..de48e4712 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h
+++ b/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h
diff --git a/interfaces/kmediaplayer/player.cpp b/interfaces/tdemediaplayer/player.cpp
index 681459731..2d97aa1f7 100644
--- a/interfaces/kmediaplayer/player.cpp
+++ b/interfaces/tdemediaplayer/player.cpp
@@ -21,7 +21,7 @@
 // used in advertising or otherwise to promote the sale, use or other dealings
 // in this Software without prior written authorization from the author(s).
 
-#include <kmediaplayer/player.h>
+#include <tdemediaplayer/player.h>
 
 KMediaPlayer::PlayerDCOPObject::PlayerDCOPObject(void)
 	: DCOPObject("KMediaPlayer")
diff --git a/interfaces/kmediaplayer/player.h b/interfaces/tdemediaplayer/player.h
index 10e9f4a74..493a921e3 100644
--- a/interfaces/kmediaplayer/player.h
+++ b/interfaces/tdemediaplayer/player.h
@@ -24,9 +24,9 @@
 #ifndef KMEDIAPLAYERPLAYER_H
 #define KMEDIAPLAYERPLAYER_H
 
-#include <kparts/part.h>
-#include <kmediaplayer/playerdcopobject.h>
-#include <kmediaplayer/view.h>
+#include <tdeparts/part.h>
+#include <tdemediaplayer/playerdcopobject.h>
+#include <tdemediaplayer/view.h>
 
 /** KMediaPlayer contains an interface to reusable media player components.
 */
diff --git a/interfaces/kmediaplayer/playerdcopobject.h b/interfaces/tdemediaplayer/playerdcopobject.h
index 73a1cfa1d..73a1cfa1d 100644
--- a/interfaces/kmediaplayer/playerdcopobject.h
+++ b/interfaces/tdemediaplayer/playerdcopobject.h
diff --git a/interfaces/kmediaplayer/kmediaplayer.desktop b/interfaces/tdemediaplayer/tdemediaplayer.desktop
index 85c1df65b..85c1df65b 100644
--- a/interfaces/kmediaplayer/kmediaplayer.desktop
+++ b/interfaces/tdemediaplayer/tdemediaplayer.desktop
diff --git a/interfaces/kmediaplayer/kmediaplayerengine.desktop b/interfaces/tdemediaplayer/tdemediaplayerengine.desktop
index ba7bf0403..ba7bf0403 100644
--- a/interfaces/kmediaplayer/kmediaplayerengine.desktop
+++ b/interfaces/tdemediaplayer/tdemediaplayerengine.desktop
diff --git a/interfaces/kmediaplayer/view.cpp b/interfaces/tdemediaplayer/view.cpp
index 64e3bf484..87d1d78a5 100644
--- a/interfaces/kmediaplayer/view.cpp
+++ b/interfaces/tdemediaplayer/view.cpp
@@ -21,7 +21,7 @@
 // used in advertising or otherwise to promote the sale, use or other dealings
 // in this Software without prior written authorization from the author(s).
 
-#include <kmediaplayer/view.h>
+#include <tdemediaplayer/view.h>
 
 struct KMediaPlayer::View::Data
 {
diff --git a/interfaces/kmediaplayer/view.h b/interfaces/tdemediaplayer/view.h
index c1d9dbe41..c1d9dbe41 100644
--- a/interfaces/kmediaplayer/view.h
+++ b/interfaces/tdemediaplayer/view.h
diff --git a/interfaces/kscript/CMakeLists.txt b/interfaces/tdescript/CMakeLists.txt
index 233dc1c49..bcddb1068 100644
--- a/interfaces/kscript/CMakeLists.txt
+++ b/interfaces/tdescript/CMakeLists.txt
@@ -40,9 +40,9 @@ install( FILES
 install( FILES scriptinterface.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-##### kscript ###################################
+##### tdescript ###################################
 
-set( target kscript )
+set( target tdescript )
 
 set( ${target}_SRCS
   scriptmanager.cpp
diff --git a/interfaces/tdescript/Makefile.am b/interfaces/tdescript/Makefile.am
new file mode 100644
index 000000000..55d4cac35
--- /dev/null
+++ b/interfaces/tdescript/Makefile.am
@@ -0,0 +1,21 @@
+SUBDIRS = . sample
+
+INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes)
+
+#lib_LTLIBRARIES = libtdescriptloader.la libtdescript.la
+lib_LTLIBRARIES = libtdescript.la
+#libtdescriptloader_la_SOURCES = scriptloader.cpp
+#libtdescriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+#libtdescriptloader_la_LIBADD = $(LIB_KPARTS)
+
+libtdescript_la_SOURCES = scriptmanager.cpp
+libtdescript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+libtdescript_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+
+tdescriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
+tdescriptincludedir = $(includedir)
+
+METASOURCES = AUTO
+
+servicetypedir = $(kde_servicetypesdir)
+servicetype_DATA = scriptinterface.desktop
diff --git a/interfaces/kscript/README b/interfaces/tdescript/README
index 213a0c277..213a0c277 100644
--- a/interfaces/kscript/README
+++ b/interfaces/tdescript/README
diff --git a/interfaces/kscript/sample/CMakeLists.txt b/interfaces/tdescript/sample/CMakeLists.txt
index cdb2505e9..46d031bff 100644
--- a/interfaces/kscript/sample/CMakeLists.txt
+++ b/interfaces/tdescript/sample/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/interfaces/kscript
+  ${CMAKE_SOURCE_DIR}/interfaces/tdescript
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
 )
@@ -38,6 +38,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kscript-shared
+  LINK tdescript-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/interfaces/kscript/sample/Makefile.am b/interfaces/tdescript/sample/Makefile.am
index 5dae5193f..77d39b28c 100644
--- a/interfaces/kscript/sample/Makefile.am
+++ b/interfaces/tdescript/sample/Makefile.am
@@ -1,10 +1,10 @@
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/kscript $(all_includes)
+INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/tdescript $(all_includes)
 
 kde_module_LTLIBRARIES = libshellscript.la
 
 libshellscript_la_SOURCES = shellscript.cpp
 libshellscript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -avoid-version
-libshellscript_la_LIBADD = ../libkscript.la $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
+libshellscript_la_LIBADD = ../libtdescript.la $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
 
 
 METASOURCES = AUTO
diff --git a/interfaces/kscript/sample/shellscript.cpp b/interfaces/tdescript/sample/shellscript.cpp
index 9ec34f7a2..9ec34f7a2 100644
--- a/interfaces/kscript/sample/shellscript.cpp
+++ b/interfaces/tdescript/sample/shellscript.cpp
diff --git a/interfaces/kscript/sample/shellscript.desktop b/interfaces/tdescript/sample/shellscript.desktop
index e65713a3b..e65713a3b 100644
--- a/interfaces/kscript/sample/shellscript.desktop
+++ b/interfaces/tdescript/sample/shellscript.desktop
diff --git a/interfaces/kscript/sample/shellscript.h b/interfaces/tdescript/sample/shellscript.h
index 2cdaf7e5a..2cdaf7e5a 100644
--- a/interfaces/kscript/sample/shellscript.h
+++ b/interfaces/tdescript/sample/shellscript.h
diff --git a/interfaces/kscript/scriptclientinterface.h b/interfaces/tdescript/scriptclientinterface.h
index 0f07d34b2..0f07d34b2 100644
--- a/interfaces/kscript/scriptclientinterface.h
+++ b/interfaces/tdescript/scriptclientinterface.h
diff --git a/interfaces/kscript/scriptinterface.desktop b/interfaces/tdescript/scriptinterface.desktop
index 397e650d8..397e650d8 100644
--- a/interfaces/kscript/scriptinterface.desktop
+++ b/interfaces/tdescript/scriptinterface.desktop
diff --git a/interfaces/kscript/scriptinterface.h b/interfaces/tdescript/scriptinterface.h
index 1c37b7f71..1c37b7f71 100644
--- a/interfaces/kscript/scriptinterface.h
+++ b/interfaces/tdescript/scriptinterface.h
diff --git a/interfaces/kscript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index 621ceb5d1..79fa2055a 100644
--- a/interfaces/kscript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -19,8 +19,8 @@
 #include "scriptloader.h"
 
 #include <kapplication.h>
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kconfig.h>
diff --git a/interfaces/kscript/scriptloader.h b/interfaces/tdescript/scriptloader.h
index 20b135231..a249283d6 100644
--- a/interfaces/kscript/scriptloader.h
+++ b/interfaces/tdescript/scriptloader.h
@@ -21,7 +21,7 @@
 #include <tqptrlist.h>
 #include <kmainwindow.h>
 #include <kaction.h>
-#include <kscript/scriptinterface.h>
+#include <tdescript/scriptinterface.h>
 
 /**
  * Script loader
diff --git a/interfaces/kscript/scriptmanager.cpp b/interfaces/tdescript/scriptmanager.cpp
index 647410b8b..cd20655d0 100644
--- a/interfaces/kscript/scriptmanager.cpp
+++ b/interfaces/tdescript/scriptmanager.cpp
@@ -1,6 +1,6 @@
 #include "scriptmanager.h"
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
 #include <kapplication.h>
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
diff --git a/interfaces/kscript/scriptmanager.h b/interfaces/tdescript/scriptmanager.h
index d21219901..d21219901 100644
--- a/interfaces/kscript/scriptmanager.h
+++ b/interfaces/tdescript/scriptmanager.h
diff --git a/interfaces/ktexteditor/.kateconfig b/interfaces/tdetexteditor/.kateconfig
index 5b0885abe..5b0885abe 100644
--- a/interfaces/ktexteditor/.kateconfig
+++ b/interfaces/tdetexteditor/.kateconfig
diff --git a/interfaces/ktexteditor/CMakeLists.txt b/interfaces/tdetexteditor/CMakeLists.txt
index 3f430b50c..a9d39edbb 100644
--- a/interfaces/ktexteditor/CMakeLists.txt
+++ b/interfaces/tdetexteditor/CMakeLists.txt
@@ -46,28 +46,28 @@ install( FILES
     selectioninterfaceext.h selectionextdcopinterface.h
     texthintinterface.h editinterfaceext.h variableinterface.h
     templateinterface.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/ktexteditor )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdetexteditor )
 
 
 ##### other data ################################
 
 install( FILES
-    ktexteditor.desktop ktexteditoreditor.desktop
-    ktexteditorplugin.desktop
+    tdetexteditor.desktop tdetexteditoreditor.desktop
+    tdetexteditorplugin.desktop
   DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 install( FILES
-    kcm_ktexteditor.desktop
+    kcm_tdetexteditor.desktop
   DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser )
 
 
 
-##### ktexteditor ###############################
+##### tdetexteditor ###############################
 
-set( target ktexteditor )
+set( target tdetexteditor )
 
 set( ${target}_SRCS
-  ktexteditor.cpp
+  tdetexteditor.cpp
   editinterface.cpp clipboardinterface.cpp  selectioninterface.cpp searchinterface.cpp
   codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp
   configinterface.cpp cursorinterface.cpp  dynwordwrapinterface.cpp
@@ -90,7 +90,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK tdeui-shared kabc-shared kparts-shared
+  LINK tdeui-shared kabc-shared tdeparts-shared
   DEPENDENCIES dcopidl dcopidl2cpp
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/interfaces/ktexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am
index cc41c788f..5663bb761 100644
--- a/interfaces/ktexteditor/Makefile.am
+++ b/interfaces/tdetexteditor/Makefile.am
@@ -1,8 +1,8 @@
 INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces  -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
 
-lib_LTLIBRARIES = libktexteditor.la
+lib_LTLIBRARIES = libtdetexteditor.la
 
-libktexteditor_la_SOURCES = ktexteditor.cpp \
+libtdetexteditor_la_SOURCES = tdetexteditor.cpp \
     editinterface.cpp clipboardinterface.cpp  selectioninterface.cpp searchinterface.cpp \
     codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \
     configinterface.cpp cursorinterface.cpp  dynwordwrapinterface.cpp \
@@ -22,10 +22,10 @@ libktexteditor_la_SOURCES = ktexteditor.cpp \
     texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp
 
 
-libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_TDEUI)
+libtdetexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+libtdetexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_TDEUI)
 
-ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
+tdetexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
                              selectioninterface.h cursorinterface.h \
                              clipboardinterface.h popupmenuinterface.h \
                              viewcursorinterface.h searchinterface.h highlightinginterface.h \
@@ -36,15 +36,15 @@ ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h
 			     documentinfo.h selectioninterfaceext.h selectionextdcopinterface.h texthintinterface.h \
 			     editinterfaceext.h variableinterface.h templateinterface.h
 
-ktexteditorincludedir = $(includedir)/ktexteditor
+tdetexteditorincludedir = $(includedir)/tdetexteditor
 
 METASOURCES = AUTO
 
 servicetypedir = $(kde_servicetypesdir)
-servicetype_DATA = ktexteditor.desktop ktexteditoreditor.desktop ktexteditorplugin.desktop
+servicetype_DATA = tdetexteditor.desktop tdetexteditoreditor.desktop tdetexteditorplugin.desktop
 
-kcm_ktexteditor_DATA = kcm_ktexteditor.desktop
-kcm_ktexteditordir = $(kde_datadir)/kcm_componentchooser
+kcm_tdetexteditor_DATA = kcm_tdetexteditor.desktop
+kcm_tdetexteditordir = $(kde_datadir)/kcm_componentchooser
 
 templateinterface.lo: $(top_builddir)/kabc/addressee.h
 
diff --git a/interfaces/ktexteditor/blockselectiondcopinterface.cpp b/interfaces/tdetexteditor/blockselectiondcopinterface.cpp
index 34b7294b2..34b7294b2 100644
--- a/interfaces/ktexteditor/blockselectiondcopinterface.cpp
+++ b/interfaces/tdetexteditor/blockselectiondcopinterface.cpp
diff --git a/interfaces/ktexteditor/blockselectiondcopinterface.h b/interfaces/tdetexteditor/blockselectiondcopinterface.h
index 4b74fd2a0..4b74fd2a0 100644
--- a/interfaces/ktexteditor/blockselectiondcopinterface.h
+++ b/interfaces/tdetexteditor/blockselectiondcopinterface.h
diff --git a/interfaces/ktexteditor/blockselectioninterface.cpp b/interfaces/tdetexteditor/blockselectioninterface.cpp
index 6d562a43e..6d562a43e 100644
--- a/interfaces/ktexteditor/blockselectioninterface.cpp
+++ b/interfaces/tdetexteditor/blockselectioninterface.cpp
diff --git a/interfaces/ktexteditor/blockselectioninterface.h b/interfaces/tdetexteditor/blockselectioninterface.h
index 3fae34682..b2cd785eb 100644
--- a/interfaces/ktexteditor/blockselectioninterface.h
+++ b/interfaces/tdetexteditor/blockselectioninterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_blockselectioninterface_h__
-#define __ktexteditor_blockselectioninterface_h__
+#ifndef __tdetexteditor_blockselectioninterface_h__
+#define __tdetexteditor_blockselectioninterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/clipboarddcopinterface.cpp b/interfaces/tdetexteditor/clipboarddcopinterface.cpp
index 334046ee5..334046ee5 100644
--- a/interfaces/ktexteditor/clipboarddcopinterface.cpp
+++ b/interfaces/tdetexteditor/clipboarddcopinterface.cpp
diff --git a/interfaces/ktexteditor/clipboarddcopinterface.h b/interfaces/tdetexteditor/clipboarddcopinterface.h
index 8104e9d4d..8104e9d4d 100644
--- a/interfaces/ktexteditor/clipboarddcopinterface.h
+++ b/interfaces/tdetexteditor/clipboarddcopinterface.h
diff --git a/interfaces/ktexteditor/clipboardinterface.cpp b/interfaces/tdetexteditor/clipboardinterface.cpp
index 89f92d089..89f92d089 100644
--- a/interfaces/ktexteditor/clipboardinterface.cpp
+++ b/interfaces/tdetexteditor/clipboardinterface.cpp
diff --git a/interfaces/ktexteditor/clipboardinterface.h b/interfaces/tdetexteditor/clipboardinterface.h
index 365006b37..8eeeb77ba 100644
--- a/interfaces/ktexteditor/clipboardinterface.h
+++ b/interfaces/tdetexteditor/clipboardinterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_clipboardinterface_h__
-#define __ktexteditor_clipboardinterface_h__
+#ifndef __tdetexteditor_clipboardinterface_h__
+#define __tdetexteditor_clipboardinterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/codecompletioninterface.cpp b/interfaces/tdetexteditor/codecompletioninterface.cpp
index 416dd593a..416dd593a 100644
--- a/interfaces/ktexteditor/codecompletioninterface.cpp
+++ b/interfaces/tdetexteditor/codecompletioninterface.cpp
diff --git a/interfaces/ktexteditor/codecompletioninterface.h b/interfaces/tdetexteditor/codecompletioninterface.h
index 2fab7231e..4f726578f 100644
--- a/interfaces/ktexteditor/codecompletioninterface.h
+++ b/interfaces/tdetexteditor/codecompletioninterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_codecompletioninterface_h__
-#define __ktexteditor_codecompletioninterface_h__
+#ifndef __tdetexteditor_codecompletioninterface_h__
+#define __tdetexteditor_codecompletioninterface_h__
 
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/interfaces/ktexteditor/configinterface.cpp b/interfaces/tdetexteditor/configinterface.cpp
index 63bf086e0..63bf086e0 100644
--- a/interfaces/ktexteditor/configinterface.cpp
+++ b/interfaces/tdetexteditor/configinterface.cpp
diff --git a/interfaces/ktexteditor/configinterface.h b/interfaces/tdetexteditor/configinterface.h
index 4879fa66b..ed6a80d81 100644
--- a/interfaces/ktexteditor/configinterface.h
+++ b/interfaces/tdetexteditor/configinterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_configinterface_h__
-#define __ktexteditor_configinterface_h__
+#ifndef __tdetexteditor_configinterface_h__
+#define __tdetexteditor_configinterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/configinterfaceextension.cpp b/interfaces/tdetexteditor/configinterfaceextension.cpp
index 460d930a4..460d930a4 100644
--- a/interfaces/ktexteditor/configinterfaceextension.cpp
+++ b/interfaces/tdetexteditor/configinterfaceextension.cpp
diff --git a/interfaces/ktexteditor/configinterfaceextension.h b/interfaces/tdetexteditor/configinterfaceextension.h
index e324e2ba2..d139ba696 100644
--- a/interfaces/ktexteditor/configinterfaceextension.h
+++ b/interfaces/tdetexteditor/configinterfaceextension.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_configinterfaceextension_h__
-#define __ktexteditor_configinterfaceextension_h__
+#ifndef __tdetexteditor_configinterfaceextension_h__
+#define __tdetexteditor_configinterfaceextension_h__
 
 #include <tqwidget.h>
 #include <tqpixmap.h>
diff --git a/interfaces/ktexteditor/cursorinterface.cpp b/interfaces/tdetexteditor/cursorinterface.cpp
index 96d00290e..96d00290e 100644
--- a/interfaces/ktexteditor/cursorinterface.cpp
+++ b/interfaces/tdetexteditor/cursorinterface.cpp
diff --git a/interfaces/ktexteditor/cursorinterface.h b/interfaces/tdetexteditor/cursorinterface.h
index e6e8e848a..e31d33395 100644
--- a/interfaces/ktexteditor/cursorinterface.h
+++ b/interfaces/tdetexteditor/cursorinterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_cursorinterface_h__
-#define __ktexteditor_cursorinterface_h__
+#ifndef __tdetexteditor_cursorinterface_h__
+#define __tdetexteditor_cursorinterface_h__
 
 #include <tqptrlist.h>
 #include <tqstring.h>
diff --git a/interfaces/ktexteditor/document.h b/interfaces/tdetexteditor/document.h
index 12823e600..83d8b7cf6 100644
--- a/interfaces/ktexteditor/document.h
+++ b/interfaces/tdetexteditor/document.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_document_h__
-#define __ktexteditor_document_h__
+#ifndef __tdetexteditor_document_h__
+#define __tdetexteditor_document_h__
 
 #include "editor.h"
 
diff --git a/interfaces/ktexteditor/documentdcopinfo.cpp b/interfaces/tdetexteditor/documentdcopinfo.cpp
index b339d01cd..b339d01cd 100644
--- a/interfaces/ktexteditor/documentdcopinfo.cpp
+++ b/interfaces/tdetexteditor/documentdcopinfo.cpp
diff --git a/interfaces/ktexteditor/documentdcopinfo.h b/interfaces/tdetexteditor/documentdcopinfo.h
index ea25284fe..ea25284fe 100644
--- a/interfaces/ktexteditor/documentdcopinfo.h
+++ b/interfaces/tdetexteditor/documentdcopinfo.h
diff --git a/interfaces/ktexteditor/documentinfo.cpp b/interfaces/tdetexteditor/documentinfo.cpp
index c675bfb5f..c675bfb5f 100644
--- a/interfaces/ktexteditor/documentinfo.cpp
+++ b/interfaces/tdetexteditor/documentinfo.cpp
diff --git a/interfaces/ktexteditor/documentinfo.h b/interfaces/tdetexteditor/documentinfo.h
index b6d393eb7..46a19bfd5 100644
--- a/interfaces/ktexteditor/documentinfo.h
+++ b/interfaces/tdetexteditor/documentinfo.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_documentinfointerface_h__
-#define __ktexteditor_documentinfointerface_h__
+#ifndef __tdetexteditor_documentinfointerface_h__
+#define __tdetexteditor_documentinfointerface_h__
 
 class TQString;
 class TQCString;
diff --git a/interfaces/ktexteditor/dynwordwrapinterface.cpp b/interfaces/tdetexteditor/dynwordwrapinterface.cpp
index 9c1da6d4b..9c1da6d4b 100644
--- a/interfaces/ktexteditor/dynwordwrapinterface.cpp
+++ b/interfaces/tdetexteditor/dynwordwrapinterface.cpp
diff --git a/interfaces/ktexteditor/dynwordwrapinterface.h b/interfaces/tdetexteditor/dynwordwrapinterface.h
index 8d796c4ae..9a6ce116b 100644
--- a/interfaces/ktexteditor/dynwordwrapinterface.h
+++ b/interfaces/tdetexteditor/dynwordwrapinterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_dynwordwrapinterface_h__
-#define __ktexteditor_dynwordwrapinterface_h__
+#ifndef __tdetexteditor_dynwordwrapinterface_h__
+#define __tdetexteditor_dynwordwrapinterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/editdcopinterface.cpp b/interfaces/tdetexteditor/editdcopinterface.cpp
index 6130ccd14..6130ccd14 100644
--- a/interfaces/ktexteditor/editdcopinterface.cpp
+++ b/interfaces/tdetexteditor/editdcopinterface.cpp
diff --git a/interfaces/ktexteditor/editdcopinterface.h b/interfaces/tdetexteditor/editdcopinterface.h
index f169fb15b..f169fb15b 100644
--- a/interfaces/ktexteditor/editdcopinterface.h
+++ b/interfaces/tdetexteditor/editdcopinterface.h
diff --git a/interfaces/ktexteditor/editinterface.cpp b/interfaces/tdetexteditor/editinterface.cpp
index cfa0b67bc..cfa0b67bc 100644
--- a/interfaces/ktexteditor/editinterface.cpp
+++ b/interfaces/tdetexteditor/editinterface.cpp
diff --git a/interfaces/ktexteditor/editinterface.h b/interfaces/tdetexteditor/editinterface.h
index 7844995e8..05e4941f2 100644
--- a/interfaces/ktexteditor/editinterface.h
+++ b/interfaces/tdetexteditor/editinterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_editinterface_h__
-#define __ktexteditor_editinterface_h__
+#ifndef __tdetexteditor_editinterface_h__
+#define __tdetexteditor_editinterface_h__
 
 #include <tqstring.h>
 
diff --git a/interfaces/ktexteditor/editinterfaceext.cpp b/interfaces/tdetexteditor/editinterfaceext.cpp
index 008fa488d..008fa488d 100644
--- a/interfaces/ktexteditor/editinterfaceext.cpp
+++ b/interfaces/tdetexteditor/editinterfaceext.cpp
diff --git a/interfaces/ktexteditor/editinterfaceext.h b/interfaces/tdetexteditor/editinterfaceext.h
index a4fcb414c..25b74201c 100644
--- a/interfaces/ktexteditor/editinterfaceext.h
+++ b/interfaces/tdetexteditor/editinterfaceext.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_editinterfaceext_h__
-#define __ktexteditor_editinterfaceext_h__
+#ifndef __tdetexteditor_editinterfaceext_h__
+#define __tdetexteditor_editinterfaceext_h__
 
 #include <tqstring.h>
 
diff --git a/interfaces/ktexteditor/editor.h b/interfaces/tdetexteditor/editor.h
index a9f542043..8b6699f9f 100644
--- a/interfaces/ktexteditor/editor.h
+++ b/interfaces/tdetexteditor/editor.h
@@ -16,10 +16,10 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_editor_h__
-#define __ktexteditor_editor_h__
+#ifndef __tdetexteditor_editor_h__
+#define __tdetexteditor_editor_h__
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 /**
  * KTextEditor is KDE's standard text editing KPart interface.
diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/tdetexteditor/editorchooser.cpp
index 807d342d0..807d342d0 100644
--- a/interfaces/ktexteditor/editorchooser.cpp
+++ b/interfaces/tdetexteditor/editorchooser.cpp
diff --git a/interfaces/ktexteditor/editorchooser.h b/interfaces/tdetexteditor/editorchooser.h
index d56e8d8e5..251776c10 100644
--- a/interfaces/ktexteditor/editorchooser.h
+++ b/interfaces/tdetexteditor/editorchooser.h
@@ -1,8 +1,8 @@
 #ifndef _EDITOR_CHOOSER_H_
 #define  _EDITOR_CHOOSER_H_
 
-#include <ktexteditor/editor.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/editor.h>
+#include <tdetexteditor/document.h>
 
 #include <tqwidget.h>
 
diff --git a/interfaces/ktexteditor/editorchooser_ui.ui b/interfaces/tdetexteditor/editorchooser_ui.ui
index e2bc82adb..e2bc82adb 100644
--- a/interfaces/ktexteditor/editorchooser_ui.ui
+++ b/interfaces/tdetexteditor/editorchooser_ui.ui
diff --git a/interfaces/ktexteditor/encodingdcopinterface.cpp b/interfaces/tdetexteditor/encodingdcopinterface.cpp
index eb408c16e..eb408c16e 100644
--- a/interfaces/ktexteditor/encodingdcopinterface.cpp
+++ b/interfaces/tdetexteditor/encodingdcopinterface.cpp
diff --git a/interfaces/ktexteditor/encodingdcopinterface.h b/interfaces/tdetexteditor/encodingdcopinterface.h
index 38de4e0aa..38de4e0aa 100644
--- a/interfaces/ktexteditor/encodingdcopinterface.h
+++ b/interfaces/tdetexteditor/encodingdcopinterface.h
diff --git a/interfaces/ktexteditor/encodinginterface.cpp b/interfaces/tdetexteditor/encodinginterface.cpp
index a0ef1ad22..a0ef1ad22 100644
--- a/interfaces/ktexteditor/encodinginterface.cpp
+++ b/interfaces/tdetexteditor/encodinginterface.cpp
diff --git a/interfaces/ktexteditor/encodinginterface.h b/interfaces/tdetexteditor/encodinginterface.h
index 5133d4a6e..42d0186ad 100644
--- a/interfaces/ktexteditor/encodinginterface.h
+++ b/interfaces/tdetexteditor/encodinginterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_encodinginterface_h__
-#define __ktexteditor_encodinginterface_h__
+#ifndef __tdetexteditor_encodinginterface_h__
+#define __tdetexteditor_encodinginterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/highlightinginterface.cpp b/interfaces/tdetexteditor/highlightinginterface.cpp
index 1677ca87c..1677ca87c 100644
--- a/interfaces/ktexteditor/highlightinginterface.cpp
+++ b/interfaces/tdetexteditor/highlightinginterface.cpp
diff --git a/interfaces/ktexteditor/highlightinginterface.h b/interfaces/tdetexteditor/highlightinginterface.h
index 4eb31659f..e7bd811e2 100644
--- a/interfaces/ktexteditor/highlightinginterface.h
+++ b/interfaces/tdetexteditor/highlightinginterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_highlightinginterface_h__
-#define __ktexteditor_highlightinginterface_h__
+#ifndef __tdetexteditor_highlightinginterface_h__
+#define __tdetexteditor_highlightinginterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/kcm_ktexteditor.desktop b/interfaces/tdetexteditor/kcm_tdetexteditor.desktop
index 490fad3ae..490fad3ae 100644
--- a/interfaces/ktexteditor/kcm_ktexteditor.desktop
+++ b/interfaces/tdetexteditor/kcm_tdetexteditor.desktop
diff --git a/interfaces/ktexteditor/markinterface.cpp b/interfaces/tdetexteditor/markinterface.cpp
index 024db35c4..024db35c4 100644
--- a/interfaces/ktexteditor/markinterface.cpp
+++ b/interfaces/tdetexteditor/markinterface.cpp
diff --git a/interfaces/ktexteditor/markinterface.h b/interfaces/tdetexteditor/markinterface.h
index 025bcc47c..64e948572 100644
--- a/interfaces/ktexteditor/markinterface.h
+++ b/interfaces/tdetexteditor/markinterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_markinterface_h__
-#define __ktexteditor_markinterface_h__
+#ifndef __tdetexteditor_markinterface_h__
+#define __tdetexteditor_markinterface_h__
 
 #include <tqptrlist.h>
 
diff --git a/interfaces/ktexteditor/markinterfaceextension.cpp b/interfaces/tdetexteditor/markinterfaceextension.cpp
index 86538abfc..86538abfc 100644
--- a/interfaces/ktexteditor/markinterfaceextension.cpp
+++ b/interfaces/tdetexteditor/markinterfaceextension.cpp
diff --git a/interfaces/ktexteditor/markinterfaceextension.h b/interfaces/tdetexteditor/markinterfaceextension.h
index efb7356de..7aef736db 100644
--- a/interfaces/ktexteditor/markinterfaceextension.h
+++ b/interfaces/tdetexteditor/markinterfaceextension.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_markinterface_extension_h__
-#define __ktexteditor_markinterface_extension_h__
+#ifndef __tdetexteditor_markinterface_extension_h__
+#define __tdetexteditor_markinterface_extension_h__
 
 #include <tqptrlist.h>
 #include <tqpixmap.h>
diff --git a/interfaces/ktexteditor/plugin.h b/interfaces/tdetexteditor/plugin.h
index f3cf5d4fc..68416bf78 100644
--- a/interfaces/ktexteditor/plugin.h
+++ b/interfaces/tdetexteditor/plugin.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_plugin_h__
-#define __ktexteditor_plugin_h__
+#ifndef __tdetexteditor_plugin_h__
+#define __tdetexteditor_plugin_h__
 
 #include <tqobject.h>
 
diff --git a/interfaces/ktexteditor/popupmenuinterface.cpp b/interfaces/tdetexteditor/popupmenuinterface.cpp
index 350fa138b..350fa138b 100644
--- a/interfaces/ktexteditor/popupmenuinterface.cpp
+++ b/interfaces/tdetexteditor/popupmenuinterface.cpp
diff --git a/interfaces/ktexteditor/popupmenuinterface.h b/interfaces/tdetexteditor/popupmenuinterface.h
index 23c38f707..3ca833709 100644
--- a/interfaces/ktexteditor/popupmenuinterface.h
+++ b/interfaces/tdetexteditor/popupmenuinterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_popupmenuinterface_h__
-#define __ktexteditor_popupmenuinterface_h__
+#ifndef __tdetexteditor_popupmenuinterface_h__
+#define __tdetexteditor_popupmenuinterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/printdcopinterface.cpp b/interfaces/tdetexteditor/printdcopinterface.cpp
index 3b9eddfe9..3b9eddfe9 100644
--- a/interfaces/ktexteditor/printdcopinterface.cpp
+++ b/interfaces/tdetexteditor/printdcopinterface.cpp
diff --git a/interfaces/ktexteditor/printdcopinterface.h b/interfaces/tdetexteditor/printdcopinterface.h
index e41e6da5d..e41e6da5d 100644
--- a/interfaces/ktexteditor/printdcopinterface.h
+++ b/interfaces/tdetexteditor/printdcopinterface.h
diff --git a/interfaces/ktexteditor/printinterface.cpp b/interfaces/tdetexteditor/printinterface.cpp
index 5a4011eb4..5a4011eb4 100644
--- a/interfaces/ktexteditor/printinterface.cpp
+++ b/interfaces/tdetexteditor/printinterface.cpp
diff --git a/interfaces/ktexteditor/printinterface.h b/interfaces/tdetexteditor/printinterface.h
index 3da6213ac..cca453d6c 100644
--- a/interfaces/ktexteditor/printinterface.h
+++ b/interfaces/tdetexteditor/printinterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_printinterface_h__
-#define __ktexteditor_printinterface_h__
+#ifndef __tdetexteditor_printinterface_h__
+#define __tdetexteditor_printinterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/searchdcopinterface.cpp b/interfaces/tdetexteditor/searchdcopinterface.cpp
index ce29e4927..ce29e4927 100644
--- a/interfaces/ktexteditor/searchdcopinterface.cpp
+++ b/interfaces/tdetexteditor/searchdcopinterface.cpp
diff --git a/interfaces/ktexteditor/searchdcopinterface.h b/interfaces/tdetexteditor/searchdcopinterface.h
index d4f558a26..d4f558a26 100644
--- a/interfaces/ktexteditor/searchdcopinterface.h
+++ b/interfaces/tdetexteditor/searchdcopinterface.h
diff --git a/interfaces/ktexteditor/searchinterface.cpp b/interfaces/tdetexteditor/searchinterface.cpp
index 6ea021e0d..6ea021e0d 100644
--- a/interfaces/ktexteditor/searchinterface.cpp
+++ b/interfaces/tdetexteditor/searchinterface.cpp
diff --git a/interfaces/ktexteditor/searchinterface.h b/interfaces/tdetexteditor/searchinterface.h
index 69952b785..f16c76dd1 100644
--- a/interfaces/ktexteditor/searchinterface.h
+++ b/interfaces/tdetexteditor/searchinterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_searchinterface_h__
-#define __ktexteditor_searchinterface_h__
+#ifndef __tdetexteditor_searchinterface_h__
+#define __tdetexteditor_searchinterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/selectiondcopinterface.cpp b/interfaces/tdetexteditor/selectiondcopinterface.cpp
index f341297e0..f341297e0 100644
--- a/interfaces/ktexteditor/selectiondcopinterface.cpp
+++ b/interfaces/tdetexteditor/selectiondcopinterface.cpp
diff --git a/interfaces/ktexteditor/selectiondcopinterface.h b/interfaces/tdetexteditor/selectiondcopinterface.h
index aa2973540..aa2973540 100644
--- a/interfaces/ktexteditor/selectiondcopinterface.h
+++ b/interfaces/tdetexteditor/selectiondcopinterface.h
diff --git a/interfaces/ktexteditor/selectionextdcopinterface.h b/interfaces/tdetexteditor/selectionextdcopinterface.h
index 5c3e32baf..5c3e32baf 100644
--- a/interfaces/ktexteditor/selectionextdcopinterface.h
+++ b/interfaces/tdetexteditor/selectionextdcopinterface.h
diff --git a/interfaces/ktexteditor/selectioninterface.cpp b/interfaces/tdetexteditor/selectioninterface.cpp
index 0a8dc6b00..0a8dc6b00 100644
--- a/interfaces/ktexteditor/selectioninterface.cpp
+++ b/interfaces/tdetexteditor/selectioninterface.cpp
diff --git a/interfaces/ktexteditor/selectioninterface.h b/interfaces/tdetexteditor/selectioninterface.h
index a6ba67bd8..03f50de33 100644
--- a/interfaces/ktexteditor/selectioninterface.h
+++ b/interfaces/tdetexteditor/selectioninterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_selectioninterface_h__
-#define __ktexteditor_selectioninterface_h__
+#ifndef __tdetexteditor_selectioninterface_h__
+#define __tdetexteditor_selectioninterface_h__
 
 #include <tqstring.h>
 
diff --git a/interfaces/ktexteditor/selectioninterfaceext.cpp b/interfaces/tdetexteditor/selectioninterfaceext.cpp
index 3034f33a5..3034f33a5 100644
--- a/interfaces/ktexteditor/selectioninterfaceext.cpp
+++ b/interfaces/tdetexteditor/selectioninterfaceext.cpp
diff --git a/interfaces/ktexteditor/selectioninterfaceext.h b/interfaces/tdetexteditor/selectioninterfaceext.h
index 255d76f64..8f57fb7e9 100644
--- a/interfaces/ktexteditor/selectioninterfaceext.h
+++ b/interfaces/tdetexteditor/selectioninterfaceext.h
@@ -19,8 +19,8 @@
    $Id$
 */
 
-#ifndef __ktexteditor_selectioninterface_ext_h__
-#define __ktexteditor_selectioninterface_ext_h__
+#ifndef __tdetexteditor_selectioninterface_ext_h__
+#define __tdetexteditor_selectioninterface_ext_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/sessionconfiginterface.cpp b/interfaces/tdetexteditor/sessionconfiginterface.cpp
index def7bf0a5..def7bf0a5 100644
--- a/interfaces/ktexteditor/sessionconfiginterface.cpp
+++ b/interfaces/tdetexteditor/sessionconfiginterface.cpp
diff --git a/interfaces/ktexteditor/sessionconfiginterface.h b/interfaces/tdetexteditor/sessionconfiginterface.h
index b4fb52233..f92502b36 100644
--- a/interfaces/ktexteditor/sessionconfiginterface.h
+++ b/interfaces/tdetexteditor/sessionconfiginterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_sessionconfiginterface_h__
-#define __ktexteditor_sessionconfiginterface_h__
+#ifndef __tdetexteditor_sessionconfiginterface_h__
+#define __tdetexteditor_sessionconfiginterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/ktexteditor.cpp b/interfaces/tdetexteditor/tdetexteditor.cpp
index c822dc93c..354361ed2 100644
--- a/interfaces/ktexteditor/ktexteditor.cpp
+++ b/interfaces/tdetexteditor/tdetexteditor.cpp
@@ -25,8 +25,8 @@
 #include "editor.h"
 
 #include <kaction.h>
-#include <kparts/factory.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/componentfactory.h>
 
 #include "document.moc"
 #include "view.moc"
diff --git a/interfaces/ktexteditor/ktexteditor.desktop b/interfaces/tdetexteditor/tdetexteditor.desktop
index 17556bdf6..17556bdf6 100644
--- a/interfaces/ktexteditor/ktexteditor.desktop
+++ b/interfaces/tdetexteditor/tdetexteditor.desktop
diff --git a/interfaces/ktexteditor/ktexteditoreditor.desktop b/interfaces/tdetexteditor/tdetexteditoreditor.desktop
index 6048da92b..6048da92b 100644
--- a/interfaces/ktexteditor/ktexteditoreditor.desktop
+++ b/interfaces/tdetexteditor/tdetexteditoreditor.desktop
diff --git a/interfaces/ktexteditor/ktexteditorplugin.desktop b/interfaces/tdetexteditor/tdetexteditorplugin.desktop
index b2e180a93..b2e180a93 100644
--- a/interfaces/ktexteditor/ktexteditorplugin.desktop
+++ b/interfaces/tdetexteditor/tdetexteditorplugin.desktop
diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/tdetexteditor/templateinterface.cpp
index ecc34c7e2..ecc34c7e2 100644
--- a/interfaces/ktexteditor/templateinterface.cpp
+++ b/interfaces/tdetexteditor/templateinterface.cpp
diff --git a/interfaces/ktexteditor/templateinterface.h b/interfaces/tdetexteditor/templateinterface.h
index a786bf461..6ffc40e73 100644
--- a/interfaces/ktexteditor/templateinterface.h
+++ b/interfaces/tdetexteditor/templateinterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_templateinterface_h__
-#define __ktexteditor_templateinterface_h__
+#ifndef __tdetexteditor_templateinterface_h__
+#define __tdetexteditor_templateinterface_h__
 
 #include <tqstring.h>
 #include <tqmap.h>
diff --git a/interfaces/ktexteditor/texthintinterface.cpp b/interfaces/tdetexteditor/texthintinterface.cpp
index f6aa4f0b3..f6aa4f0b3 100644
--- a/interfaces/ktexteditor/texthintinterface.cpp
+++ b/interfaces/tdetexteditor/texthintinterface.cpp
diff --git a/interfaces/ktexteditor/texthintinterface.h b/interfaces/tdetexteditor/texthintinterface.h
index e124fa369..4e6a5e12c 100644
--- a/interfaces/ktexteditor/texthintinterface.h
+++ b/interfaces/tdetexteditor/texthintinterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_texthintinterface_h__
-#define __ktexteditor_texthintinterface_h__
+#ifndef __tdetexteditor_texthintinterface_h__
+#define __tdetexteditor_texthintinterface_h__
 
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/interfaces/ktexteditor/undodcopinterface.cpp b/interfaces/tdetexteditor/undodcopinterface.cpp
index 69eb2ebd5..69eb2ebd5 100644
--- a/interfaces/ktexteditor/undodcopinterface.cpp
+++ b/interfaces/tdetexteditor/undodcopinterface.cpp
diff --git a/interfaces/ktexteditor/undodcopinterface.h b/interfaces/tdetexteditor/undodcopinterface.h
index b1a217036..b1a217036 100644
--- a/interfaces/ktexteditor/undodcopinterface.h
+++ b/interfaces/tdetexteditor/undodcopinterface.h
diff --git a/interfaces/ktexteditor/undointerface.cpp b/interfaces/tdetexteditor/undointerface.cpp
index 30a1dd292..30a1dd292 100644
--- a/interfaces/ktexteditor/undointerface.cpp
+++ b/interfaces/tdetexteditor/undointerface.cpp
diff --git a/interfaces/ktexteditor/undointerface.h b/interfaces/tdetexteditor/undointerface.h
index b03e4cb4e..33162e43a 100644
--- a/interfaces/ktexteditor/undointerface.h
+++ b/interfaces/tdetexteditor/undointerface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_undointerface_h__
-#define __ktexteditor_undointerface_h__
+#ifndef __tdetexteditor_undointerface_h__
+#define __tdetexteditor_undointerface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/variableinterface.cpp b/interfaces/tdetexteditor/variableinterface.cpp
index 616e0beab..616e0beab 100644
--- a/interfaces/ktexteditor/variableinterface.cpp
+++ b/interfaces/tdetexteditor/variableinterface.cpp
diff --git a/interfaces/ktexteditor/variableinterface.h b/interfaces/tdetexteditor/variableinterface.h
index 31310a43c..31310a43c 100644
--- a/interfaces/ktexteditor/variableinterface.h
+++ b/interfaces/tdetexteditor/variableinterface.h
diff --git a/interfaces/ktexteditor/view.h b/interfaces/tdetexteditor/view.h
index caa14d021..0a807d6b3 100644
--- a/interfaces/ktexteditor/view.h
+++ b/interfaces/tdetexteditor/view.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_view_h__
-#define __ktexteditor_view_h__
+#ifndef __tdetexteditor_view_h__
+#define __tdetexteditor_view_h__
 
 #include <tqwidget.h>
 #include <kxmlguiclient.h>
diff --git a/interfaces/ktexteditor/viewcursordcopinterface.cpp b/interfaces/tdetexteditor/viewcursordcopinterface.cpp
index f26385414..f26385414 100644
--- a/interfaces/ktexteditor/viewcursordcopinterface.cpp
+++ b/interfaces/tdetexteditor/viewcursordcopinterface.cpp
diff --git a/interfaces/ktexteditor/viewcursordcopinterface.h b/interfaces/tdetexteditor/viewcursordcopinterface.h
index 4bae0b520..4bae0b520 100644
--- a/interfaces/ktexteditor/viewcursordcopinterface.h
+++ b/interfaces/tdetexteditor/viewcursordcopinterface.h
diff --git a/interfaces/ktexteditor/viewcursorinterface.cpp b/interfaces/tdetexteditor/viewcursorinterface.cpp
index 58cea6289..58cea6289 100644
--- a/interfaces/ktexteditor/viewcursorinterface.cpp
+++ b/interfaces/tdetexteditor/viewcursorinterface.cpp
diff --git a/interfaces/ktexteditor/viewcursorinterface.h b/interfaces/tdetexteditor/viewcursorinterface.h
index fd6dae8ff..2fe7241e4 100644
--- a/interfaces/ktexteditor/viewcursorinterface.h
+++ b/interfaces/tdetexteditor/viewcursorinterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_viewcursorinterface_h__
-#define __ktexteditor_viewcursorinterface_h__
+#ifndef __tdetexteditor_viewcursorinterface_h__
+#define __tdetexteditor_viewcursorinterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp b/interfaces/tdetexteditor/viewstatusmsgdcopinterface.cpp
index d38b9b938..d38b9b938 100644
--- a/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp
+++ b/interfaces/tdetexteditor/viewstatusmsgdcopinterface.cpp
diff --git a/interfaces/ktexteditor/viewstatusmsgdcopinterface.h b/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h
index b4c5cf72e..b4c5cf72e 100644
--- a/interfaces/ktexteditor/viewstatusmsgdcopinterface.h
+++ b/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h
diff --git a/interfaces/ktexteditor/viewstatusmsginterface.cpp b/interfaces/tdetexteditor/viewstatusmsginterface.cpp
index af8870c80..af8870c80 100644
--- a/interfaces/ktexteditor/viewstatusmsginterface.cpp
+++ b/interfaces/tdetexteditor/viewstatusmsginterface.cpp
diff --git a/interfaces/ktexteditor/viewstatusmsginterface.h b/interfaces/tdetexteditor/viewstatusmsginterface.h
index 709448124..3516f8758 100644
--- a/interfaces/ktexteditor/viewstatusmsginterface.h
+++ b/interfaces/tdetexteditor/viewstatusmsginterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_viewstatusmsginterface_h__
-#define __ktexteditor_viewstatusmsginterface_h__
+#ifndef __tdetexteditor_viewstatusmsginterface_h__
+#define __tdetexteditor_viewstatusmsginterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/wordwrapinterface.cpp b/interfaces/tdetexteditor/wordwrapinterface.cpp
index 6be76120b..6be76120b 100644
--- a/interfaces/ktexteditor/wordwrapinterface.cpp
+++ b/interfaces/tdetexteditor/wordwrapinterface.cpp
diff --git a/interfaces/ktexteditor/wordwrapinterface.h b/interfaces/tdetexteditor/wordwrapinterface.h
index 155e69ae2..55cc2ded9 100644
--- a/interfaces/ktexteditor/wordwrapinterface.h
+++ b/interfaces/tdetexteditor/wordwrapinterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_wordwrapinterface_h__
-#define __ktexteditor_wordwrapinterface_h__
+#ifndef __tdetexteditor_wordwrapinterface_h__
+#define __tdetexteditor_wordwrapinterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/terminal/Makefile.am b/interfaces/terminal/Makefile.am
index 70bb091ef..3e2f8e4df 100644
--- a/interfaces/terminal/Makefile.am
+++ b/interfaces/terminal/Makefile.am
@@ -1,2 +1,2 @@
-ktexteditorinclude_HEADERS = kde_terminal_interface.h
-ktexteditorincludedir = $(includedir)
+tdetexteditorinclude_HEADERS = kde_terminal_interface.h
+tdetexteditorincludedir = $(includedir)
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc
index e1dacc6dc..399b6451c 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cc
@@ -1,5 +1,5 @@
 #include <kde_terminal_interface.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <ktrader.h>
 #include <klibloader.h>
 #include <kmainwindow.h>
diff --git a/kabc/CMakeLists.txt b/kabc/CMakeLists.txt
index 3cca65863..5f2619cf9 100644
--- a/kabc/CMakeLists.txt
+++ b/kabc/CMakeLists.txt
@@ -59,7 +59,7 @@ install( FILES
 ##### other data ################################
 
 install( FILES kab2kabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
-install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources )
+install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources )
 install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/kabc )
 
 
@@ -102,7 +102,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.2.0
-  LINK vcards-static vcard-shared kio-shared kresources-shared
+  LINK vcards-static vcard-shared kio-shared tderesources-shared
   DEPENDENCIES addressee.h dcopidl
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kabc/Makefile.am b/kabc/Makefile.am
index c4aa489e7..ef989662f 100644
--- a/kabc/Makefile.am
+++ b/kabc/Makefile.am
@@ -22,7 +22,7 @@ CLEANFILES = addressee.h addressee.cpp field.cpp
 lib_LTLIBRARIES = libkabc.la
 libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined
 libkabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \
-                    $(top_builddir)/kresources/libkresources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
+                    $(top_builddir)/tderesources/libtderesources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
 libkabc_la_COMPILE_FIRST = addressee.h
 
 libkabc_la_SOURCES = \
@@ -52,7 +52,7 @@ METASOURCES = AUTO
 
 bin_PROGRAMS = kab2kabc
 
-kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kab2kabc_LDADD = libkabc.la ../kab/libkab.la
 kab2kabc_SOURCES = kab2kabc.cpp
 
@@ -60,7 +60,7 @@ autostart_DATA = kab2kabc.desktop
 autostartdir = $(datadir)/autostart
 
 manager_DATA = kabc_manager.desktop
-managerdir = $(kde_servicesdir)/kresources
+managerdir = $(kde_servicesdir)/tderesources
 
 DOXYGEN_REFERENCES = tdecore tdeui
 
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 7b973be28..8b87b6898 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -24,7 +24,7 @@
 #include <tqobject.h>
 #include <tqptrlist.h>
 
-#include <kresources/manager.h>
+#include <tderesources/manager.h>
 
 #include "addressee.h"
 #include "field.h"
diff --git a/kabc/plugins/dir/CMakeLists.txt b/kabc/plugins/dir/CMakeLists.txt
index 1bc7d8daf..47f81a355 100644
--- a/kabc/plugins/dir/CMakeLists.txt
+++ b/kabc/plugins/dir/CMakeLists.txt
@@ -39,7 +39,7 @@ install( FILES
 
 ##### other data ################################
 
-install( FILES dir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
+install( FILES dir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
 
 
 ##### kabc_dir (library) ########################
diff --git a/kabc/plugins/dir/Makefile.am b/kabc/plugins/dir/Makefile.am
index f5c0c2523..52cd161e4 100644
--- a/kabc/plugins/dir/Makefile.am
+++ b/kabc/plugins/dir/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS = resourcedirconfig.h
 lib_LTLIBRARIES = libkabc_dir.la
 libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp
 libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined 
-libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
+libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
 libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 
 kde_module_LTLIBRARIES = kabc_dir.la
@@ -22,7 +22,7 @@ messages: rc.cpp
 kabcincludedir = $(includedir)/kabc
 kabcinclude_HEADERS = resourcedir.h
 
-servicedir = $(kde_servicesdir)/kresources/kabc
+servicedir = $(kde_servicesdir)/tderesources/kabc
 service_DATA = dir.desktop
 
 resourcedirplugin.lo: ../../addressee.h
diff --git a/kabc/plugins/dir/resourcedirconfig.h b/kabc/plugins/dir/resourcedirconfig.h
index 4333fdae1..9df1778d3 100644
--- a/kabc/plugins/dir/resourcedirconfig.h
+++ b/kabc/plugins/dir/resourcedirconfig.h
@@ -24,7 +24,7 @@
 #include <kcombobox.h>
 #include <kurlrequester.h>
 
-#include <kresources/configwidget.h>
+#include <tderesources/configwidget.h>
 
 namespace KABC {
 
diff --git a/kabc/plugins/evolution/Makefile.am b/kabc/plugins/evolution/Makefile.am
index 5967b9433..fd7b9be3b 100644
--- a/kabc/plugins/evolution/Makefile.am
+++ b/kabc/plugins/evolution/Makefile.am
@@ -15,5 +15,5 @@ METASOURCES = AUTO
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kabc_evolution.pot
 
-servicedir = $(kde_servicesdir)/kresources/kabc
+servicedir = $(kde_servicesdir)/tderesources/kabc
 service_DATA = evolution.desktop
diff --git a/kabc/plugins/file/CMakeLists.txt b/kabc/plugins/file/CMakeLists.txt
index 0c767b00d..3dbcd639f 100644
--- a/kabc/plugins/file/CMakeLists.txt
+++ b/kabc/plugins/file/CMakeLists.txt
@@ -39,7 +39,7 @@ install( FILES
 
 ##### other data ################################
 
-install( FILES file.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
+install( FILES file.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
 
 
 ##### kabc_file (library) #######################
diff --git a/kabc/plugins/file/Makefile.am b/kabc/plugins/file/Makefile.am
index 3060bfab5..832ec2283 100644
--- a/kabc/plugins/file/Makefile.am
+++ b/kabc/plugins/file/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS   = resourcefileconfig.h
 lib_LTLIBRARIES = libkabc_file.la
 libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp
 libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KFILE) $(LIB_TDECORE) $(LIB_TDEUI)
+libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_KFILE) $(LIB_TDECORE) $(LIB_TDEUI)
 libkabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 
 
@@ -24,5 +24,5 @@ messages: rc.cpp
 kabcincludedir = $(includedir)/kabc
 kabcinclude_HEADERS = resourcefile.h
 
-servicedir = $(kde_servicesdir)/kresources/kabc
+servicedir = $(kde_servicesdir)/tderesources/kabc
 service_DATA = file.desktop
diff --git a/kabc/plugins/file/resourcefileconfig.h b/kabc/plugins/file/resourcefileconfig.h
index 343a5623d..18c217eda 100644
--- a/kabc/plugins/file/resourcefileconfig.h
+++ b/kabc/plugins/file/resourcefileconfig.h
@@ -24,7 +24,7 @@
 #include <kcombobox.h>
 #include <kurlrequester.h>
 
-#include <kresources/configwidget.h>
+#include <tderesources/configwidget.h>
 
 namespace KABC {
 
diff --git a/kabc/plugins/ldapkio/CMakeLists.txt b/kabc/plugins/ldapkio/CMakeLists.txt
index 57370c9cf..150377bd9 100644
--- a/kabc/plugins/ldapkio/CMakeLists.txt
+++ b/kabc/plugins/ldapkio/CMakeLists.txt
@@ -39,7 +39,7 @@ install( FILES
 
 ##### other data ################################
 
-install( FILES ldapkio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
+install( FILES ldapkio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
 
 
 ##### kabc_ldapkio ##############################
diff --git a/kabc/plugins/ldapkio/Makefile.am b/kabc/plugins/ldapkio/Makefile.am
index 97cd9089c..a9803f650 100644
--- a/kabc/plugins/ldapkio/Makefile.am
+++ b/kabc/plugins/ldapkio/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS = resourceldapkioconfig.h
 lib_LTLIBRARIES = libkabc_ldapkio.la
 libkabc_ldapkio_la_SOURCES = resourceldapkio.cpp resourceldapkioconfig.cpp
 libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libkabc_ldapkio_la_LIBADD	= $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_TDEUI) $(LIB_TDECORE)
+libkabc_ldapkio_la_LIBADD	= $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE)
 libkabc_ldapkio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 
 kde_module_LTLIBRARIES = kabc_ldapkio.la
@@ -22,7 +22,7 @@ messages: rc.cpp
 kabcincludedir = $(includedir)/kabc
 kabcinclude_HEADERS = resourceldapkio.h
 
-servicedir = $(kde_servicesdir)/kresources/kabc
+servicedir = $(kde_servicesdir)/tderesources/kabc
 service_DATA = ldapkio.desktop
 
 resourceldapkioplugin.lo: ../../addressee.h
diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.h b/kabc/plugins/ldapkio/resourceldapkioconfig.h
index e14c7c428..0fde41d64 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.h
+++ b/kabc/plugins/ldapkio/resourceldapkioconfig.h
@@ -27,7 +27,7 @@
 #include <tqdict.h>
 
 #include <kdialogbase.h>
-#include <kresources/configwidget.h>
+#include <tderesources/configwidget.h>
 #include <kabc/ldif.h>
 #include <kabc/ldapconfigwidget.h>
 
diff --git a/kabc/plugins/net/CMakeLists.txt b/kabc/plugins/net/CMakeLists.txt
index 5433af217..365922d6c 100644
--- a/kabc/plugins/net/CMakeLists.txt
+++ b/kabc/plugins/net/CMakeLists.txt
@@ -39,7 +39,7 @@ install( FILES
 
 ##### other data ################################
 
-install( FILES net.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
+install( FILES net.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
 
 
 ##### kabc_net (library) ########################
diff --git a/kabc/plugins/net/Makefile.am b/kabc/plugins/net/Makefile.am
index f4183d442..ca0ece015 100644
--- a/kabc/plugins/net/Makefile.am
+++ b/kabc/plugins/net/Makefile.am
@@ -22,7 +22,7 @@ messages: rc.cpp
 kabcincludedir = $(includedir)/kabc
 kabcinclude_HEADERS = resourcenet.h
 
-servicedir = $(kde_servicesdir)/kresources/kabc
+servicedir = $(kde_servicesdir)/tderesources/kabc
 service_DATA = net.desktop
 
 resourcenetplugin.lo: ../../addressee.h
diff --git a/kabc/plugins/net/resourcenetconfig.h b/kabc/plugins/net/resourcenetconfig.h
index e07937739..3c8986122 100644
--- a/kabc/plugins/net/resourcenetconfig.h
+++ b/kabc/plugins/net/resourcenetconfig.h
@@ -24,7 +24,7 @@
 #include <kcombobox.h>
 #include <kurlrequester.h>
 
-#include <kresources/configwidget.h>
+#include <tderesources/configwidget.h>
 
 namespace KABC {
 
diff --git a/kabc/plugins/sql/Makefile.am b/kabc/plugins/sql/Makefile.am
index 6d638936f..3fa3986ce 100644
--- a/kabc/plugins/sql/Makefile.am
+++ b/kabc/plugins/sql/Makefile.am
@@ -15,6 +15,6 @@ METASOURCES = AUTO
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kabc_sql.pot
 
-linkdir		= $(kde_datadir)/kresources/contact
+linkdir		= $(kde_datadir)/tderesources/contact
 link_DATA	= sql.desktop
 EXTRA_DIST	= $(link_DATA)
diff --git a/kabc/resource.h b/kabc/resource.h
index 4824ffda8..0f5167e7b 100644
--- a/kabc/resource.h
+++ b/kabc/resource.h
@@ -21,7 +21,7 @@
 #ifndef KABC_RESOURCE_H
 #define KABC_RESOURCE_H
 
-#include <kresources/resource.h>
+#include <tderesources/resource.h>
 
 #include "addressbook.h"
 #include "plugin.h"
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index 1cf436455..f3c5b5c0e 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -24,7 +24,7 @@
 #include <kcrash.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kresources/manager.h>
+#include <tderesources/manager.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
diff --git a/kabc/tests/Makefile.am b/kabc/tests/Makefile.am
index 3af688026..961d12bd4 100644
--- a/kabc/tests/Makefile.am
+++ b/kabc/tests/Makefile.am
@@ -12,44 +12,44 @@ check_PROGRAMS = testlock testldapclient
 testlock_LDFLAGS = $(all_libraries)
 testlock_SOURCES = testlock.cpp
 
-testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testldapclient_SOURCES = testldapclient.cpp
 
 EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \
   testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit
 
-testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testkabc_SOURCES = testkabc.cpp
 
-testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testaddressee_SOURCES = testaddressee.cpp
 
-testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testaddresseelist_SOURCES = testaddresseelist.cpp
 
-testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testaddressfmt_SOURCES = testaddressfmt.cpp
 
-testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testkabcdlg_SOURCES = testkabcdlg.cpp
 
-testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testdistlist_SOURCES = testdistlist.cpp
 
-testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testaddresslineedit_SOURCES = testaddresslineedit.cpp
 
-bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
 bigread_SOURCES = bigread.cpp
 
-bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
 bigwrite_SOURCES = bigwrite.cpp
 
-testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testdb_SOURCES = testdb.cpp
 
-kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kabcargl_SOURCES = kabcargl.cpp
 
diff --git a/kabc/vcard/Makefile.am b/kabc/vcard/Makefile.am
index 738faff03..e8a33c3a9 100644
--- a/kabc/vcard/Makefile.am
+++ b/kabc/vcard/Makefile.am
@@ -12,10 +12,10 @@ libvcard_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
 
 check_PROGRAMS = testwrite testread
 
-testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testwrite_LDADD = libvcard.la 
 testwrite_SOURCES = testwrite.cpp
 
-testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testread_LDADD = libvcard.la 
 testread_SOURCES = testread.cpp
diff --git a/kabc/vcardparser/Makefile.am b/kabc/vcardparser/Makefile.am
index e698c687a..53e4e42ab 100644
--- a/kabc/vcardparser/Makefile.am
+++ b/kabc/vcardparser/Makefile.am
@@ -8,15 +8,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
 
 check_PROGRAMS = testread testwrite testread2
 
-testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
 testread_SOURCES = testread.cpp
 
-testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
 testread2_SOURCES = testread2.cpp testutils.cpp
 
-testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
 testwrite_SOURCES = testwrite.cpp
 
diff --git a/kate/AUTHORS b/kate/AUTHORS
index c12c9810f..8239561ca 100644
--- a/kate/AUTHORS
+++ b/kate/AUTHORS
@@ -33,7 +33,7 @@
   (original author of kwrite in kde 1.x until kde 2.1)
 
 - Glen Parker <glenebob@nwlink.com>
-  (undo history, kspell-integration)
+  (undo history, tdespell-integration)
 
 - Michael Koch <koch@kde.org>
   (port to KParts)
diff --git a/kate/ChangeLog b/kate/ChangeLog
index 9797ec671..0da6d5cc2 100644
--- a/kate/ChangeLog
+++ b/kate/ChangeLog
@@ -33,7 +33,7 @@
   * some folding fixes (hopefully)
   * memleak fix
   * undo stuff changed a bit, 0 means unlimited like before, show
-    that now in the dialog and add a comment to ktexteditor
+    that now in the dialog and add a comment to tdetexteditor
 
 2002-08-26 Christoph Cullmann <cullmann@kde.org>
   * Fixes for folding, cleanup, move folding tree into the buffer,
diff --git a/kate/Mainpage.dox b/kate/Mainpage.dox
index 8d8515b52..0fc1d9490 100644
--- a/kate/Mainpage.dox
+++ b/kate/Mainpage.dox
@@ -31,6 +31,6 @@ Christoph Cullmann \<cullmann@kde.org\>
 @lgpl
 
 */
-// DOXYGEN_REFERENCES = tdecore kio tdeui kparts interfaces/kdocument interfaces/ktexteditor kjs
+// DOXYGEN_REFERENCES = tdecore kio tdeui tdeparts interfaces/kdocument interfaces/tdetexteditor kjs
 // DOXYGEN_SET_PROJECT_NAME = Kate
 // vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/kate/Makefile.am b/kate/Makefile.am
index 04666d8cb..e39af3b7f 100644
--- a/kate/Makefile.am
+++ b/kate/Makefile.am
@@ -6,6 +6,6 @@ messages:
 	$(EXTRACTATTR) --attr=language,name,Language --attr="language,section,Language Section" data/*.xml >> rc.cpp
 	$(XGETTEXT) `find . -name "*.cpp"` part/*.h -o $(podir)/katepart.pot
 
-DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts
+DOXYGEN_REFERENCES = tdecore dcop kio tdeui tdeparts
 include ../admin/Doxyfile.am
 
diff --git a/kate/data/css.xml b/kate/data/css.xml
index 02ab43036..f3e65d267 100644
--- a/kate/data/css.xml
+++ b/kate/data/css.xml
@@ -17,7 +17,7 @@
         - Added CSS 3 properties "overflow-x", "overflow-y", "text-overflow", "box-shadow" and "outline-offset".
         - Added CSS 3 color values: "rgba", "hsl" and "hsla".
         - Added Gecko CSS properties: "-moz-border-*-colors".
-        - Added background size properties: "background-size" and prefixes: "-o-", "-webkit-" and "-khtml-".
+        - Added background size properties: "background-size" and prefixes: "-o-", "-webkit-" and "-tdehtml-".
 
     - Version 2.01, by Mathieu Bonnet:
         - Added CSS 3 property "border-radius".
@@ -196,7 +196,7 @@
       <item> -o-text-overflow </item>
 
       <!-- konq specific -->
-      <item> -khtml-background-size </item>
+      <item> -tdehtml-background-size </item>
       <item> konq_bgpos_x </item>
       <item> konq_bgpos_y </item>
 
diff --git a/kate/data/katepartreadonlyui.rc b/kate/data/katepartreadonlyui.rc
index 5c899dbfb..e1fff590e 100644
--- a/kate/data/katepartreadonlyui.rc
+++ b/kate/data/katepartreadonlyui.rc
@@ -77,7 +77,7 @@
   </Menu>
 </MenuBar>
 
-<Menu name="ktexteditor_popup" noMerge="1">
+<Menu name="tdetexteditor_popup" noMerge="1">
   <Action name="edit_undo" group="popup_operations" />
   <Action name="edit_redo" group="popup_operations" />
   <Separator group="popup_operations" />
diff --git a/kate/data/katepartui.rc b/kate/data/katepartui.rc
index 13908ad14..7a01434e2 100644
--- a/kate/data/katepartui.rc
+++ b/kate/data/katepartui.rc
@@ -92,7 +92,7 @@
   </Menu>
 </MenuBar>
 
-<Menu name="ktexteditor_popup" noMerge="0">
+<Menu name="tdetexteditor_popup" noMerge="0">
   <Action name="edit_undo" group="popup_operations" />
   <Action name="edit_redo" group="popup_operations" />
   <Separator group="popup_operations" />
diff --git a/kate/data/scss.xml b/kate/data/scss.xml
index 918f5c0b3..cfa6224cf 100644
--- a/kate/data/scss.xml
+++ b/kate/data/scss.xml
@@ -189,7 +189,7 @@
             <item> -o-text-overflow </item>
 
             <!-- konq specific -->
-            <item> -khtml-background-size </item>
+            <item> -tdehtml-background-size </item>
             <item> konq_bgpos_x </item>
             <item> konq_bgpos_y </item>
 
diff --git a/kate/interfaces/CMakeLists.txt b/kate/interfaces/CMakeLists.txt
index c747f184c..f62bcdb0f 100644
--- a/kate/interfaces/CMakeLists.txt
+++ b/kate/interfaces/CMakeLists.txt
@@ -42,6 +42,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK ktexteditor-shared
+  LINK tdetexteditor-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kate/interfaces/Makefile.am b/kate/interfaces/Makefile.am
index 94065cb3c..d14e58f89 100644
--- a/kate/interfaces/Makefile.am
+++ b/kate/interfaces/Makefile.am
@@ -3,10 +3,10 @@ METASOURCES = document.moc view.moc
 lib_LTLIBRARIES = libkatepartinterfaces.la
 
 libkatepartinterfaces_la_SOURCES = interfaces.cpp katecmd.cpp
-libkatepartinterfaces_la_LIBADD   = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDECORE)
+libkatepartinterfaces_la_LIBADD   = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDECORE)
 libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
 
 kateinclude_HEADERS = document.h view.h
 kateincludedir = $(includedir)/kate
 
-INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/kparts -I$(top_srcdir) $(all_includes)
+INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdeparts -I$(top_srcdir) $(all_includes)
diff --git a/kate/interfaces/document.h b/kate/interfaces/document.h
index 023840335..c56600357 100644
--- a/kate/interfaces/document.h
+++ b/kate/interfaces/document.h
@@ -19,24 +19,24 @@
 #ifndef _KATE_DOCUMENT_INCLUDE_
 #define _KATE_DOCUMENT_INCLUDE_
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/undointerface.h>
-#include <ktexteditor/cursorinterface.h>
-#include <ktexteditor/documentinfo.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/selectioninterfaceext.h>
-#include <ktexteditor/blockselectioninterface.h>
-#include <ktexteditor/searchinterface.h>
-#include <ktexteditor/highlightinginterface.h>
-#include <ktexteditor/configinterface.h>
-#include <ktexteditor/configinterfaceextension.h>
-#include <ktexteditor/markinterface.h>
-#include <ktexteditor/markinterfaceextension.h>
-#include <ktexteditor/wordwrapinterface.h>
-#include <ktexteditor/printinterface.h>
-#include <ktexteditor/variableinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/undointerface.h>
+#include <tdetexteditor/cursorinterface.h>
+#include <tdetexteditor/documentinfo.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/selectioninterfaceext.h>
+#include <tdetexteditor/blockselectioninterface.h>
+#include <tdetexteditor/searchinterface.h>
+#include <tdetexteditor/highlightinginterface.h>
+#include <tdetexteditor/configinterface.h>
+#include <tdetexteditor/configinterfaceextension.h>
+#include <tdetexteditor/markinterface.h>
+#include <tdetexteditor/markinterfaceextension.h>
+#include <tdetexteditor/wordwrapinterface.h>
+#include <tdetexteditor/printinterface.h>
+#include <tdetexteditor/variableinterface.h>
 
 #include <kaction.h>
 
diff --git a/kate/interfaces/view.h b/kate/interfaces/view.h
index 20bcdf531..3b2b8a4e1 100644
--- a/kate/interfaces/view.h
+++ b/kate/interfaces/view.h
@@ -19,14 +19,14 @@
 #ifndef _KATE_VIEW_INCLUDE_
 #define _KATE_VIEW_INCLUDE_
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/clipboardinterface.h>
-#include <ktexteditor/popupmenuinterface.h>
-#include <ktexteditor/markinterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/codecompletioninterface.h>
-#include <ktexteditor/dynwordwrapinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/clipboardinterface.h>
+#include <tdetexteditor/popupmenuinterface.h>
+#include <tdetexteditor/markinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
+#include <tdetexteditor/dynwordwrapinterface.h>
 
 class TDEConfig;
 
diff --git a/kate/part/CMakeLists.txt b/kate/part/CMakeLists.txt
index 11e347212..72ac36f8a 100644
--- a/kate/part/CMakeLists.txt
+++ b/kate/part/CMakeLists.txt
@@ -25,7 +25,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/kio/kio
   ${CMAKE_SOURCE_DIR}/kio/kfile
   ${CMAKE_SOURCE_DIR}/kjs
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/tdeprint
   ${CMAKE_SOURCE_DIR}/interfaces
   ${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor
@@ -72,6 +72,6 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy
 tde_add_kpart( ${target}
   SOURCES dummy.cpp
   EMBED kate-static
-  LINK kjs-shared tdeprint-shared katepartinterfaces-shared kutils-shared
+  LINK kjs-shared tdeprint-shared katepartinterfaces-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kate/part/Makefile.am b/kate/part/Makefile.am
index 746c35813..a0e0edbc3 100644
--- a/kate/part/Makefile.am
+++ b/kate/part/Makefile.am
@@ -16,11 +16,11 @@ libkate_la_SOURCES = katesearch.cpp katebuffer.cpp katecmds.cpp \
 
 libkatepart_la_SOURCES = dummy.cpp
 
-libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_TDEPRINT) $(top_builddir)/kutils/libkutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
+libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_TDEPRINT) $(top_builddir)/tdeutils/libtdeutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
 
 libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
-INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/interfaces  -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/tdefx -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes)
+INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/interfaces  -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes)
 
 METASOURCES = AUTO
 
diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp
index 1661c69df..7d930570d 100644
--- a/kate/part/katebuffer.cpp
+++ b/kate/part/katebuffer.cpp
@@ -118,7 +118,7 @@ class KateFileLoader
 
         if (c > 0)
         {
-          // fix utf16 LE, stolen from khtml ;)
+          // fix utf16 LE, stolen from tdehtml ;)
           if ((c >= 2) && (m_codec->mibEnum() == 1000) && (m_buffer[1] == 0x00))
           {
             // utf16LE, we need to put the decoder in LE mode
diff --git a/kate/part/katecodecompletion.h b/kate/part/katecodecompletion.h
index c2bebc841..ce4af0ecf 100644
--- a/kate/part/katecodecompletion.h
+++ b/kate/part/katecodecompletion.h
@@ -28,7 +28,7 @@
 #ifndef __KateCodeCompletion_H__
 #define __KateCodeCompletion_H__
 
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 
 #include <tqvaluelist.h>
 #include <tqstringlist.h>
diff --git a/kate/part/kateconfig.h b/kate/part/kateconfig.h
index 4c1f7294a..a698bc35d 100644
--- a/kate/part/kateconfig.h
+++ b/kate/part/kateconfig.h
@@ -19,7 +19,7 @@
 #ifndef __KATE_CONFIG_H__
 #define __KATE_CONFIG_H__
 
-#include <ktexteditor/markinterface.h>
+#include <tdetexteditor/markinterface.h>
 
 #include <tqbitarray.h>
 #include <tqcolor.h>
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index aa122a7b1..43f5977d8 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -35,8 +35,8 @@
 #include "kateview.h"
 
 
-#include <ktexteditor/configinterfaceextension.h>
-#include <ktexteditor/plugin.h>
+#include <tdetexteditor/configinterfaceextension.h>
+#include <tdetexteditor/plugin.h>
 
 #include <kio/job.h>
 #include <kio/jobclasses.h>
@@ -64,7 +64,7 @@
 #include <kmessagebox.h>
 #include <kmimetypechooser.h>
 #include <knuminput.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kpopupmenu.h>
 #include <kprocess.h>
 #include <kprocio.h>
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index f8f190c14..03c8ac638 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -40,14 +40,14 @@
 #include "katefiletype.h"
 #include "kateschema.h"
 #include "katetemplatehandler.h"
-#include <ktexteditor/plugin.h>
+#include <tdetexteditor/plugin.h>
 
 #include <kio/job.h>
 #include <kio/netaccess.h>
 #include <kio/kfileitem.h>
 
 
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 
 #include <klocale.h>
 #include <kglobal.h>
@@ -112,7 +112,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
   // my dcop object
   setObjId ("KateDocument#"+documentDCOPSuffix());
 
-  // ktexteditor interfaces
+  // tdetexteditor interfaces
   setBlockSelectionInterfaceDCOPSuffix (documentDCOPSuffix());
   setConfigInterfaceDCOPSuffix (documentDCOPSuffix());
   setConfigInterfaceExtensionDCOPSuffix (documentDCOPSuffix());
@@ -2761,7 +2761,7 @@ bool KateDocument::closeURL()
   }
 
   //
-  // first call the normal kparts implementation
+  // first call the normal tdeparts implementation
   //
   if (!KParts::ReadWritePart::closeURL ())
     return false;
diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h
index fec6983e4..1135a66fc 100644
--- a/kate/part/katedocument.h
+++ b/kate/part/katedocument.h
@@ -29,11 +29,11 @@
 
 #include "../interfaces/document.h"
 
-#include <ktexteditor/configinterfaceextension.h>
-#include <ktexteditor/encodinginterface.h>
-#include <ktexteditor/sessionconfiginterface.h>
-#include <ktexteditor/editinterfaceext.h>
-#include <ktexteditor/templateinterface.h>
+#include <tdetexteditor/configinterfaceextension.h>
+#include <tdetexteditor/encodinginterface.h>
+#include <tdetexteditor/sessionconfiginterface.h>
+#include <tdetexteditor/editinterfaceext.h>
+#include <tdetexteditor/templateinterface.h>
 
 #include <dcopobject.h>
 
@@ -955,7 +955,7 @@ class KateDocument : public Kate::Document,
 
   /**
    * Variable Reader
-   * TODO add register functionality/ktexteditor interface
+   * TODO add register functionality/tdetexteditor interface
    */
   private:
     /**
diff --git a/kate/part/katedocumenthelpers.h b/kate/part/katedocumenthelpers.h
index 75c6740d0..b604d47ce 100644
--- a/kate/part/katedocumenthelpers.h
+++ b/kate/part/katedocumenthelpers.h
@@ -23,7 +23,7 @@
 
 #include "../interfaces/document.h"
 
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 #include <tqstringlist.h>
 #include <tqguardedptr.h>
diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h
index 79d3ac011..a01e3a32c 100644
--- a/kate/part/katefactory.h
+++ b/kate/part/katefactory.h
@@ -20,7 +20,7 @@
 #define __KATE_FACTORY_H__
 
 #include "katejscript.h"
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
 
 #include <ktrader.h>
 #include <kinstance.h>
@@ -148,7 +148,7 @@ class KateFactory
 
     /**
      * on start detected plugins
-     * @return list of all at launch detected ktexteditor::plugins
+     * @return list of all at launch detected tdetexteditor::plugins
      */
     inline const KTrader::OfferList &plugins () { return m_plugins; };
 
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index b7703ccdf..28b22c74e 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -52,7 +52,7 @@
 
 namespace KJS {
 
-// taken from khtml
+// taken from tdehtml
 // therefor thx to:
 // Copyright (C) 1999-2003 Harri Porten (porten@kde.org)
 // Copyright (C) 2001-2003 David Faure (faure@kde.org)
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index fa8b21f64..0cb802e97 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -40,7 +40,7 @@
 #include <kcolordialog.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
-#include <ktexteditor/markinterface.h>
+#include <tdetexteditor/markinterface.h>
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp
index 6ce2b2a72..77e693fa6 100644
--- a/kate/part/katespell.cpp
+++ b/kate/part/katespell.cpp
@@ -28,7 +28,7 @@
 
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kspell.h>
+#include <tdespell.h>
 #include <ksconfig.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
@@ -36,18 +36,18 @@
 KateSpell::KateSpell( KateView* view )
   : TQObject( view )
   , m_view (view)
-  , m_kspell (0)
+  , m_tdespell (0)
 {
 }
 
 KateSpell::~KateSpell()
 {
-  // kspell stuff
-  if( m_kspell )
+  // tdespell stuff
+  if( m_tdespell )
   {
-    m_kspell->setAutoDelete(true);
-    m_kspell->cleanUp(); // need a way to wait for this to complete
-    delete m_kspell;
+    m_tdespell->setAutoDelete(true);
+    m_tdespell->cleanUp(); // need a way to wait for this to complete
+    delete m_tdespell;
   }
 }
 
@@ -122,27 +122,27 @@ void KateSpell::spellcheck( const KateTextCursor &from, const KateTextCursor &to
   else
     kdDebug(13020)<<"KateSpell::spellCheck(): using encoding: "<<enc<<" and KSpell::Type "<<type<<" (for '"<<mt<<"')"<<endl;
 
-  m_kspell = new KSpell( m_view, i18n("Spellcheck"),
+  m_tdespell = new KSpell( m_view, i18n("Spellcheck"),
                          this, TQT_SLOT(ready(KSpell *)), ksc, true, true, type );
 
-  connect( m_kspell, TQT_SIGNAL(death()),
+  connect( m_tdespell, TQT_SIGNAL(death()),
            this, TQT_SLOT(spellCleanDone()) );
 
-  connect( m_kspell, TQT_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)),
+  connect( m_tdespell, TQT_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)),
            this, TQT_SLOT(misspelling(const TQString&, const TQStringList&, unsigned int)) );
-  connect( m_kspell, TQT_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)),
+  connect( m_tdespell, TQT_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)),
            this, TQT_SLOT(corrected(const TQString&, const TQString&, unsigned int)) );
-  connect( m_kspell, TQT_SIGNAL(done(const TQString&)),
+  connect( m_tdespell, TQT_SIGNAL(done(const TQString&)),
            this, TQT_SLOT(spellResult(const TQString&)) );
 }
 
 void KateSpell::ready(KSpell *)
 {
-  m_kspell->setProgressResolution( 1 );
+  m_tdespell->setProgressResolution( 1 );
 
-  m_kspell->check( m_view->doc()->text( m_spellStart.line(), m_spellStart.col(), m_spellEnd.line(), m_spellEnd.col() ) );
+  m_tdespell->check( m_view->doc()->text( m_spellStart.line(), m_spellStart.col(), m_spellEnd.line(), m_spellEnd.col() ) );
 
-  kdDebug (13020) << "SPELLING READY STATUS: " << m_kspell->status () << endl;
+  kdDebug (13020) << "SPELLING READY STATUS: " << m_tdespell->status () << endl;
 }
 
 void KateSpell::locatePosition( uint pos, uint& line, uint& col )
@@ -193,12 +193,12 @@ void KateSpell::corrected( const TQString& originalword, const TQString& newword
 void KateSpell::spellResult( const TQString& )
 {
   m_view->clearSelection();
-  m_kspell->cleanUp();
+  m_tdespell->cleanUp();
 }
 
 void KateSpell::spellCleanDone()
 {
-  KSpell::spellStatus status = m_kspell->status();
+  KSpell::spellStatus status = m_tdespell->status();
 
   if( status == KSpell::Error ) {
     KMessageBox::sorry( 0,
@@ -210,8 +210,8 @@ void KateSpell::spellCleanDone()
       i18n("The spelling program seems to have crashed."));
   }
 
-  delete m_kspell;
-  m_kspell = 0;
+  delete m_tdespell;
+  m_tdespell = 0;
 
   kdDebug (13020) << "SPELLING END" << endl;
 }
diff --git a/kate/part/katespell.h b/kate/part/katespell.h
index 870a88194..f5a776c8d 100644
--- a/kate/part/katespell.h
+++ b/kate/part/katespell.h
@@ -71,7 +71,7 @@ class KateSpell : public TQObject
     KateView *m_view;
     KAction *m_spellcheckSelection;
 
-    KSpell *m_kspell;
+    KSpell *m_tdespell;
 
     // define the part of the text to check
     KateTextCursor m_spellStart, m_spellEnd;
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index ca457acaa..193f411fd 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -46,9 +46,9 @@
 #include "kateautoindent.h"
 #include "katespell.h"
 
-#include <ktexteditor/plugin.h>
+#include <tdetexteditor/plugin.h>
 
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 
 #include <kio/netaccess.h>
 
@@ -67,7 +67,7 @@
 #include <kaccel.h>
 #include <klibloader.h>
 #include <kencodingfiledialog.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 #include <ktempfile.h>
 #include <ksavefile.h>
 
diff --git a/kate/part/kateview.h b/kate/part/kateview.h
index f4ec54801..1d6a1016f 100644
--- a/kate/part/kateview.h
+++ b/kate/part/kateview.h
@@ -28,9 +28,9 @@
 
 #include "../interfaces/view.h"
 
-#include <ktexteditor/sessionconfiginterface.h>
-#include <ktexteditor/viewstatusmsginterface.h>
-#include <ktexteditor/texthintinterface.h>
+#include <tdetexteditor/sessionconfiginterface.h>
+#include <tdetexteditor/viewstatusmsginterface.h>
+#include <tdetexteditor/texthintinterface.h>
 
 #include <tqguardedptr.h>
 
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index 109a3c8b1..4f2ef26a5 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -66,7 +66,7 @@
 
 #include "katedocument.h"
 #include "kateview.h"
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include "katejscript.h"
 #include "katedocumenthelpers.h"
 #include "kateconfig.h"
diff --git a/kate/plugins/autobookmarker/Makefile.am b/kate/plugins/autobookmarker/Makefile.am
index 748dbb2e5..4465a88a7 100644
--- a/kate/plugins/autobookmarker/Makefile.am
+++ b/kate/plugins/autobookmarker/Makefile.am
@@ -2,16 +2,16 @@ INCLUDES    = -I$(top_srcdir)/interfaces $(all_includes)
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = ktexteditor_autobookmarker.la
+kde_module_LTLIBRARIES = tdetexteditor_autobookmarker.la
 
-ktexteditor_autobookmarker_la_SOURCES = autobookmarker.cpp
-ktexteditor_autobookmarker_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
-ktexteditor_autobookmarker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+tdetexteditor_autobookmarker_la_SOURCES = autobookmarker.cpp
+tdetexteditor_autobookmarker_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la
+tdetexteditor_autobookmarker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-kde_services_DATA = ktexteditor_autobookmarker.desktop
+kde_services_DATA = tdetexteditor_autobookmarker.desktop
 
 confdir=$(kde_confdir)
-conf_DATA = ktexteditor_autobookmarkerrc
+conf_DATA = tdetexteditor_autobookmarkerrc
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_autobookmarker.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_autobookmarker.pot
diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp
index 2a7a6de45..ceb76eedd 100644
--- a/kate/plugins/autobookmarker/autobookmarker.cpp
+++ b/kate/plugins/autobookmarker/autobookmarker.cpp
@@ -23,10 +23,10 @@
 //BEGIN includes
 #include "autobookmarker.h"
 
-#include <ktexteditor/markinterfaceextension.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/documentinfo.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/markinterfaceextension.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/documentinfo.h>
+#include <tdetexteditor/document.h>
 
 #include <kaction.h>
 #include <kapplication.h>
@@ -57,7 +57,7 @@
 //END includes
 
 //BEGIN AutoBookmarker
-K_EXPORT_COMPONENT_FACTORY( ktexteditor_autobookmarker, KGenericFactory<AutoBookmarker>( "ktexteditor_autobookmarker" ) )
+K_EXPORT_COMPONENT_FACTORY( tdetexteditor_autobookmarker, KGenericFactory<AutoBookmarker>( "tdetexteditor_autobookmarker" ) )
 
 AutoBookmarker::AutoBookmarker( TQObject *parent,
                             const char* name,
@@ -199,7 +199,7 @@ void ABGlobal::readConfig()
     m_ents = new ABEntityList;
   else
     m_ents->clear();
-  TDEConfig *config = new TDEConfig("ktexteditor_autobookmarkerrc");
+  TDEConfig *config = new TDEConfig("tdetexteditor_autobookmarkerrc");
 
   uint n( 0 );
   while ( config->hasGroup( TQString("autobookmark%1").arg( n ) ) )
@@ -225,7 +225,7 @@ void ABGlobal::readConfig()
 
 void ABGlobal::writeConfig()
 {
-  TDEConfig *config = new TDEConfig("ktexteditor_autobookmarkerrc");
+  TDEConfig *config = new TDEConfig("tdetexteditor_autobookmarkerrc");
 
   // clean the config object
   TQStringList l = config->groupList();
diff --git a/kate/plugins/autobookmarker/autobookmarker.h b/kate/plugins/autobookmarker/autobookmarker.h
index bdeb2abcf..4a7b998de 100644
--- a/kate/plugins/autobookmarker/autobookmarker.h
+++ b/kate/plugins/autobookmarker/autobookmarker.h
@@ -23,8 +23,8 @@
 #ifndef _AUTOBOOKMARKER_H_
 #define _AUTOBOOKMARKER_H_
 
-#include <ktexteditor/plugin.h>
-#include <ktexteditor/configinterfaceextension.h>
+#include <tdetexteditor/plugin.h>
+#include <tdetexteditor/configinterfaceextension.h>
 
 #include <kdialogbase.h>
 
diff --git a/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop b/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop
index 632d84628..ea5b08247 100644
--- a/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
+++ b/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop
@@ -128,7 +128,7 @@ Comment[uk]=В�тановлює закладки на р�дках, що від
 Comment[vi]=�ặt đánh dấu trên các dòng khớp một mẫu nào đó khi tải tài liệu.
 Comment[zh_CN]=文档装入时根�匹�模�自动设置书签
 Comment[zh_TW]=文件載入時以字串比�演算法來設定書籤。
-X-TDE-Library=ktexteditor_autobookmarker
+X-TDE-Library=tdetexteditor_autobookmarker
 ServiceTypes=KTextEditor/Plugin
 Type=Service
 InitialPreference=8
diff --git a/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc b/kate/plugins/autobookmarker/tdetexteditor_autobookmarkerrc
index 3ed8fe8c5..3ed8fe8c5 100644
--- a/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc
+++ b/kate/plugins/autobookmarker/tdetexteditor_autobookmarkerrc
diff --git a/kate/plugins/insertfile/CMakeLists.txt b/kate/plugins/insertfile/CMakeLists.txt
index 8f4390f64..0c80a1e0c 100644
--- a/kate/plugins/insertfile/CMakeLists.txt
+++ b/kate/plugins/insertfile/CMakeLists.txt
@@ -29,13 +29,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES ktexteditor_insertfile.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES ktexteditor_insertfileui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_insertfile )
+install( FILES tdetexteditor_insertfile.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdetexteditor_insertfileui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_insertfile )
 
 
-##### ktexteditor_insertfile ####################
+##### tdetexteditor_insertfile ####################
 
-set( target ktexteditor_insertfile )
+set( target tdetexteditor_insertfile )
 
 set( ${target}_SRCS
   insertfileplugin.cpp
@@ -43,6 +43,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK ktexteditor-shared
+  LINK tdetexteditor-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kate/plugins/insertfile/Makefile.am b/kate/plugins/insertfile/Makefile.am
index fc8b1e228..1cce05391 100644
--- a/kate/plugins/insertfile/Makefile.am
+++ b/kate/plugins/insertfile/Makefile.am
@@ -2,16 +2,16 @@ INCLUDES    = -I$(top_srcdir)/interfaces $(all_includes)
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = ktexteditor_insertfile.la
+kde_module_LTLIBRARIES = tdetexteditor_insertfile.la
 
-ktexteditor_insertfile_la_SOURCES = insertfileplugin.cpp
-ktexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
-ktexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+tdetexteditor_insertfile_la_SOURCES = insertfileplugin.cpp
+tdetexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
+tdetexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
           
-insertfiledatadir = $(kde_datadir)/ktexteditor_insertfile
-insertfiledata_DATA = ktexteditor_insertfileui.rc
+insertfiledatadir = $(kde_datadir)/tdetexteditor_insertfile
+insertfiledata_DATA = tdetexteditor_insertfileui.rc
 
-kde_services_DATA = ktexteditor_insertfile.desktop
+kde_services_DATA = tdetexteditor_insertfile.desktop
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_insertfile.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_insertfile.pot
diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp
index 082c0ffc9..ee46a7cff 100644
--- a/kate/plugins/insertfile/insertfileplugin.cpp
+++ b/kate/plugins/insertfile/insertfileplugin.cpp
@@ -19,9 +19,9 @@
 #include "insertfileplugin.h"
 #include "insertfileplugin.moc"
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
 
 #include <assert.h>
 #include <kio/job.h>
@@ -37,7 +37,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 
-K_EXPORT_COMPONENT_FACTORY( ktexteditor_insertfile, KGenericFactory<InsertFilePlugin>( "ktexteditor_insertfile" ) )
+K_EXPORT_COMPONENT_FACTORY( tdetexteditor_insertfile, KGenericFactory<InsertFilePlugin>( "tdetexteditor_insertfile" ) )
 
 
 //BEGIN InsertFilePlugin
@@ -77,7 +77,7 @@ InsertFilePluginView::InsertFilePluginView( KTextEditor::View *view, const char
   setInstance( KGenericFactory<InsertFilePlugin>::instance() );
   _job = 0;
   (void) new KAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" );
-  setXMLFile( "ktexteditor_insertfileui.rc" );
+  setXMLFile( "tdetexteditor_insertfileui.rc" );
 }
 
 void InsertFilePluginView::slotInsertFile()
diff --git a/kate/plugins/insertfile/insertfileplugin.h b/kate/plugins/insertfile/insertfileplugin.h
index d6751f0d1..da08a02c7 100644
--- a/kate/plugins/insertfile/insertfileplugin.h
+++ b/kate/plugins/insertfile/insertfileplugin.h
@@ -22,8 +22,8 @@
 #ifndef _INSERT_FILE_PLUGIN_H_
 #define _INSERT_FILE_PLUGIN_H_
 
-#include <ktexteditor/plugin.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/plugin.h>
+#include <tdetexteditor/view.h>
 
 #include <kxmlguiclient.h>
 #include <tqobject.h>
diff --git a/kate/plugins/insertfile/ktexteditor_insertfile.desktop b/kate/plugins/insertfile/tdetexteditor_insertfile.desktop
index 7e08d71b7..493369e29 100644
--- a/kate/plugins/insertfile/ktexteditor_insertfile.desktop
+++ b/kate/plugins/insertfile/tdetexteditor_insertfile.desktop
@@ -149,7 +149,7 @@ Comment[vi]=Chèn bất kỳ tập tin có khả năng Ä‘á»�c tại vị trí cá
 Comment[zh_CN]=在光标�置�入任何�读文件
 Comment[zh_HK]=在游標處�入任�的檔案
 Comment[zh_TW]=在游標處�入任�的�讀檔案
-X-TDE-Library=ktexteditor_insertfile
+X-TDE-Library=tdetexteditor_insertfile
 ServiceTypes=KTextEditor/Plugin
 Type=Service
 InitialPreference=8
diff --git a/kate/plugins/insertfile/ktexteditor_insertfileui.rc b/kate/plugins/insertfile/tdetexteditor_insertfileui.rc
index 36ac0916f..d92e512ff 100644
--- a/kate/plugins/insertfile/ktexteditor_insertfileui.rc
+++ b/kate/plugins/insertfile/tdetexteditor_insertfileui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="ktexteditor_insertfile" library="ktexteditor_insertfile" version="2">
+<kpartplugin name="tdetexteditor_insertfile" library="tdetexteditor_insertfile" version="2">
 <MenuBar>
  <Menu name="tools"><Text>&amp;Tools</Text>
     <separator group="tools_operations" />
diff --git a/kate/plugins/isearch/CMakeLists.txt b/kate/plugins/isearch/CMakeLists.txt
index 693c3a409..38a042973 100644
--- a/kate/plugins/isearch/CMakeLists.txt
+++ b/kate/plugins/isearch/CMakeLists.txt
@@ -27,13 +27,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES ktexteditor_isearch.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES ktexteditor_isearchui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_isearch )
+install( FILES tdetexteditor_isearch.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdetexteditor_isearchui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_isearch )
 
 
-##### ktexteditor_isearch #######################
+##### tdetexteditor_isearch #######################
 
-set( target ktexteditor_isearch )
+set( target tdetexteditor_isearch )
 
 set( ${target}_SRCS
   ISearchPlugin.cpp
@@ -41,6 +41,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK ktexteditor-shared
+  LINK tdetexteditor-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp
index 27d0b138d..26c49576d 100644
--- a/kate/plugins/isearch/ISearchPlugin.cpp
+++ b/kate/plugins/isearch/ISearchPlugin.cpp
@@ -30,7 +30,7 @@
 #include "ISearchPlugin.h"
 #include "ISearchPlugin.moc"
 
-K_EXPORT_COMPONENT_FACTORY( ktexteditor_isearch, KGenericFactory<ISearchPlugin>( "ktexteditor_isearch" ) )
+K_EXPORT_COMPONENT_FACTORY( tdetexteditor_isearch, KGenericFactory<ISearchPlugin>( "tdetexteditor_isearch" ) )
 
 ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
 	: TQObject ( view ), KXMLGUIClient (view)
@@ -139,7 +139,7 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
 // 	action->setChecked( m_autoWrap );
 // 	optionMenu->insert( action );
 
-	setXMLFile( "ktexteditor_isearchui.rc" );
+	setXMLFile( "tdetexteditor_isearchui.rc" );
 }
 
 ISearchPluginView::~ISearchPluginView()
diff --git a/kate/plugins/isearch/ISearchPlugin.h b/kate/plugins/isearch/ISearchPlugin.h
index 836ecbc7e..980630795 100644
--- a/kate/plugins/isearch/ISearchPlugin.h
+++ b/kate/plugins/isearch/ISearchPlugin.h
@@ -19,12 +19,12 @@
 #ifndef _ISearchPlugin_H_
 #define _ISearchPlugin_H_
 
-#include <ktexteditor/plugin.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/searchinterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/selectioninterface.h>        
+#include <tdetexteditor/plugin.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/searchinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/selectioninterface.h>        
 
 #include <kxmlguiclient.h>
 #include <tqobject.h>
diff --git a/kate/plugins/isearch/Makefile.am b/kate/plugins/isearch/Makefile.am
index f71da53e7..cc9356954 100644
--- a/kate/plugins/isearch/Makefile.am
+++ b/kate/plugins/isearch/Makefile.am
@@ -2,17 +2,17 @@ INCLUDES    = -I$(top_srcdir)/interfaces $(all_includes)
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = ktexteditor_isearch.la
+kde_module_LTLIBRARIES = tdetexteditor_isearch.la
 
-ktexteditor_isearch_la_SOURCES = ISearchPlugin.cpp
-ktexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
-ktexteditor_isearch_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+tdetexteditor_isearch_la_SOURCES = ISearchPlugin.cpp
+tdetexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+tdetexteditor_isearch_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
           
-isearchdatadir = $(kde_datadir)/ktexteditor_isearch
-isearchdata_DATA = ktexteditor_isearchui.rc
+isearchdatadir = $(kde_datadir)/tdetexteditor_isearch
+isearchdata_DATA = tdetexteditor_isearchui.rc
 
-kde_services_DATA = ktexteditor_isearch.desktop
+kde_services_DATA = tdetexteditor_isearch.desktop
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_isearch.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_isearch.pot
 
diff --git a/kate/plugins/isearch/ktexteditor_isearch.desktop b/kate/plugins/isearch/tdetexteditor_isearch.desktop
index 2e49615d8..6fb7894c5 100644
--- a/kate/plugins/isearch/ktexteditor_isearch.desktop
+++ b/kate/plugins/isearch/tdetexteditor_isearch.desktop
@@ -146,7 +146,7 @@ Comment[uk]=Також відомий �к "Пошук за вводом"
 Comment[vi]=Cũng được biết như là « Tìm kiếm trong khi gõ ».
 Comment[zh_CN]=也称为“�输���
 Comment[zh_TW]=也稱�「�時�尋�
-X-TDE-Library=ktexteditor_isearch
+X-TDE-Library=tdetexteditor_isearch
 ServiceTypes=KTextEditor/Plugin
 Type=Service
 InitialPreference=8
diff --git a/kate/plugins/isearch/ktexteditor_isearchui.rc b/kate/plugins/isearch/tdetexteditor_isearchui.rc
index d8fc6b5dd..a12fb64a2 100644
--- a/kate/plugins/isearch/ktexteditor_isearchui.rc
+++ b/kate/plugins/isearch/tdetexteditor_isearchui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="ktexteditor_isearch" library="ktexteditor_isearch" version="4">
+<kpartplugin name="tdetexteditor_isearch" library="tdetexteditor_isearch" version="4">
 <MenuBar>
 	<Menu name="edit"><text>&amp;Edit</text>
 		<Action name="edit_isearch" group="edit_find_merge"/>
diff --git a/kate/plugins/kdatatool/CMakeLists.txt b/kate/plugins/kdatatool/CMakeLists.txt
index aba50c79f..1adced175 100644
--- a/kate/plugins/kdatatool/CMakeLists.txt
+++ b/kate/plugins/kdatatool/CMakeLists.txt
@@ -29,13 +29,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES ktexteditor_kdatatool.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES ktexteditor_kdatatoolui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_kdatatool )
+install( FILES tdetexteditor_kdatatool.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdetexteditor_kdatatoolui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_kdatatool )
 
 
-##### ktexteditor_kdatatool #####################
+##### tdetexteditor_kdatatool #####################
 
-set( target ktexteditor_kdatatool )
+set( target tdetexteditor_kdatatool )
 
 set( ${target}_SRCS
   kate_kdatatool.cpp
@@ -43,6 +43,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK ktexteditor-shared
+  LINK tdetexteditor-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kate/plugins/kdatatool/Makefile.am b/kate/plugins/kdatatool/Makefile.am
index 210fa69e8..2d4417d97 100644
--- a/kate/plugins/kdatatool/Makefile.am
+++ b/kate/plugins/kdatatool/Makefile.am
@@ -2,18 +2,18 @@ INCLUDES    = -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdefx $(all_includes)
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = ktexteditor_kdatatool.la
+kde_module_LTLIBRARIES = tdetexteditor_kdatatool.la
 
-ktexteditor_kdatatool_la_SOURCES = kate_kdatatool.cpp
-ktexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
-ktexteditor_kdatatool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+tdetexteditor_kdatatool_la_SOURCES = kate_kdatatool.cpp
+tdetexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
+tdetexteditor_kdatatool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-kdatatooldatadir = $(kde_datadir)/ktexteditor_kdatatool
-kdatatooldata_DATA = ktexteditor_kdatatoolui.rc
+kdatatooldatadir = $(kde_datadir)/tdetexteditor_kdatatool
+kdatatooldata_DATA = tdetexteditor_kdatatoolui.rc
 
-kde_services_DATA = ktexteditor_kdatatool.desktop
+kde_services_DATA = tdetexteditor_kdatatool.desktop
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_kdatatool.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_kdatatool.pot
 
 
diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp
index 3265a77bf..832ff5eb7 100644
--- a/kate/plugins/kdatatool/kate_kdatatool.cpp
+++ b/kate/plugins/kdatatool/kate_kdatatool.cpp
@@ -21,19 +21,19 @@
 #include "kate_kdatatool.moc"
 #include <kgenericfactory.h>
 #include <kaction.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/view.h>
 #include <kdebug.h>
 #include <kdatatool.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/selectioninterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/selectioninterface.h>
 #include <kpopupmenu.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
 #include <kmessagebox.h>
 //END includes
 
 
-K_EXPORT_COMPONENT_FACTORY( ktexteditor_kdatatool, KGenericFactory<KTextEditor::KDataToolPlugin>( "ktexteditor_kdatatool" ) )
+K_EXPORT_COMPONENT_FACTORY( tdetexteditor_kdatatool, KGenericFactory<KTextEditor::KDataToolPlugin>( "tdetexteditor_kdatatool" ) )
 
 namespace KTextEditor {
 
@@ -77,7 +77,7 @@ KDataToolPluginView::KDataToolPluginView( KTextEditor::View *view )
 
 	m_menu = new KActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool");
 	connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShow()));
-	setXMLFile("ktexteditor_kdatatoolui.rc");
+	setXMLFile("tdetexteditor_kdatatoolui.rc");
 
 	m_view = view;
 }
diff --git a/kate/plugins/kdatatool/kate_kdatatool.h b/kate/plugins/kdatatool/kate_kdatatool.h
index fbe4e7bf0..ac437dd16 100644
--- a/kate/plugins/kdatatool/kate_kdatatool.h
+++ b/kate/plugins/kdatatool/kate_kdatatool.h
@@ -21,7 +21,7 @@
 #ifndef _KATE_KDATATOOL_
 #define _KATE_KDATATOOL_
 
-#include <ktexteditor/plugin.h>
+#include <tdetexteditor/plugin.h>
 #include <tqstringlist.h>
 #include <kxmlguiclient.h>
 #include <tqguardedptr.h>
diff --git a/kate/plugins/kdatatool/ktexteditor_kdatatoolui.rc b/kate/plugins/kdatatool/ktexteditor_kdatatoolui.rc
deleted file mode 100644
index b98806200..000000000
--- a/kate/plugins/kdatatool/ktexteditor_kdatatoolui.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE kpartgui>
-<kpartplugin name="ktexteditor_kdatatoolui" library="ktexteditor_kdatatool" version="2">
-
-<Menu name="ktexteditor_popup" noMerge="1">
-  <Action name="popup_dataTool" group="popup_operations"/>
-</Menu>
-
-</kpartplugin>
diff --git a/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop b/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop
index 9f3649521..d8019c570 100644
--- a/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
+++ b/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop
@@ -162,7 +162,7 @@ Comment[zh_CN]=å�¯ç”¨åƒ�辞典(thesaurus)和拼写检查(spell check)这样的æ•
 Comment[zh_HK]=如果有安�的話，啟用��義字字典和拼字檢查等的文字工具
 Comment[zh_TW]=打開資料工具如�義字典與拼字檢查 (如果有安�的話)
 Comment[zu]=Nika amandla amathuluzi edata  anjenge thesaurus kanye nokubheka ukubhalwa kwamagama (uma kufakiwe)
-X-TDE-Library=ktexteditor_kdatatool
+X-TDE-Library=tdetexteditor_kdatatool
 ServiceTypes=KTextEditor/Plugin
 Type=Service
 InitialPreference=8
diff --git a/kate/plugins/kdatatool/tdetexteditor_kdatatoolui.rc b/kate/plugins/kdatatool/tdetexteditor_kdatatoolui.rc
new file mode 100644
index 000000000..ae405e3e7
--- /dev/null
+++ b/kate/plugins/kdatatool/tdetexteditor_kdatatoolui.rc
@@ -0,0 +1,8 @@
+<!DOCTYPE kpartgui>
+<kpartplugin name="tdetexteditor_kdatatoolui" library="tdetexteditor_kdatatool" version="2">
+
+<Menu name="tdetexteditor_popup" noMerge="1">
+  <Action name="popup_dataTool" group="popup_operations"/>
+</Menu>
+
+</kpartplugin>
diff --git a/kate/plugins/wordcompletion/CMakeLists.txt b/kate/plugins/wordcompletion/CMakeLists.txt
index 007b93f20..c09dbda6d 100644
--- a/kate/plugins/wordcompletion/CMakeLists.txt
+++ b/kate/plugins/wordcompletion/CMakeLists.txt
@@ -25,13 +25,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES ktexteditor_docwordcompletion.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES docwordcompletionui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_docwordcompletion )
+install( FILES tdetexteditor_docwordcompletion.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES docwordcompletionui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_docwordcompletion )
 
 
-##### ktexteditor_docwordcompletion #############
+##### tdetexteditor_docwordcompletion #############
 
-set( target ktexteditor_docwordcompletion )
+set( target tdetexteditor_docwordcompletion )
 
 set( ${target}_SRCS
   docwordcompletion.cpp
@@ -39,6 +39,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK ktexteditor-shared
+  LINK tdetexteditor-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kate/plugins/wordcompletion/Makefile.am b/kate/plugins/wordcompletion/Makefile.am
index e79d02fb5..1fd67eaf7 100644
--- a/kate/plugins/wordcompletion/Makefile.am
+++ b/kate/plugins/wordcompletion/Makefile.am
@@ -2,16 +2,16 @@ INCLUDES    = -I$(top_srcdir)/interfaces $(all_includes)
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = ktexteditor_docwordcompletion.la
+kde_module_LTLIBRARIES = tdetexteditor_docwordcompletion.la
 
-ktexteditor_docwordcompletion_la_SOURCES = docwordcompletion.cpp
-ktexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
-ktexteditor_docwordcompletion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+tdetexteditor_docwordcompletion_la_SOURCES = docwordcompletion.cpp
+tdetexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+tdetexteditor_docwordcompletion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-docwordcompletiondatadir = $(kde_datadir)/ktexteditor_docwordcompletion
+docwordcompletiondatadir = $(kde_datadir)/tdetexteditor_docwordcompletion
 docwordcompletiondata_DATA = docwordcompletionui.rc
 
-kde_services_DATA = ktexteditor_docwordcompletion.desktop
+kde_services_DATA = tdetexteditor_docwordcompletion.desktop
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_docwordcompletion.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_docwordcompletion.pot
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index 2c2bbcb23..a468edd13 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -28,10 +28,10 @@
 //BEGIN includes
 #include "docwordcompletion.h"
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/variableinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/variableinterface.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
@@ -40,7 +40,7 @@
 #include <klocale.h>
 #include <kaction.h>
 #include <knotifyclient.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kiconloader.h>
 
 #include <tqregexp.h>
@@ -57,7 +57,7 @@
 //END
 
 //BEGIN DocWordCompletionPlugin
-K_EXPORT_COMPONENT_FACTORY( ktexteditor_docwordcompletion, KGenericFactory<DocWordCompletionPlugin>( "ktexteditor_docwordcompletion" ) )
+K_EXPORT_COMPONENT_FACTORY( tdetexteditor_docwordcompletion, KGenericFactory<DocWordCompletionPlugin>( "tdetexteditor_docwordcompletion" ) )
 DocWordCompletionPlugin::DocWordCompletionPlugin( TQObject *parent,
                             const char* name,
                             const TQStringList& /*args*/ )
diff --git a/kate/plugins/wordcompletion/docwordcompletion.h b/kate/plugins/wordcompletion/docwordcompletion.h
index ed632631a..22b469695 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.h
+++ b/kate/plugins/wordcompletion/docwordcompletion.h
@@ -29,10 +29,10 @@
 #ifndef _DocWordCompletionPlugin_h_
 #define _DocWordCompletionPlugin_h_
 
-#include <ktexteditor/plugin.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/codecompletioninterface.h>
-#include <ktexteditor/configinterfaceextension.h>
+#include <tdetexteditor/plugin.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/codecompletioninterface.h>
+#include <tdetexteditor/configinterfaceextension.h>
 #include <kxmlguiclient.h>
 
 #include <tqevent.h>
diff --git a/kate/plugins/wordcompletion/docwordcompletionui.rc b/kate/plugins/wordcompletion/docwordcompletionui.rc
index f8095e128..fb1c3f7a5 100644
--- a/kate/plugins/wordcompletion/docwordcompletionui.rc
+++ b/kate/plugins/wordcompletion/docwordcompletionui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="ktexteditor_docwordcompletion" library="ktexteditor_docwordcompletion" version="4">
+<kpartplugin name="tdetexteditor_docwordcompletion" library="tdetexteditor_docwordcompletion" version="4">
 <MenuBar>
  <Menu name="tools"><Text>&amp;Tools</Text>
     <separator group="tools_operations" />
diff --git a/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop b/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop
index d0528d90f..b18e1bf84 100644
--- a/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
+++ b/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop
@@ -132,7 +132,7 @@ Comment[uk]=Завершенн� �лів у документі. Пр�ме аб
 Comment[vi]=Khả năng nhập xong từ trong tài liệu, đựa vào chi�u hoặc vào bộ bật lên.
 Comment[zh_CN]=在文档中基于方�或弹出补全��
 Comment[zh_TW]=在編輯文件時的單字補完功能
-X-TDE-Library=ktexteditor_docwordcompletion
+X-TDE-Library=tdetexteditor_docwordcompletion
 ServiceTypes=KTextEditor/Plugin
 Type=Service
 InitialPreference=8
diff --git a/kcert/Makefile.am b/kcert/Makefile.am
deleted file mode 100644
index e5885a494..000000000
--- a/kcert/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-INCLUDES= -I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl -I$(top_srcdir) $(SSL_INCLUDES) $(all_includes)
-
-kde_module_LTLIBRARIES = libkcertpart.la
-
-libkcertpart_la_SOURCES	= kcertpart.cc
-
-libkcertpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-libkcertpart_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_KFILE) $(LIB_TDECORE)
-libkcertpart_la_DEPENDENCIES = $(LIB_KPARTS)
-
-libkcertpart_la_METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = kcertpart.desktop
-
-rcdir = $(kde_datadir)/kcertpart
-rc_DATA = kcertpart.rc
-
diff --git a/kcmshell/CMakeLists.txt b/kcmshell/CMakeLists.txt
index fafd6c2b1..92c2205d0 100644
--- a/kcmshell/CMakeLists.txt
+++ b/kcmshell/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_SOURCE_DIR}/kio
   ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
 link_directories(
@@ -36,6 +36,6 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kutils-shared
+  LINK tdeutils-shared
   DEPENDENCIES dcopidl
 )
diff --git a/kcmshell/Makefile.am b/kcmshell/Makefile.am
index 6e12d9053..9c755d8bb 100644
--- a/kcmshell/Makefile.am
+++ b/kcmshell/Makefile.am
@@ -18,7 +18,7 @@
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # 
 
-AM_CPPFLAGS = -I$(top_srcdir)/kutils $(all_includes)
+AM_CPPFLAGS = -I$(top_srcdir)/tdeutils $(all_includes)
 METASOURCES = AUTO
 
 lib_LTLIBRARIES = 
@@ -26,7 +26,7 @@ bin_PROGRAMS =
 tdeinit_LTLIBRARIES = kcmshell.la
 
 kcmshell_la_SOURCES = main.cpp main.skel
-kcmshell_la_LIBADD = ../kutils/libkutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE)
+kcmshell_la_LIBADD = ../tdeutils/libtdeutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE)
 kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 noinst_HEADERS = main.h
diff --git a/kded/DESIGN b/kded/DESIGN
index 702fca853..e6653807b 100644
--- a/kded/DESIGN
+++ b/kded/DESIGN
@@ -12,9 +12,9 @@ kbuildsycoca recreates the sycoca file by:
 * parsing all .desktop files, replacing global ones by local ones (at any
   level of the hierarchy)
 * creating all objects in memory
-* saving everything in the sycoca file (see below for ksycoca internals)
+* saving everything in the sycoca file (see below for tdesycoca internals)
 * clearing all memory
-* notifying the applications that use ksycoca by a DCOP call to the ksycoca
+* notifying the applications that use tdesycoca by a DCOP call to the tdesycoca
 object (KSycoca::notifyDatabaseChanged()).
 
 Format of the sycoca database file
diff --git a/kded/Makefile.am b/kded/Makefile.am
index ba49c2c8f..1baf30e4f 100644
--- a/kded/Makefile.am
+++ b/kded/Makefile.am
@@ -38,15 +38,15 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
 
 bin_PROGRAMS = kdontchangethehostname kde-menu kmimelist
 
-kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kdontchangethehostname_LDADD = $(LIB_TDECORE)
 kdontchangethehostname_SOURCES = khostname.cpp
 
-kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kmimelist_LDADD = ../kio/libkio.la
 kmimelist_SOURCES = kmimelist.cpp
 
-kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kde_menu_LDADD = $(LIB_KIO)
 kde_menu_SOURCES = kde-menu.cpp
 
diff --git a/kded/README.kded b/kded/README.kded
index f0ff64d41..1cf382279 100644
--- a/kded/README.kded
+++ b/kded/README.kded
@@ -6,10 +6,10 @@ Some of these tasks are built in, others are started on demand.
 
 Built in tasks
 ==============
-*) Checking for newly installed software and updating ksycoca when new
-software is detected. Updating of ksycoca is done by the program kbuildsycoca
+*) Checking for newly installed software and updating tdesycoca when new
+software is detected. Updating of tdesycoca is done by the program kbuildsycoca
 which gets started by kded. When kded is first started it always runs
-kbuildsycoca to ensure that ksycoca is up to date.
+kbuildsycoca to ensure that tdesycoca is up to date.
 
 *) Checking for newly installed update files. Applications can install
 *.upd update files. These *.upd files are used to update configuration files 
@@ -40,9 +40,9 @@ the hostname is checked for changes. The time is specified in milliseconds
 and has a default of 5000 (5 seconds).
 
 CheckSycoca: This option can be used to disable checking for new software.
-ksycoca will still be built when kded starts up and when applications
-explicitly request a rebuild of the ksycoca database. The user can 
-also manually rebuild ksycoca by running the kbuildsycoca program.
+tdesycoca will still be built when kded starts up and when applications
+explicitly request a rebuild of the tdesycoca database. The user can 
+also manually rebuild tdesycoca by running the kbuildsycoca program.
 The default value of this option is "true". Checking can be disabled by 
 setting this option to "false".
 
diff --git a/kded/kbuildimageiofactory.cpp b/kded/kbuildimageiofactory.cpp
index a0a3ce76e..267af31f6 100644
--- a/kded/kbuildimageiofactory.cpp
+++ b/kded/kbuildimageiofactory.cpp
@@ -16,8 +16,8 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include "ksycoca.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocadict.h"
 #include "kresourcelist.h"
 
 #include <kglobal.h>
diff --git a/kded/kbuildimageiofactory.h b/kded/kbuildimageiofactory.h
index 65197e17f..4a1caa81f 100644
--- a/kded/kbuildimageiofactory.h
+++ b/kded/kbuildimageiofactory.h
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 
 /**
- * Service group factory for building ksycoca
+ * Service group factory for building tdesycoca
  * @internal
  */
 class KBuildImageIOFactory : public KImageIOFactory
diff --git a/kded/kbuildprotocolinfofactory.cpp b/kded/kbuildprotocolinfofactory.cpp
index c17b1e772..f3fe698d4 100644
--- a/kded/kbuildprotocolinfofactory.cpp
+++ b/kded/kbuildprotocolinfofactory.cpp
@@ -17,8 +17,8 @@
  **/
 
 #include "kbuildprotocolinfofactory.h"
-#include "ksycoca.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocadict.h"
 #include "kresourcelist.h"
 
 #include <kglobal.h>
diff --git a/kded/kbuildprotocolinfofactory.h b/kded/kbuildprotocolinfofactory.h
index e4ddcf6b8..4230670f4 100644
--- a/kded/kbuildprotocolinfofactory.h
+++ b/kded/kbuildprotocolinfofactory.h
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 
 /**
- * Protocol Info factory for building ksycoca
+ * Protocol Info factory for building tdesycoca
  * @internal
  */
 class KBuildProtocolInfoFactory : public KProtocolInfoFactory
diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp
index 8cc2e9462..7d9406d36 100644
--- a/kded/kbuildservicefactory.cpp
+++ b/kded/kbuildservicefactory.cpp
@@ -18,8 +18,8 @@
  **/
 
 #include "kbuildservicefactory.h"
-#include "ksycoca.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocadict.h"
 #include "kresourcelist.h"
 #include "kmimetype.h"
 
diff --git a/kded/kbuildservicefactory.h b/kded/kbuildservicefactory.h
index eca439c5d..e0497bb9e 100644
--- a/kded/kbuildservicefactory.h
+++ b/kded/kbuildservicefactory.h
@@ -29,7 +29,7 @@
 #include <kbuildservicegroupfactory.h>
 
 /**
- * Service factory for building ksycoca
+ * Service factory for building tdesycoca
  * @internal
  */
 class KBuildServiceFactory : public KServiceFactory
diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp
index e231cd5da..76f27ba57 100644
--- a/kded/kbuildservicegroupfactory.cpp
+++ b/kded/kbuildservicegroupfactory.cpp
@@ -17,8 +17,8 @@
  **/
 
 #include "kbuildservicegroupfactory.h"
-#include "ksycoca.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocadict.h"
 #include "kresourcelist.h"
 
 #include <kglobal.h>
diff --git a/kded/kbuildservicegroupfactory.h b/kded/kbuildservicegroupfactory.h
index 23666fd0f..23b484cdb 100644
--- a/kded/kbuildservicegroupfactory.h
+++ b/kded/kbuildservicegroupfactory.h
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 
 /**
- * Service group factory for building ksycoca
+ * Service group factory for building tdesycoca
  * @internal
  */
 class KBuildServiceGroupFactory : public KServiceGroupFactory
diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp
index c017a91e1..351b7847a 100644
--- a/kded/kbuildservicetypefactory.cpp
+++ b/kded/kbuildservicetypefactory.cpp
@@ -17,8 +17,8 @@
  **/
 
 #include "kbuildservicetypefactory.h"
-#include "ksycoca.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocadict.h"
 #include "kresourcelist.h"
 
 #include <kglobal.h>
diff --git a/kded/kbuildservicetypefactory.h b/kded/kbuildservicetypefactory.h
index a68b8851b..68fb6c8fb 100644
--- a/kded/kbuildservicetypefactory.h
+++ b/kded/kbuildservicetypefactory.h
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 
 /**
- * Service-type factory for building ksycoca
+ * Service-type factory for building tdesycoca
  * @internal
  */
 class KBuildServiceTypeFactory : public KServiceTypeFactory
diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index 59ff8bc18..13a645395 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -104,15 +104,15 @@ static TQString sycocaPath()
 
   if (bGlobalDatabase)
   {
-     path = TDEGlobal::dirs()->saveLocation("services")+"ksycoca";
+     path = TDEGlobal::dirs()->saveLocation("services")+"tdesycoca";
   }
   else
   {
-     TQCString ksycoca_env = getenv("TDESYCOCA");
-     if (ksycoca_env.isEmpty())
-        path = TDEGlobal::dirs()->saveLocation("cache")+"ksycoca";
+     TQCString tdesycoca_env = getenv("TDESYCOCA");
+     if (tdesycoca_env.isEmpty())
+        path = TDEGlobal::dirs()->saveLocation("cache")+"tdesycoca";
      else
-        path = TQFile::decodeName(ksycoca_env);
+        path = TQFile::decodeName(tdesycoca_env);
   }
 
   return path;
@@ -120,9 +120,9 @@ static TQString sycocaPath()
 
 static TQString oldSycocaPath()
 {
-  TQCString ksycoca_env = getenv("TDESYCOCA");
-  if (ksycoca_env.isEmpty())
-     return TDEGlobal::dirs()->saveLocation("tmp")+"ksycoca";
+  TQCString tdesycoca_env = getenv("TDESYCOCA");
+  if (tdesycoca_env.isEmpty())
+     return TDEGlobal::dirs()->saveLocation("tmp")+"tdesycoca";
 
   return TQString::null;
 }
@@ -487,7 +487,7 @@ bool KBuildSycoca::recreate()
 
   m_str = database->dataStream();
 
-  kdDebug(7021) << "Recreating ksycoca file (" << path << ", version " << KSycoca::version() << ")" << endl;
+  kdDebug(7021) << "Recreating tdesycoca file (" << path << ", version " << KSycoca::version() << ")" << endl;
 
   // It is very important to build the servicetype one first
   // Both are registered in KSycoca, no need to keep the pointers
@@ -527,9 +527,9 @@ bool KBuildSycoca::recreate()
   {
     // update the timestamp file
     TQString stamppath = path + "stamp";
-    TQFile ksycocastamp(stamppath);
-    ksycocastamp.open( IO_WriteOnly );
-    TQDataStream str( &ksycocastamp );
+    TQFile tdesycocastamp(stamppath);
+    tdesycocastamp.open( IO_WriteOnly );
+    TQDataStream str( &tdesycocastamp );
     str << newTimestamp;
     str << existingResourceDirs();
     if (g_vfolder)
@@ -566,7 +566,7 @@ void KBuildSycoca::save()
    (*m_str) << TDEGlobal::dirs()->kfsstnd_prefixes();
    (*m_str) << newTimestamp;
    (*m_str) << TDEGlobal::locale()->language();
-   (*m_str) << TDEGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true);
+   (*m_str) << TDEGlobal::dirs()->calcResourceHash("services", "update_tdesycoca", true);
    (*m_str) << (*g_allResourceDirs);
 
    // Write factory data....
@@ -636,10 +636,10 @@ bool KBuildSycoca::checkDirTimestamps( const TQString& dirname, const TQDateTime
    return true;
 }
 
-// check times of last modification of all files on which ksycoca depens,
+// check times of last modification of all files on which tdesycoca depens,
 // and also their directories
-// if all of them all older than the timestamp in file ksycocastamp, this
-// means that there's no need to rebuild ksycoca
+// if all of them all older than the timestamp in file tdesycocastamp, this
+// means that there's no need to rebuild tdesycoca
 bool KBuildSycoca::checkTimestamps( TQ_UINT32 timestamp, const TQStringList &dirs )
 {
    kdDebug( 7021 ) << "checking file timestamps" << endl;
@@ -663,7 +663,7 @@ TQStringList KBuildSycoca::existingResourceDirs()
        return *dirs;
    dirs = new TQStringList;
    g_allResourceDirs = new TQStringList;
-   // these are all resources cached by ksycoca
+   // these are all resources cached by tdesycoca
    TQStringList resources;
    resources += KBuildServiceTypeFactory::resourceTypes();
    resources += KBuildServiceGroupFactory::resourceTypes();
@@ -805,12 +805,12 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
    {
      KSycoca::self()->disableAutoRebuild(); // Prevent deadlock
      TQString current_language = TDEGlobal::locale()->language();
-     TQString ksycoca_language = KSycoca::self()->language();
-     TQ_UINT32 current_update_sig = TDEGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true);
-     TQ_UINT32 ksycoca_update_sig = KSycoca::self()->updateSignature();
+     TQString tdesycoca_language = KSycoca::self()->language();
+     TQ_UINT32 current_update_sig = TDEGlobal::dirs()->calcResourceHash("services", "update_tdesycoca", true);
+     TQ_UINT32 tdesycoca_update_sig = KSycoca::self()->updateSignature();
 
-     if ((current_update_sig != ksycoca_update_sig) ||
-         (current_language != ksycoca_language) ||
+     if ((current_update_sig != tdesycoca_update_sig) ||
+         (current_language != tdesycoca_language) ||
          (KSycoca::self()->timeStamp() == 0))
      {
         incremental = false;
@@ -829,10 +829,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
        TQString path = sycocaPath()+"stamp";
        TQCString qPath = TQFile::encodeName(path);
        cSycocaPath = qPath.data(); // Delete timestamps on crash
-       TQFile ksycocastamp(path);
-       if( ksycocastamp.open( IO_ReadOnly ))
+       TQFile tdesycocastamp(path);
+       if( tdesycocastamp.open( IO_ReadOnly ))
        {
-           TQDataStream str( &ksycocastamp );
+           TQDataStream str( &tdesycocastamp );
            if (!str.atEnd())
                str >> filestamp;
            if (!str.atEnd())
@@ -870,7 +870,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
       g_ctimeDict = 0;
       if (incremental)
       {
-         tqWarning("[kbuildsycoca] Reusing existing ksycoca.");
+         tqWarning("[kbuildsycoca] Reusing existing tdesycoca.");
          KSycoca *oldSycoca = KSycoca::self();
          KSycocaFactoryList *factories = new KSycocaFactoryList;
          g_allEntries = new KSycocaEntryListList;
@@ -940,11 +940,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 
    if (args->isSet("signal"))
    {
-     // Notify ALL applications that have a ksycoca object, using a broadcast
+     // Notify ALL applications that have a tdesycoca object, using a broadcast
      TQByteArray data;
      TQDataStream stream(data, IO_WriteOnly);
      stream << *g_changeList;
-     dcopClient->send( "*", "ksycoca", "notifyDatabaseChanged(TQStringList)", data );
+     dcopClient->send( "*", "tdesycoca", "notifyDatabaseChanged(TQStringList)", data );
    }
 
 #ifdef KBUILDSYCOCA_GUI
diff --git a/kded/kbuildsycoca.h b/kded/kbuildsycoca.h
index f98001781..443f5b120 100644
--- a/kded/kbuildsycoca.h
+++ b/kded/kbuildsycoca.h
@@ -25,9 +25,9 @@
 #include <tqdict.h>
 
 #include <kservice.h>
-#include <ksycoca.h>
-#include <ksycocatype.h>
-#include <ksycocaentry.h>
+#include <tdesycoca.h>
+#include <tdesycocatype.h>
+#include <tdesycocaentry.h>
 #include <kservicegroup.h>
 
 #include "vfolder_menu.h"
@@ -80,7 +80,7 @@ protected:
    bool build();
    
    /**
-    * Save the ksycoca file
+    * Save the tdesycoca file
     */
    void save();
 
diff --git a/kded/kctimefactory.cpp b/kded/kctimefactory.cpp
index 966966a48..f6fd68859 100644
--- a/kded/kctimefactory.cpp
+++ b/kded/kctimefactory.cpp
@@ -17,8 +17,8 @@
  **/
 
 #include "kctimefactory.h"
-#include "ksycoca.h"
-#include "ksycocatype.h"
+#include "tdesycoca.h"
+#include "tdesycocatype.h"
 
 #include <assert.h>
 
diff --git a/kded/kctimefactory.h b/kded/kctimefactory.h
index 64cfe6c19..d415545b1 100644
--- a/kded/kctimefactory.h
+++ b/kded/kctimefactory.h
@@ -19,11 +19,11 @@
 #ifndef __k_ctime_factory_h__
 #define __k_ctime_factory_h__
 
-#include <ksycocafactory.h>
+#include <tdesycocafactory.h>
 #include <tqdict.h>
 
 /**
- * Service group factory for building ksycoca
+ * Service group factory for building tdesycoca
  * @internal
  */
 class KCTimeInfo : public KSycocaFactory
diff --git a/kded/kded.cpp b/kded/kded.cpp
index d06c44c38..11c46e064 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -104,11 +104,11 @@ Kded::Kded(bool checkUpdates, bool new_startup)
 {
   _self = this;
   TQCString cPath;
-  TQCString ksycoca_env = getenv("TDESYCOCA");
-  if (ksycoca_env.isEmpty())
-     cPath = TQFile::encodeName(TDEGlobal::dirs()->saveLocation("tmp")+"ksycoca");
+  TQCString tdesycoca_env = getenv("TDESYCOCA");
+  if (tdesycoca_env.isEmpty())
+     cPath = TQFile::encodeName(TDEGlobal::dirs()->saveLocation("tmp")+"tdesycoca");
   else
-     cPath = ksycoca_env;
+     cPath = tdesycoca_env;
   m_pTimer = new TQTimer(this);
   connect(m_pTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(recreate()));
 
@@ -139,7 +139,7 @@ bool Kded::process(const TQCString &obj, const TQCString &fun,
                    const TQByteArray &data,
                    TQCString &replyType, TQByteArray &replyData)
 {
-  if (obj == "ksycoca") return false; // Ignore this one.
+  if (obj == "tdesycoca") return false; // Ignore this one.
 
   if (m_dontLoad[obj])
      return false;
@@ -484,7 +484,7 @@ void Kded::recreate(bool initial)
       recreateDone();
       if(delayedCheck)
       {
-         // do a proper ksycoca check after a delay
+         // do a proper tdesycoca check after a delay
          TQTimer::singleShot( 60000, this, TQT_SLOT( runDelayedCheck()));
          m_needDelayedCheck = true;
          delayedCheck = false;
@@ -961,7 +961,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
      // anyway, because it was too early, so let's send this signal
      // unconditionnally (David)
      TQByteArray data;
-     client->send( "*", "ksycoca", "notifyDatabaseChanged()", data );
+     client->send( "*", "tdesycoca", "notifyDatabaseChanged()", data );
      client->send( "ksplash", "", "upAndRunning(TQString)",  TQString("kded"));
 #ifdef Q_WS_X11
      XEvent e;
diff --git a/kded/kded.h b/kded/kded.h
index b30549083..93aac0ab6 100644
--- a/kded/kded.h
+++ b/kded/kded.h
@@ -29,8 +29,8 @@
 #include <dcopclient.h>
 #include <dcopobject.h>
 
-#include <ksycoca.h>
-#include <ksycocatype.h>
+#include <tdesycoca.h>
+#include <tdesycocatype.h>
 #include <kdedmodule.h>
 #include <klibloader.h>
 
diff --git a/kdewidgets/Makefile.am b/kdewidgets/Makefile.am
index d5be1e908..dc30a767a 100644
--- a/kdewidgets/Makefile.am
+++ b/kdewidgets/Makefile.am
@@ -25,7 +25,7 @@ INCLUDES = -I$(top_srcdir)/kfile $(all_includes)
 
 bin_PROGRAMS = makekdewidgets
 makekdewidgets_SOURCES = makekdewidgets.cpp
-makekdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+makekdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 makekdewidgets_LDADD = $(LIB_QT) ../tdecore/libtdecore.la 
 
 kde_widget_LTLIBRARIES = kdewidgets.la
diff --git a/kdoctools/customization/entities/general.entities b/kdoctools/customization/entities/general.entities
index 1464f600d..eb43dc8c7 100644
--- a/kdoctools/customization/entities/general.entities
+++ b/kdoctools/customization/entities/general.entities
@@ -248,8 +248,8 @@
 <!ENTITY kmathtool "<application>KMathTool</application>">
 <!ENTITY kmenuedit	"<application>KMenuEdit</application>">
 <!ENTITY kmessedwords	"<application>KMessedWords</application>">
-<!ENTITY kmid	"<application>KMid</application>">
-<!ENTITY kmidi	"<application>KMidi</application>">
+<!ENTITY tdemid	"<application>KMid</application>">
+<!ENTITY tdemidi	"<application>KMidi</application>">
 <!ENTITY kmines	"<application>KMines</application>">
 <!ENTITY kmix	"<application>KMix</application>">
 <!ENTITY kmoon	"<application>KMoon</application>">
@@ -299,7 +299,7 @@
 <!ENTITY kruler	"<application>TDE Screen Ruler</application>">
 <!ENTITY ksame	"<application>KSame</application>">
 <!ENTITY kscd	"<application>KsCD</application>">
-<!ENTITY kscreensaver	"<application>KScreensaver</application>">
+<!ENTITY tdescreensaver	"<application>KScreensaver</application>">
 <!ENTITY ksgmltools	"<application>ksgmltools</application>">
 <!ENTITY kshisen	"<application>KShisen</application>">
 <!ENTITY ksim	"<application>KSim</application>">
@@ -311,7 +311,7 @@
 <!ENTITY ksnapshot	"<application>KSnapshot</application>">
 <!ENTITY ksokoban	"<application>KSokoban</application>">
 <!ENTITY kspaceduel	"<application>KSpaceDuel</application>">
-<!ENTITY kspell	"<application>KSpell</application>">
+<!ENTITY tdespell	"<application>KSpell</application>">
 <!ENTITY ksplash "<application>KSplash</application>">
 <!ENTITY kspread	"<application>KSpread</application>">
 <!ENTITY kstars	"<application>KStars</application>">
@@ -421,5 +421,5 @@
 <!ENTITY kontour	"<application>Kontour</application>">
 <!ENTITY kpanel	"<application>KPanel</application>">
 <!ENTITY kscore	"<application>KScore</application>">
-<!ENTITY tkmidi	"<application>tkmidi</application>">
+<!ENTITY ttdemidi	"<application>ttdemidi</application>">
 <!ENTITY quanta "<application>Quanta</application>">
diff --git a/kdoctools/customization/obsolete/general.entities b/kdoctools/customization/obsolete/general.entities
index ebc4b640d..a54a96fcb 100644
--- a/kdoctools/customization/obsolete/general.entities
+++ b/kdoctools/customization/obsolete/general.entities
@@ -233,8 +233,8 @@
 <!ENTITY kmathtool "<application>KMathTool</application>">
 <!ENTITY kmenuedit	"<application>kmenuedit</application>">
 <!ENTITY kmessedwords	"<application>KMessedWords</application>">
-<!ENTITY kmid	"<application>KMid</application>">
-<!ENTITY kmidi	"<application>KMidi</application>">
+<!ENTITY tdemid	"<application>KMid</application>">
+<!ENTITY tdemidi	"<application>KMidi</application>">
 <!ENTITY kmines	"<application>KMines</application>">
 <!ENTITY kmix	"<application>KMix</application>">
 <!ENTITY kmplot	"<application>KmPlot</application>">
@@ -279,7 +279,7 @@
 <!ENTITY ksame	"<application>KSame</application>">
 <!ENTITY kscd	"<application>KsCD</application>">
 <!ENTITY kscore	"<application>KScore</application>">
-<!ENTITY kscreensaver	"<application>KScreensaver</application>">
+<!ENTITY tdescreensaver	"<application>KScreensaver</application>">
 <!ENTITY ksgmltools	"<application>ksgmltools</application>">
 <!ENTITY kshisen	"<application>KShisen</application>">
 <!ENTITY ksim	"<application>KSim</application>">
@@ -290,7 +290,7 @@
 <!ENTITY ksnapshot	"<application>KSnapshot</application>">
 <!ENTITY ksokoban	"<application>KSokoban</application>">
 <!ENTITY kspaceduel	"<application>KSpaceDuel</application>">
-<!ENTITY kspell	"<application>KSpell</application>">
+<!ENTITY tdespell	"<application>KSpell</application>">
 <!ENTITY kspread	"<application>KSpread</application>">
 <!ENTITY kstars	"<application>KStars</application>">
 <!ENTITY kstart	"<application>kstart</application>">
@@ -357,7 +357,7 @@
 <!ENTITY Solaris	"<trademark>Solaris</trademark>">
 <!ENTITY SuSE	'<acronym><trademark class="registered">SuSE</trademark></acronym>'>
 <!ENTITY ThreeCom	'<trademark class="registered">3Com</trademark>'>
-<!ENTITY tkmidi	"<application>tkmidi</application>">
+<!ENTITY ttdemidi	"<application>ttdemidi</application>">
 <!ENTITY TrueType	'<trademark class="registered">TrueType</trademark>'>
 <!ENTITY UNIX	'<trademark class="registered">UNIX</trademark>'>
 <!ENTITY URL	"<acronym>URL</acronym>">
diff --git a/kdoctools/customization/pl/user.entities b/kdoctools/customization/pl/user.entities
index 509e433d8..73b0c4b3b 100644
--- a/kdoctools/customization/pl/user.entities
+++ b/kdoctools/customization/pl/user.entities
@@ -205,19 +205,19 @@ ktnef
 <!ENTITY ksysguard-narzednik    '<application>Ksysguardem</application>'>
 <!ENTITY ksysguard-miejscownik    '<application>Ksysguardzie</application>'>
 
-<!ENTITY kwallet-mianownik    '<application>Portfel &tde;</application>'>
-<!ENTITY kwallet-dopelniacz    '<application>Portfela &tde;</application>'>
-<!ENTITY kwallet-celownik    '<application>Portfelowi &tde;</application>'>
-<!ENTITY kwallet-biernik    '<application>Portfel &tde;</application>'>
-<!ENTITY kwallet-narzednik    '<application>Portfelem &tde;</application>'>
-<!ENTITY kwallet-miejscownik    '<application>Portfelu &tde;</application>'>
-
-<!ENTITY kwalletmanager-mianownik    '<application>Menedżer portfeli &tde;</application>'>
-<!ENTITY kwalletmanager-dopelniacz    '<application>Menedżera portfeli &tde;</application>'>
-<!ENTITY kwalletmanager-celownik    '<application>Menedżerowi portfeli &tde;</application>'>
-<!ENTITY kwalletmanager-biernik    '<application>Menedżera portfeli &tde;</application>'>
-<!ENTITY kwalletmanager-narzednik    '<application>Menedżerem portfeli &tde;</application>'>
-<!ENTITY kwalletmanager-miejscownik    '<application>Menedżerze portfeli &tde;</application>'>
+<!ENTITY tdewallet-mianownik    '<application>Portfel &tde;</application>'>
+<!ENTITY tdewallet-dopelniacz    '<application>Portfela &tde;</application>'>
+<!ENTITY tdewallet-celownik    '<application>Portfelowi &tde;</application>'>
+<!ENTITY tdewallet-biernik    '<application>Portfel &tde;</application>'>
+<!ENTITY tdewallet-narzednik    '<application>Portfelem &tde;</application>'>
+<!ENTITY tdewallet-miejscownik    '<application>Portfelu &tde;</application>'>
+
+<!ENTITY tdewalletmanager-mianownik    '<application>Menedżer portfeli &tde;</application>'>
+<!ENTITY tdewalletmanager-dopelniacz    '<application>Menedżera portfeli &tde;</application>'>
+<!ENTITY tdewalletmanager-celownik    '<application>Menedżerowi portfeli &tde;</application>'>
+<!ENTITY tdewalletmanager-biernik    '<application>Menedżera portfeli &tde;</application>'>
+<!ENTITY tdewalletmanager-narzednik    '<application>Menedżerem portfeli &tde;</application>'>
+<!ENTITY tdewalletmanager-miejscownik    '<application>Menedżerze portfeli &tde;</application>'>
 
 <!ENTITY noatun-mianownik    '<application>Noatun</application>'>
 <!ENTITY noatun-dopelniacz    '<application>Noatuna</application>'>
diff --git a/khtml/Makefile.am b/khtml/Makefile.am
deleted file mode 100644
index 35825194d..000000000
--- a/khtml/Makefile.am
+++ /dev/null
@@ -1,133 +0,0 @@
-#    This file is part of the KDE libraries
-#    Copyright (C) 1997 Martin Jones (mjones@kde.org)
-#              (C) 1997 Torben Weis (weis@kde.org)
-
-#    This library is free software; you can redistribute it and/or
-#    modify it under the terms of the GNU Library General Public
-#    License as published by the Free Software Foundation; either
-#    version 2 of the License, or (at your option) any later version.
-
-#    This library is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#    Library General Public License for more details.
-
-#    You should have received a copy of the GNU Library General Public License
-#    along with this library; see the file COPYING.LIB.  If not, write to
-#    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#    Boston, MA 02110-1301, USA.
-
-KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
-
-if DOJAVA
-JAVA_SUBDIR=java
-LIBKJAVA=
-endif
-
-SUBDIRS = misc dom css xml html rendering pics $(JAVA_SUBDIR) ecma . kmultipart
-
-CLEANFILES = dummy.cpp
-
-lib_LTLIBRARIES = libkhtml.la
-kde_module_LTLIBRARIES = libkhtmlpart.la khtmlimagepart.la
-
-libkhtml_la_SOURCES = kjserrordlg.ui khtmlview.cpp khtml_part.cpp khtml_run.cpp\
-			khtml_factory.cpp khtml_settings.cc khtml_events.cpp \
-			khtml_ext.cpp khtml_pagecache.cpp khtml_iface.skel \
-			khtml_iface.cc khtml_printsettings.cpp htmlpageinfo.ui \
-			khtmlimage.cpp
-
-libkhtml_la_METASOURCES = AUTO
-
-include_HEADERS = khtmlview.h khtml_part.h khtml_events.h khtml_settings.h khtmldefaults.h
-
-noinst_HEADERS = design.h testkhtml.h test_regression.h khtml_ext.h \
-		 khtml_pagecache.h khtmlimage.h khtmlpart_p.h khtml_printsettings.h \
-		kjserrordlg.ui.h
-
-if include_VERSION_SCRIPT
-VSCRIPT = -Wl,--version-script=$(srcdir)/libkhtml.map
-endif
-
-libkhtml_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(VSCRIPT) $(all_libraries)
-libkhtml_la_LIBADD = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \
-	./rendering/libkhtmlrender.la ./css/libkhtmlcss.la \
-	./misc/libkhtmlmisc.la ecma/libkjs_html.la ./dom/libkhtmldom.la $(LIBKJAVA) \
-	$(LIB_KPARTS) \
-	$(LIBTHAI) \
-	$(top_builddir)/tdeprint/libtdeprint.la  \
-	$(top_builddir)/kutils/libkutils.la \
-	$(top_builddir)/kwallet/client/libkwalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11)
-
-# init_libkhtml is in libkhtml.so; init_libkhtmlpart needs to be in the part
-dummy.cpp: $(srcdir)/Makefile.am
-	echo '#include <tdelibs_export.h>' > $@
-	echo 'extern "C" KDE_EXPORT void* init_libkhtml();' >> $@
-	echo 'extern "C" KDE_EXPORT void* init_libkhtmlpart() { return init_libkhtml(); } ' >> $@
-
-libkhtmlpart_la_SOURCES = dummy.cpp
-libkhtmlpart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-libkhtmlpart_la_LIBADD = libkhtml.la $(LIB_QT)
-
-# init_khtmlimagefactory is in libkhtml.so; init_khtmlimagepart needs to be in the part
-imgdummy.cpp: $(srcdir)/Makefile.am
-	echo '#include <tdelibs_export.h>' > $@
-	echo 'extern "C"  KDE_EXPORT void* init_khtmlimagefactory();' >> $@
-	echo 'extern "C"  KDE_EXPORT void* init_khtmlimagepart() { return init_khtmlimagefactory(); } ' >> $@
-
-khtmlimagepart_la_SOURCES = imgdummy.cpp
-khtmlimagepart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-khtmlimagepart_la_LIBADD = libkhtml.la $(LIB_QT)
-
-INCLUDES = -I$(top_srcdir)/kjs -I$(top_builddir)/kjs -I$(top_srcdir)/kimgio \
-	-I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \
-	-I$(srcdir)/dom -I$(srcdir)/xml -I$(srcdir)/html -I$(srcdir)/css \
-	-I$(top_srcdir)/libltdl \
-	-I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl \
-	-I$(top_srcdir)/tdeprint \
-	-I$(top_srcdir)/interfaces \
-	-I$(top_srcdir)/interfaces/kregexpeditor \
-        -I$(top_srcdir)/kwallet/client \
-	-I$(top_srcdir)/kutils \
-	-I$(top_srcdir) $(all_includes)
-
-servicedir = $(kde_servicesdir)
-service_DATA = khtml.desktop khtmlimage.desktop
-
-rcdir = $(kde_datadir)/khtml
-rc_DATA = khtml.rc khtml_browser.rc khtml_popupmenu.rc
-
-SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
-
-## generate lib documentation
-srcdoc:
-	$(mkinstalldirs) $(SRCDOC_DEST)
-	kdoc -H -d $(SRCDOC_DEST) tdecore \
-	         $(include_HEADERS) -lqt
-
-EXTRA_DIST =  CHANGES DESIGN README.HTMLWidget README.tags 
-
-parser:
-	cd $(srcdir) && \
-	perl scripts/makeattrs && \
-	bash scripts/maketags && \
-	bash scripts/makeprop
-
-## test program
-check_PROGRAMS 	= testkhtml
-EXTRA_PROGRAMS = testkhtml_static testregression
-testkhtml_SOURCES = testkhtml.cpp domtreeview.cpp
-testkhtml_LDADD = libkhtml.la 
-testkhtml_static_SOURCES = testkhtml.cpp domtreeview.cpp 
-testkhtml_static_LDADD = libkhtml.la
-testkhtml_static_LDFLAGS = -static
-testregression_SOURCES = test_regression.cpp test_regression_fontoverload.cpp
-testregression_LDADD = libkhtml.la
-
-DOXYGEN_REFERENCES = tdecore tdeui kio tdefx kparts
-DOXYGEN_EXCLUDE =  test*.* css ecma html java kmultipart misc pics rendering test xml
-
-include ../admin/Doxyfile.am
-
-.PHONY: parser
-
diff --git a/khtml/kmultipart/Makefile.am b/khtml/kmultipart/Makefile.am
deleted file mode 100644
index b79df405d..000000000
--- a/khtml/kmultipart/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-INCLUDES = -I$(top_srcdir)/khtml -I$(top_srcdir)/kio/httpfilter -I$(top_srcdir)/kutils $(all_includes)
-
-# These are not really libraries, but modules dynamically opened.
-# So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/trinity
-kde_module_LTLIBRARIES = libkmultipart.la
-
-libkmultipart_la_SOURCES = kmultipart.cpp
-libkmultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIBZ)
-libkmultipart_la_DEPENDENCIES = $(LIB_KPARTS)
-libkmultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-
-# Automatically generate moc files
-METASOURCES = AUTO
-
-# Install the .desktop file into the kde_services directory
-kde_services_DATA = kmultipart.desktop
-
diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt
index fd1408918..834242bf1 100644
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
@@ -39,7 +39,7 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK ltdlc-static kparts-shared
+  LINK ltdlc-static tdeparts-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index 1f65658d9..6cf9293d6 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -166,9 +166,9 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err );
 }
 #endif
 
-/* These are to link libkparts even if 'smart' linker is used */
-#include <kparts/plugin.h>
-extern "C" KParts::Plugin* _kinit_init_kparts() { return new KParts::Plugin(); }
+/* These are to link libtdeparts even if 'smart' linker is used */
+#include <tdeparts/plugin.h>
+extern "C" KParts::Plugin* _kinit_init_tdeparts() { return new KParts::Plugin(); }
 /* These are to link libkio even if 'smart' linker is used */
 #include <kio/authinfo.h>
 extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); }
diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt
index 3bd4ba8b7..cd2dfd80e 100644
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@ -65,7 +65,7 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy
 tde_add_library( ${target} SHARED
   SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
   VERSION 4.2.0
-  EMBED kssl-static kiocore-static ksycoca-static kbookmarks-static kfile-static ${ELFICON_STATIC_LIB}
-  LINK ltdlc-static tdeui-shared tdesu-shared kwalletclient-shared ${LIBR_LIBRARIES}
+  EMBED kssl-static kiocore-static tdesycoca-static kbookmarks-static kfile-static ${ELFICON_STATIC_LIB}
+  LINK ltdlc-static tdeui-shared tdesu-shared tdewalletclient-shared ${LIBR_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kio/Makefile.am b/kio/Makefile.am
index b639d43df..fbe0d75dc 100644
--- a/kio/Makefile.am
+++ b/kio/Makefile.am
@@ -29,9 +29,9 @@ libkio_la_SOURCES = dummy.cpp
 libkio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) \
 	$(KDE_MT_LDFLAGS)
 libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \
-	kio/libksycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \
+	kio/libtdesycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \
 	../tdeui/libtdeui.la ../tdesu/libtdesu.la \
-	../kwallet/client/libkwalletclient.la \
+	../tdewallet/client/libtdewalletclient.la \
 	$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 kde_mime_DATA = magic
diff --git a/kio/kfile/ChangeLog b/kio/kfile/ChangeLog
index ac05c86d0..2c9651390 100644
--- a/kio/kfile/ChangeLog
+++ b/kio/kfile/ChangeLog
@@ -622,7 +622,7 @@ Mon Mar 16 11:36:07 1998 Daniel Grana <grana@ie.iwi.unibe.ch>
         a mkdir method to kdir in near future
 
 Mon Mar 16 20:04:00 1998  Martin Jones <mjones@kde.org>
-	* Added booktoken.* to remove dependancy on khtmlw and jscript
+	* Added booktoken.* to remove dependancy on tdehtmlw and jscript
 
 Thu Mar 12 09:32:06 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 	* worked on the dir and file completion, should do both now,
diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp
index 099a7cee5..da61d0a9f 100644
--- a/kio/kfile/kfiledetailview.cpp
+++ b/kio/kfile/kfiledetailview.cpp
@@ -543,7 +543,7 @@ TQDragObject *KFileDetailView::dragObject()
     }
     TQPixmap pixmap;
     if( urls.count() > 1 )
-        pixmap = DesktopIcon( "kmultiple", KIcon::SizeSmall );
+        pixmap = DesktopIcon( "tdemultiple", KIcon::SizeSmall );
     if( pixmap.isNull() )
         pixmap = currentFileItem()->pixmap( KIcon::SizeSmall );
 
diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp
index 5d9977de6..f0ef11bfe 100644
--- a/kio/kfile/kfileiconview.cpp
+++ b/kio/kfile/kfileiconview.cpp
@@ -817,7 +817,7 @@ TQDragObject *KFileIconView::dragObject()
     }
     TQPixmap pixmap;
     if( urls.count() > 1 )
-        pixmap = DesktopIcon( "kmultiple", iconSize() );
+        pixmap = DesktopIcon( "tdemultiple", iconSize() );
     if( pixmap.isNull() )
         pixmap = currentFileItem()->pixmap( iconSize() );
 
diff --git a/kio/kfile/kfiletreeview.cpp b/kio/kfile/kfiletreeview.cpp
index e8451077d..0b8504fd6 100644
--- a/kio/kfile/kfiletreeview.cpp
+++ b/kio/kfile/kfiletreeview.cpp
@@ -262,7 +262,7 @@ TQDragObject * KFileTreeView::dragObject()
    TQPoint hotspot;
    TQPixmap pixmap;
    if( urls.count() > 1 ){
-      pixmap = DesktopIcon( "kmultiple", 16 );
+      pixmap = DesktopIcon( "tdemultiple", 16 );
    }
    if( pixmap.isNull() )
       pixmap = currentKFileTreeViewItem()->fileItem()->pixmap( 16 );
diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp
index efeaa1f02..691487730 100644
--- a/kio/kfile/kopenwith.cpp
+++ b/kio/kfile/kopenwith.cpp
@@ -54,7 +54,7 @@
 #include <kmimetype.h>
 #include <kservicegroup.h>
 #include <klistview.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 #include <kstdguiitem.h>
 
 #include "kopenwith.h"
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
index e9296ca90..0b1f6c05b 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -117,7 +117,7 @@ extern "C" {
 #include <ksqueezedtextlabel.h>
 #include <klibloader.h>
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kmetaprops.h>
 #include <kpreviewprops.h>
 #include <kprocess.h>
@@ -818,7 +818,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
       if ( (*it)->mode() != mode )
         mode = (mode_t)0;
       if ( KMimeType::iconForURL(url, mode) != iconStr )
-        iconStr = "kmultiple";
+        iconStr = "tdemultiple";
       if ( url.directory() != directory )
         directory = TQString::null;
       if ( url.protocol() != protocol )
diff --git a/kio/kfile/kurlrequester.cpp b/kio/kfile/kurlrequester.cpp
index 5d1495127..99e6e96f0 100644
--- a/kio/kfile/kurlrequester.cpp
+++ b/kio/kfile/kurlrequester.cpp
@@ -389,7 +389,7 @@ bool KURLRequester::eventFilter( TQObject *obj, TQEvent *ev )
     if ( ( TQT_BASE_OBJECT(d->edit) == TQT_BASE_OBJECT(obj) ) || ( TQT_BASE_OBJECT(d->combo) == TQT_BASE_OBJECT(obj) ) )
     {
         if (( ev->type() == TQEvent::FocusIn ) || ( ev->type() == TQEvent::FocusOut ))
-            // Forward focusin/focusout events to the urlrequester; needed by file form element in khtml
+            // Forward focusin/focusout events to the urlrequester; needed by file form element in tdehtml
             TQApplication::sendEvent( this, ev );
     }
     return TQWidget::eventFilter( obj, ev );
diff --git a/kio/kio/CMakeLists.txt b/kio/kio/CMakeLists.txt
index 25d4fad83..1a2c3a263 100644
--- a/kio/kio/CMakeLists.txt
+++ b/kio/kio/CMakeLists.txt
@@ -90,9 +90,9 @@ tde_add_library( ${target} STATIC_PIC AUTOMOC
 )
 
 
-##### ksycoca ###################################
+##### tdesycoca ###################################
 
-set( target ksycoca )
+set( target tdesycoca )
 
 set( ${target}_SRCS
   kdirwatch.cpp kfileshare.cpp ksambashare.cpp
diff --git a/kio/kio/Makefile.am b/kio/kio/Makefile.am
index 2034a33b6..63d5fc5d8 100644
--- a/kio/kio/Makefile.am
+++ b/kio/kio/Makefile.am
@@ -20,11 +20,11 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
 
 INCLUDES=  -I$(top_srcdir) -I$(srcdir)/.. -I$(top_srcdir)/tdecore/network -I$(srcdir)/../kssl -I../kssl -I$(srcdir)/../../interfaces  $(all_includes) $(SSL_INCLUDES)
 
-noinst_LTLIBRARIES = libkiocore.la libksycoca.la
+noinst_LTLIBRARIES = libkiocore.la libtdesycoca.la
 
 # convenience lib - no LDFLAGS or LIBADD !
 
-libksycoca_la_SOURCES = \
+libtdesycoca_la_SOURCES = \
 	kdirwatch.cpp \
 	kfileshare.cpp ksambashare.cpp knfsshare.cpp \
 	ktrader.cpp ktraderparse.cpp ktraderparsetree.cpp \
@@ -43,7 +43,7 @@ libksycoca_la_SOURCES = \
 	kfilemetainfo.cpp kdcopservicestarter.cpp \
 	dataslave.cpp dataprotocol.cpp 
 #if USE_POSIX_ACL
-  libksycoca_la_SOURCES += kacl.cpp posixacladdons.cpp
+  libtdesycoca_la_SOURCES += kacl.cpp posixacladdons.cpp
 #endif
 
 include_HEADERS = \
diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp
index 17a220541..08630d110 100644
--- a/kio/kio/kdatatool.cpp
+++ b/kio/kio/kdatatool.cpp
@@ -26,7 +26,7 @@
 #include <kinstance.h>
 
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <tqpixmap.h>
 #include <tqfile.h>
diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp
index 85fb1a37f..a5d34fa07 100644
--- a/kio/kio/kfilemetainfo.cpp
+++ b/kio/kio/kfilemetainfo.cpp
@@ -27,7 +27,7 @@
 
 #include <ktrader.h>
 #include <kstaticdeleter.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kuserprofile.h>
 #include <kdebug.h>
 #include <kmimetype.h>
diff --git a/kio/kio/kimageio.cpp b/kio/kio/kimageio.cpp
index cdbaa8ea3..e983cb945 100644
--- a/kio/kio/kimageio.cpp
+++ b/kio/kio/kimageio.cpp
@@ -24,8 +24,8 @@
 #include <klibloader.h>
 #include <kglobal.h>
 #include <kmimetype.h>
-#include <ksycocaentry.h>
-#include <ksycoca.h>
+#include <tdesycocaentry.h>
+#include <tdesycoca.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 
diff --git a/kio/kio/kimageiofactory.h b/kio/kio/kimageiofactory.h
index 603ef2c0e..6d2d15940 100644
--- a/kio/kio/kimageiofactory.h
+++ b/kio/kio/kimageiofactory.h
@@ -8,7 +8,7 @@
 #ifndef SSK_KIMGIOFACTORY_H
 #define SSK_KIMGIOFACTORY_H
 
-#include "ksycocafactory.h"
+#include "tdesycocafactory.h"
 #include "kimageio.h"
 
 class KImageIOFormat;
diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp
index 397fbc9e9..c6f879a73 100644
--- a/kio/kio/kmimetype.cpp
+++ b/kio/kio/kmimetype.cpp
@@ -56,7 +56,7 @@
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 #include <kde_file.h>
 
 template class KSharedPtr<KMimeType>;
@@ -144,7 +144,7 @@ KMimeType::Ptr KMimeType::mimeType( const TQString& _name )
 
   if ( !mime || !mime->isType( KST_KMimeType ) )
   {
-    // When building ksycoca, findServiceTypeByName doesn't create an object
+    // When building tdesycoca, findServiceTypeByName doesn't create an object
     // but returns one from a dict.
     if ( !KSycoca::self()->isBuilding() )
         delete mime;
@@ -426,7 +426,7 @@ void KMimeType::save( TQDataStream& _str )
 {
   KServiceType::save( _str );
   // Warning adding/removing fields here involves a binary incompatible change - update version
-  // number in ksycoca.h
+  // number in tdesycoca.h
   _str << m_lstPatterns;
 }
 
diff --git a/kio/kio/kmimetype.h b/kio/kio/kmimetype.h
index 8302fa8da..19a846b46 100644
--- a/kio/kio/kmimetype.h
+++ b/kio/kio/kmimetype.h
@@ -29,7 +29,7 @@
 
 #include <kicontheme.h>
 #include <kurl.h>
-#include <ksycocatype.h>
+#include <tdesycocatype.h>
 #include <kservicetype.h>
 
 class KSimpleConfig;
diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp
index b22bbd8dc..8ab3a69ee 100644
--- a/kio/kio/kmimetypechooser.cpp
+++ b/kio/kio/kmimetypechooser.cpp
@@ -25,7 +25,7 @@
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <krun.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/kio/kio/kprotocolinfo.h b/kio/kio/kprotocolinfo.h
index 8ce7ce500..10addc610 100644
--- a/kio/kio/kprotocolinfo.h
+++ b/kio/kio/kprotocolinfo.h
@@ -24,8 +24,8 @@
 #include <tqdatastream.h>
 
 #include <kurl.h>
-#include <ksycocaentry.h>
-#include <ksycocatype.h>
+#include <tdesycocaentry.h>
+#include <tdesycocatype.h>
 
 /**
  * Information about I/O (Internet, etc.) protocols supported by KDE.
diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp
index a5216981f..547df4651 100644
--- a/kio/kio/kservice.cpp
+++ b/kio/kio/kservice.cpp
@@ -51,7 +51,7 @@
 #include "kservicetypefactory.h"
 #include "kservicetype.h"
 #include "kuserprofile.h"
-#include "ksycoca.h"
+#include "tdesycoca.h"
 
 class KService::KServicePrivate
 {
@@ -336,7 +336,7 @@ void KService::load( TQDataStream& s )
   // WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x!
   // !! This data structure should remain binary compatible at all times !!
   // You may add new fields at the end. Make sure to update the version
-  // number in ksycoca.h
+  // number in tdesycoca.h
   s >> m_strType >> m_strName >> m_strExec >> m_strIcon
     >> term >> m_strTerminalOptions
     >> m_strPath >> m_strComment >> m_lstServiceTypes >> def >> m_mapProps
@@ -369,7 +369,7 @@ void KService::save( TQDataStream& s )
   // WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x!
   // !! This data structure should remain binary compatible at all times !!
   // You may add new fields at the end. Make sure to update the version
-  // number in ksycoca.h
+  // number in tdesycoca.h
   s << m_strType << m_strName << m_strExec << m_strIcon
     << term << m_strTerminalOptions
     << m_strPath << m_strComment << m_lstServiceTypes << def << m_mapProps
@@ -879,7 +879,7 @@ void KService::virtual_hook( int id, void* data )
 
 void KService::rebuildKSycoca(TQWidget *parent)
 {
-  KServiceProgressDialog dlg(parent, "ksycoca_progress",
+  KServiceProgressDialog dlg(parent, "tdesycoca_progress",
                       i18n("Updating System Configuration"),
                       i18n("Updating system configuration."));
 
diff --git a/kio/kio/kservice.h b/kio/kio/kservice.h
index 800bacf11..4db478ba6 100644
--- a/kio/kio/kservice.h
+++ b/kio/kio/kservice.h
@@ -25,7 +25,7 @@
 #include <tqvariant.h>
 #include <kicontheme.h>
 
-#include "ksycocaentry.h"
+#include "tdesycocaentry.h"
 
 class TQDataStream;
 class KDesktopFile;
diff --git a/kio/kio/kservicefactory.cpp b/kio/kio/kservicefactory.cpp
index c5784e65a..f4646fa75 100644
--- a/kio/kio/kservicefactory.cpp
+++ b/kio/kio/kservicefactory.cpp
@@ -17,9 +17,9 @@
  **/
 
 #include "kservicefactory.h"
-#include "ksycoca.h"
-#include "ksycocatype.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocatype.h"
+#include "tdesycocadict.h"
 #include "kservice.h"
 
 #include <tqstring.h>
diff --git a/kio/kio/kservicefactory.h b/kio/kio/kservicefactory.h
index 2fd9dd822..4e6df6534 100644
--- a/kio/kio/kservicefactory.h
+++ b/kio/kio/kservicefactory.h
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 
 #include "kservice.h"
-#include "ksycocafactory.h"
+#include "tdesycocafactory.h"
 #include <assert.h>
 
 class KSycoca;
diff --git a/kio/kio/kservicegroup.cpp b/kio/kio/kservicegroup.cpp
index e85991f82..2e27c99b0 100644
--- a/kio/kio/kservicegroup.cpp
+++ b/kio/kio/kservicegroup.cpp
@@ -29,7 +29,7 @@
 #include "kservicegroupfactory.h"
 #include "kservicegroup.h"
 #include "kservice.h"
-#include "ksycoca.h"
+#include "tdesycoca.h"
 
 class KServiceGroup::Private
 {
diff --git a/kio/kio/kservicegroup.h b/kio/kio/kservicegroup.h
index 8e2fa42e6..f2cd5a09f 100644
--- a/kio/kio/kservicegroup.h
+++ b/kio/kio/kservicegroup.h
@@ -28,8 +28,8 @@
 #include <kdesktopfile.h>
 #include <ksortablevaluelist.h>
 
-#include "ksycocaentry.h"
-#include "ksycocatype.h"
+#include "tdesycocaentry.h"
+#include "tdesycocatype.h"
 #include "kservice.h"
 
 class KBuildServiceGroupFactory;
@@ -144,7 +144,7 @@ public:
 
   /**
    * Returns true if the NoDisplay flag was set, i.e. if this
-   * group should be hidden from menus, while still being in ksycoca.
+   * group should be hidden from menus, while still being in tdesycoca.
    * @return true to hide this service group, false to display it
    * @since 3.1
    */
diff --git a/kio/kio/kservicegroupfactory.cpp b/kio/kio/kservicegroupfactory.cpp
index d27fab3e2..56ec0c07f 100644
--- a/kio/kio/kservicegroupfactory.cpp
+++ b/kio/kio/kservicegroupfactory.cpp
@@ -17,9 +17,9 @@
  **/
 
 #include "kservicegroupfactory.h"
-#include "ksycoca.h"
-#include "ksycocatype.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocatype.h"
+#include "tdesycocadict.h"
 #include "kservice.h"
 
 #include <tqstring.h>
diff --git a/kio/kio/kservicegroupfactory.h b/kio/kio/kservicegroupfactory.h
index 5fad77ce6..77bc7c042 100644
--- a/kio/kio/kservicegroupfactory.h
+++ b/kio/kio/kservicegroupfactory.h
@@ -22,7 +22,7 @@
 #include <tqstringlist.h>
 
 #include "kservicegroup.h"
-#include "ksycocafactory.h"
+#include "tdesycocafactory.h"
 #include <assert.h>
 
 class KSycoca;
diff --git a/kio/kio/kservicetype.cpp b/kio/kio/kservicetype.cpp
index 994495921..8565029ee 100644
--- a/kio/kio/kservicetype.cpp
+++ b/kio/kio/kservicetype.cpp
@@ -18,7 +18,7 @@
  **/
 
 #include "kservice.h"
-#include "ksycoca.h"
+#include "tdesycoca.h"
 #include "kservicetype.h"
 #include "kservicetypefactory.h"
 #include "kservicefactory.h"
@@ -138,7 +138,7 @@ KServiceType::save( TQDataStream& _str )
   KSycocaEntry::save( _str );
   // !! This data structure should remain binary compatible at all times !!
   // You may add new fields at the end. Make sure to update the version
-  // number in ksycoca.h
+  // number in tdesycoca.h
   _str << m_strName << m_strIcon << m_strComment << m_mapProps << m_mapPropDefs
        << (TQ_INT8)m_bValid;
 }
diff --git a/kio/kio/kservicetype.h b/kio/kio/kservicetype.h
index f17eb0394..b1cad7284 100644
--- a/kio/kio/kservicetype.h
+++ b/kio/kio/kservicetype.h
@@ -21,7 +21,7 @@
 #ifndef __kservicetype_h__
 #define __kservicetype_h__
 
-#include "ksycocaentry.h"
+#include "tdesycocaentry.h"
 #include "kservice.h"
 
 #include <tqstring.h>
diff --git a/kio/kio/kservicetypefactory.cpp b/kio/kio/kservicetypefactory.cpp
index f7c0f5969..ecf527384 100644
--- a/kio/kio/kservicetypefactory.cpp
+++ b/kio/kio/kservicetypefactory.cpp
@@ -17,9 +17,9 @@
  **/
 
 #include "kservicetypefactory.h"
-#include "ksycoca.h"
-#include "ksycocatype.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocatype.h"
+#include "tdesycocadict.h"
 #include "kservicetype.h"
 #include "kmimetype.h"
 #include "kuserprofile.h"
diff --git a/kio/kio/kservicetypefactory.h b/kio/kio/kservicetypefactory.h
index b1a3c5dab..e18630b2c 100644
--- a/kio/kio/kservicetypefactory.h
+++ b/kio/kio/kservicetypefactory.h
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 #include <tqvaluevector.h>
 
-#include "ksycocafactory.h"
+#include "tdesycocafactory.h"
 #include "kmimetype.h"
 
 class KSycoca;
diff --git a/kio/kio/ktrader.h b/kio/kio/ktrader.h
index 772f0be3a..98891b48d 100644
--- a/kio/kio/ktrader.h
+++ b/kio/kio/ktrader.h
@@ -36,7 +36,7 @@
  * A few examples will make this a lot more clear.
  *
  * Say you have an application that will display HTML.  In this
- * example, you don't want to link to khtml... and furthermore, you
+ * example, you don't want to link to tdehtml... and furthermore, you
  * really don't care if the HTML browser is ours or not, as long as
  * it works.  The way that you formulate your query as well as the way
  * that you execute the browser depends on whether or not you want the
diff --git a/kio/kio/kurifilter.cpp b/kio/kio/kurifilter.cpp
index d1425e9eb..5c50f4fa9 100644
--- a/kio/kio/kurifilter.cpp
+++ b/kio/kio/kurifilter.cpp
@@ -26,7 +26,7 @@
 #include <kmimetype.h>
 #include <klibloader.h>
 #include <kstaticdeleter.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #ifdef HAVE_ELFICON
 #include <tqimage.h>
diff --git a/kio/kio/kuserprofile.cpp b/kio/kio/kuserprofile.cpp
index efc4cbae3..b413b3cd5 100644
--- a/kio/kio/kuserprofile.cpp
+++ b/kio/kio/kuserprofile.cpp
@@ -98,7 +98,7 @@ void KServiceTypeProfile::initStatic()
 //static
 void KServiceTypeProfile::clear()
 {
-    // HACK ksycoca may open the dummy db, in such case the first call to ksycoca
+    // HACK tdesycoca may open the dummy db, in such case the first call to tdesycoca
     // in initStatic() leads to closing the dummy db and clear() being called
     // in the middle of it, making s_lstProfiles be NULL
     if( s_lstProfiles == NULL || s_lstProfiles->count() == 0 )
diff --git a/kio/kio/metainfojob.cpp b/kio/kio/metainfojob.cpp
index 3787fac80..d28914f20 100644
--- a/kio/kio/metainfojob.cpp
+++ b/kio/kio/metainfojob.cpp
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <kfilemetainfo.h>
 #include <kio/kservice.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <tqtimer.h>
 
diff --git a/kio/kioexec/Makefile.am b/kio/kioexec/Makefile.am
index 277a62974..5325ce875 100644
--- a/kio/kioexec/Makefile.am
+++ b/kio/kioexec/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = $(all_includes)
 bin_PROGRAMS = kioexec
 
 kioexec_SOURCES = main.cpp
-kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kioexec_LDADD   = $(LIB_KIO)
 
 noinst_HEADERS = main.h
diff --git a/kio/kpasswdserver/CMakeLists.txt b/kio/kpasswdserver/CMakeLists.txt
index a02d3b50a..5209e53c9 100644
--- a/kio/kpasswdserver/CMakeLists.txt
+++ b/kio/kpasswdserver/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kwallet/client
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
   ${CMAKE_SOURCE_DIR}/kio
 )
 
diff --git a/kio/kpasswdserver/Makefile.am b/kio/kpasswdserver/Makefile.am
index 694718de4..9ba393ef3 100644
--- a/kio/kpasswdserver/Makefile.am
+++ b/kio/kpasswdserver/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 # Makefile.am of tdebase/kioslave/http
 
-INCLUDES= -I$(top_srcdir)/kwallet/client $(all_includes)
+INCLUDES= -I$(top_srcdir)/tdewallet/client $(all_includes)
 
 ####### Files
 
@@ -10,6 +10,6 @@ kde_module_LTLIBRARIES = kded_kpasswdserver.la
 kded_kpasswdserver_la_SOURCES = kpasswdserver.cpp kpasswdserver.skel 
 kded_kpasswdserver_la_METASOURCES = AUTO
 kded_kpasswdserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kpasswdserver_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+kded_kpasswdserver_la_LIBADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/kio/kpasswdserver/kpasswdserver.cpp
index 7b140c467..b6a9aa696 100644
--- a/kio/kpasswdserver/kpasswdserver.cpp
+++ b/kio/kpasswdserver/kpasswdserver.cpp
@@ -34,7 +34,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kio/passdlg.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 
 #include "config.h"
 #ifdef Q_WS_X11
@@ -361,7 +361,7 @@ KPasswdServer::processRequest()
             if ( ( username.isEmpty() || password.isEmpty() )
                 && !KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::PasswordFolder(), makeWalletKey( request->key, info.realmValue )) )
             {
-                // no login+pass provided, check if kwallet has one
+                // no login+pass provided, check if tdewallet has one
                 if ( openWallet( request->windowId ) )
                     hasWalletData = readFromWallet( m_wallet, request->key, info.realmValue, username, password, info.readOnly, knownLogins );
             }
diff --git a/kio/kssl/CMakeLists.txt b/kio/kssl/CMakeLists.txt
index 377cd9d01..a2c9f00d6 100644
--- a/kio/kssl/CMakeLists.txt
+++ b/kio/kssl/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore/network
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kwallet/client
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
 )
 
 
diff --git a/kio/kssl/Makefile.am b/kio/kssl/Makefile.am
index 54f2fc6f5..5d57ab7ab 100644
--- a/kio/kssl/Makefile.am
+++ b/kio/kssl/Makefile.am
@@ -3,7 +3,7 @@
 # somewhere else. Another option for the future (needs testing) would be to
 # change SSL_INCLUDES to .../include/openssl and make the source use #include <foo.h>
 # instead of #include <openssl/foo.h>
-INCLUDES=-I$(top_srcdir)/tdecore/network -I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES)
+INCLUDES=-I$(top_srcdir)/tdecore/network -I$(top_srcdir)/tdewallet/client $(all_includes) $(SSL_INCLUDES)
 
 noinst_LTLIBRARIES = libkssl.la
 KSSLVERSION=	3.0.0
diff --git a/kio/kssl/ksslkeygen.cc b/kio/kssl/ksslkeygen.cc
index a34773989..403632b3a 100644
--- a/kio/kssl/ksslkeygen.cc
+++ b/kio/kssl/ksslkeygen.cc
@@ -31,7 +31,7 @@
 #include <kprogress.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
diff --git a/kio/misc/CMakeLists.txt b/kio/misc/CMakeLists.txt
index 52aa2207a..5212444a2 100644
--- a/kio/misc/CMakeLists.txt
+++ b/kio/misc/CMakeLists.txt
@@ -14,8 +14,8 @@ add_subdirectory( kpac )
 add_subdirectory( tdesasl )
 add_subdirectory( kssld )
 add_subdirectory( kfile )
-add_subdirectory( kwalletd )
-add_subdirectory( kntlm )
+add_subdirectory( tdewalletd )
+add_subdirectory( tdentlm )
 
 add_definitions(
   -D_LARGEFILE64_SOURCE
diff --git a/kio/misc/Makefile.am b/kio/misc/Makefile.am
index cfa5a4c3e..0bafce0f5 100644
--- a/kio/misc/Makefile.am
+++ b/kio/misc/Makefile.am
@@ -20,7 +20,7 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
 
 INCLUDES=  -I$(srcdir)/.. -I$(top_srcdir) -I$(srcdir)/../kssl -I../kssl $(all_includes) $(SSL_INCLUDES)
 
-SUBDIRS = . ksendbugmail kpac tdesasl kssld kfile kwalletd kntlm
+SUBDIRS = . ksendbugmail kpac tdesasl kssld kfile tdewalletd tdentlm
 
 lib_LTLIBRARIES =
 tdeinit_LTLIBRARIES = kio_uiserver.la
@@ -38,11 +38,11 @@ kde_services_DATA = kio_uiserver.desktop
 
 kmailservice_SOURCES = kmailservice.cpp
 kmailservice_LDADD = $(LIB_TDECORE)
-kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 ktelnetservice_SOURCES = ktelnetservice.cpp
 ktelnetservice_LDADD = $(LIB_TDEUI)
-ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 protocol_DATA = kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \
 		mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol
diff --git a/kio/misc/kfile/Makefile.am b/kio/misc/kfile/Makefile.am
index ad5a377a2..605fef7d3 100644
--- a/kio/misc/kfile/Makefile.am
+++ b/kio/misc/kfile/Makefile.am
@@ -5,6 +5,6 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio/kio $(all_includes)
 
 bin_PROGRAMS = kfile
 kfile_SOURCES = fileprops.cpp
-kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kfile_LDADD = $(LIB_KIO)
 
diff --git a/kio/misc/kntlm/Makefile.am b/kio/misc/kntlm/Makefile.am
deleted file mode 100644
index 91efaf40f..000000000
--- a/kio/misc/kntlm/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-INCLUDES=$(all_includes)
-
-lib_LTLIBRARIES = libkntlm.la
-METASOURCES     = AUTO
-
-kntlmincludedir = $(includedir)/kio
-kntlminclude_HEADERS = kntlm.h
-
-libkntlm_la_SOURCES = kntlm.cpp des.cpp
-libkntlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
-libkntlm_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
-
diff --git a/kio/misc/ksendbugmail/Makefile.am b/kio/misc/ksendbugmail/Makefile.am
index f3efb2b2c..b24e36a26 100644
--- a/kio/misc/ksendbugmail/Makefile.am
+++ b/kio/misc/ksendbugmail/Makefile.am
@@ -20,7 +20,7 @@ bin_PROGRAMS = ksendbugmail
 INCLUDES= -I$(srcdir)/.. $(all_includes)
 
 ksendbugmail_SOURCES = main.cpp smtp.cpp
-ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 ksendbugmail_LDADD = ../../libkio.la
 
 METASOURCES = AUTO
diff --git a/kio/misc/kntlm/CMakeLists.txt b/kio/misc/tdentlm/CMakeLists.txt
index 0952f4535..a846d1dcc 100644
--- a/kio/misc/kntlm/CMakeLists.txt
+++ b/kio/misc/tdentlm/CMakeLists.txt
@@ -24,15 +24,15 @@ link_directories(
 
 ##### headers ###################################
 
-install(FILES kntlm.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+install(FILES tdentlm.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
 
 
-##### kntlm ###################################
+##### tdentlm ###################################
 
-set( target kntlm )
+set( target tdentlm )
 
 set( ${target}_SRCS
-  kntlm.cpp des.cpp
+  tdentlm.cpp des.cpp
 )
 
 tde_add_library( ${target} SHARED
diff --git a/kio/misc/tdentlm/Makefile.am b/kio/misc/tdentlm/Makefile.am
new file mode 100644
index 000000000..689d0921d
--- /dev/null
+++ b/kio/misc/tdentlm/Makefile.am
@@ -0,0 +1,12 @@
+INCLUDES=$(all_includes)
+
+lib_LTLIBRARIES = libtdentlm.la
+METASOURCES     = AUTO
+
+tdentlmincludedir = $(includedir)/kio
+tdentlminclude_HEADERS = tdentlm.h
+
+libtdentlm_la_SOURCES = tdentlm.cpp des.cpp
+libtdentlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
+libtdentlm_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+
diff --git a/kio/misc/kntlm/des.cpp b/kio/misc/tdentlm/des.cpp
index bb4fab88b..bb4fab88b 100644
--- a/kio/misc/kntlm/des.cpp
+++ b/kio/misc/tdentlm/des.cpp
diff --git a/kio/misc/kntlm/des.h b/kio/misc/tdentlm/des.h
index 0f6f59dc9..0f6f59dc9 100644
--- a/kio/misc/kntlm/des.h
+++ b/kio/misc/tdentlm/des.h
diff --git a/kio/misc/kntlm/kswap.h b/kio/misc/tdentlm/kswap.h
index 9eca243de..9eca243de 100644
--- a/kio/misc/kntlm/kswap.h
+++ b/kio/misc/tdentlm/kswap.h
diff --git a/kio/misc/kntlm/kntlm.cpp b/kio/misc/tdentlm/tdentlm.cpp
index dd9cd33ec..2ef5d1cb6 100644
--- a/kio/misc/kntlm/kntlm.cpp
+++ b/kio/misc/tdentlm/tdentlm.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 
 #include "des.h"
-#include "kntlm.h"
+#include "tdentlm.h"
 
 TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode )
 {
diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/tdentlm/tdentlm.h
index 06b8febab..06b8febab 100644
--- a/kio/misc/kntlm/kntlm.h
+++ b/kio/misc/tdentlm/tdentlm.h
diff --git a/kio/misc/kwalletd/CMakeLists.txt b/kio/misc/tdewalletd/CMakeLists.txt
index db4f56cb1..4aaa332aa 100644
--- a/kio/misc/kwalletd/CMakeLists.txt
+++ b/kio/misc/tdewalletd/CMakeLists.txt
@@ -17,8 +17,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kwallet/client
-  ${CMAKE_SOURCE_DIR}/kwallet/backend
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
+  ${CMAKE_SOURCE_DIR}/tdewallet/backend
   ${CMAKE_SOURCE_DIR}/kio/kio
 )
 
@@ -29,21 +29,21 @@ link_directories(
 
 ##### other data ################################
 
-install(FILES kwalletd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
+install(FILES tdewalletd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 
 
-#### kded_kwalletd ##############################
+#### kded_tdewalletd ##############################
 
-set( target kded_kwalletd )
+set( target kded_tdewalletd )
 
 set( ${target}_SRCS
-  kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui
+  tdewalletd.cpp tdewalletd.skel ktimeout.cpp tdewalletwizard.ui
   kbetterthankdialogbase.ui
 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdeinit_kded-shared kwalletbackend-shared
+  LINK tdeinit_kded-shared tdewalletbackend-shared
   DEPENDENCIES dcopidl
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kio/misc/kwalletd/Makefile.am b/kio/misc/tdewalletd/Makefile.am
index 1d5b1313c..5d52fa810 100644
--- a/kio/misc/kwalletd/Makefile.am
+++ b/kio/misc/tdewalletd/Makefile.am
@@ -16,20 +16,20 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/kwallet/backend -I$(top_builddir)/kwallet/backend -I$(top_srcdir)/kwallet/client -I$(top_builddir)/kwallet/client $(all_includes)
+INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/tdewallet/backend -I$(top_builddir)/tdewallet/backend -I$(top_srcdir)/tdewallet/client -I$(top_builddir)/tdewallet/client $(all_includes)
 
-kde_module_LTLIBRARIES = kded_kwalletd.la
+kde_module_LTLIBRARIES = kded_tdewalletd.la
 
-kded_kwalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEUI)
-kded_kwalletd_la_SOURCES = kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui kbetterthankdialogbase.ui
+kded_tdewalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version
+kded_tdewalletd_la_LIBADD = $(LIB_KIO) ../../../tdewallet/backend/libtdewalletbackend.la ../../../tdewallet/client/libtdewalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEUI)
+kded_tdewalletd_la_SOURCES = tdewalletd.cpp tdewalletd.skel ktimeout.cpp tdewalletwizard.ui kbetterthankdialogbase.ui
 
 METASOURCES = AUTO
 
-noinst_HEADERS = kwalletd.h ktimeout.h kwalletwizard.ui.h
+noinst_HEADERS = tdewalletd.h ktimeout.h tdewalletwizard.ui.h
 
-services_DATA = kwalletd.desktop
+services_DATA = tdewalletd.desktop
 servicesdir = $(kde_servicesdir)/kded
 
-kwalletwizard.lo: kwalletwizard.ui kwalletwizard.ui.h
+tdewalletwizard.lo: tdewalletwizard.ui tdewalletwizard.ui.h
 kbetterthankdialogbase.lo: kbetterthankdialogbase.ui kbetterthankdialogbase.ui.h
diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui b/kio/misc/tdewalletd/kbetterthankdialogbase.ui
index a02d5def7..a02d5def7 100644
--- a/kio/misc/kwalletd/kbetterthankdialogbase.ui
+++ b/kio/misc/tdewalletd/kbetterthankdialogbase.ui
diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui.h b/kio/misc/tdewalletd/kbetterthankdialogbase.ui.h
index 2b3e16b0d..2b3e16b0d 100644
--- a/kio/misc/kwalletd/kbetterthankdialogbase.ui.h
+++ b/kio/misc/tdewalletd/kbetterthankdialogbase.ui.h
diff --git a/kio/misc/kwalletd/ktimeout.cpp b/kio/misc/tdewalletd/ktimeout.cpp
index c431ecf69..c431ecf69 100644
--- a/kio/misc/kwalletd/ktimeout.cpp
+++ b/kio/misc/tdewalletd/ktimeout.cpp
diff --git a/kio/misc/kwalletd/ktimeout.h b/kio/misc/tdewalletd/ktimeout.h
index 441e4ed77..441e4ed77 100644
--- a/kio/misc/kwalletd/ktimeout.h
+++ b/kio/misc/tdewalletd/ktimeout.h
diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/tdewalletd/tdewalletd.cpp
index afa634c64..3f59f4e91 100644
--- a/kio/misc/kwalletd/kwalletd.cpp
+++ b/kio/misc/tdewalletd/tdewalletd.cpp
@@ -21,8 +21,8 @@
 */
 
 #include "kbetterthankdialogbase.h"
-#include "kwalletwizard.h"
-#include "kwalletd.h"
+#include "tdewalletwizard.h"
+#include "tdewalletd.h"
 #include "ktimeout.h"
 
 #include <dcopclient.h>
@@ -37,7 +37,7 @@
 #include <kmessagebox.h>
 #include <kpassdlg.h>
 #include <kstandarddirs.h>
-#include <kwalletentry.h>
+#include <tdewalletentry.h>
 #include <twin.h>
 
 #include <tqdir.h>
@@ -51,7 +51,7 @@
 #include <assert.h>
 
 extern "C" {
-   KDE_EXPORT KDEDModule *create_kwalletd(const TQCString &name) {
+   KDE_EXPORT KDEDModule *create_tdewalletd(const TQCString &name) {
 	   return new KWalletD(name);
    }
 }
@@ -94,13 +94,13 @@ KWalletD::KWalletD(const TQCString &name)
 	_idleTime = 0;
 	connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int)));
 	reconfigure();
-	TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
+	TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
 	connect(TDEApplication::dcopClient(),
 		TQT_SIGNAL(applicationRemoved(const TQCString&)),
 		this,
 		TQT_SLOT(slotAppUnregistered(const TQCString&)));
 	_dw = new KDirWatch(this, "KWallet Directory Watcher");
-	_dw->addDir(TDEGlobal::dirs()->saveLocation("kwallet"));
+	_dw->addDir(TDEGlobal::dirs()->saveLocation("tdewallet"));
 	_dw->startScan(true);
 	connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty()));
 }
@@ -272,15 +272,15 @@ int KWalletD::open(const TQString& wallet, uint wId) {
 }
 
 
-// Sets up a dialog that will be shown by kwallet.
+// Sets up a dialog that will be shown by tdewallet.
 void KWalletD::setupDialog( TQWidget* dialog, WId wId, const TQCString& appid, bool modal ) {
 	if( wId != 0 ) 
 		KWin::setMainWindow( dialog, wId ); // correct, set dialog parent
 	else {
 		if( appid.isEmpty())
-			kdWarning() << "Using kwallet without parent window!" << endl;
+			kdWarning() << "Using tdewallet without parent window!" << endl;
 		else
-			kdWarning() << "Application '" << appid << "' using kwallet without parent window!" << endl;
+			kdWarning() << "Application '" << appid << "' using tdewallet without parent window!" << endl;
 		// allow dialog activation even if it interrupts, better than trying hacks
 		// with keeping the dialog on top or on all desktops
 		kapp->updateUserTimestamp();
@@ -314,7 +314,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet,
 		setupDialog( wiz, wId, appid, modal );
 		int rc = wiz->exec();
 		if (rc == TQDialog::Accepted) {
-			TDEConfig cfg("kwalletrc");
+			TDEConfig cfg("tdewalletrc");
 			cfg.setGroup("Wallet");
 			cfg.writeEntry("First Use", false);
 			cfg.writeEntry("Enabled", wiz->_useWallet->isChecked());
@@ -344,7 +344,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet,
 			return -1;
 		}
 	} else if (_firstUse) {
-		TDEConfig cfg("kwalletrc");
+		TDEConfig cfg("tdewalletrc");
 		_firstUse = false;
 		cfg.setGroup("Wallet");
 		cfg.writeEntry("First Use", false);
@@ -526,7 +526,7 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
 		}
 		emitDCOPSignal("walletOpened(TQString)", data);
 		if (_wallets.count() == 1 && _launchManager) {
-			TDEApplication::startServiceByDesktopName("kwalletmanager-kwalletd");
+			TDEApplication::startServiceByDesktopName("tdewalletmanager-tdewalletd");
 		}
 	} else {
 		if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) {
@@ -564,7 +564,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 
 	if (response == 0 || response == 1) {
 		if (response == 1) {
-			TDEConfig cfg("kwalletrc");
+			TDEConfig cfg("tdewalletrc");
 			cfg.setGroup("Auto Allow");
 			TQStringList apps = cfg.readListEntry(wallet);
 			if (!apps.contains(thisApp)) {
@@ -575,7 +575,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 			}
 		}
 	} else if (response == 3) {
-		TDEConfig cfg("kwalletrc");
+		TDEConfig cfg("tdewalletrc");
 		cfg.setGroup("Auto Deny");
 		TQStringList apps = cfg.readListEntry(wallet);
 		if (!apps.contains(thisApp)) {
@@ -593,7 +593,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 
 
 int KWalletD::deleteWallet(const TQString& wallet) {
-	TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + TQDir::separator() + wallet + ".kwl";
+	TQString path = TDEGlobal::dirs()->saveLocation("tdewallet") + TQDir::separator() + wallet + ".kwl";
 
 	if (TQFile::exists(path)) {
 		close(wallet, true);
@@ -806,7 +806,7 @@ bool KWalletD::isOpen(int handle) {
 
 
 TQStringList KWalletD::wallets() const {
-	TQString path = TDEGlobal::dirs()->saveLocation("kwallet");
+	TQString path = TDEGlobal::dirs()->saveLocation("tdewallet");
 	TQDir dir(path, "*.kwl");
 	TQStringList rc;
 
@@ -1343,7 +1343,7 @@ void KWalletD::emitWalletListDirty() {
 
 
 void KWalletD::reconfigure() {
-	TDEConfig cfg("kwalletrc");
+	TDEConfig cfg("tdewalletrc");
 	cfg.setGroup("Wallet");
 	_firstUse = cfg.readBoolEntry("First Use", true);
 	_enabled = cfg.readBoolEntry("Enabled", true);
@@ -1511,4 +1511,4 @@ TQString KWalletD::localWallet() {
 }
 
 
-#include "kwalletd.moc"
+#include "tdewalletd.moc"
diff --git a/kio/misc/kwalletd/kwalletd.desktop b/kio/misc/tdewalletd/tdewalletd.desktop
index 7f07fd079..1e65fe0df 100644
--- a/kio/misc/kwalletd/kwalletd.desktop
+++ b/kio/misc/tdewalletd/tdewalletd.desktop
@@ -2,8 +2,8 @@
 Type=Service
 ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
-X-TDE-Library=kwalletd
-X-TDE-FactoryName=kwalletd
+X-TDE-Library=tdewalletd
+X-TDE-FactoryName=tdewalletd
 X-TDE-Kded-autoload=false
 X-TDE-Kded-load-on-demand=true
 Name=KWallet Daemon Module
diff --git a/kio/misc/kwalletd/kwalletd.h b/kio/misc/tdewalletd/tdewalletd.h
index 2aea371ba..b3a315413 100644
--- a/kio/misc/kwalletd/kwalletd.h
+++ b/kio/misc/tdewalletd/tdewalletd.h
@@ -28,7 +28,7 @@
 #include <tqwidget.h>
 #include <tqtimer.h>
 #include <tqguardedptr.h>
-#include "kwalletbackend.h"
+#include "tdewalletbackend.h"
 
 #include <time.h>
 #include <stdlib.h>
diff --git a/kio/misc/kwalletd/kwalletwizard.ui b/kio/misc/tdewalletd/tdewalletwizard.ui
index b79853549..aa3a1c09d 100644
--- a/kio/misc/kwalletd/kwalletwizard.ui
+++ b/kio/misc/tdewalletd/tdewalletwizard.ui
@@ -532,7 +532,7 @@
 <includes>
     <include location="global" impldecl="in declaration">tqcheckbox.h</include>
     <include location="global" impldecl="in implementation">klocale.h</include>
-    <include location="local" impldecl="in implementation">kwalletwizard.ui.h</include>
+    <include location="local" impldecl="in implementation">tdewalletwizard.ui.h</include>
 </includes>
 <Q_SLOTS>
     <slot access="private">passwordPageUpdate()</slot>
diff --git a/kio/misc/kwalletd/kwalletwizard.ui.h b/kio/misc/tdewalletd/tdewalletwizard.ui.h
index a42635e9b..a42635e9b 100644
--- a/kio/misc/kwalletd/kwalletwizard.ui.h
+++ b/kio/misc/tdewalletd/tdewalletwizard.ui.h
diff --git a/kio/tests/Makefile.am b/kio/tests/Makefile.am
index fe0b6d7ca..3a81dfc57 100644
--- a/kio/tests/Makefile.am
+++ b/kio/tests/Makefile.am
@@ -18,15 +18,15 @@
 
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes)
 LDADD = $(LIB_KIO)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
-check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\
+check_PROGRAMS = tdesycocatest getalltest kruntest ktartest kziptest\
                  kioslavetest kdirwatchtest kshredtest speed kurifiltertest \
                  kdefaultprogresstest kmimemagictest \
                  kfiltertest kiopassdlgtest kscantest kdirlistertest \
                  previewtest kionetrctest kdcopcheck metatest \
 		 kmimefromext kpropsdlgtest kmfitest dataprotocoltest \
-		 kprotocolinfotest ksycocaupdatetest netaccesstest jobtest \
+		 kprotocolinfotest tdesycocaupdatetest netaccesstest jobtest \
 		 kurlcompletiontest kmimetypetest kacltest
 
 # Unfortunately some tests depend on the network settings, it seems
@@ -48,7 +48,7 @@ kdefaultprogresstest_SOURCES = kdefaultprogresstest.cpp
 kionetrctest_SOURCES = kionetrctest.cpp
 kiopassdlgtest_SOURCES = kiopassdlgtest.cpp
 kurifiltertest_SOURCES = kurifiltertest.cpp
-ksycocatest_SOURCES = ksycocatest.cpp
+tdesycocatest_SOURCES = tdesycocatest.cpp
 kdcopcheck_SOURCES = kdcopcheck.cpp
 getalltest_SOURCES = getalltest.cpp
 kruntest_SOURCES = kruntest.cpp
@@ -67,7 +67,7 @@ kpropsdlgtest_SOURCES = kpropsdlgtest.cpp
 kmfitest_SOURCES = kmfitest.cpp
 dataprotocoltest_SOURCES = dataprotocoltest.cpp
 kprotocolinfotest_SOURCES = kprotocolinfotest.cpp
-ksycocaupdatetest_SOURCES = ksycocaupdatetest.cpp
+tdesycocaupdatetest_SOURCES = tdesycocaupdatetest.cpp
 netaccesstest_SOURCES = netaccesstest.cpp
 jobtest_SOURCES = jobtest.cpp
 kurlcompletiontest_SOURCES = kurlcompletiontest.cpp
@@ -75,10 +75,10 @@ kmimetypetest_SOURCES = kmimetypetest.cpp
 kacltest_SOURCES = kacltest.cpp
 
 
-check_LTLIBRARIES = kunittest_kdirwatch.la
-kunittest_kdirwatch_la_SOURCES = kdirwatchunittest.cpp
-kunittest_kdirwatch_la_LIBADD = $(LIB_KUNITTEST) $(LIB_KIO)
-kunittest_kdirwatch_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
+check_LTLIBRARIES = tdeunittest_kdirwatch.la
+tdeunittest_kdirwatch_la_SOURCES = kdirwatchunittest.cpp
+tdeunittest_kdirwatch_la_LIBADD = $(LIB_KUNITTEST) $(LIB_KIO)
+tdeunittest_kdirwatch_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
 
 # kfile meta stuff. Comment this in, if you want a small
 # metadata plugin test and "make install".
diff --git a/kio/tests/kdirwatchunittest.cpp b/kio/tests/kdirwatchunittest.cpp
index 870b85de9..3d7505a3f 100644
--- a/kio/tests/kdirwatchunittest.cpp
+++ b/kio/tests/kdirwatchunittest.cpp
@@ -106,7 +106,7 @@ void KDirWatchTest::rename_file(const TQString& from, const TQString& to)
   ::rename(TQFile::encodeName(from), TQFile::encodeName(to));
 }
 
-KUNITTEST_MODULE ( kunittest_kdirwatch, "KDirWatchTest" )
+KUNITTEST_MODULE ( tdeunittest_kdirwatch, "KDirWatchTest" )
 KUNITTEST_MODULE_REGISTER_TESTER (KDirWatchTest)
 
 #define SLEEP() TQApplication::processEvents();
diff --git a/kio/tests/kdirwatchunittest.h b/kio/tests/kdirwatchunittest.h
index 053ab2882..42222a787 100644
--- a/kio/tests/kdirwatchunittest.h
+++ b/kio/tests/kdirwatchunittest.h
@@ -19,8 +19,8 @@
 #include "kdirwatch.h"
 #include "kapplication.h"
 
-#include <kunittest/tester.h>
-#include <kunittest/module.h>
+#include <tdeunittest/tester.h>
+#include <tdeunittest/module.h>
 
 class KDirWatchTest : public KUnitTest::Tester
 {
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp
index a5ed8da9d..820f97403 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -154,7 +154,7 @@ static const KCmdLineOptions options[] =
 int main(int argc, char **argv)
 {
     // Ensure that user configuration doesn't change the results of those tests
-    // TDEHOME needs to be writable though, for a ksycoca database
+    // TDEHOME needs to be writable though, for a tdesycoca database
     setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-kurifiltertest" ), true );
     setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
diff --git a/kio/tests/ksycocatest.cpp b/kio/tests/tdesycocatest.cpp
index 45f94ac3c..45f94ac3c 100644
--- a/kio/tests/ksycocatest.cpp
+++ b/kio/tests/tdesycocatest.cpp
diff --git a/kio/tests/ksycocaupdatetest.cpp b/kio/tests/tdesycocaupdatetest.cpp
index e7778e056..e7778e056 100644
--- a/kio/tests/ksycocaupdatetest.cpp
+++ b/kio/tests/tdesycocaupdatetest.cpp
diff --git a/kioslave/gzip/Makefile.am b/kioslave/gzip/Makefile.am
index 3da565fb7..0ec2e03c9 100644
--- a/kioslave/gzip/Makefile.am
+++ b/kioslave/gzip/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES = -I$(top_srcdir)/kio $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = kgzipfilter.la
diff --git a/kioslave/http/CMakeLists.txt b/kioslave/http/CMakeLists.txt
index 51bcfe092..c093df483 100644
--- a/kioslave/http/CMakeLists.txt
+++ b/kioslave/http/CMakeLists.txt
@@ -64,6 +64,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK httpfilter-static kntlm-shared kio-shared
+  LINK httpfilter-static tdentlm-shared kio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/http/Makefile.am b/kioslave/http/Makefile.am
index f8e099140..5946fc9f8 100644
--- a/kioslave/http/Makefile.am
+++ b/kioslave/http/Makefile.am
@@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = kio_http.la
 
 kio_http_la_SOURCES = http.cc
 kio_http_la_METASOURCES = AUTO
-kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kio/misc/kntlm/libkntlm.la
+kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kio/misc/tdentlm/libtdentlm.la
 kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
 
 kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp
diff --git a/kioslave/http/TODO b/kioslave/http/TODO
index 12a929525..9dbf60a3e 100644
--- a/kioslave/http/TODO
+++ b/kioslave/http/TODO
@@ -20,7 +20,7 @@ features such as locking.
 This might involve an external program to parse the labels, and something to
 configure access accordingly.  There is only some basic things that need to be
 added to kio_http to support this.  The majority of the work has to be done at the
-application level.  A khtml plugin in tdeaddons to do this might be a nice idea.
+application level.  A tdehtml plugin in tdeaddons to do this might be a nice idea.
 
 - P3P support:
 This can also be implemented as a plugin to konqueror and does
diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc
index 0973b0b3b..e1eefa595 100644
--- a/kioslave/http/http.cc
+++ b/kioslave/http/http.cc
@@ -88,7 +88,7 @@
 
 #endif /* HAVE_LIBGSSAPI */
 
-#include <misc/kntlm/kntlm.h>
+#include <misc/tdentlm/tdentlm.h>
 
 using namespace TDEIO;
 
@@ -3982,7 +3982,7 @@ void HTTPProtocol::httpClose( bool keepAlive )
   // Only allow persistent connections for GET requests.
   // NOTE: we might even want to narrow this down to non-form
   // based submit requests which will require a meta-data from
-  // khtml.
+  // tdehtml.
   if (keepAlive && (!m_bUseProxy ||
       m_bPersistentProxyConnection || m_bIsTunneled))
   {
diff --git a/kioslave/http/kcookiejar/CMakeLists.txt b/kioslave/http/kcookiejar/CMakeLists.txt
index eef5e9654..289daa4f0 100644
--- a/kioslave/http/kcookiejar/CMakeLists.txt
+++ b/kioslave/http/kcookiejar/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 
 install( FILES kcookiejar.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 install( FILES kcookiescfg.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
-install( FILES domain_info DESTINATION ${DATA_INSTALL_DIR}/khtml )
+install( FILES domain_info DESTINATION ${DATA_INSTALL_DIR}/tdehtml )
 
 
 ##### kcookiejar ################################
diff --git a/kioslave/http/kcookiejar/Makefile.am b/kioslave/http/kcookiejar/Makefile.am
index 3cfb540fb..431502c12 100644
--- a/kioslave/http/kcookiejar/Makefile.am
+++ b/kioslave/http/kcookiejar/Makefile.am
@@ -27,5 +27,5 @@ update_DATA = kcookiescfg.upd
 updatedir = $(kde_datadir)/kconf_update
 
 cookie_DATA = domain_info
-cookiedir = $(kde_datadir)/khtml
+cookiedir = $(kde_datadir)/tdehtml
 
diff --git a/kioslave/http/kcookiejar/kcookiejar.cpp b/kioslave/http/kcookiejar/kcookiejar.cpp
index f115a6da6..12d92a8df 100644
--- a/kioslave/http/kcookiejar/kcookiejar.cpp
+++ b/kioslave/http/kcookiejar/kcookiejar.cpp
@@ -257,7 +257,7 @@ KCookieJar::KCookieJar()
     m_configChanged = false;
     m_cookiesChanged = false;
     
-    TDEConfig cfg("khtml/domain_info", true, false, "data");
+    TDEConfig cfg("tdehtml/domain_info", true, false, "data");
     TQStringList countries = cfg.readListEntry("twoLevelTLD");
     for(TQStringList::ConstIterator it = countries.begin();
         it != countries.end(); ++it)
diff --git a/kioslave/http/kcookiejar/tests/Makefile.am b/kioslave/http/kcookiejar/tests/Makefile.am
index 44a453feb..4059cdcd1 100644
--- a/kioslave/http/kcookiejar/tests/Makefile.am
+++ b/kioslave/http/kcookiejar/tests/Makefile.am
@@ -9,7 +9,7 @@ check_PROGRAMS = kcookiejartest
 
 kcookiejartest_SOURCES = kcookiejartest.cpp 
 kcookiejartest_LDADD   = $(LIB_KIO)
-kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 check-local: kcookiejartest
 	./kcookiejartest $(srcdir)/cookie.test
diff --git a/kioslave/metainfo/Makefile.am b/kioslave/metainfo/Makefile.am
index e2de616c6..c1d1d295e 100644
--- a/kioslave/metainfo/Makefile.am
+++ b/kioslave/metainfo/Makefile.am
@@ -2,7 +2,7 @@
 ## Makefile.am of tdebase/kioslave/metainfo
 
 INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = kio_metainfo.la
diff --git a/kmdi/Makefile.am b/kmdi/Makefile.am
deleted file mode 100644
index 5e176dc17..000000000
--- a/kmdi/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-SUBDIRS = kmdi . test
-
-INCLUDES = -I$(top_srcdir)/kmdi/res -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_srcdir)/kmdi $(all_includes)
-
-lib_LTLIBRARIES = libkmdi.la
-libkmdi_la_LDFLAGS = $(all_libraries) -version-info 1:0
-libkmdi_la_LIBADD  = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_X11)
-
-libkmdi_la_SOURCES = kmdichildarea.cpp kmdichildfrm.cpp kmdichildfrmcaption.cpp \
-                     kmdichildview.cpp kmdimainfrm.cpp kmditaskbar.cpp kmdidockcontainer.cpp \
-		     kmditoolviewaccessor.cpp kmdiguiclient.cpp kmdidocumentviewtabwidget.cpp \
-                     kmdifocuslist.cpp
-
-include_HEADERS = kmdichildarea.h kmdichildfrm.h kmdichildfrmcaption.h kmdidefines.h \
-                  kmdiiterator.h kmdilistiterator.h kmdimainfrm.h kmdinulliterator.h \
-                  kmditaskbar.h kmdichildview.h kmditoolviewaccessor.h
-
-METASOURCES = AUTO
-
-include ../admin/Doxyfile.am
diff --git a/kmdi/kmdi/Makefile.am b/kmdi/kmdi/Makefile.am
deleted file mode 100644
index 7f16a30dd..000000000
--- a/kmdi/kmdi/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-INCLUDES = -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_srcdir)/kmdi $(all_includes)
-
-lib_LTLIBRARIES = libkmdi2.la
-libkmdi2_la_LDFLAGS = $(all_libraries) -version-info 1:0
-libkmdi2_la_LIBADD  = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
-
-libkmdi2_la_SOURCES = mainwindow.cpp dockcontainer.cpp toolviewaccessor.cpp guiclient.cpp tabwidget.cpp
-
-kmdiincludedir = $(includedir)/kmdi
-kmdiinclude_HEADERS = global.h mainwindow.h toolviewaccessor.h tabwidget.h
-
-METASOURCES = AUTO
-
-include ../../admin/Doxyfile.am
diff --git a/knewstuff/Makefile.am b/knewstuff/Makefile.am
index 50272b343..0f0bc9676 100644
--- a/knewstuff/Makefile.am
+++ b/knewstuff/Makefile.am
@@ -12,17 +12,17 @@ libknewstuff_la_SOURCES = engine.cpp entry.cpp downloaddialog.cpp \
 
 bin_PROGRAMS = khotnewstuff
 
-khotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+khotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 khotnewstuff_LDADD = libknewstuff.la
 khotnewstuff_SOURCES = khotnewstuff.cpp
 
 EXTRA_PROGRAMS = testnewstuff ghns
 
-testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testnewstuff_LDADD   = libknewstuff.la
 testnewstuff_SOURCES = testnewstuff.cpp
 
-ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 ghns_LDADD   = libknewstuff.la
 ghns_SOURCES = ghns.cpp
 
diff --git a/krandr/Makefile.am b/krandr/Makefile.am
deleted file mode 100644
index e95e80f21..000000000
--- a/krandr/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-
-INCLUDES =  -I$(srcdir)/.. $(all_includes)
-
-# For the future: examine if condensing the tons of *_LDFLAGS variables
-# into $(all_libraries) isn't better
-AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
-
-libkrandrincludedir = $(includedir)/libkrandr
-libkrandrinclude_HEADERS = randr.h lowlevel_randr.h ktimerdialog.h libkrandr.h
-
-lib_LTLIBRARIES = libkrandr.la
-libkrandr_la_SOURCES  = randr.cpp lowlevel_randr.c ktimerdialog.cpp libkrandr.cc
-METASOURCES = AUTO
-
-libkrandr_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
-libkrandr_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_QT) $(LIB_XRANDR)
-
-DOXYGEN_REFERENCES = tdecore
-include ../admin/Doxyfile.am
diff --git a/kresources/Makefile.am b/kresources/Makefile.am
deleted file mode 100644
index 315968e78..000000000
--- a/kresources/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-INCLUDES = $(all_includes)
-
-METASOURCES = AUTO
-
-lib_LTLIBRARIES = libkresources.la
-
-libkresources_la_SOURCES = resource.cpp \
-  factory.cpp \
-  manageriface.skel \
-  manageriface.stub \
-  managerimpl.cpp \
-  configwidget.cpp \
-  configdialog.cpp \
-  selectdialog.cpp \
-  configpage.cpp
-
-libkresources_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-libkresources_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
-
-kresincludedir = $(includedir)/kresources
-kresinclude_HEADERS = resource.h \
-  configwidget.h \
-  factory.h \
-  manageriface.h \
-  managerimpl.h \
-  manager.h \
-  selectdialog.h \
-  configdialog.h \
-  configpage.h
-
-kde_module_LTLIBRARIES = kcm_kresources.la
-
-kcm_kresources_la_SOURCES = kcmkresources.cpp
-kcm_kresources_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_kresources_la_LIBADD = libkresources.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
-
-
-check_PROGRAMS = testresources
-
-testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-testresources_LDADD   = libkresources.la
-testresources_SOURCES = testresources.cpp
-
-xdg_apps_DATA = kresources.desktop
-
-servicetypedir = $(kde_servicetypesdir)
-servicetype_DATA = kresources_plugin.desktop kresources_manager.desktop
-
-include ../admin/Doxyfile.am
diff --git a/kspell2/Makefile.am b/kspell2/Makefile.am
deleted file mode 100644
index a3ef1b807..000000000
--- a/kspell2/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-SUBDIRS = . ui tests plugins
-METASOURCES = AUTO
-
-noinst_LTLIBRARIES = libkspell2base.la
-
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -I$(top_srcdir)/kutils $(all_includes)
-
-kspell2baseincludedir = $(includedir)/kspell2
-
-kspell2baseinclude_HEADERS = settings.h filter.h \
-	dictionary.h broker.h \
-	backgroundchecker.h defaultdictionary.h 
-
-libkspell2base_la_SOURCES = settings.cpp broker.cpp \
-	client.cpp filter.cpp backgroundchecker.cpp \
-	backgroundthread.cpp backgroundengine.cpp \
-	defaultdictionary.cpp 
-
-libkspell2base_la_LDFLAGS = -no-undefined $(all_libraries)
-
-servicetype_DATA = kspellclient.desktop
-servicetypedir = $(kde_servicetypesdir)
-
-include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kspell2/plugins/aspell/Makefile.am b/kspell2/plugins/aspell/Makefile.am
deleted file mode 100644
index b3eb64f33..000000000
--- a/kspell2/plugins/aspell/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-METASOURCES = AUTO
-
-AM_CPPFLAGS = -I$(top_srcdir)/kspell2 -I$(top_srcdir) $(all_includes)
-
-# For the future: examine if condensing the tons of *_LDFLAGS variables
-# into $(all_libraries) isn't better
-AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
-
-kde_module_LTLIBRARIES = kspell_aspell.la
-
-kspell_aspell_la_SOURCES = kspell_aspellclient.cpp kspell_aspelldict.cpp
-
-kspell_aspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-kspell_aspell_la_LIBADD = ../../ui/libkspell2.la -laspell $(LIB_QT) $(LIB_TDECORE)
-
-service_DATA = kspell_aspell.desktop
-servicedir = $(kde_servicesdir)
diff --git a/kspell2/plugins/hspell/Makefile.am b/kspell2/plugins/hspell/Makefile.am
deleted file mode 100644
index ebc78472a..000000000
--- a/kspell2/plugins/hspell/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-METASOURCES = AUTO
-
-AM_CPPFLAGS = -I$(top_srcdir)/kspell2 -I$(top_srcdir) $(all_includes)
-
-# For the future: examine if condensing the tons of *_LDFLAGS variables
-# into $(all_libraries) isn't better
-AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
-
-kde_module_LTLIBRARIES = kspell_hspell.la
-
-kspell_hspell_la_SOURCES = kspell_hspellclient.cpp kspell_hspelldict.cpp
-
-kspell_hspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-kspell_hspell_la_LIBADD = ../../ui/libkspell2.la -lhspell -lz $(LIB_QT) $(LIB_TDECORE)
-
-service_DATA = kspell_hspell.desktop
-servicedir = $(kde_servicesdir)
diff --git a/kspell2/plugins/ispell/Makefile.am b/kspell2/plugins/ispell/Makefile.am
deleted file mode 100644
index 2605fe249..000000000
--- a/kspell2/plugins/ispell/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-METASOURCES = AUTO
-
-AM_CPPFLAGS = -I$(top_srcdir)/kspell2 -I$(top_srcdir) $(all_includes)
-
-# For the future: examine if condensing the tons of *_LDFLAGS variables
-# into $(all_libraries) isn't better
-AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
-
-kde_module_LTLIBRARIES = kspell_ispell.la
-
-kspell_ispell_la_SOURCES = kspell_ispellclient.cpp kspell_ispelldict.cpp \
-	correct.cpp		\
-	good.cpp		\
-	hash.cpp		\
-	lookup.cpp		\
-	makedent.cpp		\
-	tgood.cpp		\
-	ispell_checker.cpp
-
-kspell_ispell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-kspell_ispell_la_LIBADD = ../../ui/libkspell2.la  $(LIB_QT) $(LIB_TDECORE)
-
-service_DATA = kspell_ispell.desktop
-servicedir = $(kde_servicesdir)
diff --git a/kspell2/tests/Makefile.am b/kspell2/tests/Makefile.am
deleted file mode 100644
index b47c45927..000000000
--- a/kspell2/tests/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -I$(top_srcdir)/kspell2 -I$(top_srcdir)/kspell2/ui $(all_includes)
-METASOURCES = AUTO
-
-
-check_PROGRAMS = test test_filter backgroundtest \
-	test_dialog test_highlighter test_configdialog
-
-test_SOURCES = test.cpp
-test_LDADD = ../ui/libkspell2.la $(LIB_TDECORE)
-
-test_filter_SOURCES = test_filter.cpp
-test_filter_LDADD = ../ui/libkspell2.la $(LIB_TDECORE)
-
-backgroundtest_SOURCES = backgroundtest.cpp
-backgroundtest_LDADD = ../ui/libkspell2.la $(LIB_TDECORE)
-
-test_dialog_SOURCES = test_dialog.cpp
-test_dialog_LDADD = ../ui/libkspell2.la $(LIB_TDECORE)
-
-test_highlighter_SOURCES = test_highlighter.cpp
-test_highlighter_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_TDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
-
-test_configdialog_SOURCES = test_configdialog.cpp
-test_configdialog_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_TDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
diff --git a/kspell2/ui/Makefile.am b/kspell2/ui/Makefile.am
deleted file mode 100644
index bc1fe608b..000000000
--- a/kspell2/ui/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-METASOURCES = AUTO
-
-lib_LTLIBRARIES = libkspell2.la
-# Put most of the code in a noinst lib, for the unit tests to be able to use internal classes.
-noinst_LTLIBRARIES = libkspell2_noinst.la
-
-KDE_CXXFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT
-INCLUDES = -I$(top_srcdir)/kspell2 $(all_includes)
-
-kspell2includedir = $(includedir)/kspell2
-kspell2include_HEADERS = dialog.h highlighter.h configdialog.h \
-	configwidget.h
-
-libkspell2_noinst_la_SOURCES = kspell2ui.ui configwidget.cpp \
-	highlighter.cpp configui.ui configdialog.cpp
-
-dialog.lo: kspell2ui.h
-
-libkspell2_la_SOURCES = dialog.cpp
-libkspell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
-libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la ../../kutils/libkutils.la  $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KFILE)
diff --git a/kstyles/asteroid/Makefile.am b/kstyles/asteroid/Makefile.am
index 2b8735e08..3d2bcab8c 100644
--- a/kstyles/asteroid/Makefile.am
+++ b/kstyles/asteroid/Makefile.am
@@ -11,7 +11,7 @@ noinst_HEADERS = asteroid.h
 kde_style_LTLIBRARIES = asteroid.la
 
 asteroid_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-asteroid_la_LIBADD = -ltdefx -lkutils
+asteroid_la_LIBADD = -ltdefx -ltdeutils
 asteroid_la_SOURCES = asteroid.cpp
 
 themercdir = $(kde_datadir)/kstyle/themes
diff --git a/kstyles/keramik/Makefile.am b/kstyles/keramik/Makefile.am
index 83e1d4a03..4f3dbebae 100644
--- a/kstyles/keramik/Makefile.am
+++ b/kstyles/keramik/Makefile.am
@@ -15,7 +15,7 @@ noinst_PROGRAMS = genembed
 
 genembed_SOURCES = genembed.cpp
 genembed_LDADD = ../../tdefx/libtdefx.la
-genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 pixmaps.keramik: pics/checkbox-off.png pics/checkbox-on.png pics/combobox-list-bc.png\
 	 pics/combobox-list-bl.png pics/combobox-list-br.png pics/combobox-list-cl.png pics/combobox-list-cr.png\
diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp
index e97cf6aed..77f6b0e1b 100644
--- a/kstyles/plastik/plastik.cpp
+++ b/kstyles/plastik/plastik.cpp
@@ -240,9 +240,9 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
     if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
 	TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
 
-	if( !strcmp(widget->name(), "__khtml") ) { // is it a khtml widget...?
-		khtmlWidgets[widget] = true;
-		connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(khtmlWidgetDestroyed(TQObject*)));
+	if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...?
+		tdehtmlWidgets[widget] = true;
+		connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(tdehtmlWidgetDestroyed(TQObject*)));
 	}
 	
 	// use tqqt_cast where possible to check if the widget inheits one of the classes. might improve
@@ -283,8 +283,8 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
     if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
 	TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
 
-	if( !strcmp(widget->name(), "__khtml") ) { // is it a khtml widget...?
-		khtmlWidgets.remove(widget);
+	if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...?
+		tdehtmlWidgets.remove(widget);
 	}
 	
 	// use tqqt_cast to check if the widget inheits one of the classes.
@@ -314,9 +314,9 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
     KStyle::unPolish(ceData, elementFlags, ptr);
 }
 
-void PlastikStyle::khtmlWidgetDestroyed(TQObject* obj)
+void PlastikStyle::tdehtmlWidgetDestroyed(TQObject* obj)
 {
-    khtmlWidgets.remove(TQT_TQWIDGET(obj));
+    tdehtmlWidgets.remove(TQT_TQWIDGET(obj));
 }
 
 void PlastikStyle::progressBarDestroyed(TQObject* obj)
@@ -719,7 +719,7 @@ void PlastikStyle::renderButton(TQPainter *p,
                                bool mouseOver,
                                bool horizontal,
                                bool enabled,
-                               bool khtmlMode) const
+                               bool tdehtmlMode) const
 {
     // small fix for the kicker buttons...
     if(kickerMode) enabled = true;
@@ -728,7 +728,7 @@ void PlastikStyle::renderButton(TQPainter *p,
 
     uint contourFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom;
     if(!enabled) contourFlags|=Is_Disabled;
-    if(khtmlMode) contourFlags|=Draw_AlphaBlend;
+    if(tdehtmlMode) contourFlags|=Draw_AlphaBlend;
 
     uint surfaceFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom;
     if(horizontal) surfaceFlags|=Is_Horizontal;
@@ -1526,8 +1526,8 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe,
         case PE_ButtonTool:
         case PE_ButtonDropDown:
         case PE_ButtonCommand: {
-            bool khtmlMode = opt.isDefault() ? false : khtmlWidgets.contains(opt.widget());
-            renderButton(p, r, cg, (on||down), mouseOver, true, enabled, khtmlMode );
+            bool tdehtmlMode = opt.isDefault() ? false : tdehtmlWidgets.contains(opt.widget());
+            renderButton(p, r, cg, (on||down), mouseOver, true, enabled, tdehtmlMode );
             break;
         }
 
@@ -1884,12 +1884,12 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe,
 
             // HACK!!
             //
-            // In order to draw nice edges in khtml, we need to paint alpha-blended.
+            // In order to draw nice edges in tdehtml, we need to paint alpha-blended.
             // On the other hand, we can't paint alpha-blended in normal widgets.
             //
-            // In this place there is no reliable way to detect if we are in khtml; the
-            // only thing we know is that khtml buffers its widgets into a pixmap. So
-            // when the paint device is a TQPixmap, chances are high that we are in khtml.
+            // In this place there is no reliable way to detect if we are in tdehtml; the
+            // only thing we know is that tdehtml buffers its widgets into a pixmap. So
+            // when the paint device is a TQPixmap, chances are high that we are in tdehtml.
             // It's possible that this breaks other things, so let's see how it works...
             if (p->device() && dynamic_cast<TQPixmap*>(p->device() ) ) {
                 contourFlags += Draw_AlphaBlend;
@@ -2816,7 +2816,7 @@ void PlastikStyle::drawComplexControl(TQ_ComplexControl control,
                                               :cg.background();
 
             uint contourFlags = 0;
-            if( khtmlWidgets.contains(cb) )
+            if( tdehtmlWidgets.contains(cb) )
                 contourFlags |= Draw_AlphaBlend;
             
             if (_inputFocusHighlight && hasFocus && editable && enabled)
diff --git a/kstyles/plastik/plastik.h b/kstyles/plastik/plastik.h
index 708666a7f..a1870b701 100644
--- a/kstyles/plastik/plastik.h
+++ b/kstyles/plastik/plastik.h
@@ -233,7 +233,7 @@ protected:
                       bool mouseOver = false,
                       bool horizontal = true,
                       bool enabled = true,
-                      bool khtmlMode = false) const;
+                      bool tdehtmlMode = false) const;
 
     void renderPanel(TQPainter *p,
                      const TQRect &r,
@@ -269,7 +269,7 @@ protected:
     virtual bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
 
 protected slots:
-    void khtmlWidgetDestroyed(TQObject* w);
+    void tdehtmlWidgetDestroyed(TQObject* w);
 
     //Animation slots.
     void updateProgressPos();
@@ -300,8 +300,8 @@ private:
     TQColor _focusHighlightColor;
     TQColor _checkMarkColor;
 
-    // track khtml widgets.
-    TQMap<const TQWidget*,bool> khtmlWidgets;
+    // track tdehtml widgets.
+    TQMap<const TQWidget*,bool> tdehtmlWidgets;
 
     //Animation support.
     TQMap<TQWidget*, int> progAnimWidgets;
diff --git a/kstyles/utils/installtheme/Makefile.am b/kstyles/utils/installtheme/Makefile.am
index 2d7fab839..84272a681 100644
--- a/kstyles/utils/installtheme/Makefile.am
+++ b/kstyles/utils/installtheme/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = 	kinstalltheme
 kinstalltheme_SOURCES = main.cpp 
 
 # the library search path. 
-kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
diff --git a/kunittest/Makefile.am b/kunittest/Makefile.am
deleted file mode 100644
index 9ce5040d7..000000000
--- a/kunittest/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-INCLUDES = $(all_includes)
-METASOURCES = AUTO
-
-lib_LTLIBRARIES = libkunittest.la
-libkunittest_la_SOURCES = runner.cpp tester.cpp
-libkunittest_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0:0
-libkunittest_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
-
-libkunittestinclude_HEADERS = runner.h tester.h module.h
-libkunittestincludedir = $(includedir)/kunittest
-
-bin_PROGRAMS = kunittestmodrunner
-kunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kunittestmodrunner_LDADD = libkunittest.la $(LIB_TDECORE)
-kunittestmodrunner_SOURCES = modrunner.cpp
-
-# The check_ target makes sure we don't install the modules,
-# $(KDE_CHECK_PLUGIN) assures a shared library is created.
-check_LTLIBRARIES = kunittest_samplemodule.la
-kunittest_samplemodule_la_SOURCES = samplemodule.cpp
-kunittest_samplemodule_la_LIBADD = libkunittest.la
-kunittest_samplemodule_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
-
-check-local:
-	./kunittestmodrunner
-
-include ../admin/Doxyfile.am
diff --git a/kwallet/backend/Makefile.am b/kwallet/backend/Makefile.am
deleted file mode 100644
index f07c72df9..000000000
--- a/kwallet/backend/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-
-INCLUDES = -I$(srcdir)/../client $(all_includes)
-
-lib_LTLIBRARIES = libkwalletbackend.la
-
-libkwalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined
-libkwalletbackend_la_LIBADD = $(LIB_QT) ../../tdecore/libtdecore.la
-libkwalletbackend_la_SOURCES = blockcipher.cc		\
-			       blowfish.cc		\
-			       cbc.cc			\
-			       sha1.cc			\
-			       kwalletentry.cc		\
-			       kwalletbackend.cc
-
-
-libkwalletbackend_la_METASOURCES = AUTO
-
-noinst_HEADERS = blowfishtables.h	\
-		 cbc.h			\
-		 sha1.h			\
-		 blockcipher.h		\
-		 kwalletentry.h		\
-		 kwalletbackend.h	\
-		 blowfish.h
-
diff --git a/kwallet/client/Makefile.am b/kwallet/client/Makefile.am
deleted file mode 100644
index 8ea320dc7..000000000
--- a/kwallet/client/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-
-INCLUDES= -I$(srcdir) $(all_includes)
-
-lib_LTLIBRARIES = libkwalletclient.la
-
-libkwalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined
-libkwalletclient_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
-libkwalletclient_la_SOURCES =   kwallet.skel \
-				kwallet.cc
-
-libkwalletclient_la_METASOURCES = AUTO
-
-include_HEADERS = kwallet.h kwallettypes.h
-
diff --git a/kwallet/tests/Makefile.am b/kwallet/tests/Makefile.am
deleted file mode 100644
index d3d9ecb99..000000000
--- a/kwallet/tests/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_ASCII_CAST $(all_includes)
-
-METASOURCES = AUTO
-check_PROGRAMS = kwalletasync kwalletsync kwalletboth
-
-kwalletasync_SOURCES = kwalletasync.cpp kwallettest.cpp
-kwalletasync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
-kwalletasync_LDADD = $(top_builddir)/kwallet/client/libkwalletclient.la \
-	$(LIB_TDECORE) $(LIB_QT)
-
-kwalletsync_SOURCES = kwalletsync.cpp
-kwalletsync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
-kwalletsync_LDADD = $(top_builddir)/kwallet/client/libkwalletclient.la \
-	$(LIB_TDECORE) $(LIB_QT)
-
-kwalletboth_SOURCES = kwalletboth.cpp kwallettest.cpp
-kwalletboth_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
-kwalletboth_LDADD = $(top_builddir)/kwallet/client/libkwalletclient.la \
-	$(LIB_TDECORE) $(LIB_QT)
-INCLUDES = -I$(top_srcdir)/kwallet/client
diff --git a/kwallet/tests/README b/kwallet/tests/README
deleted file mode 100644
index 73c3ad1db..000000000
--- a/kwallet/tests/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Tests for opening the wallet synchronously and asynchronously
-
-kwalletsync - open synchronously
-kwalletasync - open asynchronously
-kwalletboth - start opening asynchronously, then, during the async call, open synchronously
diff --git a/kwallet/tests/kwallettest.cpp b/kwallet/tests/kwallettest.cpp
deleted file mode 100644
index a17644cfb..000000000
--- a/kwallet/tests/kwallettest.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "kwallettest.h"
-#include "kwallettest.moc"
diff --git a/libkscreensaver/Makefile.am b/libkscreensaver/Makefile.am
deleted file mode 100644
index 36e5b999b..000000000
--- a/libkscreensaver/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-lib_LTLIBRARIES = libkscreensaver.la
-libkscreensaver_la_SOURCES = main.cpp kscreensaver.cpp
-libkscreensaver_la_LIBADD  = $(LIB_QT) $(LIB_TDECORE) $(LIB_X11)
-if undefined_symbols_allowed
-libkscreensaver_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 6:0:2
-else
-libkscreensaver_la_LDFLAGS = $(all_libraries) -static
-endif 
-
-include_HEADERS = kscreensaver.h kscreensaver_vroot.h
-
-INCLUDES = $(all_includes)
-METASOURCES = AUTO
-
-messages:
-	$(XGETTEXT) *.cpp *.h -o $(podir)/libkscreensaver.pot 
-
-include $(top_srcdir)/admin/Doxyfile.am
diff --git a/libkmid/CMakeLists.txt b/libtdemid/CMakeLists.txt
index d0bc35d84..bc9fdb416 100644
--- a/libkmid/CMakeLists.txt
+++ b/libtdemid/CMakeLists.txt
@@ -28,19 +28,19 @@ install( FILES
     midiout.h player.h track.h midimapper.h midfile.h
     dattypes.h midistat.h deviceman.h synthout.h
     fmout.h gusout.h alsaout.h voiceman.h notearray.h
-    mt32togm.h midispec.h libkmid.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/libkmid )
+    mt32togm.h midispec.h libtdemid.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/libtdemid )
 
 
-##### kmid ######################################
+##### tdemid ######################################
 
-set( target kmid )
+set( target tdemid )
 
 set( ${target}_SRCS
   midiout.cc player.cc track.cc midimapper.cc
   midfile.cc dattypes.cc midistat.cc deviceman.cc
   synthout.cc fmout.cc gusout.cc alsaout.cc voiceman.cc
-  mt32togm.cc notearray.cc libkmid.cc
+  mt32togm.cc notearray.cc libtdemid.cc
 )
 
 tde_add_library( ${target} SHARED
diff --git a/libkmid/Makefile.am b/libtdemid/Makefile.am
index 507b7381e..9616de31f 100644
--- a/libkmid/Makefile.am
+++ b/libtdemid/Makefile.am
@@ -5,20 +5,20 @@ INCLUDES =  -I$(srcdir)/.. $(all_includes)
 # into $(all_libraries) isn't better
 AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
 
-libkmidincludedir = $(includedir)/libkmid
-libkmidinclude_HEADERS = midiout.h player.h track.h midimapper.h \
+libtdemidincludedir = $(includedir)/libtdemid
+libtdemidinclude_HEADERS = midiout.h player.h track.h midimapper.h \
 	midfile.h dattypes.h midistat.h deviceman.h synthout.h \
 	fmout.h gusout.h alsaout.h voiceman.h notearray.h mt32togm.h \
-	midispec.h libkmid.h
+	midispec.h libtdemid.h
 
-lib_LTLIBRARIES = libkmid.la
-libkmid_la_SOURCES  = midiout.cc player.cc track.cc midimapper.cc \
+lib_LTLIBRARIES = libtdemid.la
+libtdemid_la_SOURCES  = midiout.cc player.cc track.cc midimapper.cc \
 	midfile.cc dattypes.cc midistat.cc deviceman.cc synthout.cc \
 	fmout.cc gusout.cc alsaout.cc voiceman.cc mt32togm.cc notearray.cc \
-	libkmid.cc
+	libtdemid.cc
 
-libkmid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
-libkmid_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_QT)
+libtdemid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
+libtdemid_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_QT)
 
 DOXYGEN_REFERENCES = tdecore
 include ../admin/Doxyfile.am
diff --git a/libkmid/alsaout.cc b/libtdemid/alsaout.cc
index 4c7f48f4e..517852b25 100644
--- a/libkmid/alsaout.cc
+++ b/libtdemid/alsaout.cc
@@ -3,7 +3,7 @@
     alsaout.cc   - class AlsaOut which represents an alsa client/port pair
     This file is part of LibKMid 0.9.5
     Copyright (C) 2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/alsaout.h b/libtdemid/alsaout.h
index fd4a46579..016ca29c6 100644
--- a/libkmid/alsaout.h
+++ b/libtdemid/alsaout.h
@@ -1,7 +1,7 @@
 /*  alsaout.cc   - class AlsaOut which represents an alsa client/port pair
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -24,7 +24,7 @@
 #ifndef _ALSAOUT_H
 #define _ALSAOUT_H
 
-#include <libkmid/midiout.h>
+#include <libtdemid/midiout.h>
 
 struct snd_seq_event;
 typedef struct snd_seq_event snd_seq_event_t;
diff --git a/libkmid/awe_sup.h b/libtdemid/awe_sup.h
index 5602cf15f..5e649736c 100644
--- a/libkmid/awe_sup.h
+++ b/libtdemid/awe_sup.h
@@ -1,7 +1,7 @@
 /*  awe_sup.h  - A wrapper on awe_voice.h
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
  
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/configure.in.in b/libtdemid/configure.in.in
index 7500e3455..d8a5f391e 100644
--- a/libkmid/configure.in.in
+++ b/libtdemid/configure.in.in
@@ -1,7 +1,7 @@
-dnl libkmid's specific checks
+dnl libtdemid's specific checks
 
-#AC_MSG_CHECKING(if libkmid would compile)
-#AC_CACHE_VAL(kde_libkmid_compiles,
+#AC_MSG_CHECKING(if libtdemid would compile)
+#AC_CACHE_VAL(kde_libtdemid_compiles,
 #[
 #AC_TRY_COMPILE([
 ##ifndef __FreeBSD__
@@ -17,7 +17,7 @@ dnl libkmid's specific checks
 #])
 #AC_MSG_RESULT($kde_libmid_compiles)
 #if test $kde_libmid_compiles = no; then
-#  DO_NOT_COMPILE="$DO_NOT_COMPILE libkmid"
+#  DO_NOT_COMPILE="$DO_NOT_COMPILE libtdemid"
 #fi
 
 #AC_MSG_CHECKING([for OSS support])
diff --git a/libkmid/dattypes.cc b/libtdemid/dattypes.cc
index 821abd00a..218591fa4 100644
--- a/libkmid/dattypes.cc
+++ b/libtdemid/dattypes.cc
@@ -3,7 +3,7 @@
     dattypes.cc  - Some always useful definitions and functions
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
  
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/dattypes.h b/libtdemid/dattypes.h
index 0e647980f..e2d9d0a89 100644
--- a/libkmid/dattypes.h
+++ b/libtdemid/dattypes.h
@@ -1,7 +1,7 @@
 /*  dattypes.h  - Some useful definitions and functions 
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html                                         
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html                                         
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
diff --git a/libkmid/deviceman.cc b/libtdemid/deviceman.cc
index f539d00b6..c7649f5a5 100644
--- a/libkmid/deviceman.cc
+++ b/libtdemid/deviceman.cc
@@ -3,7 +3,7 @@
     deviceman.cc  - The device manager, that hides the use of midiOut
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/deviceman.h b/libtdemid/deviceman.h
index 8bd0728a6..40788ad34 100644
--- a/libkmid/deviceman.h
+++ b/libtdemid/deviceman.h
@@ -1,7 +1,7 @@
 /*  deviceman.h  - The device manager, that hides the use of midiOut
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ -23,7 +23,7 @@
 #ifndef DEVICEMAN_H
 #define DEVICEMAN_H
 
-#include <libkmid/dattypes.h>
+#include <libtdemid/dattypes.h>
 #include <tdelibs_export.h>
 
 class MidiOut;
diff --git a/libkmid/fmout.cc b/libtdemid/fmout.cc
index bce421f81..72b3198c9 100644
--- a/libkmid/fmout.cc
+++ b/libtdemid/fmout.cc
@@ -4,7 +4,7 @@
 			for fm synths
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/fmout.h b/libtdemid/fmout.h
index 328ca5626..1a1cf6215 100644
--- a/libkmid/fmout.h
+++ b/libtdemid/fmout.h
@@ -2,7 +2,7 @@
 			for FM synths
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html                                         
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html                                         
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ -24,8 +24,8 @@
 #ifndef _FMOUT_H
 #define _FMOUT_H
 
-#include <libkmid/midiout.h>
-#include <libkmid/voiceman.h>
+#include <libtdemid/midiout.h>
+#include <libtdemid/voiceman.h>
 
 /**
  * FM device output class . FMOut is used to send MIDI events to 
diff --git a/libkmid/gusout.cc b/libtdemid/gusout.cc
index 6b207956b..69aae3927 100644
--- a/libkmid/gusout.cc
+++ b/libtdemid/gusout.cc
@@ -4,7 +4,7 @@
          Ultrasound cards through a /dev/sequencer device
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/gusout.h b/libtdemid/gusout.h
index 1fd8a3cbd..c3eb409dd 100644
--- a/libkmid/gusout.h
+++ b/libtdemid/gusout.h
@@ -2,7 +2,7 @@
          Ultrasound cards through a /dev/sequencer device
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -25,8 +25,8 @@
 #ifndef _GUSOUT_H
 #define _GUSOUT_H
 
-#include <libkmid/midiout.h>
-#include <libkmid/voiceman.h>
+#include <libtdemid/midiout.h>
+#include <libtdemid/voiceman.h>
 
 /**
  * Gravis Ultrasound synthesizer output class . This class is used to send midi
diff --git a/libkmid/gusvoices.h b/libtdemid/gusvoices.h
index da364eb18..1b818c15f 100644
--- a/libkmid/gusvoices.h
+++ b/libtdemid/gusvoices.h
@@ -1,7 +1,7 @@
 /*  gusvoices.h  - struct with Gravis Ultrasound patches' names
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/libkmid.cc b/libtdemid/libtdemid.cc
index 59e96ad0f..04a0dac0d 100644
--- a/libkmid/libkmid.cc
+++ b/libtdemid/libtdemid.cc
@@ -1,10 +1,10 @@
 /**************************************************************************
  
-    libkmid.cc  - class KMidSimpleAPI that makes it easy to use libkmid
+    libtdemid.cc  - class KMidSimpleAPI that makes it easy to use libtdemid
                         and a C wrapper.
     This file is part of LibKMid 0.9.5
     Copyright (C) 2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
  
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -25,7 +25,7 @@
  
 ***************************************************************************/ 
 
-#include "libkmid.h"
+#include "libtdemid.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
diff --git a/libkmid/libkmid.h b/libtdemid/libtdemid.h
index 53f765093..7d7c2f239 100644
--- a/libkmid/libkmid.h
+++ b/libtdemid/libtdemid.h
@@ -1,8 +1,8 @@
-/*  libkmid.h     - class KMidSimpleAPI that makes it easy to use libkmid
+/*  libtdemid.h     - class KMidSimpleAPI that makes it easy to use libtdemid
 			and a C wrapper.
     This file is part of LibKMid 0.9.5
     Copyright (C) 2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
  
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -30,7 +30,7 @@
 #include <tdelibs_export.h>
 
 /**
- * Simple API covering most of the uses of libkmid.
+ * Simple API covering most of the uses of libtdemid.
  *
  * You can use the members of this class in pure C applications, just by using
  * the same name as the corresponding function member. 
@@ -47,9 +47,9 @@
  * @li kMidStop();
  * @li kMidDestruct();
  *
- * to stop the music and release the memory allocated by libkmid.
+ * to stop the music and release the memory allocated by libtdemid.
  *
- * @short A very simple API around the rest of libkmid.
+ * @short A very simple API around the rest of libtdemid.
  * @version 0.9.5 17/01/2000
  * @author Antonio Larrosa Jimenez <larrosa@kde.org> 
  */
@@ -62,7 +62,7 @@ class KMID_EXPORT KMidSimpleAPI
   public:
 
     /**
-     * Initializes libkmid. Creates the DeviceManager object, and initializes
+     * Initializes libtdemid. Creates the DeviceManager object, and initializes
      * some variables that will be used later.
      *
      * @return 0 if OK, and a positive number when there's any error (for
@@ -102,7 +102,7 @@ class KMID_EXPORT KMidSimpleAPI
     static int kMidStop(void);
 
     /**
-     * Releases the memory allocated by libkmid. To continue playing, you must
+     * Releases the memory allocated by libtdemid. To continue playing, you must
      * first make a(nother) call to kMidInit().
      */
     static void kMidDestruct(void);
@@ -123,7 +123,7 @@ class KMID_EXPORT KMidSimpleAPI
     static int kMidDevices(void);
 
     /**
-     * Returns the name of the i-th device . In case libkmid wasn't yet
+     * Returns the name of the i-th device . In case libtdemid wasn't yet
      * initialized ( see kMidInit() ), the return value is NULL, and in
      * case the parameter has a value out of the valid range 
      * ( see kMidDevices() ) it returns an empty string.
@@ -134,7 +134,7 @@ class KMID_EXPORT KMidSimpleAPI
     static const char *kMidName(int i);
 
     /**
-     * Returns the type of the i-th device . In case libkmid wasn't yet
+     * Returns the type of the i-th device . In case libtdemid wasn't yet
      * initialized ( see kMidInit() ), the return value is NULL, and in
      * case the parameter has a value out of the valid range 
      * ( see kMidDevices() ) it returns an empty string.
@@ -164,12 +164,12 @@ class KMID_EXPORT KMidSimpleAPI
     static void kMidSetMidiMapper(const char *mapfilename);
 
     /**
-     * Returns the version number of libkmid, i.e. "0.9.5" or "1.0 Beta"
+     * Returns the version number of libtdemid, i.e. "0.9.5" or "1.0 Beta"
      */
     static const char *kMidVersion(void);
 
     /**
-     * Returns the copyright notice that applications using libkmid should print
+     * Returns the copyright notice that applications using libtdemid should print
      * to the user in an about box or somewhere visible.
      * I.e. 
      *
diff --git a/libkmid/midfile.cc b/libtdemid/midfile.cc
index 4bf19f5b1..f8222b3f8 100644
--- a/libkmid/midfile.cc
+++ b/libtdemid/midfile.cc
@@ -3,7 +3,7 @@
     midfile.cc - function which reads a midi file,and creates the track classes
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/midfile.h b/libtdemid/midfile.h
index 18687b25c..0791ff0fa 100644
--- a/libkmid/midfile.h
+++ b/libtdemid/midfile.h
@@ -1,7 +1,7 @@
 /*  midfile.h  - function which reads a midi file,and creates the track classes
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -24,8 +24,8 @@
 #ifndef _MIDFILE_H
 #define _MIDFILE_H
 
-#include <libkmid/dattypes.h>
-#include <libkmid/track.h>
+#include <libtdemid/dattypes.h>
+#include <libtdemid/track.h>
 #include <stdio.h>
 #include <tdelibs_export.h>
 
diff --git a/libkmid/midimapper.cc b/libtdemid/midimapper.cc
index 0b8022b8e..837728410 100644
--- a/libkmid/midimapper.cc
+++ b/libtdemid/midimapper.cc
@@ -3,7 +3,7 @@
     midimapper.cc  - The midi mapper object  
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html            
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html            
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/midimapper.h b/libtdemid/midimapper.h
index 0edefdeec..59fe9f1b5 100644
--- a/libkmid/midimapper.h
+++ b/libtdemid/midimapper.h
@@ -1,7 +1,7 @@
 /*  midimapper.h  - The midi mapper object
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -25,7 +25,7 @@
 #define _MIDIMAPPER_H
 
 #include <stdio.h>
-#include <libkmid/dattypes.h>
+#include <libtdemid/dattypes.h>
 #include <tdelibs_export.h>
 
 #define KM_NAME_SIZE 30
@@ -40,7 +40,7 @@
  * as if the synthesizer was GM compatible.
  *
  * Please see the KMid documentation 
- * ( http://www.arrakis.es/~rlarrosa/kmid.html ) for information on the
+ * ( http://www.arrakis.es/~rlarrosa/tdemid.html ) for information on the
  * format of a MIDI mapper definition file, and how they work.
  * 
  * I created this class because I had one of those non-GM keyboards, 
diff --git a/libkmid/midiout.cc b/libtdemid/midiout.cc
index e4a03a405..24a209cce 100644
--- a/libkmid/midiout.cc
+++ b/libtdemid/midiout.cc
@@ -3,7 +3,7 @@
     midiout.cc   - class midiOut which handles external midi devices
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/midiout.h b/libtdemid/midiout.h
index 93bbfff8c..046d78a31 100644
--- a/libkmid/midiout.h
+++ b/libtdemid/midiout.h
@@ -1,7 +1,7 @@
 /*  midiout.h	- class midiOut which handles the /dev/sequencer device
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -24,9 +24,9 @@
 #ifndef _MIDIOUT_H
 #define _MIDIOUT_H
 
-#include <libkmid/dattypes.h>
-#include <libkmid/deviceman.h>
-#include <libkmid/midimapper.h>
+#include <libtdemid/dattypes.h>
+#include <libtdemid/deviceman.h>
+#include <libtdemid/midimapper.h>
 #include <stdio.h>
 
 /**
diff --git a/libkmid/midispec.h b/libtdemid/midispec.h
index 3f60d49f2..63ca41a9d 100644
--- a/libkmid/midispec.h
+++ b/libtdemid/midispec.h
@@ -1,7 +1,7 @@
 /*  midispec.h  - Some definitions to make the code more readable 
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/midistat.cc b/libtdemid/midistat.cc
index 29d1436c8..6a6c94b0c 100644
--- a/libkmid/midistat.cc
+++ b/libtdemid/midistat.cc
@@ -3,7 +3,7 @@
     midistat.cc	- class MidiStatus, change it internally and then send it. 
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html            
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html            
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/midistat.h b/libtdemid/midistat.h
index 17dda1269..5078f3733 100644
--- a/libkmid/midistat.h
+++ b/libtdemid/midistat.h
@@ -1,7 +1,7 @@
 /*  midistat.h	- class midiStat, change it internally and then send it. 
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -24,7 +24,7 @@
 #ifndef _MIDISTAT_H
 #define _MIDISTAT_H
 
-#include <libkmid/dattypes.h>
+#include <libtdemid/dattypes.h>
 
 /**
  * Stores the status of a MIDI device . That is, current patch in each channel,
diff --git a/libkmid/mt32togm.cc b/libtdemid/mt32togm.cc
index a59eb959c..a59eb959c 100644
--- a/libkmid/mt32togm.cc
+++ b/libtdemid/mt32togm.cc
diff --git a/libkmid/mt32togm.h b/libtdemid/mt32togm.h
index 74fb27875..fe7dec3c2 100644
--- a/libkmid/mt32togm.h
+++ b/libtdemid/mt32togm.h
@@ -1,7 +1,7 @@
 /*  mt32togm.h  - the translation map from MT32 patches to GM patches 
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
  
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/notearray.cc b/libtdemid/notearray.cc
index 70652f16e..9899fd837 100644
--- a/libkmid/notearray.cc
+++ b/libtdemid/notearray.cc
@@ -3,7 +3,7 @@
     notearray.cc  - NoteArray class, which holds an array of notes
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html            
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html            
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/notearray.h b/libtdemid/notearray.h
index b09e0dd1a..833fe4987 100644
--- a/libkmid/notearray.h
+++ b/libtdemid/notearray.h
@@ -1,7 +1,7 @@
 /*  notearray.h  - NoteArray class, which holds an array of notes
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -24,7 +24,7 @@
 #ifndef NOTEARRAY_H
 #define NOTEARRAY_H
 
-#include <libkmid/dattypes.h>
+#include <libtdemid/dattypes.h>
 #include <tdelibs_export.h>
 
 /**
diff --git a/libkmid/player.cc b/libtdemid/player.cc
index a68a9b147..ff7093496 100644
--- a/libkmid/player.cc
+++ b/libtdemid/player.cc
@@ -3,7 +3,7 @@
     player.cc  - class MidiPlayer. Plays a set of tracks
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html            
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html            
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/player.h b/libtdemid/player.h
index 6a9210292..ae33de849 100644
--- a/libkmid/player.h
+++ b/libtdemid/player.h
@@ -1,7 +1,7 @@
 /*  player.h  - class MidiPlayer. Plays a set of tracks
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -24,11 +24,11 @@
 #ifndef _PLAYER_H
 #define _PLAYER_H
 
-#include <libkmid/dattypes.h>
-#include <libkmid/midfile.h>
-#include <libkmid/deviceman.h>
-#include <libkmid/track.h>
-#include <libkmid/notearray.h>
+#include <libtdemid/dattypes.h>
+#include <libtdemid/midfile.h>
+#include <libtdemid/deviceman.h>
+#include <libtdemid/track.h>
+#include <libtdemid/notearray.h>
 #include <kdemacros.h>
 
 /**
@@ -249,7 +249,7 @@ struct PlayerController
  *
  * Alternatively, if everything you want is to play a midi file in a game or
  * any other application that doesn't need to fine tune the midi playing, just
- * use the kmidplay() function.
+ * use the tdemidplay() function.
  *
  * @see KMidSimpleAPI
  *
diff --git a/libkmid/sndcard.h b/libtdemid/sndcard.h
index c533451ed..e6eab5255 100644
--- a/libkmid/sndcard.h
+++ b/libtdemid/sndcard.h
@@ -1,7 +1,7 @@
 /*  sndcard.h  - include the OSS' soundcard.h file
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
  
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/synthout.cc b/libtdemid/synthout.cc
index 069bbd32f..6d7ef47a1 100644
--- a/libkmid/synthout.cc
+++ b/libtdemid/synthout.cc
@@ -5,7 +5,7 @@
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98  Antonio Larrosa Jimenez and P.J.Leonard
                   1999,2000 Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/synthout.h b/libtdemid/synthout.h
index 4d34336ee..db1f507f1 100644
--- a/libkmid/synthout.h
+++ b/libtdemid/synthout.h
@@ -3,7 +3,7 @@
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98  Antonio Larrosa Jimenez and P.J.Leonard
 		  1999,2000 Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html                                         
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html                                         
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ -25,7 +25,7 @@
 #ifndef _SYNTHOUT_H
 #define _SYNTHOUT_H
 
-#include <libkmid/midiout.h>
+#include <libtdemid/midiout.h>
 
 /**
  * Synth (AWE) device output class . SynthOut is used to send MIDI events to
diff --git a/libkmid/tests/Kathzy.mid b/libtdemid/tests/Kathzy.mid
index f3a857fba..f3a857fba 100644
--- a/libkmid/tests/Kathzy.mid
+++ b/libtdemid/tests/Kathzy.mid
diff --git a/libkmid/tests/Makefile.am b/libtdemid/tests/Makefile.am
index 58bf5d58b..a00018c62 100644
--- a/libkmid/tests/Makefile.am
+++ b/libtdemid/tests/Makefile.am
@@ -4,11 +4,11 @@ INCLUDES = -I$(srcdir)/.. $(all_includes)
 noinst_PROGRAMS = ctest apitest notesoff
 
 ctest_SOURCES = ctest.c
-ctest_LDADD = ../libkmid.la
+ctest_LDADD = ../libtdemid.la
 
 apitest_SOURCES = apitest.cc
-apitest_LDADD = ../libkmid.la
+apitest_LDADD = ../libtdemid.la
 
 notesoff_SOURCES = notesoff.cc
-notesoff_LDADD = ../libkmid.la
+notesoff_LDADD = ../libtdemid.la
 
diff --git a/libkmid/tests/apitest.cc b/libtdemid/tests/apitest.cc
index 308fe2957..7f370331e 100644
--- a/libkmid/tests/apitest.cc
+++ b/libtdemid/tests/apitest.cc
@@ -1,11 +1,11 @@
-#include <libkmid/libkmid.h>
+#include <libtdemid/libtdemid.h>
 #include <unistd.h>
 #include <stdio.h>
 
 int main (int , char **)
 {
-  printf("Libkmid test2 . (C) 2000 Antonio Larrosa Jimenez . Malaga (Spain)\n");
-  printf("Using libkmid from a simple C++ application\n");
+  printf("Libtdemid test2 . (C) 2000 Antonio Larrosa Jimenez . Malaga (Spain)\n");
+  printf("Using libtdemid from a simple C++ application\n");
 
   KMidSimpleAPI::kMidInit();
   KMidSimpleAPI::kMidLoad("Kathzy.mid");
diff --git a/libkmid/tests/ctest.c b/libtdemid/tests/ctest.c
index 6e427a2c7..0e7d25884 100644
--- a/libkmid/tests/ctest.c
+++ b/libtdemid/tests/ctest.c
@@ -1,4 +1,4 @@
-#include <libkmid/libkmid.h>
+#include <libtdemid/libtdemid.h>
 #include <unistd.h>
 #include <stdio.h>
 
@@ -7,12 +7,12 @@ int main (int argc, char **argv)
   int i;
   char c;
 
-  printf("Test1 %s. Using libkmid from a simple C application\n",kMidVersion());
+  printf("Test1 %s. Using libtdemid from a simple C application\n",kMidVersion());
   printf("%s\n",kMidCopyright());
 
   if (kMidInit()!=0) 
   {
-    printf("Error initializing libkmid\n");
+    printf("Error initializing libtdemid\n");
     return 0;
   }
 
diff --git a/libkmid/tests/notesoff.cc b/libtdemid/tests/notesoff.cc
index 15cbb7f73..15e00bd6c 100644
--- a/libkmid/tests/notesoff.cc
+++ b/libtdemid/tests/notesoff.cc
@@ -1,12 +1,12 @@
-#include <libkmid/libkmid.h>
-#include <libkmid/deviceman.h>
+#include <libtdemid/libtdemid.h>
+#include <libtdemid/deviceman.h>
 #include <unistd.h>
 #include <stdio.h>
 
 int main (int , char **)
 {
-  printf("Libkmid Notes Off . (C) 2000 Antonio Larrosa Jimenez . Malaga (Spain)\n");
-  printf("Using libkmid from a simple C++ application\n");
+  printf("Libtdemid Notes Off . (C) 2000 Antonio Larrosa Jimenez . Malaga (Spain)\n");
+  printf("Using libtdemid from a simple C++ application\n");
 
   KMidSimpleAPI::kMidInit();
 
diff --git a/libkmid/track.cc b/libtdemid/track.cc
index ccaaf69d2..c7c858919 100644
--- a/libkmid/track.cc
+++ b/libtdemid/track.cc
@@ -3,7 +3,7 @@
     track.cc  - class track, which has a midi file track and its events
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/track.h b/libtdemid/track.h
index 073fc9825..96a1e77d5 100644
--- a/libkmid/track.h
+++ b/libtdemid/track.h
@@ -1,7 +1,7 @@
 /*  track.h  - class track, which has a midi file track and its events
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -25,7 +25,7 @@
 #define _TRACK_H
 
 #include <stdio.h>
-#include <libkmid/dattypes.h>
+#include <libtdemid/dattypes.h>
 
 /**
  * An structure that represents a MIDI event.
diff --git a/libkmid/voiceman.cc b/libtdemid/voiceman.cc
index 8e7863720..867ee6024 100644
--- a/libkmid/voiceman.cc
+++ b/libtdemid/voiceman.cc
@@ -3,7 +3,7 @@
     voiceman.cc - The VoiceManager class handles a set of voices for synths
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/voiceman.h b/libtdemid/voiceman.h
index 79dee9d3d..42b67434b 100644
--- a/libkmid/voiceman.h
+++ b/libtdemid/voiceman.h
@@ -1,7 +1,7 @@
 /*  voiceman.h - The VoiceManager class handles a set of voices for synths
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkscreensaver/CMakeLists.txt b/libtdescreensaver/CMakeLists.txt
index 472f8a834..8cfc6ba7d 100644
--- a/libkscreensaver/CMakeLists.txt
+++ b/libtdescreensaver/CMakeLists.txt
@@ -27,16 +27,16 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    kscreensaver.h kscreensaver_vroot.h
+    tdescreensaver.h tdescreensaver_vroot.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
-##### kscreensaver ##############################
+##### tdescreensaver ##############################
 
-set( target kscreensaver )
+set( target tdescreensaver )
 
 set( ${target}_SRCS
-  main.cpp kscreensaver.cpp
+  main.cpp tdescreensaver.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/libtdescreensaver/Makefile.am b/libtdescreensaver/Makefile.am
new file mode 100644
index 000000000..8f7a6104a
--- /dev/null
+++ b/libtdescreensaver/Makefile.am
@@ -0,0 +1,18 @@
+lib_LTLIBRARIES = libtdescreensaver.la
+libtdescreensaver_la_SOURCES = main.cpp tdescreensaver.cpp
+libtdescreensaver_la_LIBADD  = $(LIB_QT) $(LIB_TDECORE) $(LIB_X11)
+if undefined_symbols_allowed
+libtdescreensaver_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 6:0:2
+else
+libtdescreensaver_la_LDFLAGS = $(all_libraries) -static
+endif 
+
+include_HEADERS = tdescreensaver.h tdescreensaver_vroot.h
+
+INCLUDES = $(all_includes)
+METASOURCES = AUTO
+
+messages:
+	$(XGETTEXT) *.cpp *.h -o $(podir)/libtdescreensaver.pot 
+
+include $(top_srcdir)/admin/Doxyfile.am
diff --git a/libkscreensaver/configure.in.in b/libtdescreensaver/configure.in.in
index 1777b1e98..1777b1e98 100644
--- a/libkscreensaver/configure.in.in
+++ b/libtdescreensaver/configure.in.in
diff --git a/libkscreensaver/main.cpp b/libtdescreensaver/main.cpp
index 4934a1658..9f908b81a 100644
--- a/libkscreensaver/main.cpp
+++ b/libtdescreensaver/main.cpp
@@ -31,8 +31,8 @@
 #include <kapplication.h>
 #include <kcrash.h>
 
-#include "kscreensaver.h"
-#include "kscreensaver_vroot.h"
+#include "tdescreensaver.h"
+#include "tdescreensaver_vroot.h"
 
 extern "C"
 {
@@ -93,7 +93,7 @@ typedef WId Window;
 
 KDE_EXPORT int main(int argc, char *argv[])
 {
-    KLocale::setMainCatalogue("libkscreensaver");
+    KLocale::setMainCatalogue("libtdescreensaver");
     TDECmdLineArgs::init(argc, argv, kss_applicationName, kss_description, kss_version);
 
     TDECmdLineArgs::addCmdLineOptions(options);
@@ -102,7 +102,7 @@ KDE_EXPORT int main(int argc, char *argv[])
 
     KCrash::setCrashHandler( crashHandler );
     TDEGlobal::locale()->insertCatalogue("klock");
-    TDEGlobal::locale()->insertCatalogue("kscreensaver");
+    TDEGlobal::locale()->insertCatalogue("tdescreensaver");
 
     DemoWindow *demoWidget = 0;
     Window saveWin = 0;
diff --git a/libkscreensaver/kscreensaver.cpp b/libtdescreensaver/tdescreensaver.cpp
index e4a1f89a0..4474e5874 100644
--- a/libkscreensaver/kscreensaver.cpp
+++ b/libtdescreensaver/tdescreensaver.cpp
@@ -21,7 +21,7 @@
 #include <tqpainter.h>
 #include <tqtimer.h>
 #include <kapplication.h>
-#include "kscreensaver.h"
+#include "tdescreensaver.h"
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
 #else
@@ -228,4 +228,4 @@ void KBlankEffect::blankBlocks()
     }
 }
 
-#include "kscreensaver.moc"
+#include "tdescreensaver.moc"
diff --git a/libkscreensaver/kscreensaver.h b/libtdescreensaver/tdescreensaver.h
index de23f8431..de23f8431 100644
--- a/libkscreensaver/kscreensaver.h
+++ b/libtdescreensaver/tdescreensaver.h
diff --git a/libkscreensaver/kscreensaver_vroot.h b/libtdescreensaver/tdescreensaver_vroot.h
index aae76f9d9..aae76f9d9 100644
--- a/libkscreensaver/kscreensaver_vroot.h
+++ b/libtdescreensaver/tdescreensaver_vroot.h
diff --git a/pics/Makefile.am b/pics/Makefile.am
index 68267ab78..580f33eee 100644
--- a/pics/Makefile.am
+++ b/pics/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = $(KSVGTOPNG)
 
 ksvgtopng_SOURCES = ksvgtopng.cpp
 ksvgtopng_LDADD =  $(LIB_TDECORE) $(top_builddir)/tdecore/svgicons/libkdesvgicons.la
-ksvgtopng_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ksvgtopng_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 install-data-local:
 	-rm -f $(DESTDIR)$(kde_icondir)/default.tde
diff --git a/pics/crystalsvg/cr128-mime-kmultiple.png b/pics/crystalsvg/cr128-mime-tdemultiple.png
index 9e822431c..9e822431c 100644
--- a/pics/crystalsvg/cr128-mime-kmultiple.png
+++ b/pics/crystalsvg/cr128-mime-tdemultiple.png
diff --git a/pics/crystalsvg/cr16-mime-kmultiple.png b/pics/crystalsvg/cr16-mime-tdemultiple.png
index d19526823..d19526823 100644
--- a/pics/crystalsvg/cr16-mime-kmultiple.png
+++ b/pics/crystalsvg/cr16-mime-tdemultiple.png
diff --git a/pics/crystalsvg/cr22-mime-kmultiple.png b/pics/crystalsvg/cr22-mime-tdemultiple.png
index 485cc80de..485cc80de 100644
--- a/pics/crystalsvg/cr22-mime-kmultiple.png
+++ b/pics/crystalsvg/cr22-mime-tdemultiple.png
diff --git a/pics/crystalsvg/cr32-mime-kmultiple.png b/pics/crystalsvg/cr32-mime-tdemultiple.png
index 45cb5ffe8..45cb5ffe8 100644
--- a/pics/crystalsvg/cr32-mime-kmultiple.png
+++ b/pics/crystalsvg/cr32-mime-tdemultiple.png
diff --git a/pics/crystalsvg/cr48-mime-kmultiple.png b/pics/crystalsvg/cr48-mime-tdemultiple.png
index 00651fcd2..00651fcd2 100644
--- a/pics/crystalsvg/cr48-mime-kmultiple.png
+++ b/pics/crystalsvg/cr48-mime-tdemultiple.png
diff --git a/pics/crystalsvg/cr64-mime-kmultiple.png b/pics/crystalsvg/cr64-mime-tdemultiple.png
index ee7a8194e..ee7a8194e 100644
--- a/pics/crystalsvg/cr64-mime-kmultiple.png
+++ b/pics/crystalsvg/cr64-mime-tdemultiple.png
diff --git a/pics/crystalsvg/crsc-mime-kmultiple.svgz b/pics/crystalsvg/crsc-mime-tdemultiple.svgz
index c8b696048..c8b696048 100644
--- a/pics/crystalsvg/crsc-mime-kmultiple.svgz
+++ b/pics/crystalsvg/crsc-mime-tdemultiple.svgz
diff --git a/kcert/CMakeLists.txt b/tdecert/CMakeLists.txt
index b8bf6c84b..045d77720 100644
--- a/kcert/CMakeLists.txt
+++ b/tdecert/CMakeLists.txt
@@ -31,20 +31,20 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kcertpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kcertpart.rc DESTINATION ${DATA_INSTALL_DIR}/kcertpart )
+install( FILES tdecertpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdecertpart.rc DESTINATION ${DATA_INSTALL_DIR}/tdecertpart )
 
 
-##### libkcertpart ##############################
+##### libtdecertpart ##############################
 
-set( target libkcertpart )
+set( target libtdecertpart )
 
 set( ${target}_SRCS
-  kcertpart.cc
+  tdecertpart.cc
 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared kparts-shared
+  LINK kio-shared tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdecert/Makefile.am b/tdecert/Makefile.am
new file mode 100644
index 000000000..d43ce0f5b
--- /dev/null
+++ b/tdecert/Makefile.am
@@ -0,0 +1,18 @@
+INCLUDES= -I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl -I$(top_srcdir) $(SSL_INCLUDES) $(all_includes)
+
+kde_module_LTLIBRARIES = libtdecertpart.la
+
+libtdecertpart_la_SOURCES	= tdecertpart.cc
+
+libtdecertpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
+libtdecertpart_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_KFILE) $(LIB_TDECORE)
+libtdecertpart_la_DEPENDENCIES = $(LIB_KPARTS)
+
+libtdecertpart_la_METASOURCES = AUTO
+
+servicedir = $(kde_servicesdir)
+service_DATA = tdecertpart.desktop
+
+rcdir = $(kde_datadir)/tdecertpart
+rc_DATA = tdecertpart.rc
+
diff --git a/kcert/kcertpart.cc b/tdecert/tdecertpart.cc
index ca5912206..ebb6e77ad 100644
--- a/kcert/kcertpart.cc
+++ b/tdecert/tdecertpart.cc
@@ -19,8 +19,8 @@
  */
 
 
-#include "kcertpart.h"
-#include <kparts/genericfactory.h>
+#include "tdecertpart.h"
+#include <tdeparts/genericfactory.h>
 #include <kinstance.h>
 #include <kaboutdata.h>
 #include <tqframe.h>
@@ -45,11 +45,11 @@
 #include <tqmultilineedit.h>
 #include <tqregexp.h>
 #include <kcombobox.h>
-#include <kparts/browserextension.h>
-#include <kparts/browserinterface.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/browserinterface.h>
 #include <kio/kservicetypefactory.h>
 
-K_EXPORT_COMPONENT_FACTORY( libkcertpart, KParts::GenericFactory<KCertPart> )
+K_EXPORT_COMPONENT_FACTORY( libtdecertpart, KParts::GenericFactory<KCertPart> )
 
 
 KX509Item::KX509Item(KListViewItem *parent, KSSLCertificate *x) :
@@ -879,5 +879,5 @@ TDEAboutData *KCertPart::createAboutData()
     return new TDEAboutData("KCertPart", I18N_NOOP("TDE Certificate Part"), "1.0");
 }
 
-#include "kcertpart.moc"
+#include "tdecertpart.moc"
 
diff --git a/kcert/kcertpart.desktop b/tdecert/tdecertpart.desktop
index 997b9a050..e4478480d 100644
--- a/kcert/kcertpart.desktop
+++ b/tdecert/tdecertpart.desktop
@@ -95,5 +95,5 @@ Name[ta]=கேசான�றிதழ�பக�தி
 Name[te]=కెసెర�ట� పార�ట�
 Name[ven]=Tshipida tsha cert ya K
 ServiceTypes=KParts/ReadWritePart
-X-TDE-Library=libkcertpart
+X-TDE-Library=libtdecertpart
 InitialPreference=15
diff --git a/kcert/kcertpart.h b/tdecert/tdecertpart.h
index a5274a926..040b0ad94 100644
--- a/kcert/kcertpart.h
+++ b/tdecert/tdecertpart.h
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <tqptrlist.h>
 #include <tqlistview.h>
 #include <klistview.h>
diff --git a/kcert/kcertpart.rc b/tdecert/tdecertpart.rc
index 4deb2d7c8..4deb2d7c8 100644
--- a/kcert/kcertpart.rc
+++ b/tdecert/tdecertpart.rc
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index 2adc73c52..8d4939d83 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -85,9 +85,9 @@ install( FILES
     kdcoppropertyproxy.h netwm.h kaccelmanager.h netwm_def.h
     kpixmapprovider.h kunload.h kstaticdeleter.h kextsock.h
     kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h kbufferedio.h
-    kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h ksycoca.h
-    ksycocaentry.h ksycocatype.h kxmessages.h kstartupinfo.h
-    klargefile.h kmultipledrag.h kgenericfactory.h kgenericfactory.tcc
+    kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h tdesycoca.h
+    tdesycocaentry.h tdesycocatype.h kxmessages.h kstartupinfo.h
+    klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc
     ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h
     kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h
     kmanagerselection.h kmountpoint.h kuser.h klockfile.h
@@ -138,9 +138,9 @@ set( ${target}_SRCS
   kaudioplayer.cpp kdcoppropertyproxy.cpp ksockaddr.cpp
   kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp
   kpixmapprovider.cpp kurldrag.cpp kmdcodec.cpp ksocks.cpp
-  fakes.c vsnprintf.c ksycoca.cpp ksycocadict.cpp ksycoca.skel
-  ksycocafactory.cpp kxmessages.cpp kstartupinfo.cpp
-  kcatalogue.cpp kasyncio.cpp kmultipledrag.cpp kstaticdeleter.cpp
+  fakes.c vsnprintf.c tdesycoca.cpp tdesycocadict.cpp tdesycoca.skel
+  tdesycocafactory.cpp kxmessages.cpp kstartupinfo.cpp
+  kcatalogue.cpp kasyncio.cpp tdemultipledrag.cpp kstaticdeleter.cpp
   kappdcopiface.cpp kappdcopiface.skel kclipboard.cpp
   kcheckaccelerators.cpp tdeversion.cpp kdebugdcopiface.cpp
   kdebugdcopiface.skel kcalendarsystem.cpp kcalendarsystemgregorian.cpp
diff --git a/tdecore/DESIGN.iconloading b/tdecore/DESIGN.iconloading
index bcfb13c95..a9e57afbd 100644
--- a/tdecore/DESIGN.iconloading
+++ b/tdecore/DESIGN.iconloading
@@ -58,7 +58,7 @@ can copy this pixmap:
    // p contains now 30x30 pixels of test.png.
 
 The only hard part is then to publish the icons in a way that applications 
-know what to copy. I'm thinking about a ksycoca-sort-of index that 
+know what to copy. I'm thinking about a tdesycoca-sort-of index that 
 applications can map and can use to do fast lookups with. This has no major 
 problems except for the race-condition that might exist when an icon is 
 removed. In that case you will remove it from the index first and then later 
@@ -79,7 +79,7 @@ sure that the index will no longer be used.
 
 I think the best way to distribute the index information is through the file 
 system but the update mechanism for this file should probably more complex 
-than the one used in ksycoca. Since ksycoca updates only happen once in a 
+than the one used in tdesycoca. Since tdesycoca updates only happen once in a 
 while, we can afford it to write out a whole new file. For icons this will 
 probably be more difficult since updates will be part of normal operation, if 
 the index file is rather large (no idea about that.. how much icons are in 
@@ -182,6 +182,6 @@ KDE 2.2: We deliver.
 <pmax> oh I see
 <Zogje> to answer you rfirst question: "won't the ipc be a bottleneck?" no, because you don't use ipc in the critical part (the icon loading)
 <pmax> yup I understand how it works now I think
-<Zogje> instead you access an index from disk which is quite fast (as fast as ksycoca)
+<Zogje> instead you access an index from disk which is quite fast (as fast as tdesycoca)
 <pmax> I think this will definitely speed things up on my machine since I have a relatively fast box with slow disks
 <Zogje> that's why I want to use the file-system instaed of X-properties
diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS
index 07a996b24..995ab753a 100644
--- a/tdecore/MAINTAINERS
+++ b/tdecore/MAINTAINERS
@@ -44,7 +44,7 @@ klibloader.cpp
 klocale.cpp		Hans Petter Bieker <bieker@kde.org>
 kmdcodec.cpp
 kmimesourcefactory.cpp
-kmultipledrag.cpp	David Faure <faure@kde.org>
+tdemultipledrag.cpp	David Faure <faure@kde.org>
 knotifyclient.cpp
 kpalette.cpp		Waldo Bastian <bastian@kde.org>
 kpixmapprovider.cpp	Carsten Pfeiffer <pfeiffer@kde.org>
@@ -64,9 +64,9 @@ kstartupinfo.cpp	Lubos Lunak <l.lunak@kde.org>
 kstaticdeleter.cpp	Stephan Kulow <coolo@kde.org>
 kstdaccel.cpp		Ellis Whitehead <ellis@kde.org>
 kstringhandler.cpp
-ksycoca.cpp		Waldo Bastian <bastian@kde.org>
-ksycocadict.cpp		Waldo Bastian <bastian@kde.org>
-ksycocafactory.cpp	Waldo Bastian <bastian@kde.org>
+tdesycoca.cpp		Waldo Bastian <bastian@kde.org>
+tdesycocadict.cpp		Waldo Bastian <bastian@kde.org>
+tdesycocafactory.cpp	Waldo Bastian <bastian@kde.org>
 ktempfile.cpp		Waldo Bastian <bastian@kde.org>
 kuniqueapplication.cpp	Waldo Bastian <bastian@kde.org>
 kurl.cpp		Waldo Bastian <bastian@kde.org>
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index f8856108c..75037eccf 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -53,8 +53,8 @@ include_HEADERS = kconfig.h kconfigskeleton.h \
 	netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h \
 	kextsock.h kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h \
 	kbufferedio.h kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h \
-	ksycoca.h ksycocaentry.h ksycocatype.h kxmessages.h kstartupinfo.h \
-	klargefile.h kmultipledrag.h kgenericfactory.h kgenericfactory.tcc \
+	tdesycoca.h tdesycocaentry.h tdesycocatype.h kxmessages.h kstartupinfo.h \
+	klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc \
 	ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h \
 	kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h \
 	kmanagerselection.h kmountpoint.h kuser.h klockfile.h \
@@ -84,7 +84,7 @@ libtdefakes_pic.a: libtdefakes.la
 noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \
 	kcompletion_private.h netwm_p.h \
 	kglobalaccel_x11.h kglobalaccel_win.h kkeyserver_x11.h kkeyserver.h \
-	kregpriv.h kshortcutmenu.h ksycocadict.h ksycocafactory.h netsupp.h \
+	kregpriv.h kshortcutmenu.h tdesycocadict.h tdesycocafactory.h netsupp.h \
 	kcheckaccelerators.h kcalendarsystemgregorian.h \
 	kcalendarsystemhijri.h kcalendarsystemhebrew.h kcalendarsystemjalali.h \
 	kprotocolinfofactory.h kqiodevicegzip_p.h kiconloader_p.h
@@ -108,9 +108,9 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
 	ksockaddr.cpp kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp \
 	kpixmapprovider.cpp kurldrag.cpp \
 	kmdcodec.cpp ksocks.cpp fakes.c vsnprintf.c \
-	ksycoca.cpp ksycocadict.cpp ksycocafactory.cpp ksycoca.skel \
+	tdesycoca.cpp tdesycocadict.cpp tdesycocafactory.cpp tdesycoca.skel \
 	kxmessages.cpp kstartupinfo.cpp kcatalogue.cpp kasyncio.cpp \
-	kmultipledrag.cpp kstaticdeleter.cpp kappdcopiface.cpp \
+	tdemultipledrag.cpp kstaticdeleter.cpp kappdcopiface.cpp \
 	kappdcopiface.skel kclipboard.cpp kcheckaccelerators.cpp \
 	tdeversion.cpp kdebugdcopiface.cpp kdebugdcopiface.skel \
 	kcalendarsystem.cpp kcalendarsystemgregorian.cpp \
@@ -188,7 +188,7 @@ install-exec-hook:
 
 DISTCLEANFILES = tde-config.cpp
 
-DOXYGEN_REFERENCES = dcop tdeui kparts kio
+DOXYGEN_REFERENCES = dcop tdeui tdeparts kio
 DOXYGEN_EXCLUDE = malloc kde_file.h
 DOXYGEN_SET_WARN_IF_UNDOCUMENTED = YES
 
diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk
index 635c61f95..657a6a72b 100644
--- a/tdecore/README.kiosk
+++ b/tdecore/README.kiosk
@@ -492,11 +492,11 @@ of these actions then the application will not appear in the TDE menu and will n
 be used by KDE for opening files.
 
 IMPORTANT NOTE:
-Changing restrictions may influence the data that is cached in the ksycoca
+Changing restrictions may influence the data that is cached in the tdesycoca
 database. Since changes to .../share/config/kdeglobals do not trigger an
-automatic ksycoca update you need to force an update manually.
-To force an update of the ksycoca database touch the file 
-.../share/services/update_ksycoca. This will force a user's sycoca database
+automatic tdesycoca update you need to force an update manually.
+To force an update of the tdesycoca database touch the file 
+.../share/services/update_tdesycoca. This will force a user's sycoca database
 to be rebuild the next time the user logs in.
 
 KDE3 URL Restrictions
diff --git a/tdecore/kaccelmanager.cpp b/tdecore/kaccelmanager.cpp
index d4387e652..6c2233c81 100644
--- a/tdecore/kaccelmanager.cpp
+++ b/tdecore/kaccelmanager.cpp
@@ -47,7 +47,7 @@
 
 #include "kaccelmanager_private.h"
 #include "../tdeui/kstdaction_p.h"
-#include "../kutils/kmultitabbar.h"
+#include "../tdeutils/tdemultitabbar.h"
 
 
 /*********************************************************************
diff --git a/tdecore/kconfig_compiler/Makefile.am b/tdecore/kconfig_compiler/Makefile.am
index 5a3b0f2e8..d4f287381 100644
--- a/tdecore/kconfig_compiler/Makefile.am
+++ b/tdecore/kconfig_compiler/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
 
 bin_PROGRAMS = kconfig_compiler
 
-kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kconfig_compiler_LDADD = $(LIB_TDECORE)
 kconfig_compiler_SOURCES = kconfig_compiler.cpp
 
diff --git a/tdecore/kconfig_compiler/example/Makefile.am b/tdecore/kconfig_compiler/example/Makefile.am
index f7834ba63..4e7a59fec 100644
--- a/tdecore/kconfig_compiler/example/Makefile.am
+++ b/tdecore/kconfig_compiler/example/Makefile.am
@@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
 check_PROGRAMS = example # autoexample
 EXTRA_PROGRAMS = autoexample
 
-example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 example_LDADD = $(LIB_TDECORE)
 example_SOURCES = example.cpp exampleprefs_base.cpp
 
-autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 autoexample_LDADD = $(LIB_TDECORE) $(LIB_TDEUI)
 autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
   autoexample.cpp  
diff --git a/tdecore/kconfig_compiler/tests/Makefile.am b/tdecore/kconfig_compiler/tests/Makefile.am
index 9462c800b..953d1c6b4 100644
--- a/tdecore/kconfig_compiler/tests/Makefile.am
+++ b/tdecore/kconfig_compiler/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/kunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdeunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"
 
 check_PROGRAMS = test1 test2 test3 test4 test5 test6 test7 test8 test9 test_dpointer
 
@@ -14,52 +14,52 @@ CLEANFILES = test1.cpp test1.h \
 						 test_dpointer.cpp test_dpointer.h \
              md5sums
 
-test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test1_LDADD = $(LIB_TDECORE)
 test1_SOURCES = test1main.cpp test1.cpp
 
-test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test2_LDADD = $(LIB_TDECORE)
 test2_SOURCES = test2main.cpp test2.cpp
 
-test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test3_LDADD = $(LIB_TDECORE)
 test3_SOURCES = test3main.cpp test3.cpp
 
-test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test4_LDADD = $(LIB_TDECORE)
 test4_SOURCES = test4main.cpp test4.cpp
 
-test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test5_LDADD = $(LIB_TDECORE)
 test5_SOURCES = test5main.cpp test5.cpp
 
-test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test6_LDADD = $(LIB_TDECORE)
 test6_SOURCES = test6main.cpp test6.cpp
 
-test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test7_LDADD = $(LIB_TDECORE)
 test7_SOURCES = test7main.cpp test7.cpp
 
-test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test8_LDADD = $(LIB_TDECORE)
 test8_SOURCES = test8main.cpp test8a.cpp test8b.cpp
 
-test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test9_LDADD = $(LIB_TDECORE)
 test9_SOURCES = test9main.cpp test9.cpp
 
-test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test_dpointer_LDADD = $(LIB_TDECORE)
 test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp
 
-check_LTLIBRARIES = kunittest_kconfigcompiler_test.la
+check_LTLIBRARIES = tdeunittest_kconfigcompiler_test.la
 
-kunittest_kconfigcompiler_test_la_SOURCES = kconfigcompiler_test.cpp
-kunittest_kconfigcompiler_test_la_LIBADD = \
-	$(top_builddir)/kunittest/libkunittest.la
-kunittest_kconfigcompiler_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) \
+tdeunittest_kconfigcompiler_test_la_SOURCES = kconfigcompiler_test.cpp
+tdeunittest_kconfigcompiler_test_la_LIBADD = \
+	$(top_builddir)/tdeunittest/libtdeunittest.la
+tdeunittest_kconfigcompiler_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) \
 	$(all_libraries)
 
 
diff --git a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
index 143838908..c9f2f8471 100644
--- a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
+++ b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
@@ -16,12 +16,12 @@
 #include <tqfile.h>
 #include <tqstring.h>
 #include <kdebug.h>
-#include <kunittest/module.h>
+#include <tdeunittest/module.h>
 #include "kconfigcompiler_test.h"
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( kunittest_kconfigcompiler_test, "TDEConfigXT")
+KUNITTEST_MODULE( tdeunittest_kconfigcompiler_test, "TDEConfigXT")
 KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigCompiler_Test )
 
 typedef const char * CompilerTestSet[];
diff --git a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h
index 1eba78b97..df3f4cf37 100644
--- a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h
+++ b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h
@@ -16,7 +16,7 @@
 #ifndef KCONFIGCOMPILER_TEST_H
 #define KCONFIGCOMPILER_TEST_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 class TQString;
 
diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas
index 92e62aaee..f2da61c43 100644
--- a/tdecore/kdebug.areas
+++ b/tdecore/kdebug.areas
@@ -47,27 +47,27 @@
 399        kimgio
 400        artskde
 500        tdeprint
-700        kutils (KSettings::Dialog)
-701        kutils (KSettings::Dispatcher)
-702        kutils (KPluginSelector)
-703        kutils (KPluginInfo)
-704        kutils (KSettings::ComponentsDialog)
-710        kutils (KCMultiDialog)
-711        kutils (TDECModuleProxy)
-712        kutils (TDECModuleInfo)
-713        kutils (TDECModuleContainer)
-750        kspell (tdelibs)
-760        kmdi
+700        tdeutils (KSettings::Dialog)
+701        tdeutils (KSettings::Dispatcher)
+702        tdeutils (KPluginSelector)
+703        tdeutils (KPluginInfo)
+704        tdeutils (KSettings::ComponentsDialog)
+710        tdeutils (KCMultiDialog)
+711        tdeutils (TDECModuleProxy)
+712        tdeutils (TDECModuleInfo)
+713        tdeutils (TDECModuleContainer)
+750        tdespell (tdelibs)
+760        tdemdi
 780        kcmshell (tdelibs)
-790        kimproxy (tdelibs)
+790        tdeimproxy (tdelibs)
 800        kabapi (tdelibs)
 900        tdesu (tdelibs)
 912        ksmartcard (tdelibs)
 
 
-1000        kparts
-1001        kparts (mainwindow)
-1002        kparts (factory)
+1000        tdeparts
+1001        tdeparts (mainwindow)
+1002        tdeparts (factory)
 
 # tdebase
 1201        konqtree
@@ -116,7 +116,7 @@
 2003        ksim
 2100	    kgpg
 2200	    kdf
-2300        kwallet
+2300        tdewallet
 
 # 2500-2999 Reserved for private use
 
@@ -182,7 +182,7 @@
 5600        kontact (core)
 5601        kontact (interfaces)
 5602        kontact (plugins)
-5650        kresources
+5650        tderesources
 5700        kabc
 5710        kabc/vcard
 5720        kaddressbook
@@ -197,28 +197,28 @@
 5960        kandy
 5970        karm
 
-# libkhtml
-6000        khtml
-6005        khtml (encoding)
-6010        khtml (dom)
-6020        khtml (xml)
-6030        khtml (html)
-6031        khtml (frames & objects)
-6035        khtml (parser)
-6036        khtml (tokenizer)
-6040        khtml (render)
-6041        khtml (bidi)
-6045        khtml (rendering tree)
-6050        khtml (part)
-6060        khtml (cache)
-6061        khtml (cache-expiredates)
-6070        khtml (jscript)
-6080        khtml (css)
-6090        khtml (memory)
+# libtdehtml
+6000        tdehtml
+6005        tdehtml (encoding)
+6010        tdehtml (dom)
+6020        tdehtml (xml)
+6030        tdehtml (html)
+6031        tdehtml (frames & objects)
+6035        tdehtml (parser)
+6036        tdehtml (tokenizer)
+6040        tdehtml (render)
+6041        tdehtml (bidi)
+6045        tdehtml (rendering tree)
+6050        tdehtml (part)
+6060        tdehtml (cache)
+6061        tdehtml (cache-expiredates)
+6070        tdehtml (jscript)
+6080        tdehtml (css)
+6090        tdehtml (memory)
 6100        kjas
-6200        khtml (caret)
-6201        khtml (caret table)
-6210        khtml (editor)
+6200        tdehtml (caret)
+6201        tdehtml (caret table)
+6210        tdehtml (editor)
 
 # libkio
 7000        kio
@@ -556,7 +556,7 @@
 66666	noatun
 67000	kscd
 67100	kmix
-67200	kmid
+67200	tdemid
 
 # tdebindings
 70001	dcoppython
diff --git a/tdecore/kentities.c b/tdecore/kentities.c
index 8181e5a6c..141ed9db0 100644
--- a/tdecore/kentities.c
+++ b/tdecore/kentities.c
@@ -53,7 +53,7 @@
   
     kentities.gperf: input file to generate a hash table for entities
     kentities.c: DO NOT EDIT! generated by the command
-    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 khtmlentities.gperf > entities.c"
+    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 tdehtmlentities.gperf > entities.c"
     from kentities.gperf
 
     $Id$     
diff --git a/tdecore/kentities.gperf b/tdecore/kentities.gperf
index 08f712707..5d848b837 100644
--- a/tdecore/kentities.gperf
+++ b/tdecore/kentities.gperf
@@ -22,7 +22,7 @@
   
     kentities.gperf: input file to generate a hash table for entities
     kentities.c: DO NOT EDIT! generated by the command
-    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 khtmlentities.gperf > entities.c"
+    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 tdehtmlentities.gperf > entities.c"
     from kentities.gperf
 
     $Id$     
diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp
index 1c6232068..de16f0128 100644
--- a/tdecore/kprotocolinfo_tdecore.cpp
+++ b/tdecore/kprotocolinfo_tdecore.cpp
@@ -150,7 +150,7 @@ void
 KProtocolInfo::load( TQDataStream& _str)
 {
    // You may add new fields at the end. Make sure to update the version
-   // number in ksycoca.h
+   // number in tdesycoca.h
    TQ_INT32 i_inputType, i_outputType;
    TQ_INT8 i_isSourceProtocol, i_isHelperProtocol,
           i_supportsListing, i_supportsReading,
@@ -205,7 +205,7 @@ KProtocolInfo::save( TQDataStream& _str)
    KSycocaEntry::save( _str );
 
    // You may add new fields at the end. Make sure to update the version
-   // number in ksycoca.h
+   // number in tdesycoca.h
    TQ_INT32 i_inputType, i_outputType;
    TQ_INT8 i_isSourceProtocol, i_isHelperProtocol,
           i_supportsListing, i_supportsReading,
diff --git a/tdecore/kprotocolinfofactory.cpp b/tdecore/kprotocolinfofactory.cpp
index e47cbb881..c651024ef 100644
--- a/tdecore/kprotocolinfofactory.cpp
+++ b/tdecore/kprotocolinfofactory.cpp
@@ -21,8 +21,8 @@
 #include <kglobal.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <ksycoca.h>
-#include <ksycocadict.h>
+#include <tdesycoca.h>
+#include <tdesycocadict.h>
 
 #include "kprotocolinfofactory.h"
 
diff --git a/tdecore/kprotocolinfofactory.h b/tdecore/kprotocolinfofactory.h
index 6a10ac1e3..04883bde0 100644
--- a/tdecore/kprotocolinfofactory.h
+++ b/tdecore/kprotocolinfofactory.h
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <kurl.h>
-#include <ksycocafactory.h>
+#include <tdesycocafactory.h>
 
 class KProtocolInfoPrivate;
 
diff --git a/tdecore/kstringhandler.h b/tdecore/kstringhandler.h
index 40cfa3617..f20963d63 100644
--- a/tdecore/kstringhandler.h
+++ b/tdecore/kstringhandler.h
@@ -350,8 +350,8 @@ public:
      *
      * Example:
      * \code
-     * perlSplit(' ', "kparts reaches the parts other parts can't", 3)
-     * TQStringList contains: "kparts", "reaches", "the parts other parts can't"
+     * perlSplit(' ', "tdeparts reaches the parts other parts can't", 3)
+     * TQStringList contains: "tdeparts", "reaches", "the parts other parts can't"
      * \endcode
      *
      * @param sep is the character to use to delimit s.
diff --git a/tdecore/network/CMakeLists.txt b/tdecore/network/CMakeLists.txt
index addc3633b..5c213a752 100644
--- a/tdecore/network/CMakeLists.txt
+++ b/tdecore/network/CMakeLists.txt
@@ -24,7 +24,7 @@ install( FILES
     kresolver.h kreverseresolver.h tdesocketaddress.h
     tdesocketbase.h tdesocketdevice.h kclientsocketbase.h
     kstreamsocket.h kserversocket.h kdatagramsocket.h
-    kmulticastsocketdevice.h kmulticastsocket.h
+    tdemulticastsocketdevice.h tdemulticastsocket.h
     knetworkinterface.h khttpproxysocketdevice.h
     ksockssocketdevice.h kbufferedsocket.h kiobuffer.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
diff --git a/tdecore/network/Makefile.am b/tdecore/network/Makefile.am
index 768180d1b..793b6d96d 100644
--- a/tdecore/network/Makefile.am
+++ b/tdecore/network/Makefile.am
@@ -38,8 +38,8 @@ include_HEADERS = kresolver.h \
 	kstreamsocket.h \
 	kserversocket.h \
 	kdatagramsocket.h \
-	kmulticastsocketdevice.h \
-	kmulticastsocket.h \
+	tdemulticastsocketdevice.h \
+	tdemulticastsocket.h \
 	knetworkinterface.h \
 	khttpproxysocketdevice.h \
 	ksockssocketdevice.h \
diff --git a/tdecore/network/kmulticastsocket.h b/tdecore/network/tdemulticastsocket.h
index 8fe413283..15d3a28ea 100644
--- a/tdecore/network/kmulticastsocket.h
+++ b/tdecore/network/tdemulticastsocket.h
@@ -26,13 +26,13 @@
 #define KMULTICASTSOCKET_H
 
 #include "kdatagramsocket.h"
-#include "kmulticastsocketdevice.h"
+#include "tdemulticastsocketdevice.h"
 
 namespace KNetwork {
 
 class KMulticastSocketPrivate;
 /**
- * @class KMulticastSocket kmulticastsocket.h kmulticastsocket.h
+ * @class KMulticastSocket tdemulticastsocket.h tdemulticastsocket.h
  * @brief A multicast-capable datagram socket class
  *
  * This class derives from @ref KDatagramSocket adding methods to it to
diff --git a/tdecore/network/kmulticastsocketdevice.h b/tdecore/network/tdemulticastsocketdevice.h
index a24ba326a..bddb048a8 100644
--- a/tdecore/network/kmulticastsocketdevice.h
+++ b/tdecore/network/tdemulticastsocketdevice.h
@@ -34,7 +34,7 @@ namespace KNetwork {
 class KMulticastSocketImplPrivate;
 
 /**
- * @class KMulticastSocketImpl kmulticastsocketdevice.h kmulticastsocketdevice.h
+ * @class KMulticastSocketImpl tdemulticastsocketdevice.h tdemulticastsocketdevice.h
  * @brief The low-level backend for multicasting sockets.
  *
  * This class is an interface providing methods for handling multicast 
diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp
index bd5ee6ec6..d012c64aa 100644
--- a/tdecore/tdehardwaredevices.cpp
+++ b/tdecore/tdehardwaredevices.cpp
@@ -4458,7 +4458,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD
 		}
 
 		// FIXME
-		// Much of the code in libkrandr should be integrated into/interfaced with this library
+		// Much of the code in libtderandr should be integrated into/interfaced with this library
 	}
 
 	if (device->type() == TDEGenericDeviceType::RootSystem) {
@@ -5587,7 +5587,7 @@ TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDE
 		ret = DesktopIcon("kcmpci", size);
 	}
 	else if (query == TDEGenericDeviceType::Backlight) {
-		ret = DesktopIcon("kscreensaver", size);	// FIXME
+		ret = DesktopIcon("tdescreensaver", size);	// FIXME
 	}
 	else if (query == TDEGenericDeviceType::Battery) {
 		ret = DesktopIcon("energy", size);
diff --git a/tdecore/kmultipledrag.cpp b/tdecore/tdemultipledrag.cpp
index 29d56bd85..db71c9e87 100644
--- a/tdecore/kmultipledrag.cpp
+++ b/tdecore/tdemultipledrag.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kmultipledrag.h"
+#include "tdemultipledrag.h"
 #include "kdebug.h"
 
 #ifndef QT_NO_DRAGANDDROP
@@ -77,6 +77,6 @@ const char* KMultipleDrag::format( int i ) const
 void KMultipleDrag::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kmultipledrag.moc"
+#include "tdemultipledrag.moc"
 
 #endif
diff --git a/tdecore/kmultipledrag.h b/tdecore/tdemultipledrag.h
index 42baf3530..42baf3530 100644
--- a/tdecore/kmultipledrag.h
+++ b/tdecore/tdemultipledrag.h
diff --git a/tdecore/ksycoca.cpp b/tdecore/tdesycoca.cpp
index 0a2cd2511..f433510d6 100644
--- a/tdecore/ksycoca.cpp
+++ b/tdecore/tdesycoca.cpp
@@ -18,9 +18,9 @@
 
 #include "config.h"
 
-#include "ksycoca.h"
-#include "ksycocatype.h"
-#include "ksycocafactory.h"
+#include "tdesycoca.h"
+#include "tdesycocatype.h"
+#include "tdesycocafactory.h"
 
 #include <tqdatastream.h>
 #include <tqfile.h>
@@ -87,7 +87,7 @@ int KSycoca::version()
 
 // Read-only constructor
 KSycoca::KSycoca()
-  : DCOPObject("ksycoca"), m_lstFactories(0), m_str(0), m_barray(0), bNoDatabase(false),
+  : DCOPObject("tdesycoca"), m_lstFactories(0), m_str(0), m_barray(0), bNoDatabase(false),
     m_sycoca_size(0), m_sycoca_mmap(0), m_timeStamp(0)
 {
    d = new KSycocaPrivate;
@@ -112,21 +112,21 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound )
    m_str = 0;
    m_barray = 0;
    TQString path;
-   TQCString ksycoca_env = getenv("TDESYCOCA");
-   if (ksycoca_env.isEmpty())
-      path = TDEGlobal::dirs()->saveLocation("cache") + "ksycoca";
+   TQCString tdesycoca_env = getenv("TDESYCOCA");
+   if (tdesycoca_env.isEmpty())
+      path = TDEGlobal::dirs()->saveLocation("cache") + "tdesycoca";
    else
-      path = TQFile::decodeName(ksycoca_env);
+      path = TQFile::decodeName(tdesycoca_env);
 
-   kdDebug(7011) << "Trying to open ksycoca from " << path << endl;
+   kdDebug(7011) << "Trying to open tdesycoca from " << path << endl;
    TQFile *database = new TQFile(path);
    bool bOpen = database->open( IO_ReadOnly );
    if (!bOpen)
    {
-     path = locate("services", "ksycoca");
+     path = locate("services", "tdesycoca");
      if (!path.isEmpty())
      {
-       kdDebug(7011) << "Trying to open global ksycoca from " << path << endl;
+       kdDebug(7011) << "Trying to open global tdesycoca from " << path << endl;
        delete database;
        database = new TQFile(path);
        bOpen = database->open( IO_ReadOnly );
@@ -166,7 +166,7 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound )
    }
    else
    {
-     kdDebug(7011) << "Could not open ksycoca" << endl;
+     kdDebug(7011) << "Could not open tdesycoca" << endl;
 
      // No database file
      delete database;
@@ -197,7 +197,7 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound )
 
 // Read-write constructor - only for KBuildSycoca
 KSycoca::KSycoca( bool /* dummy */ )
-  : DCOPObject("ksycoca_building"), m_lstFactories(0), m_str(0), m_barray(0), bNoDatabase(false),
+  : DCOPObject("tdesycoca_building"), m_lstFactories(0), m_str(0), m_barray(0), bNoDatabase(false),
     m_sycoca_size(0), m_sycoca_mmap(0)
 {
    d = new KSycocaPrivate;
@@ -206,14 +206,14 @@ KSycoca::KSycoca( bool /* dummy */ )
    _self = this;
 }
 
-static void delete_ksycoca_self() {
+static void delete_tdesycoca_self() {
   delete KSycoca::_self;
 }
 
 KSycoca * KSycoca::self()
 {
     if (!_self) {
-        tqAddPostRoutine(delete_ksycoca_self);
+        tqAddPostRoutine(delete_tdesycoca_self);
         _self = new KSycoca();
     }
   return _self;
@@ -525,4 +525,4 @@ void KSycoca::virtual_hook( int id, void* data )
 void KSycocaEntry::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "ksycoca.moc"
+#include "tdesycoca.moc"
diff --git a/tdecore/ksycoca.h b/tdecore/tdesycoca.h
index adf9d2aa7..1b3355de3 100644
--- a/tdecore/ksycoca.h
+++ b/tdecore/tdesycoca.h
@@ -16,13 +16,13 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycoca_h__
-#define __ksycoca_h__
+#ifndef __tdesycoca_h__
+#define __tdesycoca_h__
 
 #include <dcopobject.h>
 #include <tqobject.h>
 #include <tqstringlist.h>
-#include "ksycocatype.h"
+#include "tdesycocatype.h"
 #include <tdelibs_export.h>
 
 class TQDataStream;
@@ -99,7 +99,7 @@ public:
     * @internal - returns update signature of database
     *
     * Signature that keeps track of changes to
-    * $TDEDIR/share/services/update_ksycoca
+    * $TDEDIR/share/services/update_tdesycoca
     *
     * Touching this file causes the database to be recreated
     * from scratch.
diff --git a/tdecore/ksycocadict.cpp b/tdecore/tdesycocadict.cpp
index d8dcf3a24..702c163a7 100644
--- a/tdecore/ksycocadict.cpp
+++ b/tdecore/tdesycocadict.cpp
@@ -16,9 +16,9 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include "ksycocadict.h"
-#include "ksycocaentry.h"
-#include "ksycoca.h"
+#include "tdesycocadict.h"
+#include "tdesycocaentry.h"
+#include "tdesycoca.h"
 
 #include <tqptrlist.h>
 #include <tqvaluelist.h>
diff --git a/tdecore/ksycocadict.h b/tdecore/tdesycocadict.h
index 79f1432e8..006e72a61 100644
--- a/tdecore/ksycocadict.h
+++ b/tdecore/tdesycocadict.h
@@ -16,8 +16,8 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocadict_h__
-#define __ksycocadict_h__
+#ifndef __tdesycocadict_h__
+#define __tdesycocadict_h__
 
 #include <tqstring.h>
 #include <tqvaluelist.h>
diff --git a/tdecore/ksycocaentry.h b/tdecore/tdesycocaentry.h
index a3071ec5a..a4e2512e0 100644
--- a/tdecore/ksycocaentry.h
+++ b/tdecore/tdesycocaentry.h
@@ -16,10 +16,10 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocaentry_h__
-#define __ksycocaentry_h__
+#ifndef __tdesycocaentry_h__
+#define __tdesycocaentry_h__
 
-#include "ksycocatype.h"
+#include "tdesycocatype.h"
 
 #include <tqstringlist.h>
 #include <ksharedptr.h>
@@ -32,7 +32,7 @@ class TQDataStream;
  * the common functionality for servicetypes and services.
  * 
  * @internal
- * @see http://developer.kde.org/documentation/library/kdeqt/trinityarch/ksycoca.html 
+ * @see http://developer.kde.org/documentation/library/kdeqt/trinityarch/tdesycoca.html 
  */
 class TDECORE_EXPORT KSycocaEntry : public KShared
 {
diff --git a/tdecore/ksycocafactory.cpp b/tdecore/tdesycocafactory.cpp
index c224ebe79..d7d350ddf 100644
--- a/tdecore/ksycocafactory.cpp
+++ b/tdecore/tdesycocafactory.cpp
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include "ksycoca.h"
-#include "ksycocatype.h"
-#include "ksycocafactory.h"
-#include "ksycocaentry.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocatype.h"
+#include "tdesycocafactory.h"
+#include "tdesycocaentry.h"
+#include "tdesycocadict.h"
 #include <tqstringlist.h>
 #include <tqdict.h>
 #include <kdebug.h>
diff --git a/tdecore/ksycocafactory.h b/tdecore/tdesycocafactory.h
index 100047834..4569fff5a 100644
--- a/tdecore/ksycocafactory.h
+++ b/tdecore/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/tdecore/ksycocatype.h b/tdecore/tdesycocatype.h
index 889c3be6d..8407782fc 100644
--- a/tdecore/ksycocatype.h
+++ b/tdecore/tdesycocatype.h
@@ -18,8 +18,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ksycocatype_h__
-#define __ksycocatype_h__
+#ifndef __tdesycocatype_h__
+#define __tdesycocatype_h__
 
 /**
  * \relates KSycocaEntry
diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am
index e35ae68a4..9d2c5259c 100644
--- a/tdecore/tests/Makefile.am
+++ b/tdecore/tests/Makefile.am
@@ -79,8 +79,8 @@ kstdacceltest_SOURCES = kstdacceltest.cpp
 kglobaltest_SOURCES = kglobaltest.cpp
 ktimezonestest_SOURCES = ktimezonestest.cpp
 
-check_LTLIBRARIES = kunittest_kconfig.la
+check_LTLIBRARIES = tdeunittest_kconfig.la
 
-kunittest_kconfig_la_SOURCES = kconfigtest.cpp
-kunittest_kconfig_la_LIBADD = $(LIB_KUNITTEST)
-kunittest_kconfig_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
+tdeunittest_kconfig_la_SOURCES = kconfigtest.cpp
+tdeunittest_kconfig_la_LIBADD = $(LIB_KUNITTEST)
+tdeunittest_kconfig_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
diff --git a/tdecore/tests/dcopkonqtest.cpp b/tdecore/tests/dcopkonqtest.cpp
index 543efd706..79137cd5f 100644
--- a/tdecore/tests/dcopkonqtest.cpp
+++ b/tdecore/tests/dcopkonqtest.cpp
@@ -27,8 +27,8 @@ debug("sending configure to object KonquerorIface in konqueror");
       debug("ko");
 
 /// BROADCAST
-debug("sending databaseChanged to object ksycoca in all apps");
-    if (kapp->dcopClient()->send( "*", "ksycoca", "databaseChanged()", data ))
+debug("sending databaseChanged to object tdesycoca in all apps");
+    if (kapp->dcopClient()->send( "*", "tdesycoca", "databaseChanged()", data ))
       debug("ok");
     else
       debug("ko");
diff --git a/tdecore/tests/kapptest.cpp b/tdecore/tests/kapptest.cpp
index 53bb0f9f3..bae6a9c2e 100644
--- a/tdecore/tests/kapptest.cpp
+++ b/tdecore/tests/kapptest.cpp
@@ -23,7 +23,7 @@
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <kglobalsettings.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 
 int
 main(int argc, char *argv[])
diff --git a/tdecore/tests/kconfigtest.cpp b/tdecore/tests/kconfigtest.cpp
index e4768119c..d3421a3d8 100644
--- a/tdecore/tests/kconfigtest.cpp
+++ b/tdecore/tests/kconfigtest.cpp
@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kunittest/tester.h>
-#include <kunittest/module.h>
+#include <tdeunittest/tester.h>
+#include <tdeunittest/module.h>
 
 #include <kconfig.h>
 
@@ -31,7 +31,7 @@ private:
     void revertEntries();
 };
 
-KUNITTEST_MODULE( kunittest_kconfig, "TDEConfigTest" )
+KUNITTEST_MODULE( tdeunittest_kconfig, "TDEConfigTest" )
 KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigTest )
 
 // test data
diff --git a/khtml/.emacs-dirvars b/tdehtml/.emacs-dirvars
index 36219bd6b..36219bd6b 100644
--- a/khtml/.emacs-dirvars
+++ b/tdehtml/.emacs-dirvars
diff --git a/khtml/CMakeLists.txt b/tdehtml/CMakeLists.txt
index 2c5e58a4b..bab7d78e2 100644
--- a/khtml/CMakeLists.txt
+++ b/tdehtml/CMakeLists.txt
@@ -20,7 +20,7 @@ add_subdirectory( rendering )
 add_subdirectory( pics )
 add_subdirectory( java )
 add_subdirectory( ecma )
-add_subdirectory( kmultipart )
+add_subdirectory( tdemultipart )
 
 include_directories(
   ${TQT_INCLUDE_DIRS}
@@ -39,8 +39,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/kio/kio
   ${CMAKE_SOURCE_DIR}/kio/kfile
   ${CMAKE_SOURCE_DIR}/kio/kssl
-  ${CMAKE_SOURCE_DIR}/kutils
-  ${CMAKE_SOURCE_DIR}/kwallet/client
+  ${CMAKE_SOURCE_DIR}/tdeutils
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
   ${CMAKE_SOURCE_DIR}/tdeprint
 )
 
@@ -52,32 +52,32 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    khtmlview.h khtml_part.h khtml_events.h
-    khtml_settings.h khtmldefaults.h
+    tdehtmlview.h tdehtml_part.h tdehtml_events.h
+    tdehtml_settings.h tdehtmldefaults.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
 ##### other data ################################
 
-install( FILES khtml.desktop khtmlimage.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES khtml.rc khtml_browser.rc khtml_popupmenu.rc DESTINATION ${DATA_INSTALL_DIR}/khtml )
+install( FILES tdehtml.desktop tdehtmlimage.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdehtml.rc tdehtml_browser.rc tdehtml_popupmenu.rc DESTINATION ${DATA_INSTALL_DIR}/tdehtml )
 
 
-##### khtml #####################################
+##### tdehtml #####################################
 
-set( target khtml )
+set( target tdehtml )
 
 set( ${target}_SRCS
-  khtmlview.cpp khtml_part.cpp khtml_run.cpp
-  khtml_factory.cpp khtml_settings.cc khtml_events.cpp
-  khtml_ext.cpp khtml_pagecache.cpp khtml_iface.cc
-  khtml_printsettings.cpp khtmlimage.cpp kjserrordlg.ui
-  htmlpageinfo.ui khtml_iface.skel
+  tdehtmlview.cpp tdehtml_part.cpp tdehtml_run.cpp
+  tdehtml_factory.cpp tdehtml_settings.cc tdehtml_events.cpp
+  tdehtml_ext.cpp tdehtml_pagecache.cpp tdehtml_iface.cc
+  tdehtml_printsettings.cpp tdehtmlimage.cpp kjserrordlg.ui
+  htmlpageinfo.ui tdehtml_iface.skel
 )
 
 ### FIXME what is this?
 ### if include_VERSION_SCRIPT
-### VSCRIPT = -Wl,--version-script=$(srcdir)/libkhtml.map
+### VSCRIPT = -Wl,--version-script=$(srcdir)/libtdehtml.map
 ### endif
 
 ### FIXME what about java?
@@ -86,17 +86,17 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 4.2.0
-  LINK ${VSCRIPT} kjava-static kjs_html-static khtmldom-static khtmlcss-static
-    khtmlhtml-static khtmlxml-static khtmlrender-static khtmlmisc-static
-    kutils-shared tdeprint-shared kjs-shared ${JPEG_LIBRARIES}
+  LINK ${VSCRIPT} kjava-static kjs_html-static tdehtmldom-static tdehtmlcss-static
+    tdehtmlhtml-static tdehtmlxml-static tdehtmlrender-static tdehtmlmisc-static
+    tdeutils-shared tdeprint-shared kjs-shared ${JPEG_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
   DEPENDENCIES dcopidl
 )
 
 
-##### libkhtmlpart ##############################
+##### libtdehtmlpart ##############################
 
-set( target libkhtmlpart )
+set( target libtdehtmlpart )
 
 set( ${target}_SRCS
   dummy.cpp
@@ -104,20 +104,20 @@ set( ${target}_SRCS
 
 file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
 "#include <tdelibs_export.h>
-extern \"C\" KDE_EXPORT void* init_libkhtml();
-extern \"C\" KDE_EXPORT void* init_libkhtmlpart() { return init_libkhtml(); }
+extern \"C\" KDE_EXPORT void* init_libtdehtml();
+extern \"C\" KDE_EXPORT void* init_libtdehtmlpart() { return init_libtdehtml(); }
 " )
 
 tde_add_kpart( ${target}
   SOURCES ${${target}_SRCS}
-  LINK khtml-shared
+  LINK tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
 
-##### khtmlimagepart ############################
+##### tdehtmlimagepart ############################
 
-set( target khtmlimagepart )
+set( target tdehtmlimagepart )
 
 set( ${target}_SRCS
   imgdummy.cpp
@@ -126,12 +126,12 @@ set( ${target}_SRCS
 file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/imgdummy.cpp
 "
 #include <tdelibs_export.h>
-extern \"C\"  KDE_EXPORT void* init_khtmlimagefactory();
-extern \"C\"  KDE_EXPORT void* init_khtmlimagepart() { return init_khtmlimagefactory(); }
+extern \"C\"  KDE_EXPORT void* init_tdehtmlimagefactory();
+extern \"C\"  KDE_EXPORT void* init_tdehtmlimagepart() { return init_tdehtmlimagefactory(); }
 " )
 
 tde_add_kpart( ${target}
   SOURCES ${${target}_SRCS}
-  LINK khtml-shared
+  LINK tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/khtml/ChangeLog b/tdehtml/ChangeLog
index 8c7c88bb9..ea77bf459 100644
--- a/khtml/ChangeLog
+++ b/tdehtml/ChangeLog
@@ -33,7 +33,7 @@
 	* ecma/kjs_window.cpp (executeOpenWindow): fixed location href
 	and pathname for about:blank windows
 
-	* khtml_part.cpp (findFrameParent): made frame name lookup locale
+	* tdehtml_part.cpp (findFrameParent): made frame name lookup locale
 	independant. Was mostly problematic with non-ascii names.
 
 	* html/html_formimpl.cpp (gatherWalletData): prevent crash occuring
@@ -48,7 +48,7 @@
         * rendering/render_object.h: New functions scrollsOverflowX() and scrollsOverflowY
         * rendering/render_layer.h: Remove depricated function moveScrollbarsAside()
         * rendering/render_layer.cpp: More fine grained creation of scrollbars
-        * khtmlview.cpp: More fine grained creation of scrollbars
+        * tdehtmlview.cpp: More fine grained creation of scrollbars
         * rendering/render_block.cpp: Use new functions
         * rendering/render_box.cpp: Use new functions
         * rendering/bidi.cpp: Use new functions
@@ -83,7 +83,7 @@
 
         * html/html_baseimpl.{h,cpp} (HTMLIFrameElementImpl::parseAttribute): parse frameborder attribute. Defaults to true as per specification.
         (HTMLIFrameElementImpl::updateFrame/attach): apply/remove frameborder style at attachment time.
-        * khtmlview.cpp (drawContents): fix counter-mask problem. Widget geometry is not accurate before painting, so we must
+        * tdehtmlview.cpp (drawContents): fix counter-mask problem. Widget geometry is not accurate before painting, so we must
         use the RenderObject's.
         * rendering/render_frames.h (paddingTop/paddingBottom/paddingLeft/paddingRight): reimplement. Frames have no padding.
         (RenderPartObject::canHaveBorder): reimplement. True.
@@ -219,7 +219,7 @@
 
         Improve the CSS :lang() selector to match clarified specification
 
-        * khtml_part.cpp: parse HTTP content-language
+        * tdehtml_part.cpp: parse HTTP content-language
         * xml/dom_docimpl.cpp: parse HTTP-EQUIV content-language
         * css/cssstyleselector.cpp: match :lang() against parents and ultimately the document
 
@@ -227,7 +227,7 @@
 
         Scope: relayout/repaint/widget masks fixes. Refine stacking context exploration. Optimise.
 
-        * khtmlview.cpp (drawContents): use widget geometry rather than the RenderWidget's rect (fixes widget borders not being updated)
+        * tdehtmlview.cpp (drawContents): use widget geometry rather than the RenderWidget's rect (fixes widget borders not being updated)
         Check if widget is in the dirty rect before doing any work.
 
         * rendering/render_block.cpp (layoutBlockChildren): I meant !child->isPositioned() here, not isPositioned(). No need to
@@ -245,7 +245,7 @@
 
         * rendering/render_replaced.{h,cpp} (isKHTMLWidget): new flag for KHTML-proxied widgets.
         (detach/resizeWidget/setQWidget/layout/updateFromElement/slotWidgetDestructed/setStyle/paint): use the flag insead of strcmp's
-        Only allow !khtml widgets to register in the view (only those need masking).
+        Only allow !tdehtml widgets to register in the view (only those need masking).
 
 2006-03-05  Charles Samuels  <charles@kde.org>
 	* link not accessable with negative text-indent (#96275)
@@ -259,7 +259,7 @@
 
         get iframes, objects and some other overlaid widgets to obey their stacking context (#31121)
 
-        * khtmlview.cpp: mask widgets more precisely (i.e. allow layers to paint over overlaid widgets,
+        * tdehtmlview.cpp: mask widgets more precisely (i.e. allow layers to paint over overlaid widgets,
         when they ought to).
 
         * rendering/render_canvas.{cpp,h}: update widget masks after pos child layout/positioning;
@@ -314,7 +314,7 @@
 2005-12-09  Germain Garand  <germain@ebooksfrance.org>
 
         implement quirky HTML alignment ; introduce special float values
-        -khtml-left/-khtml-right to this effect.
+        -tdehtml-left/-tdehtml-right to this effect.
 
         * css/cssparser.cpp: ditto. Fix memory leak from Function struct deletion also.
         * css/cssstyleselector.cpp: ditto.
@@ -377,7 +377,7 @@
 
 2005-10-14  Lubos Lunak <l.lunak@kde.org>
 
-        * khtmlview.cpp: show accesskeys for all frames
+        * tdehtmlview.cpp: show accesskeys for all frames
 
 2005-10-13  Allan Sandfeld Jensen <kde@carewolf.com>
 
@@ -441,7 +441,7 @@
 
         Implementation of real page-breaking algorithm respecting the CSS 2.1 specification.
 
-        * khtmlview.cpp:
+        * tdehtmlview.cpp:
         Do layout for page-breaks before printing.
         Use screen resolution as default instead of 72DPI.
         * css/html4.css: Add the print media default styles
@@ -490,7 +490,7 @@
         * rendering/render_line.{h,cpp}: ditto
         * rendering/render_object.{h,cpp}: ditto
         * rendering/render_form.cpp:
-        * khtml/rendering/render_table.cpp:
+        * tdehtml/rendering/render_table.cpp:
 
 2005-08-02  Allan Sandfeld Jensen <kde@carewolf.com>
 
@@ -499,7 +499,7 @@
 2005-07-26  Andreas Kling <kling@impul.se>
 
         * html/htmlparser.cpp: Block <input type="image"> elements if SRC attribute is ad-filtered.
-        * khtml_part.cpp: Include <input type="image"> elements in AdBlocK filter runs.
+        * tdehtml_part.cpp: Include <input type="image"> elements in AdBlocK filter runs.
 
 2005-07-25  Dawit Alemayehu <adawit@kde.org>
         * ecma/xmlhttprequest.cpp: Use the charset provided by the remote host through the HTTP headers.
@@ -509,8 +509,8 @@
         Make new ad filters have instant effect (either hide affected elements
         replace them with the "blocked" pixmap.)
 
-        * khtml_part.{cpp,h}: Added runAdFilters() function which is called from reparseConfiguration()
-        * khtml_ext.cpp: Call KHTMLPart::reparseConfiguration() after adding new filters.
+        * tdehtml_part.{cpp,h}: Added runAdFilters() function which is called from reparseConfiguration()
+        * tdehtml_ext.cpp: Call KHTMLPart::reparseConfiguration() after adding new filters.
         * misc/loader.cpp: Create blockedPixmap in Cache::init() instead of the CachedImage constructor.
 
 2005-07-19  Allan Sandfeld Jensen <kde@carewolf.com>
@@ -526,9 +526,9 @@
 
         "Block IFrame..." context menu option
 
-        * khtml_ext.{cpp,h}: Added "blockiframe" to context popup menu
-        * khtml_popupmenu.rc: Same
-        * khtml_part.h: added KHTMLPopupGUIClient to friend classes
+        * tdehtml_ext.{cpp,h}: Added "blockiframe" to context popup menu
+        * tdehtml_popupmenu.rc: Same
+        * tdehtml_part.h: added KHTMLPopupGUIClient to friend classes
 
 2005-07-08  Germain Garand  <germain@ebooksfrance.org>
 
@@ -580,7 +580,7 @@
         * html/html_tableimpl.cpp (appendChild): Improve fix for bug #105586 to avoid
         side effects with tfoot.
 
-        * khtml_run.cpp (foundMimeType): Mark child object (e.g. <embed>) as completed
+        * tdehtml_run.cpp (foundMimeType): Mark child object (e.g. <embed>) as completed
         after saving, running in external viewer, or cancelling, so that e.g. scheduled redirects
         can happen. Patch by Andreas Kling <kling@impul.se>.
 
@@ -633,7 +633,7 @@
 
         * ecma/domparser.{h,cpp}: Implementation
         * ecma/kjs_window.{h,cpp}: Exposing DOMParser
-        * misc/shared.h: khtml::SharedPtr<>
+        * misc/shared.h: tdehtml::SharedPtr<>
 
 2005-06-08  Allan Sandfeld Jensen <kde@carewolf.com>
 
@@ -662,7 +662,7 @@
         Implement ideographic enumeration including the CSS 2.1 cjk-ideographic and several from CSS 3 List (working draft).
         Also add three more numeric: (Lao, Thai and Tibetan)
 
-        * css/cssvalues.in: Add new CSS3 values with -khtml-
+        * css/cssvalues.in: Add new CSS3 values with -tdehtml-
         * rendering/render_style.h: Add new enums
         * rendering/enumerate.cpp: Implement the ideographic algorithm.
 
@@ -708,7 +708,7 @@
 	from innerHTML() and innerText()
 
 2005-05-14  Ivor Hewitt <ivor@ivor.org>
-        * khtml_settings.cc: Support full wildcard expressions in AdblocK
+        * tdehtml_settings.cc: Support full wildcard expressions in AdblocK
 
 2005-05-12  Luciano Montanaro <mikelima@cirulla.net>
 	* html/html_formimpl.cpp: Make a return keypress activate form
@@ -718,7 +718,7 @@
 
 2005-05-12  David Faure  <faure@kde.org>
 
-        * khtmlview.cpp (dispatchKeyEvent): Don't send DOM keypress if
+        * tdehtmlview.cpp (dispatchKeyEvent): Don't send DOM keypress if
         the DOM keydown that precedes it was blocked by javascript, as in IE.
 
         * rendering/render_replaced.cpp (handleEvent): send Qt::KeyPress to the
@@ -749,9 +749,9 @@
 
         fix #15848: First implementation of AdBlocK.
 
-        * khtml_ext.{cpp,h}: Add Blockimage to context popup menu
-        * khtml_popupmenu.rc: ditto
-        * khtml_settings.{cc,h}: Add adFilter settings and helper functions
+        * tdehtml_ext.{cpp,h}: Add Blockimage to context popup menu
+        * tdehtml_popupmenu.rc: ditto
+        * tdehtml_settings.{cc,h}: Add adFilter settings and helper functions
         * html/htmlparser.cpp: Strip blocked IMG tags
         * misc/loader.{cpp,h}: Return replacement blocked images and refuse to load blocked scripts.
         * misc/blocked_icon.{cpp,png}: Image for above
@@ -805,15 +805,15 @@
 
 2005-04-15  Lubos Lunak <l.lunak@kde.org>
 
-        * khtmlview.{h,cpp}: Assign unused accesskeys automatically to elements
+        * tdehtmlview.{h,cpp}: Assign unused accesskeys automatically to elements
         without accesskeys.
 
 2005-04-06  Lubos Lunak <l.lunak@kde.org>
 
-        * khtmlview.{h,cpp}: Use KActions for type ahead find.
-        * khtml_part.{h,cpp}: ditto.
-        * khtml_part.{h,cpp}: Add Find Previous action.
-        * khtml_part.cpp (findTextNext): Fix changing direction while searching text.
+        * tdehtmlview.{h,cpp}: Use KActions for type ahead find.
+        * tdehtml_part.{h,cpp}: ditto.
+        * tdehtml_part.{h,cpp}: Add Find Previous action.
+        * tdehtml_part.cpp (findTextNext): Fix changing direction while searching text.
 
 2005-04-05  Lubos Lunak <l.lunak@kde.org>
 
@@ -821,7 +821,7 @@
 
 2005-04-04  Lubos Lunak <l.lunak@kde.org>
 
-        * khtmlview.cpp: Don't use keyboard grab for type-ahead find.
+        * tdehtmlview.cpp: Don't use keyboard grab for type-ahead find.
 
 2005-04-03  Allan Sandfeld Jensen <kde@carewolf.com>
 
@@ -1031,7 +1031,7 @@
 
 2005-02-16  Leo Savernik  <l.savernik@aon.at>
 
-	* khtmlview.cpp (dispatchMouseEvent): Walk upwards the parent chain
+	* tdehtmlview.cpp (dispatchMouseEvent): Walk upwards the parent chain
 	from the target node and set the focus to the nearest focusable
 	ancestor (merged from WebCore).
 
@@ -1045,7 +1045,7 @@
         * html/htmltokenizer.{h,cpp} (setAutoClose/timerEvent/...): add timer driven auto-close mode for
           e.g cross-frame scripts.
 
-        * khtml_part.{h,cpp} (resetFromScript): reset the part to a sane state before reopening
+        * tdehtml_part.{h,cpp} (resetFromScript): reset the part to a sane state before reopening
           a closed document.
 
         * xml/dom_docimpl.cpp (write): ditto.
@@ -1108,7 +1108,7 @@
 
 2005-02-12  David Faure  <faure@kde.org>
 
-        * khtml_part.cpp (slotRedirect): No reload should happen when redirecting
+        * tdehtml_part.cpp (slotRedirect): No reload should happen when redirecting
         to sameurl#anchor via Javascript or META refresh. This happened due to the
         setRedirectedRequest(true), which wasn't necessary for the webmin tree.cgi
         fix - setRedirectedRequest is called by KonqRun for that one.
@@ -1129,7 +1129,7 @@
 
 2005-02-08  David Faure  <faure@kde.org>
 
-        * khtml_part.cpp (executeScript): Handle immediate redirects, scheduled
+        * tdehtml_part.cpp (executeScript): Handle immediate redirects, scheduled
         by JS with e.g. location='foo', as soon as the current script finishes.
 
 2005-02-07  Leo Savernik  <l.savernik@aon.at>
@@ -1200,7 +1200,7 @@
 
 2005-01-25  Germain Garand  <germain@ebooksfrance.org>
 
-        * khtmlview.cpp (viewportWheelEvent): discard wheel events occuring before the first relayout (avoids blanking the view).
+        * tdehtmlview.cpp (viewportWheelEvent): discard wheel events occuring before the first relayout (avoids blanking the view).
          Also support Horizontal wheel events (needs qt-copy/patch #61).
 
 2005-01-25  Germain Garand  <germain@ebooksfrance.org>
@@ -1232,7 +1232,7 @@
 
 2005-01-06  Allan Sandfeld Jensen <kde@carewolf.com>
 
-        * khtml_part.cpp: Fix selection by selecting the text in the cleaned string rather
+        * tdehtml_part.cpp: Fix selection by selecting the text in the cleaned string rather
         than in the DOM.
         * xml/dom_textimpl.{h,cpp}: Add renderString() to return the possibly transformed string.
 
@@ -1262,7 +1262,7 @@
 
         memory allocation fixes
 
-        * khtml_factory.cpp: cleanup the global Arena freelist after the last khtml part gets unloaded
+        * tdehtml_factory.cpp: cleanup the global Arena freelist after the last tdehtml part gets unloaded
 
         * misc/arena.{cpp,h} (InitArenaPool): change arenasize from 4096 to kMax(8192, 2*pagesize).
         (ArenaAllocate): when a single pool grows over a 256*initial size threshold, switch to fractional allocation
@@ -1307,7 +1307,7 @@
         Pragmatic incremental repaints: be accurate on layered objects, conservative on
         objects in normal flow. Fix performance issues on repeated relayouts (#53114)
 
-        * khtmlview.{cpp,h}: add needsFullRepaint flag, mostly similar to WebCore's.
+        * tdehtmlview.{cpp,h}: add needsFullRepaint flag, mostly similar to WebCore's.
         (layout): don't repaint the canvas systematically anymore.
 
         * rendering/bidi.cpp (layoutInlineChildren): schedule a repaint on
@@ -1344,12 +1344,12 @@
         slots to avoid undeterministic calling order and redundant
         connections(#94783, 3.3.2 regression of #57360).
 
-        * khtml_part.cpp (restoreURL/openURL/slotData/restoreState): ditto.
+        * tdehtml_part.cpp (restoreURL/openURL/slotData/restoreState): ditto.
         (checkCompleted): don't setContentsPos here
 
-        * khtml_part.h: remove private gotoAnchor slot
+        * tdehtml_part.h: remove private gotoAnchor slot
 
-        * khtmlpart_p.h: add boolean to record whether we need to restore a
+        * tdehtmlpart_p.h: add boolean to record whether we need to restore a
         stored scroll offset or honour an anchor
 
 2004-12-09  Allan Sandfeld Jensen <kde@carewolf.com>
@@ -1364,7 +1364,7 @@
         Merge encoding detection from WebCore
 
         * misc/decoder.{h,cpp}: Detect XML-encoding, comments in headers and other merges
-        * khtml_part.cpp: Frames inherits parents encoding as their default
+        * tdehtml_part.cpp: Frames inherits parents encoding as their default
 
 2004-12-08  Allan Sandfeld Jensen <kde@carewolf.com>
 
@@ -1372,7 +1372,7 @@
 
         * css/cssstyleselector.cpp: Uncomment :target handling
         * xml/dom_docimpl.{h,cpp}: Add (set)cssTarget.
-        * khtml_part.cpp: Call setCssTarget on anchors
+        * tdehtml_part.cpp: Call setCssTarget on anchors
 
 2004-12-07  Allan Sandfeld Jensen <kde@carewolf.com>
 
@@ -1393,8 +1393,8 @@
         * rendering/render_list.cpp: New algorithms for hiragana, katakana,
             armenian, georgian and decimal-leading-zero.
             Also fix greek and latin list-styles for larger values.
-        * css/cssvalues.cpp: Parse box, -khtml-diamond, -khtml-arabic-indic,
-            -khtml-persian, -khtml-urdu and -khtml-upper-greek
+        * css/cssvalues.cpp: Parse box, -tdehtml-diamond, -tdehtml-arabic-indic,
+            -tdehtml-persian, -tdehtml-urdu and -tdehtml-upper-greek
         * rendering/render_style.h: Expand list-style enum
 
 2004-11-30  Germain Garand  <germain@ebooksfrance.org>
@@ -1451,10 +1451,10 @@
 
         Implement CSS border on form-widgets
 
-        * css/cssvalues.in: Add -khtml-native
-        * css/cssparser.cpp: Accept -khtml-native as a border-type
+        * css/cssvalues.in: Add -tdehtml-native
+        * css/cssparser.cpp: Accept -tdehtml-native as a border-type
         * css/cssstyleselector.cpp: BNATIVE and not BNONE is now lowest border-style
-        * css/html4.css: Make -khtml-native default border-style for form-widgets
+        * css/html4.css: Make -tdehtml-native default border-style for form-widgets
         * render/render_style.h: Add BNATIVE
         * render/render_object.cpp: Treat BNATIVE like BNONE
         * render/render_replaced.cpp: Remove native, and paint CSS border when allowed
@@ -1463,7 +1463,7 @@
 
         float and flowAroundFloat fixes.
 
-        * css/html4.css: make fieldset -khtml-around-floats (#92979)
+        * css/html4.css: make fieldset -tdehtml-around-floats (#92979)
 
         * rendering/render_block.cpp (layoutBlockChildren): cleanup float/flowAroundFloats
         logic. Merges: add better RTL layouting of fAFs.
@@ -1512,7 +1512,7 @@
 
 2004-11-16  Stephan Kulow  <coolo@kde.org>
 
-        * rendering/break_lines.cpp (khtml): adding patch by Otto Pattara to support
+        * rendering/break_lines.cpp (tdehtml): adding patch by Otto Pattara to support
         libthai for correct line breaks
 
 2004-11-15  Allan Sandfeld Jensen <kde@carewolf.com>
@@ -1555,7 +1555,7 @@
 
 2004-11-05  Germain Garand  <germain@ebooksfrance.org>
 
-        * khtml_part.cpp (closeURL/slotData/restoreState): avoid triggering
+        * tdehtml_part.cpp (closeURL/slotData/restoreState): avoid triggering
         full repaints of the view before the first layout is done.
 
 2004-11-05  Germain Garand  <germain@ebooksfrance.com>
@@ -1571,7 +1571,7 @@
 
 2004-11-03  Germain Garand  <germain@ebooksfrance.com>
 
-        * khtmlview.cpp (slotScrollBarMoved): make sure we are layouted before
+        * tdehtmlview.cpp (slotScrollBarMoved): make sure we are layouted before
         scrolling if we are still loading (#51473)
 
 2004-11-02  Stephan Kulow  <coolo@kde.org>
@@ -1629,12 +1629,12 @@
 
 2004-10-26  David Faure  <faure@kde.org>
 
-        * khtml_part.cpp (urlSelected): Only call recursiveFrameRequest if target is
+        * tdehtml_part.cpp (urlSelected): Only call recursiveFrameRequest if target is
         different from _self, _top, _blank and _parent. See tests/frames/target/*.
 
 2004-10-25  David Faure  <faure@kde.org>
 
-        * khtml_part.cpp (processObjectRequest): connect to completed(bool) for <embed>
+        * tdehtml_part.cpp (processObjectRequest): connect to completed(bool) for <embed>
         too, to avoid a never-ending-spinning-wheel on the following testcase
         <META HTTP-EQUIV="Refresh" content="10;URL=www.kde.org"><EMBED>
 
@@ -1648,7 +1648,7 @@
         * rendering/render_image.cpp: Pass through the CachedObject so we can
         use the suggested filename possibly provided by the HTTP headers.
 
-	* khtml_ext.cpp: Make use of the suggested filename for images.
+	* tdehtml_ext.cpp: Make use of the suggested filename for images.
 
 2004-10-24  David Faure  <faure@kde.org>
 
@@ -1731,7 +1731,7 @@
         * html/html_formimpl.cpp (defaultEventHandler): propagate events to
         QScrollView
 
-        * khtmlview.{cpp,h}: QScrollview needs fast repaints. Fix
+        * tdehtmlview.{cpp,h}: QScrollview needs fast repaints. Fix
         background color of QFrames.
 
         * rendering/render_form.cpp (createListBox/TextAreaWidget):
@@ -1806,7 +1806,7 @@
         Break on page-break-before and -after.
         * rendering/render_canvas.{h,cpp}:
         Merge bestTruncatedAt from WebCore.
-        * khtmlview.cpp (print):
+        * tdehtmlview.cpp (print):
         Use bestTruncatedAt for detect truncated pages.
 
 2004-10-07  David Faure  <faure@kde.org>
@@ -1831,7 +1831,7 @@
 
 2004-10-04  David Faure  <faure@kde.org>
 
-        * khtml_part.cpp (processObjectRequest):
+        * tdehtml_part.cpp (processObjectRequest):
         Fixed showing of iframe hidden with display=none (#84332).
 
 2004-09-16  Leo Savernik  <l.savernik@aon.at>
@@ -1855,7 +1855,7 @@
 
 2004-09-11  David Faure  <faure@kde.org>
 
-        * khtml_part.cpp (defaultEncoding, encoding, createDecoder):
+        * tdehtml_part.cpp (defaultEncoding, encoding, createDecoder):
         Make default charset latin1 over HTTP, keep default to locale on other protocols.
 
 2004-09-02  Leo Savernik  <l.savernik@aon.at>
@@ -1875,7 +1875,7 @@
         scope: - more accurate completed() signal.
                - anchor jumps (#57360)
 
-        * khtml_part.cpp (openURL): when restoring a previous scroll
+        * tdehtml_part.cpp (openURL): when restoring a previous scroll
         position on reload, avoid jumping to anchors.
         (gotoAnchor): keep jumping at least while we are parsing.
         (gotoAnchor): "top" and "" anchors mean top of document.
@@ -1883,7 +1883,7 @@
         (checkCompleted): entrust the view to emit completed on our behalf
         after any pending layout/repaint is done.
 
-        * khtmlview.{cpp,h}: ditto
+        * tdehtmlview.{cpp,h}: ditto
 
         * xml/dom_nodeimpl.cpp (getUpperLeftCorner/getLowerRightCorner):
         use inlineYPos for text objects (#57360 c.#17).
@@ -1951,7 +1951,7 @@
 
 2004-08-04  Germain Garand <germain@ebooksfrance.org>
 
-	* khtmlview.cpp (resizeEvent): take care, in case we are shrinking,
+	* tdehtmlview.cpp (resizeEvent): take care, in case we are shrinking,
         not to pass past the content limits yet. Next layout will calculate
         if we positively need scrollbars or not (#84798).
 
@@ -1959,7 +1959,7 @@
         instead, account for a scrollbar hysteresis level when sizing the content (#61730).
 
 2004-07-30  Jean-Baptiste Mardelle <bj@altern.org>
-	* khtmlview.{cpp,h} (displayAccessKeys): When accesskeys are activated,
+	* tdehtmlview.{cpp,h} (displayAccessKeys): When accesskeys are activated,
 	small tooltips appear showing existing accesskeys on the page.
 
 2004-07-28  Stephan Kulow  <coolo@kde.org>
@@ -1969,10 +1969,10 @@
 
 2004-07-28  Leo Savernik  <l.savernik@aon.at>
 
-	* khtmlview.{cpp,h} (KHTMLToolTip::maybeTip): Query <area> elements
+	* tdehtmlview.{cpp,h} (KHTMLToolTip::maybeTip): Query <area> elements
 	of image maps.
 	(dispatchMouseEvent): Added parameter innerNonSharedNode.
-	* khtml_part.{cpp,h}: Added method nonSharedNodeUnderMouse.
+	* tdehtml_part.{cpp,h}: Added method nonSharedNodeUnderMouse.
 	* xml/dom_docimpl.cpp (prepareMouseEvent): Initialize
 	innerNonSharedNode in DOM mouse event.
 	* xml/dom_nodeimpl.h: Added innerNonSharedNode to
@@ -1986,12 +1986,12 @@
         They have to be ignored (css1/test11.htm)
 
 2004-07-14 Jean-Baptiste Mardelle <bj@altern.org>
-	* khtmlview.{cpp,h}: Accesskeys now activated when pressing & releasing
+	* tdehtmlview.{cpp,h}: Accesskeys now activated when pressing & releasing
 	the crtl key (#83053).
 
 2004-07-12 Jean-Baptiste Mardelle <bj@altern.org>
 	* html/html_formimpl.{h,cpp}: Make form labels clickable (#59489)
-	* khtmlview.cpp (focusNodeWithAccessKey): Make accesskeys work for labels
+	* tdehtmlview.cpp (focusNodeWithAccessKey): Make accesskeys work for labels
 
 2004-07-12 Germain Garand <germain@ebooksfrance.org>
 
@@ -2007,7 +2007,7 @@
         posClipRect in effect (#67665/#72994).
 
 2004-06-30  Tobias Anton  <anton@stud.fbi.fh-darmstadt.de>
-	* khtmlview.{cpp,h}:
+	* tdehtmlview.{cpp,h}:
 	integrated keyboard tabbing with mouse scrolling.
 	Hitting tab skips at most one page, but respects
 	the tabindex ordering of the document.
@@ -2092,17 +2092,17 @@
 
 2004-06-13  Leo Savernik  <l.savernik@aon.at>
 
-	* khtml_part.cpp: (clear) Stopping marquees.
+	* tdehtml_part.cpp: (clear) Stopping marquees.
 	* css/cssparser.cpp: (parserValue) Parse overflow: marquee.
 	Inserted CSS3 Properties section.
-	Moved -khtml-user-input to CSS3 Properties.
-	Added parsing of -khtml-marquee{,-direction,-increment,-style,-repetition,
+	Moved -tdehtml-user-input to CSS3 Properties.
+	Added parsing of -tdehtml-marquee{,-direction,-increment,-style,-repetition,
 	-speed}.
 	* css/cssproperties.{c,h}: Regenerated.
-	* css/cssproperties.in: Added -khtml-marquee{,-direction,-increment,
+	* css/cssproperties.in: Added -tdehtml-marquee{,-direction,-increment,
 	-style,-repetition,	-speed} keywords.
 	* css/cssstyleselector: (applyRule) Handle overflow: marquee.
-	Handle applying of -khtml-marquee{,-direction,-increment,-style,-repetition,
+	Handle applying of -tdehtml-marquee{,-direction,-increment,-style,-repetition,
 	-speed}.
 	* css/cssvalues.{c,h}: Regenerated.
 	* css/cssvalues.in: Added marquee, forwards, backwards, ahead, reverse,
@@ -2197,7 +2197,7 @@
 2004-06-08  Zack Rusin  <zack@kde.org>
 
         * html/htmltokenizer.cpp (parseEntity): Fix to make 8-character
-        hexadecimal entities work in khtml from Darin Adler. Testcase at
+        hexadecimal entities work in tdehtml from Darin Adler. Testcase at
         http://www.alanwood.net/unicode/deseret.html
 
 2004-06-06  Zack Rusin  <zack@kde.org>
@@ -2341,24 +2341,24 @@
 
 2004-04-18  Leo Savernik  <l.savernik@aon.at>
 
-	* khtml_part.cpp: (extendSelectionTo): Fixed deselection of whole
+	* tdehtml_part.cpp: (extendSelectionTo): Fixed deselection of whole
 	word/line at line boundaries in ExtendByWord/ExtendByLine mode.
 
 2004-04-18  Leo Savernik  <l.savernik@aon.at>
 
-	* khtml_part.cpp: Merged firstRunAt, lastRunAt from WebCore.
-	(khtmlMouse{Press,DoubleClick,Move,Release}Event): Support extending selection
+	* tdehtml_part.cpp: Merged firstRunAt, lastRunAt from WebCore.
+	(tdehtmlMouse{Press,DoubleClick,Move,Release}Event): Support extending selection
 	by word and by line as mandated by the KDE style guide.
-	(khtmlMousePressDoubleClickEvent): Fixed automatic scrolling when mouse
+	(tdehtmlMousePressDoubleClickEvent): Fixed automatic scrolling when mouse
 	moves off the view while selecting.
 	(extendSelection): Make it support extending by line by merging
 	WebCore's startAndEndLineNodesIncludingNode into it.
 	Fixed issue with double word selection when between two words.
 
-	* khtmlpart_p.h: added m_initialNode, m_initialOffset and
+	* tdehtmlpart_p.h: added m_initialNode, m_initialOffset and
 	m_extendMode.
 
-	* khtmlview.cpp (extendSelection): Initialize all relevant fields for selection.
+	* tdehtmlview.cpp (extendSelection): Initialize all relevant fields for selection.
 
 	* rendering/render_text.h: Merged inlineTextBoxes function, needed by
 	firstRunAt, lastRunAt.
@@ -2366,11 +2366,11 @@
 
 2004-04-15  Leo Savernik  <l.savernik@aon.at>
 
-	* khtml_caret{.cpp,_p.h}: Vast changes.
+	* tdehtml_caret{.cpp,_p.h}: Vast changes.
 	Added classes CaretBox, CaretBoxLine, CaretBoxIterator,
 	EditableCaretBoxIterator. Changed every other class.
 
-	* khtmlview.[cpp,h}: (class KHTMLView) Adapt to khtml_caret* changes.
+	* tdehtmlview.[cpp,h}: (class KHTMLView) Adapt to tdehtml_caret* changes.
 	(KHTMLToolTip::maybeTip) Save tooltip position instead of recalculating it.
 
 	* rendering/render_{inline,box}.{cpp,h}: (Render{Box,Inline}::caretPos)
@@ -2408,22 +2408,22 @@
 
 2004-03-23  Dirk Mueller  <mueller@kde.org>
 
-	* khtml_part.cpp (checkLinkSecurity): Be stricter.
+	* tdehtml_part.cpp (checkLinkSecurity): Be stricter.
 
 	* rendering/render_frames.cpp (updateWidget): readd the recursion protection.
 
 2004-03-21  Arend van Beelen jr. <arend@auton.nl>
-	* khtml_part.cpp/.h: if text in a link is highlighted, the link now receives
+	* tdehtml_part.cpp/.h: if text in a link is highlighted, the link now receives
 	focus.
 
-	* khtmlview.cpp: made type-ahead find more aggressive by grabbing the keyboard
+	* tdehtmlview.cpp: made type-ahead find more aggressive by grabbing the keyboard
 	when active, this way it temporarily overrules single-letter shortcuts as seen
 	in KMail. Note it immediately releases the keyboard when it looses focus.
 
 2004-03-20  Arend van Beelen jr. <arend@auton.nl>
-	* khtml_part.cpp/.h: finished new searching API.
+	* tdehtml_part.cpp/.h: finished new searching API.
 
-	* khtmlview.cpp/.h: implemented type-ahead find (#51259).
+	* tdehtmlview.cpp/.h: implemented type-ahead find (#51259).
 
 2004-03-21  Dirk Mueller  <mueller@kde.org>
 
@@ -2439,7 +2439,7 @@
 
 2004-03-18  Lubos Lunak <l.lunak@kde.org>
 
-        * khtmlview.cpp, xml/dom_docimpl.cpp: accesskey attribute support
+        * tdehtmlview.cpp, xml/dom_docimpl.cpp: accesskey attribute support
 
 2004-03-03  Dirk Mueller  <mueller@kde.org>
 
@@ -2500,7 +2500,7 @@
 	repaint handling over here, since TableSections don't inherit RenderBox,
 	but still have a background.
 
-	* khtml_settings.cc (init)/html4.css: MediumFontSize up to 12. Form elements
+	* tdehtml_settings.cc (init)/html4.css: MediumFontSize up to 12. Form elements
 	get font-size: small instead.
 
 2004-02-24  Dirk Mueller  <mueller@kde.org>
@@ -2523,10 +2523,10 @@
 
 2004-02-22  Frerich Raabe  <raabe@kde.org>
 
-	* khtml_part.cpp/.h (openURL): In case the call is a reload, do a stat
+	* tdehtml_part.cpp/.h (openURL): In case the call is a reload, do a stat
 	on the user-defined stylesheet and reload it in case it changed in
 	the meanwhile (#39962).
-	* khtmlpart_p.h (class KHTMLPartPrivate): Added
+	* tdehtmlpart_p.h (class KHTMLPartPrivate): Added
 	m_userStyleSheetLastModified variable which keeps track of the
 	mtime of the user-defined sheet.
 
@@ -2550,7 +2550,7 @@
 	whether the given URL references the user-defined stylesheet. If so,
 	use DOCLOADER_SECCHECK(false) to disable the check for invalid
 	redirections (it's not useful for the user-defined URL).
-	* khtml_part.cpp (PartStyleSheetLoader ctor): pass true to
+	* tdehtml_part.cpp (PartStyleSheetLoader ctor): pass true to
 	DocLoader::requestStyleSheet to indicate that the user-stylesheet is
 	loaded. Fixes seemingly ignored user-defined stylesheet. (#69697)
 
@@ -2721,7 +2721,7 @@
 	image are fully loaded. do a repaint when the new image finished loading, so
 	that it actually updates. avoid reloading images on news.google.com on hover.
 
-	* khtmlview.cpp (scheduleRepaint): make scheduling not starvating repaints.
+	* tdehtmlview.cpp (scheduleRepaint): make scheduling not starvating repaints.
 	Fix repainting logic to optimize for reduced X server load and minimum CPU
 	usage in traversing the render tree (#72575).
 
@@ -2769,7 +2769,7 @@
 
 2004-01-22  Lubos Lunak <l.lunak@kde.org>
 
-        * khtmlview.cpp: make Ctrl only temporary suspend Shift+Down scrolling
+        * tdehtmlview.cpp: make Ctrl only temporary suspend Shift+Down scrolling
 
 2004-01-22  David Faure  <faure@kde.org>
 
@@ -2787,7 +2787,7 @@
 
 2004-01-21  Leo Savernik <l.savernik@aon.at>
 
-	* khtml_part.cpp (checkCompleted): do not explicitly set focus to
+	* tdehtml_part.cpp (checkCompleted): do not explicitly set focus to
 	the document if m_focusNodeNumber is not set (fixes dict.leo.org)
 
 2004-01-21  Stephan Kulow  <coolo@kde.org>
@@ -2825,7 +2825,7 @@
 
 2004-01-18  Dirk Mueller  <mueller@kde.org>
 
-	* khtmlpart_p.h (class KHTMLPartPrivate): experimental:
+	* tdehtmlpart_p.h (class KHTMLPartPrivate): experimental:
 	copy encoding information from parent frame. helps on
 	http://www.pfl.ru/ when manually setting the correct encoding.
 
@@ -2954,12 +2954,12 @@
 
 	* css/cssstyleselector.cpp (reparseConfiguration): implement.
 
-	* khtml_part.cpp (reparseConfiguration): call CSSStyleSelector::reparseConfiguration
+	* tdehtml_part.cpp (reparseConfiguration): call CSSStyleSelector::reparseConfiguration
 	instead of ::clear(). much less crashy. (#68141)
 
 2003-12-27  Simon Perreault  <nomis80@nomis80.org>
 
-	* khtml_part.cpp: Remove unused zoom actions. Assign CTRL + Key_Plus to
+	* tdehtml_part.cpp: Remove unused zoom actions. Assign CTRL + Key_Plus to
 	zooming in and CTRL + Key_Minus to zooming out.
 
 2003-12-27  Luis Pedro Coelho <luis@luispedro.org>
@@ -2979,7 +2979,7 @@
 
 2003-12-10  Germain Garand  <germain@ebooksfrance.org>
 
-        * rendering/render_replaced.cpp (updateFromElement): don't use setEraseColor for __khtml
+        * rendering/render_replaced.cpp (updateFromElement): don't use setEraseColor for __tdehtml
         widgets as it changes the background mode and induces flicker (#69130)
         (copyWidget): retrieve background color from the widget's palette.
 
@@ -2993,7 +2993,7 @@
 
 2003-12-08  Zack Rusin  <zack@kde.org>
 
-	* khtmlview.*, html/html_formimpl.cpp (submit):  Fixing 67179 -
+	* tdehtmlview.*, html/html_formimpl.cpp (submit):  Fixing 67179 -
 	Possibility to avoid saving form data for certain sites.
 
 2003-12-05  David Faure  <faure@kde.org>
@@ -3006,7 +3006,7 @@
 	* dom/dom_node.cpp (dispatchEvent): Return !defaultPrevented as mandated by
 	the DOM, now that NodeImpl doesn't do it anymore.
 	* rendering/render_replaced.cpp (eventFilter): Adapted to new logic
-	* khtmlview.cpp (dispatchKeyEventHelper): Adapted to new logic
+	* tdehtmlview.cpp (dispatchKeyEventHelper): Adapted to new logic
 
 2003-12-05  Stephan Kulow  <coolo@kde.org>
 
@@ -3014,7 +3014,7 @@
 
 2003-12-05  Lubos Lunak  <l.lunak@kde.org>
 
-	* khtmlview.cpp, xml/dom2_eventsimpl.*, xml/dom_nodeimpl.*, rendering/render_replaced.cpp :
+	* tdehtmlview.cpp, xml/dom2_eventsimpl.*, xml/dom_nodeimpl.*, rendering/render_replaced.cpp :
             fix mapping between Qt and DOM key events
 
 2003-12-05  Germain Garand  <germain@ebooksfrance.org>
@@ -3077,7 +3077,7 @@
 
 2003-11-26  Lubos Lunak  <l.lunak@kde.org>
 
-	* khtmlview.cpp, xml/dom2_eventsimpl.cpp : generate correctly keydown,keypress and keyup events
+	* tdehtmlview.cpp, xml/dom2_eventsimpl.cpp : generate correctly keydown,keypress and keyup events
 
 2003-11-26  Dirk Mueller  <mueller@kde.org>
 
@@ -3108,7 +3108,7 @@
 
 2003-11-25  Germain Garand  <germain@ebooksfrance.org>
 
-        * khtml_part.cpp (checkCompleted): prepend "Automatic Detection" entry to
+        * tdehtml_part.cpp (checkCompleted): prepend "Automatic Detection" entry to
         "Use Stylesheet" menu.
         (slotUseStylesheet): set m_sheetUsed to null string if autodetect is on.
         Fixes #54335.
@@ -3142,7 +3142,7 @@
 
 	* html/htmlparser.cpp (getElement, processCloseTag): Allow only one
 	non-empty <title> tag, discard any following <title> tag. This matches
-	both IE and Mozilla. Testcases khtmltests/regression/tests/ecma/title*
+	both IE and Mozilla. Testcases tdehtmltests/regression/tests/ecma/title*
 
 	* html/html_headimpl.cpp (childrenChanged): Set title immediately, like
 	other browsers do.
@@ -3201,7 +3201,7 @@
 
 2003-11-17  David Faure  <faure@kde.org>
 
-	* khtml_part.cpp (processObjectRequest):
+	* tdehtml_part.cpp (processObjectRequest):
 	Stop the spinning wheel on <frame src="">.
 	Testcase: webcore's fast/frames/empty-frame-src.html
 
@@ -3249,7 +3249,7 @@
 
 2003-11-10  David Faure  <faure@kde.org>
 
-	* khtml_part.cpp: Ask the user "open or save?" before embedding a
+	* tdehtml_part.cpp: Ask the user "open or save?" before embedding a
 	non-usual mimetype into a frame (e.g. ZIP files or PS files).
 	(html and images are the 'usual' exceptions)
 	Includes a dontshowagain checkbox, so this shouldn't be too annoying.
@@ -3287,7 +3287,7 @@
 
 2003-11-04  Leo Savernik <l.savernik@aon.at>
 
-	* khtml_part.{cpp,h} (selection): Added new overloaded function to
+	* tdehtml_part.{cpp,h} (selection): Added new overloaded function to
 	return selection boundaries.
 
 2003-11-04  Dirk Mueller  <mueller@kde.org>
@@ -3332,7 +3332,7 @@
 	* rendering/render_form.cpp (setStyle): check for direction (#57626)
 	on RenderLineEdit and RenderTextArea.
 
-	* khtmlview.cpp (viewportWheelEvent): toggle Font zooming orientation (#61862).
+	* tdehtmlview.cpp (viewportWheelEvent): toggle Font zooming orientation (#61862).
 
 	* rendering/render_box.cpp (paintBackgroundExtended): implement. needed
 	for inline elements background drawing somewhen.
@@ -3382,7 +3382,7 @@
 
 2003-10-29  Leo Savernik <l.savernik@aon.at>
 
-	* khtml_part.cpp (khtmlMousePressEvent): Fixed occasional selection
+	* tdehtml_part.cpp (tdehtmlMousePressEvent): Fixed occasional selection
 	of image on which a drag had been initiated.
 
 2003-10-29  David Faure  <faure@kde.org>
@@ -3392,7 +3392,7 @@
 
 2003-10-28  David Faure  <faure@kde.org>
 
-	* khtmlview.cpp (viewportMouseDoubleClickEvent): Set bool in MouseEventImpl
+	* tdehtmlview.cpp (viewportMouseDoubleClickEvent): Set bool in MouseEventImpl
 	when handling a double click. The DOM API only has "number of clicks at the
 	same place" notion, but not whether they happened quick or over a long time.
 	Added support for small mouse movement when double-clicking, like in mousePressEvent.
@@ -3406,7 +3406,7 @@
 
 2003-10-28  Stephan Kulow  <coolo@kde.org>
 
-       * khtml_part.cpp (reparseConfiguration): clear the style selector
+       * tdehtml_part.cpp (reparseConfiguration): clear the style selector
 
 2003-10-28  Leo Savernik  <l.savernik@aon.at>
 
@@ -3428,7 +3428,7 @@
 
 2003-10-27  David Faure  <faure@kde.org>
 
-	* khtmlview.cpp (dispatchKeyEvent): Generate keypress, keydown and keyup
+	* tdehtmlview.cpp (dispatchKeyEvent): Generate keypress, keydown and keyup
 	events for the document if no node has the focus. Factorized code in
 	a new method, dispatchKeyEvent. Cleaned up old unused variables d->lastKeyNode
 	and d->lastKeyPress. #42918 and #43072, google keys.
@@ -3733,7 +3733,7 @@
 2003-10-19  Dirk Mueller  <mueller@kde.org>
 
 	* html/htmltokenizer.cpp (parseEntity): when entity is terminated and result
-	is not-ascii, require ending ';'. khtmltests/html/parser/obscure_entity_tokenizing.html
+	is not-ascii, require ending ';'. tdehtmltests/html/parser/obscure_entity_tokenizing.html
 
 2003-10-18  Dirk Mueller  <mueller@kde.org>
 
@@ -3804,7 +3804,7 @@
 
 2003-10-07 Germain Garand <germain@ebooksfrance.org>
 
-	* khtmlview.cpp (viewportMouseReleaseEvent/viewportMouseMoveEvent): forward
+	* tdehtmlview.cpp (viewportMouseReleaseEvent/viewportMouseMoveEvent): forward
 	meaningful peripheral mouse events to focused widget to restore correct
 	mouse handling in proxied widgets. #65216 (selection part)
 
@@ -3826,16 +3826,16 @@
 
 2003-10-06  Dirk Mueller  <mueller@kde.org>
 
-	* khtml_part.cpp (jScript): remove broken #ifdef'ery.
+	* tdehtml_part.cpp (jScript): remove broken #ifdef'ery.
 	(popupMenu): add a QGuardedPtr to detect the case when we're destructed
 	before the popup menu is closed. avoid accessing any "this" then.
 	#43389
 
-	* khtmlview.cpp (viewportMousePressEvent): reorder afaik unrelated code
+	* tdehtmlview.cpp (viewportMousePressEvent): reorder afaik unrelated code
 	to make the one call entering a local event loop the last, so that we can
 	cleanly exit when it the view is already deleted.
 
-	* khtml_ext.cpp (KHTMLPopupGUIClient): pass QObject parent
+	* tdehtml_ext.cpp (KHTMLPopupGUIClient): pass QObject parent
 
 2003-10-05  Dirk Mueller  <mueller@kde.org>
 
@@ -3859,7 +3859,7 @@
 
 2003-10-04  Dirk Mueller  <mueller@kde.org>
 
-	* khtml_settings.cc (init): change default for JS debugger to off.
+	* tdehtml_settings.cc (init): change default for JS debugger to off.
 
 	* html/html_elementimpl.cpp (createContextualFragment): Fix memory
 	leaks. Adjust code style. Adjust return to avoid dangling return leaks.
diff --git a/khtml/DESIGN.html b/tdehtml/DESIGN.html
index 16484d4f1..861825141 100644
--- a/khtml/DESIGN.html
+++ b/tdehtml/DESIGN.html
@@ -1,23 +1,23 @@
 <html>
 <head>
-<title>Internal design of khtml</title>
+<title>Internal design of tdehtml</title>
 <style>
 dt { font-weight: bold; }
 </style>
 <body bgcolor=white>
-<h1>Internal design of khtml</h1>
+<h1>Internal design of tdehtml</h1>
 
 <p>
-This document tries to give a short overview about the internal design of the khtml
+This document tries to give a short overview about the internal design of the tdehtml
 library. I've written this, because the lib has gotten quite big, and it is hard at first to find your
-way in the source code. This doesn't mean that you'll understand khtml after reading this
+way in the source code. This doesn't mean that you'll understand tdehtml after reading this
 document, but it'll hopefully make it easier for you to read the source code.
 </p>
 <p>
 The library is build up out of several different parts. Basically, when you use the lib, you
 create an instance of a KHTMLPart, and feed data to it. That's more or less all you need to 
-know if you want to use khtml for another application. If you want to start hacking khtml,
-here's a sketch of the objects that will get constructed, when eg. running testkhtml with
+know if you want to use tdehtml for another application. If you want to start hacking tdehtml,
+here's a sketch of the objects that will get constructed, when eg. running testtdehtml with
 a url argument.
 </p>
 <p>
@@ -52,14 +52,14 @@ compatible to IE.
 </blockquote>
 
 <p>
-<a href="khtml_part.h">KHTMLPart</a> creates one instance of a
-<a href="khtmlview.h">KHTMLView</a> (derived from TQScrollView),
+<a href="tdehtml_part.h">KHTMLPart</a> creates one instance of a
+<a href="tdehtmlview.h">KHTMLView</a> (derived from TQScrollView),
 the widget showing the whole thing.  At the same time a DOM tree
 is built up from the HTML or XML found in the specified file.
 <p>
 Let me describe this with an example.
 <p>
-khtml makes use of the document object model (DOM) for storing the document
+tdehtml makes use of the document object model (DOM) for storing the document
 in a tree like structure. Imagine some html like
 <pre>
 &lt;html&gt;
@@ -91,14 +91,14 @@ more or less in parallel.
 <p>
 The first thing that happens when you start parsing a new document is that a
 DocumentImpl* (for XML documents) or an HTMLDocumentImpl* object will get
-created by the Part (in khtml_part.cpp::begin()). A Tokenizer*
+created by the Part (in tdehtml_part.cpp::begin()). A Tokenizer*
 object is created as soon as DocumentImpl::open() is called by the part, also
 in begin() (can be either an XMLTokenizer or an HTMLTokenizer).
 <p>
 The XMLTokenizer uses the QXML classes in Qt to parse the document, and it's SAX interface 
-to parse the stuff into khtmls DOM.
+to parse the stuff into tdehtmls DOM.
 <p>
-For HTML, the tokenizer is located in khtmltokenizer.cpp. The tokenizer uses the contents
+For HTML, the tokenizer is located in tdehtmltokenizer.cpp. The tokenizer uses the contents
 of a HTML-file as input and breaks this contents up in a linked list of
 tokens. The tokenizer recognizes HTML-entities and HTML-tags. Text between
 begin- and end-tags is handled distinctly for several tags. The distinctions
@@ -116,7 +116,7 @@ and constructs the tree of Nodes representing the document according
 to the Document Object Model.
 <p>
 
-<h2>The DOM in khtml</h2>
+<h2>The DOM in tdehtml</h2>
 <p>
 Parsing the document given above gives the following DOM tree:
 
@@ -159,7 +159,7 @@ case the root element gets deleted (as long as there's no interface class
 holding a pointer to the Implementation).
 <p>
 The interface classes (the ones without the Impl) are defined in the <code>dom/</code>
-subdirectory, and are not used by khtml itself at all. The only place they are used are in the
+subdirectory, and are not used by tdehtml itself at all. The only place they are used are in the
 javascript bindings, which uses them to access the DOM tree. The big advantage of having this 
 separation between interface classes and imlementation classes, is that we can have several 
 interface objects pointing to the same implementation. This implements the requirement of
@@ -174,7 +174,7 @@ not be seen from the outside for various reasons (make implementation of shared
 or to reduce memory consumption).
 <p>
 In C++, you can access the whole DOM tree from outside KHTML by using the interface classes. 
-For a description see the <a href="http://developer.kde.org/documentation/library/kdeqt/trinityarch/khtml/index.html">introduction to khtml</a> on <a href="http://developer.kde.org/">developer.kde.org</a>.
+For a description see the <a href="http://developer.kde.org/documentation/library/kdeqt/trinityarch/tdehtml/index.html">introduction to tdehtml</a> on <a href="http://developer.kde.org/">developer.kde.org</a>.
 
 One thing that has been omitted in the discussion above is the style sheet defined inside the 
 <code>&lt;style&gt;</code> element (as an example of a style sheet) and the image element 
@@ -274,7 +274,7 @@ text". For an explanation why this is done, see the CSS specs.
 
 <h2>Directory structure</h2>
 
-A short explanation of the subdirectories in khtml.
+A short explanation of the subdirectories in tdehtml.
 <dl>
 <dt><a href="css/">css:</a>
 <dd>Contains all the stuff relevant to the CSS part of DOM Level2 (implementation classes only), 
@@ -283,14 +283,14 @@ RenderStyle object out of Nodes and the CSS style sheets.
 <dt><a href="dom/">dom: </a>
 <dd>Contains the external DOM API (the DOM interface classes) for all of the DOM
 <dt><a href="ecma/">ecma:</a>
-<dd>The javascript bindings to the DOM and khtml.
+<dd>The javascript bindings to the DOM and tdehtml.
 <dt><a href="html/">html:</a>
 <dd>The html subpart of the DOM (implementation only), the HTML tokenizer and parser and a class
 that defines the DTD to use for HTML (used mainly in the parser).
 <dt><a href="java/">java:</a>
 <dd>Java related stuff.
 <dt><a href="misc/">misc:</a>
-<dd>Some misc stuff needed in khtml. Contains the image loader, some misc definitions and the
+<dd>Some misc stuff needed in tdehtml. Contains the image loader, some misc definitions and the
 decoder class that converts the incoming stream to unicode.
 <dt><a href="rendering">rendering:</a>
 <dd>Everything thats related to bringing a DOM tree with CSS declarations to the screen. Contains
@@ -307,39 +307,39 @@ is part of dom/* checks for this flag and throws the exception.
   
 <h2>Final words...</h2>
 <p>
-All the above is to give you a quick introduction into the way khtml brings an HTML/XML file to the screen.
+All the above is to give you a quick introduction into the way tdehtml brings an HTML/XML file to the screen.
 It is by no way complete or even 100% correct. I left out many problems, I will perhaps add either on request
 or when I find some time to do so. Let me name some of the missing things:
 <ul>
 <li>The decoder to convert the incoming stream to Unicode
 <li>interaction with konqueror/applications
 <li>javascript
-<li>dynamic reflow and how to use the DOM to manipulate khtmls visual output
+<li>dynamic reflow and how to use the DOM to manipulate tdehtmls visual output
 <li>mouse/event handling
 <li>real interactions when parsing incrementally
 <li>java
 </ul>
 
-Still I hope that this short introduction will make it easier for you to get a first hold of khtml and the way it works.
+Still I hope that this short introduction will make it easier for you to get a first hold of tdehtml and the way it works.
 <p>
-Now before I finish let me add a small <b>warning</b> and <b>advice</b> to all of you who plan hacking khtml themselves:
+Now before I finish let me add a small <b>warning</b> and <b>advice</b> to all of you who plan hacking tdehtml themselves:
 <p>
-khtml is by now a quite big library and it takes some time to understand how it works. Don't let yourself get frustrated
+tdehtml is by now a quite big library and it takes some time to understand how it works. Don't let yourself get frustrated
 if you don't immediately understand how it works. On the other hand, it is by now one of the libraries that
 get used a lot, that probably has the biggest number of remaining bugs (even though it's sometimes hard to
 know if some behavior is really a bug).
 <blockquote>
 Some parts of it's code are however <b>extremely touchy</b> (especially the layouting algorithms), 
 and making changes there (that might fix a bug on one web page) might introduce severe bugs.
-All the people developing khtml have already spend huge amounts of time searching for such bugs,
+All the people developing tdehtml have already spend huge amounts of time searching for such bugs,
 that only showed up on some web pages, and thus were found only a week after the change that
 introduced the bug was made. This can be very frustrating for us, and we'd appreciate if people
-that are not completely familiar with khtml post changes touching these critical regions to kfm-devel
+that are not completely familiar with tdehtml post changes touching these critical regions to kfm-devel
 for review before applying them.
 </blockquote>
 
 <div style="margin-top: 2em; font-size: large;">
-And now have fun hacking khtml.
+And now have fun hacking tdehtml.
 <div style="margin-left: 10em; margin-bottom: 1em;">Lars</div>
 </div>
 </body>
diff --git a/khtml/Mainpage.dox b/tdehtml/Mainpage.dox
index 02ac5c5dd..84ebfedb1 100644
--- a/khtml/Mainpage.dox
+++ b/tdehtml/Mainpage.dox
@@ -40,7 +40,7 @@ Maksim Orlovich
 @lgpl
 
 */
-// DOXYGEN_REFERENCES = tdecore tdeui kio kparts kjs
+// DOXYGEN_REFERENCES = tdecore tdeui kio tdeparts kjs
 // DOXYGEN_EXCLUDE =  test*.* html rendering xml misc ecma css imload pics test 
 // DOXYGEN_SET_PROJECT_NAME = KHTML
 // vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/tdehtml/Makefile.am b/tdehtml/Makefile.am
new file mode 100644
index 000000000..3c9cb05c5
--- /dev/null
+++ b/tdehtml/Makefile.am
@@ -0,0 +1,133 @@
+#    This file is part of the KDE libraries
+#    Copyright (C) 1997 Martin Jones (mjones@kde.org)
+#              (C) 1997 Torben Weis (weis@kde.org)
+
+#    This library is free software; you can redistribute it and/or
+#    modify it under the terms of the GNU Library General Public
+#    License as published by the Free Software Foundation; either
+#    version 2 of the License, or (at your option) any later version.
+
+#    This library is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#    Library General Public License for more details.
+
+#    You should have received a copy of the GNU Library General Public License
+#    along with this library; see the file COPYING.LIB.  If not, write to
+#    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#    Boston, MA 02110-1301, USA.
+
+KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
+
+if DOJAVA
+JAVA_SUBDIR=java
+LIBKJAVA=
+endif
+
+SUBDIRS = misc dom css xml html rendering pics $(JAVA_SUBDIR) ecma . tdemultipart
+
+CLEANFILES = dummy.cpp
+
+lib_LTLIBRARIES = libtdehtml.la
+kde_module_LTLIBRARIES = libtdehtmlpart.la tdehtmlimagepart.la
+
+libtdehtml_la_SOURCES = kjserrordlg.ui tdehtmlview.cpp tdehtml_part.cpp tdehtml_run.cpp\
+			tdehtml_factory.cpp tdehtml_settings.cc tdehtml_events.cpp \
+			tdehtml_ext.cpp tdehtml_pagecache.cpp tdehtml_iface.skel \
+			tdehtml_iface.cc tdehtml_printsettings.cpp htmlpageinfo.ui \
+			tdehtmlimage.cpp
+
+libtdehtml_la_METASOURCES = AUTO
+
+include_HEADERS = tdehtmlview.h tdehtml_part.h tdehtml_events.h tdehtml_settings.h tdehtmldefaults.h
+
+noinst_HEADERS = design.h testtdehtml.h test_regression.h tdehtml_ext.h \
+		 tdehtml_pagecache.h tdehtmlimage.h tdehtmlpart_p.h tdehtml_printsettings.h \
+		kjserrordlg.ui.h
+
+if include_VERSION_SCRIPT
+VSCRIPT = -Wl,--version-script=$(srcdir)/libtdehtml.map
+endif
+
+libtdehtml_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(VSCRIPT) $(all_libraries)
+libtdehtml_la_LIBADD = ./xml/libtdehtmlxml.la ./html/libtdehtmlhtml.la \
+	./rendering/libtdehtmlrender.la ./css/libtdehtmlcss.la \
+	./misc/libtdehtmlmisc.la ecma/libkjs_html.la ./dom/libtdehtmldom.la $(LIBKJAVA) \
+	$(LIB_KPARTS) \
+	$(LIBTHAI) \
+	$(top_builddir)/tdeprint/libtdeprint.la  \
+	$(top_builddir)/tdeutils/libtdeutils.la \
+	$(top_builddir)/tdewallet/client/libtdewalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11)
+
+# init_libtdehtml is in libtdehtml.so; init_libtdehtmlpart needs to be in the part
+dummy.cpp: $(srcdir)/Makefile.am
+	echo '#include <tdelibs_export.h>' > $@
+	echo 'extern "C" KDE_EXPORT void* init_libtdehtml();' >> $@
+	echo 'extern "C" KDE_EXPORT void* init_libtdehtmlpart() { return init_libtdehtml(); } ' >> $@
+
+libtdehtmlpart_la_SOURCES = dummy.cpp
+libtdehtmlpart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+libtdehtmlpart_la_LIBADD = libtdehtml.la $(LIB_QT)
+
+# init_tdehtmlimagefactory is in libtdehtml.so; init_tdehtmlimagepart needs to be in the part
+imgdummy.cpp: $(srcdir)/Makefile.am
+	echo '#include <tdelibs_export.h>' > $@
+	echo 'extern "C"  KDE_EXPORT void* init_tdehtmlimagefactory();' >> $@
+	echo 'extern "C"  KDE_EXPORT void* init_tdehtmlimagepart() { return init_tdehtmlimagefactory(); } ' >> $@
+
+tdehtmlimagepart_la_SOURCES = imgdummy.cpp
+tdehtmlimagepart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+tdehtmlimagepart_la_LIBADD = libtdehtml.la $(LIB_QT)
+
+INCLUDES = -I$(top_srcdir)/kjs -I$(top_builddir)/kjs -I$(top_srcdir)/kimgio \
+	-I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \
+	-I$(srcdir)/dom -I$(srcdir)/xml -I$(srcdir)/html -I$(srcdir)/css \
+	-I$(top_srcdir)/libltdl \
+	-I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl \
+	-I$(top_srcdir)/tdeprint \
+	-I$(top_srcdir)/interfaces \
+	-I$(top_srcdir)/interfaces/kregexpeditor \
+        -I$(top_srcdir)/tdewallet/client \
+	-I$(top_srcdir)/tdeutils \
+	-I$(top_srcdir) $(all_includes)
+
+servicedir = $(kde_servicesdir)
+service_DATA = tdehtml.desktop tdehtmlimage.desktop
+
+rcdir = $(kde_datadir)/tdehtml
+rc_DATA = tdehtml.rc tdehtml_browser.rc tdehtml_popupmenu.rc
+
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
+
+## generate lib documentation
+srcdoc:
+	$(mkinstalldirs) $(SRCDOC_DEST)
+	kdoc -H -d $(SRCDOC_DEST) tdecore \
+	         $(include_HEADERS) -lqt
+
+EXTRA_DIST =  CHANGES DESIGN README.HTMLWidget README.tags 
+
+parser:
+	cd $(srcdir) && \
+	perl scripts/makeattrs && \
+	bash scripts/maketags && \
+	bash scripts/makeprop
+
+## test program
+check_PROGRAMS 	= testtdehtml
+EXTRA_PROGRAMS = testtdehtml_static testregression
+testtdehtml_SOURCES = testtdehtml.cpp domtreeview.cpp
+testtdehtml_LDADD = libtdehtml.la 
+testtdehtml_static_SOURCES = testtdehtml.cpp domtreeview.cpp 
+testtdehtml_static_LDADD = libtdehtml.la
+testtdehtml_static_LDFLAGS = -static
+testregression_SOURCES = test_regression.cpp test_regression_fontoverload.cpp
+testregression_LDADD = libtdehtml.la
+
+DOXYGEN_REFERENCES = tdecore tdeui kio tdefx tdeparts
+DOXYGEN_EXCLUDE =  test*.* css ecma html java tdemultipart misc pics rendering test xml
+
+include ../admin/Doxyfile.am
+
+.PHONY: parser
+
diff --git a/khtml/README.HTMLWidget b/tdehtml/README.HTMLWidget
index 571d4a947..2a8900ee2 100644
--- a/khtml/README.HTMLWidget
+++ b/tdehtml/README.HTMLWidget
@@ -25,11 +25,11 @@ Lars Knoll, Dirk Mueller and Antti Koivisto.
 Revision History
 ----------------
 
-This library is called libkhtml.
-This library used to be called libkhtmlw. With the release of KDE 1.1 a 
-source incompatible version called libkhtml has been created. 
-libkhtmlw will not be maintained any more, all application writers are 
-urgently requested to make use of the new libkhtml library.
+This library is called libtdehtml.
+This library used to be called libtdehtmlw. With the release of KDE 1.1 a 
+source incompatible version called libtdehtml has been created. 
+libtdehtmlw will not be maintained any more, all application writers are 
+urgently requested to make use of the new libtdehtml library.
 
 
 Starting Point
@@ -37,7 +37,7 @@ Starting Point
 
 You can add the widget to your program by doing something like:
 
-#include <khtml.h>
+#include <tdehtml.h>
 
    .
    .
diff --git a/khtml/SAFARI_MERGE b/tdehtml/SAFARI_MERGE
index 7ef67e134..427c3d1c8 100644
--- a/khtml/SAFARI_MERGE
+++ b/tdehtml/SAFARI_MERGE
@@ -1,12 +1,12 @@
 
 This is a short document with the progress of patches in the Safari codebase
-being merged into khtml. 
+being merged into tdehtml. 
 
 its ordered by directory and by files. Add here the parts that cannot be
 immediately merged and need further negotiation. 
 
 Its recommended to add a //FIXME_SAFARI comment to places which need merging
-in the khtml sourcecode. 
+in the tdehtml sourcecode. 
 
 ===========================================================================
 # css
diff --git a/khtml/TODO b/tdehtml/TODO
index 8cf22e9eb..d22e3f83d 100644
--- a/khtml/TODO
+++ b/tdehtml/TODO
@@ -22,7 +22,7 @@ DOM:
 	* Implementation of NamedAttrMapImpl and Attributes in DOMElementImpl
 	  is ugly. MOve aatributes to the elementImpl and make the namedNodeMap
 	  point to an element. Think of creating AttrImpl's directly in
-	  khtmltoken.cpp
+	  tdehtmltoken.cpp
 
 XML:
 	* lots of stuff in the Impl classes
diff --git a/khtml/configure.in.in b/tdehtml/configure.in.in
index b85dd8474..b85dd8474 100644
--- a/khtml/configure.in.in
+++ b/tdehtml/configure.in.in
diff --git a/khtml/css/CMakeLists.txt b/tdehtml/css/CMakeLists.txt
index 50ca11815..4d0b52df1 100644
--- a/khtml/css/CMakeLists.txt
+++ b/tdehtml/css/CMakeLists.txt
@@ -15,25 +15,25 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_SOURCE_DIR}/kio
   ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kwallet/client
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
+  ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
 
 ##### other data ################################
 
-install( FILES html4.css quirks.css DESTINATION ${DATA_INSTALL_DIR}/khtml/css )
+install( FILES html4.css quirks.css DESTINATION ${DATA_INSTALL_DIR}/tdehtml/css )
 
 
-##### khtmlcss (static) #########################
+##### tdehtmlcss (static) #########################
 
-set( target khtmlcss )
+set( target tdehtmlcss )
 
 set( ${target}_SRCS
   css_stylesheetimpl.cpp css_ruleimpl.cpp css_valueimpl.cpp
diff --git a/khtml/css/Makefile.am b/tdehtml/css/Makefile.am
index 47653ca8f..6c43675ed 100644
--- a/khtml/css/Makefile.am
+++ b/tdehtml/css/Makefile.am
@@ -21,14 +21,14 @@ KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
 
 YACC=bison
 
-noinst_LTLIBRARIES = libkhtmlcss.la
-libkhtmlcss_la_SOURCES = \
+noinst_LTLIBRARIES = libtdehtmlcss.la
+libtdehtmlcss_la_SOURCES = \
 	css_stylesheetimpl.cpp css_ruleimpl.cpp css_valueimpl.cpp css_base.cpp \
 	cssparser.cpp cssstyleselector.cpp csshelper.cpp parser.cpp \
 	css_renderstyledeclarationimpl.cpp
 
-#libkhtmlcss_la_LDFLAGS = -no-undefined 
-libkhtmlcss_la_METASOURCES = AUTO
+#libtdehtmlcss_la_LDFLAGS = -no-undefined 
+libtdehtmlcss_la_METASOURCES = AUTO
 
 noinst_HEADERS = \
 	css_extensionsimpl.h  css_stylesheetimpl.h  cssparser.h \
@@ -37,14 +37,14 @@ noinst_HEADERS = \
 	css_renderstyledeclarationimpl.h
 
 INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
- -I$(top_srcdir)/khtml -I$(top_srcdir)/libltdl -I$(top_srcdir) \
- -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils \
+ -I$(top_srcdir)/tdehtml -I$(top_srcdir)/libltdl -I$(top_srcdir) \
+ -I$(top_srcdir)/tdewallet/client -I$(top_srcdir)/tdeutils \
  $(all_includes)
 
-cssdir = $(kde_datadir)/khtml/css
+cssdir = $(kde_datadir)/tdehtml/css
 css_DATA = html4.css quirks.css
 
-SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
 
 EXTRA_DIST = parser.y
 
diff --git a/khtml/css/css_base.cpp b/tdehtml/css/css_base.cpp
index 699ff6554..a4dda95a0 100644
--- a/khtml/css/css_base.cpp
+++ b/tdehtml/css/css_base.cpp
@@ -172,10 +172,10 @@ void CSSSelector::extractPseudoType() const
         value = value.lower();
         switch (value[0]) {
             case '-':
-                if (value == "-khtml-replaced")
+                if (value == "-tdehtml-replaced")
                     _pseudoType = PseudoReplaced;
                 else
-                if (value == "-khtml-marker")
+                if (value == "-tdehtml-marker")
                     _pseudoType = PseudoMarker;
                 element = true;
                 break;
diff --git a/khtml/css/css_base.h b/tdehtml/css/css_base.h
index 9a8774107..d2ab4f63f 100644
--- a/khtml/css/css_base.h
+++ b/tdehtml/css/css_base.h
@@ -191,7 +191,7 @@ namespace DOM {
     };
 
     // a style class which has a parent (almost all have)
-    class StyleBaseImpl : public khtml::TreeShared<StyleBaseImpl>
+    class StyleBaseImpl : public tdehtml::TreeShared<StyleBaseImpl>
     {
     public:
 	StyleBaseImpl()  { m_parent = 0; hasInlinedDecl = false; strictParsing = true; multiLength = false; }
diff --git a/khtml/css/css_extensionsimpl.cpp b/tdehtml/css/css_extensionsimpl.cpp
index e0e17e207..e0e17e207 100644
--- a/khtml/css/css_extensionsimpl.cpp
+++ b/tdehtml/css/css_extensionsimpl.cpp
diff --git a/khtml/css/css_extensionsimpl.h b/tdehtml/css/css_extensionsimpl.h
index dba74e217..dba74e217 100644
--- a/khtml/css/css_extensionsimpl.h
+++ b/tdehtml/css/css_extensionsimpl.h
diff --git a/khtml/css/css_renderstyledeclarationimpl.cpp b/tdehtml/css/css_renderstyledeclarationimpl.cpp
index daf607a9e..95c1c95d9 100644
--- a/khtml/css/css_renderstyledeclarationimpl.cpp
+++ b/tdehtml/css/css_renderstyledeclarationimpl.cpp
@@ -28,7 +28,7 @@
 #include "cssvalues.h"
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 // List of all properties we know how to compute, omitting shorthands.
 static const int computedProperties[] = {
@@ -136,27 +136,27 @@ static CSSValueImpl *valueForLength(const Length &length, int max)
 static CSSValueImpl *valueForBorderStyle(EBorderStyle style)
 {
     switch (style) {
-    case khtml::BNATIVE:
+    case tdehtml::BNATIVE:
         return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_NATIVE);
-    case khtml::BNONE:
+    case tdehtml::BNONE:
         return new CSSPrimitiveValueImpl(CSS_VAL_NONE);
-    case khtml::BHIDDEN:
+    case tdehtml::BHIDDEN:
         return new CSSPrimitiveValueImpl(CSS_VAL_HIDDEN);
-    case khtml::INSET:
+    case tdehtml::INSET:
         return new CSSPrimitiveValueImpl(CSS_VAL_INSET);
-    case khtml::GROOVE:
+    case tdehtml::GROOVE:
         return new CSSPrimitiveValueImpl(CSS_VAL_GROOVE);
-    case khtml::RIDGE:
+    case tdehtml::RIDGE:
          return new CSSPrimitiveValueImpl(CSS_VAL_RIDGE);
-    case khtml::OUTSET:
+    case tdehtml::OUTSET:
         return new CSSPrimitiveValueImpl(CSS_VAL_OUTSET);
-    case khtml::DOTTED:
+    case tdehtml::DOTTED:
         return new CSSPrimitiveValueImpl(CSS_VAL_DOTTED);
-    case khtml::DASHED:
+    case tdehtml::DASHED:
         return new CSSPrimitiveValueImpl(CSS_VAL_DASHED);
-    case khtml::SOLID:
+    case tdehtml::SOLID:
         return new CSSPrimitiveValueImpl(CSS_VAL_SOLID);
-    case khtml::DOUBLE:
+    case tdehtml::DOUBLE:
         return new CSSPrimitiveValueImpl(CSS_VAL_DOUBLE);
     }
     Q_ASSERT( 0 );
@@ -166,101 +166,101 @@ static CSSValueImpl *valueForBorderStyle(EBorderStyle style)
 static CSSValueImpl *valueForTextAlign(ETextAlign align)
 {
     switch (align) {
-    case khtml::TAAUTO:
+    case tdehtml::TAAUTO:
         return new CSSPrimitiveValueImpl(CSS_VAL_AUTO);
-    case khtml::LEFT:
+    case tdehtml::LEFT:
         return new CSSPrimitiveValueImpl(CSS_VAL_LEFT);
-    case khtml::RIGHT:
+    case tdehtml::RIGHT:
         return new CSSPrimitiveValueImpl(CSS_VAL_RIGHT);
-    case khtml::CENTER:
+    case tdehtml::CENTER:
         return new CSSPrimitiveValueImpl(CSS_VAL_CENTER);
-    case khtml::JUSTIFY:
+    case tdehtml::JUSTIFY:
         return new CSSPrimitiveValueImpl(CSS_VAL_JUSTIFY);
-    case khtml::KHTML_LEFT:
+    case tdehtml::KHTML_LEFT:
         return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_LEFT);
-    case khtml::KHTML_RIGHT:
+    case tdehtml::KHTML_RIGHT:
         return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_RIGHT);
-    case khtml::KHTML_CENTER:
+    case tdehtml::KHTML_CENTER:
         return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_CENTER);
     }
     Q_ASSERT( 0 );
     return 0;
 }
 
-DOMString khtml::stringForListStyleType(EListStyleType type)
+DOMString tdehtml::stringForListStyleType(EListStyleType type)
 {
     switch (type) {
-        case khtml::LDISC:
+        case tdehtml::LDISC:
             return "disc";
-        case khtml::LCIRCLE:
+        case tdehtml::LCIRCLE:
             return "circle";
-        case khtml::LSQUARE:
+        case tdehtml::LSQUARE:
             return "square";
-        case khtml::LBOX:
+        case tdehtml::LBOX:
             return "box";
-        case khtml::LDIAMOND:
-            return "-khtml-diamond";
-        case khtml::LDECIMAL:
+        case tdehtml::LDIAMOND:
+            return "-tdehtml-diamond";
+        case tdehtml::LDECIMAL:
             return "decimal";
-        case khtml::DECIMAL_LEADING_ZERO:
+        case tdehtml::DECIMAL_LEADING_ZERO:
             return "decimal-leading-zero";
-        case khtml::ARABIC_INDIC:
-            return "-khtml-arabic-indic";
-        case khtml::LAO:
-            return "-khtml-lao";
-        case khtml::PERSIAN:
-            return "-khtml-persian";
-        case khtml::URDU:
-            return "-khtml-urdu";
-        case khtml::THAI:
-            return "-khtml-thai";
-        case khtml::TIBETAN:
-            return "-khtml-tibetan";
-        case khtml::LOWER_ROMAN:
+        case tdehtml::ARABIC_INDIC:
+            return "-tdehtml-arabic-indic";
+        case tdehtml::LAO:
+            return "-tdehtml-lao";
+        case tdehtml::PERSIAN:
+            return "-tdehtml-persian";
+        case tdehtml::URDU:
+            return "-tdehtml-urdu";
+        case tdehtml::THAI:
+            return "-tdehtml-thai";
+        case tdehtml::TIBETAN:
+            return "-tdehtml-tibetan";
+        case tdehtml::LOWER_ROMAN:
             return "lower-roman";
-        case khtml::UPPER_ROMAN:
+        case tdehtml::UPPER_ROMAN:
             return "upper-roman";
-        case khtml::HEBREW:
+        case tdehtml::HEBREW:
             return "hebrew";
-        case khtml::ARMENIAN:
+        case tdehtml::ARMENIAN:
             return "armenian";
-        case khtml::GEORGIAN:
+        case tdehtml::GEORGIAN:
             return "georgian";
-        case khtml::CJK_IDEOGRAPHIC:
+        case tdehtml::CJK_IDEOGRAPHIC:
             return "cjk-ideographic";
-        case khtml::JAPANESE_FORMAL:
-            return "-khtml-japanese-formal";
-        case khtml::JAPANESE_INFORMAL:
-            return "-khtml-japanese-informal";
-        case khtml::SIMP_CHINESE_FORMAL:
-            return "-khtml-simp-chinese-formal";
-        case khtml::SIMP_CHINESE_INFORMAL:
-            return "-khtml-simp-chinese-informal";
-        case khtml::TRAD_CHINESE_FORMAL:
-            return "-khtml-trad-chinese-formal";
-        case khtml::TRAD_CHINESE_INFORMAL:
-            return "-khtml-trad-chinese-informal";
-        case khtml::LOWER_GREEK:
+        case tdehtml::JAPANESE_FORMAL:
+            return "-tdehtml-japanese-formal";
+        case tdehtml::JAPANESE_INFORMAL:
+            return "-tdehtml-japanese-informal";
+        case tdehtml::SIMP_CHINESE_FORMAL:
+            return "-tdehtml-simp-chinese-formal";
+        case tdehtml::SIMP_CHINESE_INFORMAL:
+            return "-tdehtml-simp-chinese-informal";
+        case tdehtml::TRAD_CHINESE_FORMAL:
+            return "-tdehtml-trad-chinese-formal";
+        case tdehtml::TRAD_CHINESE_INFORMAL:
+            return "-tdehtml-trad-chinese-informal";
+        case tdehtml::LOWER_GREEK:
             return "lower-greek";
-        case khtml::UPPER_GREEK:
-            return "-khtml-upper-greek";
-        case khtml::LOWER_ALPHA:
+        case tdehtml::UPPER_GREEK:
+            return "-tdehtml-upper-greek";
+        case tdehtml::LOWER_ALPHA:
             return "lower-alpha";
-        case khtml::UPPER_ALPHA:
+        case tdehtml::UPPER_ALPHA:
             return "upper-alpha";
-        case khtml::LOWER_LATIN:
+        case tdehtml::LOWER_LATIN:
             return "lower-latin";
-        case khtml::UPPER_LATIN:
+        case tdehtml::UPPER_LATIN:
             return "upper-latin";
-        case khtml::HIRAGANA:
+        case tdehtml::HIRAGANA:
             return "hiragana";
-        case khtml::KATAKANA:
+        case tdehtml::KATAKANA:
             return "katakana";
-        case khtml::HIRAGANA_IROHA:
+        case tdehtml::HIRAGANA_IROHA:
             return "hiragana-iroha";
-        case khtml::KATAKANA_IROHA:
+        case tdehtml::KATAKANA_IROHA:
             return "katakana_iroha";
-        case khtml::LNONE:
+        case tdehtml::LNONE:
             return "none";
     }
     Q_ASSERT( 0 );
@@ -272,7 +272,7 @@ static CSSPrimitiveValueImpl* valueForColor(TQColor color)
     if (color.isValid())
         return new CSSPrimitiveValueImpl(color.rgb());//### KDE4: use rgba!
     else
-        return new CSSPrimitiveValueImpl(khtml::transparentColor);
+        return new CSSPrimitiveValueImpl(tdehtml::transparentColor);
 }
 
 static CSSValueImpl* valueForShadow(const ShadowData *shadow)
@@ -391,13 +391,13 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
         return new CSSPrimitiveValueImpl(CSS_VAL_NONE);
     case CSS_PROP_BACKGROUND_REPEAT:
         switch (style->backgroundRepeat()) {
-        case khtml::REPEAT:
+        case tdehtml::REPEAT:
             return new CSSPrimitiveValueImpl(CSS_VAL_REPEAT);
-        case khtml::REPEAT_X:
+        case tdehtml::REPEAT_X:
             return new CSSPrimitiveValueImpl(CSS_VAL_REPEAT_X);
-        case khtml::REPEAT_Y:
+        case tdehtml::REPEAT_Y:
             return new CSSPrimitiveValueImpl(CSS_VAL_REPEAT_Y);
-        case khtml::NO_REPEAT:
+        case tdehtml::NO_REPEAT:
             return new CSSPrimitiveValueImpl(CSS_VAL_NO_REPEAT);
         default:
             Q_ASSERT( 0 );
@@ -889,19 +889,19 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
     case CSS_PROP_TEXT_DECORATION:
     {
         TQString string;
-        if (style->textDecoration() & khtml::UNDERLINE)
+        if (style->textDecoration() & tdehtml::UNDERLINE)
             string += "underline";
-        if (style->textDecoration() & khtml::OVERLINE) {
+        if (style->textDecoration() & tdehtml::OVERLINE) {
             if (string.length() > 0)
                 string += " ";
             string += "overline";
         }
-        if (style->textDecoration() & khtml::LINE_THROUGH) {
+        if (style->textDecoration() & tdehtml::LINE_THROUGH) {
             if (string.length() > 0)
                 string += " ";
             string += "line-through";
         }
-        if (style->textDecoration() & khtml::BLINK) {
+        if (style->textDecoration() & tdehtml::BLINK) {
             if (string.length() > 0)
                 string += " ";
             string += "blink";
@@ -969,11 +969,11 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
     }
     case CSS_PROP_VISIBILITY:
         switch (style->visibility()) {
-            case khtml::VISIBLE:
+            case tdehtml::VISIBLE:
                 return new CSSPrimitiveValueImpl(CSS_VAL_VISIBLE);
-            case khtml::HIDDEN:
+            case tdehtml::HIDDEN:
                 return new CSSPrimitiveValueImpl(CSS_VAL_HIDDEN);
-            case khtml::COLLAPSE:
+            case tdehtml::COLLAPSE:
                 return new CSSPrimitiveValueImpl(CSS_VAL_COLLAPSE);
         }
         Q_ASSERT(0);
diff --git a/khtml/css/css_renderstyledeclarationimpl.h b/tdehtml/css/css_renderstyledeclarationimpl.h
index d35983993..a751ceda1 100644
--- a/khtml/css/css_renderstyledeclarationimpl.h
+++ b/tdehtml/css/css_renderstyledeclarationimpl.h
@@ -30,13 +30,13 @@ namespace DOM {
     class NodeImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderObject;
 
 
 // Used by DOM::Counter::listStyle()
-DOM::DOMString stringForListStyleType(khtml::EListStyleType type);
+DOM::DOMString stringForListStyleType(tdehtml::EListStyleType type);
 
 class RenderStyleDeclarationImpl : public DOM::CSSStyleDeclarationImpl
 {
diff --git a/khtml/css/css_ruleimpl.cpp b/tdehtml/css/css_ruleimpl.cpp
index 0bf675484..0edd3a511 100644
--- a/khtml/css/css_ruleimpl.cpp
+++ b/tdehtml/css/css_ruleimpl.cpp
@@ -171,7 +171,7 @@ void CSSImportRuleImpl::init()
 {
     m_loading = 0;
     m_done = false;
-    khtml::DocLoader *docLoader = 0;
+    tdehtml::DocLoader *docLoader = 0;
     StyleBaseImpl *root = this;
     StyleBaseImpl *parent;
     while ( ( parent = root->parent()) )
diff --git a/khtml/css/css_ruleimpl.h b/tdehtml/css/css_ruleimpl.h
index 2753fcf83..63d0f96a1 100644
--- a/khtml/css/css_ruleimpl.h
+++ b/tdehtml/css/css_ruleimpl.h
@@ -30,7 +30,7 @@
 #include "misc/loader_client.h"
 #include "misc/shared.h"
 
-namespace khtml {
+namespace tdehtml {
     class CachedCSSStyleSheet;
 }
 
@@ -95,7 +95,7 @@ protected:
 };
 
 
-class CSSImportRuleImpl : public khtml::CachedObjectClient, public CSSRuleImpl
+class CSSImportRuleImpl : public tdehtml::CachedObjectClient, public CSSRuleImpl
 {
 public:
     CSSImportRuleImpl( StyleBaseImpl *parent, const DOM::DOMString &href,
@@ -122,14 +122,14 @@ protected:
     DOMString m_strHref;
     MediaListImpl *m_lstMedia;
     CSSStyleSheetImpl *m_styleSheet;
-    khtml::CachedCSSStyleSheet *m_cachedSheet;
+    tdehtml::CachedCSSStyleSheet *m_cachedSheet;
     bool m_loading;
     bool m_done;
 };
 
 class MediaList;
 
-class CSSRuleListImpl : public khtml::Shared<CSSRuleListImpl>
+class CSSRuleListImpl : public tdehtml::Shared<CSSRuleListImpl>
 {
 public:
     CSSRuleListImpl() {}
diff --git a/khtml/css/css_stylesheetimpl.cpp b/tdehtml/css/css_stylesheetimpl.cpp
index 8189a6846..40fa0dc0c 100644
--- a/khtml/css/css_stylesheetimpl.cpp
+++ b/tdehtml/css/css_stylesheetimpl.cpp
@@ -40,7 +40,7 @@
 #include <kdebug.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 // --------------------------------------------------------------------------------
 
 StyleSheetImpl::StyleSheetImpl(StyleSheetImpl *parentSheet, DOMString href)
diff --git a/khtml/css/css_stylesheetimpl.h b/tdehtml/css/css_stylesheetimpl.h
index 656b59ca9..8b59003ed 100644
--- a/khtml/css/css_stylesheetimpl.h
+++ b/tdehtml/css/css_stylesheetimpl.h
@@ -31,7 +31,7 @@
 #include "misc/loader_client.h"
 #include "xml/dom_docimpl.h"
 
-namespace khtml {
+namespace tdehtml {
     class CachedCSSStyleSheet;
     class DocLoader;
 }
@@ -55,7 +55,7 @@ public:
     StyleSheetImpl(DOM::NodeImpl *ownerNode, DOM::DOMString href = DOMString());
     StyleSheetImpl(StyleSheetImpl *parentSheet, DOM::DOMString href = DOMString());
     StyleSheetImpl(StyleBaseImpl *owner, DOM::DOMString href  = DOMString());
-    StyleSheetImpl(khtml::CachedCSSStyleSheet *cached, DOM::DOMString href  = DOMString());
+    StyleSheetImpl(tdehtml::CachedCSSStyleSheet *cached, DOM::DOMString href  = DOMString());
     virtual ~StyleSheetImpl();
 
     virtual bool isStyleSheet() const { return true; }
@@ -115,7 +115,7 @@ public:
     virtual void checkLoaded() const;
 
     // ### remove? (clients should use sheet->doc()->docLoader())
-    khtml::DocLoader *docLoader() const
+    tdehtml::DocLoader *docLoader() const
     { return m_doc ? m_doc->docLoader() : 0; }
 
     DocumentImpl *doc() const { return m_doc; }
@@ -130,7 +130,7 @@ protected:
 
 // ----------------------------------------------------------------------------
 
-class StyleSheetListImpl : public khtml::Shared<StyleSheetListImpl>
+class StyleSheetListImpl : public tdehtml::Shared<StyleSheetListImpl>
 {
 public:
     StyleSheetListImpl() {}
diff --git a/khtml/css/css_valueimpl.cpp b/tdehtml/css/css_valueimpl.cpp
index a6150c78b..0da65c4b6 100644
--- a/khtml/css/css_valueimpl.cpp
+++ b/tdehtml/css/css_valueimpl.cpp
@@ -48,7 +48,7 @@
 // Hack for debugging purposes
 extern DOM::DOMString getPropertyName(unsigned short id);
 
-using khtml::FontDef;
+using tdehtml::FontDef;
 
 using namespace DOM;
 
@@ -549,7 +549,7 @@ void CSSPrimitiveValueImpl::cleanup()
     m_type = 0;
 }
 
-int CSSPrimitiveValueImpl::computeLength( khtml::RenderStyle *style, TQPaintDeviceMetrics *devMetrics )
+int CSSPrimitiveValueImpl::computeLength( tdehtml::RenderStyle *style, TQPaintDeviceMetrics *devMetrics )
 {
     double result = computeLengthFloat( style, devMetrics );
     // This conversion is imprecise, often resulting in values of, e.g., 44.99998.  We
@@ -558,14 +558,14 @@ int CSSPrimitiveValueImpl::computeLength( khtml::RenderStyle *style, TQPaintDevi
     return intResult;
 }
 
-double CSSPrimitiveValueImpl::computeLengthFloat( khtml::RenderStyle *style, TQPaintDeviceMetrics *devMetrics )
+double CSSPrimitiveValueImpl::computeLengthFloat( tdehtml::RenderStyle *style, TQPaintDeviceMetrics *devMetrics )
 {
     unsigned short type = primitiveType();
 
     double dpiY = 72.; // fallback
     if ( devMetrics )
         dpiY = devMetrics->logicalDpiY();
-    if ( !khtml::printpainter && dpiY < 96 )
+    if ( !tdehtml::printpainter && dpiY < 96 )
         dpiY = 96.;
 
     double factor = 1.;
@@ -758,7 +758,7 @@ DOM::DOMString CSSPrimitiveValueImpl::cssText() const
         }
 	case CSSPrimitiveValue::CSS_RGBCOLOR:
 	    if (tqAlpha(m_value.rgbcolor) != 0xFF) {
-		if (m_value.rgbcolor == khtml::transparentColor)
+		if (m_value.rgbcolor == tdehtml::transparentColor)
 		    text = "transparent";
 		else
 		    text = "rgba(" + TQString::number(tqRed  (m_value.rgbcolor)) + "," 
@@ -854,7 +854,7 @@ void PairImpl::setSecond(CSSPrimitiveValueImpl* second)
 CSSImageValueImpl::CSSImageValueImpl(const DOMString &url, const StyleBaseImpl* style)
     : CSSPrimitiveValueImpl(url, CSSPrimitiveValue::CSS_URI)
 {
-    khtml::DocLoader *docLoader = 0;
+    tdehtml::DocLoader *docLoader = 0;
     const StyleBaseImpl *root = style;
     while (root->parent())
 	root = root->parent();
diff --git a/khtml/css/css_valueimpl.h b/tdehtml/css/css_valueimpl.h
index 3566c00cb..9a6203c86 100644
--- a/khtml/css/css_valueimpl.h
+++ b/tdehtml/css/css_valueimpl.h
@@ -32,7 +32,7 @@
 
 #include <tqintdict.h>
 
-namespace khtml {
+namespace tdehtml {
     class RenderStyle;
     class CachedImage;
 }
@@ -182,9 +182,9 @@ public:
      * this is screen/printer dependent, so we probably need a config option for this,
      * and some tool to calibrate.
      */
-    int computeLength( khtml::RenderStyle *style, TQPaintDeviceMetrics *devMetrics );
+    int computeLength( tdehtml::RenderStyle *style, TQPaintDeviceMetrics *devMetrics );
 
-    double computeLengthFloat( khtml::RenderStyle *style, TQPaintDeviceMetrics *devMetrics );
+    double computeLengthFloat( tdehtml::RenderStyle *style, TQPaintDeviceMetrics *devMetrics );
 
     // use with care!!!
     void setPrimitiveType(unsigned short type) { m_type = type; }
@@ -252,7 +252,7 @@ public:
     virtual bool isQuirkValue() const { return true; }
 };
 
-class CounterImpl : public khtml::Shared<CounterImpl> {
+class CounterImpl : public tdehtml::Shared<CounterImpl> {
 public:
     CounterImpl() : m_listStyle(0) { }
     DOMString identifier() const { return m_identifier; }
@@ -264,7 +264,7 @@ public:
     DOMString m_separator;
 };
 
-class RectImpl : public khtml::Shared<RectImpl> {
+class RectImpl : public tdehtml::Shared<RectImpl> {
 public:
     RectImpl();
     ~RectImpl();
@@ -289,7 +289,7 @@ protected:
 // and border-spacing (all of which are space-separated sets of two values).  At the moment we are only using it for
 // border-radius and background-size, but (FIXME) border-spacing and background-position could be converted over to use
 // it (eliminating some extra -webkit- internal properties).
-class PairImpl : public khtml::Shared<PairImpl> {
+class PairImpl : public tdehtml::Shared<PairImpl> {
 public:
     PairImpl() : m_first(0), m_second(0) { }
     PairImpl(CSSPrimitiveValueImpl* first, CSSPrimitiveValueImpl* second)
@@ -308,16 +308,16 @@ protected:
 };
 
 
-class CSSImageValueImpl : public CSSPrimitiveValueImpl, public khtml::CachedObjectClient
+class CSSImageValueImpl : public CSSPrimitiveValueImpl, public tdehtml::CachedObjectClient
 {
 public:
     CSSImageValueImpl(const DOMString &url, const StyleBaseImpl *style);
     CSSImageValueImpl();
     virtual ~CSSImageValueImpl();
 
-    khtml::CachedImage *image() { return m_image; }
+    tdehtml::CachedImage *image() { return m_image; }
 protected:
-    khtml::CachedImage *m_image;
+    tdehtml::CachedImage *m_image;
 };
 
 class FontFamilyValueImpl : public CSSPrimitiveValueImpl
diff --git a/khtml/css/csshelper.cpp b/tdehtml/css/csshelper.cpp
index b388d2215..02b5b3d39 100644
--- a/khtml/css/csshelper.cpp
+++ b/tdehtml/css/csshelper.cpp
@@ -36,13 +36,13 @@
 #include "dom/css_value.h"
 #include "misc/helper.h"
 #include "xml/dom_stringimpl.h"
-#include "khtml_settings.h"
+#include "tdehtml_settings.h"
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 
-DOMString khtml::parseURL(const DOMString &url)
+DOMString tdehtml::parseURL(const DOMString &url)
 {
     DOMStringImpl* i = url.implementation();
     if(!i) return DOMString();
diff --git a/khtml/css/csshelper.h b/tdehtml/css/csshelper.h
index 1ab8ac3ce..772a9eba1 100644
--- a/khtml/css/csshelper.h
+++ b/tdehtml/css/csshelper.h
@@ -35,7 +35,7 @@ namespace DOM
     class CSSPrimitiveValueImpl;
 }
 
-namespace khtml
+namespace tdehtml
 {
     class RenderStyle;
 
diff --git a/khtml/css/cssparser.cpp b/tdehtml/css/cssparser.cpp
index b4480ab7d..b994ad773 100644
--- a/khtml/css/cssparser.cpp
+++ b/tdehtml/css/cssparser.cpp
@@ -184,13 +184,13 @@ CSSRuleImpl *CSSParser::parseRule( DOM::CSSStyleSheetImpl *sheet, const DOM::DOM
 {
     styleElement = sheet;
 
-    const char khtml_rule[] = "@-khtml-rule{";
-    int length = string.length() + 4 + strlen(khtml_rule);
+    const char tdehtml_rule[] = "@-tdehtml-rule{";
+    int length = string.length() + 4 + strlen(tdehtml_rule);
     assert( !data );
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
-    for ( unsigned int i = 0; i < strlen(khtml_rule); i++ )
-        data[i] = khtml_rule[i];
-    memcpy( data + strlen( khtml_rule ), string.unicode(), string.length()*sizeof( unsigned short) );
+    for ( unsigned int i = 0; i < strlen(tdehtml_rule); i++ )
+        data[i] = tdehtml_rule[i];
+    memcpy( data + strlen( tdehtml_rule ), string.unicode(), string.length()*sizeof( unsigned short) );
     // tqDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() );
     data[length-4] = '}';
 
@@ -212,13 +212,13 @@ bool CSSParser::parseValue( DOM::CSSStyleDeclarationImpl *declaration, int _id,
 
     styleElement = declaration->stylesheet();
 
-    const char khtml_value[] = "@-khtml-value{";
-    int length = string.length() + 4 + strlen(khtml_value);
+    const char tdehtml_value[] = "@-tdehtml-value{";
+    int length = string.length() + 4 + strlen(tdehtml_value);
     assert( !data );
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
-    for ( unsigned int i = 0; i < strlen(khtml_value); i++ )
-        data[i] = khtml_value[i];
-    memcpy( data + strlen( khtml_value ), string.unicode(), string.length()*sizeof( unsigned short) );
+    for ( unsigned int i = 0; i < strlen(tdehtml_value); i++ )
+        data[i] = tdehtml_value[i];
+    memcpy( data + strlen( tdehtml_value ), string.unicode(), string.length()*sizeof( unsigned short) );
     data[length-4] = '}';
     // tqDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() );
 
@@ -254,13 +254,13 @@ bool CSSParser::parseDeclaration( DOM::CSSStyleDeclarationImpl *declaration, con
 
     styleElement = declaration->stylesheet();
 
-    const char khtml_decls[] = "@-khtml-decls{";
-    int length = string.length() + 4 + strlen(khtml_decls);
+    const char tdehtml_decls[] = "@-tdehtml-decls{";
+    int length = string.length() + 4 + strlen(tdehtml_decls);
     assert( !data );
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
-    for ( unsigned int i = 0; i < strlen(khtml_decls); i++ )
-        data[i] = khtml_decls[i];
-    memcpy( data + strlen( khtml_decls ), string.unicode(), string.length()*sizeof( unsigned short) );
+    for ( unsigned int i = 0; i < strlen(tdehtml_decls); i++ )
+        data[i] = tdehtml_decls[i];
+    memcpy( data + strlen( tdehtml_decls ), string.unicode(), string.length()*sizeof( unsigned short) );
     data[length-4] = '}';
 
     nonCSSHint = _nonCSSHint;
@@ -530,7 +530,7 @@ bool CSSParser::parseValue( int propId, bool important )
         break;
 
     /* Start of supported CSS properties with validation. This is needed for parseShortHand to work
-     * correctly and allows optimization in khtml::applyRule(..)
+     * correctly and allows optimization in tdehtml::applyRule(..)
      */
     case CSS_PROP_CAPTION_SIDE:         // top | bottom | left | right | inherit
         // Left and right were deprecated in CSS 2.1 and never supported by KHTML
@@ -572,7 +572,7 @@ bool CSSParser::parseValue( int propId, bool important )
         break;
 
     case CSS_PROP_DISPLAY:
-        // inline | block | list-item | run-in | inline-block | -khtml-ruler | table |
+        // inline | block | list-item | run-in | inline-block | -tdehtml-ruler | table |
         // inline-table | table-row-group | table-header-group | table-footer-group | table-row |
         // table-column-group | table-column | table-cell | table-caption | none | inherit
         if ((id >= CSS_VAL_INLINE && id <= CSS_VAL_TABLE_CAPTION) || id == CSS_VAL_NONE)
@@ -589,7 +589,7 @@ bool CSSParser::parseValue( int propId, bool important )
             valid_primitive = true;
         break;
 
-    case CSS_PROP_FLOAT:                // left | right | none | khtml_left | khtml_right | inherit + center for buggy CSS
+    case CSS_PROP_FLOAT:                // left | right | none | tdehtml_left | tdehtml_right | inherit + center for buggy CSS
         if ( id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL__KHTML_LEFT ||
              id == CSS_VAL__KHTML_RIGHT ||id == CSS_VAL_NONE || id == CSS_VAL_CENTER)
             valid_primitive = true;
@@ -602,7 +602,7 @@ bool CSSParser::parseValue( int propId, bool important )
         break;
 
     case CSS_PROP_TEXT_ALIGN:
-        // left | right | center | justify | khtml_left | khtml_right | khtml_center | <string> | inherit
+        // left | right | center | justify | tdehtml_left | tdehtml_right | tdehtml_center | <string> | inherit
         if ( ( id >= CSS_VAL__KHTML_AUTO && id <= CSS_VAL__KHTML_CENTER ) ||
              value->unit == CSSPrimitiveValue::CSS_STRING )
             valid_primitive = true;
@@ -611,7 +611,7 @@ bool CSSParser::parseValue( int propId, bool important )
     case CSS_PROP_OUTLINE_STYLE:        // <border-style> | inherit
     case CSS_PROP_BORDER_TOP_STYLE:     //// <border-style> | inherit
     case CSS_PROP_BORDER_RIGHT_STYLE:   //   Defined as:    none | hidden | dotted | dashed |
-    case CSS_PROP_BORDER_BOTTOM_STYLE:  //   solid | double | groove | ridge | inset | outset | -khtml-native
+    case CSS_PROP_BORDER_BOTTOM_STYLE:  //   solid | double | groove | ridge | inset | outset | -tdehtml-native
     case CSS_PROP_BORDER_LEFT_STYLE:    ////
         if (id >= CSS_VAL__KHTML_NATIVE && id <= CSS_VAL_DOUBLE)
             valid_primitive = true;
@@ -732,7 +732,7 @@ bool CSSParser::parseValue( int propId, bool important )
         }
         else if (value->unit == CSSPrimitiveValue::CSS_URI ) {
             // ### allow string in non strict mode?
-            DOMString uri = khtml::parseURL( domString( value->string ) );
+            DOMString uri = tdehtml::parseURL( domString( value->string ) );
             if (!uri.isEmpty()) {
                 parsedValue = new CSSImageValueImpl(
                     DOMString(KURL( styleElement->baseURL(), uri.string()).url()),
@@ -1336,7 +1336,7 @@ bool CSSParser::parseContent( int propId, bool important )
         parsedValue = 0;
         if ( val->unit == CSSPrimitiveValue::CSS_URI ) {
             // url
-            DOMString value = khtml::parseURL(domString(val->string));
+            DOMString value = tdehtml::parseURL(domString(val->string));
             parsedValue = new CSSImageValueImpl(
                 DOMString(KURL( styleElement->baseURL(), value.string()).url() ), styleElement );
 #ifdef CSS_DEBUG
@@ -1451,7 +1451,7 @@ CSSValueImpl* CSSParser::parseBackgroundImage()
     if (valueList->current()->id == CSS_VAL_NONE)
         return new CSSImageValueImpl();
     if (valueList->current()->unit == CSSPrimitiveValue::CSS_URI) {
-        DOMString uri = khtml::parseURL(domString(valueList->current()->string));
+        DOMString uri = tdehtml::parseURL(domString(valueList->current()->string));
         if (!uri.isEmpty())
             return new CSSImageValueImpl(DOMString(KURL(styleElement->baseURL(), uri.string()).url()),
                                          styleElement);
@@ -2101,7 +2101,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColor()
 
 CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
 {
-    QRgb c = khtml::transparentColor;
+    QRgb c = tdehtml::transparentColor;
     if ( !strict && value->unit == CSSPrimitiveValue::CSS_NUMBER &&
               value->fValue >= 0. && value->fValue < 1000000. ) {
         TQString str;
@@ -2144,7 +2144,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
         double colorValues[3];
         if (!parseHSLParameters(value, colorValues, false))
             return 0;
-        c = khtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], 1.0);
+        c = tdehtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], 1.0);
     } else if (value->unit == Value::Function &&
                 value->function->args != 0 &&
                 value->function->args->size() == 7 /* hsla + three commas */ &&
@@ -2152,7 +2152,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
         double colorValues[4];
         if (!parseHSLParameters(value, colorValues, true))
             return 0;
-        c = khtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
+        c = tdehtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
     }
     else
         return 0;
diff --git a/khtml/css/cssparser.h b/tdehtml/css/cssparser.h
index 0e00ebc16..0e00ebc16 100644
--- a/khtml/css/cssparser.h
+++ b/tdehtml/css/cssparser.h
diff --git a/khtml/css/cssproperties.c b/tdehtml/css/cssproperties.c
index c86f2d326..da5208412 100644
--- a/khtml/css/cssproperties.c
+++ b/tdehtml/css/cssproperties.c
@@ -295,7 +295,7 @@ findProp (register const char *str, register unsigned int len)
 #line 104 "cssproperties.gperf"
       {"text-indent", CSS_PROP_TEXT_INDENT},
 #line 69 "cssproperties.gperf"
-      {"-khtml-margin-start", CSS_PROP__KHTML_MARGIN_START},
+      {"-tdehtml-margin-start", CSS_PROP__KHTML_MARGIN_START},
 #line 14 "cssproperties.gperf"
       {"background-color", CSS_PROP_BACKGROUND_COLOR},
 #line 100 "cssproperties.gperf"
@@ -305,7 +305,7 @@ findProp (register const char *str, register unsigned int len)
 #line 47 "cssproperties.gperf"
       {"counter-reset", CSS_PROP_COUNTER_RESET},
 #line 93 "cssproperties.gperf"
-      {"-khtml-padding-start", CSS_PROP__KHTML_PADDING_START},
+      {"-tdehtml-padding-start", CSS_PROP__KHTML_PADDING_START},
 #line 15 "cssproperties.gperf"
       {"background-image", CSS_PROP_BACKGROUND_IMAGE},
 #line 96 "cssproperties.gperf"
@@ -319,11 +319,11 @@ findProp (register const char *str, register unsigned int len)
 #line 52 "cssproperties.gperf"
       {"float", CSS_PROP_FLOAT},
 #line 21 "cssproperties.gperf"
-      {"-khtml-background-clip", CSS_PROP__KHTML_BACKGROUND_CLIP},
+      {"-tdehtml-background-clip", CSS_PROP__KHTML_BACKGROUND_CLIP},
 #line 70 "cssproperties.gperf"
-      {"-khtml-marquee", CSS_PROP__KHTML_MARQUEE},
+      {"-tdehtml-marquee", CSS_PROP__KHTML_MARQUEE},
 #line 27 "cssproperties.gperf"
-      {"-khtml-border-vertical-spacing", CSS_PROP__KHTML_BORDER_VERTICAL_SPACING},
+      {"-tdehtml-border-vertical-spacing", CSS_PROP__KHTML_BORDER_VERTICAL_SPACING},
 #line 46 "cssproperties.gperf"
       {"counter-increment", CSS_PROP_COUNTER_INCREMENT},
 #line 128 "cssproperties.gperf"
@@ -337,7 +337,7 @@ findProp (register const char *str, register unsigned int len)
 #line 31 "cssproperties.gperf"
       {"border-left-color", CSS_PROP_BORDER_LEFT_COLOR},
 #line 22 "cssproperties.gperf"
-      {"-khtml-background-origin", CSS_PROP__KHTML_BACKGROUND_ORIGIN},
+      {"-tdehtml-background-origin", CSS_PROP__KHTML_BACKGROUND_ORIGIN},
 #line 17 "cssproperties.gperf"
       {"background-attachment", CSS_PROP_BACKGROUND_ATTACHMENT},
 #line 126 "cssproperties.gperf"
@@ -353,7 +353,7 @@ findProp (register const char *str, register unsigned int len)
 #line 68 "cssproperties.gperf"
       {"margin-left", CSS_PROP_MARGIN_LEFT},
 #line 142 "cssproperties.gperf"
-      {"-khtml-user-input", CSS_PROP__KHTML_USER_INPUT},
+      {"-tdehtml-user-input", CSS_PROP__KHTML_USER_INPUT},
 #line 79 "cssproperties.gperf"
       {"min-width", CSS_PROP_MIN_WIDTH},
 #line 127 "cssproperties.gperf"
@@ -361,13 +361,13 @@ findProp (register const char *str, register unsigned int len)
 #line 92 "cssproperties.gperf"
       {"padding-left", CSS_PROP_PADDING_LEFT},
 #line 71 "cssproperties.gperf"
-      {"-khtml-marquee-direction", CSS_PROP__KHTML_MARQUEE_DIRECTION},
+      {"-tdehtml-marquee-direction", CSS_PROP__KHTML_MARQUEE_DIRECTION},
 #line 73 "cssproperties.gperf"
-      {"-khtml-marquee-repetition", CSS_PROP__KHTML_MARQUEE_REPETITION},
+      {"-tdehtml-marquee-repetition", CSS_PROP__KHTML_MARQUEE_REPETITION},
 #line 95 "cssproperties.gperf"
       {"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE},
 #line 74 "cssproperties.gperf"
-      {"-khtml-marquee-speed", CSS_PROP__KHTML_MARQUEE_SPEED},
+      {"-tdehtml-marquee-speed", CSS_PROP__KHTML_MARQUEE_SPEED},
 #line 94 "cssproperties.gperf"
       {"page-break-after", CSS_PROP_PAGE_BREAK_AFTER},
 #line 81 "cssproperties.gperf"
@@ -383,7 +383,7 @@ findProp (register const char *str, register unsigned int len)
 #line 134 "cssproperties.gperf"
       {"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR},
 #line 72 "cssproperties.gperf"
-      {"-khtml-marquee-increment", CSS_PROP__KHTML_MARQUEE_INCREMENT},
+      {"-tdehtml-marquee-increment", CSS_PROP__KHTML_MARQUEE_INCREMENT},
 #line 116 "cssproperties.gperf"
       {"word-spacing", CSS_PROP_WORD_SPACING},
 #line 111 "cssproperties.gperf"
@@ -405,13 +405,13 @@ findProp (register const char *str, register unsigned int len)
 #line 32 "cssproperties.gperf"
       {"border-top-style", CSS_PROP_BORDER_TOP_STYLE},
 #line 26 "cssproperties.gperf"
-      {"-khtml-border-horizontal-spacing", CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING},
+      {"-tdehtml-border-horizontal-spacing", CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING},
 #line 33 "cssproperties.gperf"
       {"border-right-style", CSS_PROP_BORDER_RIGHT_STYLE},
 #line 34 "cssproperties.gperf"
       {"border-bottom-style", CSS_PROP_BORDER_BOTTOM_STYLE},
 #line 23 "cssproperties.gperf"
-      {"-khtml-background-size", CSS_PROP__KHTML_BACKGROUND_SIZE},
+      {"-tdehtml-background-size", CSS_PROP__KHTML_BACKGROUND_SIZE},
 #line 135 "cssproperties.gperf"
       {"scrollbar-shadow-color", CSS_PROP_SCROLLBAR_SHADOW_COLOR},
 #line 129 "cssproperties.gperf"
@@ -435,7 +435,7 @@ findProp (register const char *str, register unsigned int len)
 #line 84 "cssproperties.gperf"
       {"outline-style", CSS_PROP_OUTLINE_STYLE},
 #line 141 "cssproperties.gperf"
-      {"-khtml-flow-mode", CSS_PROP__KHTML_FLOW_MODE},
+      {"-tdehtml-flow-mode", CSS_PROP__KHTML_FLOW_MODE},
 #line 87 "cssproperties.gperf"
       {"overflow-x", CSS_PROP_OVERFLOW_X},
 #line 113 "cssproperties.gperf"
@@ -449,7 +449,7 @@ findProp (register const char *str, register unsigned int len)
 #line 83 "cssproperties.gperf"
       {"outline-offset", CSS_PROP_OUTLINE_OFFSET},
 #line 75 "cssproperties.gperf"
-      {"-khtml-marquee-style", CSS_PROP__KHTML_MARQUEE_STYLE},
+      {"-tdehtml-marquee-style", CSS_PROP__KHTML_MARQUEE_STYLE},
 #line 55 "cssproperties.gperf"
       {"font-style", CSS_PROP_FONT_STYLE},
 #line 35 "cssproperties.gperf"
@@ -544,13 +544,13 @@ static const char * const propertyList[] = {
 "background-position", 
 "background-position-x", 
 "background-position-y", 
-"-khtml-background-clip", 
-"-khtml-background-origin", 
-"-khtml-background-size", 
+"-tdehtml-background-clip", 
+"-tdehtml-background-origin", 
+"-tdehtml-background-size", 
 "border-collapse", 
 "border-spacing", 
-"-khtml-border-horizontal-spacing", 
-"-khtml-border-vertical-spacing", 
+"-tdehtml-border-horizontal-spacing", 
+"-tdehtml-border-vertical-spacing", 
 "border-top-color", 
 "border-right-color", 
 "border-bottom-color", 
@@ -592,13 +592,13 @@ static const char * const propertyList[] = {
 "margin-right", 
 "margin-bottom", 
 "margin-left", 
-"-khtml-margin-start", 
-"-khtml-marquee", 
-"-khtml-marquee-direction", 
-"-khtml-marquee-increment", 
-"-khtml-marquee-repetition", 
-"-khtml-marquee-speed", 
-"-khtml-marquee-style", 
+"-tdehtml-margin-start", 
+"-tdehtml-marquee", 
+"-tdehtml-marquee-direction", 
+"-tdehtml-marquee-increment", 
+"-tdehtml-marquee-repetition", 
+"-tdehtml-marquee-speed", 
+"-tdehtml-marquee-style", 
 "max-height", 
 "max-width", 
 "min-height", 
@@ -616,7 +616,7 @@ static const char * const propertyList[] = {
 "padding-right", 
 "padding-bottom", 
 "padding-left", 
-"-khtml-padding-start", 
+"-tdehtml-padding-start", 
 "page-break-after", 
 "page-break-before", 
 "page-break-inside", 
@@ -664,8 +664,8 @@ static const char * const propertyList[] = {
 "scrollbar-darkshadow-color", 
 "scrollbar-track-color", 
 "scrollbar-arrow-color", 
-"-khtml-flow-mode", 
-"-khtml-user-input", 
+"-tdehtml-flow-mode", 
+"-tdehtml-user-input", 
     0
 };
 DOMString getPropertyName(unsigned short id)
diff --git a/khtml/css/cssproperties.h b/tdehtml/css/cssproperties.h
index be92d93d4..be92d93d4 100644
--- a/khtml/css/cssproperties.h
+++ b/tdehtml/css/cssproperties.h
diff --git a/khtml/css/cssproperties.in b/tdehtml/css/cssproperties.in
index 251eb5e3d..27e452322 100644
--- a/khtml/css/cssproperties.in
+++ b/tdehtml/css/cssproperties.in
@@ -3,7 +3,7 @@
 #
 # aural properties are commented out, as we don't support them anyway.
 #
-# some properties are used in khtml, but are not part of CSS. They are used to get
+# some properties are used in tdehtml, but are not part of CSS. They are used to get
 # HTML4 compatibility in the rendering engine.
 #
 # Mircosoft extensions are documented here:
@@ -20,14 +20,14 @@ background-position
 background-position-x
 background-position-y
 # CSS3 Extensions
--khtml-background-clip
--khtml-background-origin
--khtml-background-size
+-tdehtml-background-clip
+-tdehtml-background-origin
+-tdehtml-background-size
 
 border-collapse
 border-spacing
--khtml-border-horizontal-spacing
--khtml-border-vertical-spacing
+-tdehtml-border-horizontal-spacing
+-tdehtml-border-vertical-spacing
 border-top-color
 border-right-color
 border-bottom-color
@@ -69,13 +69,13 @@ margin-top
 margin-right
 margin-bottom
 margin-left
--khtml-margin-start
--khtml-marquee
--khtml-marquee-direction
--khtml-marquee-increment
--khtml-marquee-repetition
--khtml-marquee-speed
--khtml-marquee-style
+-tdehtml-margin-start
+-tdehtml-marquee
+-tdehtml-marquee-direction
+-tdehtml-marquee-increment
+-tdehtml-marquee-repetition
+-tdehtml-marquee-speed
+-tdehtml-marquee-style
 max-height
 max-width
 min-height
@@ -93,7 +93,7 @@ padding-top
 padding-right
 padding-bottom
 padding-left
--khtml-padding-start
+-tdehtml-padding-start
 #page
 page-break-after
 page-break-before
@@ -143,6 +143,6 @@ scrollbar-3dlight-color
 scrollbar-darkshadow-color
 scrollbar-track-color
 scrollbar-arrow-color
-# khtml internals
--khtml-flow-mode
--khtml-user-input
+# tdehtml internals
+-tdehtml-flow-mode
+-tdehtml-user-input
diff --git a/khtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp
index 3f4a8cd26..f2c5703c1 100644
--- a/khtml/css/cssstyleselector.cpp
+++ b/tdehtml/css/cssstyleselector.cpp
@@ -36,24 +36,24 @@
 #include "xml/dom_restyler.h"
 #include "dom/css_rule.h"
 #include "dom/css_value.h"
-#include "khtml_factory.h"
-#include "khtmlpart_p.h"
-using namespace khtml;
+#include "tdehtml_factory.h"
+#include "tdehtmlpart_p.h"
+using namespace tdehtml;
 using namespace DOM;
 
 #include "css/cssproperties.h"
 #include "css/cssvalues.h"
 
-#include "misc/khtmllayout.h"
-#include "khtml_settings.h"
+#include "misc/tdehtmllayout.h"
+#include "tdehtml_settings.h"
 #include "misc/htmlhashes.h"
 #include "misc/helper.h"
 #include "misc/loader.h"
 
 #include "rendering/font.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 
 #include <kstandarddirs.h>
 #include <kcharsets.h>
@@ -195,7 +195,7 @@ else \
 HANDLE_INHERIT_ON_INHERITED_PROPERTY(prop, Prop)
 
 
-namespace khtml {
+namespace tdehtml {
 
 CSSStyleSelectorList *CSSStyleSelector::s_defaultStyle;
 CSSStyleSelectorList *CSSStyleSelector::s_defaultQuirksStyle;
@@ -225,7 +225,7 @@ CSSStyleSelector::CSSStyleSelector( DocumentImpl* doc, TQString userStyleSheet,
     userSheet = 0;
     paintDeviceMetrics = doc->paintDeviceMetrics();
 
-    if(paintDeviceMetrics) // this may be null, not everyone uses khtmlview (Niko)
+    if(paintDeviceMetrics) // this may be null, not everyone uses tdehtmlview (Niko)
         computeFontSizes(paintDeviceMetrics, view ? view->part()->zoomFactor() : 100);
 
     if ( !userStyleSheet.isEmpty() ) {
@@ -318,7 +318,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do
     if(s_defaultStyle) return;
 
     {
-	TQFile f(locate( "data", "khtml/css/html4.css" ) );
+	TQFile f(locate( "data", "tdehtml/css/html4.css" ) );
 	f.open(IO_ReadOnly);
 
 	TQCString file( f.size()+1 );
@@ -343,7 +343,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do
 	s_defaultPrintStyle->append( s_defaultSheet, "print" );
     }
     {
-	TQFile f(locate( "data", "khtml/css/quirks.css" ) );
+	TQFile f(locate( "data", "tdehtml/css/quirks.css" ) );
 	f.open(IO_ReadOnly);
 
 	TQCString file( f.size()+1 );
@@ -415,7 +415,7 @@ void CSSStyleSelector::computeFontSizesFor(TQPaintDeviceMetrics* paintDeviceMetr
     static const float fontFactors[] =      {3./5., 3./4., 8./9., 1., 6./5., 3./2., 2., 3.};
     static const float smallFontFactors[] = {3./4., 5./6., 8./9., 1., 6./5., 3./2., 2., 3.};
     float mediumFontSize, minFontSize, factor;
-    if (!khtml::printpainter) {
+    if (!tdehtml::printpainter) {
         scale *= zoomFactor / 100.0;
 #ifdef APPLE_CHANGES
 	if (isFixed)
@@ -3132,7 +3132,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         HANDLE_INHERIT_AND_INITIAL(verticalAlign, VerticalAlign)
         if (!primitiveValue) return;
         if (primitiveValue->getIdent()) {
-	  khtml::EVerticalAlign align;
+	  tdehtml::EVerticalAlign align;
 
 	  switch(primitiveValue->getIdent())
 	    {
@@ -3224,7 +3224,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         } else {
             int type = primitiveValue->primitiveType();
             if(type > CSSPrimitiveValue::CSS_PERCENTAGE && type < CSSPrimitiveValue::CSS_DEG) {
-                if ( !khtml::printpainter && type != CSSPrimitiveValue::CSS_EMS && type != CSSPrimitiveValue::CSS_EXS &&
+                if ( !tdehtml::printpainter && type != CSSPrimitiveValue::CSS_EMS && type != CSSPrimitiveValue::CSS_EXS &&
                      view && view->part())
                     size = int( primitiveValue->computeLengthFloat(parentStyle, paintDeviceMetrics) *
                                 view->part()->zoomFactor() ) / 100;
@@ -3304,7 +3304,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         else if (type > CSSPrimitiveValue::CSS_PERCENTAGE && type < CSSPrimitiveValue::CSS_DEG) {
             // Scale for the font zoom factor only for types other than "em" and "ex", since those are
             // already based on the font size.
-		if ( !khtml::printpainter && type != CSSPrimitiveValue::CSS_EMS && type != CSSPrimitiveValue::CSS_EXS &&
+		if ( !tdehtml::printpainter && type != CSSPrimitiveValue::CSS_EMS && type != CSSPrimitiveValue::CSS_EXS &&
                     view && view->part())
                     lineHeight = Length(primitiveValue->computeLength(style, paintDeviceMetrics) *
                                         view->part()->zoomFactor()/100, Fixed );
@@ -3821,7 +3821,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
             int x = item->x->computeLength(style, paintDeviceMetrics);
             int y = item->y->computeLength(style, paintDeviceMetrics);
             int blur = item->blur ? item->blur->computeLength(style, paintDeviceMetrics) : 0;
-            TQColor col = khtml::transparentColor;
+            TQColor col = tdehtml::transparentColor;
             if (item->color) {
                 int ident = item->color->getIdent();
                 if (ident)
@@ -3964,7 +3964,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         }
         break;
     case CSS_PROP_TEXT_OVERFLOW: {
-        // This property is supported by WinIE, and so we leave off the "-khtml-" in order to
+        // This property is supported by WinIE, and so we leave off the "-tdehtml-" in order to
         // work with WinIE-specific pages that use the property.
         HANDLE_INHERIT_AND_INITIAL(textOverflow, TextOverflow)
         if (!primitiveValue || !primitiveValue->getIdent())
@@ -4214,4 +4214,4 @@ void CSSStyleSelector::checkForGenericFamilyChange(RenderStyle* aStyle, RenderSt
 }
 #endif
 
-} // namespace khtml
+} // namespace tdehtml
diff --git a/khtml/css/cssstyleselector.h b/tdehtml/css/cssstyleselector.h
index 1b076337e..ad6903de7 100644
--- a/khtml/css/cssstyleselector.h
+++ b/tdehtml/css/cssstyleselector.h
@@ -50,7 +50,7 @@ namespace DOM {
     class CSSValueImpl;
 }
 
-namespace khtml
+namespace tdehtml
 {
     class CSSStyleSelectorList;
     class CSSOrderedRule;
diff --git a/khtml/css/cssvalues.c b/tdehtml/css/cssvalues.c
index 7368d1869..28ceede3d 100644
--- a/khtml/css/cssvalues.c
+++ b/tdehtml/css/cssvalues.c
@@ -597,9 +597,9 @@ findValue (register const char *str, register unsigned int len)
 #line 35 "cssvalues.gperf"
       {"small-caps", CSS_VAL_SMALL_CAPS},
 #line 122 "cssvalues.gperf"
-      {"-khtml-text", CSS_VAL__KHTML_TEXT},
+      {"-tdehtml-text", CSS_VAL__KHTML_TEXT},
 #line 141 "cssvalues.gperf"
-      {"-khtml-left", CSS_VAL__KHTML_LEFT},
+      {"-tdehtml-left", CSS_VAL__KHTML_LEFT},
 #line 97 "cssvalues.gperf"
       {"background", CSS_VAL_BACKGROUND},
 #line 178 "cssvalues.gperf"
@@ -615,9 +615,9 @@ findValue (register const char *str, register unsigned int len)
 #line 198 "cssvalues.gperf"
       {"table-caption", CSS_VAL_TABLE_CAPTION},
 #line 154 "cssvalues.gperf"
-      {"-khtml-lao", CSS_VAL__KHTML_LAO},
+      {"-tdehtml-lao", CSS_VAL__KHTML_LAO},
 #line 143 "cssvalues.gperf"
-      {"-khtml-center", CSS_VAL__KHTML_CENTER},
+      {"-tdehtml-center", CSS_VAL__KHTML_CENTER},
 #line 54 "cssvalues.gperf"
       {"x-large", CSS_VAL_X_LARGE},
 #line 30 "cssvalues.gperf"
@@ -625,29 +625,29 @@ findValue (register const char *str, register unsigned int len)
 #line 203 "cssvalues.gperf"
       {"progress", CSS_VAL_PROGRESS},
 #line 16 "cssvalues.gperf"
-      {"-khtml-native", CSS_VAL__KHTML_NATIVE},
+      {"-tdehtml-native", CSS_VAL__KHTML_NATIVE},
 #line 177 "cssvalues.gperf"
       {"hiragana", CSS_VAL_HIRAGANA},
 #line 171 "cssvalues.gperf"
       {"lower-greek", CSS_VAL_LOWER_GREEK},
 #line 150 "cssvalues.gperf"
-      {"-khtml-diamond", CSS_VAL__KHTML_DIAMOND},
+      {"-tdehtml-diamond", CSS_VAL__KHTML_DIAMOND},
 #line 224 "cssvalues.gperf"
       {"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
 #line 61 "cssvalues.gperf"
       {"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
 #line 158 "cssvalues.gperf"
-      {"-khtml-tibetan", CSS_VAL__KHTML_TIBETAN},
+      {"-tdehtml-tibetan", CSS_VAL__KHTML_TIBETAN},
 #line 124 "cssvalues.gperf"
       {"repeat-x", CSS_VAL_REPEAT_X},
 #line 266 "cssvalues.gperf"
-      {"-khtml-normal", CSS_VAL__KHTML_NORMAL},
+      {"-tdehtml-normal", CSS_VAL__KHTML_NORMAL},
 #line 113 "cssvalues.gperf"
       {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
 #line 219 "cssvalues.gperf"
       {"uppercase", CSS_VAL_UPPERCASE},
 #line 136 "cssvalues.gperf"
-      {"-khtml-auto", CSS_VAL__KHTML_AUTO},
+      {"-tdehtml-auto", CSS_VAL__KHTML_AUTO},
 #line 163 "cssvalues.gperf"
       {"georgian", CSS_VAL_GEORGIAN},
 #line 229 "cssvalues.gperf"
@@ -657,13 +657,13 @@ findValue (register const char *str, register unsigned int len)
 #line 109 "cssvalues.gperf"
       {"infobackground", CSS_VAL_INFOBACKGROUND},
 #line 157 "cssvalues.gperf"
-      {"-khtml-thai", CSS_VAL__KHTML_THAI},
+      {"-tdehtml-thai", CSS_VAL__KHTML_THAI},
 #line 226 "cssvalues.gperf"
       {"open-quote", CSS_VAL_OPEN_QUOTE},
 #line 173 "cssvalues.gperf"
       {"lower-alpha", CSS_VAL_LOWER_ALPHA},
 #line 156 "cssvalues.gperf"
-      {"-khtml-urdu", CSS_VAL__KHTML_URDU},
+      {"-tdehtml-urdu", CSS_VAL__KHTML_URDU},
 #line 223 "cssvalues.gperf"
       {"close-quote", CSS_VAL_CLOSE_QUOTE},
 #line 104 "cssvalues.gperf"
@@ -671,13 +671,13 @@ findValue (register const char *str, register unsigned int len)
 #line 225 "cssvalues.gperf"
       {"no-open-quote", CSS_VAL_NO_OPEN_QUOTE},
 #line 231 "cssvalues.gperf"
-      {"-khtml-nowrap", CSS_VAL__KHTML_NOWRAP},
+      {"-tdehtml-nowrap", CSS_VAL__KHTML_NOWRAP},
 #line 67 "cssvalues.gperf"
       {"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
 #line 105 "cssvalues.gperf"
       {"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
 #line 155 "cssvalues.gperf"
-      {"-khtml-persian", CSS_VAL__KHTML_PERSIAN},
+      {"-tdehtml-persian", CSS_VAL__KHTML_PERSIAN},
 #line 116 "cssvalues.gperf"
       {"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
 #line 96 "cssvalues.gperf"
@@ -691,13 +691,13 @@ findValue (register const char *str, register unsigned int len)
 #line 251 "cssvalues.gperf"
       {"line-through", CSS_VAL_LINE_THROUGH},
 #line 142 "cssvalues.gperf"
-      {"-khtml-right", CSS_VAL__KHTML_RIGHT},
+      {"-tdehtml-right", CSS_VAL__KHTML_RIGHT},
 #line 160 "cssvalues.gperf"
       {"upper-roman", CSS_VAL_UPPER_ROMAN},
 #line 135 "cssvalues.gperf"
-      {"-khtml-baseline-middle", CSS_VAL__KHTML_BASELINE_MIDDLE},
+      {"-tdehtml-baseline-middle", CSS_VAL__KHTML_BASELINE_MIDDLE},
 #line 153 "cssvalues.gperf"
-      {"-khtml-arabic-indic", CSS_VAL__KHTML_ARABIC_INDIC},
+      {"-tdehtml-arabic-indic", CSS_VAL__KHTML_ARABIC_INDIC},
 #line 152 "cssvalues.gperf"
       {"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
 #line 115 "cssvalues.gperf"
@@ -707,13 +707,13 @@ findValue (register const char *str, register unsigned int len)
 #line 99 "cssvalues.gperf"
       {"buttonhighlight", CSS_VAL_BUTTONHIGHLIGHT},
 #line 56 "cssvalues.gperf"
-      {"-khtml-xxx-large", CSS_VAL__KHTML_XXX_LARGE},
+      {"-tdehtml-xxx-large", CSS_VAL__KHTML_XXX_LARGE},
 #line 267 "cssvalues.gperf"
-      {"-khtml-around-floats", CSS_VAL__KHTML_AROUND_FLOATS},
+      {"-tdehtml-around-floats", CSS_VAL__KHTML_AROUND_FLOATS},
 #line 191 "cssvalues.gperf"
       {"table-row-group", CSS_VAL_TABLE_ROW_GROUP},
 #line 182 "cssvalues.gperf"
-      {"-khtml-close-quote", CSS_VAL__KHTML_CLOSE_QUOTE},
+      {"-tdehtml-close-quote", CSS_VAL__KHTML_CLOSE_QUOTE},
 #line 179 "cssvalues.gperf"
       {"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
 #line 193 "cssvalues.gperf"
@@ -723,23 +723,23 @@ findValue (register const char *str, register unsigned int len)
 #line 175 "cssvalues.gperf"
       {"upper-alpha", CSS_VAL_UPPER_ALPHA},
 #line 181 "cssvalues.gperf"
-      {"-khtml-open-quote", CSS_VAL__KHTML_OPEN_QUOTE},
+      {"-tdehtml-open-quote", CSS_VAL__KHTML_OPEN_QUOTE},
 #line 165 "cssvalues.gperf"
-      {"-khtml-japanese-formal", CSS_VAL__KHTML_JAPANESE_FORMAL},
+      {"-tdehtml-japanese-formal", CSS_VAL__KHTML_JAPANESE_FORMAL},
 #line 166 "cssvalues.gperf"
-      {"-khtml-japanese-informal", CSS_VAL__KHTML_JAPANESE_INFORMAL},
+      {"-tdehtml-japanese-informal", CSS_VAL__KHTML_JAPANESE_INFORMAL},
 #line 192 "cssvalues.gperf"
       {"table-header-group", CSS_VAL_TABLE_HEADER_GROUP},
 #line 169 "cssvalues.gperf"
-      {"-khtml-trad-chinese-formal", CSS_VAL__KHTML_TRAD_CHINESE_FORMAL},
+      {"-tdehtml-trad-chinese-formal", CSS_VAL__KHTML_TRAD_CHINESE_FORMAL},
 #line 170 "cssvalues.gperf"
-      {"-khtml-trad-chinese-informal", CSS_VAL__KHTML_TRAD_CHINESE_INFORMAL},
+      {"-tdehtml-trad-chinese-informal", CSS_VAL__KHTML_TRAD_CHINESE_INFORMAL},
 #line 167 "cssvalues.gperf"
-      {"-khtml-simp-chinese-formal", CSS_VAL__KHTML_SIMP_CHINESE_FORMAL},
+      {"-tdehtml-simp-chinese-formal", CSS_VAL__KHTML_SIMP_CHINESE_FORMAL},
 #line 168 "cssvalues.gperf"
-      {"-khtml-simp-chinese-informal", CSS_VAL__KHTML_SIMP_CHINESE_INFORMAL},
+      {"-tdehtml-simp-chinese-informal", CSS_VAL__KHTML_SIMP_CHINESE_INFORMAL},
 #line 172 "cssvalues.gperf"
-      {"-khtml-upper-greek", CSS_VAL__KHTML_UPPER_GREEK}
+      {"-tdehtml-upper-greek", CSS_VAL__KHTML_UPPER_GREEK}
     };
 
   static const short lookup[] =
@@ -1059,7 +1059,7 @@ static const char * const valueList[] = {
 "",
 "inherit", 
 "initial", 
-"-khtml-native", 
+"-tdehtml-native", 
 "none", 
 "hidden", 
 "inset", 
@@ -1099,7 +1099,7 @@ static const char * const valueList[] = {
 "large", 
 "x-large", 
 "xx-large", 
-"-khtml-xxx-large", 
+"-tdehtml-xxx-large", 
 "smaller", 
 "larger", 
 "wider", 
@@ -1165,7 +1165,7 @@ static const char * const valueList[] = {
 "windowframe", 
 "windowtext", 
 "grey", 
-"-khtml-text", 
+"-tdehtml-text", 
 "repeat", 
 "repeat-x", 
 "repeat-y", 
@@ -1178,44 +1178,44 @@ static const char * const valueList[] = {
 "text-bottom", 
 "top", 
 "bottom", 
-"-khtml-baseline-middle", 
-"-khtml-auto", 
+"-tdehtml-baseline-middle", 
+"-tdehtml-auto", 
 "left", 
 "right", 
 "center", 
 "justify", 
-"-khtml-left", 
-"-khtml-right", 
-"-khtml-center", 
+"-tdehtml-left", 
+"-tdehtml-right", 
+"-tdehtml-center", 
 "outside", 
 "inside", 
 "disc", 
 "circle", 
 "square", 
 "box", 
-"-khtml-diamond", 
+"-tdehtml-diamond", 
 "decimal", 
 "decimal-leading-zero", 
-"-khtml-arabic-indic", 
-"-khtml-lao", 
-"-khtml-persian", 
-"-khtml-urdu", 
-"-khtml-thai", 
-"-khtml-tibetan", 
+"-tdehtml-arabic-indic", 
+"-tdehtml-lao", 
+"-tdehtml-persian", 
+"-tdehtml-urdu", 
+"-tdehtml-thai", 
+"-tdehtml-tibetan", 
 "lower-roman", 
 "upper-roman", 
 "hebrew", 
 "armenian", 
 "georgian", 
 "cjk-ideographic", 
-"-khtml-japanese-formal", 
-"-khtml-japanese-informal", 
-"-khtml-simp-chinese-formal", 
-"-khtml-simp-chinese-informal", 
-"-khtml-trad-chinese-formal", 
-"-khtml-trad-chinese-informal", 
+"-tdehtml-japanese-formal", 
+"-tdehtml-japanese-informal", 
+"-tdehtml-simp-chinese-formal", 
+"-tdehtml-simp-chinese-informal", 
+"-tdehtml-trad-chinese-formal", 
+"-tdehtml-trad-chinese-informal", 
 "lower-greek", 
-"-khtml-upper-greek", 
+"-tdehtml-upper-greek", 
 "lower-alpha", 
 "lower-latin", 
 "upper-alpha", 
@@ -1224,8 +1224,8 @@ static const char * const valueList[] = {
 "katakana", 
 "hiragana-iroha", 
 "katakana-iroha", 
-"-khtml-open-quote", 
-"-khtml-close-quote", 
+"-tdehtml-open-quote", 
+"-tdehtml-close-quote", 
 "inline", 
 "block", 
 "list-item", 
@@ -1274,7 +1274,7 @@ static const char * const valueList[] = {
 "pre", 
 "pre-wrap", 
 "pre-line", 
-"-khtml-nowrap", 
+"-tdehtml-nowrap", 
 "break-word", 
 "above", 
 "absolute", 
@@ -1309,8 +1309,8 @@ static const char * const valueList[] = {
 "thick", 
 "thin", 
 "underline", 
-"-khtml-normal", 
-"-khtml-around-floats", 
+"-tdehtml-normal", 
+"-tdehtml-around-floats", 
 "border-box", 
 "content-box", 
 "enabled", 
diff --git a/khtml/css/cssvalues.h b/tdehtml/css/cssvalues.h
index 36a365754..36a365754 100644
--- a/khtml/css/cssvalues.h
+++ b/tdehtml/css/cssvalues.h
diff --git a/khtml/css/cssvalues.in b/tdehtml/css/cssvalues.in
index 1ad99c38d..b85d49f17 100644
--- a/khtml/css/cssvalues.in
+++ b/tdehtml/css/cssvalues.in
@@ -16,7 +16,7 @@ initial
 # CSS_PROP_BORDER_TOP_STYLE
 # CSS_PROP_BORDER_BOTTOM_STYLE
 # CSS_PROP_BORDER_LEFT_STYLE
--khtml-native
+-tdehtml-native
 none
 hidden
 inset
@@ -73,7 +73,7 @@ medium
 large
 x-large
 xx-large
--khtml-xxx-large
+-tdehtml-xxx-large
 smaller
 larger
 #
@@ -156,7 +156,7 @@ windowtext
 #
 # colors in non strict mode
 grey
--khtml-text
+-tdehtml-text
 #
 # CSS_PROP_BACKGROUND_REPEAT:
 #
@@ -176,18 +176,18 @@ text-bottom
 top
 bottom
 # HTML alignment MIDDLE has no corresponding CSS alignment
--khtml-baseline-middle
+-tdehtml-baseline-middle
 #
 # CSS_PROP_TEXT_ALIGN:
 #
--khtml-auto
+-tdehtml-auto
 left
 right
 center
 justify
--khtml-left
--khtml-right
--khtml-center
+-tdehtml-left
+-tdehtml-right
+-tdehtml-center
 #
 # CSS_PROP_LIST_STYLE_POSITION:
 #
@@ -200,29 +200,29 @@ disc
 circle
 square
 box
--khtml-diamond
+-tdehtml-diamond
 decimal
 decimal-leading-zero
--khtml-arabic-indic
--khtml-lao
--khtml-persian
--khtml-urdu
--khtml-thai
--khtml-tibetan
+-tdehtml-arabic-indic
+-tdehtml-lao
+-tdehtml-persian
+-tdehtml-urdu
+-tdehtml-thai
+-tdehtml-tibetan
 lower-roman
 upper-roman
 hebrew
 armenian
 georgian
 cjk-ideographic
--khtml-japanese-formal
--khtml-japanese-informal
--khtml-simp-chinese-formal
--khtml-simp-chinese-informal
--khtml-trad-chinese-formal
--khtml-trad-chinese-informal
+-tdehtml-japanese-formal
+-tdehtml-japanese-informal
+-tdehtml-simp-chinese-formal
+-tdehtml-simp-chinese-informal
+-tdehtml-trad-chinese-formal
+-tdehtml-trad-chinese-informal
 lower-greek
--khtml-upper-greek
+-tdehtml-upper-greek
 lower-alpha
 lower-latin
 upper-alpha
@@ -231,8 +231,8 @@ hiragana
 katakana
 hiragana-iroha
 katakana-iroha
--khtml-open-quote
--khtml-close-quote
+-tdehtml-open-quote
+-tdehtml-close-quote
 #none
 #
 # CSS_PROP_DISPLAY:
@@ -307,7 +307,7 @@ nowrap
 pre
 pre-wrap
 pre-line
--khtml-nowrap
+-tdehtml-nowrap
 #
 # CSS_PROP_WORD_WRAP
 #
@@ -351,8 +351,8 @@ thin
 underline
 #
 # CSS_PROP__KHTML_FLOW_MODE
--khtml-normal
--khtml-around-floats
+-tdehtml-normal
+-tdehtml-around-floats
 
 # CSS3 Values
 # CSS_PROP__KHTML_BOX_SIZING
diff --git a/khtml/css/html4.css b/tdehtml/css/html4.css
index c3fd1a347..ffd599601 100644
--- a/khtml/css/html4.css
+++ b/tdehtml/css/html4.css
@@ -1,8 +1,8 @@
 /*
- * The default style sheet used by khtml to render HTML pages
+ * The default style sheet used by tdehtml to render HTML pages
  * (C) 2000-2003 Lars Knoll (knoll@kde.org)
  *
- * Konqueror/khtml relies on the existence of this style sheet for
+ * Konqueror/tdehtml relies on the existence of this style sheet for
  * rendering. Do not remove or modify this file unless you know
  * what you are doing.
  */
@@ -11,7 +11,7 @@
 
 html {
 	display: block;
-	color: -khtml-text;
+	color: -tdehtml-text;
 }
 
 /*
@@ -99,7 +99,7 @@ q:after  {
 center {
 	display: block;
 	/* special centering to be able to emulate the html4/netscape behavior */
-	text-align: -khtml-center;
+	text-align: -tdehtml-center;
 }
 
 hr  {
@@ -107,7 +107,7 @@ hr  {
         margin: 12px auto;
         border-style: inset;
         border-width: 1px;
-        -khtml-flow-mode: -khtml-around-floats
+        -tdehtml-flow-mode: -tdehtml-around-floats
 }
 
 map {
@@ -171,7 +171,7 @@ table {
 	display: table;
 	border-collapse: separate;
 	border-spacing: 2px;
-        -khtml-flow-mode: -khtml-around-floats;
+        -tdehtml-flow-mode: -tdehtml-around-floats;
         box-sizing: border-box;
 }
 
@@ -181,11 +181,11 @@ table[align="center"] {
 }
 
 table[align="left"] {
-	float: -khtml-left;
+	float: -tdehtml-left;
 }
 
 table[align="right"] {
-	float: -khtml-right;
+	float: -tdehtml-right;
 }
 
 thead {
@@ -232,7 +232,7 @@ th {
 
 caption {
 	display: table-caption;
-	text-align: -khtml-center;
+	text-align: -tdehtml-center;
 }
 
 /*
@@ -243,19 +243,19 @@ ul, menu, dir {
         display: block;
         list-style-type: disc;
         margin: 1__qem 0 1em 0;
-        -khtml-padding-start: 40px
+        -tdehtml-padding-start: 40px
 }
 
 ol {
         display: block;
         list-style-type: decimal;
         margin: 1__qem 0 1em 0;
-        -khtml-padding-start: 40px
+        -tdehtml-padding-start: 40px
 }
 
 li {
         display: list-item;
-        -khtml-flow-mode: -khtml-around-floats;
+        -tdehtml-flow-mode: -tdehtml-around-floats;
 }
 
 
@@ -273,7 +273,7 @@ dd {
 }
 
 dl > dd {
-	-khtml-margin-start: 40px;
+	-tdehtml-margin-start: 40px;
 }
 
 dl {
@@ -329,7 +329,7 @@ fieldset {
         padding: 0.75em 0.625em;
 	margin: 1.0em 0;
         border: 2px groove threedface;
-        -khtml-flow-mode: -khtml-around-floats
+        -tdehtml-flow-mode: -tdehtml-around-floats
 }
 
 button {
@@ -346,7 +346,7 @@ button:active {
 }
 
 input, textarea {
-        text-align: -khtml-auto;
+        text-align: -tdehtml-auto;
 }
 
 input, textarea, select, button {
@@ -357,7 +357,7 @@ input, textarea, select, button {
 input { color: windowtext;
         font-family: sans-serif;
         font-size: small;
-        border: 2px -khtml-native;
+        border: 2px -tdehtml-native;
 }
 
 input[type="hidden"] {
@@ -396,7 +396,7 @@ select {
 textarea {
         color: windowtext;
         font-family: monospace;
-        border: 2px -khtml-native;
+        border: 2px -tdehtml-native;
 }
 
 /*
diff --git a/khtml/css/makeprop b/tdehtml/css/makeprop
index a1a30ac97..a1a30ac97 100644
--- a/khtml/css/makeprop
+++ b/tdehtml/css/makeprop
diff --git a/khtml/css/makevalues b/tdehtml/css/makevalues
index 0f81f1612..0f81f1612 100755
--- a/khtml/css/makevalues
+++ b/tdehtml/css/makevalues
diff --git a/khtml/css/parser.cpp b/tdehtml/css/parser.cpp
index 8b2e008d8..f88b7d002 100644
--- a/khtml/css/parser.cpp
+++ b/tdehtml/css/parser.cpp
@@ -594,8 +594,8 @@ static const char *const yytname[] =
   "RADS", "GRADS", "MSECS", "SECS", "HERZ", "KHERZ", "DIMEN", "PERCENTAGE",
   "FLOAT", "INTEGER", "URI", "FUNCTION", "NOTFUNCTION", "UNICODERANGE",
   "'{'", "'}'", "';'", "','", "'+'", "'~'", "'>'", "'-'", "']'", "'='",
-  "')'", "'/'", "'@'", "$accept", "stylesheet", "khtml_rule",
-  "khtml_decls", "khtml_value", "maybe_space", "maybe_sgml",
+  "')'", "'/'", "'@'", "$accept", "stylesheet", "tdehtml_rule",
+  "tdehtml_decls", "tdehtml_value", "maybe_space", "maybe_sgml",
   "maybe_charset", "import_list", "import", "namespace_list", "namespace",
   "maybe_ns_prefix", "rule_list", "rule", "string_or_uri",
   "maybe_media_list", "media_list", "media", "ruleset_list", "medium",
@@ -1869,7 +1869,7 @@ yyreduce:
 	    yyvsp[0].selector->print();
 #endif
 	    yyval.selectorList->append( yyvsp[0].selector );
-	    khtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), yyvsp[0].selector);
+	    tdehtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), yyvsp[0].selector);
 	} else {
 	    yyval.selectorList = 0;
 	}
@@ -1882,7 +1882,7 @@ yyreduce:
 	if ( yyvsp[-3].selectorList && yyvsp[0].selector ) {
 	    yyval.selectorList = yyvsp[-3].selectorList;
 	    yyval.selectorList->append( yyvsp[0].selector );
-	    khtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), yyvsp[0].selector);
+	    tdehtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), yyvsp[0].selector);
 #ifdef CSS_DEBUG
 	    kdDebug( 6080 ) << "   got simple selector:" << endl;
 	    yyvsp[0].selector->print();
@@ -2026,7 +2026,7 @@ yyreduce:
 	    const DOMString dtag(tag);
             yyval.element = makeId(p->defaultNamespace(), doc->getId(NodeImpl::ElementId, dtag.implementation(), false, true));
 	} else {
-	    yyval.element = makeId(p->defaultNamespace(), khtml::getTagID(tag.lower().ascii(), tag.length()));
+	    yyval.element = makeId(p->defaultNamespace(), tdehtml::getTagID(tag.lower().ascii(), tag.length()));
 	    // this case should never happen - only when loading
 	    // the default stylesheet - which must not contain unknown tags
 // 	    assert($$ != 0);
@@ -2108,7 +2108,7 @@ yyreduce:
 	    yyval.attribute = doc->getId(NodeImpl::AttributeId, dattr.implementation(), false, true);
 #endif
 	} else {
-	    yyval.attribute = khtml::getAttrID(attr.lower().ascii(), attr.length());
+	    yyval.attribute = tdehtml::getAttrID(attr.lower().ascii(), attr.length());
 	    // this case should never happen - only when loading
 	    // the default stylesheet - which must not contain unknown attributes
 	    assert(yyval.attribute != 0);
diff --git a/khtml/css/parser.h b/tdehtml/css/parser.h
index e3375db66..e3375db66 100644
--- a/khtml/css/parser.h
+++ b/tdehtml/css/parser.h
diff --git a/khtml/css/parser.y b/tdehtml/css/parser.y
index 33e6fd730..bb6f915f9 100644
--- a/khtml/css/parser.y
+++ b/tdehtml/css/parser.y
@@ -255,25 +255,25 @@ static int cssyylex( YYSTYPE *yylval ) {
 
 stylesheet:
     maybe_charset maybe_sgml import_list namespace_list rule_list
-  | khtml_rule maybe_space
-  | khtml_decls maybe_space
-  | khtml_value maybe_space
+  | tdehtml_rule maybe_space
+  | tdehtml_decls maybe_space
+  | tdehtml_value maybe_space
   ;
 
-khtml_rule:
+tdehtml_rule:
     KHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
         CSSParser *p = static_cast<CSSParser *>(parser);
 	p->rule = $4;
     }
 ;
 
-khtml_decls:
+tdehtml_decls:
     KHTML_DECLS_SYM declaration_block {
 	/* can be empty */
     }
 ;
 
-khtml_value:
+tdehtml_value:
     KHTML_VALUE_SYM '{' maybe_space expr '}' {
 	CSSParser *p = static_cast<CSSParser *>(parser);
 	if ( $4 ) {
@@ -532,7 +532,7 @@ selector_list:
 	    $1->print();
 #endif
 	    $$->append( $1 );
-	    khtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), $1);
+	    tdehtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), $1);
 	} else {
 	    $$ = 0;
 	}
@@ -541,7 +541,7 @@ selector_list:
 	if ( $1 && $4 ) {
 	    $$ = $1;
 	    $$->append( $4 );
-	    khtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), $4);
+	    tdehtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), $4);
 #ifdef CSS_DEBUG
 	    kdDebug( 6080 ) << "   got simple selector:" << endl;
 	    $4->print();
@@ -641,7 +641,7 @@ element_name:
 	    const DOMString dtag(tag);
             $$ = makeId(p->defaultNamespace(), doc->getId(NodeImpl::ElementId, dtag.implementation(), false, true));
 	} else {
-	    $$ = makeId(p->defaultNamespace(), khtml::getTagID(tag.lower().ascii(), tag.length()));
+	    $$ = makeId(p->defaultNamespace(), tdehtml::getTagID(tag.lower().ascii(), tag.length()));
 	    // this case should never happen - only when loading
 	    // the default stylesheet - which must not contain unknown tags
 // 	    assert($$ != 0);
@@ -710,7 +710,7 @@ attrib_id:
 	    $$ = doc->getId(NodeImpl::AttributeId, dattr.implementation(), false, true);
 #endif
 	} else {
-	    $$ = khtml::getAttrID(attr.lower().ascii(), attr.length());
+	    $$ = tdehtml::getAttrID(attr.lower().ascii(), attr.length());
 	    // this case should never happen - only when loading
 	    // the default stylesheet - which must not contain unknown attributes
 	    assert($$ != 0);
diff --git a/khtml/css/quirks.css b/tdehtml/css/quirks.css
index 6a02ee0bd..b979b77c9 100644
--- a/khtml/css/quirks.css
+++ b/tdehtml/css/quirks.css
@@ -1,8 +1,8 @@
 /*
- * This style sheet is used by khtml to render HTML pages in quirks mode
+ * This style sheet is used by tdehtml to render HTML pages in quirks mode
  * (C) 2000-2003 Lars Knoll (knoll@kde.org)
  *
- * Konqueror/khtml relies on the existence of this style sheet for
+ * Konqueror/tdehtml relies on the existence of this style sheet for
  * rendering. Do not remove or modify this file unless you know
  * what you are doing.
  */
@@ -21,10 +21,10 @@ img[align="right"] {
 table {
     white-space: normal;
     line-height: normal;
-    color: -khtml-text;
+    color: -tdehtml-text;
     font-size: medium;
     empty-cells: hide;
-    text-align: -khtml-auto;
+    text-align: -tdehtml-auto;
     font-weight: initial;
 }
 
diff --git a/khtml/css/tokenizer.cpp b/tdehtml/css/tokenizer.cpp
index 493a98032..493a98032 100644
--- a/khtml/css/tokenizer.cpp
+++ b/tdehtml/css/tokenizer.cpp
diff --git a/khtml/css/tokenizer.flex b/tdehtml/css/tokenizer.flex
index 3c24d8e07..76fcadb7c 100644
--- a/khtml/css/tokenizer.flex
+++ b/tdehtml/css/tokenizer.flex
@@ -50,9 +50,9 @@ nth             (-?[0-9]*n[\+-][0-9]+)|(-?[0-9]*n)
 "@font-face"            {yyTok = FONT_FACE_SYM; return yyTok;}
 "@charset"              {yyTok = CHARSET_SYM; return yyTok;}
 "@namespace"		{yyTok = NAMESPACE_SYM; return yyTok; }
-"@-khtml-rule"    {yyTok = KHTML_RULE_SYM; return yyTok; }
-"@-khtml-decls"   {yyTok = KHTML_DECLS_SYM; return yyTok; }
-"@-khtml-value"   {yyTok = KHTML_VALUE_SYM; return yyTok; }
+"@-tdehtml-rule"    {yyTok = KHTML_RULE_SYM; return yyTok; }
+"@-tdehtml-decls"   {yyTok = KHTML_DECLS_SYM; return yyTok; }
+"@-tdehtml-value"   {yyTok = KHTML_VALUE_SYM; return yyTok; }
 
 "!"{w}"important"         {yyTok = IMPORTANT_SYM; return yyTok;}
 
diff --git a/khtml/design.h b/tdehtml/design.h
index 5f54c3137..86dbec911 100644
--- a/khtml/design.h
+++ b/tdehtml/design.h
@@ -37,10 +37,10 @@
  * browsing, you can also use the KTextBrowser widget in tdeui.
  *
  * KHTMLPart :
- *   The main part/widget for using khtml.
+ *   The main part/widget for using tdehtml.
  *
  * DOM :
- *   The dom implementation used in khtml.
+ *   The dom implementation used in tdehtml.
  *
  */
 
diff --git a/khtml/dom/CMakeLists.txt b/tdehtml/dom/CMakeLists.txt
index 83dd88c5c..dd637f7bd 100644
--- a/khtml/dom/CMakeLists.txt
+++ b/tdehtml/dom/CMakeLists.txt
@@ -16,7 +16,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/kio
 )
@@ -38,9 +38,9 @@ install( FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}/dom )
 
 
-##### khtmldom-static ############################
+##### tdehtmldom-static ############################
 
-set( target khtmldom )
+set( target tdehtmldom )
 
 set( ${target}_SRCS
   dom_misc.cpp html_block.cpp html_inline.cpp css_rule.cpp
diff --git a/khtml/dom/Makefile.am b/tdehtml/dom/Makefile.am
index cb8b1de8c..6a33de62d 100644
--- a/khtml/dom/Makefile.am
+++ b/tdehtml/dom/Makefile.am
@@ -19,8 +19,8 @@
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(WOVERLOADED_VIRTUAL)
 
-noinst_LTLIBRARIES = libkhtmldom.la
-libkhtmldom_la_SOURCES = \
+noinst_LTLIBRARIES = libtdehtmldom.la
+libtdehtmldom_la_SOURCES = \
 	dom_misc.cpp        html_block.cpp      html_inline.cpp \
 	css_rule.cpp        dom_node.cpp        html_document.cpp   html_list.cpp \
 	css_stylesheet.cpp  dom_string.cpp      html_element.cpp    html_misc.cpp \
@@ -31,7 +31,7 @@ libkhtmldom_la_SOURCES = \
 	dom2_views.cpp
 #	css_extensions.cpp
 
-libkhtmldom_la_METASOURCES = AUTO
+libtdehtmldom_la_METASOURCES = AUTO
 
 myincludedir = $(includedir)/dom
 myinclude_HEADERS = \
@@ -47,9 +47,9 @@ myinclude_HEADERS = \
 #	css_extensions.h
 
 INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
- -I$(top_srcdir)/khtml -I$(top_srcdir) $(all_includes)
+ -I$(top_srcdir)/tdehtml -I$(top_srcdir) $(all_includes)
 
-SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
 
 ## generate lib documentation
 srcdoc:
diff --git a/khtml/dom/css_extensions.cpp b/tdehtml/dom/css_extensions.cpp
index 23f7739dc..23f7739dc 100644
--- a/khtml/dom/css_extensions.cpp
+++ b/tdehtml/dom/css_extensions.cpp
diff --git a/khtml/dom/css_extensions.h b/tdehtml/dom/css_extensions.h
index a6cdb2149..a6cdb2149 100644
--- a/khtml/dom/css_extensions.h
+++ b/tdehtml/dom/css_extensions.h
diff --git a/khtml/dom/css_rule.cpp b/tdehtml/dom/css_rule.cpp
index e73ff493a..e73ff493a 100644
--- a/khtml/dom/css_rule.cpp
+++ b/tdehtml/dom/css_rule.cpp
diff --git a/khtml/dom/css_rule.h b/tdehtml/dom/css_rule.h
index 5f27e8f8a..5f27e8f8a 100644
--- a/khtml/dom/css_rule.h
+++ b/tdehtml/dom/css_rule.h
diff --git a/khtml/dom/css_stylesheet.cpp b/tdehtml/dom/css_stylesheet.cpp
index ab5ce1451..ab5ce1451 100644
--- a/khtml/dom/css_stylesheet.cpp
+++ b/tdehtml/dom/css_stylesheet.cpp
diff --git a/khtml/dom/css_stylesheet.h b/tdehtml/dom/css_stylesheet.h
index d220ffa76..d220ffa76 100644
--- a/khtml/dom/css_stylesheet.h
+++ b/tdehtml/dom/css_stylesheet.h
diff --git a/khtml/dom/css_value.cpp b/tdehtml/dom/css_value.cpp
index 90d1b1570..4e365644a 100644
--- a/khtml/dom/css_value.cpp
+++ b/tdehtml/dom/css_value.cpp
@@ -453,7 +453,7 @@ DOMString Counter::identifier() const
 DOMString Counter::listStyle() const
 {
   if (!impl) return DOMString();
-  return khtml::stringForListStyleType((khtml::EListStyleType)impl->listStyle());
+  return tdehtml::stringForListStyleType((tdehtml::EListStyleType)impl->listStyle());
 }
 
 DOMString Counter::separator() const
diff --git a/khtml/dom/css_value.h b/tdehtml/dom/css_value.h
index 5d4a043c7..5d4a043c7 100644
--- a/khtml/dom/css_value.h
+++ b/tdehtml/dom/css_value.h
diff --git a/khtml/dom/dom2_events.cpp b/tdehtml/dom/dom2_events.cpp
index 898a73bc3..898a73bc3 100644
--- a/khtml/dom/dom2_events.cpp
+++ b/tdehtml/dom/dom2_events.cpp
diff --git a/khtml/dom/dom2_events.h b/tdehtml/dom/dom2_events.h
index 285a0c10e..285a0c10e 100644
--- a/khtml/dom/dom2_events.h
+++ b/tdehtml/dom/dom2_events.h
diff --git a/khtml/dom/dom2_range.cpp b/tdehtml/dom/dom2_range.cpp
index 87bdab145..87bdab145 100644
--- a/khtml/dom/dom2_range.cpp
+++ b/tdehtml/dom/dom2_range.cpp
diff --git a/khtml/dom/dom2_range.h b/tdehtml/dom/dom2_range.h
index 290f4f48c..290f4f48c 100644
--- a/khtml/dom/dom2_range.h
+++ b/tdehtml/dom/dom2_range.h
diff --git a/khtml/dom/dom2_traversal.cpp b/tdehtml/dom/dom2_traversal.cpp
index c0a09435b..c0a09435b 100644
--- a/khtml/dom/dom2_traversal.cpp
+++ b/tdehtml/dom/dom2_traversal.cpp
diff --git a/khtml/dom/dom2_traversal.h b/tdehtml/dom/dom2_traversal.h
index ea3d3521b..ea3d3521b 100644
--- a/khtml/dom/dom2_traversal.h
+++ b/tdehtml/dom/dom2_traversal.h
diff --git a/khtml/dom/dom2_views.cpp b/tdehtml/dom/dom2_views.cpp
index 11b07fbb0..11b07fbb0 100644
--- a/khtml/dom/dom2_views.cpp
+++ b/tdehtml/dom/dom2_views.cpp
diff --git a/khtml/dom/dom2_views.h b/tdehtml/dom/dom2_views.h
index 6f326aaa3..6f326aaa3 100644
--- a/khtml/dom/dom2_views.h
+++ b/tdehtml/dom/dom2_views.h
diff --git a/khtml/dom/dom_core.h b/tdehtml/dom/dom_core.h
index c3c8f2893..c3c8f2893 100644
--- a/khtml/dom/dom_core.h
+++ b/tdehtml/dom/dom_core.h
diff --git a/khtml/dom/dom_doc.cpp b/tdehtml/dom/dom_doc.cpp
index 0ff123444..0ff123444 100644
--- a/khtml/dom/dom_doc.cpp
+++ b/tdehtml/dom/dom_doc.cpp
diff --git a/khtml/dom/dom_doc.h b/tdehtml/dom/dom_doc.h
index 9a5331295..9a5331295 100644
--- a/khtml/dom/dom_doc.h
+++ b/tdehtml/dom/dom_doc.h
diff --git a/khtml/dom/dom_element.cpp b/tdehtml/dom/dom_element.cpp
index 54c322e25..d9872e37c 100644
--- a/khtml/dom/dom_element.cpp
+++ b/tdehtml/dom/dom_element.cpp
@@ -147,7 +147,7 @@ DOMString Element::tagName() const
 DOMString Element::getAttribute( const DOMString &name )
 {
     // ### getAttribute() and getAttributeNS() are supposed to return the empty string if the attribute
-    // does not exist. However, there are a number of places around khtml that expect a null string
+    // does not exist. However, there are a number of places around tdehtml that expect a null string
     // for nonexistent attributes. These need to be changed to use hasAttribute() instead.
     if (!impl) throw DOMException(DOMException::NOT_FOUND_ERR);
     if (!name.implementation()) throw DOMException(DOMException::NOT_FOUND_ERR);
@@ -364,7 +364,7 @@ void Element::setContentEditable(bool enabled) {
     static_cast<ElementImpl *>(impl)->setContentEditable(enabled);
 }
 
-bool Element::khtmlValidAttrName(const DOMString &name)
+bool Element::tdehtmlValidAttrName(const DOMString &name)
 {
     // Check if name is valid
     // http://www.w3.org/TR/2000/REC-xml-20001006#NT-Name
@@ -384,25 +384,25 @@ bool Element::khtmlValidAttrName(const DOMString &name)
     return true;
 }
 
-bool Element::khtmlValidPrefix(const DOMString &name)
+bool Element::tdehtmlValidPrefix(const DOMString &name)
 {
-    // Null prefix is ok. If not null, reuse code from khtmlValidAttrName
-    return !name.implementation() || khtmlValidAttrName(name);
+    // Null prefix is ok. If not null, reuse code from tdehtmlValidAttrName
+    return !name.implementation() || tdehtmlValidAttrName(name);
 }
 
-bool Element::khtmlValidQualifiedName(const DOMString &name)
+bool Element::tdehtmlValidQualifiedName(const DOMString &name)
 {
-    return khtmlValidAttrName(name);
+    return tdehtmlValidAttrName(name);
 }
 
-bool Element::khtmlMalformedQualifiedName(const DOMString &name)
+bool Element::tdehtmlMalformedQualifiedName(const DOMString &name)
 {
     // #### Not clearly defined in the DOM spec...
     // But we know for sure that a null qualified name is malformed
     return name.isNull();
 }
 
-bool Element::khtmlMalformedPrefix(const DOMString &/*name*/)
+bool Element::tdehtmlMalformedPrefix(const DOMString &/*name*/)
 {
     // ####
     return false;
diff --git a/khtml/dom/dom_element.h b/tdehtml/dom/dom_element.h
index 5a5f2986b..d3313628e 100644
--- a/khtml/dom/dom_element.h
+++ b/tdehtml/dom/dom_element.h
@@ -586,12 +586,12 @@ public:
      */
     Element form() const;
 
-    static bool khtmlValidAttrName(const DOMString &name);
-    static bool khtmlValidPrefix(const DOMString &name);
-    static bool khtmlValidQualifiedName(const DOMString &name);
+    static bool tdehtmlValidAttrName(const DOMString &name);
+    static bool tdehtmlValidPrefix(const DOMString &name);
+    static bool tdehtmlValidQualifiedName(const DOMString &name);
 
-    static bool khtmlMalformedQualifiedName(const DOMString &name);
-    static bool khtmlMalformedPrefix(const DOMString &name);
+    static bool tdehtmlMalformedQualifiedName(const DOMString &name);
+    static bool tdehtmlMalformedPrefix(const DOMString &name);
 protected:
     Element(ElementImpl *_impl);
 };
diff --git a/khtml/dom/dom_exception.h b/tdehtml/dom/dom_exception.h
index cef032206..cef032206 100644
--- a/khtml/dom/dom_exception.h
+++ b/tdehtml/dom/dom_exception.h
diff --git a/khtml/dom/dom_html.h b/tdehtml/dom/dom_html.h
index f8aa02e99..f8aa02e99 100644
--- a/khtml/dom/dom_html.h
+++ b/tdehtml/dom/dom_html.h
diff --git a/khtml/dom/dom_misc.cpp b/tdehtml/dom/dom_misc.cpp
index d296b954a..d296b954a 100644
--- a/khtml/dom/dom_misc.cpp
+++ b/tdehtml/dom/dom_misc.cpp
diff --git a/khtml/dom/dom_misc.h b/tdehtml/dom/dom_misc.h
index 4cded0f00..4cded0f00 100644
--- a/khtml/dom/dom_misc.h
+++ b/tdehtml/dom/dom_misc.h
diff --git a/khtml/dom/dom_node.cpp b/tdehtml/dom/dom_node.cpp
index 9971bdb00..9971bdb00 100644
--- a/khtml/dom/dom_node.cpp
+++ b/tdehtml/dom/dom_node.cpp
diff --git a/khtml/dom/dom_node.h b/tdehtml/dom/dom_node.h
index 594aa5e3e..594aa5e3e 100644
--- a/khtml/dom/dom_node.h
+++ b/tdehtml/dom/dom_node.h
diff --git a/khtml/dom/dom_string.cpp b/tdehtml/dom/dom_string.cpp
index 14bdc2613..14bdc2613 100644
--- a/khtml/dom/dom_string.cpp
+++ b/tdehtml/dom/dom_string.cpp
diff --git a/khtml/dom/dom_string.h b/tdehtml/dom/dom_string.h
index 3d4706b5a..3d4706b5a 100644
--- a/khtml/dom/dom_string.h
+++ b/tdehtml/dom/dom_string.h
diff --git a/khtml/dom/dom_text.cpp b/tdehtml/dom/dom_text.cpp
index af4584410..af4584410 100644
--- a/khtml/dom/dom_text.cpp
+++ b/tdehtml/dom/dom_text.cpp
diff --git a/khtml/dom/dom_text.h b/tdehtml/dom/dom_text.h
index c6f92fb1d..c6f92fb1d 100644
--- a/khtml/dom/dom_text.h
+++ b/tdehtml/dom/dom_text.h
diff --git a/khtml/dom/dom_xml.cpp b/tdehtml/dom/dom_xml.cpp
index 524bbe218..524bbe218 100644
--- a/khtml/dom/dom_xml.cpp
+++ b/tdehtml/dom/dom_xml.cpp
diff --git a/khtml/dom/dom_xml.h b/tdehtml/dom/dom_xml.h
index 12e70d9e5..12e70d9e5 100644
--- a/khtml/dom/dom_xml.h
+++ b/tdehtml/dom/dom_xml.h
diff --git a/khtml/dom/html_base.cpp b/tdehtml/dom/html_base.cpp
index e35fdaa0a..e35fdaa0a 100644
--- a/khtml/dom/html_base.cpp
+++ b/tdehtml/dom/html_base.cpp
diff --git a/khtml/dom/html_base.h b/tdehtml/dom/html_base.h
index c7ed878ce..c7ed878ce 100644
--- a/khtml/dom/html_base.h
+++ b/tdehtml/dom/html_base.h
diff --git a/khtml/dom/html_block.cpp b/tdehtml/dom/html_block.cpp
index 9e499adb0..9e499adb0 100644
--- a/khtml/dom/html_block.cpp
+++ b/tdehtml/dom/html_block.cpp
diff --git a/khtml/dom/html_block.h b/tdehtml/dom/html_block.h
index 4283bafa2..4283bafa2 100644
--- a/khtml/dom/html_block.h
+++ b/tdehtml/dom/html_block.h
diff --git a/khtml/dom/html_document.cpp b/tdehtml/dom/html_document.cpp
index c9a6c2541..c24bf65f7 100644
--- a/khtml/dom/html_document.cpp
+++ b/tdehtml/dom/html_document.cpp
@@ -102,7 +102,7 @@ DOMString HTMLDocument::referrer() const
 DOMString HTMLDocument::completeURL(const DOMString& str) const
 {
     if(!impl) return str;
-    DOMString parsed = khtml::parseURL(str);
+    DOMString parsed = tdehtml::parseURL(str);
     return ((HTMLDocumentImpl *)impl)->completeURL(parsed.string());
 }
 
diff --git a/khtml/dom/html_document.h b/tdehtml/dom/html_document.h
index aa53de96c..aa53de96c 100644
--- a/khtml/dom/html_document.h
+++ b/tdehtml/dom/html_document.h
diff --git a/khtml/dom/html_element.cpp b/tdehtml/dom/html_element.cpp
index 0063985ea..0063985ea 100644
--- a/khtml/dom/html_element.cpp
+++ b/tdehtml/dom/html_element.cpp
diff --git a/khtml/dom/html_element.h b/tdehtml/dom/html_element.h
index 1329793b2..1329793b2 100644
--- a/khtml/dom/html_element.h
+++ b/tdehtml/dom/html_element.h
diff --git a/khtml/dom/html_form.cpp b/tdehtml/dom/html_form.cpp
index 5d9aec633..5d9aec633 100644
--- a/khtml/dom/html_form.cpp
+++ b/tdehtml/dom/html_form.cpp
diff --git a/khtml/dom/html_form.h b/tdehtml/dom/html_form.h
index 0623e421b..0623e421b 100644
--- a/khtml/dom/html_form.h
+++ b/tdehtml/dom/html_form.h
diff --git a/khtml/dom/html_head.cpp b/tdehtml/dom/html_head.cpp
index e5e72e73b..e5e72e73b 100644
--- a/khtml/dom/html_head.cpp
+++ b/tdehtml/dom/html_head.cpp
diff --git a/khtml/dom/html_head.h b/tdehtml/dom/html_head.h
index e8dc52d21..e8dc52d21 100644
--- a/khtml/dom/html_head.h
+++ b/tdehtml/dom/html_head.h
diff --git a/khtml/dom/html_image.cpp b/tdehtml/dom/html_image.cpp
index f7c9dac26..f7c9dac26 100644
--- a/khtml/dom/html_image.cpp
+++ b/tdehtml/dom/html_image.cpp
diff --git a/khtml/dom/html_image.h b/tdehtml/dom/html_image.h
index 9f30aaa14..9f30aaa14 100644
--- a/khtml/dom/html_image.h
+++ b/tdehtml/dom/html_image.h
diff --git a/khtml/dom/html_inline.cpp b/tdehtml/dom/html_inline.cpp
index 568761685..568761685 100644
--- a/khtml/dom/html_inline.cpp
+++ b/tdehtml/dom/html_inline.cpp
diff --git a/khtml/dom/html_inline.h b/tdehtml/dom/html_inline.h
index f92ed6917..f92ed6917 100644
--- a/khtml/dom/html_inline.h
+++ b/tdehtml/dom/html_inline.h
diff --git a/khtml/dom/html_list.cpp b/tdehtml/dom/html_list.cpp
index 8d66fe3fc..8d66fe3fc 100644
--- a/khtml/dom/html_list.cpp
+++ b/tdehtml/dom/html_list.cpp
diff --git a/khtml/dom/html_list.h b/tdehtml/dom/html_list.h
index 34c081cb5..34c081cb5 100644
--- a/khtml/dom/html_list.h
+++ b/tdehtml/dom/html_list.h
diff --git a/khtml/dom/html_misc.cpp b/tdehtml/dom/html_misc.cpp
index fb975b7cf..fb975b7cf 100644
--- a/khtml/dom/html_misc.cpp
+++ b/tdehtml/dom/html_misc.cpp
diff --git a/khtml/dom/html_misc.h b/tdehtml/dom/html_misc.h
index 643e5caf6..643e5caf6 100644
--- a/khtml/dom/html_misc.h
+++ b/tdehtml/dom/html_misc.h
diff --git a/khtml/dom/html_object.cpp b/tdehtml/dom/html_object.cpp
index 65ec2f34e..65ec2f34e 100644
--- a/khtml/dom/html_object.cpp
+++ b/tdehtml/dom/html_object.cpp
diff --git a/khtml/dom/html_object.h b/tdehtml/dom/html_object.h
index 9195a40f7..9195a40f7 100644
--- a/khtml/dom/html_object.h
+++ b/tdehtml/dom/html_object.h
diff --git a/khtml/dom/html_table.cpp b/tdehtml/dom/html_table.cpp
index b42c4fcd1..b42c4fcd1 100644
--- a/khtml/dom/html_table.cpp
+++ b/tdehtml/dom/html_table.cpp
diff --git a/khtml/dom/html_table.h b/tdehtml/dom/html_table.h
index 6b9a2d99d..6b9a2d99d 100644
--- a/khtml/dom/html_table.h
+++ b/tdehtml/dom/html_table.h
diff --git a/khtml/domtreeview.cpp b/tdehtml/domtreeview.cpp
index 61697a9f3..7482c7b81 100644
--- a/khtml/domtreeview.cpp
+++ b/tdehtml/domtreeview.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "khtml_part.h"
+#include "tdehtml_part.h"
 #include "domtreeview.moc"
 #include "xml/dom_nodeimpl.h"
 
diff --git a/khtml/domtreeview.h b/tdehtml/domtreeview.h
index ef3d45c44..ef3d45c44 100644
--- a/khtml/domtreeview.h
+++ b/tdehtml/domtreeview.h
diff --git a/khtml/ecma/AUTHORS b/tdehtml/ecma/AUTHORS
index 2a129330d..2a129330d 100644
--- a/khtml/ecma/AUTHORS
+++ b/tdehtml/ecma/AUTHORS
diff --git a/khtml/ecma/CMakeLists.txt b/tdehtml/ecma/CMakeLists.txt
index 77457436b..eddd99f1e 100644
--- a/khtml/ecma/CMakeLists.txt
+++ b/tdehtml/ecma/CMakeLists.txt
@@ -16,7 +16,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}/kjs
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
@@ -25,8 +25,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/kio/kio
   ${CMAKE_SOURCE_DIR}/kio/bookmarks
   ${CMAKE_SOURCE_DIR}/kjs
-  ${CMAKE_SOURCE_DIR}/kwallet/client
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
+  ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
 link_directories(
diff --git a/khtml/ecma/Makefile.am b/tdehtml/ecma/Makefile.am
index c88b51d33..d69ff807b 100644
--- a/khtml/ecma/Makefile.am
+++ b/tdehtml/ecma/Makefile.am
@@ -16,7 +16,7 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kio/bookmarks -I$(top_srcdir)/khtml -I$(top_srcdir)/khtml/java -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kio/bookmarks -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdehtml/java -I$(top_srcdir)/tdewallet/client -I$(top_srcdir)/tdeutils -I$(top_builddir)/kjs $(all_includes)
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 
@@ -32,7 +32,7 @@ libkjs_html_la_SOURCES = kjs_binding.cpp kjs_dom.cpp kjs_html.cpp kjs_window.cpp
 	kjs_views.cpp kjs_debugwin.cpp kjs_mozilla.cpp xmlhttprequest.cpp \
         xmlserializer.cpp domparser.cpp
 #libkjs_html_la_LDFLAGS = -module -avoid-version $(all_libraries)
-libkjs_html_la_LIBADD = $(top_builddir)/kjs/libkjs.la # ../libkhtml.la
+libkjs_html_la_LIBADD = $(top_builddir)/kjs/libkjs.la # ../libtdehtml.la
 libkjs_html_la_METASOURCES = AUTO
 
 LUT_FILES = kjs_dom.lut.h kjs_html.lut.h kjs_css.lut.h kjs_events.lut.h kjs_navigator.lut.h \
@@ -86,5 +86,5 @@ CLEANFILES = $(LUT_FILES)
 # interactive test program
 #check_PROGRAMS = testecma
 #testecma_SOURCES = testecma.cpp
-#testecma_LDADD = ../libkhtml.la $(top_builddir)/kjs/libkjs.la
+#testecma_LDADD = ../libtdehtml.la $(top_builddir)/kjs/libkjs.la
 
diff --git a/khtml/ecma/README b/tdehtml/ecma/README
index 4c341699a..4c341699a 100644
--- a/khtml/ecma/README
+++ b/tdehtml/ecma/README
diff --git a/khtml/ecma/THANKS b/tdehtml/ecma/THANKS
index b21dce741..b21dce741 100644
--- a/khtml/ecma/THANKS
+++ b/tdehtml/ecma/THANKS
diff --git a/khtml/ecma/TODO b/tdehtml/ecma/TODO
index 16a7152c5..16a7152c5 100644
--- a/khtml/ecma/TODO
+++ b/tdehtml/ecma/TODO
diff --git a/khtml/ecma/domparser.cpp b/tdehtml/ecma/domparser.cpp
index 672754a45..672754a45 100644
--- a/khtml/ecma/domparser.cpp
+++ b/tdehtml/ecma/domparser.cpp
diff --git a/khtml/ecma/domparser.h b/tdehtml/ecma/domparser.h
index 746514783..13a880837 100644
--- a/khtml/ecma/domparser.h
+++ b/tdehtml/ecma/domparser.h
@@ -36,7 +36,7 @@ namespace KJS {
     virtual bool implementsConstruct() const;
     virtual Object construct(ExecState *exec, const List &args);
 private:
-    khtml::SharedPtr<DOM::DocumentImpl> doc;
+    tdehtml::SharedPtr<DOM::DocumentImpl> doc;
   };
 
   class DOMParser : public DOMObject {
diff --git a/khtml/ecma/jsk.html b/tdehtml/ecma/jsk.html
index 917c083e8..917c083e8 100644
--- a/khtml/ecma/jsk.html
+++ b/tdehtml/ecma/jsk.html
diff --git a/khtml/ecma/kjs_binding.cpp b/tdehtml/ecma/kjs_binding.cpp
index 125401cae..09961fbb5 100644
--- a/khtml/ecma/kjs_binding.cpp
+++ b/tdehtml/ecma/kjs_binding.cpp
@@ -26,10 +26,10 @@
 #include "dom/dom_exception.h"
 #include "dom/dom2_range.h"
 #include "xml/dom2_eventsimpl.h"
-#include "khtmlpart_p.h"
+#include "tdehtmlpart_p.h"
 
 #include <kdebug.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 #include <assert.h>
 
@@ -173,7 +173,7 @@ Value DOMFunction::call(ExecState *exec, Object &thisObj, const List &args)
 typedef TQPtrList<ScriptInterpreter> InterpreterList;
 static InterpreterList *interpreterList;
 
-ScriptInterpreter::ScriptInterpreter( const Object &global, khtml::ChildFrame* frame )
+ScriptInterpreter::ScriptInterpreter( const Object &global, tdehtml::ChildFrame* frame )
   : Interpreter( global ), m_frame( frame ), m_domObjects(1021),
     m_evt( 0L ), m_inlineCode(false), m_timerCallback(false)
 {
diff --git a/khtml/ecma/kjs_binding.h b/tdehtml/ecma/kjs_binding.h
index c55da21ce..9b69284ba 100644
--- a/khtml/ecma/kjs_binding.h
+++ b/tdehtml/ecma/kjs_binding.h
@@ -36,7 +36,7 @@ namespace KParts {
   class LiveConnectExtension;
 }
 
-namespace khtml {
+namespace tdehtml {
   class ChildFrame;
 }
 
@@ -93,7 +93,7 @@ namespace KJS {
   class KDE_EXPORT ScriptInterpreter : public Interpreter
   {
   public:
-    ScriptInterpreter( const Object &global, khtml::ChildFrame* frame );
+    ScriptInterpreter( const Object &global, tdehtml::ChildFrame* frame );
     virtual ~ScriptInterpreter();
 
     DOMObject* getDOMObject( void* objectHandle ) const {
@@ -143,7 +143,7 @@ namespace KJS {
     bool isWindowOpenAllowed() const;
 
   private:
-    khtml::ChildFrame* m_frame;
+    tdehtml::ChildFrame* m_frame;
     TQPtrDict<DOMObject> m_domObjects;
     TQPtrDict<void> m_customizedDomObjects; //Objects which had custom properties set,
                                            //and should not be GC'd. key is DOMObject*
diff --git a/khtml/ecma/kjs_css.cpp b/tdehtml/ecma/kjs_css.cpp
index b42f9dd02..b42f9dd02 100644
--- a/khtml/ecma/kjs_css.cpp
+++ b/tdehtml/ecma/kjs_css.cpp
diff --git a/khtml/ecma/kjs_css.h b/tdehtml/ecma/kjs_css.h
index 2b7d14712..2b7d14712 100644
--- a/khtml/ecma/kjs_css.h
+++ b/tdehtml/ecma/kjs_css.h
diff --git a/khtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index 73a55cf94..4830c1108 100644
--- a/khtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -61,11 +61,11 @@
 
 #include "kjs_dom.h"
 #include "kjs_binding.h"
-#include "khtml_part.h"
-#include "khtmlview.h"
-#include "khtml_pagecache.h"
-#include "khtml_settings.h"
-#include "khtml_factory.h"
+#include "tdehtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_pagecache.h"
+#include "tdehtml_settings.h"
+#include "tdehtml_factory.h"
 #include "misc/decoder.h"
 #include <kjs/ustring.h>
 #include <kjs/object.h>
@@ -73,7 +73,7 @@
 #include <kjs/interpreter.h>
 
 using namespace KJS;
-using namespace khtml;
+using namespace tdehtml;
 
 SourceDisplay::SourceDisplay(KJSDebugWin *debugWin, TQWidget *parent, const char *name)
   : TQScrollView(parent,name), m_currentLine(-1), m_sourceFile(0), m_debugWin(debugWin),
@@ -805,8 +805,8 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch
     return true;
 
   KParts::ReadOnlyPart *part = static_cast<ScriptInterpreter*>(exec->interpreter())->part();
-  KHTMLPart *khtmlpart = ::tqqt_cast<KHTMLPart*>(part);
-  if (khtmlpart && !khtmlpart->settings()->isJavaScriptErrorReportingEnabled())
+  KHTMLPart *tdehtmlpart = ::tqqt_cast<KHTMLPart*>(part);
+  if (tdehtmlpart && !tdehtmlpart->settings()->isJavaScriptErrorReportingEnabled())
     return true;
 
   TQWidget *dlgParent = (m_evalDepth == 0) ? (TQWidget*)part->widget() : (TQWidget*)this;
diff --git a/khtml/ecma/kjs_debugwin.h b/tdehtml/ecma/kjs_debugwin.h
index dc2368ac2..dc2368ac2 100644
--- a/khtml/ecma/kjs_debugwin.h
+++ b/tdehtml/ecma/kjs_debugwin.h
diff --git a/khtml/ecma/kjs_dom.cpp b/tdehtml/ecma/kjs_dom.cpp
index cc2f3c78a..71e91d7ef 100644
--- a/khtml/ecma/kjs_dom.cpp
+++ b/tdehtml/ecma/kjs_dom.cpp
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include "xml/dom2_eventsimpl.h"
 #include "rendering/render_canvas.h"
 #include "rendering/render_layer.h"
@@ -29,7 +29,7 @@
 #include "misc/htmlattrs.h" // ATTR_*
 #include "html/html_baseimpl.h"
 #include <kdebug.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 #include "kjs_dom.h"
 #include "kjs_html.h"
@@ -41,7 +41,7 @@
 #include "kjs_window.h"
 #include "dom/dom_exception.h"
 #include "kjs_dom.lut.h"
-#include "khtmlpart_p.h"
+#include "tdehtmlpart_p.h"
 
 namespace KJS {
 
@@ -183,7 +183,7 @@ Value DOMNode::tryGet(ExecState *exec, const Identifier &propertyName) const
   return DOMObjectLookupGetValue<DOMNode, DOMObject>(exec, propertyName, &DOMNodeTable, this);
 }
 
-static khtml::RenderObject* handleBodyRootQuirk(const DOM::Node& node, khtml::RenderObject* rend, int token)
+static tdehtml::RenderObject* handleBodyRootQuirk(const DOM::Node& node, tdehtml::RenderObject* rend, int token)
 {
   //This emulates the quirks of various height/width properties on the viewport and root. Note that it 
   //is (mostly) IE-compatible in quirks, and mozilla-compatible in strict.
@@ -328,7 +328,7 @@ Value DOMNode::getValueProperty(ExecState *exec, int token) const
       docimpl->updateLayout();
     }
 
-    khtml::RenderObject *rend = node.handle()->renderer();
+    tdehtml::RenderObject *rend = node.handle()->renderer();
 
     //In quirks mode, may need to forward if to body.
     rend = handleBodyRootQuirk(node, rend, token);
@@ -344,7 +344,7 @@ Value DOMNode::getValueProperty(ExecState *exec, int token) const
       return rend ? static_cast<Value>(  Number( rend->offsetHeight() ) ) : Number(0);
     case OffsetParent:
     {
-      khtml::RenderObject* par = rend ? rend->offsetParent() : 0;
+      tdehtml::RenderObject* par = rend ? rend->offsetParent() : 0;
       return getDOMNode( exec, par ? par->element() : 0 );
     }
     case ClientWidth:
@@ -474,7 +474,7 @@ void DOMNode::putValueProperty(ExecState *exec, int token, const Value& value, i
     if (docimpl)
       docimpl->updateLayout();
 
-    khtml::RenderObject *rend = node.handle() ? node.handle()->renderer() : 0L;
+    tdehtml::RenderObject *rend = node.handle() ? node.handle()->renderer() : 0L;
 
     //In quirks mode, may need to forward.
     rend = handleBodyRootQuirk(node, rend, token);
@@ -1088,10 +1088,10 @@ Value DOMDocumentProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List
     Window* active = Window::retrieveActive(exec);
     // Complete the URL using the "active part" (running interpreter). We do this for the security
     // check and to make sure we load exactly the same url as we have verified to be safe
-    KHTMLPart *khtmlpart = ::tqqt_cast<KHTMLPart *>(active->part());
-    if (khtmlpart) {
+    KHTMLPart *tdehtmlpart = ::tqqt_cast<KHTMLPart *>(active->part());
+    if (tdehtmlpart) {
       // Security: only allow documents to be loaded from the same host
-      TQString dstUrl = khtmlpart->htmlDocument().completeURL(s).string();
+      TQString dstUrl = tdehtmlpart->htmlDocument().completeURL(s).string();
       KParts::ReadOnlyPart *part = static_cast<KJS::ScriptInterpreter*>(exec->interpreter())->part();
       if (part->url().host() == KURL(dstUrl).host()) {
 	kdDebug(6070) << "JavaScript: access granted for document.load() of " << dstUrl << endl;
diff --git a/khtml/ecma/kjs_dom.h b/tdehtml/ecma/kjs_dom.h
index b17488592..b17488592 100644
--- a/khtml/ecma/kjs_dom.h
+++ b/tdehtml/ecma/kjs_dom.h
diff --git a/khtml/ecma/kjs_events.cpp b/tdehtml/ecma/kjs_events.cpp
index a0daf19c8..7b6ff3cc1 100644
--- a/khtml/ecma/kjs_events.cpp
+++ b/tdehtml/ecma/kjs_events.cpp
@@ -30,7 +30,7 @@
 #include "rendering/render_object.h"
 #include "rendering/render_canvas.h"
 #include "xml/dom2_eventsimpl.h"
-#include "khtml_part.h"
+#include "tdehtml_part.h"
 
 #include <kdebug.h>
 
@@ -114,9 +114,9 @@ void JSEventListener::handleEvent(DOM::Event &evt)
 DOM::DOMString JSEventListener::eventListenerType()
 {
     if (html)
-	return "_khtml_HTMLEventListener";
+	return "_tdehtml_HTMLEventListener";
     else
-	return "_khtml_JSEventListener";
+	return "_tdehtml_JSEventListener";
 }
 
 Object JSEventListener::listenerObj() const
@@ -595,7 +595,7 @@ Value DOMMouseEvent::getValueProperty(ExecState *exec, int token) const
   case OffsetY: // MSIE extension
   {
     DOM::Node node = event.target();
-    khtml::RenderObject *rend = 0;
+    tdehtml::RenderObject *rend = 0;
     if (node.handle()) {
         node.handle()->getDocument()->updateRendering();
         rend = node.handle()->renderer();
@@ -631,7 +631,7 @@ Value DOMMouseEvent::getValueProperty(ExecState *exec, int token) const
     if ( exec->interpreter()->compatMode() == Interpreter::NetscapeCompat ) {
         return Number(static_cast<DOM::MouseEvent>(event).button());
     }
-    // Tricky. The DOM (and khtml) use 0 for LMB, 1 for MMB and 2 for RMB
+    // Tricky. The DOM (and tdehtml) use 0 for LMB, 1 for MMB and 2 for RMB
     // but MSIE uses 1=LMB, 2=RMB, 4=MMB, as a bitfield
     int domButton = static_cast<DOM::MouseEvent>(event).button();
     int button = domButton==0 ? 1 : domButton==1 ? 4 : domButton==2 ? 2 : 0;
diff --git a/khtml/ecma/kjs_events.h b/tdehtml/ecma/kjs_events.h
index e48276031..e48276031 100644
--- a/khtml/ecma/kjs_events.h
+++ b/tdehtml/ecma/kjs_events.h
diff --git a/khtml/ecma/kjs_html.cpp b/tdehtml/ecma/kjs_html.cpp
index 57762ffd3..37fd70754 100644
--- a/khtml/ecma/kjs_html.cpp
+++ b/tdehtml/ecma/kjs_html.cpp
@@ -38,10 +38,10 @@
 #include "html/html_miscimpl.h"
 #include "xml/dom2_eventsimpl.h"
 
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
-#include "khtml_part.h"
-#include "khtmlview.h"
+#include "tdehtml_part.h"
+#include "tdehtmlview.h"
 
 #include "ecma/kjs_css.h"
 #include "ecma/kjs_events.h"
@@ -110,7 +110,7 @@ Value KJS::HTMLDocFunction::tryCall(ExecState *exec, Object &thisObj, const List
     doc.open();
     return Undefined();
   case HTMLDocument::Close:
-    // see khtmltests/ecma/tokenizer-script-recursion.html
+    // see tdehtmltests/ecma/tokenizer-script-recursion.html
     doc.close();
     return Undefined();
   case HTMLDocument::Write:
@@ -1129,7 +1129,7 @@ static KParts::LiveConnectExtension *getLiveConnectExtension(const DOM::HTMLElem
   DOM::HTMLDocument doc = element.ownerDocument();
   KHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view();
   if (view && element.handle())
-    return view->part()->liveConnectExtension(static_cast<khtml::RenderPart*>(element.handle()->renderer()));
+    return view->part()->liveConnectExtension(static_cast<tdehtml::RenderPart*>(element.handle()->renderer()));
   return 0L;
 }
 
@@ -1892,7 +1892,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const
     case FrameHeight:
       {
           frameElement.handle()->getDocument()->updateLayout();
-          khtml::RenderObject* r = frameElement.handle()->renderer();
+          tdehtml::RenderObject* r = frameElement.handle()->renderer();
           return Number( r ? (token == FrameWidth ? r->width() : r->height()) : 0 );
       }
     }
diff --git a/khtml/ecma/kjs_html.h b/tdehtml/ecma/kjs_html.h
index 53da38462..53da38462 100644
--- a/khtml/ecma/kjs_html.h
+++ b/tdehtml/ecma/kjs_html.h
diff --git a/khtml/ecma/kjs_mozilla.cpp b/tdehtml/ecma/kjs_mozilla.cpp
index 1a5555c42..216fde26e 100644
--- a/khtml/ecma/kjs_mozilla.cpp
+++ b/tdehtml/ecma/kjs_mozilla.cpp
@@ -24,7 +24,7 @@
 #include "kjs_mozilla.h"
 #include "kjs/lookup.h"
 #include "kjs_binding.h"
-#include "khtml_part.h"
+#include "tdehtml_part.h"
 #include "kjs_mozilla.lut.h"
 
 using namespace KJS;
diff --git a/khtml/ecma/kjs_mozilla.h b/tdehtml/ecma/kjs_mozilla.h
index 220094f63..220094f63 100644
--- a/khtml/ecma/kjs_mozilla.h
+++ b/tdehtml/ecma/kjs_mozilla.h
diff --git a/khtml/ecma/kjs_navigator.cpp b/tdehtml/ecma/kjs_navigator.cpp
index 9bd99ada7..222ef7902 100644
--- a/khtml/ecma/kjs_navigator.cpp
+++ b/tdehtml/ecma/kjs_navigator.cpp
@@ -34,7 +34,7 @@
 #include "kjs_navigator.h"
 #include "kjs/lookup.h"
 #include "kjs_binding.h"
-#include "khtml_part.h"
+#include "tdehtml_part.h"
 #include <sys/utsname.h>
 #include "kjs_navigator.lut.h"
 
@@ -219,7 +219,7 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
         return Undefined();
     }
     // We are acting straight
-    return String("Konqueror/khtml");
+    return String("Konqueror/tdehtml");
   case ProductSub:
     {
       int ix = userAgent.find("Gecko");
diff --git a/khtml/ecma/kjs_navigator.h b/tdehtml/ecma/kjs_navigator.h
index ccd1ba63b..ccd1ba63b 100644
--- a/khtml/ecma/kjs_navigator.h
+++ b/tdehtml/ecma/kjs_navigator.h
diff --git a/khtml/ecma/kjs_proxy.cpp b/tdehtml/ecma/kjs_proxy.cpp
index ca26c5a0b..cc7afa00a 100644
--- a/khtml/ecma/kjs_proxy.cpp
+++ b/tdehtml/ecma/kjs_proxy.cpp
@@ -36,8 +36,8 @@
 #include "kjs_events.h"
 #include "kjs_debugwin.h"
 #include "xml/dom_nodeimpl.h"
-#include "khtmlpart_p.h"
-#include <khtml_part.h>
+#include "tdehtmlpart_p.h"
+#include <tdehtml_part.h>
 #include <kprotocolmanager.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
@@ -51,14 +51,14 @@
 using namespace KJS;
 
 extern "C" {
-  KJSProxy *kjs_html_init(khtml::ChildFrame *childframe);
+  KJSProxy *kjs_html_init(tdehtml::ChildFrame *childframe);
 }
 
 namespace KJS {
 
 class KJSProxyImpl : public KJSProxy {
 public:
-  KJSProxyImpl(khtml::ChildFrame *frame);
+  KJSProxyImpl(tdehtml::ChildFrame *frame);
   virtual ~KJSProxyImpl();
   virtual TQVariant evaluate(TQString filename, int baseLine, const TQString &, const DOM::Node &n,
 			    Completion *completion = 0);
@@ -89,7 +89,7 @@ private:
 int KJSProxyImpl::s_count = 0;
 #endif
 
-KJSProxyImpl::KJSProxyImpl(khtml::ChildFrame *frame)
+KJSProxyImpl::KJSProxyImpl(tdehtml::ChildFrame *frame)
 {
   m_script = 0;
   m_frame = frame;
@@ -372,7 +372,7 @@ KJSProxy * KJSProxy::proxy( KHTMLPart *part )
 }
 
 // initialize HTML module
-KJSProxy *kjs_html_init(khtml::ChildFrame *childframe)
+KJSProxy *kjs_html_init(tdehtml::ChildFrame *childframe)
 {
   return new KJSProxyImpl(childframe);
 }
diff --git a/khtml/ecma/kjs_proxy.h b/tdehtml/ecma/kjs_proxy.h
index dde30b070..5ea2d5bf6 100644
--- a/khtml/ecma/kjs_proxy.h
+++ b/tdehtml/ecma/kjs_proxy.h
@@ -42,7 +42,7 @@ namespace KJS {
   class KJSDebugWin;
 }
 
-namespace khtml {
+namespace tdehtml {
   class ChildFrame;
 }
 
@@ -69,7 +69,7 @@ public:
 
   void setEventHandlerLineno(int lineno) { m_handlerLineno = lineno; }
 
-  khtml::ChildFrame *m_frame;
+  tdehtml::ChildFrame *m_frame;
   int m_handlerLineno;
 
   // Helper method, to access the private KHTMLPart::jScript()
diff --git a/khtml/ecma/kjs_range.cpp b/tdehtml/ecma/kjs_range.cpp
index bf148ffe8..bf148ffe8 100644
--- a/khtml/ecma/kjs_range.cpp
+++ b/tdehtml/ecma/kjs_range.cpp
diff --git a/khtml/ecma/kjs_range.h b/tdehtml/ecma/kjs_range.h
index fbf47020f..fbf47020f 100644
--- a/khtml/ecma/kjs_range.h
+++ b/tdehtml/ecma/kjs_range.h
diff --git a/khtml/ecma/kjs_traversal.cpp b/tdehtml/ecma/kjs_traversal.cpp
index 5b521b6d5..b8b9e824a 100644
--- a/khtml/ecma/kjs_traversal.cpp
+++ b/tdehtml/ecma/kjs_traversal.cpp
@@ -24,8 +24,8 @@
 #include <dom/dom_node.h>
 #include <xml/dom_nodeimpl.h>
 #include <xml/dom_docimpl.h>
-#include <khtmlview.h>
-#include <khtml_part.h>
+#include <tdehtmlview.h>
+#include <tdehtml_part.h>
 #include <kdebug.h>
 
 namespace KJS {
diff --git a/khtml/ecma/kjs_traversal.h b/tdehtml/ecma/kjs_traversal.h
index fd7e064b1..fd7e064b1 100644
--- a/khtml/ecma/kjs_traversal.h
+++ b/tdehtml/ecma/kjs_traversal.h
diff --git a/khtml/ecma/kjs_views.cpp b/tdehtml/ecma/kjs_views.cpp
index dbf354ce8..dbf354ce8 100644
--- a/khtml/ecma/kjs_views.cpp
+++ b/tdehtml/ecma/kjs_views.cpp
diff --git a/khtml/ecma/kjs_views.h b/tdehtml/ecma/kjs_views.h
index 11e103fde..11e103fde 100644
--- a/khtml/ecma/kjs_views.h
+++ b/tdehtml/ecma/kjs_views.h
diff --git a/khtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp
index e557497e0..767c7607f 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/tdehtml/ecma/kjs_window.cpp
@@ -21,10 +21,10 @@
  */
 #include "config.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
-#include "khtmlpart_p.h"
-#include "khtml_settings.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
+#include "tdehtmlpart_p.h"
+#include "tdehtml_settings.h"
 #include "xml/dom2_eventsimpl.h"
 #include "xml/dom_docimpl.h"
 #include "misc/htmltags.h"
@@ -40,7 +40,7 @@
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmdcodec.h>
-#include <kparts/browserinterface.h>
+#include <tdeparts/browserinterface.h>
 #include <twin.h>
 
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
@@ -404,7 +404,7 @@ const ClassInfo Window::info = { "Window", &DOMAbstractView::info, &WindowTable,
 */
 IMPLEMENT_PROTOFUNC_DOM(WindowFunc)
 
-Window::Window(khtml::ChildFrame *p)
+Window::Window(tdehtml::ChildFrame *p)
   : ObjectImp(/*no proto*/), m_frame(p), screen(0), history(0), external(0), m_frames(0), loc(0), m_evt(0)
 {
   winq = new WindowQObject(this);
@@ -828,12 +828,12 @@ Value Window::get(ExecState *exec, const Identifier &p) const
     case InnerHeight:
       if (!part->view())
         return Undefined();
-      khtml::RenderWidget::flushWidgetResizes(); // make sure frames have their final size
+      tdehtml::RenderWidget::flushWidgetResizes(); // make sure frames have their final size
       return Number(part->view()->visibleHeight());
     case InnerWidth:
       if (!part->view())
         return Undefined();
-      khtml::RenderWidget::flushWidgetResizes(); // make sure frames have their final size
+      tdehtml::RenderWidget::flushWidgetResizes(); // make sure frames have their final size
       return Number(part->view()->visibleWidth());
     case Length:
       return Number(part->frames().count());
@@ -1444,7 +1444,7 @@ void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory)
       kdDebug(6070) << "Window::goURL dstUrl=" << dstUrl << endl;
 
       // check if we're allowed to inject javascript
-      // SYNC check with khtml_part.cpp::slotRedirect!
+      // SYNC check with tdehtml_part.cpp::slotRedirect!
       if ( isSafeScript(exec) ||
             dstUrl.find(TQString::fromLatin1("javascript:"), 0, false) != 0 )
         part->scheduleRedirection(-1,
@@ -1704,26 +1704,26 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
     KParts::ReadOnlyPart *newPart = 0L;
     emit p->browserExtension()->createNewWindow(KURL(), uargs,winargs,newPart);
     if (newPart && ::tqqt_cast<KHTMLPart*>(newPart)) {
-      KHTMLPart *khtmlpart = static_cast<KHTMLPart*>(newPart);
+      KHTMLPart *tdehtmlpart = static_cast<KHTMLPart*>(newPart);
       //tqDebug("opener set to %p (this Window's part) in new Window %p  (this Window=%p)",part,win,window);
-      khtmlpart->setOpener(p);
-      khtmlpart->setOpenedByJS(true);
-      if (khtmlpart->document().isNull()) {
-        khtmlpart->begin();
-        khtmlpart->write("<HTML><BODY>");
-        khtmlpart->end();
+      tdehtmlpart->setOpener(p);
+      tdehtmlpart->setOpenedByJS(true);
+      if (tdehtmlpart->document().isNull()) {
+        tdehtmlpart->begin();
+        tdehtmlpart->write("<HTML><BODY>");
+        tdehtmlpart->end();
         if ( p->docImpl() ) {
           //kdDebug(6070) << "Setting domain to " << p->docImpl()->domain().string() << endl;
-          khtmlpart->docImpl()->setDomain( p->docImpl()->domain());
-          khtmlpart->docImpl()->setBaseURL( p->docImpl()->baseURL() );
+          tdehtmlpart->docImpl()->setDomain( p->docImpl()->domain());
+          tdehtmlpart->docImpl()->setBaseURL( p->docImpl()->baseURL() );
         }
       }
       uargs.serviceType = TQString::null;
       if (uargs.frameName.lower() == "_blank")
         uargs.frameName = TQString::null;
       if (!url.isEmpty())
-        emit khtmlpart->browserExtension()->openURLRequest(url,uargs);
-      return Window::retrieve(khtmlpart); // global object
+        emit tdehtmlpart->browserExtension()->openURLRequest(url,uargs);
+      return Window::retrieve(tdehtmlpart); // global object
     } else
       return Undefined();
 }
@@ -2483,7 +2483,7 @@ const ClassInfo Location::info = { "Location", 0, &LocationTable, 0 };
 @end
 */
 IMPLEMENT_PROTOFUNC_DOM(LocationFunc)
-Location::Location(khtml::ChildFrame *f) : m_frame(f)
+Location::Location(tdehtml::ChildFrame *f) : m_frame(f)
 {
   //kdDebug(6070) << "Location::Location " << this << " m_part=" << (void*)m_part << endl;
 }
@@ -2681,9 +2681,9 @@ Value LocationFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
             id == Location::Replace);
     break;
   case Location::Reload: {
-    KHTMLPart *khtmlpart = ::tqqt_cast<KHTMLPart *>(part);
-    if (khtmlpart)
-      khtmlpart->scheduleRedirection(-1, part->url().url(), true/*lock history*/);
+    KHTMLPart *tdehtmlpart = ::tqqt_cast<KHTMLPart *>(part);
+    if (tdehtmlpart)
+      tdehtmlpart->scheduleRedirection(-1, part->url().url(), true/*lock history*/);
     else
       part->openURL(part->url());
     break;
diff --git a/khtml/ecma/kjs_window.h b/tdehtml/ecma/kjs_window.h
index 2f5eb45f5..b9142f983 100644
--- a/khtml/ecma/kjs_window.h
+++ b/tdehtml/ecma/kjs_window.h
@@ -39,7 +39,7 @@ namespace KParts {
   class ReadOnlyPart;
 }
 
-namespace khtml {
+namespace tdehtml {
   class ChildFrame;
 }
 
@@ -76,7 +76,7 @@ namespace KJS {
     friend class WindowQObject;
     friend class ScheduledAction;
   public:
-    Window(khtml::ChildFrame *p);
+    Window(tdehtml::ChildFrame *p);
   public:
     ~Window();
     /**
@@ -178,7 +178,7 @@ namespace KJS {
 
     bool checkIsSafeScript( KParts::ReadOnlyPart* activePart ) const;
 
-    TQGuardedPtr<khtml::ChildFrame> m_frame;
+    TQGuardedPtr<tdehtml::ChildFrame> m_frame;
     Screen *screen;
     History *history;
     External *external;
@@ -285,8 +285,8 @@ namespace KJS {
     static const ClassInfo info;
   private:
     friend class Window;
-    Location(khtml::ChildFrame *f);
-    TQGuardedPtr<khtml::ChildFrame> m_frame;
+    Location(tdehtml::ChildFrame *f);
+    TQGuardedPtr<tdehtml::ChildFrame> m_frame;
   };
 
 #ifdef Q_WS_QWS
diff --git a/khtml/ecma/testecma.cpp b/tdehtml/ecma/testecma.cpp
index 44cd7ecb0..44cd7ecb0 100644
--- a/khtml/ecma/testecma.cpp
+++ b/tdehtml/ecma/testecma.cpp
diff --git a/khtml/ecma/xmlhttprequest.cpp b/tdehtml/ecma/xmlhttprequest.cpp
index 8a8a86c16..f3aec5492 100644
--- a/khtml/ecma/xmlhttprequest.cpp
+++ b/tdehtml/ecma/xmlhttprequest.cpp
@@ -30,8 +30,8 @@
 #include "html/html_documentimpl.h"
 #include "xml/dom2_eventsimpl.h"
 
-#include "khtml_part.h"
-#include "khtmlview.h"
+#include "tdehtml_part.h"
+#include "tdehtmlview.h"
 
 #include <kio/scheduler.h>
 #include <kio/job.h>
@@ -53,7 +53,7 @@ using TDEIO::NetAccess;
                             "keep-alive,te,trailer,"\
                             "transfer-encoding,upgrade"
 
-using khtml::Decoder;
+using tdehtml::Decoder;
 
 namespace KJS {
 
@@ -409,7 +409,7 @@ void XMLHttpRequest::send(const TQString& _body)
     TQString headers;
 
 #ifdef APPLE_CHANGES
-    data = KWQServeSynchronousRequest(khtml::Cache::loader(), doc->docLoader(), job, finalURL, headers);
+    data = KWQServeSynchronousRequest(tdehtml::Cache::loader(), doc->docLoader(), job, finalURL, headers);
 #else
     TQMap<TQString, TQString> metaData;
     if ( NetAccess::synchronousRun( job, 0, &data, &finalURL, &metaData ) ) {
@@ -434,7 +434,7 @@ void XMLHttpRequest::send(const TQString& _body)
 		    TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
 
 #ifdef APPLE_CHANGES
-  KWQServeRequest(khtml::Cache::loader(), doc->docLoader(), job);
+  KWQServeRequest(tdehtml::Cache::loader(), doc->docLoader(), job);
 #else
   TDEIO::Scheduler::scheduleJob( job );
 #endif
diff --git a/khtml/ecma/xmlhttprequest.h b/tdehtml/ecma/xmlhttprequest.h
index 93420453e..2dc89e227 100644
--- a/khtml/ecma/xmlhttprequest.h
+++ b/tdehtml/ecma/xmlhttprequest.h
@@ -109,7 +109,7 @@ namespace KJS {
     JSEventListener *onReadyStateChangeListener;
     JSEventListener *onLoadListener;
 
-    khtml::Decoder *decoder;
+    tdehtml::Decoder *decoder;
     TQString encoding;
     TQString responseHeaders;
 
diff --git a/khtml/ecma/xmlserializer.cpp b/tdehtml/ecma/xmlserializer.cpp
index 856f35e1f..856f35e1f 100644
--- a/khtml/ecma/xmlserializer.cpp
+++ b/tdehtml/ecma/xmlserializer.cpp
diff --git a/khtml/ecma/xmlserializer.h b/tdehtml/ecma/xmlserializer.h
index 629d09afe..629d09afe 100644
--- a/khtml/ecma/xmlserializer.h
+++ b/tdehtml/ecma/xmlserializer.h
diff --git a/khtml/html/AlwaysInline.h b/tdehtml/html/AlwaysInline.h
index 71fe82928..71fe82928 100644
--- a/khtml/html/AlwaysInline.h
+++ b/tdehtml/html/AlwaysInline.h
diff --git a/khtml/html/CMakeLists.txt b/tdehtml/html/CMakeLists.txt
index 8f47c06f8..a7a3bf466 100644
--- a/khtml/html/CMakeLists.txt
+++ b/tdehtml/html/CMakeLists.txt
@@ -15,7 +15,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
@@ -23,13 +23,13 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/kio/kio
   ${CMAKE_SOURCE_DIR}/kio/kfile
   ${CMAKE_SOURCE_DIR}/kio/kssl
-  ${CMAKE_SOURCE_DIR}/kutils
-  ${CMAKE_SOURCE_DIR}/kwallet/client
+  ${CMAKE_SOURCE_DIR}/tdeutils
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
 )
 
-##### khtmlhtml-static ###########################
+##### tdehtmlhtml-static ###########################
 
-set( target khtmlhtml )
+set( target tdehtmlhtml )
 
 set( ${target}_SRCS
   htmlparser.cpp htmltokenizer.cpp dtd.cpp html_headimpl.cpp
diff --git a/khtml/html/Makefile.am b/tdehtml/html/Makefile.am
index ed7722517..0a3286243 100644
--- a/khtml/html/Makefile.am
+++ b/tdehtml/html/Makefile.am
@@ -19,8 +19,8 @@
 
 KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
 
-noinst_LTLIBRARIES = libkhtmlhtml.la
-libkhtmlhtml_la_SOURCES = \
+noinst_LTLIBRARIES = libtdehtmlhtml.la
+libtdehtmlhtml_la_SOURCES = \
 	htmlparser.cpp         htmltokenizer.cpp \
 	dtd.cpp                html_headimpl.cpp      html_blockimpl.cpp  \
 	html_elementimpl.cpp   html_inlineimpl.cpp    html_documentimpl.cpp \
@@ -28,7 +28,7 @@ libkhtmlhtml_la_SOURCES = \
 	html_miscimpl.cpp      html_formimpl.cpp      html_objectimpl.cpp \
 	html_tableimpl.cpp
 
-libkhtmlhtml_la_METASOURCES = AUTO
+libtdehtmlhtml_la_METASOURCES = AUTO
 
 
 noinst_HEADERS = \
@@ -41,8 +41,8 @@ noinst_HEADERS = \
 
 INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/dcop \
  -I$(top_srcdir)/kio/kssl \
- -I$(top_srcdir)/kjs -I$(top_srcdir)/khtml -I$(top_srcdir) \
- -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils \
+ -I$(top_srcdir)/kjs -I$(top_srcdir)/tdehtml -I$(top_srcdir) \
+ -I$(top_srcdir)/tdewallet/client -I$(top_srcdir)/tdeutils \
  $(all_includes)
 
 # Use "make doctypes" to regenerate doctypes.cpp from doctypes.gperf
diff --git a/khtml/html/Platform.h b/tdehtml/html/Platform.h
index 3cdd7177b..3cdd7177b 100644
--- a/khtml/html/Platform.h
+++ b/tdehtml/html/Platform.h
diff --git a/khtml/html/RefPtr.h b/tdehtml/html/RefPtr.h
index 8754bbf94..8754bbf94 100644
--- a/khtml/html/RefPtr.h
+++ b/tdehtml/html/RefPtr.h
diff --git a/khtml/html/doctypes.cpp b/tdehtml/html/doctypes.cpp
index e12fc4db7..332ad18fd 100644
--- a/khtml/html/doctypes.cpp
+++ b/tdehtml/html/doctypes.cpp
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.0.1 */
-/* Command-line: gperf -CEot -L ANSI-C -k '*' -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards /opt/src/kde/tdelibs/khtml/html/doctypes.gperf  */
+/* Command-line: gperf -CEot -L ANSI-C -k '*' -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards /opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -28,7 +28,7 @@
 #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
-#line 1 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 1 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
 struct PubIDInfo {
     enum eMode { 
         eQuirks,        /* always quirks mode, unless there's an internal subset */
@@ -351,7 +351,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 91 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 91 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"html", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -461,7 +461,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 81 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 81 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd w3 html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -480,148 +480,148 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 48 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 48 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 28 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 28 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 3//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 73 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 73 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 3.2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 45 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 45 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 35 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 35 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html level 3//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 33 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 33 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 43 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 43 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict level 3//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 29 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 29 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html level 0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 41 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 41 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 27 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 27 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 3.2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 37 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 37 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict level 0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 69 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 69 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w30//dtd w3 html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 24 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 24 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 3.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 50 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 50 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 25 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 25 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 3.0//en//", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 31 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 31 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 22 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 22 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 49 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 49 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 47 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 47 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 36 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 36 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html level 3//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 39 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 39 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 21 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 21 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 2.0 strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 46 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 46 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 44 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 44 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict level 3//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 18 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 18 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 2.0 level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 34 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 34 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html level 2//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 72 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 72 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 3.2 final//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 23 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 23 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 2.1e//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 75 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 75 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 4.0 frameset//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
-#line 30 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 30 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html level 0//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 20 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 20 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 2.0 strict level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 42 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 42 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict level 2//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 85 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 85 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3o//dtd w3 html 3.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 89 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 89 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//webtechs//dtd mozilla html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 86 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 86 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3o//dtd w3 html 3.0//en//", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 84 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 84 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd xhtml 1.1//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards},
-#line 38 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 38 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict level 0//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 70 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 70 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 3 1995-03-24//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 87 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 87 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3o//dtd w3 html strict 3.0//en//", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 17 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 17 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 2.0 level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 32 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 32 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html level 1//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 26 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 26 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 3.2 final//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 19 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 19 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 2.0 strict level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 40 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 40 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict level 1//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 77 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 77 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 4.01 frameset//en", PubIDInfo::eQuirks, PubIDInfo::eAlmostStandards},
-#line 71 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 71 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 3.2 draft//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 74 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 74 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 3.2s draft//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 82 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 82 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd xhtml 1.0 frameset//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards},
-#line 80 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 80 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html experimental 970421//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 51 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 51 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//metrius//dtd metrius presentational//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 88 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 88 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//webtechs//dtd mozilla html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -639,17 +639,17 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 90 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 90 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-/w3c/dtd html 4.0 transitional/en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 76 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 76 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 4.0 transitional//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 79 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 79 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html experimental 19960712//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -670,22 +670,22 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 58 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 58 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//netscape comm. corp.//dtd html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 78 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 78 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 4.01 transitional//en", PubIDInfo::eQuirks, PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 83 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 83 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd xhtml 1.0 transitional//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards},
-#line 59 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 59 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//netscape comm. corp.//dtd strict html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 65 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 65 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//spyglass//dtd html 2.0 extended//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -702,9 +702,9 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 16 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 16 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//as//dtd html 3.0 aswedit + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 66 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 66 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//sq//dtd html 2.0 hotmetal + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -727,7 +727,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 67 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 67 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//sun microsystems corp.//dtd hotjava html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -735,7 +735,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 68 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 68 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//sun microsystems corp.//dtd hotjava strict html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -746,7 +746,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 60 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 60 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//o'reilly and associates//dtd html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -761,35 +761,35 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 56 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 56 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//microsoft//dtd internet explorer 3.0 html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 53 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 53 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//microsoft//dtd internet explorer 2.0 html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 55 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 55 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//microsoft//dtd internet explorer 3.0 html strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 14 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 14 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"+//silmaril//dtd html pro v0r11 19970101//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 52 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 52 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//microsoft//dtd internet explorer 2.0 html strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 57 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 57 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//microsoft//dtd internet explorer 3.0 tables//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 54 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 54 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//microsoft//dtd internet explorer 2.0 tables//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -879,12 +879,12 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 15 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 15 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//advasoft ltd//dtd html 3.0 aswedit + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 61 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 61 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//o'reilly and associates//dtd html extended 1.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -953,7 +953,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 62 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 62 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//o'reilly and associates//dtd html extended relaxed 1.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -1089,7 +1089,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 64 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 64 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -1154,7 +1154,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 63 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 63 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks}
     };
 
diff --git a/khtml/html/doctypes.gperf b/tdehtml/html/doctypes.gperf
index 97b10e258..97b10e258 100644
--- a/khtml/html/doctypes.gperf
+++ b/tdehtml/html/doctypes.gperf
diff --git a/khtml/html/dtd.cpp b/tdehtml/html/dtd.cpp
index accc8b855..accc8b855 100644
--- a/khtml/html/dtd.cpp
+++ b/tdehtml/html/dtd.cpp
diff --git a/khtml/html/dtd.dtd b/tdehtml/html/dtd.dtd
index d6a5ac8f0..d6a5ac8f0 100644
--- a/khtml/html/dtd.dtd
+++ b/tdehtml/html/dtd.dtd
diff --git a/khtml/html/dtd.h b/tdehtml/html/dtd.h
index 4192ce51c..4192ce51c 100644
--- a/khtml/html/dtd.h
+++ b/tdehtml/html/dtd.h
diff --git a/khtml/html/html_baseimpl.cpp b/tdehtml/html/html_baseimpl.cpp
index 0ed4e4888..7ac3d93c9 100644
--- a/khtml/html/html_baseimpl.cpp
+++ b/tdehtml/html/html_baseimpl.cpp
@@ -26,8 +26,8 @@
 #include "html/html_baseimpl.h"
 #include "html/html_documentimpl.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 
 #include "rendering/render_frames.h"
 #include "rendering/render_body.h"
@@ -46,7 +46,7 @@
 #include <kdebug.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 HTMLBodyElementImpl::HTMLBodyElementImpl(DocumentImpl *doc)
     : HTMLElementImpl(doc),
@@ -72,7 +72,7 @@ void HTMLBodyElementImpl::parseAttribute(AttributeImpl *attr)
 
     case ATTR_BACKGROUND:
     {
-        TQString url = khtml::parseURL( attr->value() ).string();
+        TQString url = tdehtml::parseURL( attr->value() ).string();
         if (!url.isEmpty()) {
             url = getDocument()->completeURL( url );
             addCSSProperty(CSS_PROP_BACKGROUND_IMAGE, "url('"+url+"')" );
@@ -263,7 +263,7 @@ void HTMLFrameElementImpl::parseAttribute(AttributeImpl *attr)
     switch(attr->id())
     {
     case ATTR_SRC:
-        setLocation(khtml::parseURL(attr->val()));
+        setLocation(tdehtml::parseURL(attr->val()));
         break;
     case ATTR_FRAMEBORDER:
     {
@@ -399,7 +399,7 @@ bool HTMLFrameElementImpl::isFocusable() const
 void HTMLFrameElementImpl::setFocus(bool received)
 {
     HTMLElementImpl::setFocus(received);
-    khtml::RenderFrame *renderFrame = static_cast<khtml::RenderFrame *>(m_render);
+    tdehtml::RenderFrame *renderFrame = static_cast<tdehtml::RenderFrame *>(m_render);
     if (!renderFrame || !renderFrame->widget())
 	return;
     if (received)
@@ -551,7 +551,7 @@ void HTMLFrameSetElementImpl::attach()
 void HTMLFrameSetElementImpl::defaultEventHandler(EventImpl *evt)
 {
     if (evt->isMouseEvent() && !noresize && m_render)
-        static_cast<khtml::RenderFrameSet *>(m_render)->userResize(static_cast<MouseEventImpl*>(evt));
+        static_cast<tdehtml::RenderFrameSet *>(m_render)->userResize(static_cast<MouseEventImpl*>(evt));
 
     evt->setDefaultHandled();
     HTMLElementImpl::defaultEventHandler(evt);
diff --git a/khtml/html/html_baseimpl.h b/tdehtml/html/html_baseimpl.h
index b04afd749..0aff3e8e1 100644
--- a/khtml/html/html_baseimpl.h
+++ b/tdehtml/html/html_baseimpl.h
@@ -29,14 +29,14 @@
 
 #include "html/dtd.h"
 #include "html/html_elementimpl.h"
-#include "misc/khtmllayout.h"
+#include "misc/tdehtmllayout.h"
 
 #include <tqscrollview.h>
 
 class KHTMLView;
 class KHTMLPart;
 
-namespace khtml {
+namespace tdehtml {
     class RenderFrameSet;
     class RenderFrame;
     class RenderPartObject;
@@ -76,8 +76,8 @@ protected:
 
 class HTMLFrameElementImpl : public HTMLElementImpl
 {
-    friend class khtml::RenderFrame;
-    friend class khtml::RenderPartObject;
+    friend class tdehtml::RenderFrame;
+    friend class tdehtml::RenderPartObject;
 
 public:
     HTMLFrameElementImpl(DocumentImpl *doc);
@@ -114,7 +114,7 @@ public:
 
 class HTMLFrameSetElementImpl : public HTMLElementImpl
 {
-    friend class khtml::RenderFrameSet;
+    friend class tdehtml::RenderFrameSet;
 public:
     HTMLFrameSetElementImpl(DocumentImpl *doc);
 
@@ -138,8 +138,8 @@ public:
     virtual void recalcStyle( StyleChange ch );
 
 protected:
-    khtml::Length* m_rows;
-    khtml::Length* m_cols;
+    tdehtml::Length* m_rows;
+    tdehtml::Length* m_cols;
 
     int m_totalRows;
     int m_totalCols;
diff --git a/khtml/html/html_blockimpl.cpp b/tdehtml/html/html_blockimpl.cpp
index 41cdaccea..3e4585c41 100644
--- a/khtml/html/html_blockimpl.cpp
+++ b/tdehtml/html/html_blockimpl.cpp
@@ -34,7 +34,7 @@
 
 #include <kdebug.h>
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 void HTMLDivElementImpl::parseAttribute(AttributeImpl *attr)
@@ -89,7 +89,7 @@ void HTMLHRElementImpl::parseAttribute(AttributeImpl *attr)
     {
         if(!attr->val()) break;
         // cheap hack to cause linebreaks
-        // khtmltests/html/strange_hr.html
+        // tdehtmltests/html/strange_hr.html
         bool ok;
         int v = attr->val()->toInt(&ok);
         if(ok && !v)
diff --git a/khtml/html/html_blockimpl.h b/tdehtml/html/html_blockimpl.h
index f560583db..f560583db 100644
--- a/khtml/html/html_blockimpl.h
+++ b/tdehtml/html/html_blockimpl.h
diff --git a/khtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp
index 457908943..3aa70c196 100644
--- a/khtml/html/html_documentimpl.cpp
+++ b/tdehtml/html/html_documentimpl.cpp
@@ -29,17 +29,17 @@
 #include "html/html_miscimpl.h"
 #include "html/html_formimpl.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
-#include "khtmlpart_p.h"
-#include "khtml_settings.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
+#include "tdehtmlpart_p.h"
+#include "tdehtml_settings.h"
 #include "misc/htmlattrs.h"
 #include "misc/htmlhashes.h"
 
 #include "xml/xml_tokenizer.h"
 #include "xml/dom2_eventsimpl.h"
 
-#include "khtml_factory.h"
+#include "tdehtml_factory.h"
 #include "rendering/render_object.h"
 #include "dom/dom_exception.h"
 
@@ -66,7 +66,7 @@
 template class TQPtrStack<DOM::NodeImpl>;
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 
 HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
diff --git a/khtml/html/html_documentimpl.h b/tdehtml/html/html_documentimpl.h
index 01fdb2127..0aea47b8b 100644
--- a/khtml/html/html_documentimpl.h
+++ b/tdehtml/html/html_documentimpl.h
@@ -58,7 +58,7 @@ public:
     HTMLElementImpl *body();
     void setBody(HTMLElementImpl *_body, int& exceptioncode);
 
-    virtual khtml::Tokenizer *createTokenizer();
+    virtual tdehtml::Tokenizer *createTokenizer();
 
     virtual bool childAllowed( NodeImpl *newChild );
 
diff --git a/khtml/html/html_elementimpl.cpp b/tdehtml/html/html_elementimpl.cpp
index 5c0e4ae0a..c18f19ea0 100644
--- a/khtml/html/html_elementimpl.cpp
+++ b/tdehtml/html/html_elementimpl.cpp
@@ -37,8 +37,8 @@
 
 #include "misc/htmlhashes.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 
 #include "rendering/render_object.h"
 #include "rendering/render_replaced.h"
@@ -54,7 +54,7 @@
 #include "html_elementimpl.h"
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 HTMLElementImpl::HTMLElementImpl(DocumentImpl *doc)
     : ElementImpl( doc )
diff --git a/khtml/html/html_elementimpl.h b/tdehtml/html/html_elementimpl.h
index f71ae9b23..f71ae9b23 100644
--- a/khtml/html/html_elementimpl.h
+++ b/tdehtml/html/html_elementimpl.h
diff --git a/khtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp
index c7c232dc9..f8c566511 100644
--- a/khtml/html/html_formimpl.cpp
+++ b/tdehtml/html/html_formimpl.cpp
@@ -28,10 +28,10 @@
 
 #include "html/html_formimpl.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 #include "html/html_documentimpl.h"
-#include "khtml_settings.h"
+#include "tdehtml_settings.h"
 #include "misc/htmlhashes.h"
 
 #include "css/cssstyleselector.h"
@@ -42,7 +42,7 @@
 #include "xml/dom_docimpl.h"
 #include "xml/dom2_eventsimpl.h"
 #include "xml/dom_restyler.h"
-#include "khtml_ext.h"
+#include "tdehtml_ext.h"
 
 #include "rendering/render_form.h"
 
@@ -54,7 +54,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #ifndef KHTML_NO_WALLET
-#include <kwallet.h>
+#include <tdewallet.h>
 #endif
 #include <netaccess.h>
 #include <kfileitem.h>
@@ -70,7 +70,7 @@
 
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 HTMLFormElementImpl::HTMLFormElementImpl(DocumentImpl *doc, bool implicit)
     : HTMLElementImpl(doc)
@@ -259,13 +259,13 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok)
 
     for (TQPtrListIterator<HTMLGenericFormElementImpl> it(formElements); it.current(); ++it) {
         HTMLGenericFormElementImpl* const current = it.current();
-        khtml::encodingList lst;
+        tdehtml::encodingList lst;
 
         if (!current->disabled() && current->encoding(codec, lst, m_multipart))
         {
             //kdDebug(6030) << "adding name '" << current->name().string() << "'" << endl;
-            khtml::encodingList::ConstIterator it = lst.begin();
-            const khtml::encodingList::ConstIterator itEnd = lst.end();
+            tdehtml::encodingList::ConstIterator it = lst.begin();
+            const tdehtml::encodingList::ConstIterator itEnd = lst.end();
             for( it = lst.begin(); it != itEnd; ++it )
             {
                 if (!m_multipart)
@@ -632,7 +632,7 @@ void HTMLFormElementImpl::submit(  )
         }
 #endif // KHTML_NO_WALLET
 
-        const DOMString url(khtml::parseURL(getAttribute(ATTR_ACTION)));
+        const DOMString url(tdehtml::parseURL(getAttribute(ATTR_ACTION)));
         if(m_post) {
             view->part()->submitForm( "post", url.string(), form_data,
                                       m_target.string(),
@@ -1153,7 +1153,7 @@ void HTMLButtonElementImpl::click()
     dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1);
 }
 
-bool HTMLButtonElementImpl::encoding(const TQTextCodec* codec, khtml::encodingList& encoding, bool /*multipart*/)
+bool HTMLButtonElementImpl::encoding(const TQTextCodec* codec, tdehtml::encodingList& encoding, bool /*multipart*/)
 {
     if (m_type != SUBMIT || name().isEmpty() || !m_activeSubmit)
         return false;
@@ -1274,7 +1274,7 @@ void HTMLInputElementImpl::parseType(const DOMString& t)
         newType = IMAGE;
     else if ( strcasecmp( t, "button" ) == 0 )
         newType = BUTTON;
-    else if ( strcasecmp( t, "khtml_isindex" ) == 0 )
+    else if ( strcasecmp( t, "tdehtml_isindex" ) == 0 )
         newType = ISINDEX;
     else
         newType = TEXT;
@@ -1529,7 +1529,7 @@ DOMString HTMLInputElementImpl::altText() const
     return alt;
 }
 
-bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingList& encoding, bool multipart)
+bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, tdehtml::encodingList& encoding, bool multipart)
 {
     const TQString nme = name().string();
 
@@ -1601,7 +1601,7 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
 	case FILE: // hmm, we have the type FILE also.  bad choice here...
         {
             // don't submit if display: none or display: hidden
-            if(!renderer() || renderer()->style()->visibility() != khtml::VISIBLE)
+            if(!renderer() || renderer()->style()->visibility() != tdehtml::VISIBLE)
                 return false;
 
             TQString local;
@@ -2297,7 +2297,7 @@ void HTMLSelectElementImpl::attach()
     _style->deref();
 }
 
-bool HTMLSelectElementImpl::encoding(const TQTextCodec* codec, khtml::encodingList& encoded_values, bool)
+bool HTMLSelectElementImpl::encoding(const TQTextCodec* codec, tdehtml::encodingList& encoded_values, bool)
 {
     bool successful = false;
     const TQCString enc_name = fixUpfromUnicode(codec, name().string());
@@ -2419,7 +2419,7 @@ void HTMLSelectElementImpl::setRecalcListItems()
 {
     m_recalcListItems = true;
     if (m_render)
-        static_cast<khtml::RenderSelect*>(m_render)->setOptionsChanged(true);
+        static_cast<tdehtml::RenderSelect*>(m_render)->setOptionsChanged(true);
     setChanged();
 }
 
@@ -2502,7 +2502,7 @@ void HTMLKeygenElementImpl::parseAttribute(AttributeImpl* attr)
     }
 }
 
-bool HTMLKeygenElementImpl::encoding(const TQTextCodec* codec, khtml::encodingList& encoded_values, bool)
+bool HTMLKeygenElementImpl::encoding(const TQTextCodec* codec, tdehtml::encodingList& encoded_values, bool)
 {
     bool successful = false;
     const TQCString enc_name = fixUpfromUnicode(codec, name().string());
diff --git a/khtml/html/html_formimpl.h b/tdehtml/html/html_formimpl.h
index 40fefc9ee..6a909368a 100644
--- a/khtml/html/html_formimpl.h
+++ b/tdehtml/html/html_formimpl.h
@@ -37,7 +37,7 @@
 class KHTMLView;
 class TQTextCodec;
 
-namespace khtml
+namespace tdehtml
 {
     class RenderFormElement;
     class RenderTextArea;
@@ -134,7 +134,7 @@ private:
 class HTMLGenericFormElementImpl : public HTMLElementImpl
 {
     friend class HTMLFormElementImpl;
-    friend class khtml::RenderFormElement;
+    friend class tdehtml::RenderFormElement;
 
 public:
     HTMLGenericFormElementImpl(DocumentImpl *doc, HTMLFormElementImpl *f = 0);
@@ -171,7 +171,7 @@ public:
      * for submitting
      * return true for a successful control (see HTML4-17.13.2)
      */
-    virtual bool encoding(const TQTextCodec*, khtml::encodingList&, bool) { return false; }
+    virtual bool encoding(const TQTextCodec*, tdehtml::encodingList&, bool) { return false; }
 
     virtual void defaultEventHandler(EventImpl *evt);
     virtual bool isEditable();
@@ -206,7 +206,7 @@ public:
     typeEnum buttonType() const { return m_type; }
     virtual void parseAttribute(AttributeImpl *attr);
     virtual void defaultEventHandler(EventImpl *evt);
-    virtual bool encoding(const TQTextCodec*, khtml::encodingList&, bool);
+    virtual bool encoding(const TQTextCodec*, tdehtml::encodingList&, bool);
     void activate();
     virtual void attach();
     void click();
@@ -241,9 +241,9 @@ public:
 
 class HTMLInputElementImpl : public HTMLGenericFormElementImpl
 {
-    friend class khtml::RenderLineEdit;
-    friend class khtml::RenderRadioButton;
-    friend class khtml::RenderFileButton;
+    friend class tdehtml::RenderLineEdit;
+    friend class tdehtml::RenderRadioButton;
+    friend class tdehtml::RenderFileButton;
 
 public:
     // do not change the order!
@@ -297,7 +297,7 @@ public:
     virtual void parseAttribute(AttributeImpl *attr);
 
     virtual void attach();
-    virtual bool encoding(const TQTextCodec*, khtml::encodingList&, bool);
+    virtual bool encoding(const TQTextCodec*, tdehtml::encodingList&, bool);
 
     typeEnum inputType() const { return m_type; }
     virtual void reset();
@@ -379,7 +379,7 @@ public:
 
 class HTMLSelectElementImpl : public HTMLGenericFormElementImpl
 {
-    friend class khtml::RenderSelect;
+    friend class tdehtml::RenderSelect;
 
 public:
     HTMLSelectElementImpl(DocumentImpl *doc, HTMLFormElementImpl *f = 0);
@@ -425,7 +425,7 @@ public:
     virtual void parseAttribute(AttributeImpl *attr);
 
     virtual void attach();
-    virtual bool encoding(const TQTextCodec*, khtml::encodingList&, bool);
+    virtual bool encoding(const TQTextCodec*, tdehtml::encodingList&, bool);
 
     // get the actual listbox index of the optionIndexth option
     int optionToListIndex(int optionIndex) const;
@@ -472,7 +472,7 @@ public:
     virtual bool isEnumeratable() const { return false; }
 
     virtual void parseAttribute(AttributeImpl *attr);
-    virtual bool encoding(const TQTextCodec*, khtml::encodingList&, bool);
+    virtual bool encoding(const TQTextCodec*, tdehtml::encodingList&, bool);
 
 };
 
@@ -492,7 +492,7 @@ public:
 
 class HTMLOptionElementImpl : public HTMLGenericFormElementImpl
 {
-    friend class khtml::RenderSelect;
+    friend class tdehtml::RenderSelect;
     friend class DOM::HTMLSelectElementImpl;
 
 public:
@@ -523,7 +523,7 @@ protected:
 
 class HTMLTextAreaElementImpl : public HTMLGenericFormElementImpl
 {
-    friend class khtml::RenderTextArea;
+    friend class tdehtml::RenderTextArea;
 
 public:
     enum WrapMethod {
@@ -555,7 +555,7 @@ public:
 
     virtual void parseAttribute(AttributeImpl *attr);
     virtual void attach();
-    virtual bool encoding(const TQTextCodec*, khtml::encodingList&, bool);
+    virtual bool encoding(const TQTextCodec*, tdehtml::encodingList&, bool);
     virtual void reset();
     DOMString value();
     void setValue(DOMString _value);
diff --git a/khtml/html/html_headimpl.cpp b/tdehtml/html/html_headimpl.cpp
index d7154e936..2bc0ae99f 100644
--- a/khtml/html/html_headimpl.cpp
+++ b/tdehtml/html/html_headimpl.cpp
@@ -27,8 +27,8 @@
 #include "html/html_documentimpl.h"
 #include "xml/dom_textimpl.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 
 #include "misc/htmlhashes.h"
 #include "misc/loader.h"
@@ -43,7 +43,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-using namespace khtml;
+using namespace tdehtml;
 
 NodeImpl::Id HTMLBaseElementImpl::id() const
 {
@@ -55,7 +55,7 @@ void HTMLBaseElementImpl::parseAttribute(AttributeImpl *attr)
     switch(attr->id())
     {
     case ATTR_HREF:
-	m_href = khtml::parseURL(attr->value());
+	m_href = tdehtml::parseURL(attr->value());
 	process();
 	break;
     case ATTR_TARGET:
@@ -116,7 +116,7 @@ void HTMLLinkElementImpl::parseAttribute(AttributeImpl *attr)
     switch (attr->id())
     {
     case ATTR_HREF:
-        m_url = getDocument()->completeURL( khtml::parseURL(attr->value()).string() );
+        m_url = getDocument()->completeURL( tdehtml::parseURL(attr->value()).string() );
 	process();
         break;
     case ATTR_REL:
diff --git a/khtml/html/html_headimpl.h b/tdehtml/html/html_headimpl.h
index d22f64434..ee9c2ad8b 100644
--- a/khtml/html/html_headimpl.h
+++ b/tdehtml/html/html_headimpl.h
@@ -30,7 +30,7 @@
 
 class KHTMLView;
 
-namespace khtml {
+namespace tdehtml {
     class CachedCSSStyleSheet;
     class CachedObject;
 }
@@ -68,7 +68,7 @@ protected:
 
 // -------------------------------------------------------------------------
 
-class HTMLLinkElementImpl : public khtml::CachedObjectClient, public HTMLElementImpl
+class HTMLLinkElementImpl : public tdehtml::CachedObjectClient, public HTMLElementImpl
 {
 public:
     HTMLLinkElementImpl(DocumentImpl *doc)
@@ -104,7 +104,7 @@ public:
 protected:
     void finished();
 
-    khtml::CachedCSSStyleSheet *m_cachedSheet;
+    tdehtml::CachedCSSStyleSheet *m_cachedSheet;
     CSSStyleSheetImpl *m_sheet;
     DOMString m_url;
     TQString m_media;
@@ -135,7 +135,7 @@ protected:
 
 // -------------------------------------------------------------------------
 
-class HTMLScriptElementImpl : public HTMLElementImpl, public khtml::CachedObjectClient
+class HTMLScriptElementImpl : public HTMLElementImpl, public tdehtml::CachedObjectClient
 {
 public:
     HTMLScriptElementImpl(DocumentImpl *doc);
@@ -143,7 +143,7 @@ public:
 
     virtual void insertedIntoDocument();
     virtual void removedFromDocument();
-    virtual void notifyFinished(khtml::CachedObject *finishedObj);
+    virtual void notifyFinished(tdehtml::CachedObject *finishedObj);
     virtual void childrenChanged();
 
     virtual Id id() const;
@@ -175,7 +175,7 @@ public:
     void setType(const DOMString &);
 
 private:
-    khtml::CachedScript *m_cachedScript;
+    tdehtml::CachedScript *m_cachedScript;
     bool m_createdByParser;
     bool m_evaluated;
 };
diff --git a/khtml/html/html_imageimpl.cpp b/tdehtml/html/html_imageimpl.cpp
index be13e93c2..b1972aad4 100644
--- a/khtml/html/html_imageimpl.cpp
+++ b/tdehtml/html/html_imageimpl.cpp
@@ -25,8 +25,8 @@
 #include "html/html_documentimpl.h"
 
 #include "misc/htmlhashes.h"
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 
 #include <kstringhandler.h>
 #include <kglobal.h>
@@ -48,7 +48,7 @@
 #include <tqpointarray.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 // -------------------------------------------------------------------------
 
@@ -89,7 +89,7 @@ void HTMLImageElementImpl::parseAttribute(AttributeImpl *attr)
         //Start loading the image already, to generate events
         DOMString url = attr->value();
         if (!url.isEmpty()) { //### why do we not hide or something when setting this?
-            CachedImage* newImage = getDocument()->docLoader()->requestImage(khtml::parseURL(url));
+            CachedImage* newImage = getDocument()->docLoader()->requestImage(tdehtml::parseURL(url));
             if (newImage && newImage != m_image) {
                 CachedImage* oldImage = m_image;
                 loadEventSent = false;
@@ -147,7 +147,7 @@ void HTMLImageElementImpl::parseAttribute(AttributeImpl *attr)
         if ( attr->value()[0] == '#' )
             usemap = attr->value().lower();
         else {
-            TQString url = getDocument()->completeURL( khtml::parseURL( attr->value() ).string() );
+            TQString url = getDocument()->completeURL( tdehtml::parseURL( attr->value() ).string() );
             // ### we remove the part before the anchor and hope
             // the map is on the same html page....
             usemap = url;
@@ -410,7 +410,7 @@ void HTMLMapElementImpl::parseAttribute(AttributeImpl *attr)
         } 
         else {
             // add name with full url:
-            TQString url = getDocument()->completeURL( khtml::parseURL( attr->value() ).string() );
+            TQString url = getDocument()->completeURL( tdehtml::parseURL( attr->value() ).string() );
             if(getDocument()->isHTMLDocument())
                 static_cast<HTMLDocumentImpl*>(getDocument())->mapMap[url] = this;
         }
diff --git a/khtml/html/html_imageimpl.h b/tdehtml/html/html_imageimpl.h
index 6f26cd2df..f36e61295 100644
--- a/khtml/html/html_imageimpl.h
+++ b/tdehtml/html/html_imageimpl.h
@@ -24,7 +24,7 @@
 #define HTML_IMAGEIMPL_H
 
 #include "html/html_inlineimpl.h"
-#include "misc/khtmllayout.h"
+#include "misc/tdehtmllayout.h"
 #include "misc/loader_client.h"
 #include "rendering/render_object.h"
 
@@ -36,7 +36,7 @@ class DOMString;
 class HTMLFormElementImpl;
 
 class HTMLImageElementImpl
-    : public HTMLElementImpl, public khtml::CachedObjectClient
+    : public HTMLElementImpl, public tdehtml::CachedObjectClient
 {
     friend class HTMLFormElementImpl;
 public:
@@ -75,13 +75,13 @@ public:
      * @return True if and only if the image is completely downloaded yet*/
     bool complete() const;
 
-    virtual void notifyFinished(khtml::CachedObject *finishedObj);
+    virtual void notifyFinished(tdehtml::CachedObject *finishedObj);
     void dispatchLoadEvent();
 protected:
     DOMString usemap;
     bool ismap : 1;
     bool loadEventSent : 1;
-    khtml::CachedImage  *m_image;
+    tdehtml::CachedImage  *m_image;
     HTMLFormElementImpl *m_form;
     DOMString            m_name;
 };
@@ -105,7 +105,7 @@ public:
     bool isDefault() const { return shape==Default; }
 
     bool mapMouseEvent(int x_, int y_, int width_, int height_,
-                       khtml::RenderObject::NodeInfo& info);
+                       tdehtml::RenderObject::NodeInfo& info);
 
     virtual TQRect getRect() const;
 
@@ -114,7 +114,7 @@ public:
 protected:
     TQRegion getRegion(int width_, int height) const;
     TQRegion region;
-    khtml::Length* m_coords;
+    tdehtml::Length* m_coords;
     int m_coordsLen;
     int lastw, lasth;
     Shape shape  : 3;
@@ -138,7 +138,7 @@ public:
     virtual void parseAttribute(AttributeImpl *attr);
 
     bool mapMouseEvent(int x_, int y_, int width_, int height_,
-                       khtml::RenderObject::NodeInfo& info);
+                       tdehtml::RenderObject::NodeInfo& info);
 private:
 
     TQString name;
diff --git a/khtml/html/html_inlineimpl.cpp b/tdehtml/html/html_inlineimpl.cpp
index 9d30a5b4e..829b10f7b 100644
--- a/khtml/html/html_inlineimpl.cpp
+++ b/tdehtml/html/html_inlineimpl.cpp
@@ -29,8 +29,8 @@
 #include "html/html_documentimpl.h"
 
 #include "misc/htmlhashes.h"
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 #include "css/csshelper.h"
 #include "css/cssproperties.h"
 #include "css/cssvalues.h"
@@ -41,7 +41,7 @@
 
 #include <kdebug.h>
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 NodeImpl::Id HTMLAnchorElementImpl::id() const
@@ -54,7 +54,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
     bool keydown = evt->id() == EventImpl::KEYDOWN_EVENT && evt->isKeyRelatedEvent();
 
     // React on clicks and on keypresses.
-    // Don't make this KEYUP_EVENT again, it makes khtml follow links
+    // Don't make this KEYUP_EVENT again, it makes tdehtml follow links
     // it shouldn't, when pressing Enter in the combo.
     if ( ( (evt->id() == EventImpl::CLICK_EVENT && !static_cast<MouseEventImpl*>(evt)->isDoubleClick()) ||
          ( keydown && m_focused)) && m_hasAnchor) {
@@ -84,7 +84,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
             if (k->qKeyEvent()) k->qKeyEvent()->accept();
         }
 
-        url = khtml::parseURL(getAttribute(ATTR_HREF)).string();
+        url = tdehtml::parseURL(getAttribute(ATTR_HREF)).string();
 
         utarget = getAttribute(ATTR_TARGET).string();
 
@@ -95,7 +95,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
             HTMLImageElementImpl* img = static_cast<HTMLImageElementImpl*>( evt->target() );
             if ( img && img->isServerMap() )
             {
-                khtml::RenderImage *r = static_cast<khtml::RenderImage *>(img->renderer());
+                tdehtml::RenderImage *r = static_cast<tdehtml::RenderImage *>(img->renderer());
                 if(r && e)
                 {
                     KHTMLView* v = getDocument()->view();
diff --git a/khtml/html/html_inlineimpl.h b/tdehtml/html/html_inlineimpl.h
index 252e64e41..252e64e41 100644
--- a/khtml/html/html_inlineimpl.h
+++ b/tdehtml/html/html_inlineimpl.h
diff --git a/khtml/html/html_listimpl.cpp b/tdehtml/html/html_listimpl.cpp
index e1650af46..1ad450f84 100644
--- a/khtml/html/html_listimpl.cpp
+++ b/tdehtml/html/html_listimpl.cpp
@@ -30,7 +30,7 @@ using namespace DOM;
 #include "misc/htmlhashes.h"
 #include "xml/dom_docimpl.h"
 
-using namespace khtml;
+using namespace tdehtml;
 
 NodeImpl::Id HTMLUListElementImpl::id() const
 {
diff --git a/khtml/html/html_listimpl.h b/tdehtml/html/html_listimpl.h
index d4a9f4436..d4a9f4436 100644
--- a/khtml/html/html_listimpl.h
+++ b/tdehtml/html/html_listimpl.h
diff --git a/khtml/html/html_miscimpl.cpp b/tdehtml/html/html_miscimpl.cpp
index 58804bff5..58804bff5 100644
--- a/khtml/html/html_miscimpl.cpp
+++ b/tdehtml/html/html_miscimpl.cpp
diff --git a/khtml/html/html_miscimpl.h b/tdehtml/html/html_miscimpl.h
index b28fef82a..b28fef82a 100644
--- a/khtml/html/html_miscimpl.h
+++ b/tdehtml/html/html_miscimpl.h
diff --git a/khtml/html/html_objectimpl.cpp b/tdehtml/html/html_objectimpl.cpp
index 2dc0f4288..b224ad687 100644
--- a/khtml/html/html_objectimpl.cpp
+++ b/tdehtml/html/html_objectimpl.cpp
@@ -22,10 +22,10 @@
  */
 #include "html/html_objectimpl.h"
 
-#include "khtml_part.h"
+#include "tdehtml_part.h"
 #include "dom/dom_string.h"
 #include "misc/htmlhashes.h"
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 #include <tqstring.h>
 #include <tqvariant.h>
 #include <tqmap.h>
@@ -45,7 +45,7 @@
 #include "xml/dom2_eventsimpl.h"
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 // -------------------------------------------------------------------------
 HTMLObjectBaseElementImpl::HTMLObjectBaseElementImpl(DocumentImpl *doc)
@@ -304,7 +304,7 @@ void HTMLEmbedElementImpl::parseAttribute(AttributeImpl *attr)
   {
      case ATTR_CODE:
      case ATTR_SRC:
-         url = khtml::parseURL(attr->val()).string();
+         url = tdehtml::parseURL(attr->val()).string();
          needWidgetUpdate = true;
          break;
      case ATTR_BORDER:
@@ -383,7 +383,7 @@ void HTMLObjectElementImpl::parseAttribute(AttributeImpl *attr)
   switch ( attr->id() )
   {
     case ATTR_DATA:
-      url = khtml::parseURL( attr->val() ).string();
+      url = tdehtml::parseURL( attr->val() ).string();
       needWidgetUpdate = true;
       break;
     case ATTR_CLASSID:
diff --git a/khtml/html/html_objectimpl.h b/tdehtml/html/html_objectimpl.h
index 4204e6ef3..cc91935ca 100644
--- a/khtml/html/html_objectimpl.h
+++ b/tdehtml/html/html_objectimpl.h
@@ -81,7 +81,7 @@ public:
     virtual void parseAttribute(AttributeImpl *token);
     virtual void attach();
 protected:
-    khtml::VAlign valign;
+    tdehtml::VAlign valign;
 };
 
 // -------------------------------------------------------------------------
diff --git a/khtml/html/html_tableimpl.cpp b/tdehtml/html/html_tableimpl.cpp
index 2c2e6567d..3fc4ba757 100644
--- a/khtml/html/html_tableimpl.cpp
+++ b/tdehtml/html/html_tableimpl.cpp
@@ -32,8 +32,8 @@
 #include "dom/dom_node.h"
 
 #include "misc/htmlhashes.h"
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 
 #include "css/cssstyleselector.h"
 #include "css/cssproperties.h"
@@ -45,7 +45,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 HTMLTableElementImpl::HTMLTableElementImpl(DocumentImpl *doc)
@@ -464,7 +464,7 @@ void HTMLTableElementImpl::parseAttribute(AttributeImpl *attr)
     case ATTR_BACKGROUND:
     {
         if (!attr->value().isEmpty()) {
-            TQString url = khtml::parseURL( attr->value() ).string();
+            TQString url = tdehtml::parseURL( attr->value() ).string();
             url = getDocument()->completeURL( url );
             addCSSProperty(CSS_PROP_BACKGROUND_IMAGE, "url('"+url+"')" );
         }
@@ -604,7 +604,7 @@ void HTMLTablePartElementImpl::parseAttribute(AttributeImpl *attr)
     case ATTR_BACKGROUND:
     {
         if (attr->val()) {
-            TQString url = khtml::parseURL( attr->value() ).string();
+            TQString url = tdehtml::parseURL( attr->value() ).string();
             url = getDocument()->completeURL( url );
             addCSSProperty(CSS_PROP_BACKGROUND_IMAGE,  "url('"+url+"')" );
         }
diff --git a/khtml/html/html_tableimpl.h b/tdehtml/html/html_tableimpl.h
index 76d81ce50..76d81ce50 100644
--- a/khtml/html/html_tableimpl.h
+++ b/tdehtml/html/html_tableimpl.h
diff --git a/khtml/html/htmlparser.cpp b/tdehtml/html/htmlparser.cpp
index 9da99f4b3..144a9addd 100644
--- a/khtml/html/htmlparser.cpp
+++ b/tdehtml/html/htmlparser.cpp
@@ -45,9 +45,9 @@
 #include "xml/dom_nodeimpl.h"
 #include "misc/htmlhashes.h"
 #include "html/htmltokenizer.h"
-#include "khtmlview.h"
-#include "khtml_part.h"
-#include "khtml_factory.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
+#include "tdehtml_factory.h"
 #include "css/cssproperties.h"
 #include "css/cssvalues.h"
 #include "css/csshelper.h"
@@ -59,7 +59,7 @@
 #include <klocale.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 //----------------------------------------------------------------------------
 
@@ -915,7 +915,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
              KHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled() &&
              !strcasecmp( t->attrs->getValue( ATTR_TYPE ), "image" ) )
         {
-            if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered( doc()->completeURL( khtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() ) ))
+            if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered( doc()->completeURL( tdehtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() ) ))
                 return 0;
         }
         n = new HTMLInputElementImpl(document, form);
@@ -1041,7 +1041,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
             KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()&&
             KHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled())
         {
-            TQString url = doc()->completeURL( khtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() );
+            TQString url = doc()->completeURL( tdehtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() );
             if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered(url))
                 return 0;
         }
@@ -1710,7 +1710,7 @@ NodeImpl *KHTMLParser::handleIsindex( Token *t )
     child = new TextImpl(document, text.implementation());
     n->addChild( child );
     child = new HTMLIsIndexElementImpl(document, myform);
-    static_cast<ElementImpl *>(child)->setAttribute(ATTR_TYPE, "khtml_isindex");
+    static_cast<ElementImpl *>(child)->setAttribute(ATTR_TYPE, "tdehtml_isindex");
     n->addChild( child );
     child = new HTMLHRElementImpl( document );
     n->addChild( child );
diff --git a/khtml/html/htmlparser.h b/tdehtml/html/htmlparser.h
index d0ce549ef..660ced9e9 100644
--- a/khtml/html/htmlparser.h
+++ b/tdehtml/html/htmlparser.h
@@ -58,7 +58,7 @@ namespace DOM {
     class DocumentFragmentImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 class Token;
 
@@ -186,7 +186,7 @@ private:
 #endif
 };
 
-} // namespace khtml
+} // namespace tdehtml
 
 #endif // HTMLPARSER_H
 
diff --git a/khtml/html/htmltokenizer.cpp b/tdehtml/html/htmltokenizer.cpp
index 50e3ea69e..83bfd4bd5 100644
--- a/khtml/html/htmltokenizer.cpp
+++ b/tdehtml/html/htmltokenizer.cpp
@@ -44,8 +44,8 @@
 #include "misc/loader.h"
 #include "misc/htmlhashes.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 #include "xml/dom_docimpl.h"
 #include "css/csshelper.h"
 #include "ecma/kjs_proxy.h"
@@ -59,7 +59,7 @@
 
 #include "kentities.c"
 
-using namespace khtml;
+using namespace tdehtml;
 
 static const TQChar commentStart [] = { '<','!','-','-', TQChar::null };
 
@@ -845,7 +845,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
                         currToken.flat = true;
                 }
 
-                uint tagID = khtml::getTagID(ptr, len);
+                uint tagID = tdehtml::getTagID(ptr, len);
                 if (!tagID) {
 #ifdef TOKEN_DEBUG
                     TQCString tmp(ptr, len+1);
@@ -910,13 +910,13 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
                     if(curchar <= ' ' || curchar == '=' || curchar == '>') {
                         unsigned int a;
                         cBuffer[cBufferPos] = '\0';
-                        a = khtml::getAttrID(cBuffer, cBufferPos);
+                        a = tdehtml::getAttrID(cBuffer, cBufferPos);
                         if ( !a ) {
                             // did we just get /> or e.g checked/>
                             if (curchar == '>' && cBufferPos >=1 && cBuffer[cBufferPos-1] == '/') {
                                 currToken.flat = true;
                                 if (cBufferPos>1)
-                                    a = khtml::getAttrID(cBuffer, cBufferPos-1);
+                                    a = tdehtml::getAttrID(cBuffer, cBufferPos-1);
                             }
                             if (!a)
                                 attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data());
@@ -1126,7 +1126,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
                      parser->doc()->view()->part()->jScriptEnabled() /* jscript allowed at all? */
                     ) {
                     if ( ( a = currToken.attrs->getValue( ATTR_SRC ) ) )
-                        scriptSrc = parser->doc()->completeURL(khtml::parseURL( DOMString(a) ).string() );
+                        scriptSrc = parser->doc()->completeURL(tdehtml::parseURL( DOMString(a) ).string() );
                     if ( ( a = currToken.attrs->getValue( ATTR_CHARSET ) ) )
                         scriptSrcCharset = DOMString(a).string().stripWhiteSpace();
                     if ( scriptSrcCharset.isEmpty() && view)
diff --git a/khtml/html/htmltokenizer.h b/tdehtml/html/htmltokenizer.h
index 10ef76176..5222647d4 100644
--- a/khtml/html/htmltokenizer.h
+++ b/tdehtml/html/htmltokenizer.h
@@ -48,7 +48,7 @@ namespace DOM {
     class DocumentFragmentImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
     class CachedScript;
     class KHTMLParser;
 
@@ -127,7 +127,7 @@ public:
     virtual ~HTMLTokenizer();
 
     void begin();
-    void write( const khtml::TokenizerString &str, bool appendData );
+    void write( const tdehtml::TokenizerString &str, bool appendData );
     void end();
     void finish();
     void timerEvent( TQTimerEvent *e );
@@ -141,16 +141,16 @@ protected:
     void reset();
     void addPending();
     void processToken();
-    void processListing(khtml::TokenizerString list);
-
-    void parseComment(khtml::TokenizerString &str);
-    void parseServer(khtml::TokenizerString &str);
-    void parseText(khtml::TokenizerString &str);
-    void parseListing(khtml::TokenizerString &str);
-    void parseSpecial(khtml::TokenizerString &str);
-    void parseTag(khtml::TokenizerString &str);
-    void parseEntity(khtml::TokenizerString &str, TQChar *&dest, bool start = false);
-    void parseProcessingInstruction(khtml::TokenizerString &str);
+    void processListing(tdehtml::TokenizerString list);
+
+    void parseComment(tdehtml::TokenizerString &str);
+    void parseServer(tdehtml::TokenizerString &str);
+    void parseText(tdehtml::TokenizerString &str);
+    void parseListing(tdehtml::TokenizerString &str);
+    void parseSpecial(tdehtml::TokenizerString &str);
+    void parseTag(tdehtml::TokenizerString &str);
+    void parseEntity(tdehtml::TokenizerString &str, TQChar *&dest, bool start = false);
+    void parseProcessingInstruction(tdehtml::TokenizerString &str);
     void scriptHandler();
     void scriptExecution(const TQString& script, const TQString& scriptURL = TQString::null, int baseLine = 0);
     void setSrc(const TokenizerString& source);
@@ -172,7 +172,7 @@ protected:
     void enlargeScriptBuffer(int len);
 
     // from CachedObjectClient
-    void notifyFinished(khtml::CachedObject *finishedObj);
+    void notifyFinished(tdehtml::CachedObject *finishedObj);
 
 protected:
     // Internal buffers
@@ -180,7 +180,7 @@ protected:
     TQChar *buffer;
     TQChar *dest;
 
-    khtml::Token currToken;
+    tdehtml::Token currToken;
 
     // the size of buffer
     int size;
@@ -321,7 +321,7 @@ protected:
     // true if we are executing a script while parsing a document. This causes the parsing of
     // the output of the script to be postponed until after the script has finished executing
     int m_executingScript;
-    TQPtrQueue<khtml::CachedScript> cachedScript;
+    TQPtrQueue<tdehtml::CachedScript> cachedScript;
     // you can pause the tokenizer if you need to display a dialog or something
     bool onHold;
     // you can ask the tokenizer to abort the current write() call, e.g. to redirect somewhere else
@@ -344,7 +344,7 @@ protected:
     unsigned int cBufferPos;
     unsigned int entityLen;
 
-    khtml::TokenizerString src;
+    tdehtml::TokenizerString src;
 
     KCharsets *charsets;
     KHTMLParser *parser;
diff --git a/khtml/htmlpageinfo.ui b/tdehtml/htmlpageinfo.ui
index 5dd21cd6f..5dd21cd6f 100644
--- a/khtml/htmlpageinfo.ui
+++ b/tdehtml/htmlpageinfo.ui
diff --git a/khtml/java/CMakeLists.txt b/tdehtml/java/CMakeLists.txt
index abda3ed66..994763c09 100644
--- a/khtml/java/CMakeLists.txt
+++ b/tdehtml/java/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_BINARY_DIR}/kio/kssl
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
@@ -71,6 +71,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/khtml/java/ChangeLog b/tdehtml/java/ChangeLog
index b276c27ac..b276c27ac 100644
--- a/khtml/java/ChangeLog
+++ b/tdehtml/java/ChangeLog
diff --git a/khtml/java/KJAS_GRAMMAR.txt b/tdehtml/java/KJAS_GRAMMAR.txt
index 5632f8de8..5632f8de8 100644
--- a/khtml/java/KJAS_GRAMMAR.txt
+++ b/tdehtml/java/KJAS_GRAMMAR.txt
diff --git a/khtml/java/Makefile.am b/tdehtml/java/Makefile.am
index a6b719262..a5e46a0d5 100644
--- a/khtml/java/Makefile.am
+++ b/tdehtml/java/Makefile.am
@@ -14,7 +14,7 @@ METASOURCES = AUTO
 libkjava_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
 libkjava_la_LIBADD = $(LIB_KPARTS)
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/khtml \
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tdehtml \
 	-I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl \
 	$(all_includes) 
 
diff --git a/khtml/java/README b/tdehtml/java/README
index 5d64e742f..5d64e742f 100644
--- a/khtml/java/README
+++ b/tdehtml/java/README
diff --git a/khtml/java/TODO b/tdehtml/java/TODO
index 2b9289e59..3d707c898 100644
--- a/khtml/java/TODO
+++ b/tdehtml/java/TODO
@@ -5,11 +5,11 @@ a Java 1.1 security manager, please feel free and we can integrate
 both versions.
 
 - Get the keyboard focus issues fixed
-- Fix khtml_part to have one applet context per Document
+- Fix tdehtml_part to have one applet context per Document
 - add a context cache someplace so we can reload contexts-
   this will keep us from having to restart the jvm over
   and over- this is the biggest performance problem I think
-- fix khtml_part so it will start and stop applets??
+- fix tdehtml_part so it will start and stop applets??
 - Implement class loading via html proxies if one is set
 
 
diff --git a/khtml/java/build.properties b/tdehtml/java/build.properties
index c2c0016bc..c2c0016bc 100644
--- a/khtml/java/build.properties
+++ b/tdehtml/java/build.properties
diff --git a/khtml/java/build.xml b/tdehtml/java/build.xml
index 16b523588..16b523588 100644
--- a/khtml/java/build.xml
+++ b/tdehtml/java/build.xml
diff --git a/khtml/java/configure.in.in b/tdehtml/java/configure.in.in
index 32e7883ef..2ed75f6fe 100644
--- a/khtml/java/configure.in.in
+++ b/tdehtml/java/configure.in.in
@@ -1,5 +1,5 @@
 dnl don't remove
-dnl AC_OUTPUT(khtml/java/kjava.policy)
+dnl AC_OUTPUT(tdehtml/java/kjava.policy)
 KJAVA_POLICYPATH=${kde_datadir}/kjava/-
 KDE_EXPAND_MAKEVAR(KJAVA_POLICYPATH, KJAVA_POLICYPATH)
 AC_SUBST(KJAVA_POLICYPATH)
diff --git a/khtml/java/cr16-action-java.png b/tdehtml/java/cr16-action-java.png
index dca85a129..dca85a129 100644
--- a/khtml/java/cr16-action-java.png
+++ b/tdehtml/java/cr16-action-java.png
diff --git a/khtml/java/dummy/CMakeLists.txt b/tdehtml/java/dummy/CMakeLists.txt
index 5828f4b83..5828f4b83 100644
--- a/khtml/java/dummy/CMakeLists.txt
+++ b/tdehtml/java/dummy/CMakeLists.txt
diff --git a/khtml/java/dummy/Makefile.am b/tdehtml/java/dummy/Makefile.am
index 5438da6ad..5438da6ad 100644
--- a/khtml/java/dummy/Makefile.am
+++ b/tdehtml/java/dummy/Makefile.am
diff --git a/khtml/java/images/animbean.gif b/tdehtml/java/images/animbean.gif
index a842be25d..a842be25d 100644
--- a/khtml/java/images/animbean.gif
+++ b/tdehtml/java/images/animbean.gif
diff --git a/khtml/java/images/beanicon.png b/tdehtml/java/images/beanicon.png
index d1632c16e..d1632c16e 100644
--- a/khtml/java/images/beanicon.png
+++ b/tdehtml/java/images/beanicon.png
diff --git a/khtml/java/images/brokenbean.gif b/tdehtml/java/images/brokenbean.gif
index 9f46dc355..9f46dc355 100644
--- a/khtml/java/images/brokenbean.gif
+++ b/tdehtml/java/images/brokenbean.gif
diff --git a/khtml/java/kjava.jar b/tdehtml/java/kjava.jar
index afab6884b..afab6884b 100644
--- a/khtml/java/kjava.jar
+++ b/tdehtml/java/kjava.jar
diff --git a/khtml/java/kjava.policy.in b/tdehtml/java/kjava.policy.in
index 72197bb2e..72197bb2e 100644
--- a/khtml/java/kjava.policy.in
+++ b/tdehtml/java/kjava.policy.in
diff --git a/khtml/java/kjavaapplet.cpp b/tdehtml/java/kjavaapplet.cpp
index 879c8624e..70a39afbc 100644
--- a/khtml/java/kjavaapplet.cpp
+++ b/tdehtml/java/kjavaapplet.cpp
@@ -24,7 +24,7 @@
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 
 
diff --git a/khtml/java/kjavaapplet.h b/tdehtml/java/kjavaapplet.h
index 8e02c5ba4..8e02c5ba4 100644
--- a/khtml/java/kjavaapplet.h
+++ b/tdehtml/java/kjavaapplet.h
diff --git a/khtml/java/kjavaappletcontext.cpp b/tdehtml/java/kjavaappletcontext.cpp
index 76914a5dc..76914a5dc 100644
--- a/khtml/java/kjavaappletcontext.cpp
+++ b/tdehtml/java/kjavaappletcontext.cpp
diff --git a/khtml/java/kjavaappletcontext.h b/tdehtml/java/kjavaappletcontext.h
index 119699f23..119699f23 100644
--- a/khtml/java/kjavaappletcontext.h
+++ b/tdehtml/java/kjavaappletcontext.h
diff --git a/khtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index 9d8b0ac4f..b125bcc1a 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <kconfig.h>
 #include <klocale.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
 
diff --git a/khtml/java/kjavaappletserver.h b/tdehtml/java/kjavaappletserver.h
index 63463b040..63463b040 100644
--- a/khtml/java/kjavaappletserver.h
+++ b/tdehtml/java/kjavaappletserver.h
diff --git a/khtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index 979403df4..fce5195ff 100644
--- a/khtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -223,7 +223,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
                                            new KJavaServerMaintainer);
     }
     m_view = new CoverWidget (wparent);
-    TQString classname, classid, codebase, khtml_codebase, src_param;
+    TQString classname, classid, codebase, tdehtml_codebase, src_param;
     int width = -1;
     int height = -1;
     KJavaApplet* const applet = m_view->appletWidget()->applet ();
@@ -244,7 +244,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
                 if (name == "__KHTML__PLUGINBASEURL") {
                     baseurl = KURL (KURL (value), TQString (".")).url ();
                 } else if (name == "__KHTML__CODEBASE")
-                    khtml_codebase = value;
+                    tdehtml_codebase = value;
                 else if (name_lower == TQString::fromLatin1("codebase") ||
                          name_lower == TQString::fromLatin1("java_codebase")) {
                     if (!value.isEmpty ())
@@ -278,7 +278,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
         kdDebug(6100) << "classid=" << classid << classid.startsWith("clsid:")<< endl;
         if (classid.startsWith ("clsid:"))
             // codeBase contains the URL to the plugin page
-            khtml_codebase = baseurl;
+            tdehtml_codebase = baseurl;
         else if (classname.isEmpty () && classid.startsWith ("java:"))
             classname = classid.mid(5);
     }
@@ -287,9 +287,9 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
     else if (!src_param.isEmpty ())
         applet->setParameter (TQString ("SRC"), src_param);
     if (codebase.isEmpty ())
-        codebase = khtml_codebase;
+        codebase = tdehtml_codebase;
     if (baseurl.isEmpty ()) {
-        // not embeded in khtml
+        // not embeded in tdehtml
         TQString pwd = TQDir().absPath ();
         if (!pwd.endsWith (TQChar (TQDir::separator ())))
             pwd += TQDir::separator ();
diff --git a/khtml/java/kjavaappletviewer.desktop b/tdehtml/java/kjavaappletviewer.desktop
index 9a2d16355..9a2d16355 100644
--- a/khtml/java/kjavaappletviewer.desktop
+++ b/tdehtml/java/kjavaappletviewer.desktop
diff --git a/khtml/java/kjavaappletviewer.h b/tdehtml/java/kjavaappletviewer.h
index cf2c20721..9b32e3f21 100644
--- a/khtml/java/kjavaappletviewer.h
+++ b/tdehtml/java/kjavaappletviewer.h
@@ -23,10 +23,10 @@
 #ifndef KJAVAAPPLETVIEWER_H
 #define KJAVAAPPLETVIEWER_H
 
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
-#include <kparts/statusbarextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/statusbarextension.h>
+#include <tdeparts/factory.h>
 #include <kdialogbase.h>
 #include <kurl.h>
 #include <tqobject.h>
diff --git a/khtml/java/kjavaappletwidget.cpp b/tdehtml/java/kjavaappletwidget.cpp
index c096261cd..c096261cd 100644
--- a/khtml/java/kjavaappletwidget.cpp
+++ b/tdehtml/java/kjavaappletwidget.cpp
diff --git a/khtml/java/kjavaappletwidget.h b/tdehtml/java/kjavaappletwidget.h
index e84f96039..e84f96039 100644
--- a/khtml/java/kjavaappletwidget.h
+++ b/tdehtml/java/kjavaappletwidget.h
diff --git a/khtml/java/kjavadownloader.cpp b/tdehtml/java/kjavadownloader.cpp
index a0a8abdd2..a0a8abdd2 100644
--- a/khtml/java/kjavadownloader.cpp
+++ b/tdehtml/java/kjavadownloader.cpp
diff --git a/khtml/java/kjavadownloader.h b/tdehtml/java/kjavadownloader.h
index 22690824c..22690824c 100644
--- a/khtml/java/kjavadownloader.h
+++ b/tdehtml/java/kjavadownloader.h
diff --git a/khtml/java/kjavaprocess.cpp b/tdehtml/java/kjavaprocess.cpp
index dbe80305e..dbe80305e 100644
--- a/khtml/java/kjavaprocess.cpp
+++ b/tdehtml/java/kjavaprocess.cpp
diff --git a/khtml/java/kjavaprocess.h b/tdehtml/java/kjavaprocess.h
index 4768bc382..4768bc382 100644
--- a/khtml/java/kjavaprocess.h
+++ b/tdehtml/java/kjavaprocess.h
diff --git a/khtml/java/kqeventutil.cpp b/tdehtml/java/kqeventutil.cpp
index ff15e97da..ff15e97da 100644
--- a/khtml/java/kqeventutil.cpp
+++ b/tdehtml/java/kqeventutil.cpp
diff --git a/khtml/java/kqeventutil.h b/tdehtml/java/kqeventutil.h
index c7ec19bf0..c7ec19bf0 100644
--- a/khtml/java/kqeventutil.h
+++ b/tdehtml/java/kqeventutil.h
diff --git a/khtml/java/kxeventutil.cpp b/tdehtml/java/kxeventutil.cpp
index 9afa5a5ac..9afa5a5ac 100644
--- a/khtml/java/kxeventutil.cpp
+++ b/tdehtml/java/kxeventutil.cpp
diff --git a/khtml/java/kxeventutil.h b/tdehtml/java/kxeventutil.h
index 6eb0bf14b..6eb0bf14b 100644
--- a/khtml/java/kxeventutil.h
+++ b/tdehtml/java/kxeventutil.h
diff --git a/khtml/java/make-jar b/tdehtml/java/make-jar
index a817ec1f3..a817ec1f3 100755
--- a/khtml/java/make-jar
+++ b/tdehtml/java/make-jar
diff --git a/khtml/java/netscape/javascript/JSException.java b/tdehtml/java/netscape/javascript/JSException.java
index 222033e7a..222033e7a 100644
--- a/khtml/java/netscape/javascript/JSException.java
+++ b/tdehtml/java/netscape/javascript/JSException.java
diff --git a/khtml/java/netscape/javascript/JSObject.java b/tdehtml/java/netscape/javascript/JSObject.java
index f103d90c8..f103d90c8 100644
--- a/khtml/java/netscape/javascript/JSObject.java
+++ b/tdehtml/java/netscape/javascript/JSObject.java
diff --git a/khtml/java/netscape/plugin/Plugin.java b/tdehtml/java/netscape/plugin/Plugin.java
index c7be0e542..c7be0e542 100644
--- a/khtml/java/netscape/plugin/Plugin.java
+++ b/tdehtml/java/netscape/plugin/Plugin.java
diff --git a/khtml/java/netscape/security/ForbiddenTargetException.java b/tdehtml/java/netscape/security/ForbiddenTargetException.java
index 27879d05b..27879d05b 100644
--- a/khtml/java/netscape/security/ForbiddenTargetException.java
+++ b/tdehtml/java/netscape/security/ForbiddenTargetException.java
diff --git a/khtml/java/netscape/security/Principal.java b/tdehtml/java/netscape/security/Principal.java
index 1f93a8293..1f93a8293 100644
--- a/khtml/java/netscape/security/Principal.java
+++ b/tdehtml/java/netscape/security/Principal.java
diff --git a/khtml/java/netscape/security/PrivilegeManager.java b/tdehtml/java/netscape/security/PrivilegeManager.java
index c6555eaa0..c6555eaa0 100644
--- a/khtml/java/netscape/security/PrivilegeManager.java
+++ b/tdehtml/java/netscape/security/PrivilegeManager.java
diff --git a/khtml/java/netscape/security/Target.java b/tdehtml/java/netscape/security/Target.java
index 8b50040b5..8b50040b5 100644
--- a/khtml/java/netscape/security/Target.java
+++ b/tdehtml/java/netscape/security/Target.java
diff --git a/khtml/java/org/kde/javascript/JSObject.java b/tdehtml/java/org/kde/javascript/JSObject.java
index 11e7f9f99..11e7f9f99 100644
--- a/khtml/java/org/kde/javascript/JSObject.java
+++ b/tdehtml/java/org/kde/javascript/JSObject.java
diff --git a/khtml/java/org/kde/kjas/server/Console.java b/tdehtml/java/org/kde/kjas/server/Console.java
index d089f3cd8..d089f3cd8 100644
--- a/khtml/java/org/kde/kjas/server/Console.java
+++ b/tdehtml/java/org/kde/kjas/server/Console.java
diff --git a/khtml/java/org/kde/kjas/server/KJASAppletClassLoader.java b/tdehtml/java/org/kde/kjas/server/KJASAppletClassLoader.java
index c6defa848..c6defa848 100644
--- a/khtml/java/org/kde/kjas/server/KJASAppletClassLoader.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASAppletClassLoader.java
diff --git a/khtml/java/org/kde/kjas/server/KJASAppletContext.java b/tdehtml/java/org/kde/kjas/server/KJASAppletContext.java
index f868b7b64..f868b7b64 100644
--- a/khtml/java/org/kde/kjas/server/KJASAppletContext.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASAppletContext.java
diff --git a/khtml/java/org/kde/kjas/server/KJASAppletPanel.java b/tdehtml/java/org/kde/kjas/server/KJASAppletPanel.java
index d7acbdaf9..d7acbdaf9 100644
--- a/khtml/java/org/kde/kjas/server/KJASAppletPanel.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASAppletPanel.java
diff --git a/khtml/java/org/kde/kjas/server/KJASAppletStub.java b/tdehtml/java/org/kde/kjas/server/KJASAppletStub.java
index e090183d7..e090183d7 100644
--- a/khtml/java/org/kde/kjas/server/KJASAppletStub.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASAppletStub.java
diff --git a/khtml/java/org/kde/kjas/server/KJASAudioClip.java b/tdehtml/java/org/kde/kjas/server/KJASAudioClip.java
index 3a40cf6e0..3a40cf6e0 100644
--- a/khtml/java/org/kde/kjas/server/KJASAudioClip.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASAudioClip.java
diff --git a/khtml/java/org/kde/kjas/server/KJASBrokenClassFixer.java b/tdehtml/java/org/kde/kjas/server/KJASBrokenClassFixer.java
index aab1be4af..aab1be4af 100644
--- a/khtml/java/org/kde/kjas/server/KJASBrokenClassFixer.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASBrokenClassFixer.java
diff --git a/khtml/java/org/kde/kjas/server/KJASConsole.java b/tdehtml/java/org/kde/kjas/server/KJASConsole.java
index 51498b59b..51498b59b 100644
--- a/khtml/java/org/kde/kjas/server/KJASConsole.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASConsole.java
diff --git a/khtml/java/org/kde/kjas/server/KJASConsoleStream.java b/tdehtml/java/org/kde/kjas/server/KJASConsoleStream.java
index 2c1152ed4..2c1152ed4 100644
--- a/khtml/java/org/kde/kjas/server/KJASConsoleStream.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASConsoleStream.java
diff --git a/khtml/java/org/kde/kjas/server/KJASProtocolHandler.java b/tdehtml/java/org/kde/kjas/server/KJASProtocolHandler.java
index f8b50a91d..f8b50a91d 100644
--- a/khtml/java/org/kde/kjas/server/KJASProtocolHandler.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASProtocolHandler.java
diff --git a/khtml/java/org/kde/kjas/server/KJASSecurityManager.java b/tdehtml/java/org/kde/kjas/server/KJASSecurityManager.java
index 0525bba0c..0525bba0c 100644
--- a/khtml/java/org/kde/kjas/server/KJASSecurityManager.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASSecurityManager.java
diff --git a/khtml/java/org/kde/kjas/server/KJASSoundPlayer.java b/tdehtml/java/org/kde/kjas/server/KJASSoundPlayer.java
index a37c2bbd4..a37c2bbd4 100644
--- a/khtml/java/org/kde/kjas/server/KJASSoundPlayer.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASSoundPlayer.java
diff --git a/khtml/java/org/kde/kjas/server/KJASSwingConsole.java b/tdehtml/java/org/kde/kjas/server/KJASSwingConsole.java
index fedda6c48..fedda6c48 100644
--- a/khtml/java/org/kde/kjas/server/KJASSwingConsole.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASSwingConsole.java
diff --git a/khtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java b/tdehtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java
index 58c5ff518..58c5ff518 100644
--- a/khtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java
diff --git a/khtml/java/org/kde/kjas/server/Main.java b/tdehtml/java/org/kde/kjas/server/Main.java
index 50ccb14f1..50ccb14f1 100644
--- a/khtml/java/org/kde/kjas/server/Main.java
+++ b/tdehtml/java/org/kde/kjas/server/Main.java
diff --git a/khtml/java/org/kde/kjas/server/StatusListener.java b/tdehtml/java/org/kde/kjas/server/StatusListener.java
index be17c2b29..be17c2b29 100644
--- a/khtml/java/org/kde/kjas/server/StatusListener.java
+++ b/tdehtml/java/org/kde/kjas/server/StatusListener.java
diff --git a/khtml/java/pluginsinfo b/tdehtml/java/pluginsinfo
index 7d37ed7c8..7d37ed7c8 100644
--- a/khtml/java/pluginsinfo
+++ b/tdehtml/java/pluginsinfo
diff --git a/khtml/java/tests/Makefile.am b/tdehtml/java/tests/Makefile.am
index ab392b874..55e6fc732 100644
--- a/khtml/java/tests/Makefile.am
+++ b/tdehtml/java/tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/khtml/java -I$(top_srcdir)/khtml \
+INCLUDES = -I$(top_srcdir)/tdehtml/java -I$(top_srcdir)/tdehtml \
            -I$(top_srcdir) $(all_includes)
 
 check_PROGRAMS = testserver 
diff --git a/khtml/java/tests/badapplets/BadApplet.jar b/tdehtml/java/tests/badapplets/BadApplet.jar
index fc9c274a2..fc9c274a2 100644
--- a/khtml/java/tests/badapplets/BadApplet.jar
+++ b/tdehtml/java/tests/badapplets/BadApplet.jar
diff --git a/khtml/java/tests/badapplets/BadApplet.java b/tdehtml/java/tests/badapplets/BadApplet.java
index c8217d256..c8217d256 100644
--- a/khtml/java/tests/badapplets/BadApplet.java
+++ b/tdehtml/java/tests/badapplets/BadApplet.java
diff --git a/khtml/java/tests/badapplets/applet.html b/tdehtml/java/tests/badapplets/applet.html
index fe9e47ef9..fe9e47ef9 100644
--- a/khtml/java/tests/badapplets/applet.html
+++ b/tdehtml/java/tests/badapplets/applet.html
diff --git a/khtml/java/tests/good_sites b/tdehtml/java/tests/good_sites
index f9699fe2a..f9699fe2a 100644
--- a/khtml/java/tests/good_sites
+++ b/tdehtml/java/tests/good_sites
diff --git a/khtml/java/tests/testkjavaappletserver.cpp b/tdehtml/java/tests/testkjavaappletserver.cpp
index fb5ed8c0d..ea8a7656b 100644
--- a/khtml/java/tests/testkjavaappletserver.cpp
+++ b/tdehtml/java/tests/testkjavaappletserver.cpp
@@ -29,7 +29,7 @@ int main(int argc, char **argv)
 
     a->show();
 
-    a->applet()->setBaseURL( "file:" + path_to_tdelibs + "/tdelibs/khtml/test/" );
+    a->applet()->setBaseURL( "file:" + path_to_tdelibs + "/tdelibs/tdehtml/test/" );
     a->applet()->setAppletName( "Lake" );
     a->applet()->setAppletClass( "lake.class" );
     a->applet()->setParameter( "image", "konqi.gif" );
diff --git a/khtml/kjserrordlg.ui b/tdehtml/kjserrordlg.ui
index d5e9c7e28..d5e9c7e28 100644
--- a/khtml/kjserrordlg.ui
+++ b/tdehtml/kjserrordlg.ui
diff --git a/khtml/kjserrordlg.ui.h b/tdehtml/kjserrordlg.ui.h
index 50b73568e..50b73568e 100644
--- a/khtml/kjserrordlg.ui.h
+++ b/tdehtml/kjserrordlg.ui.h
diff --git a/khtml/libkhtml.map b/tdehtml/libtdehtml.map
index 65bafbfe2..7ffe30238 100644
--- a/khtml/libkhtml.map
+++ b/tdehtml/libtdehtml.map
@@ -17,6 +17,6 @@
     vtable*KJS::*;
     KJSProxy*;
     KJSCPUGuard*;
-    khtml::*
+    tdehtml::*
   };
 };
diff --git a/khtml/misc/CMakeLists.txt b/tdehtml/misc/CMakeLists.txt
index 3ef86c200..da1f0dfd3 100644
--- a/khtml/misc/CMakeLists.txt
+++ b/tdehtml/misc/CMakeLists.txt
@@ -15,20 +15,20 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_SOURCE_DIR}/kio
   ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/kio/kfile
 )
 
 
-##### khtmlmisc-static ###########################
+##### tdehtmlmisc-static ###########################
 
-set( target khtmlmisc )
+set( target tdehtmlmisc )
 
 set( ${target}_SRCS
   decoder.cpp loader.cpp loader_jpeg.cpp guess_ja.cpp
diff --git a/khtml/misc/Makefile.am b/tdehtml/misc/Makefile.am
index f0dc1ab76..670fd5a1f 100644
--- a/khtml/misc/Makefile.am
+++ b/tdehtml/misc/Makefile.am
@@ -19,22 +19,22 @@
 
 KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
 
-noinst_LTLIBRARIES = libkhtmlmisc.la
-libkhtmlmisc_la_SOURCES = \
+noinst_LTLIBRARIES = libtdehtmlmisc.la
+libtdehtmlmisc_la_SOURCES = \
 	decoder.cpp    loader.cpp loader_jpeg.cpp guess_ja.cpp\
 	htmlhashes.cpp helper.cpp arena.cpp stringit.cpp knsplugininstaller.cpp
-libkhtmlmisc_la_LIBADD = $(LIBJPEG)
-libkhtmlmisc_la_LDFLAGS = $(USER_LDFLAGS)
-libkhtmlmisc_la_METASOURCES = AUTO
+libtdehtmlmisc_la_LIBADD = $(LIBJPEG)
+libtdehtmlmisc_la_LDFLAGS = $(USER_LDFLAGS)
+libtdehtmlmisc_la_METASOURCES = AUTO
 
 noinst_HEADERS = \
-	decoder.h khtmllayout.h loader_jpeg.h loader.h guess_ja.h\
+	decoder.h tdehtmllayout.h loader_jpeg.h loader.h guess_ja.h\
 	stringit.h htmlhashes.h helper.h shared.h arena.h knsplugininstaller.h
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dcop -I$(top_srcdir)/kio -I$(top_srcdir)/libltdl \
-           -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils $(all_includes)
+           -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeutils $(all_includes)
 
-SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
 
 ## generate lib documentation
 srcdoc:
diff --git a/khtml/misc/arena.cpp b/tdehtml/misc/arena.cpp
index 5efcaf98d..cfbce24ab 100644
--- a/khtml/misc/arena.cpp
+++ b/tdehtml/misc/arena.cpp
@@ -61,7 +61,7 @@
 #include <stdio.h>
 #endif
 
-namespace khtml {
+namespace tdehtml {
 
 #ifdef DEBUG_ARENA_MALLOC
 static int i = 0;
diff --git a/khtml/misc/arena.h b/tdehtml/misc/arena.h
index 6415b00bb..1f9a1e69d 100644
--- a/khtml/misc/arena.h
+++ b/tdehtml/misc/arena.h
@@ -59,7 +59,7 @@
 
 typedef unsigned long uword;
 
-namespace khtml {
+namespace tdehtml {
 
 struct Arena {
     Arena* next; 	// next arena
diff --git a/khtml/misc/blocked_icon.cpp b/tdehtml/misc/blocked_icon.cpp
index 4136cd9cf..4136cd9cf 100644
--- a/khtml/misc/blocked_icon.cpp
+++ b/tdehtml/misc/blocked_icon.cpp
diff --git a/khtml/misc/blocked_icon.png b/tdehtml/misc/blocked_icon.png
index 0f545c393..0f545c393 100644
--- a/khtml/misc/blocked_icon.png
+++ b/tdehtml/misc/blocked_icon.png
diff --git a/khtml/misc/decoder.cpp b/tdehtml/misc/decoder.cpp
index f75fa411d..6000aa9cf 100644
--- a/khtml/misc/decoder.cpp
+++ b/tdehtml/misc/decoder.cpp
@@ -32,7 +32,7 @@
 #include "decoder.h"
 #include "guess_ja.h"
 
-using namespace khtml;
+using namespace tdehtml;
 
 #include "htmlhashes.h"
 
@@ -351,7 +351,7 @@ TQString Decoder::decode(const char *data, int len)
                         len++;
                     }
 		    tmp[len] = 0;
-                    int id = khtml::getTagID(tmp, len);
+                    int id = tdehtml::getTagID(tmp, len);
                     if(end) id += ID_CLOSE_TAG;
 
                     switch( id ) {
diff --git a/khtml/misc/decoder.h b/tdehtml/misc/decoder.h
index 261daec90..2fcda7904 100644
--- a/khtml/misc/decoder.h
+++ b/tdehtml/misc/decoder.h
@@ -26,7 +26,7 @@
 class TQTextCodec;
 class TQTextDecoder;
 
-namespace khtml {
+namespace tdehtml {
 
 class JapaneseCode;
 
diff --git a/khtml/misc/guess_ja.cpp b/tdehtml/misc/guess_ja.cpp
index 62934445b..2a4e82215 100644
--- a/khtml/misc/guess_ja.cpp
+++ b/tdehtml/misc/guess_ja.cpp
@@ -43,7 +43,7 @@
 #include "decoder.h"
 #include "guess_ja.h"
 
-using namespace khtml;
+using namespace tdehtml;
 
 /* DFA tables */
 const dfa_table guess_eucj_st[] = {
diff --git a/khtml/misc/guess_ja.h b/tdehtml/misc/guess_ja.h
index 9dee907e6..a596d5c3a 100644
--- a/khtml/misc/guess_ja.h
+++ b/tdehtml/misc/guess_ja.h
@@ -38,7 +38,7 @@
 #ifndef GUESS_JA_H
 #define GUESS_JA_H
 
-namespace khtml {
+namespace tdehtml {
     class guess_arc {
     public:
         unsigned int next;          /* next state */
@@ -46,7 +46,7 @@ namespace khtml {
     };
 }
 
-using namespace khtml;
+using namespace tdehtml;
 
 typedef signed char dfa_table[256];
 
@@ -58,7 +58,7 @@ extern guess_arc guess_sjis_ar[6];
 extern const dfa_table guess_utf8_st[];
 extern guess_arc guess_utf8_ar[11];
 
-namespace khtml {
+namespace tdehtml {
 
     class guess_dfa {
     public:
diff --git a/khtml/misc/helper.cpp b/tdehtml/misc/helper.cpp
index 8c0b79ab5..f759a9957 100644
--- a/khtml/misc/helper.cpp
+++ b/tdehtml/misc/helper.cpp
@@ -21,7 +21,7 @@
  *
  */
 #include "helper.h"
-#include "khtmllayout.h"
+#include "tdehtmllayout.h"
 #include <tqmap.h>
 #include <tqpainter.h>
 #include <dom/dom_string.h>
@@ -34,13 +34,13 @@
 #include <tqtooltip.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
-namespace khtml {
+namespace tdehtml {
   TQPainter *printpainter;
 }
 
-void khtml::setPrintPainter( TQPainter *printer )
+void tdehtml::setPrintPainter( TQPainter *printer )
 {
     printpainter = printer;
 }
@@ -66,7 +66,7 @@ double calcHue(double temp1, double temp2, double hueVal)
 // explanation available at http://en.wikipedia.org/wiki/HSL_color_space
 
 // all values are in the range of 0 to 1.0
-QRgb khtml::tqRgbaFromHsla(double h, double s, double l, double a)
+QRgb tdehtml::tqRgbaFromHsla(double h, double s, double l, double a)
 {
     double temp2 = l < 0.5 ? l * (1.0 + s) : l + s - l * s;
     double temp1 = 2.0 * l - temp2;
@@ -78,7 +78,7 @@ QRgb khtml::tqRgbaFromHsla(double h, double s, double l, double a)
  * @param obj render object
  * @return the background color. It is guaranteed that a valid color is returned.
  */
-TQColor khtml::retrieveBackgroundColor(const RenderObject *obj)
+TQColor tdehtml::retrieveBackgroundColor(const RenderObject *obj)
 {
   TQColor result;
   while (!obj->isCanvas()) {
@@ -95,7 +95,7 @@ TQColor khtml::retrieveBackgroundColor(const RenderObject *obj)
 /** checks whether the given colors have enough contrast
  * @returns @p true if contrast is ok.
  */
-bool khtml::hasSufficientContrast(const TQColor &c1, const TQColor &c2)
+bool tdehtml::hasSufficientContrast(const TQColor &c1, const TQColor &c2)
 {
 // New version from Germain Garand, better suited for contrast measurement
 #if 1
diff --git a/khtml/misc/helper.h b/tdehtml/misc/helper.h
index 167a2a68e..10ffb8035 100644
--- a/khtml/misc/helper.h
+++ b/tdehtml/misc/helper.h
@@ -29,7 +29,7 @@ class TQPainter;
 
 
 
-namespace khtml
+namespace tdehtml
 {
     class RenderObject;
      const QRgb transparentColor = 0x00000000;
diff --git a/khtml/misc/htmlattrs.c b/tdehtml/misc/htmlattrs.c
index 779792e71..779792e71 100644
--- a/khtml/misc/htmlattrs.c
+++ b/tdehtml/misc/htmlattrs.c
diff --git a/khtml/misc/htmlattrs.h b/tdehtml/misc/htmlattrs.h
index d9aaff067..d9aaff067 100644
--- a/khtml/misc/htmlattrs.h
+++ b/tdehtml/misc/htmlattrs.h
diff --git a/khtml/misc/htmlattrs.in b/tdehtml/misc/htmlattrs.in
index 263b2fd7b..263b2fd7b 100644
--- a/khtml/misc/htmlattrs.in
+++ b/tdehtml/misc/htmlattrs.in
diff --git a/khtml/misc/htmlhashes.cpp b/tdehtml/misc/htmlhashes.cpp
index 593c1ce96..e073f0964 100644
--- a/khtml/misc/htmlhashes.cpp
+++ b/tdehtml/misc/htmlhashes.cpp
@@ -25,7 +25,7 @@
 #include "htmltags.c"
 #include "htmlattrs.c"
 
-int khtml::getTagID(const char *tagStr, int len)
+int tdehtml::getTagID(const char *tagStr, int len)
 {
     const struct tags *tagPtr = findTag(tagStr, len);
     if (!tagPtr)
@@ -34,7 +34,7 @@ int khtml::getTagID(const char *tagStr, int len)
     return tagPtr->id;
 }
 
-int khtml::getAttrID(const char *tagStr, int len)
+int tdehtml::getAttrID(const char *tagStr, int len)
 {
     const struct attrs *tagPtr = findAttr(tagStr, len);
     if (!tagPtr)
diff --git a/khtml/misc/htmlhashes.h b/tdehtml/misc/htmlhashes.h
index bade18ffb..dfea9a289 100644
--- a/khtml/misc/htmlhashes.h
+++ b/tdehtml/misc/htmlhashes.h
@@ -5,7 +5,7 @@
 #include "htmlattrs.h"
 #include "htmltags.h"
 
-namespace khtml
+namespace tdehtml
 {
   int getTagID(const char *tagStr, int len);
   int getAttrID(const char *tagStr, int len);
diff --git a/khtml/misc/htmltags.c b/tdehtml/misc/htmltags.c
index 1342e62bf..1342e62bf 100644
--- a/khtml/misc/htmltags.c
+++ b/tdehtml/misc/htmltags.c
diff --git a/khtml/misc/htmltags.h b/tdehtml/misc/htmltags.h
index a2fb0fe55..a2fb0fe55 100644
--- a/khtml/misc/htmltags.h
+++ b/tdehtml/misc/htmltags.h
diff --git a/khtml/misc/htmltags.in b/tdehtml/misc/htmltags.in
index 9d686364a..9d686364a 100644
--- a/khtml/misc/htmltags.in
+++ b/tdehtml/misc/htmltags.in
diff --git a/khtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp
index b953f34fb..b953f34fb 100644
--- a/khtml/misc/knsplugininstaller.cpp
+++ b/tdehtml/misc/knsplugininstaller.cpp
diff --git a/khtml/misc/knsplugininstaller.h b/tdehtml/misc/knsplugininstaller.h
index 240202468..240202468 100644
--- a/khtml/misc/knsplugininstaller.h
+++ b/tdehtml/misc/knsplugininstaller.h
diff --git a/khtml/misc/loader.cpp b/tdehtml/misc/loader.cpp
index 79a8c2148..60a75f856 100644
--- a/khtml/misc/loader.cpp
+++ b/tdehtml/misc/loader.cpp
@@ -65,8 +65,8 @@
 #include <kiconloader.h>
 #include <scheduler.h>
 #include <kdebug.h>
-#include "khtml_factory.h"
-#include "khtml_part.h"
+#include "tdehtml_factory.h"
+#include "tdehtml_part.h"
 
 #ifdef IMAGE_TITLES
 #include <tqfile.h>
@@ -80,7 +80,7 @@
 
 #include "blocked_icon.cpp"
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 #define MAX_LRU_LISTS 20
@@ -377,7 +377,7 @@ void CachedScript::error( int /*err*/, const char* /*text*/ )
 
 // ------------------------------------------------------------------------------------------
 
-namespace khtml
+namespace tdehtml
 {
 
 class ImageSource : public TQDataSource
@@ -985,7 +985,7 @@ void DocLoader::insertCachedObject( CachedObject* o ) const
         return;
     m_docObjects.insert( o, o );
     if ( m_docObjects.count() > 3 * m_docObjects.size() )
-        m_docObjects.resize(khtml::nextSeed( m_docObjects.size() ) );
+        m_docObjects.resize(tdehtml::nextSeed( m_docObjects.size() ) );
 }
 
 bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
diff --git a/khtml/misc/loader.h b/tdehtml/misc/loader.h
index 833b98b84..97e637120 100644
--- a/khtml/misc/loader.h
+++ b/tdehtml/misc/loader.h
@@ -23,8 +23,8 @@
     This class provides all functionality needed for loading images, style sheets and html
     pages from the web. It has a memory cache for these objects.
 */
-#ifndef _khtml_loader_h
-#define _khtml_loader_h
+#ifndef _tdehtml_loader_h
+#define _tdehtml_loader_h
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -51,7 +51,7 @@
 #include <kurl.h>
 #include <kio/global.h>
 
-#include <khtml_settings.h>
+#include <tdehtml_settings.h>
 #include <dom/dom_string.h>
 
 class TQMovie;
@@ -68,7 +68,7 @@ namespace DOM
     class DocumentImpl;
 }
 
-namespace khtml
+namespace tdehtml
 {
     class CachedObject;
     class Request;
@@ -421,9 +421,9 @@ namespace khtml
         TDEIO::Job *jobForRequest( const DOM::DOMString &url ) const;
 
     signals:
-        void requestStarted( khtml::DocLoader* dl, khtml::CachedObject* obj );
-	void requestDone( khtml::DocLoader* dl, khtml::CachedObject *obj );
-	void requestFailed( khtml::DocLoader* dl, khtml::CachedObject *obj );
+        void requestStarted( tdehtml::DocLoader* dl, tdehtml::CachedObject* obj );
+	void requestDone( tdehtml::DocLoader* dl, tdehtml::CachedObject *obj );
+	void requestFailed( tdehtml::DocLoader* dl, tdehtml::CachedObject *obj );
 
     protected slots:
 	void slotFinished( TDEIO::Job * );
diff --git a/khtml/misc/loader_client.h b/tdehtml/misc/loader_client.h
index 3e28f7e56..d61a52b51 100644
--- a/khtml/misc/loader_client.h
+++ b/tdehtml/misc/loader_client.h
@@ -4,7 +4,7 @@
 #include <tqpixmap.h>
 #include "dom/dom_string.h"
 
-namespace khtml {
+namespace tdehtml {
     class CachedObject;
     class CachedImage;
 
diff --git a/khtml/misc/loader_jpeg.cpp b/tdehtml/misc/loader_jpeg.cpp
index 15057e0be..72816817f 100644
--- a/khtml/misc/loader_jpeg.cpp
+++ b/tdehtml/misc/loader_jpeg.cpp
@@ -54,16 +54,16 @@ extern "C" {
 
 // -----------------------------------------------------------------------------
 
-struct khtml_error_mgr : public jpeg_error_mgr {
+struct tdehtml_error_mgr : public jpeg_error_mgr {
     jmp_buf setjmp_buffer;
 };
 
 extern "C" {
 
     static
-    void khtml_error_exit (j_common_ptr cinfo)
+    void tdehtml_error_exit (j_common_ptr cinfo)
     {
-        khtml_error_mgr* myerr = (khtml_error_mgr*) cinfo->err;
+        tdehtml_error_mgr* myerr = (tdehtml_error_mgr*) cinfo->err;
         char buffer[JMSG_LENGTH_MAX];
         (*cinfo->err->format_message)(cinfo, buffer);
 #ifdef JPEG_DEBUG
@@ -76,7 +76,7 @@ extern "C" {
 static const int max_buf = 32768;
 static const int max_consumingtime = 2000;
 
-struct khtml_jpeg_source_mgr : public jpeg_source_mgr {
+struct tdehtml_jpeg_source_mgr : public jpeg_source_mgr {
     JOCTET buffer[max_buf];
 
     int valid_buffer_len;
@@ -90,25 +90,25 @@ struct khtml_jpeg_source_mgr : public jpeg_source_mgr {
     bool do_progressive;
 
 public:
-    khtml_jpeg_source_mgr() KDE_NO_EXPORT;
+    tdehtml_jpeg_source_mgr() KDE_NO_EXPORT;
 };
 
 
 extern "C" {
 
     static
-    void khtml_j_decompress_dummy(j_decompress_ptr)
+    void tdehtml_j_decompress_dummy(j_decompress_ptr)
     {
     }
 
     static
-    boolean khtml_fill_input_buffer(j_decompress_ptr cinfo)
+    boolean tdehtml_fill_input_buffer(j_decompress_ptr cinfo)
     {
 #ifdef BUFFER_DEBUG
-        tqDebug("khtml_fill_input_buffer called!");
+        tqDebug("tdehtml_fill_input_buffer called!");
 #endif
 
-        khtml_jpeg_source_mgr* src = (khtml_jpeg_source_mgr*)cinfo->src;
+        tdehtml_jpeg_source_mgr* src = (tdehtml_jpeg_source_mgr*)cinfo->src;
 
         if ( src->ateof )
         {
@@ -127,16 +127,16 @@ extern "C" {
     }
 
     static
-    void khtml_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
+    void tdehtml_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
     {
         if(num_bytes <= 0)
             return; /* required noop */
 
 #ifdef BUFFER_DEBUG
-        tqDebug("khtml_skip_input_data (%d) called!", num_bytes);
+        tqDebug("tdehtml_skip_input_data (%d) called!", num_bytes);
 #endif
 
-        khtml_jpeg_source_mgr* src = (khtml_jpeg_source_mgr*)cinfo->src;
+        tdehtml_jpeg_source_mgr* src = (tdehtml_jpeg_source_mgr*)cinfo->src;
         src->skip_input_bytes += num_bytes;
 
         unsigned int skipbytes = kMin(src->bytes_in_buffer, src->skip_input_bytes);
@@ -166,13 +166,13 @@ extern "C" {
 }
 
 
-khtml_jpeg_source_mgr::khtml_jpeg_source_mgr()
+tdehtml_jpeg_source_mgr::tdehtml_jpeg_source_mgr()
 {
-    jpeg_source_mgr::init_source = khtml_j_decompress_dummy;
-    jpeg_source_mgr::fill_input_buffer = khtml_fill_input_buffer;
-    jpeg_source_mgr::skip_input_data = khtml_skip_input_data;
+    jpeg_source_mgr::init_source = tdehtml_j_decompress_dummy;
+    jpeg_source_mgr::fill_input_buffer = tdehtml_fill_input_buffer;
+    jpeg_source_mgr::skip_input_data = tdehtml_skip_input_data;
     jpeg_source_mgr::resync_to_restart = jpeg_resync_to_restart;
-    jpeg_source_mgr::term_source = khtml_j_decompress_dummy;
+    jpeg_source_mgr::term_source = tdehtml_j_decompress_dummy;
     bytes_in_buffer = 0;
     valid_buffer_len = 0;
     skip_input_bytes = 0;
@@ -211,8 +211,8 @@ private:
 
     // structs for the jpeglib
     struct jpeg_decompress_struct cinfo;
-    struct khtml_error_mgr jerr;
-    struct khtml_jpeg_source_mgr jsrc;
+    struct tdehtml_error_mgr jerr;
+    struct tdehtml_jpeg_source_mgr jsrc;
 };
 
 
@@ -224,7 +224,7 @@ KJPEGFormat::KJPEGFormat()
     cinfo.err = jpeg_std_error(&jerr);
     jpeg_create_decompress(&cinfo);
     cinfo.err = jpeg_std_error(&jerr);
-    jerr.error_exit = khtml_error_exit;
+    jerr.error_exit = tdehtml_error_exit;
     cinfo.src = &jsrc;
     state = Init;
 }
@@ -521,7 +521,7 @@ again:
 // -----------------------------------------------------------------------------
 // This is the factory that teaches TQt about progressive JPEG's
 
-TQImageFormat* khtml::KJPEGFormatType::decoderFor(const unsigned char* buffer, int length)
+TQImageFormat* tdehtml::KJPEGFormatType::decoderFor(const unsigned char* buffer, int length)
 {
     if(length < 3) return 0;
 
@@ -533,14 +533,14 @@ TQImageFormat* khtml::KJPEGFormatType::decoderFor(const unsigned char* buffer, i
     return 0;
 }
 
-const char* khtml::KJPEGFormatType::formatName() const
+const char* tdehtml::KJPEGFormatType::formatName() const
 {
     return "JPEG";
 }
 
 #else
 #ifdef __GNUC__
-#warning You don't seem to have libJPEG. jpeg support in khtml won't work
+#warning You don't seem to have libJPEG. jpeg support in tdehtml won't work
 #endif
 #endif // HAVE_LIBJPEG
 
diff --git a/khtml/misc/loader_jpeg.h b/tdehtml/misc/loader_jpeg.h
index 87b18a8b5..568a29d44 100644
--- a/khtml/misc/loader_jpeg.h
+++ b/tdehtml/misc/loader_jpeg.h
@@ -23,12 +23,12 @@
     This is a helper for progressive loading of JPEG's. 
 */
 
-#ifndef _khtml_loader_jpeg_h
-#define _khtml_loader_jpeg_h
+#ifndef _tdehtml_loader_jpeg_h
+#define _tdehtml_loader_jpeg_h
 
 #include <tqasyncimageio.h>
 
-namespace khtml
+namespace tdehtml
 {
     /**
      * @internal
@@ -47,4 +47,4 @@ namespace khtml
 
 // -----------------------------------------------------------------------------
 
-#endif // _khtml_loader_jpeg_h
+#endif // _tdehtml_loader_jpeg_h
diff --git a/khtml/misc/makeattrs b/tdehtml/misc/makeattrs
index 48a02c045..935f350bd 100644
--- a/khtml/misc/makeattrs
+++ b/tdehtml/misc/makeattrs
@@ -22,7 +22,7 @@
 #
 #----------------------------------------------------------------------------
 #
-#  KDE HTML Widget -- Script to generate khtmlattrs.c and khtmlattrs.h
+#  KDE HTML Widget -- Script to generate tdehtmlattrs.c and tdehtmlattrs.h
 #
 open IN, "htmlattrs.in"
   or die "Can't open in\n";
diff --git a/khtml/misc/maketags b/tdehtml/misc/maketags
index a460cf8e4..a460cf8e4 100644
--- a/khtml/misc/maketags
+++ b/tdehtml/misc/maketags
diff --git a/khtml/misc/multimap.h b/tdehtml/misc/multimap.h
index 125e8e07d..125e8e07d 100644
--- a/khtml/misc/multimap.h
+++ b/tdehtml/misc/multimap.h
diff --git a/khtml/misc/seed.h b/tdehtml/misc/seed.h
index e491cbaae..3041d1d95 100644
--- a/khtml/misc/seed.h
+++ b/tdehtml/misc/seed.h
@@ -23,9 +23,9 @@
 #ifndef html_seed_h
 #define html_seed_h
 
-#define khtml_MaxSeed 47963
+#define tdehtml_MaxSeed 47963
 
-namespace khtml {
+namespace tdehtml {
 
 static const int primes_t[] =
 {
diff --git a/khtml/misc/shared.h b/tdehtml/misc/shared.h
index 7dfd95ed0..d99b327c6 100644
--- a/khtml/misc/shared.h
+++ b/tdehtml/misc/shared.h
@@ -23,7 +23,7 @@
 #ifndef SHARED_H
 #define SHARED_H
 
-namespace khtml {
+namespace tdehtml {
 
 template<class type> class Shared
 {
diff --git a/khtml/misc/stringit.cpp b/tdehtml/misc/stringit.cpp
index 9b8fc5899..f4bea427f 100644
--- a/khtml/misc/stringit.cpp
+++ b/tdehtml/misc/stringit.cpp
@@ -21,7 +21,7 @@
 
 #include "stringit.h"
 
-namespace khtml {
+namespace tdehtml {
 
 uint TokenizerString::length() const
 {
diff --git a/khtml/misc/stringit.h b/tdehtml/misc/stringit.h
index 789f22af8..a93a59e4d 100644
--- a/khtml/misc/stringit.h
+++ b/tdehtml/misc/stringit.h
@@ -35,7 +35,7 @@
 
 using namespace DOM;
 
-namespace khtml
+namespace tdehtml
 {
 
 class DOMStringIt
diff --git a/khtml/misc/khtmllayout.h b/tdehtml/misc/tdehtmllayout.h
index 1049d10c4..524cc5e74 100644
--- a/khtml/misc/khtmllayout.h
+++ b/tdehtml/misc/tdehtmllayout.h
@@ -28,7 +28,7 @@
  * this namespace contains definitions for various types needed for
  * layouting.
  */
-namespace khtml
+namespace tdehtml
 {
 
     const int UNDEFINED = -1;
diff --git a/khtml/pics/CMakeLists.txt b/tdehtml/pics/CMakeLists.txt
index 49e567671..17390707c 100644
--- a/khtml/pics/CMakeLists.txt
+++ b/tdehtml/pics/CMakeLists.txt
@@ -13,7 +13,7 @@
 
 tde_install_icons(
     bug images_display wallet_open
-  DESTINATION ${DATA_INSTALL_DIR}/khtml/icons )
+  DESTINATION ${DATA_INSTALL_DIR}/tdehtml/icons )
 
 tde_install_icons(
     dbgnext dbgrun dbgrunto dbgstep
diff --git a/khtml/pics/Makefile.am b/tdehtml/pics/Makefile.am
index 7914ee158..7477bfd51 100644
--- a/khtml/pics/Makefile.am
+++ b/tdehtml/pics/Makefile.am
@@ -1,5 +1,5 @@
-khtmliconsdir = $(kde_datadir)/khtml/icons
-khtmlicons_ICON = bug \
+tdehtmliconsdir = $(kde_datadir)/tdehtml/icons
+tdehtmlicons_ICON = bug \
                   images_display \
                   wallet_open
 
diff --git a/khtml/pics/cr128-action-bug.png b/tdehtml/pics/cr128-action-bug.png
index a39081d9a..a39081d9a 100644
--- a/khtml/pics/cr128-action-bug.png
+++ b/tdehtml/pics/cr128-action-bug.png
diff --git a/khtml/pics/cr16-action-bug.png b/tdehtml/pics/cr16-action-bug.png
index 827d5f8e6..827d5f8e6 100644
--- a/khtml/pics/cr16-action-bug.png
+++ b/tdehtml/pics/cr16-action-bug.png
diff --git a/khtml/pics/cr16-action-images_display.png b/tdehtml/pics/cr16-action-images_display.png
index 66f550e7a..66f550e7a 100644
--- a/khtml/pics/cr16-action-images_display.png
+++ b/tdehtml/pics/cr16-action-images_display.png
diff --git a/khtml/pics/cr16-action-wallet_open.png b/tdehtml/pics/cr16-action-wallet_open.png
index f0d309834..f0d309834 100644
--- a/khtml/pics/cr16-action-wallet_open.png
+++ b/tdehtml/pics/cr16-action-wallet_open.png
diff --git a/khtml/pics/cr22-action-bug.png b/tdehtml/pics/cr22-action-bug.png
index 3a3d1ea2b..3a3d1ea2b 100644
--- a/khtml/pics/cr22-action-bug.png
+++ b/tdehtml/pics/cr22-action-bug.png
diff --git a/khtml/pics/cr22-action-dbgnext.png b/tdehtml/pics/cr22-action-dbgnext.png
index ee94f5854..ee94f5854 100644
--- a/khtml/pics/cr22-action-dbgnext.png
+++ b/tdehtml/pics/cr22-action-dbgnext.png
diff --git a/khtml/pics/cr22-action-dbgrun.png b/tdehtml/pics/cr22-action-dbgrun.png
index 32f4badc5..32f4badc5 100644
--- a/khtml/pics/cr22-action-dbgrun.png
+++ b/tdehtml/pics/cr22-action-dbgrun.png
diff --git a/khtml/pics/cr22-action-dbgrunto.png b/tdehtml/pics/cr22-action-dbgrunto.png
index 861c549ab..861c549ab 100644
--- a/khtml/pics/cr22-action-dbgrunto.png
+++ b/tdehtml/pics/cr22-action-dbgrunto.png
diff --git a/khtml/pics/cr22-action-dbgstep.png b/tdehtml/pics/cr22-action-dbgstep.png
index c4a760435..c4a760435 100644
--- a/khtml/pics/cr22-action-dbgstep.png
+++ b/tdehtml/pics/cr22-action-dbgstep.png
diff --git a/khtml/pics/cr22-action-images_display.png b/tdehtml/pics/cr22-action-images_display.png
index 96ad00c41..96ad00c41 100644
--- a/khtml/pics/cr22-action-images_display.png
+++ b/tdehtml/pics/cr22-action-images_display.png
diff --git a/khtml/pics/cr32-action-bug.png b/tdehtml/pics/cr32-action-bug.png
index 597739255..597739255 100644
--- a/khtml/pics/cr32-action-bug.png
+++ b/tdehtml/pics/cr32-action-bug.png
diff --git a/khtml/pics/cr32-action-images_display.png b/tdehtml/pics/cr32-action-images_display.png
index ced97ac3f..ced97ac3f 100644
--- a/khtml/pics/cr32-action-images_display.png
+++ b/tdehtml/pics/cr32-action-images_display.png
diff --git a/khtml/pics/cr48-action-bug.png b/tdehtml/pics/cr48-action-bug.png
index 2565d767c..2565d767c 100644
--- a/khtml/pics/cr48-action-bug.png
+++ b/tdehtml/pics/cr48-action-bug.png
diff --git a/khtml/pics/cr64-action-bug.png b/tdehtml/pics/cr64-action-bug.png
index f2f45269e..f2f45269e 100644
--- a/khtml/pics/cr64-action-bug.png
+++ b/tdehtml/pics/cr64-action-bug.png
diff --git a/khtml/rendering/CMakeLists.txt b/tdehtml/rendering/CMakeLists.txt
index fe3301265..757e9a72a 100644
--- a/khtml/rendering/CMakeLists.txt
+++ b/tdehtml/rendering/CMakeLists.txt
@@ -16,19 +16,19 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_SOURCE_DIR}/kio
   ${CMAKE_SOURCE_DIR}/kio/kio
   ${CMAKE_SOURCE_DIR}/kio/kfile
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
 
-##### khtmlrender-static #########################
+##### tdehtmlrender-static #########################
 
-set( target khtmlrender )
+set( target tdehtmlrender )
 
 set( ${target}_SRCS
   bidi.cpp break_lines.cpp render_block.cpp render_inline.cpp
diff --git a/khtml/rendering/Makefile.am b/tdehtml/rendering/Makefile.am
index d41638f27..605788764 100644
--- a/khtml/rendering/Makefile.am
+++ b/tdehtml/rendering/Makefile.am
@@ -19,8 +19,8 @@
 
 KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
 
-noinst_LTLIBRARIES = libkhtmlrender.la
-libkhtmlrender_la_SOURCES = \
+noinst_LTLIBRARIES = libtdehtmlrender.la
+libtdehtmlrender_la_SOURCES = \
 	bidi.cpp break_lines.cpp render_block.cpp render_inline.cpp \
 	render_style.cpp render_object.cpp render_container.cpp render_box.cpp \
 	render_flow.cpp render_text.cpp render_arena.cpp render_layer.cpp \
@@ -30,7 +30,7 @@ libkhtmlrender_la_SOURCES = \
 	render_body.cpp font.cpp render_line.cpp render_generated.cpp \
 	enumerate.cpp counter_tree.cpp
 
-libkhtmlrender_la_METASOURCES = AUTO
+libtdehtmlrender_la_METASOURCES = AUTO
 
 noinst_HEADERS = \
 	bidi.h break_lines.h \
@@ -42,9 +42,9 @@ noinst_HEADERS = \
 	render_generated.h enumerate.h
 
 INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
- -I$(top_srcdir)/kfile -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils -I$(top_srcdir) $(all_includes)
+ -I$(top_srcdir)/kfile -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeutils -I$(top_srcdir) $(all_includes)
 
-SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
 
 ## generate lib documentation
 srcdoc:
diff --git a/khtml/rendering/bidi.cpp b/tdehtml/rendering/bidi.cpp
index 2dcfe48c9..a79ac9854 100644
--- a/khtml/rendering/bidi.cpp
+++ b/tdehtml/rendering/bidi.cpp
@@ -38,7 +38,7 @@
 //#define DEBUG_LINEBREAKS
 //#define PAGE_DEBUG
 
-namespace khtml {
+namespace tdehtml {
 
 
 // an iterator which goes through a BidiParagraph
@@ -2198,7 +2198,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
 
 void RenderBlock::checkLinesForOverflow()
 {
-    for (RootInlineBox* curr = static_cast<khtml::RootInlineBox*>(firstLineBox()); curr; curr = static_cast<khtml::RootInlineBox*>(curr->nextLineBox())) {
+    for (RootInlineBox* curr = static_cast<tdehtml::RootInlineBox*>(firstLineBox()); curr; curr = static_cast<tdehtml::RootInlineBox*>(curr->nextLineBox())) {
 //         m_overflowLeft = min(curr->leftOverflow(), m_overflowLeft);
         m_overflowTop = kMin(curr->topOverflow(), m_overflowTop);
 //         m_overflowWidth = max(curr->rightOverflow(), m_overflowWidth);
diff --git a/khtml/rendering/bidi.h b/tdehtml/rendering/bidi.h
index c8776ce19..ec926d99a 100644
--- a/khtml/rendering/bidi.h
+++ b/tdehtml/rendering/bidi.h
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include "rendering/render_object.h"
 
-namespace khtml {
+namespace tdehtml {
     class RenderArena;
     class RenderBlock;
     class RenderObject;
diff --git a/khtml/rendering/break_lines.cpp b/tdehtml/rendering/break_lines.cpp
index a0d314cee..e82787eb8 100644
--- a/khtml/rendering/break_lines.cpp
+++ b/tdehtml/rendering/break_lines.cpp
@@ -6,7 +6,7 @@
 #include <config.h>
 
 
-/* If HAVE_LIBTHAI is defined, libkhtml will link against 
+/* If HAVE_LIBTHAI is defined, libtdehtml will link against 
  * libthai since compile time. Otherwise it will try to 
  * dlopen at run-time
  *
@@ -21,7 +21,7 @@ static th_brk_def th_brk;
 #include <thai/thbrk.h>
 #endif
 
-namespace khtml {
+namespace tdehtml {
     struct ThaiCache
     {
         ThaiCache() {
diff --git a/khtml/rendering/break_lines.h b/tdehtml/rendering/break_lines.h
index 5176e5fb0..34b733121 100644
--- a/khtml/rendering/break_lines.h
+++ b/tdehtml/rendering/break_lines.h
@@ -3,7 +3,7 @@
 
 #include <tqstring.h>
 
-namespace khtml {
+namespace tdehtml {
 
     /*
       array of unicode codes where breaking shouldn't occur.
diff --git a/khtml/rendering/counter_tree.cpp b/tdehtml/rendering/counter_tree.cpp
index 5b178d96e..931c54332 100644
--- a/khtml/rendering/counter_tree.cpp
+++ b/tdehtml/rendering/counter_tree.cpp
@@ -23,7 +23,7 @@
 #include "rendering/counter_tree.h"
 #include "rendering/render_object.h"
 
-namespace khtml {
+namespace tdehtml {
 
 CounterNode::CounterNode(RenderObject *o)
     : m_hasCounters(false), m_isVisual(false),
diff --git a/khtml/rendering/counter_tree.h b/tdehtml/rendering/counter_tree.h
index 55b924b80..0266dcc75 100644
--- a/khtml/rendering/counter_tree.h
+++ b/tdehtml/rendering/counter_tree.h
@@ -25,7 +25,7 @@
 #include "misc/shared.h"
 #include "rendering/render_object.h"
 
-namespace khtml {
+namespace tdehtml {
 
 class CounterReset;
 
diff --git a/khtml/rendering/enumerate.cpp b/tdehtml/rendering/enumerate.cpp
index 9cfe149ad..bd2ff3696 100644
--- a/khtml/rendering/enumerate.cpp
+++ b/tdehtml/rendering/enumerate.cpp
@@ -28,7 +28,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 
-namespace khtml {
+namespace tdehtml {
 
 namespace Enumerate {
 
diff --git a/khtml/rendering/enumerate.h b/tdehtml/rendering/enumerate.h
index c8df6549a..16b92f43c 100644
--- a/khtml/rendering/enumerate.h
+++ b/tdehtml/rendering/enumerate.h
@@ -26,7 +26,7 @@
 class TQChar;
 class TQString;
 
-namespace khtml {
+namespace tdehtml {
 
 namespace Enumerate {
 
diff --git a/khtml/rendering/font.cpp b/tdehtml/rendering/font.cpp
index 1a0591192..3ace5ddd1 100644
--- a/khtml/rendering/font.cpp
+++ b/tdehtml/rendering/font.cpp
@@ -29,8 +29,8 @@
 #endif
 
 #include "font.h"
-#include "khtml_factory.h"
-#include "khtml_settings.h"
+#include "tdehtml_factory.h"
+#include "tdehtml_settings.h"
 
 #include <kdebug.h>
 #include <kglobal.h>
@@ -39,7 +39,7 @@
 #include <tqfontdatabase.h>
 #include <tqpaintdevicemetrics.h>
 
-using namespace khtml;
+using namespace tdehtml;
 
 /** closes the current word and returns its width in pixels
  * @param fm metrics of font to be used
@@ -433,7 +433,7 @@ void Font::update( TQPaintDeviceMetrics* devMetrics ) const
         const TQValueList<int>& pointSizes = (*scalSizesCache)[ScalKey(f)];
         // lets see if we find a nice looking font, which is not too far away
         // from the requested one.
-        // kdDebug(6080) << "khtml::setFontSize family = " << f.family() << " size requested=" << size << endl;
+        // kdDebug(6080) << "tdehtml::setFontSize family = " << f.family() << " size requested=" << size << endl;
 
 
         float diff = 1; // ### 100% deviation
diff --git a/khtml/rendering/font.h b/tdehtml/rendering/font.h
index 714b03829..81110e0d0 100644
--- a/khtml/rendering/font.h
+++ b/tdehtml/rendering/font.h
@@ -33,7 +33,7 @@
 class TQFontDatabase;
 class TQPaintDeviceMetrics;
 
-namespace khtml
+namespace tdehtml
 {
 class RenderStyle;
 class CSSStyleSelector;
diff --git a/khtml/rendering/img-loading.png b/tdehtml/rendering/img-loading.png
index ae5a9732f..ae5a9732f 100644
--- a/khtml/rendering/img-loading.png
+++ b/tdehtml/rendering/img-loading.png
diff --git a/khtml/rendering/loading_icon.cpp b/tdehtml/rendering/loading_icon.cpp
index 218befcf8..218befcf8 100644
--- a/khtml/rendering/loading_icon.cpp
+++ b/tdehtml/rendering/loading_icon.cpp
diff --git a/khtml/rendering/render_applet.cpp b/tdehtml/rendering/render_applet.cpp
index fce22f7c8..1b65ca8de 100644
--- a/khtml/rendering/render_applet.cpp
+++ b/tdehtml/rendering/render_applet.cpp
@@ -27,8 +27,8 @@
 #include "rendering/render_applet.h"
 #include "rendering/render_canvas.h"
 #include "xml/dom_docimpl.h"
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 
 #include <tqlabel.h>
 
@@ -38,7 +38,7 @@
 #include "misc/htmltags.h"
 #include "html/html_objectimpl.h"
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 RenderApplet::RenderApplet(HTMLElementImpl *applet, const TQMap<TQString, TQString> &args )
diff --git a/khtml/rendering/render_applet.h b/tdehtml/rendering/render_applet.h
index 184697a7c..24907edaa 100644
--- a/khtml/rendering/render_applet.h
+++ b/tdehtml/rendering/render_applet.h
@@ -34,7 +34,7 @@ namespace DOM {
     class HTMLElementImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderApplet : public RenderWidget
 {
diff --git a/khtml/rendering/render_arena.cpp b/tdehtml/rendering/render_arena.cpp
index 99fbf4f4d..14c55ef89 100644
--- a/khtml/rendering/render_arena.cpp
+++ b/tdehtml/rendering/render_arena.cpp
@@ -38,9 +38,9 @@
 #include <string.h>
 #include <assert.h>
 
-using namespace khtml;
+using namespace tdehtml;
 
-namespace khtml {
+namespace tdehtml {
 
 //#ifdef NDEBUG
 #define KHTML_USE_ARENA_ALLOCATOR
diff --git a/khtml/rendering/render_arena.h b/tdehtml/rendering/render_arena.h
index 786cd208a..1beab6fed 100644
--- a/khtml/rendering/render_arena.h
+++ b/tdehtml/rendering/render_arena.h
@@ -41,7 +41,7 @@
 
 #include <stdlib.h>
 
-namespace khtml {
+namespace tdehtml {
 
 #define KHTML_MAX_RECYCLED_SIZE 400
 #define KHTML_ROUNDUP(x,y) ((((x)+((y)-1))/(y))*(y))
diff --git a/khtml/rendering/render_block.cpp b/tdehtml/rendering/render_block.cpp
index ccbb6fad0..3c6c79543 100644
--- a/khtml/rendering/render_block.cpp
+++ b/tdehtml/rendering/render_block.cpp
@@ -44,11 +44,11 @@
 #include "html/html_formimpl.h"
 #include "misc/htmltags.h"
 
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 
 using namespace DOM;
 
-namespace khtml {
+namespace tdehtml {
 
 // -------------------------------------------------------------------------------------------------------
 
@@ -964,7 +964,7 @@ void RenderBlock::insertCompactIfNeeded(RenderObject* child, CompactInfo& compac
                 adj = vpos;
             compactYPos += adj;
         }
-        Length newLineHeight( kMax(compactChild->lineHeight(true)+adj, (int)child->lineHeight(true)), khtml::Fixed);
+        Length newLineHeight( kMax(compactChild->lineHeight(true)+adj, (int)child->lineHeight(true)), tdehtml::Fixed);
         child->style()->setLineHeight( newLineHeight );
         child->setNeedsLayout( true, false );
         child->layout();
@@ -3151,5 +3151,5 @@ void RenderBlock::dump(TQTextStream &stream, const TQString &ind) const
 #undef DEBUG_LAYOUT
 #undef BOX_DEBUG
 
-} // namespace khtml
+} // namespace tdehtml
 
diff --git a/khtml/rendering/render_block.h b/tdehtml/rendering/render_block.h
index 2b0e49398..84fd15a0b 100644
--- a/khtml/rendering/render_block.h
+++ b/tdehtml/rendering/render_block.h
@@ -30,7 +30,7 @@
 
 #include "render_flow.h"
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderBlock : public RenderFlow
 {
diff --git a/khtml/rendering/render_body.cpp b/tdehtml/rendering/render_body.cpp
index 541c9676d..80a613000 100644
--- a/khtml/rendering/render_body.cpp
+++ b/tdehtml/rendering/render_body.cpp
@@ -23,12 +23,12 @@
 #include "rendering/render_canvas.h"
 #include "html/html_baseimpl.h"
 #include "xml/dom_docimpl.h"
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 
 #include <kglobal.h>
 #include <kdebug.h>
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 RenderBody::RenderBody(HTMLBodyElementImpl* element)
diff --git a/khtml/rendering/render_body.h b/tdehtml/rendering/render_body.h
index 7951f73e1..b7ac7c99a 100644
--- a/khtml/rendering/render_body.h
+++ b/tdehtml/rendering/render_body.h
@@ -29,7 +29,7 @@ namespace DOM
     class HTMLBodyElementImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderBody : public RenderBlock
 {
diff --git a/khtml/rendering/render_box.cpp b/tdehtml/rendering/render_box.cpp
index 7400752ac..4cf7080c7 100644
--- a/khtml/rendering/render_box.cpp
+++ b/tdehtml/rendering/render_box.cpp
@@ -43,14 +43,14 @@
 #include "xml/dom_docimpl.h"
 #include "html/html_elementimpl.h"
 
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <assert.h>
 
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 #define TABLECELLMARGIN -0x4000
 
diff --git a/khtml/rendering/render_box.h b/tdehtml/rendering/render_box.h
index c0c618d5c..0a65df72e 100644
--- a/khtml/rendering/render_box.h
+++ b/tdehtml/rendering/render_box.h
@@ -26,7 +26,7 @@
 
 #include "render_container.h"
 
-namespace khtml {
+namespace tdehtml {
 
 enum WidthType { Width, MinWidth, MaxWidth };
 enum HeightType { Height, MinHeight, MaxHeight };
diff --git a/khtml/rendering/render_br.cpp b/tdehtml/rendering/render_br.cpp
index 69984b760..f330e5f17 100644
--- a/khtml/rendering/render_br.cpp
+++ b/tdehtml/rendering/render_br.cpp
@@ -21,7 +21,7 @@
  */
 #include "render_br.h"
 
-using namespace khtml;
+using namespace tdehtml;
 
 
 RenderBR::RenderBR(DOM::NodeImpl* node)
diff --git a/khtml/rendering/render_br.h b/tdehtml/rendering/render_br.h
index f4175015f..8e511c94f 100644
--- a/khtml/rendering/render_br.h
+++ b/tdehtml/rendering/render_br.h
@@ -28,7 +28,7 @@
  * The whole class here is a hack to get <br> working, as long as we don't have support for
  * CSS2 :before and :after pseudo elements
  */
-namespace khtml {
+namespace tdehtml {
 
 class RenderBR : public RenderText
 {
diff --git a/khtml/rendering/render_canvas.cpp b/tdehtml/rendering/render_canvas.cpp
index e8540eba6..53dc32162 100644
--- a/khtml/rendering/render_canvas.cpp
+++ b/tdehtml/rendering/render_canvas.cpp
@@ -26,12 +26,12 @@
 #include "rendering/render_layer.h"
 #include "xml/dom_docimpl.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 #include <kdebug.h>
 #include <kglobal.h>
 
-using namespace khtml;
+using namespace tdehtml;
 
 //#define BOX_DEBUG
 //#define SPEED_DEBUG
@@ -568,7 +568,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep
     TQRect updateRect;
 
     // Don't use repaint() because it will cause all rects to
-    // be united (see khtmlview::scheduleRepaint()).  Instead
+    // be united (see tdehtmlview::scheduleRepaint()).  Instead
     // just draw damage rects for objects that have a change
     // in selection state.
     // ### for Qt, updateContents will unite them, too. This has to be
diff --git a/khtml/rendering/render_canvas.h b/tdehtml/rendering/render_canvas.h
index 17f279d7b..8495b87bc 100644
--- a/khtml/rendering/render_canvas.h
+++ b/tdehtml/rendering/render_canvas.h
@@ -28,7 +28,7 @@
 class KHTMLView;
 class TQScrollView;
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderPage;
 class RenderStyle;
diff --git a/khtml/rendering/render_container.cpp b/tdehtml/rendering/render_container.cpp
index 69f987477..b91bc91df 100644
--- a/khtml/rendering/render_container.cpp
+++ b/tdehtml/rendering/render_container.cpp
@@ -38,7 +38,7 @@
 #include <kdebug.h>
 #include <assert.h>
 
-using namespace khtml;
+using namespace tdehtml;
 
 RenderContainer::RenderContainer(DOM::NodeImpl* node)
     : RenderObject(node)
diff --git a/khtml/rendering/render_container.h b/tdehtml/rendering/render_container.h
index 4cf386140..44ff88384 100644
--- a/khtml/rendering/render_container.h
+++ b/tdehtml/rendering/render_container.h
@@ -24,7 +24,7 @@
 
 #include "render_object.h"
 
-namespace khtml
+namespace tdehtml
 {
 
 
diff --git a/khtml/rendering/render_flow.cpp b/tdehtml/rendering/render_flow.cpp
index ae579bd46..71456d0a8 100644
--- a/khtml/rendering/render_flow.cpp
+++ b/tdehtml/rendering/render_flow.cpp
@@ -41,10 +41,10 @@
 #include "misc/htmltags.h"
 #include "html/html_formimpl.h"
 
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 RenderFlow* RenderFlow::createFlow(DOM::NodeImpl* node, RenderStyle* style, RenderArena* arena)
 {
diff --git a/khtml/rendering/render_flow.h b/tdehtml/rendering/render_flow.h
index 1e23822bb..684968bc1 100644
--- a/khtml/rendering/render_flow.h
+++ b/tdehtml/rendering/render_flow.h
@@ -29,7 +29,7 @@
 #include "bidi.h"
 #include "render_line.h"
 
-namespace khtml {
+namespace tdehtml {
 
 /**
  * all geometry managing stuff is only in the block elements.
diff --git a/khtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index 81005de85..7fe009a7f 100644
--- a/khtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -34,7 +34,7 @@
 #include <kmessagebox.h>
 #include <kreplace.h>
 #include <kreplacedialog.h>
-#include <kspell.h>
+#include <tdespell.h>
 #include <kurlcompletion.h>
 #include <twin.h>
 
@@ -48,14 +48,14 @@
 #include "rendering/render_form.h"
 #include <assert.h>
 
-#include "khtmlview.h"
-#include "khtml_ext.h"
+#include "tdehtmlview.h"
+#include "tdehtml_ext.h"
 #include "xml/dom_docimpl.h"
 
 #include <tqpopupmenu.h>
 #include <tqbitmap.h>
 
-using namespace khtml;
+using namespace tdehtml;
 
 RenderFormElement::RenderFormElement(HTMLGenericFormElementImpl *element)
     : RenderWidget(element)
@@ -138,7 +138,7 @@ short RenderButton::baselinePosition( bool f ) const
 RenderCheckBox::RenderCheckBox(HTMLInputElementImpl *element)
     : RenderButton(element)
 {
-    TQCheckBox* b = new TQCheckBox(view()->viewport(), "__khtml");
+    TQCheckBox* b = new TQCheckBox(view()->viewport(), "__tdehtml");
     b->setAutoMask(true);
     b->setMouseTracking(true);
     setQWidget(b);
@@ -185,7 +185,7 @@ void RenderCheckBox::slotStateChanged(int state)
 RenderRadioButton::RenderRadioButton(HTMLInputElementImpl *element)
     : RenderButton(element)
 {
-    TQRadioButton* b = new TQRadioButton(view()->viewport(), "__khtml");
+    TQRadioButton* b = new TQRadioButton(view()->viewport(), "__tdehtml");
     b->setMouseTracking(true);
     setQWidget(b);
 
@@ -230,7 +230,7 @@ void RenderRadioButton::slotToggled(bool activated)
 RenderSubmitButton::RenderSubmitButton(HTMLInputElementImpl *element)
     : RenderButton(element)
 {
-    TQPushButton* p = new TQPushButton(view()->viewport(), "__khtml");
+    TQPushButton* p = new TQPushButton(view()->viewport(), "__tdehtml");
     setQWidget(p);
     p->setAutoMask(true);
     p->setMouseTracking(true);
@@ -308,7 +308,7 @@ RenderResetButton::RenderResetButton(HTMLInputElementImpl *element)
 // -------------------------------------------------------------------------------
 
 LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, KHTMLView* view, TQWidget* parent)
-    : KLineEdit(parent, "__khtml"), m_input(input), m_view(view), m_spell(0)
+    : KLineEdit(parent, "__tdehtml"), m_input(input), m_view(view), m_spell(0)
 {
     setMouseTracking(true);
     KActionCollection *ac = new KActionCollection(this);
@@ -780,7 +780,7 @@ void RenderFieldset::setStyle(RenderStyle* _style)
 RenderFileButton::RenderFileButton(HTMLInputElementImpl *element)
     : RenderFormElement(element)
 {
-    KURLRequester* w = new KURLRequester( view()->viewport(), "__khtml" );
+    KURLRequester* w = new KURLRequester( view()->viewport(), "__tdehtml" );
 
     w->setMode(KFile::File | KFile::ExistingOnly);
     w->completionObject()->setDir(TDEGlobalSettings::documentPath());
@@ -877,7 +877,7 @@ RenderLegend::RenderLegend(HTMLGenericFormElementImpl *element)
 // -------------------------------------------------------------------------------
 
 ComboBoxWidget::ComboBoxWidget(TQWidget *parent)
-    : KComboBox(false, parent, "__khtml")
+    : KComboBox(false, parent, "__tdehtml")
 {
     setAutoMask(true);
     if (listBox()) listBox()->installEventFilter(this);
@@ -1222,7 +1222,7 @@ void RenderSelect::setOptionsChanged(bool _optionsChanged)
 
 KListBox* RenderSelect::createListBox()
 {
-    KListBox *lb = new KListBox(view()->viewport(), "__khtml");
+    KListBox *lb = new KListBox(view()->viewport(), "__tdehtml");
     lb->setSelectionMode(m_multiple ? TQListBox::Extended : TQListBox::Single);
     // ### looks broken
     //lb->setAutoMask(true);
@@ -1277,7 +1277,7 @@ void RenderSelect::updateSelection()
 // -------------------------------------------------------------------------
 
 TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent)
-    : KTextEdit(parent, "__khtml"), m_findDlg(0), m_find(0), m_repDlg(0), m_replace(0)
+    : KTextEdit(parent, "__tdehtml"), m_findDlg(0), m_find(0), m_repDlg(0), m_replace(0)
 {
     if(wrap != DOM::HTMLTextAreaElementImpl::ta_NoWrap) {
         setWordWrap(TQTextEdit::WidgetWidth);
diff --git a/khtml/rendering/render_form.h b/tdehtml/rendering/render_form.h
index db5088d20..d1611c1e0 100644
--- a/khtml/rendering/render_form.h
+++ b/tdehtml/rendering/render_form.h
@@ -62,13 +62,13 @@ namespace DOM {
     class HTMLTextAreaElementImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 class DocLoader;
 
 // -------------------------------------------------------------------------
 
-class RenderFormElement : public khtml::RenderWidget
+class RenderFormElement : public tdehtml::RenderWidget
 {
 public:
     RenderFormElement(DOM::HTMLGenericFormElementImpl* node);
diff --git a/khtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp
index 2535b534e..03d55fbfd 100644
--- a/khtml/rendering/render_frames.cpp
+++ b/tdehtml/rendering/render_frames.cpp
@@ -34,8 +34,8 @@
 #include "xml/dom2_eventsimpl.h"
 #include "xml/dom_docimpl.h"
 #include "misc/htmltags.h"
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 #include "misc/knsplugininstaller.h"
 
 #include <kapplication.h>
@@ -49,7 +49,7 @@
 
 #include <assert.h>
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 RenderFrameSet::RenderFrameSet( HTMLFrameSetElementImpl *frameSet)
@@ -148,7 +148,7 @@ void RenderFrameSet::layout( )
         int countPercent = 0;
         int gridLen = m_gridLen[k];
         int* gridDelta = m_gridDelta[k];
-        khtml::Length* grid =  k ? element()->m_cols : element()->m_rows;
+        tdehtml::Length* grid =  k ? element()->m_cols : element()->m_rows;
         int* gridLayout = m_gridLayout[k];
 
         if (grid) {
@@ -645,7 +645,7 @@ void RenderPart::setWidget( TQWidget *widget )
     slotViewCleared();
 }
 
-bool RenderPart::partLoadingErrorNotify(khtml::ChildFrame *, const KURL& , const TQString& )
+bool RenderPart::partLoadingErrorNotify(tdehtml::ChildFrame *, const KURL& , const TQString& )
 {
     return false;
 }
@@ -812,7 +812,7 @@ void RenderPartObject::updateWidget()
                   // It is ActiveX, but the nsplugin system handling
                   // should also work, that's why we don't override the
                   // serviceType with application/x-activex-handler
-                  // but let the KTrader in khtmlpart::createPart() detect
+                  // but let the KTrader in tdehtmlpart::createPart() detect
                   // the user's preference: launch with activex viewer or
                   // with nspluginviewer (Niko)
                   serviceType = "application/x-shockwave-flash";
@@ -855,7 +855,7 @@ void RenderPartObject::close()
 }
 
 
-bool RenderPartObject::partLoadingErrorNotify( khtml::ChildFrame *childFrame, const KURL& url, const TQString& serviceType )
+bool RenderPartObject::partLoadingErrorNotify( tdehtml::ChildFrame *childFrame, const KURL& url, const TQString& serviceType )
 {
     KHTMLPart *part = static_cast<KHTMLView *>(m_view)->part();
     kdDebug(6031) << "RenderPartObject::partLoadingErrorNotify serviceType=" << serviceType << endl;
diff --git a/khtml/rendering/render_frames.h b/tdehtml/rendering/render_frames.h
index 3dd7ed0d9..79171c747 100644
--- a/khtml/rendering/render_frames.h
+++ b/tdehtml/rendering/render_frames.h
@@ -35,7 +35,7 @@ namespace DOM
   class MouseEventImpl;
 }
 
-namespace khtml
+namespace tdehtml
 {
     class ChildFrame;
 
@@ -91,7 +91,7 @@ private:
     bool m_clientresizing;
 };
 
-class RenderPart : public khtml::RenderWidget
+class RenderPart : public tdehtml::RenderWidget
 {
     Q_OBJECT
 public:
@@ -112,7 +112,7 @@ public:
      * Return false in the normal case, return true if a fallback was found
      * and the url was successfully opened.
      */
-    virtual bool partLoadingErrorNotify( khtml::ChildFrame *childFrame, const KURL& url, const TQString& serviceType );
+    virtual bool partLoadingErrorNotify( tdehtml::ChildFrame *childFrame, const KURL& url, const TQString& serviceType );
 
     virtual short intrinsicWidth() const;
     virtual int intrinsicHeight() const;
@@ -121,7 +121,7 @@ public slots:
     virtual void slotViewCleared();
 };
 
-class RenderFrame : public khtml::RenderPart
+class RenderFrame : public tdehtml::RenderPart
 {
     Q_OBJECT
 public:
@@ -144,7 +144,7 @@ public slots:
 };
 
 // I can hardly call the class RenderObject ;-)
-class RenderPartObject : public khtml::RenderPart
+class RenderPartObject : public tdehtml::RenderPart
 {
     Q_OBJECT
 public:
@@ -159,7 +159,7 @@ public:
     
     virtual bool canHaveBorder() const { return true; }
 
-    virtual bool partLoadingErrorNotify( khtml::ChildFrame *childFrame, const KURL& url, const TQString& serviceType );
+    virtual bool partLoadingErrorNotify( tdehtml::ChildFrame *childFrame, const KURL& url, const TQString& serviceType );
 
 public slots:
     void slotViewCleared();
diff --git a/khtml/rendering/render_generated.cpp b/tdehtml/rendering/render_generated.cpp
index 17c65fc9c..2b793e504 100644
--- a/khtml/rendering/render_generated.cpp
+++ b/tdehtml/rendering/render_generated.cpp
@@ -26,7 +26,7 @@
 #include "rendering/counter_tree.h"
 #include "css/css_valueimpl.h"
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace Enumerate;
 
 // -------------------------------------------------------------------------
@@ -259,7 +259,7 @@ void RenderQuote::generateContent()
         visual = true;
 
     if (!m_counterNode)
-        m_counterNode = getCounter("-khtml-quotes", visual, false);
+        m_counterNode = getCounter("-tdehtml-quotes", visual, false);
 
     int value = m_counterNode->count();
     if (m_counterNode->isReset()) value = m_counterNode->value();
diff --git a/khtml/rendering/render_generated.h b/tdehtml/rendering/render_generated.h
index 6fa20e7cd..4e6aa6053 100644
--- a/khtml/rendering/render_generated.h
+++ b/tdehtml/rendering/render_generated.h
@@ -29,7 +29,7 @@ namespace DOM {
     class CounterImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
     class CounterNode;
 
 // -----------------------------------------------------------------------------
diff --git a/khtml/rendering/render_image.cpp b/tdehtml/rendering/render_image.cpp
index f931e9ca5..d382c9bd1 100644
--- a/khtml/rendering/render_image.cpp
+++ b/tdehtml/rendering/render_image.cpp
@@ -45,14 +45,14 @@
 #include "xml/dom2_eventsimpl.h"
 #include "html/html_documentimpl.h"
 #include "html/html_objectimpl.h"
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 #include <math.h>
 
 #include "loading_icon.cpp"
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 // -------------------------------------------------------------------------
 
@@ -242,8 +242,8 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
     // paint frame around image as long as it is not completely loaded from web.
     if (bUnfinishedImageFrame && paintInfo.phase == PaintActionForeground && cWidth > 2 && cHeight > 2 && !complete()) {
         static TQPixmap *loadingIcon;
-        TQColor bg = khtml::retrieveBackgroundColor(this);
-        TQColor fg = khtml::hasSufficientContrast(Qt::gray, bg) ? Qt::gray :
+        TQColor bg = tdehtml::retrieveBackgroundColor(this);
+        TQColor fg = tdehtml::hasSufficientContrast(Qt::gray, bg) ? Qt::gray :
                     (hasSufficientContrast(Qt::white, bg) ? Qt::white : Qt::black);
 	paintInfo.p->setPen(TQPen(fg, 1));
 	paintInfo.p->setBrush( Qt::NoBrush );
@@ -478,7 +478,7 @@ void RenderImage::updateFromElement()
     if (!u.isEmpty() &&
         ( !m_cachedImage || m_cachedImage->url() != u ) ) {
         CachedImage *new_image = element()->getDocument()->docLoader()->
-                                 requestImage(khtml::parseURL(u));
+                                 requestImage(tdehtml::parseURL(u));
 
         if(new_image && new_image != m_cachedImage)
             updateImage( new_image );
diff --git a/khtml/rendering/render_image.h b/tdehtml/rendering/render_image.h
index 8c8bb9bef..9bd0bce4c 100644
--- a/khtml/rendering/render_image.h
+++ b/tdehtml/rendering/render_image.h
@@ -31,7 +31,7 @@
 #include <tqmap.h>
 #include <tqpixmap.h>
 
-namespace khtml {
+namespace tdehtml {
 
 class DocLoader;
 class CachedObject;
diff --git a/khtml/rendering/render_inline.cpp b/tdehtml/rendering/render_inline.cpp
index c3eb08d4b..96841eb43 100644
--- a/khtml/rendering/render_inline.cpp
+++ b/tdehtml/rendering/render_inline.cpp
@@ -32,7 +32,7 @@
 
 #include <tqvaluevector.h>
 
-using namespace khtml;
+using namespace tdehtml;
 
 void RenderInline::setStyle(RenderStyle* _style)
 {
diff --git a/khtml/rendering/render_inline.h b/tdehtml/rendering/render_inline.h
index 5f4bf7b29..97392999e 100644
--- a/khtml/rendering/render_inline.h
+++ b/tdehtml/rendering/render_inline.h
@@ -28,7 +28,7 @@
 
 #include "render_flow.h"
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderInline : public RenderFlow
 {
diff --git a/khtml/rendering/render_layer.cpp b/tdehtml/rendering/render_layer.cpp
index 2b7e93f1f..2b6bbf027 100644
--- a/khtml/rendering/render_layer.cpp
+++ b/tdehtml/rendering/render_layer.cpp
@@ -48,7 +48,7 @@
 #include "render_layer.h"
 #include <kdebug.h>
 #include <assert.h>
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 #include "render_canvas.h"
 #include "render_arena.h"
 #include "render_replaced.h"
@@ -63,7 +63,7 @@
 #include <tqstyle.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 #ifdef APPLE_CHANGES
 TQScrollBar* RenderLayer::gScrollBar = 0;
@@ -610,7 +610,7 @@ RenderLayer::showScrollbar(Qt::Orientation o, bool show)
 
     if (show && !sb) {
         TQScrollView* scrollView = m_object->document()->view();
-        sb = new TQScrollBar(o, scrollView, "__khtml");
+        sb = new TQScrollBar(o, scrollView, "__tdehtml");
         scrollView->addChild(sb, 0, -50000);
 	sb->setBackgroundMode(TQWidget::NoBackground);
         sb->show();
diff --git a/khtml/rendering/render_layer.h b/tdehtml/rendering/render_layer.h
index a8f1e5adc..ae5ddff65 100644
--- a/khtml/rendering/render_layer.h
+++ b/tdehtml/rendering/render_layer.h
@@ -53,7 +53,7 @@
 class TQScrollBar;
 template <class T> class TQPtrVector;
 
-namespace khtml {
+namespace tdehtml {
     class RenderStyle;
     class RenderTable;
     class CachedObject;
diff --git a/khtml/rendering/render_line.cpp b/tdehtml/rendering/render_line.cpp
index 2bcbe366e..b518d3a43 100644
--- a/khtml/rendering/render_line.cpp
+++ b/tdehtml/rendering/render_line.cpp
@@ -37,16 +37,16 @@
 #include "xml/dom_docimpl.h"
 #include "html/html_formimpl.h"
 #include "misc/htmltags.h"
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 #ifndef NDEBUG
 static bool inInlineBoxDetach;
 #endif
 
-class khtml::EllipsisBox : public InlineBox
+class tdehtml::EllipsisBox : public InlineBox
 {
 public:
     EllipsisBox(RenderObject* obj, const DOM::DOMString& ellipsisStr, InlineFlowBox* p,
@@ -426,7 +426,7 @@ void InlineFlowBox::adjustMaxAscentAndDescent(int& maxAscent, int& maxDescent,
     for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
         // The computed lineheight needs to be extended for the
         // positioned elements
-        // see khtmltests/rendering/html_align.html
+        // see tdehtmltests/rendering/html_align.html
 
         if (curr->object()->isPositioned())
             continue; // Positioned placeholders don't affect calculations.
diff --git a/khtml/rendering/render_line.h b/tdehtml/rendering/render_line.h
index d42f2acb8..3dc066e10 100644
--- a/khtml/rendering/render_line.h
+++ b/tdehtml/rendering/render_line.h
@@ -22,7 +22,7 @@
 #ifndef RENDER_LINE_H
 #define RENDER_LINE_H
 
-namespace khtml {
+namespace tdehtml {
 
 class EllipsisBox;
 class InlineFlowBox;
diff --git a/khtml/rendering/render_list.cpp b/tdehtml/rendering/render_list.cpp
index 769b79670..08ee1a88b 100644
--- a/khtml/rendering/render_list.cpp
+++ b/tdehtml/rendering/render_list.cpp
@@ -40,7 +40,7 @@
 
 //#define BOX_DEBUG
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace Enumerate;
 
 const int cMarkerPadding = 7;
diff --git a/khtml/rendering/render_list.h b/tdehtml/rendering/render_list.h
index b70132671..9797d5114 100644
--- a/khtml/rendering/render_list.h
+++ b/tdehtml/rendering/render_list.h
@@ -33,7 +33,7 @@ namespace DOM
     class DocumentImpl;
 }
 
-namespace khtml
+namespace tdehtml
 {
 
 class RenderListItem;
diff --git a/khtml/rendering/render_object.cpp b/tdehtml/rendering/render_object.cpp
index f03039759..a3eb1565e 100644
--- a/khtml/rendering/render_object.cpp
+++ b/tdehtml/rendering/render_object.cpp
@@ -47,12 +47,12 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <tqpainter.h>
-#include "khtmlview.h"
-#include <khtml_part.h>
+#include "tdehtmlview.h"
+#include <tdehtml_part.h>
 
 #include <assert.h>
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 #define RED_LUMINOSITY        30
 #define GREEN_LUMINOSITY      59
@@ -96,7 +96,7 @@ void RenderObject::operator delete(void* ptr, size_t sz)
 RenderObject *RenderObject::createObject(DOM::NodeImpl* node,  RenderStyle* style)
 {
     RenderObject *o = 0;
-    khtml::RenderArena* arena = node->getDocument()->renderArena();
+    tdehtml::RenderArena* arena = node->getDocument()->renderArena();
     switch(style->display())
     {
     case NONE:
@@ -1712,7 +1712,7 @@ FindSelectionResult RenderObject::checkSelectionPoint( int _x, int _y, int _tx,
 
 //        kdDebug(6040) << "iterating " << (child ? child->renderName() : "") << "@" << child << (child->isText() ? " contains: \"" + TQConstString(static_cast<RenderText *>(child)->text(), kMin(static_cast<RenderText *>(child)->length(), 10u)).string() + "\"" : TQString::null) << endl;
 //        kdDebug(6040) << "---------- checkSelectionPoint recursive -----------" << endl;
-        khtml::FindSelectionResult pos = child->checkSelectionPoint(_x, _y, _tx+xPos(), _ty+yPos(), nod, off, state);
+        tdehtml::FindSelectionResult pos = child->checkSelectionPoint(_x, _y, _tx+xPos(), _ty+yPos(), nod, off, state);
 //        kdDebug(6040) << "-------- end checkSelectionPoint recursive ---------" << endl;
 //        kdDebug(6030) << this << " child->findSelectionNode returned result=" << pos << " nod=" << nod << " off=" << off << endl;
         switch(pos) {
@@ -2077,7 +2077,7 @@ bool RenderObject::hasCounter(const TQString& counter) const
                 element()->id() == ID_DIR))
             return true;
     } else
-    if (counter == "-khtml-quotes" && isQuote()) {
+    if (counter == "-tdehtml-quotes" && isQuote()) {
         return (static_cast<const RenderQuote*>(this)->quoteCount() != 0);
     }
     return false;
@@ -2146,7 +2146,7 @@ CounterNode* RenderObject::getCounter(const TQString& counter, bool view, bool c
 //             kdDebug( 6040 ) << renderName() << " counter-reset: " << counter << " " << val << endl;
         }
     }
-    else if (counter == "-khtml-quotes" && isQuote()) {
+    else if (counter == "-tdehtml-quotes" && isQuote()) {
         i = new CounterNode(this);
         val = static_cast<RenderQuote*>(this)->quoteCount();
     }
@@ -2221,7 +2221,7 @@ CounterNode* RenderObject::getCounter(const TQString& counter, bool view, bool c
 
 CounterNode* RenderObject::lookupCounter(const TQString& counter) const
 {
-    TQDict<khtml::CounterNode>* counters = document()->counters(this);
+    TQDict<tdehtml::CounterNode>* counters = document()->counters(this);
     if (counters)
         return counters->find(counter);
     else
@@ -2230,10 +2230,10 @@ CounterNode* RenderObject::lookupCounter(const TQString& counter) const
 
 void RenderObject::detachCounters()
 {
-    TQDict<khtml::CounterNode>* counters = document()->counters(this);
+    TQDict<tdehtml::CounterNode>* counters = document()->counters(this);
     if (!counters) return;
 
-    TQDictIterator<khtml::CounterNode> i(*counters);
+    TQDictIterator<tdehtml::CounterNode> i(*counters);
 
     while (i.current()) {
         (*i)->remove();
@@ -2245,10 +2245,10 @@ void RenderObject::detachCounters()
 
 void RenderObject::insertCounter(const TQString& counter, CounterNode* val)
 {
-    TQDict<khtml::CounterNode>* counters = document()->counters(this);
+    TQDict<tdehtml::CounterNode>* counters = document()->counters(this);
 
     if (!counters) {
-        counters = new TQDict<khtml::CounterNode>(11);
+        counters = new TQDict<tdehtml::CounterNode>(11);
         document()->setCounters(this, counters);
     }
 
diff --git a/khtml/rendering/render_object.h b/tdehtml/rendering/render_object.h
index e15dabbbc..9dd064932 100644
--- a/khtml/rendering/render_object.h
+++ b/tdehtml/rendering/render_object.h
@@ -35,7 +35,7 @@
 #include <kglobal.h>
 
 #include "xml/dom_docimpl.h"
-#include "misc/khtmllayout.h"
+#include "misc/tdehtmllayout.h"
 #include "misc/loader_client.h"
 #include "misc/helper.h"
 #include "rendering/render_style.h"
@@ -112,7 +112,7 @@ namespace DOM {
     class EventImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
     class RenderFlow;
     class RenderStyle;
     class RenderTable;
diff --git a/khtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp
index 319f842e7..42fce027e 100644
--- a/khtml/rendering/render_replaced.cpp
+++ b/tdehtml/rendering/render_replaced.cpp
@@ -39,16 +39,16 @@
 #include <tqobjectlist.h>
 #include <tqvaluevector.h>
 
-#include "khtml_ext.h"
-#include "khtmlview.h"
+#include "tdehtml_ext.h"
+#include "tdehtmlview.h"
 #include "xml/dom2_eventsimpl.h"
-#include "khtml_part.h"
+#include "tdehtml_part.h"
 #include "xml/dom_docimpl.h"
 #include <kdebug.h>
 
-bool khtml::allowWidgetPaintEvents = false;
+bool tdehtml::allowWidgetPaintEvents = false;
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 
@@ -212,7 +212,7 @@ void RenderWidget::setQWidget(TQWidget *widget)
             connect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed()));
             m_widget->installEventFilter(this);
 
-            if ( (m_isKHTMLWidget = !strcmp(m_widget->name(), "__khtml")) && !::tqqt_cast<TQFrame*>(m_widget))
+            if ( (m_isKHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqqt_cast<TQFrame*>(m_widget))
                 m_widget->setBackgroundMode( TQWidget::NoBackground );
 
             if (m_widget->focusPolicy() > TQ_StrongFocus)
@@ -398,7 +398,7 @@ void RenderWidget::paint(PaintInfo& paintInfo, int _tx, int _ty)
     int xPos = _tx+borderLeft()+paddingLeft();
     int yPos = _ty+borderTop()+paddingTop();
 
-    bool khtmlw = isKHTMLWidget();
+    bool tdehtmlw = isKHTMLWidget();
     int childw = m_widget->width();
     int childh = m_widget->height();
     if ( (childw == 2000 || childh == 3072) && m_widget->inherits( "KHTMLView" ) ) {
@@ -435,7 +435,7 @@ void RenderWidget::paint(PaintInfo& paintInfo, int _tx, int _ty)
     m_view->setWidgetVisible(this, true);
     m_view->addChild(m_widget, xPos, yPos );
     m_widget->show();
-    if (khtmlw)
+    if (tdehtmlw)
         paintWidget(paintInfo, m_widget, xPos, yPos);
 }
 
@@ -882,7 +882,7 @@ void RenderWidget::deref()
     if (_ref) _ref--;
 //     tqDebug( "deref(%p): width get count is %d", this, _ref);
     if (!_ref) {
-        khtml::SharedPtr<RenderArena> guard(m_arena); //Since delete on us gets called -first-,
+        tdehtml::SharedPtr<RenderArena> guard(m_arena); //Since delete on us gets called -first-,
                                                       //before the arena free
         arenaDelete(m_arena.get());
     }
diff --git a/khtml/rendering/render_replaced.h b/tdehtml/rendering/render_replaced.h
index 8432f170e..c1369bfc0 100644
--- a/khtml/rendering/render_replaced.h
+++ b/tdehtml/rendering/render_replaced.h
@@ -34,7 +34,7 @@ namespace DOM
     class MouseEventImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderReplaced : public RenderBox
 {
@@ -81,7 +81,7 @@ protected:
 };
 
 
-class RenderWidget : public TQObject, public RenderReplaced, public khtml::Shared<RenderWidget>
+class RenderWidget : public TQObject, public RenderReplaced, public tdehtml::Shared<RenderWidget>
 {
     Q_OBJECT
 public:
diff --git a/khtml/rendering/render_style.cpp b/tdehtml/rendering/render_style.cpp
index a71dd4116..a2ae70948 100644
--- a/khtml/rendering/render_style.cpp
+++ b/tdehtml/rendering/render_style.cpp
@@ -31,7 +31,7 @@
 
 #include "kdebug.h"
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 /* CSS says Fixed for the default padding value, but we treat variable as 0 padding anyways, and like
diff --git a/khtml/rendering/render_style.h b/tdehtml/rendering/render_style.h
index 80d052980..6e1b9cbc8 100644
--- a/khtml/rendering/render_style.h
+++ b/tdehtml/rendering/render_style.h
@@ -44,7 +44,7 @@
 
 #include "dom/dom_misc.h"
 #include "dom/dom_string.h"
-#include "misc/khtmllayout.h"
+#include "misc/tdehtmllayout.h"
 #include "misc/shared.h"
 #include "rendering/font.h"
 
@@ -69,7 +69,7 @@ namespace DOM {
     class CounterActImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
     class CachedImage;
     class CachedObject;
@@ -764,7 +764,7 @@ public:
 
     CachedImage *style_image;
 
-    khtml::Font font;
+    tdehtml::Font font;
     TQColor color;
 
     short border_hspacing;
@@ -1276,7 +1276,7 @@ public:
 
     void setClear(EClear v) {  noninherited_flags.f._clear = v; }
     void setTableLayout(ETableLayout v) {  noninherited_flags.f._table_layout = v; }
-    bool setFontDef(const khtml::FontDef & v) {
+    bool setFontDef(const tdehtml::FontDef & v) {
         // bah, this doesn't compare pointers. broken! (Dirk)
         if (!(inherited->font.fontDef == v)) {
             inherited.access()->font = Font( v );
diff --git a/khtml/rendering/render_table.cpp b/tdehtml/rendering/render_table.cpp
index d98aa2072..ef7fe1031 100644
--- a/khtml/rendering/render_table.cpp
+++ b/tdehtml/rendering/render_table.cpp
@@ -48,7 +48,7 @@
 #include <kdebug.h>
 #include <assert.h>
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 RenderTable::RenderTable(DOM::NodeImpl* node)
diff --git a/khtml/rendering/render_table.h b/tdehtml/rendering/render_table.h
index a6de6cfaf..09695e3d8 100644
--- a/khtml/rendering/render_table.h
+++ b/tdehtml/rendering/render_table.h
@@ -34,13 +34,13 @@
 #include "rendering/render_block.h"
 #include "rendering/render_style.h"
 
-#include "misc/khtmllayout.h"
+#include "misc/tdehtmllayout.h"
 
 namespace DOM {
     class DOMString;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderTable;
 class RenderTableSection;
diff --git a/khtml/rendering/render_text.cpp b/tdehtml/rendering/render_text.cpp
index 770e8cd4d..9090e1631 100644
--- a/khtml/rendering/render_text.cpp
+++ b/tdehtml/rendering/render_text.cpp
@@ -55,7 +55,7 @@
 #include <stdlib.h>
 #endif
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 #ifndef NDEBUG
@@ -225,11 +225,11 @@ void InlineTextBox::paintSelection(const Font *f, RenderText *text, TQPainter *p
         hc = grp.highlightedText();
         hbg = grp.highlight();
 	// ### should be at most retrieved once per render text
-	TQColor bg = khtml::retrieveBackgroundColor(text);
+	TQColor bg = tdehtml::retrieveBackgroundColor(text);
 	// It may happen that the contrast is -- well -- virtually non existent.
 	// In this case, simply swap the colors, thus in compliance with
 	// NN4 (win32 only), IE, and Mozilla.
-	if (!khtml::hasSufficientContrast(hbg, bg))
+	if (!tdehtml::hasSufficientContrast(hbg, bg))
 	    tqSwap(hc, hbg);
     }
 
diff --git a/khtml/rendering/render_text.h b/tdehtml/rendering/render_text.h
index 50132fbc7..acce98350 100644
--- a/khtml/rendering/render_text.h
+++ b/tdehtml/rendering/render_text.h
@@ -42,7 +42,7 @@ class TQFontMetrics;
 const int cNoTruncation = -1;
 const int cFullTruncation = -2;
 
-namespace khtml
+namespace tdehtml
 {
     class RenderText;
     class RenderStyle;
diff --git a/khtml/rendering/table_layout.cpp b/tdehtml/rendering/table_layout.cpp
index f745640e7..eb8153331 100644
--- a/khtml/rendering/table_layout.cpp
+++ b/tdehtml/rendering/table_layout.cpp
@@ -25,7 +25,7 @@
 
 #include <kglobal.h>
 
-using namespace khtml;
+using namespace tdehtml;
 
 // #define DEBUG_LAYOUT
 
diff --git a/khtml/rendering/table_layout.h b/tdehtml/rendering/table_layout.h
index cbaf6d3a7..04b34a832 100644
--- a/khtml/rendering/table_layout.h
+++ b/tdehtml/rendering/table_layout.h
@@ -24,9 +24,9 @@
 #define TABLE_LAYOUT_H
 
 #include <tqmemarray.h>
-#include <misc/khtmllayout.h>
+#include <misc/tdehtmllayout.h>
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderTable;
 class RenderTableCell;
diff --git a/khtml/rendering/table_layout.txt b/tdehtml/rendering/table_layout.txt
index 14a74bd1e..6dee6c1c2 100644
--- a/khtml/rendering/table_layout.txt
+++ b/tdehtml/rendering/table_layout.txt
@@ -43,7 +43,7 @@ The algorithm below describes to the best of our knowledge the way
 table alyouting is handled in a NS compatible way.
 
 There are two stages, the collection stage (assocaited with
-calcMinMaxWidth() in khtml) and the stage assigning width to cells
+calcMinMaxWidth() in tdehtml) and the stage assigning width to cells
 (associated with layout()).
 
 A set of hinted widths are used to determine the final table layout in
diff --git a/khtml/khtml-devel-gdb b/tdehtml/tdehtml-devel-gdb
index d5fea476f..02030b2d6 100644
--- a/khtml/khtml-devel-gdb
+++ b/tdehtml/tdehtml-devel-gdb
@@ -1,6 +1,6 @@
 # This file defines handy gdb macros for KHTML
 # To use it, add this line to your ~/.gdbinit :
-# source /path/to/kde/sources/tdelibs/khtml/khtml-devel-gdb
+# source /path/to/kde/sources/tdelibs/tdehtml/tdehtml-devel-gdb
 
 define printdomstring
     printdomstringimpl $arg0.impl
diff --git a/khtml/khtml.desktop b/tdehtml/tdehtml.desktop
index 588f52ab1..959691671 100644
--- a/khtml/khtml.desktop
+++ b/tdehtml/tdehtml.desktop
@@ -89,5 +89,5 @@ Name=KHTML
 Name[hi]=के�चटी�म�ल (KHTML)
 Name[te]=కెహెచ� టి ఎమ� ఎల�
 ServiceTypes=KParts/ReadOnlyPart,Browser/View
-X-TDE-Library=libkhtmlpart
+X-TDE-Library=libtdehtmlpart
 InitialPreference=10
diff --git a/khtml/khtml.rc b/tdehtml/tdehtml.rc
index cea311444..af41c8246 100644
--- a/khtml/khtml.rc
+++ b/tdehtml/tdehtml.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="khtmlpart" version="5">
+<kpartgui name="tdehtmlpart" version="5">
 <MenuBar>
  <Menu name="edit"><text>&amp;Edit</text>
   <Action name="selectAll" />
diff --git a/khtml/khtml_browser.rc b/tdehtml/tdehtml_browser.rc
index a1da305e7..02220dc51 100644
--- a/khtml/khtml_browser.rc
+++ b/tdehtml/tdehtml_browser.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="khtmlpart" version="19">
+<kpartgui name="tdehtmlpart" version="19">
 <MenuBar>
  <Menu name="file"><text>&amp;File</text>
   <Action name="saveBackground" />
diff --git a/khtml/khtml_caret.cpp b/tdehtml/tdehtml_caret.cpp
index 9b819ee6c..b5d5185f0 100644
--- a/khtml/khtml_caret.cpp
+++ b/tdehtml/tdehtml_caret.cpp
@@ -19,11 +19,11 @@
  */
 
 
-#include "khtml_caret_p.h"
+#include "tdehtml_caret_p.h"
 
 #include "html/html_documentimpl.h"
 
-namespace khtml {
+namespace tdehtml {
 
 /** Flags representing the type of advance that has been made.
  * @param LeftObject a render object was left and an ascent to its parent has
@@ -2090,7 +2090,7 @@ static inline RenderTableCell *findNearestTableCell(KHTMLPart *part, int x,
  * If the cell at @p x is not editable, its left neighbor is tried, then its
  * right neighbor, then the left neighbor's left neighbor etc. If no
  * editable cell can be found, 0 is returned.
- * @param part khtml part
+ * @param part tdehtml part
  * @param x absolute x-coordinate
  * @param row table row to be searched
  * @param fromEnd @p true, begin from end (applies only to nested tables)
diff --git a/khtml/khtml_caret_p.h b/tdehtml/tdehtml_caret_p.h
index 9524f2df7..729f4d8ba 100644
--- a/khtml/khtml_caret_p.h
+++ b/tdehtml/tdehtml_caret_p.h
@@ -34,7 +34,7 @@ namespace DOM {
   class ElementImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 /** caret advance policy.
  *
@@ -1103,7 +1103,7 @@ protected:
 };
 
 
-}/*namespace khtml*/
+}/*namespace tdehtml*/
 
 
 #endif
diff --git a/khtml/khtml_events.cpp b/tdehtml/tdehtml_events.cpp
index 1045a018f..0bb9c6fc3 100644
--- a/khtml/khtml_events.cpp
+++ b/tdehtml/tdehtml_events.cpp
@@ -17,17 +17,17 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "khtml_events.h"
+#include "tdehtml_events.h"
 #include "rendering/render_object.h"
 #include "xml/dom_nodeimpl.h"
 
-using namespace khtml;
+using namespace tdehtml;
 
-class khtml::MouseEvent::MouseEventPrivate
+class tdehtml::MouseEvent::MouseEventPrivate
 {
 };
 
-khtml::MouseEvent::MouseEvent( const char *name, TQMouseEvent *qmouseEvent, int x, int y,
+tdehtml::MouseEvent::MouseEvent( const char *name, TQMouseEvent *qmouseEvent, int x, int y,
                                const DOM::DOMString &url, const DOM::DOMString& target,
 	                const DOM::Node &innerNode )
 : KParts::Event( name ), m_qmouseEvent( qmouseEvent ), m_x( x ), m_y( y ),
@@ -38,12 +38,12 @@ khtml::MouseEvent::MouseEvent( const char *name, TQMouseEvent *qmouseEvent, int
       innerNode.handle()->renderer()->absolutePosition(m_nodeAbsX, m_nodeAbsY);
 }
 
-khtml::MouseEvent::~MouseEvent()
+tdehtml::MouseEvent::~MouseEvent()
 {
   delete d;
 }
 
-long khtml::MouseEvent::offset() const
+long tdehtml::MouseEvent::offset() const
 {
     int offset = 0;
     DOM::NodeImpl* tempNode = 0;
@@ -51,23 +51,23 @@ long khtml::MouseEvent::offset() const
     absX = absY = 0;
     if (innerNode().handle()->renderer()) {
         innerNode().handle()->renderer()->absolutePosition(absX, absY);
-        khtml::RenderObject::SelPointState state;
+        tdehtml::RenderObject::SelPointState state;
         innerNode().handle()->renderer()->checkSelectionPoint( x(), y(), absX, absY, tempNode, offset, state );
     }
     return offset;
 }
 
-const char *khtml::MousePressEvent::s_strMousePressEvent = "khtml/Events/MousePressEvent";
+const char *tdehtml::MousePressEvent::s_strMousePressEvent = "tdehtml/Events/MousePressEvent";
 
-const char *khtml::MouseDoubleClickEvent::s_strMouseDoubleClickEvent = "khtml/Events/MouseDoubleClickEvent";
+const char *tdehtml::MouseDoubleClickEvent::s_strMouseDoubleClickEvent = "tdehtml/Events/MouseDoubleClickEvent";
 
-const char *khtml::MouseMoveEvent::s_strMouseMoveEvent = "khtml/Events/MouseMoveEvent";
+const char *tdehtml::MouseMoveEvent::s_strMouseMoveEvent = "tdehtml/Events/MouseMoveEvent";
 
-const char *khtml::MouseReleaseEvent::s_strMouseReleaseEvent = "khtml/Events/MouseReleaseEvent";
+const char *tdehtml::MouseReleaseEvent::s_strMouseReleaseEvent = "tdehtml/Events/MouseReleaseEvent";
 
-const char *khtml::DrawContentsEvent::s_strDrawContentsEvent = "khtml/Events/DrawContentsEvent";
+const char *tdehtml::DrawContentsEvent::s_strDrawContentsEvent = "tdehtml/Events/DrawContentsEvent";
 
-class khtml::DrawContentsEvent::DrawContentsEventPrivate
+class tdehtml::DrawContentsEvent::DrawContentsEventPrivate
 {
 public:
   DrawContentsEventPrivate()
@@ -78,14 +78,14 @@ public:
   }
 };
 
-khtml::DrawContentsEvent::DrawContentsEvent( TQPainter *painter, int clipx, int clipy, int clipw, int cliph )
+tdehtml::DrawContentsEvent::DrawContentsEvent( TQPainter *painter, int clipx, int clipy, int clipw, int cliph )
   : KParts::Event( s_strDrawContentsEvent ), m_painter( painter ), m_clipx( clipx ), m_clipy( clipy ),
     m_clipw( clipw ), m_cliph( cliph )
 {
   d = new DrawContentsEventPrivate;
 }
 
-khtml::DrawContentsEvent::~DrawContentsEvent()
+tdehtml::DrawContentsEvent::~DrawContentsEvent()
 {
   delete d;
 }
diff --git a/khtml/khtml_events.h b/tdehtml/tdehtml_events.h
index 223f2b47d..f71298262 100644
--- a/khtml/khtml_events.h
+++ b/tdehtml/tdehtml_events.h
@@ -16,15 +16,15 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef __khtml_events_h__
-#define __khtml_events_h__
+#ifndef __tdehtml_events_h__
+#define __tdehtml_events_h__
 
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 
 #include "dom/dom_node.h"
 #include "dom/dom_string.h"
 
-namespace khtml
+namespace tdehtml
 {
 
 class MouseEvent : public KParts::Event
diff --git a/khtml/khtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 2e4660f2d..62a5293c1 100644
--- a/khtml/khtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -26,9 +26,9 @@
  */
 
 #include <assert.h>
-#include "khtml_ext.h"
-#include "khtmlview.h"
-#include "khtml_pagecache.h"
+#include "tdehtml_ext.h"
+#include "tdehtmlview.h"
+#include "tdehtml_pagecache.h"
 #include "rendering/render_form.h"
 #include "rendering/render_image.h"
 #include "html/html_imageimpl.h"
@@ -60,15 +60,15 @@
 #include <kurifilter.h>
 #include <kiconloader.h>
 #include <kdesktopfile.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 #include <kinputdialog.h>
 
-#include "khtml_factory.h"
+#include "tdehtml_factory.h"
 
 #include "dom/dom_element.h"
 #include "misc/htmltags.h"
 
-#include "khtmlpart_p.h"
+#include "tdehtmlpart_p.h"
 
 KHTMLPartBrowserExtension::KHTMLPartBrowserExtension( KHTMLPart *parent, const char *name )
 : KParts::BrowserExtension( parent, name )
@@ -394,7 +394,7 @@ void KHTMLPartBrowserExtension::disableScrolling()
 class KHTMLPopupGUIClient::KHTMLPopupGUIClientPrivate
 {
 public:
-  KHTMLPart *m_khtml;
+  KHTMLPart *m_tdehtml;
   KURL m_url;
   KURL m_imageURL;
   TQPixmap m_pixmap;
@@ -402,27 +402,27 @@ public:
 };
 
 
-KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc, const KURL &url )
-  : TQObject( khtml )
+KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *tdehtml, const TQString &doc, const KURL &url )
+  : TQObject( tdehtml )
 {
   d = new KHTMLPopupGUIClientPrivate;
-  d->m_khtml = khtml;
+  d->m_tdehtml = tdehtml;
   d->m_url = url;
   bool isImage = false;
-  bool hasSelection = khtml->hasSelection();
-  setInstance( khtml->instance() );
+  bool hasSelection = tdehtml->hasSelection();
+  setInstance( tdehtml->instance() );
 
   DOM::Element e;
-  e = khtml->nodeUnderMouse();
+  e = tdehtml->nodeUnderMouse();
 
   if ( !e.isNull() && (e.elementId() == ID_IMG ||
                        (e.elementId() == ID_INPUT && !static_cast<DOM::HTMLInputElement>(e).src().isEmpty())))
   {
     if (e.elementId() == ID_IMG) {
       DOM::HTMLImageElementImpl *ie = static_cast<DOM::HTMLImageElementImpl*>(e.handle());
-      khtml::RenderImage *ri = dynamic_cast<khtml::RenderImage*>(ie->renderer());
+      tdehtml::RenderImage *ri = dynamic_cast<tdehtml::RenderImage*>(ie->renderer());
       if (ri && ri->contentObject()) {
-        d->m_suggestedFilename = static_cast<khtml::CachedImage*>(ri->contentObject())->suggestedFilename();
+        d->m_suggestedFilename = static_cast<tdehtml::CachedImage*>(ri->contentObject())->suggestedFilename();
       }
     }
     isImage=true;
@@ -430,10 +430,10 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
 
   if (hasSelection)
   {
-      KAction* copyAction = KStdAction::copy( d->m_khtml->browserExtension(), TQT_SLOT( copy() ), actionCollection(), "copy" );
+      KAction* copyAction = KStdAction::copy( d->m_tdehtml->browserExtension(), TQT_SLOT( copy() ), actionCollection(), "copy" );
       copyAction->setText(i18n("&Copy Text"));
-      copyAction->setEnabled(d->m_khtml->browserExtension()->isActionEnabled( "copy" ));
-      actionCollection()->insert( khtml->actionCollection()->action( "selectAll" ) );
+      copyAction->setEnabled(d->m_tdehtml->browserExtension()->isActionEnabled( "copy" ));
+      actionCollection()->insert( tdehtml->actionCollection()->action( "selectAll" ) );
 
 
       // Fill search provider entries
@@ -443,7 +443,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
       const char keywordDelimiter = config.readNumEntry("KeywordDelimiter", ':');
 
       // search text
-      TQString selectedText = khtml->selectedText();
+      TQString selectedText = tdehtml->selectedText();
       selectedText.replace("&", "&&");
       if ( selectedText.length()>18 ) {
         selectedText.truncate(15);
@@ -477,7 +477,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
       }
 
       // using .arg(foo, bar) instead of .arg(foo).arg(bar), as foo can contain %x
-      new KAction( i18n( "Search for '%1' with %2" ).arg( selectedText, name ), icon, 0, d->m_khtml->browserExtension(),
+      new KAction( i18n( "Search for '%1' with %2" ).arg( selectedText, name ), icon, 0, d->m_tdehtml->browserExtension(),
                      TQT_SLOT( searchProvider() ), actionCollection(), "searchProvider" );
 
       // favorite search providers
@@ -507,7 +507,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
               icon = TQPixmap( iconPath );
             name = service->name();
 
-            providerList->insert( new KAction( name, icon, 0, d->m_khtml->browserExtension(),
+            providerList->insert( new KAction( name, icon, 0, d->m_tdehtml->browserExtension(),
               TQT_SLOT( searchProvider() ), actionCollection(), TQString( "searchProvider" + searchProviderPrefix ).latin1() ) );
           }
         }
@@ -516,12 +516,12 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
 
       if ( selectedText.contains("://") && KURL(selectedText).isValid() )
          new KAction( i18n( "Open '%1'" ).arg( selectedText ), "window_new", 0,
-         d->m_khtml->browserExtension(), TQT_SLOT( openSelection() ), actionCollection(), "openSelection" );
+         d->m_tdehtml->browserExtension(), TQT_SLOT( openSelection() ), actionCollection(), "openSelection" );
   }
   else if ( url.isEmpty() && !isImage )
   {
-      actionCollection()->insert( khtml->actionCollection()->action( "security" ) );
-      actionCollection()->insert( khtml->actionCollection()->action( "setEncoding" ) );
+      actionCollection()->insert( tdehtml->actionCollection()->action( "security" ) );
+      actionCollection()->insert( tdehtml->actionCollection()->action( "setEncoding" ) );
       new KAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
                    actionCollection(), "stopanimations" );
   }
@@ -545,7 +545,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
   // frameset? -> add "Reload Frame" etc.
   if (!hasSelection)
   {
-    if ( khtml->parentPart() )
+    if ( tdehtml->parentPart() )
     {
       new KAction( i18n( "Open in New &Window" ), "window_new", 0, this, TQT_SLOT( slotFrameInWindow() ),
                                           actionCollection(), "frameinwindow" );
@@ -557,28 +557,28 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
                                         actionCollection(), "reloadframe" );
 
       if ( KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() ) {
-          if ( khtml->d->m_frame->m_type == khtml::ChildFrame::IFrame )
+          if ( tdehtml->d->m_frame->m_type == tdehtml::ChildFrame::IFrame )
               new KAction( i18n( "Block IFrame..." ), 0, this, TQT_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" );
       }
 
-      new KAction( i18n( "View Frame Source" ), 0, d->m_khtml, TQT_SLOT( slotViewDocumentSource() ),
+      new KAction( i18n( "View Frame Source" ), 0, d->m_tdehtml, TQT_SLOT( slotViewDocumentSource() ),
                                           actionCollection(), "viewFrameSource" );
-      new KAction( i18n( "View Frame Information" ), 0, d->m_khtml, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" );
-      // This one isn't in khtml_popupmenu.rc anymore, because Print isn't either,
+      new KAction( i18n( "View Frame Information" ), 0, d->m_tdehtml, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" );
+      // This one isn't in tdehtml_popupmenu.rc anymore, because Print isn't either,
       // and because print frame is already in the toolbar and the menu.
       // But leave this here, so that it's easy to read it.
-      new KAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_khtml->browserExtension(), TQT_SLOT( print() ), actionCollection(), "printFrame" );
-      new KAction( i18n( "Save &Frame As..." ), 0, d->m_khtml, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
+      new KAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_tdehtml->browserExtension(), TQT_SLOT( print() ), actionCollection(), "printFrame" );
+      new KAction( i18n( "Save &Frame As..." ), 0, d->m_tdehtml, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
 
-      actionCollection()->insert( khtml->parentPart()->actionCollection()->action( "viewDocumentSource" ) );
-      actionCollection()->insert( khtml->parentPart()->actionCollection()->action( "viewPageInfo" ) );
+      actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewDocumentSource" ) );
+      actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewPageInfo" ) );
     } else {
-      actionCollection()->insert( khtml->actionCollection()->action( "viewDocumentSource" ) );
-      actionCollection()->insert( khtml->actionCollection()->action( "viewPageInfo" ) );
+      actionCollection()->insert( tdehtml->actionCollection()->action( "viewDocumentSource" ) );
+      actionCollection()->insert( tdehtml->actionCollection()->action( "viewPageInfo" ) );
     }
   } else if (isImage || !url.isEmpty()) {
-    actionCollection()->insert( khtml->actionCollection()->action( "viewDocumentSource" ) );
-    actionCollection()->insert( khtml->actionCollection()->action( "viewPageInfo" ) );
+    actionCollection()->insert( tdehtml->actionCollection()->action( "viewDocumentSource" ) );
+    actionCollection()->insert( tdehtml->actionCollection()->action( "viewPageInfo" ) );
     new KAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
                  actionCollection(), "stopanimations" );
   }
@@ -649,8 +649,8 @@ KHTMLPopupGUIClient::~KHTMLPopupGUIClient()
 void KHTMLPopupGUIClient::slotSaveLinkAs()
 {
   TDEIO::MetaData metaData;
-  metaData["referrer"] = d->m_khtml->referrer();
-  saveURL( d->m_khtml->widget(), i18n( "Save Link As" ), d->m_url, metaData );
+  metaData["referrer"] = d->m_tdehtml->referrer();
+  saveURL( d->m_tdehtml->widget(), i18n( "Save Link As" ), d->m_url, metaData );
 }
 
 void KHTMLPopupGUIClient::slotSendImage()
@@ -669,15 +669,15 @@ void KHTMLPopupGUIClient::slotSendImage()
 void KHTMLPopupGUIClient::slotSaveImageAs()
 {
   TDEIO::MetaData metaData;
-  metaData["referrer"] = d->m_khtml->referrer();
-  saveURL( d->m_khtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData, TQString::null, 0, d->m_suggestedFilename );
+  metaData["referrer"] = d->m_tdehtml->referrer();
+  saveURL( d->m_tdehtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData, TQString::null, 0, d->m_suggestedFilename );
 }
 
 void KHTMLPopupGUIClient::slotBlockHost()
 {
     TQString name=d->m_imageURL.protocol()+"://"+d->m_imageURL.host()+"/*";
     KHTMLFactory::defaultHTMLSettings()->addAdFilter( name );
-    d->m_khtml->reparseConfiguration();
+    d->m_tdehtml->reparseConfiguration();
 }
 
 void KHTMLPopupGUIClient::slotBlockImage()
@@ -690,7 +690,7 @@ void KHTMLPopupGUIClient::slotBlockImage()
                                          &ok);
     if ( ok ) {
         KHTMLFactory::defaultHTMLSettings()->addAdFilter( url );
-        d->m_khtml->reparseConfiguration();
+        d->m_tdehtml->reparseConfiguration();
     }
 }
 
@@ -699,11 +699,11 @@ void KHTMLPopupGUIClient::slotBlockIFrame()
     bool ok = false;
     TQString url = KInputDialog::getText( i18n( "Add URL to Filter"),
                                                i18n("Enter the URL:"),
-                                               d->m_khtml->url().url(),
+                                               d->m_tdehtml->url().url(),
                                                &ok );
     if ( ok ) {
         KHTMLFactory::defaultHTMLSettings()->addAdFilter( url );
-        d->m_khtml->reparseConfiguration();
+        d->m_tdehtml->reparseConfiguration();
     }
 }
 
@@ -724,7 +724,7 @@ void KHTMLPopupGUIClient::slotCopyLinkLocation()
 
 void KHTMLPopupGUIClient::slotStopAnimations()
 {
-  d->m_khtml->stopAnimations();
+  d->m_tdehtml->stopAnimations();
 }
 
 void KHTMLPopupGUIClient::slotCopyImage()
@@ -735,10 +735,10 @@ void KHTMLPopupGUIClient::slotCopyImage()
 
   KURL::List lst;
   lst.append( safeURL );
-  KMultipleDrag *drag = new KMultipleDrag(d->m_khtml->view(), "Image");
+  KMultipleDrag *drag = new KMultipleDrag(d->m_tdehtml->view(), "Image");
 
   drag->addDragObject( new TQImageDrag(d->m_pixmap.convertToImage()) );
-  drag->addDragObject( new KURLDrag(lst, d->m_khtml->view(), "Image URL") );
+  drag->addDragObject( new KURLDrag(lst, d->m_tdehtml->view(), "Image URL") );
 
   // Set it in both the mouse selection and in the clipboard
   TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard );
@@ -765,42 +765,42 @@ void KHTMLPopupGUIClient::slotCopyImageLocation()
 
 void KHTMLPopupGUIClient::slotViewImage()
 {
-  d->m_khtml->browserExtension()->createNewWindow(d->m_imageURL);
+  d->m_tdehtml->browserExtension()->createNewWindow(d->m_imageURL);
 }
 
 void KHTMLPopupGUIClient::slotReloadFrame()
 {
-  KParts::URLArgs args( d->m_khtml->browserExtension()->urlArgs() );
+  KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() );
   args.reload = true;
-  args.metaData()["referrer"] = d->m_khtml->pageReferrer();
+  args.metaData()["referrer"] = d->m_tdehtml->pageReferrer();
   // reload document
-  d->m_khtml->closeURL();
-  d->m_khtml->browserExtension()->setURLArgs( args );
-  d->m_khtml->openURL( d->m_khtml->url() );
+  d->m_tdehtml->closeURL();
+  d->m_tdehtml->browserExtension()->setURLArgs( args );
+  d->m_tdehtml->openURL( d->m_tdehtml->url() );
 }
 
 void KHTMLPopupGUIClient::slotFrameInWindow()
 {
-  KParts::URLArgs args( d->m_khtml->browserExtension()->urlArgs() );
-  args.metaData()["referrer"] = d->m_khtml->pageReferrer();
+  KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() );
+  args.metaData()["referrer"] = d->m_tdehtml->pageReferrer();
   args.metaData()["forcenewwindow"] = "true";
-  emit d->m_khtml->browserExtension()->createNewWindow( d->m_khtml->url(), args );
+  emit d->m_tdehtml->browserExtension()->createNewWindow( d->m_tdehtml->url(), args );
 }
 
 void KHTMLPopupGUIClient::slotFrameInTop()
 {
-  KParts::URLArgs args( d->m_khtml->browserExtension()->urlArgs() );
-  args.metaData()["referrer"] = d->m_khtml->pageReferrer();
+  KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() );
+  args.metaData()["referrer"] = d->m_tdehtml->pageReferrer();
   args.frameName = "_top";
-  emit d->m_khtml->browserExtension()->openURLRequest( d->m_khtml->url(), args );
+  emit d->m_tdehtml->browserExtension()->openURLRequest( d->m_tdehtml->url(), args );
 }
 
 void KHTMLPopupGUIClient::slotFrameInTab()
 {
-  KParts::URLArgs args( d->m_khtml->browserExtension()->urlArgs() );
-  args.metaData()["referrer"] = d->m_khtml->pageReferrer();
+  KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() );
+  args.metaData()["referrer"] = d->m_tdehtml->pageReferrer();
   args.setNewTab(true);
-  emit d->m_khtml->browserExtension()->createNewWindow( d->m_khtml->url(), args );
+  emit d->m_tdehtml->browserExtension()->createNewWindow( d->m_tdehtml->url(), args );
 }
 
 void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption,
@@ -956,7 +956,7 @@ void KHTMLPartBrowserHostExtension::virtual_hook( int id, void *data )
 }
 
 
-// defined in khtml_part.cpp
+// defined in tdehtml_part.cpp
 extern const int KDE_NO_EXPORT fastZoomSizes[];
 extern const int KDE_NO_EXPORT fastZoomSizeCount;
 
@@ -1028,5 +1028,5 @@ void KHTMLZoomFactorAction::slotActivated( int id )
         m_part->setZoomFactor(fastZoomSizes[fastZoomSizeCount/2 + (m_direction ? 1 : -1)*idx]);
 }
 
-#include "khtml_ext.moc"
+#include "tdehtml_ext.moc"
 
diff --git a/khtml/khtml_ext.h b/tdehtml/tdehtml_ext.h
index 4878c0ac4..5e2eafa9e 100644
--- a/khtml/khtml_ext.h
+++ b/tdehtml/tdehtml_ext.h
@@ -24,10 +24,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef __khtml_ext_h__
-#define __khtml_ext_h__
+#ifndef __tdehtml_ext_h__
+#define __tdehtml_ext_h__
 
-#include "khtml_part.h"
+#include "tdehtml_part.h"
 
 #include <tqguardedptr.h>
 
@@ -116,7 +116,7 @@ class KHTMLPopupGUIClient : public TQObject, public KXMLGUIClient
 {
   Q_OBJECT
 public:
-  KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc, const KURL &url );
+  KHTMLPopupGUIClient( KHTMLPart *tdehtml, const TQString &doc, const KURL &url );
   virtual ~KHTMLPopupGUIClient();
 
   static void saveURL( TQWidget *parent, const TQString &caption, const KURL &url,
diff --git a/khtml/khtml_factory.cpp b/tdehtml/tdehtml_factory.cpp
index 63e44025f..9d0ec6d36 100644
--- a/khtml/khtml_factory.cpp
+++ b/tdehtml/tdehtml_factory.cpp
@@ -18,9 +18,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "khtml_factory.h"
-#include "khtml_part.h"
-#include "khtml_settings.h"
+#include "tdehtml_factory.h"
+#include "tdehtml_part.h"
+#include "tdehtml_settings.h"
 
 #include "css/cssstyleselector.h"
 #include "html/html_imageimpl.h"
@@ -39,11 +39,11 @@
 
 template class TQPtrList<KHTMLPart>;
 
-extern "C" KDE_EXPORT void *init_libkhtml()
+extern "C" KDE_EXPORT void *init_libtdehtml()
 {
     // We can't use a plain self() here, because that would
     // return the global factory, which might already exist
-    // at the time init_libkhtml is called! As soon as someone
+    // at the time init_libtdehtml is called! As soon as someone
     // does new KHTMLPart() in his application and loads up
     // an html document into that part which either embeds
     // embeds another KHTMLPart instance via <object> or
@@ -93,11 +93,11 @@ KHTMLFactory::~KHTMLFactory()
 	KHTMLSettings::avFamilies = 0;
 
         // clean up static data
-        khtml::CSSStyleSelector::clear();
-        khtml::RenderStyle::cleanup();
-        khtml::Cache::clear();
-        khtml::cleanup_thaibreaks();
-        khtml::ArenaFinish();
+        tdehtml::CSSStyleSelector::clear();
+        tdehtml::RenderStyle::cleanup();
+        tdehtml::Cache::clear();
+        tdehtml::cleanup_thaibreaks();
+        tdehtml::ArenaFinish();
     }
     else
         deref();
@@ -126,7 +126,7 @@ void KHTMLFactory::ref()
         // safe side ;-) -> let's use a simple reference counting scheme
         // (Simon)
         s_self = new KHTMLFactory;
-        khtml::Cache::init();
+        tdehtml::Cache::init();
     }
 
     s_refcnt++;
@@ -174,7 +174,7 @@ TDEInstance *KHTMLFactory::instance()
 
   if ( !s_instance )
   {
-    s_about = new TDEAboutData( "khtml", I18N_NOOP( "KHTML" ), "4.0",
+    s_about = new TDEAboutData( "tdehtml", I18N_NOOP( "KHTML" ), "4.0",
                               I18N_NOOP( "Embeddable HTML component" ),
                               TDEAboutData::License_LGPL );
     s_about->addAuthor( "Lars Knoll", 0, "knoll@kde.org" );
@@ -203,5 +203,5 @@ KHTMLSettings *KHTMLFactory::defaultHTMLSettings()
 }
 
 using namespace KParts;
-#include "khtml_factory.moc"
+#include "tdehtml_factory.moc"
 
diff --git a/khtml/khtml_factory.h b/tdehtml/tdehtml_factory.h
index 4d0154128..2177a2602 100644
--- a/khtml/khtml_factory.h
+++ b/tdehtml/tdehtml_factory.h
@@ -17,11 +17,11 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef __khtml_factory_h__
-#define __khtml_factory_h__
+#ifndef __tdehtml_factory_h__
+#define __tdehtml_factory_h__
 
-#include <kparts/factory.h>
-#include <kparts/historyprovider.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/historyprovider.h>
 #include <tqptrlist.h>
 #include <kurl.h>
 
diff --git a/khtml/khtml_iface.cc b/tdehtml/tdehtml_iface.cc
index 9576379ec..e42562c51 100644
--- a/khtml/khtml_iface.cc
+++ b/tdehtml/tdehtml_iface.cc
@@ -18,10 +18,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "khtml_iface.h"
-#include "khtml_part.h"
-#include "khtmlview.h"
-#include "khtml_ext.h"
+#include "tdehtml_iface.h"
+#include "tdehtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_ext.h"
 #include <kio/global.h>
 #include <tqapplication.h>
 #include <tqvariant.h>
diff --git a/khtml/khtml_iface.h b/tdehtml/tdehtml_iface.h
index 8caade850..d4c34940b 100644
--- a/khtml/khtml_iface.h
+++ b/tdehtml/tdehtml_iface.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef __khtml_Iface_h__
-#define __khtml_Iface_h__
+#ifndef __tdehtml_Iface_h__
+#define __tdehtml_Iface_h__
 
 #include <dcopobject.h>
 #include <dcopref.h>
diff --git a/khtml/khtml_pagecache.cpp b/tdehtml/tdehtml_pagecache.cpp
index 935f31cc0..bde26c9de 100644
--- a/khtml/khtml_pagecache.cpp
+++ b/tdehtml/tdehtml_pagecache.cpp
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "khtml_pagecache.h"
+#include "tdehtml_pagecache.h"
 
 #include <kstaticdeleter.h>
 #include <ktempfile.h>
@@ -72,7 +72,7 @@ public:
 
 KHTMLPageCacheEntry::KHTMLPageCacheEntry(long id) : m_id(id), m_complete(false)
 {
-  TQString path = locateLocal("tmp", "khtmlcache");
+  TQString path = locateLocal("tmp", "tdehtmlcache");
   m_file = new KTempFile(path);
   m_file->unlink();
 }
@@ -310,4 +310,4 @@ KHTMLPageCacheDelivery::~KHTMLPageCacheDelivery()
   close(fd);
 }
 
-#include "khtml_pagecache.moc"
+#include "tdehtml_pagecache.moc"
diff --git a/khtml/khtml_pagecache.h b/tdehtml/tdehtml_pagecache.h
index ac9ea5b4b..e2992faa4 100644
--- a/khtml/khtml_pagecache.h
+++ b/tdehtml/tdehtml_pagecache.h
@@ -17,8 +17,8 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef __khtml_pagecache_h__
-#define __khtml_pagecache_h__
+#ifndef __tdehtml_pagecache_h__
+#define __tdehtml_pagecache_h__
 
 #include <tqobject.h>
 #include <tqcstring.h>
diff --git a/khtml/khtml_part.cpp b/tdehtml/tdehtml_part.cpp
index c0733c990..185ded02d 100644
--- a/khtml/khtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -28,9 +28,9 @@
  */
 
 //#define SPEED_DEBUG
-#include "khtml_part.h"
+#include "tdehtml_part.h"
 
-#include "khtml_pagecache.h"
+#include "tdehtml_pagecache.h"
 
 #include "dom/dom_string.h"
 #include "dom/dom_element.h"
@@ -53,11 +53,11 @@
 #include "css/csshelper.h"
 using namespace DOM;
 
-#include "khtmlview.h"
-#include <kparts/partmanager.h>
+#include "tdehtmlview.h"
+#include <tdeparts/partmanager.h>
 #include "ecma/kjs_proxy.h"
 #include "ecma/kjs_window.h"
-#include "khtml_settings.h"
+#include "tdehtml_settings.h"
 #include "kjserrordlg.h"
 
 #include <kjs/function.h>
@@ -92,12 +92,12 @@ using namespace DOM;
 #include <kglobalsettings.h>
 #include <kurldrag.h>
 #include <kapplication.h>
-#include <kparts/browserinterface.h>
+#include <tdeparts/browserinterface.h>
 #if !defined(QT_NO_DRAGANDDROP)
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 #endif
-#include "../kutils/kfinddialog.h"
-#include "../kutils/kfind.h"
+#include "../tdeutils/kfinddialog.h"
+#include "../tdeutils/kfind.h"
 
 #include <ksslcertchain.h>
 #include <ksslinfodlg.h>
@@ -113,7 +113,7 @@ using namespace DOM;
 #include <tqmetaobject.h>
 #include <tqucomextra_p.h>
 
-#include "khtmlpart_p.h"
+#include "tdehtmlpart_p.h"
 #include "kpassivepopup.h"
 #include "kpopupmenu.h"
 #include "rendering/render_form.h"
@@ -121,7 +121,7 @@ using namespace DOM;
 
 #define HINT_UTF8	106
 
-namespace khtml {
+namespace tdehtml {
     class PartStyleSheetLoader : public CachedObjectClient
     {
     public:
@@ -148,11 +148,11 @@ namespace khtml {
           delete this;
         }
         TQGuardedPtr<KHTMLPart> m_part;
-        khtml::CachedCSSStyleSheet *m_cachedSheet;
+        tdehtml::CachedCSSStyleSheet *m_cachedSheet;
     };
 }
 
-void khtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & event, const KParts::LiveConnectExtension::ArgList & args)
+void tdehtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & event, const KParts::LiveConnectExtension::ArgList & args)
 {
     if (!m_part || !m_frame || !m_liveconnect)
         // hmmm
@@ -176,7 +176,7 @@ void khtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & e
             script += (*i).second;
     }
     script += ")";
-    kdDebug(6050) << "khtml::ChildFrame::liveConnectEvent " << script << endl;
+    kdDebug(6050) << "tdehtml::ChildFrame::liveConnectEvent " << script << endl;
 
     KHTMLPart * part = ::tqqt_cast<KHTMLPart *>(m_part->parent());
     if (!part)
@@ -229,9 +229,9 @@ KHTMLPart::KHTMLPart( KHTMLView *view, TQObject *parent, const char *name, GUIPr
 void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
 {
   if ( prof == DefaultGUI )
-    setXMLFile( "khtml.rc" );
+    setXMLFile( "tdehtml.rc" );
   else if ( prof == BrowserViewGUI )
-    setXMLFile( "khtml_browser.rc" );
+    setXMLFile( "tdehtml_browser.rc" );
 
   d = new KHTMLPartPrivate(parent());
 
@@ -309,48 +309,48 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
   TDEConfig *config = TDEGlobal::config();
   if ( config->hasGroup( "HTML Settings" ) ) {
     config->setGroup( "HTML Settings" );
-    khtml::Decoder::AutoDetectLanguage language;
+    tdehtml::Decoder::AutoDetectLanguage language;
     TQCString name = TQTextCodec::codecForLocale()->name();
     name = name.lower();
 
     if ( name == "cp1256" || name == "iso-8859-6" ) {
-      language = khtml::Decoder::Arabic;
+      language = tdehtml::Decoder::Arabic;
     }
     else if ( name == "cp1257" || name == "iso-8859-13" || name == "iso-8859-4" ) {
-      language = khtml::Decoder::Baltic;
+      language = tdehtml::Decoder::Baltic;
     }
     else if ( name == "cp1250" || name == "ibm852" || name == "iso-8859-2" || name == "iso-8859-3" ) {
-      language = khtml::Decoder::CentralEuropean;
+      language = tdehtml::Decoder::CentralEuropean;
     }
     else if ( name == "cp1251" || name == "koi8-r" || name == "iso-8859-5" ) {
-      language = khtml::Decoder::Russian;
+      language = tdehtml::Decoder::Russian;
     }
     else if ( name == "koi8-u" ) {
-      language = khtml::Decoder::Ukrainian;
+      language = tdehtml::Decoder::Ukrainian;
     }
     else if ( name == "cp1253" || name == "iso-8859-7" ) {
-      language = khtml::Decoder::Greek;
+      language = tdehtml::Decoder::Greek;
     }
     else if ( name == "cp1255" || name == "iso-8859-8" || name == "iso-8859-8-i" ) {
-      language = khtml::Decoder::Hebrew;
+      language = tdehtml::Decoder::Hebrew;
     }
     else if ( name == "jis7" || name == "eucjp" || name == "sjis"  ) {
-      language = khtml::Decoder::Japanese;
+      language = tdehtml::Decoder::Japanese;
     }
     else if ( name == "cp1254" || name == "iso-8859-9" ) {
-      language = khtml::Decoder::Turkish;
+      language = tdehtml::Decoder::Turkish;
     }
     else if ( name == "cp1252" || name == "iso-8859-1" || name == "iso-8859-15" ) {
-      language = khtml::Decoder::WesternEuropean;
+      language = tdehtml::Decoder::WesternEuropean;
     }
     else
-      language = khtml::Decoder::SemiautomaticDetection;
+      language = tdehtml::Decoder::SemiautomaticDetection;
 
     int _id = config->readNumEntry( "AutomaticDetectionLanguage", language );
     d->m_automaticDetection->setItemChecked( _id, true );
     d->m_paSetEncoding->popupMenu()->setItemChecked( 0, true );
 
-    d->m_autoDetectLanguage = static_cast< khtml::Decoder::AutoDetectLanguage >( _id );
+    d->m_autoDetectLanguage = static_cast< tdehtml::Decoder::AutoDetectLanguage >( _id );
   }
 
 
@@ -437,14 +437,14 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
   connect( this, TQT_SIGNAL( started( TDEIO::Job * ) ),
            this, TQT_SLOT( updateActions() ) );
 
-  d->m_popupMenuXML = KXMLGUIFactory::readConfigFile( locate( "data", "khtml/khtml_popupmenu.rc", KHTMLFactory::instance() ) );
+  d->m_popupMenuXML = KXMLGUIFactory::readConfigFile( locate( "data", "tdehtml/tdehtml_popupmenu.rc", KHTMLFactory::instance() ) );
 
-  connect( khtml::Cache::loader(), TQT_SIGNAL( requestStarted( khtml::DocLoader*, khtml::CachedObject* ) ),
-           this, TQT_SLOT( slotLoaderRequestStarted( khtml::DocLoader*, khtml::CachedObject* ) ) );
-  connect( khtml::Cache::loader(), TQT_SIGNAL( requestDone( khtml::DocLoader*, khtml::CachedObject *) ),
-           this, TQT_SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
-  connect( khtml::Cache::loader(), TQT_SIGNAL( requestFailed( khtml::DocLoader*, khtml::CachedObject *) ),
-           this, TQT_SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
+  connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ),
+           this, TQT_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) );
+  connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+           this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
+  connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+           this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
 
   connect ( &d->m_progressUpdateTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgressUpdate() ) );
 
@@ -459,10 +459,10 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
   //if ( prof == BrowserViewGUI && !parentPart() )
   //        loadPlugins( partObject(), this, instance() );
 
-  // "khtml" catalog does not exist, our translations are in tdelibs.
+  // "tdehtml" catalog does not exist, our translations are in tdelibs.
   // removing this catalog from TDEGlobal::locale() prevents problems
   // with changing the language in applications at runtime -Thomas Reitelbach
-  TDEGlobal::locale()->removeCatalogue("khtml");
+  TDEGlobal::locale()->removeCatalogue("tdehtml");
 }
 
 KHTMLPart::~KHTMLPart()
@@ -477,7 +477,7 @@ KHTMLPart::~KHTMLPart()
   delete d->m_manualDetection;
 
   slotWalletClosed();
-  if (!parentPart()) { // only delete it if the top khtml_part closes
+  if (!parentPart()) { // only delete it if the top tdehtml_part closes
     removeJSErrorExtension();
     delete d->m_statusBarPopupLabel;
   }
@@ -496,12 +496,12 @@ KHTMLPart::~KHTMLPart()
   if (!d->m_bComplete)
     closeURL();
 
-  disconnect( khtml::Cache::loader(), TQT_SIGNAL( requestStarted( khtml::DocLoader*, khtml::CachedObject* ) ),
-           this, TQT_SLOT( slotLoaderRequestStarted( khtml::DocLoader*, khtml::CachedObject* ) ) );
-  disconnect( khtml::Cache::loader(), TQT_SIGNAL( requestDone( khtml::DocLoader*, khtml::CachedObject *) ),
-           this, TQT_SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
-  disconnect( khtml::Cache::loader(), TQT_SIGNAL( requestFailed( khtml::DocLoader*, khtml::CachedObject *) ),
-           this, TQT_SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
+  disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ),
+           this, TQT_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) );
+  disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+           this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
+  disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+           this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
 
   clear();
 
@@ -512,12 +512,12 @@ KHTMLPart::~KHTMLPart()
     d->m_view->m_part = 0;
   }
 
-  // Have to delete this here since we forward declare it in khtmlpart_p and
+  // Have to delete this here since we forward declare it in tdehtmlpart_p and
   // at least some compilers won't call the destructor in this case.
   delete d->m_jsedlg;
   d->m_jsedlg = 0;
 
-  if (!parentPart()) // only delete d->m_frame if the top khtml_part closes
+  if (!parentPart()) // only delete d->m_frame if the top tdehtml_part closes
       delete d->m_frame;
   delete d; d = 0;
   KHTMLFactory::deregisterPart( this );
@@ -571,7 +571,7 @@ bool KHTMLPart::openURL( const KURL &url )
 
   // check to see if this is an "error://" URL. This is caused when an error
   // occurs before this part was loaded (e.g. KonqRun), and is passed to
-  // khtmlpart so that it can display the error.
+  // tdehtmlpart so that it can display the error.
   if ( url.protocol() == "error" && url.hasSubURL() ) {
     closeURL();
 
@@ -811,7 +811,7 @@ bool KHTMLPart::closeURL()
   d->m_workingURL = KURL();
 
   if ( d->m_doc && d->m_doc->docLoader() )
-    khtml::Cache::loader()->cancelRequests( d->m_doc->docLoader() );
+    tdehtml::Cache::loader()->cancelRequests( d->m_doc->docLoader() );
 
   // tell all subframes to stop as well
   {
@@ -957,19 +957,19 @@ bool KHTMLPart::metaRefreshEnabled() const
 }
 
 // Define this to disable dlopening kjs_html, when directly linking to it.
-// You need to edit khtml/Makefile.am to add ./ecma/libkjs_html.la to LIBADD
-// and to edit khtml/ecma/Makefile.am to s/kjs_html/libkjs_html/, remove libkhtml from LIBADD,
+// You need to edit tdehtml/Makefile.am to add ./ecma/libkjs_html.la to LIBADD
+// and to edit tdehtml/ecma/Makefile.am to s/kjs_html/libkjs_html/, remove libtdehtml from LIBADD,
 //        remove LDFLAGS line, and replace kde_module with either lib (shared) or noinst (static)
-//        Also, change the order of "ecma" and "." in khtml's SUBDIRS line.
+//        Also, change the order of "ecma" and "." in tdehtml's SUBDIRS line.
 // OK - that's the default now, use the opposite of the above instructions to go back
 // to "dlopening it" - but it breaks exception catching in kjs_binding.cpp
 #define DIRECT_LINKAGE_TO_ECMA
 
 #ifdef DIRECT_LINKAGE_TO_ECMA
-extern "C" { KJSProxy *kjs_html_init(khtml::ChildFrame * childframe); }
+extern "C" { KJSProxy *kjs_html_init(tdehtml::ChildFrame * childframe); }
 #endif
 
-static bool createJScript(khtml::ChildFrame *frame)
+static bool createJScript(tdehtml::ChildFrame *frame)
 {
 #ifndef DIRECT_LINKAGE_TO_ECMA
   KLibrary *lib = KLibLoader::self()->library("kjs_html");
@@ -984,7 +984,7 @@ static bool createJScript(khtml::ChildFrame *frame)
     setJScriptEnabled( false );
     return false;
   }
-  typedef KJSProxy* (*initFunction)(khtml::ChildFrame *);
+  typedef KJSProxy* (*initFunction)(tdehtml::ChildFrame *);
   initFunction initSym = (initFunction) sym;
   frame->m_jscript = (*initSym)(d->m_frame);
   frame->m_kjs_lib = lib;
@@ -1002,7 +1002,7 @@ KJSProxy *KHTMLPart::jScript()
   if ( !d->m_frame ) {
       KHTMLPart * p = parentPart();
       if (!p) {
-          d->m_frame = new khtml::ChildFrame;
+          d->m_frame = new tdehtml::ChildFrame;
           d->m_frame->m_part = this;
       } else {
           ConstFrameIt it = p->d->m_frames.begin();
@@ -1135,7 +1135,7 @@ void KHTMLPart::launchJSErrorDialog() {
 
 void KHTMLPart::launchJSConfigDialog() {
   TQStringList args;
-  args << "khtml_java_js";
+  args << "tdehtml_java_js";
   TDEApplication::tdeinitExec( "kcmshell", args );
 }
 
@@ -1170,7 +1170,7 @@ TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const
   {
     kdDebug(6070) << "executeScript done, handling immediate redirection NOW" << endl;
     // Must abort tokenizer, no further script must execute.
-    khtml::Tokenizer* t = d->m_doc->tokenizer();
+    tdehtml::Tokenizer* t = d->m_doc->tokenizer();
     if(t)
       t->abort();
     d->m_redirectionTimer.start( 0, true );
@@ -1843,7 +1843,7 @@ void KHTMLPart::slotFinished( TDEIO::Job * job )
   }
   TDEIO::TransferJob *tjob = ::tqqt_cast<TDEIO::TransferJob*>(job);
   if (tjob && tjob->isErrorPage()) {
-    khtml::RenderPart *renderPart = d->m_frame ? static_cast<khtml::RenderPart *>(d->m_frame->m_frame) : 0;
+    tdehtml::RenderPart *renderPart = d->m_frame ? static_cast<tdehtml::RenderPart *>(d->m_frame->m_frame) : 0;
     if (renderPart) {
       HTMLObjectElementImpl* elt = static_cast<HTMLObjectElementImpl *>(renderPart->element());
       if (!elt)
@@ -1984,7 +1984,7 @@ void KHTMLPart::write( const char *str, int len )
       d->m_doc->recalcStyle( NodeImpl::Force );
   }
 
-  khtml::Tokenizer* t = d->m_doc->tokenizer();
+  tdehtml::Tokenizer* t = d->m_doc->tokenizer();
   if(t)
     t->write( decoded, true );
 }
@@ -1999,7 +1999,7 @@ void KHTMLPart::write( const TQString &str )
         d->m_doc->setParseMode( DocumentImpl::Strict );
         d->m_bFirstData = false;
     }
-    khtml::Tokenizer* t = d->m_doc->tokenizer();
+    tdehtml::Tokenizer* t = d->m_doc->tokenizer();
     if(t)
         t->write( str, true );
 }
@@ -2087,9 +2087,9 @@ void KHTMLPart::slotFinishedParsing()
   checkCompleted();
 }
 
-void KHTMLPart::slotLoaderRequestStarted( khtml::DocLoader* dl, khtml::CachedObject *obj )
+void KHTMLPart::slotLoaderRequestStarted( tdehtml::DocLoader* dl, tdehtml::CachedObject *obj )
 {
-  if ( obj && obj->type() == khtml::CachedObject::Image && d->m_doc && d->m_doc->docLoader() == dl ) {
+  if ( obj && obj->type() == tdehtml::CachedObject::Image && d->m_doc && d->m_doc->docLoader() == dl ) {
     KHTMLPart* p = this;
     while ( p ) {
       KHTMLPart* const op = p;
@@ -2102,9 +2102,9 @@ void KHTMLPart::slotLoaderRequestStarted( khtml::DocLoader* dl, khtml::CachedObj
   }
 }
 
-void KHTMLPart::slotLoaderRequestDone( khtml::DocLoader* dl, khtml::CachedObject *obj )
+void KHTMLPart::slotLoaderRequestDone( tdehtml::DocLoader* dl, tdehtml::CachedObject *obj )
 {
-  if ( obj && obj->type() == khtml::CachedObject::Image && d->m_doc && d->m_doc->docLoader() == dl ) {
+  if ( obj && obj->type() == tdehtml::CachedObject::Image && d->m_doc && d->m_doc->docLoader() == dl ) {
     KHTMLPart* p = this;
     while ( p ) {
       KHTMLPart* const op = p;
@@ -2240,7 +2240,7 @@ void KHTMLPart::checkCompleted()
   // Still waiting for images/scripts from the loader ?
   int requests = 0;
   if ( d->m_doc && d->m_doc->docLoader() )
-    requests = khtml::Cache::loader()->numRequests( d->m_doc->docLoader() );
+    requests = tdehtml::Cache::loader()->numRequests( d->m_doc->docLoader() );
 
   if ( requests > 0 )
   {
@@ -2334,7 +2334,7 @@ void KHTMLPart::checkEmitLoadEvent()
   // ## This makes this method very similar to checkCompleted. A brave soul should try merging them.
   int requests = 0;
   if ( d->m_doc && d->m_doc->docLoader() )
-    requests = khtml::Cache::loader()->numRequests( d->m_doc->docLoader() );
+    requests = tdehtml::Cache::loader()->numRequests( d->m_doc->docLoader() );
 
   if ( requests > 0 )
     return;
@@ -2506,7 +2506,7 @@ TQString KHTMLPart::defaultEncoding() const
 void KHTMLPart::setUserStyleSheet(const KURL &url)
 {
   if ( d->m_doc && d->m_doc->docLoader() )
-    (void) new khtml::PartStyleSheetLoader(this, url.url(), d->m_doc->docLoader());
+    (void) new tdehtml::PartStyleSheetLoader(this, url.url(), d->m_doc->docLoader());
 }
 
 void KHTMLPart::setUserStyleSheet(const TQString &styleSheet)
@@ -2619,8 +2619,8 @@ void KHTMLPartPrivate::setFlagRecursively(
 
   // descend into child frames recursively
   {
-    TQValueList<khtml::ChildFrame*>::Iterator it = m_frames.begin();
-    const TQValueList<khtml::ChildFrame*>::Iterator itEnd = m_frames.end();
+    TQValueList<tdehtml::ChildFrame*>::Iterator it = m_frames.begin();
+    const TQValueList<tdehtml::ChildFrame*>::Iterator itEnd = m_frames.end();
     for (; it != itEnd; ++it) {
       KHTMLPart* const part = static_cast<KHTMLPart *>((KParts::ReadOnlyPart *)(*it)->m_part);
       if (part->inherits("KHTMLPart"))
@@ -2629,8 +2629,8 @@ void KHTMLPartPrivate::setFlagRecursively(
   }
   // do the same again for objects
   {
-    TQValueList<khtml::ChildFrame*>::Iterator it = m_objects.begin();
-    const TQValueList<khtml::ChildFrame*>::Iterator itEnd = m_objects.end();
+    TQValueList<tdehtml::ChildFrame*>::Iterator it = m_objects.begin();
+    const TQValueList<tdehtml::ChildFrame*>::Iterator itEnd = m_objects.end();
     for (; it != itEnd; ++it) {
       KHTMLPart* const part = static_cast<KHTMLPart *>((KParts::ReadOnlyPart *)(*it)->m_part);
       if (part->inherits("KHTMLPart"))
@@ -2796,7 +2796,7 @@ bool KHTMLPart::initFindNode( bool selection, bool reverse, bool fromCursor )
       if ( reverse )
       {
         // Need to find out the really last object, to start from it
-        khtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0;
+        tdehtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0;
         if ( obj )
         {
           // find the last object in the render tree
@@ -2845,7 +2845,7 @@ bool KHTMLPart::findTextNext( const TQString &str, bool forward, bool caseSensit
             if(d->m_findPos != -1)
             {
                 int x = 0, y = 0;
-                if(static_cast<khtml::RenderText *>(d->m_findNode->renderer())
+                if(static_cast<tdehtml::RenderText *>(d->m_findNode->renderer())
                   ->posOfChar(d->m_findPos, x, y))
                     d->m_view->setContentsPos(x-50, y-50);
 
@@ -3003,13 +3003,13 @@ void KHTMLPart::findText()
     return;
   }
 
-  // The lineedit of the dialog would make khtml lose its selection, otherwise
+  // The lineedit of the dialog would make tdehtml lose its selection, otherwise
 #ifndef QT_NO_CLIPBOARD
   disconnect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) );
 #endif
 
   // Now show the dialog in which the user can choose options.
-  d->m_findDialog = new KFindDialog( false /*non-modal*/, widget(), "khtmlfind" );
+  d->m_findDialog = new KFindDialog( false /*non-modal*/, widget(), "tdehtmlfind" );
   d->m_findDialog->setHasSelection( hasSelection() );
   d->m_findDialog->setHasCursor( d->m_findNode != 0 );
   if ( d->m_findNode ) // has a cursor -> default to 'FromCursor'
@@ -3115,8 +3115,8 @@ bool KHTMLPart::findTextNext( bool reverse )
     tqSwap( d->m_findPosEnd, d->m_findPosStart );
     tqSwap( d->m_findNode, d->m_findNodePrevious );
     // d->m_findNode now point at the end of the last searched line - advance one node
-    khtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0;
-    khtml::RenderObject* end = d->m_findNodeEnd ? d->m_findNodeEnd->renderer() : 0;
+    tdehtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0;
+    tdehtml::RenderObject* end = d->m_findNodeEnd ? d->m_findNodeEnd->renderer() : 0;
     if ( obj == end )
       obj = 0L;
     else if ( obj )
@@ -3133,9 +3133,9 @@ bool KHTMLPart::findTextNext( bool reverse )
   d->m_lastFindState.last_dir = ( options & KFindDialog::FindBackwards ) ? 1 : 0;
 
   KFind::Result res = KFind::NoMatch;
-  khtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0;
-  khtml::RenderObject* end = d->m_findNodeEnd ? d->m_findNodeEnd->renderer() : 0;
-  khtml::RenderTextArea *tmpTextArea=0L;
+  tdehtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0;
+  tdehtml::RenderObject* end = d->m_findNodeEnd ? d->m_findNodeEnd->renderer() : 0;
+  tdehtml::RenderTextArea *tmpTextArea=0L;
   //kdDebug(6050) << k_funcinfo << "obj=" << obj << " end=" << end << endl;
   while( res == KFind::NoMatch )
   {
@@ -3162,14 +3162,14 @@ bool KHTMLPart::findTextNext( bool reverse )
         bool renderLineText = (TQCString(obj->renderName())== "RenderLineEdit");
         if ( renderAreaText )
         {
-          khtml::RenderTextArea *parent= static_cast<khtml::RenderTextArea *>(obj->parent());
+          tdehtml::RenderTextArea *parent= static_cast<tdehtml::RenderTextArea *>(obj->parent());
           s = parent->text();
           s = s.replace(0xa0, ' ');
           tmpTextArea = parent;
         }
         else if ( renderLineText )
         {
-          khtml::RenderLineEdit *parentLine= static_cast<khtml::RenderLineEdit *>(obj);
+          tdehtml::RenderLineEdit *parentLine= static_cast<tdehtml::RenderLineEdit *>(obj);
           if (parentLine->widget()->echoMode() == TQLineEdit::Normal)
             s = parentLine->widget()->text();
           s = s.replace(0xa0, ' ');
@@ -3199,7 +3199,7 @@ bool KHTMLPart::findTextNext( bool reverse )
 
           if ( isLink && obj->parent()!=tmpTextArea )
           {
-            s = static_cast<khtml::RenderText *>(obj)->data().string();
+            s = static_cast<tdehtml::RenderText *>(obj)->data().string();
             s = s.replace(0xa0, ' ');
           }
         }
@@ -3309,9 +3309,9 @@ void KHTMLPart::slotHighlight( const TQString& /*text*/, int index, int length )
   d->m_selectionStart = node;
   d->m_startOffset = index - (*prev).index;
 
-  khtml::RenderObject* obj = node->renderer();
-  khtml::RenderTextArea *parent = 0L;
-  khtml::RenderLineEdit *parentLine = 0L;
+  tdehtml::RenderObject* obj = node->renderer();
+  tdehtml::RenderTextArea *parent = 0L;
+  tdehtml::RenderLineEdit *parentLine = 0L;
   bool renderLineText =false;
 
   TQRect highlightedRect;
@@ -3325,15 +3325,15 @@ void KHTMLPart::slotHighlight( const TQString& /*text*/, int index, int length )
 
 
     if( renderAreaText )
-      parent= static_cast<khtml::RenderTextArea *>(obj->parent());
+      parent= static_cast<tdehtml::RenderTextArea *>(obj->parent());
     if ( renderLineText )
-      parentLine= static_cast<khtml::RenderLineEdit *>(obj);
+      parentLine= static_cast<tdehtml::RenderLineEdit *>(obj);
     if ( !renderLineText )
-      //if (static_cast<khtml::RenderText *>(node->renderer())
+      //if (static_cast<tdehtml::RenderText *>(node->renderer())
       //    ->posOfChar(d->m_startOffset, x, y))
       {
         int dummy;
-        static_cast<khtml::RenderText *>(node->renderer())
+        static_cast<tdehtml::RenderText *>(node->renderer())
           ->caretPos( d->m_startOffset, false, x, y, dummy, dummy ); // more precise than posOfChar
         //kdDebug(6050) << "topleft: " << x << "," << y << endl;
         if ( x != -1 || y != -1 )
@@ -3409,12 +3409,12 @@ void KHTMLPart::slotHighlight( const TQString& /*text*/, int index, int length )
     if (d->m_selectionEnd.handle()->renderer() )
     {
       int x, y, height, dummy;
-      static_cast<khtml::RenderText *>(d->m_selectionEnd.handle()->renderer())
+      static_cast<tdehtml::RenderText *>(d->m_selectionEnd.handle()->renderer())
           ->caretPos( d->m_endOffset, false, x, y, dummy, height ); // more precise than posOfChar
       //kdDebug(6050) << "bottomright: " << x << "," << y+height << endl;
       if ( x != -1 || y != -1 )
       {
-        // if ( static_cast<khtml::RenderText *>(d->m_selectionEnd.handle()->renderer())
+        // if ( static_cast<tdehtml::RenderText *>(d->m_selectionEnd.handle()->renderer())
         //  ->posOfChar(d->m_endOffset-1, x, y))
         highlightedRect.setBottomRight( d->m_view->mapToGlobal( TQPoint(x, y+height) ) );
       }
@@ -3956,7 +3956,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c
   if ( hasTarget && target != "_self" && target != "_top" && target != "_blank" && target != "_parent" )
   {
     // unknown frame names should open in a new window.
-    khtml::ChildFrame *frame = recursiveFrameRequest( this, cURL, args, false );
+    tdehtml::ChildFrame *frame = recursiveFrameRequest( this, cURL, args, false );
     if ( frame )
     {
       args.metaData()["referrer"] = d->m_referrer;
@@ -4240,10 +4240,10 @@ void KHTMLPart::updateActions()
 {
   bool frames = false;
 
-  TQValueList<khtml::ChildFrame*>::ConstIterator it = d->m_frames.begin();
-  const TQValueList<khtml::ChildFrame*>::ConstIterator end = d->m_frames.end();
+  TQValueList<tdehtml::ChildFrame*>::ConstIterator it = d->m_frames.begin();
+  const TQValueList<tdehtml::ChildFrame*>::ConstIterator end = d->m_frames.end();
   for (; it != end; ++it )
-      if ( (*it)->m_type == khtml::ChildFrame::Frame )
+      if ( (*it)->m_type == tdehtml::ChildFrame::Frame )
       {
           frames = true;
           break;
@@ -4293,7 +4293,7 @@ void KHTMLPart::updateActions()
     d->m_paDebugScript->setEnabled( d->m_frame ? d->m_frame->m_jscript : 0L );
 }
 
-KParts::LiveConnectExtension *KHTMLPart::liveConnectExtension( const khtml::RenderPart *frame) const {
+KParts::LiveConnectExtension *KHTMLPart::liveConnectExtension( const tdehtml::RenderPart *frame) const {
     const ConstFrameIt end = d->m_objects.end();
     for(ConstFrameIt it = d->m_objects.begin(); it != end; ++it )
         if ((*it)->m_frame == frame)
@@ -4301,20 +4301,20 @@ KParts::LiveConnectExtension *KHTMLPart::liveConnectExtension( const khtml::Rend
     return 0L;
 }
 
-bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, const TQString &frameName,
+bool KHTMLPart::requestFrame( tdehtml::RenderPart *frame, const TQString &url, const TQString &frameName,
                               const TQStringList &params, bool isIFrame )
 {
   //kdDebug( 6050 ) << this << " requestFrame( ..., " << url << ", " << frameName << " )" << endl;
   FrameIt it = d->m_frames.find( frameName );
   if ( it == d->m_frames.end() )
   {
-    khtml::ChildFrame * child = new khtml::ChildFrame;
+    tdehtml::ChildFrame * child = new tdehtml::ChildFrame;
     //kdDebug( 6050 ) << "inserting new frame into frame map " << frameName << endl;
     child->m_name = frameName;
     it = d->m_frames.append( child );
   }
 
-  (*it)->m_type = isIFrame ? khtml::ChildFrame::IFrame : khtml::ChildFrame::Frame;
+  (*it)->m_type = isIFrame ? tdehtml::ChildFrame::IFrame : tdehtml::ChildFrame::Frame;
   (*it)->m_frame = frame;
   (*it)->m_params = params;
 
@@ -4344,14 +4344,14 @@ TQString KHTMLPart::requestFrameName()
    return TQString::fromLatin1("<!--frame %1-->").arg(d->m_frameNameId++);
 }
 
-bool KHTMLPart::requestObject( khtml::RenderPart *frame, const TQString &url, const TQString &serviceType,
+bool KHTMLPart::requestObject( tdehtml::RenderPart *frame, const TQString &url, const TQString &serviceType,
                                const TQStringList &params )
 {
   //kdDebug( 6005 ) << "KHTMLPart::requestObject " << this << " frame=" << frame << endl;
-  khtml::ChildFrame *child = new khtml::ChildFrame;
+  tdehtml::ChildFrame *child = new tdehtml::ChildFrame;
   FrameIt it = d->m_objects.append( child );
   (*it)->m_frame = frame;
-  (*it)->m_type = khtml::ChildFrame::Object;
+  (*it)->m_type = tdehtml::ChildFrame::Object;
   (*it)->m_params = params;
 
   KParts::URLArgs args;
@@ -4363,7 +4363,7 @@ bool KHTMLPart::requestObject( khtml::RenderPart *frame, const TQString &url, co
   return true;
 }
 
-bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &_args )
+bool KHTMLPart::requestObject( tdehtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &_args )
 {
   if (!checkLinkSecurity(url))
   {
@@ -4420,7 +4420,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const
   }
 }
 
-bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url, const TQString &mimetype )
+bool KHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL &_url, const TQString &mimetype )
 {
   //kdDebug( 6050 ) << "KHTMLPart::processObjectRequest trying to create part for " << mimetype << endl;
 
@@ -4429,7 +4429,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
   // though -> the reference becomes invalid -> crash is likely
   KURL url( _url );
 
-  // khtmlrun called us this way to indicate a loading error
+  // tdehtmlrun called us this way to indicate a loading error
   if ( d->m_onlyLocalReferences || ( url.isEmpty() && mimetype.isEmpty() ) )
   {
       child->m_bCompleted = true;
@@ -4449,7 +4449,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
     // Before attempting to load a part, check if the user wants that.
     // Many don't like getting ZIP files embedded.
     // However we don't want to ask for flash and other plugin things..
-    if ( child->m_type != khtml::ChildFrame::Object )
+    if ( child->m_type != tdehtml::ChildFrame::Object )
     {
       TQString suggestedFilename;
       if ( child->m_run )
@@ -4500,7 +4500,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
     if ( child->m_frame  && part->widget() )
       child->m_frame->setWidget( part->widget() );
 
-    if ( child->m_type != khtml::ChildFrame::Object )
+    if ( child->m_type != tdehtml::ChildFrame::Object )
       partManager()->addPart( part, false );
 //  else
 //      kdDebug(6005) << "AH! NO FRAME!!!!!" << endl;
@@ -4603,7 +4603,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
   child->m_args.serviceType = mimetype;
 
   // if not a frame set child as completed
-  child->m_bCompleted = child->m_type == khtml::ChildFrame::Object;
+  child->m_bCompleted = child->m_type == tdehtml::ChildFrame::Object;
 
   if ( child->m_extension )
     child->m_extension->setURLArgs( child->m_args );
@@ -4701,7 +4701,7 @@ KParts::PartManager *KHTMLPart::partManager()
 {
   if ( !d->m_manager && d->m_view )
   {
-    d->m_manager = new KParts::PartManager( d->m_view->topLevelWidget(), this, "khtml part manager" );
+    d->m_manager = new KParts::PartManager( d->m_view->topLevelWidget(), this, "tdehtml part manager" );
     d->m_manager->setAllowNestedParts( true );
     connect( d->m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ),
              this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
@@ -4938,13 +4938,13 @@ void KHTMLPart::popupMenu( const TQString &linkUrl )
   KParts::BrowserExtension::PopupFlags itemflags=KParts::BrowserExtension::ShowBookmark | KParts::BrowserExtension::ShowReload;
 
   if ( linkUrl.isEmpty() ) { // click on background
-    KHTMLPart* khtmlPart = this;
-    while ( khtmlPart->parentPart() )
+    KHTMLPart* tdehtmlPart = this;
+    while ( tdehtmlPart->parentPart() )
     {
-      khtmlPart=khtmlPart->parentPart();
+      tdehtmlPart=tdehtmlPart->parentPart();
     }
-    popupURL = khtmlPart->url();
-    referrer = khtmlPart->pageReferrer();
+    popupURL = tdehtmlPart->url();
+    referrer = tdehtmlPart->pageReferrer();
     if (hasSelection())
       itemflags = KParts::BrowserExtension::ShowTextSelectionItems;
     else
@@ -5030,7 +5030,7 @@ void KHTMLPart::slotParentCompleted()
 
 void KHTMLPart::slotChildStarted( TDEIO::Job *job )
 {
-  khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
+  tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
 
   assert( child );
 
@@ -5057,7 +5057,7 @@ void KHTMLPart::slotChildCompleted()
 
 void KHTMLPart::slotChildCompleted( bool pendingAction )
 {
-  khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
+  tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
 
   if ( child ) {
     kdDebug(6050) << this << " slotChildCompleted child=" << child << " m_frame=" << child->m_frame << endl;
@@ -5090,7 +5090,7 @@ void KHTMLPart::slotChildDocCreated()
 
 void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args )
 {
-  khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender())->parent() );
+  tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender())->parent() );
   KHTMLPart *callingHtmlPart = const_cast<KHTMLPart *>(dynamic_cast<const KHTMLPart *>(sender()->parent()));
 
   // TODO: handle child target correctly! currently the script are always executed fur the parent
@@ -5123,7 +5123,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg
     }
     else if ( frameName != TQString::fromLatin1( "_self" ) )
     {
-      khtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args );
+      tdehtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args );
 
       if ( !_frame )
       {
@@ -5135,7 +5135,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg
     }
   }
 
-  if ( child && child->m_type != khtml::ChildFrame::Object ) {
+  if ( child && child->m_type != tdehtml::ChildFrame::Object ) {
       // Inform someone that we are about to show something else.
       child->m_bNotify = true;
       requestObject( child, url, args );
@@ -5152,7 +5152,7 @@ void KHTMLPart::slotRequestFocus( KParts::ReadOnlyPart * )
   emit d->m_extension->requestFocus(this);
 }
 
-khtml::ChildFrame *KHTMLPart::frame( const TQObject *obj )
+tdehtml::ChildFrame *KHTMLPart::frame( const TQObject *obj )
 {
     assert( obj->inherits( "KParts::ReadOnlyPart" ) );
     const KParts::ReadOnlyPart* const part = static_cast<const KParts::ReadOnlyPart *>( obj );
@@ -5209,7 +5209,7 @@ bool KHTMLPart::checkFrameAccess(KHTMLPart *callingHtmlPart)
 }
 
 KHTMLPart *
-KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, khtml::ChildFrame **childFrame )
+KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, tdehtml::ChildFrame **childFrame )
 {
 #ifdef DEBUG_FINDFRAME
   kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl;
@@ -5253,7 +5253,7 @@ KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f
 
 KHTMLPart *KHTMLPart::findFrame( const TQString &f )
 {
-  khtml::ChildFrame *childFrame;
+  tdehtml::ChildFrame *childFrame;
   KHTMLPart *parentFrame = findFrameParent(this, f, &childFrame);
   if (parentFrame)
   {
@@ -5266,7 +5266,7 @@ KHTMLPart *KHTMLPart::findFrame( const TQString &f )
 
 KParts::ReadOnlyPart *KHTMLPart::findFramePart(const TQString &f)
 {
-  khtml::ChildFrame *childFrame;
+  tdehtml::ChildFrame *childFrame;
   return findFrameParent(this, f, &childFrame) ? static_cast<KParts::ReadOnlyPart *>(childFrame->m_part) : 0L;
 }
 
@@ -5320,13 +5320,13 @@ KHTMLPart *KHTMLPart::parentPart()
   return ::tqqt_cast<KHTMLPart *>( parent() );
 }
 
-khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url,
+tdehtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url,
                                                      const KParts::URLArgs &args, bool callParent )
 {
 #ifdef DEBUG_FINDFRAME
   kdDebug( 6050 ) << "KHTMLPart::recursiveFrameRequest this = " << this << ", frame = " << args.frameName << ", url = " << url << endl;
 #endif
-  khtml::ChildFrame *childFrame;
+  tdehtml::ChildFrame *childFrame;
   KHTMLPart *childPart = findFrameParent(callingHtmlPart, args.frameName, &childFrame);
   if (childPart)
   {
@@ -5339,7 +5339,7 @@ khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart,
 
   if ( parentPart() && callParent )
   {
-     khtml::ChildFrame *res = parentPart()->recursiveFrameRequest( callingHtmlPart, url, args, callParent );
+     tdehtml::ChildFrame *res = parentPart()->recursiveFrameRequest( callingHtmlPart, url, args, callParent );
 
      if ( res )
        parentPart()->requestObject( res, url, args );
@@ -5522,7 +5522,7 @@ void KHTMLPart::restoreState( TQDataStream &stream )
 
     for (; fIt != fEnd; ++fIt, ++fNameIt, ++fServiceTypeIt, ++fServiceNameIt, ++fURLIt, ++fBufferIt )
     {
-      khtml::ChildFrame* const child = *fIt;
+      tdehtml::ChildFrame* const child = *fIt;
 
 //      kdDebug( 6050 ) <<  *fNameIt  << " ---- " <<  *fServiceTypeIt << endl;
 
@@ -5578,7 +5578,7 @@ void KHTMLPart::restoreState( TQDataStream &stream )
 
     for (; fNameIt != fNameEnd; ++fNameIt, ++fServiceTypeIt, ++fServiceNameIt, ++fURLIt, ++fBufferIt )
     {
-      khtml::ChildFrame* const newChild = new khtml::ChildFrame;
+      tdehtml::ChildFrame* const newChild = new tdehtml::ChildFrame;
       newChild->m_bPreloaded = true;
       newChild->m_name = *fNameIt;
       newChild->m_serviceName = *fServiceNameIt;
@@ -5875,7 +5875,7 @@ void KHTMLPart::reparseConfiguration()
   d->m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings());
 
   TQApplication::setOverrideCursor( tqwaitCursor );
-  khtml::CSSStyleSelector::reparseConfiguration();
+  tdehtml::CSSStyleSelector::reparseConfiguration();
   if(d->m_doc) d->m_doc->updateStyleSelector();
   TQApplication::restoreOverrideCursor();
 
@@ -5938,33 +5938,33 @@ bool KHTMLPart::dndEnabled() const
 
 void KHTMLPart::customEvent( TQCustomEvent *event )
 {
-  if ( khtml::MousePressEvent::test( event ) )
+  if ( tdehtml::MousePressEvent::test( event ) )
   {
-    khtmlMousePressEvent( static_cast<khtml::MousePressEvent *>( event ) );
+    tdehtmlMousePressEvent( static_cast<tdehtml::MousePressEvent *>( event ) );
     return;
   }
 
-  if ( khtml::MouseDoubleClickEvent::test( event ) )
+  if ( tdehtml::MouseDoubleClickEvent::test( event ) )
   {
-    khtmlMouseDoubleClickEvent( static_cast<khtml::MouseDoubleClickEvent *>( event ) );
+    tdehtmlMouseDoubleClickEvent( static_cast<tdehtml::MouseDoubleClickEvent *>( event ) );
     return;
   }
 
-  if ( khtml::MouseMoveEvent::test( event ) )
+  if ( tdehtml::MouseMoveEvent::test( event ) )
   {
-    khtmlMouseMoveEvent( static_cast<khtml::MouseMoveEvent *>( event ) );
+    tdehtmlMouseMoveEvent( static_cast<tdehtml::MouseMoveEvent *>( event ) );
     return;
   }
 
-  if ( khtml::MouseReleaseEvent::test( event ) )
+  if ( tdehtml::MouseReleaseEvent::test( event ) )
   {
-    khtmlMouseReleaseEvent( static_cast<khtml::MouseReleaseEvent *>( event ) );
+    tdehtmlMouseReleaseEvent( static_cast<tdehtml::MouseReleaseEvent *>( event ) );
     return;
   }
 
-  if ( khtml::DrawContentsEvent::test( event ) )
+  if ( tdehtml::DrawContentsEvent::test( event ) )
   {
-    khtmlDrawContentsEvent( static_cast<khtml::DrawContentsEvent *>( event ) );
+    tdehtmlDrawContentsEvent( static_cast<tdehtml::DrawContentsEvent *>( event ) );
     return;
   }
 
@@ -5976,12 +5976,12 @@ void KHTMLPart::customEvent( TQCustomEvent *event )
  *
  * This is a helper function for line-by-line text selection.
  */
-static bool firstRunAt(khtml::RenderObject *renderNode, int y, NodeImpl *&startNode, long &startOffset)
+static bool firstRunAt(tdehtml::RenderObject *renderNode, int y, NodeImpl *&startNode, long &startOffset)
 {
-    for (khtml::RenderObject *n = renderNode; n; n = n->nextSibling()) {
+    for (tdehtml::RenderObject *n = renderNode; n; n = n->nextSibling()) {
         if (n->isText()) {
-            khtml::RenderText* const textRenderer = static_cast<khtml::RenderText *>(n);
-            const khtml::InlineTextBoxArray &runs = textRenderer->inlineTextBoxes();
+            tdehtml::RenderText* const textRenderer = static_cast<tdehtml::RenderText *>(n);
+            const tdehtml::InlineTextBoxArray &runs = textRenderer->inlineTextBoxes();
             const unsigned lim = runs.count();
             for (unsigned i = 0; i != lim; ++i) {
                 if (runs[i]->m_y == y && textRenderer->element()) {
@@ -6005,13 +6005,13 @@ static bool firstRunAt(khtml::RenderObject *renderNode, int y, NodeImpl *&startN
  *
  * This is a helper function for line-by-line text selection.
  */
-static bool lastRunAt(khtml::RenderObject *renderNode, int y, NodeImpl *&endNode, long &endOffset)
+static bool lastRunAt(tdehtml::RenderObject *renderNode, int y, NodeImpl *&endNode, long &endOffset)
 {
-    khtml::RenderObject *n = renderNode;
+    tdehtml::RenderObject *n = renderNode;
     if (!n) {
         return false;
     }
-    khtml::RenderObject *next;
+    tdehtml::RenderObject *next;
     while ((next = n->nextSibling())) {
         n = next;
     }
@@ -6022,8 +6022,8 @@ static bool lastRunAt(khtml::RenderObject *renderNode, int y, NodeImpl *&endNode
         }
 
         if (n->isText()) {
-            khtml::RenderText* const textRenderer =  static_cast<khtml::RenderText *>(n);
-            const khtml::InlineTextBoxArray &runs = textRenderer->inlineTextBoxes();
+            tdehtml::RenderText* const textRenderer =  static_cast<tdehtml::RenderText *>(n);
+            const tdehtml::InlineTextBoxArray &runs = textRenderer->inlineTextBoxes();
             for (int i = (int)runs.count()-1; i >= 0; --i) {
                 if (runs[i]->m_y == y && textRenderer->element()) {
                     endNode = textRenderer->element();
@@ -6041,7 +6041,7 @@ static bool lastRunAt(khtml::RenderObject *renderNode, int y, NodeImpl *&endNode
     }
 }
 
-void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
+void KHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event )
 {
   DOM::DOMString url = event->url();
   TQMouseEvent *_mouse = event->qmouseEvent();
@@ -6071,7 +6071,7 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
       if ( !innerNode.isNull()  && innerNode.handle()->renderer()) {
           int offset = 0;
           DOM::NodeImpl* node = 0;
-          khtml::RenderObject::SelPointState state;
+          tdehtml::RenderObject::SelPointState state;
           innerNode.handle()->renderer()->checkSelectionPoint( event->x(), event->y(),
                                                                event->absX()-innerNode.handle()->renderer()->xPos(),
                                                                event->absY()-innerNode.handle()->renderer()->yPos(), node, offset, state );
@@ -6080,10 +6080,10 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
           d->m_selectionStart = node;
           d->m_startOffset = offset;
           //if ( node )
-          //  kdDebug(6005) << "KHTMLPart::khtmlMousePressEvent selectionStart=" << d->m_selectionStart.handle()->renderer()
+          //  kdDebug(6005) << "KHTMLPart::tdehtmlMousePressEvent selectionStart=" << d->m_selectionStart.handle()->renderer()
           //                << " offset=" << d->m_startOffset << endl;
           //else
-          //  kdDebug(6005) << "KHTML::khtmlMousePressEvent selectionStart=(nil)" << endl;
+          //  kdDebug(6005) << "KHTML::tdehtmlMousePressEvent selectionStart=(nil)" << endl;
           d->m_selectionEnd = d->m_selectionStart;
           d->m_endOffset = d->m_startOffset;
           d->m_doc->clearSelection();
@@ -6121,18 +6121,18 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
   }
 }
 
-void KHTMLPart::khtmlMouseDoubleClickEvent( khtml::MouseDoubleClickEvent *event )
+void KHTMLPart::tdehtmlMouseDoubleClickEvent( tdehtml::MouseDoubleClickEvent *event )
 {
   TQMouseEvent *_mouse = event->qmouseEvent();
   if ( _mouse->button() == Qt::LeftButton )
   {
     d->m_bMousePressed = true;
     DOM::Node innerNode = event->innerNode();
-    // Find selectionStart again, khtmlMouseReleaseEvent lost it
+    // Find selectionStart again, tdehtmlMouseReleaseEvent lost it
     if ( !innerNode.isNull() && innerNode.handle()->renderer()) {
       int offset = 0;
       DOM::NodeImpl* node = 0;
-      khtml::RenderObject::SelPointState state;
+      tdehtml::RenderObject::SelPointState state;
       innerNode.handle()->renderer()->checkSelectionPoint( event->x(), event->y(),
                                                            event->absX()-innerNode.handle()->renderer()->xPos(),
                                                            event->absY()-innerNode.handle()->renderer()->yPos(), node, offset, state);
@@ -6187,12 +6187,12 @@ void KHTMLPart::khtmlMouseDoubleClickEvent( khtml::MouseDoubleClickEvent *event
 
 void KHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& selectionNode, long& selectionOffset, bool right, bool selectLines )
 {
-  khtml::RenderObject* obj = node->renderer();
+  tdehtml::RenderObject* obj = node->renderer();
 
   if (obj->isText() && selectLines) {
     int pos;
-    khtml::RenderText *renderer = static_cast<khtml::RenderText *>(obj);
-    khtml::InlineTextBox *run = renderer->findInlineTextBox( offset, pos );
+    tdehtml::RenderText *renderer = static_cast<tdehtml::RenderText *>(obj);
+    tdehtml::InlineTextBox *run = renderer->findInlineTextBox( offset, pos );
     DOMString t = node->nodeValue();
     DOM::NodeImpl* selNode = 0;
     long selOfs = 0;
@@ -6203,7 +6203,7 @@ void KHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& se
     int selectionPointY = run->m_y;
 
     // Go up to first non-inline element.
-    khtml::RenderObject *renderNode = renderer;
+    tdehtml::RenderObject *renderNode = renderer;
     while (renderNode && renderNode->isInline())
       renderNode = renderNode->parent();
 
@@ -6229,7 +6229,7 @@ void KHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& se
   TQString str;
   int len = 0;
   if ( obj->isText() ) { // can be false e.g. when double-clicking on a disabled submit button
-    str = static_cast<khtml::RenderText *>(obj)->data().string();
+    str = static_cast<tdehtml::RenderText *>(obj)->data().string();
     len = str.length();
   }
   //kdDebug() << "extendSelection right=" << right << " offset=" << offset << " len=" << len << " Starting at obj=" << obj << endl;
@@ -6250,7 +6250,7 @@ void KHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& se
         //kdDebug() << "isText=" << obj->isText() << endl;
         str = TQString();
         if ( obj->isText() )
-          str = static_cast<khtml::RenderText *>(obj)->data().string();
+          str = static_cast<tdehtml::RenderText *>(obj)->data().string();
         else if ( obj->isBR() )
           str = '\n';
         else if ( !obj->isInline() ) {
@@ -6293,9 +6293,9 @@ void KHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& se
 void KHTMLPart::extendSelectionTo(int x, int y, int absX, int absY, const DOM::Node &innerNode)
 {
       int offset;
-      //kdDebug(6000) << "KHTMLPart::khtmlMouseMoveEvent x=" << event->x() << " y=" << event->y() << endl;
+      //kdDebug(6000) << "KHTMLPart::tdehtmlMouseMoveEvent x=" << event->x() << " y=" << event->y() << endl;
       DOM::NodeImpl* node=0;
-      khtml::RenderObject::SelPointState state;
+      tdehtml::RenderObject::SelPointState state;
       innerNode.handle()->renderer()->checkSelectionPoint( x, y,
                                                            absX-innerNode.handle()->renderer()->xPos(),
                                                            absY-innerNode.handle()->renderer()->yPos(), node, offset, state);
@@ -6364,14 +6364,14 @@ void KHTMLPart::extendSelectionTo(int x, int y, int absX, int absY, const DOM::N
 
 bool KHTMLPart::isExtendingSelection() const
 {
-  // This is it, the whole detection. khtmlMousePressEvent only sets this
+  // This is it, the whole detection. tdehtmlMousePressEvent only sets this
   // on LMB or MMB, but never on RMB. As text selection doesn't work for MMB,
   // it's sufficient to only rely on this flag to detect selection extension.
   return d->m_bMousePressed;
 }
 #endif // KHTML_NO_SELECTION
 
-void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
+void KHTMLPart::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event )
 {
   TQMouseEvent *_mouse = event->qmouseEvent();
 
@@ -6405,7 +6405,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
     if ( url.length() == 0 && innerNode.handle() && innerNode.handle()->id() == ID_IMG )
     {
       img = static_cast<HTMLImageElementImpl *>(innerNode.handle());
-      u = KURL( completeURL( khtml::parseURL(img->getAttribute(ATTR_SRC)).string() ) );
+      u = KURL( completeURL( tdehtml::parseURL(img->getAttribute(ATTR_SRC)).string() ) );
       pix = KMimeType::mimeType("image/png")->pixmap(KIcon::Desktop);
     }
     else
@@ -6458,7 +6458,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
         HTMLImageElementImpl *i = static_cast<HTMLImageElementImpl *>(innerNode.handle());
         if ( i && i->isServerMap() )
         {
-          khtml::RenderObject *r = i->renderer();
+          tdehtml::RenderObject *r = i->renderer();
           if(r)
           {
             int absx, absy, vx, vy;
@@ -6510,7 +6510,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
 
 }
 
-void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
+void KHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
 {
   DOM::Node innerNode = event->innerNode();
   d->m_mousePressNode = DOM::Node();
@@ -6535,7 +6535,7 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
   }
 #ifndef QT_NO_CLIPBOARD
   if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == Qt::MidButton) && (event->url().isNull())) {
-    kdDebug( 6050 ) << "KHTMLPart::khtmlMouseReleaseEvent() MMB shouldOpen="
+    kdDebug( 6050 ) << "KHTMLPart::tdehtmlMouseReleaseEvent() MMB shouldOpen="
                     << d->m_bOpenMiddleClick << endl;
 
     if (d->m_bOpenMiddleClick) {
@@ -6624,7 +6624,7 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
 
 }
 
-void KHTMLPart::khtmlDrawContentsEvent( khtml::DrawContentsEvent * )
+void KHTMLPart::tdehtmlDrawContentsEvent( tdehtml::DrawContentsEvent * )
 {
 }
 
@@ -6704,10 +6704,10 @@ void KHTMLPart::runAdFilter()
     if ( !d->m_doc )
         return;
 
-    TQPtrDictIterator<khtml::CachedObject> it( d->m_doc->docLoader()->m_docObjects );
+    TQPtrDictIterator<tdehtml::CachedObject> it( d->m_doc->docLoader()->m_docObjects );
     for ( ; it.current(); ++it )
-        if ( it.current()->type() == khtml::CachedObject::Image ) {
-            khtml::CachedImage *image = static_cast<khtml::CachedImage *>(it.current());
+        if ( it.current()->type() == tdehtml::CachedObject::Image ) {
+            tdehtml::CachedImage *image = static_cast<tdehtml::CachedImage *>(it.current());
             bool wasBlocked = image->m_wasBlocked;
             image->m_wasBlocked = KHTMLFactory::defaultHTMLSettings()->isAdFiltered( d->m_doc->completeURL( (*it).url().string() ) );
             if ( image->m_wasBlocked != wasBlocked )
@@ -6817,7 +6817,7 @@ bool KHTMLPart::checkLinkSecurity(const KURL &linkURL,const TQString &message, c
     linkAllowed = kapp && kapp->authorizeURLAction("redirect", url(), linkURL);
 
   if ( !linkAllowed ) {
-    khtml::Tokenizer *tokenizer = d->m_doc->tokenizer();
+    tdehtml::Tokenizer *tokenizer = d->m_doc->tokenizer();
     if (tokenizer)
       tokenizer->setOnHold(true);
 
@@ -6967,12 +6967,12 @@ void KHTMLPart::setOpenedByJS(bool _openedByJS)
 
 void KHTMLPart::preloadStyleSheet(const TQString &url, const TQString &stylesheet)
 {
-    khtml::Cache::preloadStyleSheet(url, stylesheet);
+    tdehtml::Cache::preloadStyleSheet(url, stylesheet);
 }
 
 void KHTMLPart::preloadScript(const TQString &url, const TQString &script)
 {
-    khtml::Cache::preloadScript(url, script);
+    tdehtml::Cache::preloadScript(url, script);
 }
 
 TQCString KHTMLPart::dcopObjectId() const
@@ -7016,52 +7016,52 @@ void KHTMLPart::slotAutomaticDetectionLanguage( int _id )
 
   switch ( _id ) {
     case 0 :
-      d->m_autoDetectLanguage = khtml::Decoder::SemiautomaticDetection;
+      d->m_autoDetectLanguage = tdehtml::Decoder::SemiautomaticDetection;
       break;
     case 1 :
-      d->m_autoDetectLanguage = khtml::Decoder::Arabic;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Arabic;
       break;
     case 2 :
-      d->m_autoDetectLanguage = khtml::Decoder::Baltic;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Baltic;
       break;
     case 3 :
-      d->m_autoDetectLanguage = khtml::Decoder::CentralEuropean;
+      d->m_autoDetectLanguage = tdehtml::Decoder::CentralEuropean;
       break;
     case 4 :
-      d->m_autoDetectLanguage = khtml::Decoder::Chinese;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Chinese;
       break;
     case 5 :
-      d->m_autoDetectLanguage = khtml::Decoder::Greek;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Greek;
       break;
     case 6 :
-      d->m_autoDetectLanguage = khtml::Decoder::Hebrew;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Hebrew;
       break;
     case 7 :
-      d->m_autoDetectLanguage = khtml::Decoder::Japanese;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Japanese;
       break;
     case 8 :
-      d->m_autoDetectLanguage = khtml::Decoder::Korean;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Korean;
       break;
     case 9 :
-      d->m_autoDetectLanguage = khtml::Decoder::Russian;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Russian;
       break;
     case 10 :
-      d->m_autoDetectLanguage = khtml::Decoder::Thai;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Thai;
       break;
     case 11 :
-      d->m_autoDetectLanguage = khtml::Decoder::Turkish;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Turkish;
       break;
     case 12 :
-      d->m_autoDetectLanguage = khtml::Decoder::Ukrainian;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Ukrainian;
       break;
     case 13 :
-      d->m_autoDetectLanguage = khtml::Decoder::Unicode;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Unicode;
       break;
     case 14 :
-      d->m_autoDetectLanguage = khtml::Decoder::WesternEuropean;
+      d->m_autoDetectLanguage = tdehtml::Decoder::WesternEuropean;
       break;
     default :
-      d->m_autoDetectLanguage = khtml::Decoder::SemiautomaticDetection;
+      d->m_autoDetectLanguage = tdehtml::Decoder::SemiautomaticDetection;
       break;
   }
 
@@ -7079,17 +7079,17 @@ void KHTMLPart::slotAutomaticDetectionLanguage( int _id )
   d->m_paSetEncoding->popupMenu()->setItemChecked( d->m_paSetEncoding->popupMenu()->idAt( 2 ), false );
 }
 
-khtml::Decoder *KHTMLPart::createDecoder()
+tdehtml::Decoder *KHTMLPart::createDecoder()
 {
-    khtml::Decoder *dec = new khtml::Decoder();
+    tdehtml::Decoder *dec = new tdehtml::Decoder();
     if( !d->m_encoding.isNull() )
         dec->setEncoding( d->m_encoding.latin1(),
-            d->m_haveEncoding ? khtml::Decoder::UserChosenEncoding : khtml::Decoder::EncodingFromHTTPHeader);
+            d->m_haveEncoding ? tdehtml::Decoder::UserChosenEncoding : tdehtml::Decoder::EncodingFromHTTPHeader);
     else {
         // Inherit the default encoding from the parent frame if there is one.
         const char *defaultEncoding = (parentPart() && parentPart()->d->m_decoder)
             ? parentPart()->d->m_decoder->encoding() : settings()->encoding().latin1();
-        dec->setEncoding(defaultEncoding, khtml::Decoder::DefaultEncoding);
+        dec->setEncoding(defaultEncoding, tdehtml::Decoder::DefaultEncoding);
     }
 #ifdef APPLE_CHANGES
     if (d->m_doc)
@@ -7298,10 +7298,10 @@ void KHTMLPart::slotWalletClosed()
 void KHTMLPart::launchWalletManager()
 {
 #ifndef KHTML_NO_WALLET
-  if (!DCOPClient::mainClient()->isApplicationRegistered("kwalletmanager")) {
-    TDEApplication::startServiceByDesktopName("kwalletmanager_show");
+  if (!DCOPClient::mainClient()->isApplicationRegistered("tdewalletmanager")) {
+    TDEApplication::startServiceByDesktopName("tdewalletmanager_show");
   } else {
-    DCOPRef r("kwalletmanager", "kwalletmanager-mainwindow#1");
+    DCOPRef r("tdewalletmanager", "tdewalletmanager-mainwindow#1");
     r.send("show");
     r.send("raise");
   }
@@ -7467,5 +7467,5 @@ bool KHTMLPart::inProgress() const
 }
 
 using namespace KParts;
-#include "khtml_part.moc"
-#include "khtmlpart_p.moc"
+#include "tdehtml_part.moc"
+#include "tdehtmlpart_p.moc"
diff --git a/khtml/khtml_part.h b/tdehtml/tdehtml_part.h
index d84296f04..e4e20c03c 100644
--- a/khtml/khtml_part.h
+++ b/tdehtml/tdehtml_part.h
@@ -23,14 +23,14 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef __khtml_part_h__
-#define __khtml_part_h__
+#ifndef __tdehtml_part_h__
+#define __tdehtml_part_h__
 
 #include "dom/html_document.h"
 #include "dom/dom2_range.h"
 
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
 #include <kdemacros.h>
 #include <kfinddialog.h>
 
@@ -68,7 +68,7 @@ namespace KJS
   class Interpreter;
 }
 
-namespace khtml
+namespace tdehtml
 {
   class DocLoader;
   class RenderPart;
@@ -112,7 +112,7 @@ namespace KWallet
 }
 
 /**
- * This class is khtml's main class. It features an almost complete
+ * This class is tdehtml's main class. It features an almost complete
  * web browser, and html renderer.
  *
  * The easiest way to use this class (if you just want to display an HTML
@@ -194,7 +194,7 @@ class KHTML_EXPORT KHTMLPart : public KParts::ReadOnlyPart
   friend class DOM::NodeImpl;
   friend class KHTMLRun;
   friend class DOM::HTMLFormElementImpl;
-  friend class khtml::RenderPartObject;
+  friend class tdehtml::RenderPartObject;
   friend class KJS::Window;
   friend class KJS::ScheduledAction;
   friend class KJS::JSNodeFilter;
@@ -209,10 +209,10 @@ class KHTML_EXPORT KHTMLPart : public KParts::ReadOnlyPart
   friend class DOM::DocumentImpl;
   friend class DOM::HTMLDocumentImpl;
   friend class KHTMLPartBrowserHostExtension;
-  friend class khtml::HTMLTokenizer;
-  friend class khtml::XMLTokenizer;
-  friend class khtml::RenderWidget;
-  friend class khtml::CSSStyleSelector;
+  friend class tdehtml::HTMLTokenizer;
+  friend class tdehtml::XMLTokenizer;
+  friend class tdehtml::RenderWidget;
+  friend class tdehtml::CSSStyleSelector;
   friend class KHTMLPartIface;
   friend class KHTMLPartFunction;
   friend class KHTMLPopupGUIClient;
@@ -301,7 +301,7 @@ public:
    * Returns a pointer to the KParts::BrowserExtension.
    */
   KParts::BrowserExtension *browserExtension() const;
-  KParts::LiveConnectExtension *liveConnectExtension( const khtml::RenderPart *) const;
+  KParts::LiveConnectExtension *liveConnectExtension( const tdehtml::RenderPart *) const;
   KParts::BrowserHostExtension *browserHostExtension() const;
 
   /**
@@ -916,7 +916,7 @@ public:
    * frame info in @p *childFrame
    * @since 3.3
    */
-  KHTMLPart *findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, khtml::ChildFrame **childFrame=0 );
+  KHTMLPart *findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, tdehtml::ChildFrame **childFrame=0 );
 
   /**
    * Return the current frame (the one that has focus)
@@ -1127,25 +1127,25 @@ protected:
   virtual void customEvent( TQCustomEvent *event );
 
   /**
-   * Eventhandler of the khtml::MousePressEvent.
+   * Eventhandler of the tdehtml::MousePressEvent.
    */
-  virtual void khtmlMousePressEvent( khtml::MousePressEvent *event );
+  virtual void tdehtmlMousePressEvent( tdehtml::MousePressEvent *event );
   /**
-   * Eventhandler for the khtml::MouseDoubleClickEvent.
+   * Eventhandler for the tdehtml::MouseDoubleClickEvent.
    */
-  virtual void khtmlMouseDoubleClickEvent( khtml::MouseDoubleClickEvent * );
+  virtual void tdehtmlMouseDoubleClickEvent( tdehtml::MouseDoubleClickEvent * );
   /**
-   * Eventhandler for the khtml::MouseMouseMoveEvent.
+   * Eventhandler for the tdehtml::MouseMouseMoveEvent.
    */
-  virtual void khtmlMouseMoveEvent( khtml::MouseMoveEvent *event );
+  virtual void tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event );
   /**
-   * Eventhandler for the khtml::MouseMouseReleaseEvent.
+   * Eventhandler for the tdehtml::MouseMouseReleaseEvent.
    */
-  virtual void khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event );
+  virtual void tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event );
   /**
-   * Eventhandler for the khtml::DrawContentsEvent.
+   * Eventhandler for the tdehtml::DrawContentsEvent.
    */
-  virtual void khtmlDrawContentsEvent( khtml::DrawContentsEvent * );
+  virtual void tdehtmlDrawContentsEvent( tdehtml::DrawContentsEvent * );
 
   /**
    * Internal reimplementation of KParts::Part::guiActivateEvent .
@@ -1430,8 +1430,8 @@ private slots:
    * @internal
    */
   void slotRequestFocus( KParts::ReadOnlyPart * );
-  void slotLoaderRequestStarted( khtml::DocLoader*, khtml::CachedObject* obj);
-  void slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *obj );
+  void slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* obj);
+  void slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *obj );
   void checkCompleted();
 
   /**
@@ -1562,7 +1562,7 @@ private:
   void overURL( const TQString &url, const TQString &target, bool shiftPressed = false );
   void resetHoverText(); // Undo overURL and reset HoverText
 
-  bool processObjectRequest( khtml::ChildFrame *child, const KURL &url, const TQString &mimetype );
+  bool processObjectRequest( tdehtml::ChildFrame *child, const KURL &url, const TQString &mimetype );
 
   KWallet::Wallet* wallet();
 
@@ -1598,7 +1598,7 @@ private:
   TQVariant crossFrameExecuteScript(const TQString& target, const TQString& script);
   TQVariant executeScheduledScript();
 
-  bool requestFrame( khtml::RenderPart *frame, const TQString &url, const TQString &frameName,
+  bool requestFrame( tdehtml::RenderPart *frame, const TQString &url, const TQString &frameName,
                      const TQStringList &args = TQStringList(), bool isIFrame = false );
 
   /**
@@ -1610,18 +1610,18 @@ private:
    */
   TQString requestFrameName();
 
-  bool requestObject( khtml::RenderPart *frame, const TQString &url, const TQString &serviceType,
+  bool requestObject( tdehtml::RenderPart *frame, const TQString &url, const TQString &serviceType,
                       const TQStringList &args = TQStringList() );
 
-  bool requestObject( khtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
+  bool requestObject( tdehtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
 
   DOM::EventListener *createHTMLEventListener( TQString code, TQString name, DOM::NodeImpl *node );
 
   DOM::HTMLDocumentImpl *docImpl() const;
   DOM::DocumentImpl *xmlDocImpl() const;
-  khtml::ChildFrame *frame( const TQObject *obj );
+  tdehtml::ChildFrame *frame( const TQObject *obj );
 
-  khtml::ChildFrame *recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, const KParts::URLArgs &args, bool callParent = true );
+  tdehtml::ChildFrame *recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, const KParts::URLArgs &args, bool callParent = true );
 
   bool checkLinkSecurity( const KURL &linkURL,const TQString &message = TQString::null, const TQString &button = TQString::null );
   TQVariant executeScript( const TQString& filename, int baseLine, const DOM::Node &n, const TQString& script );
@@ -1654,7 +1654,7 @@ private:
    * @return @p true if a selection is extended by the mouse.
    */
   bool isExtendingSelection() const;
-  khtml::Decoder *createDecoder();
+  tdehtml::Decoder *createDecoder();
   TQString defaultEncoding() const;
 
   /** .html, .xhtml or .xml */
diff --git a/khtml/khtml_popupmenu.rc b/tdehtml/tdehtml_popupmenu.rc
index 79e3391d3..0570313d2 100644
--- a/khtml/khtml_popupmenu.rc
+++ b/tdehtml/tdehtml_popupmenu.rc
@@ -1,4 +1,4 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"><kpartgui name="khtmlpart_popupmenu" version="14">
+<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"><kpartgui name="tdehtmlpart_popupmenu" version="14">
 <Menu name="popupmenu">
  <Action name="copy" group="editactions"/>
  <Action name="selectAll" group="editactions"/>
diff --git a/khtml/khtml_printsettings.cpp b/tdehtml/tdehtml_printsettings.cpp
index ed998ffb7..41b87244a 100644
--- a/khtml/khtml_printsettings.cpp
+++ b/tdehtml/tdehtml_printsettings.cpp
@@ -17,7 +17,7 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include "khtml_printsettings.h"
+#include "tdehtml_printsettings.h"
 
 #include <klocale.h>
 #include <tqcheckbox.h>
@@ -93,16 +93,16 @@ KHTMLPrintSettings::~KHTMLPrintSettings()
 
 void KHTMLPrintSettings::getOptions(TQMap<TQString,TQString>& opts, bool /*incldef*/)
 {
-	opts["app-khtml-printfriendly"] = (m_printfriendly->isChecked() ? "true" : "false");
-	opts["app-khtml-printimages"] = (m_printimages->isChecked() ? "true" : "false");
-	opts["app-khtml-printheader"] = (m_printheader->isChecked() ? "true" : "false");
+	opts["app-tdehtml-printfriendly"] = (m_printfriendly->isChecked() ? "true" : "false");
+	opts["app-tdehtml-printimages"] = (m_printimages->isChecked() ? "true" : "false");
+	opts["app-tdehtml-printheader"] = (m_printheader->isChecked() ? "true" : "false");
 }
 
 void KHTMLPrintSettings::setOptions(const TQMap<TQString,TQString>& opts)
 {
-	m_printfriendly->setChecked(opts["app-khtml-printfriendly"] != "false");
-	m_printimages->setChecked(opts["app-khtml-printimages"] != "false");
-	m_printheader->setChecked(opts["app-khtml-printheader"] != "false");
+	m_printfriendly->setChecked(opts["app-tdehtml-printfriendly"] != "false");
+	m_printimages->setChecked(opts["app-tdehtml-printimages"] != "false");
+	m_printheader->setChecked(opts["app-tdehtml-printheader"] != "false");
 }
 
-#include "khtml_printsettings.moc"
+#include "tdehtml_printsettings.moc"
diff --git a/khtml/khtml_printsettings.h b/tdehtml/tdehtml_printsettings.h
index 9f69d9b88..9f69d9b88 100644
--- a/khtml/khtml_printsettings.h
+++ b/tdehtml/tdehtml_printsettings.h
diff --git a/khtml/khtml_run.cpp b/tdehtml/tdehtml_run.cpp
index c999562b4..e1c34915a 100644
--- a/khtml/khtml_run.cpp
+++ b/tdehtml/tdehtml_run.cpp
@@ -20,15 +20,15 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#include "khtmlpart_p.h"
-#include "khtml_run.h"
+#include "tdehtmlpart_p.h"
+#include "tdehtml_run.h"
 #include <kio/job.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include "khtml_ext.h"
+#include "tdehtml_ext.h"
 #include <tqwidget.h>
 
-KHTMLRun::KHTMLRun( KHTMLPart *part, khtml::ChildFrame *child, const KURL &url,
+KHTMLRun::KHTMLRun( KHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url,
                     const KParts::URLArgs &args, bool hideErrorDialog )
     : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->topLevelWidget() : 0,
                           false, false, hideErrorDialog ),
@@ -89,4 +89,4 @@ void KHTMLRun::handleError( TDEIO::Job *job )
     KParts::BrowserRun::handleError( job );
 }
 
-#include "khtml_run.moc"
+#include "tdehtml_run.moc"
diff --git a/khtml/khtml_run.h b/tdehtml/tdehtml_run.h
index 0420e91af..e549f9b2d 100644
--- a/khtml/khtml_run.h
+++ b/tdehtml/tdehtml_run.h
@@ -20,17 +20,17 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef __khtml_run_h__
-#define __khtml_run_h__
+#ifndef __tdehtml_run_h__
+#define __tdehtml_run_h__
 
-#include <kparts/browserrun.h>
+#include <tdeparts/browserrun.h>
 #include <kurl.h>
 #include <kservice.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 class KHTMLPart;
 
-namespace khtml
+namespace tdehtml
 {
   class ChildFrame;
 }
@@ -39,7 +39,7 @@ class KHTMLRun : public KParts::BrowserRun
 {
   Q_OBJECT
 public:
-  KHTMLRun( KHTMLPart *part, khtml::ChildFrame *child, const KURL &url,
+  KHTMLRun( KHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url,
             const KParts::URLArgs &args, bool hideErrorDialog );
 
   virtual void foundMimeType( const TQString &mimetype );
@@ -53,7 +53,7 @@ protected:
   bool askSave( const KURL & url, KService::Ptr offer, const TQString & mimeType, const TQString & suggestedFilename );
 
 private:
-  khtml::ChildFrame *m_child;
+  tdehtml::ChildFrame *m_child;
 };
 
 #endif
diff --git a/khtml/khtml_settings.cc b/tdehtml/tdehtml_settings.cc
index 430271877..4d65aa99b 100644
--- a/khtml/khtml_settings.cc
+++ b/tdehtml/tdehtml_settings.cc
@@ -19,8 +19,8 @@
 
 #include <tqfontdatabase.h>
 
-#include "khtml_settings.h"
-#include "khtmldefaults.h"
+#include "tdehtml_settings.h"
+#include "tdehtmldefaults.h"
 #include <kglobalsettings.h>
 #include <kconfig.h>
 #include <kglobal.h>
@@ -289,7 +289,7 @@ bool KHTMLSettings::hoverLink() const
 
 void KHTMLSettings::init()
 {
-  TDEConfig global( "khtmlrc", true, false );
+  TDEConfig global( "tdehtmlrc", true, false );
   init( &global, true );
 
   TDEConfig *local = TDEGlobal::config();
@@ -741,7 +741,7 @@ bool KHTMLSettings::isAdFiltered( const TQString &url ) const
 
 void KHTMLSettings::addAdFilter( const TQString &url )
 {
-    TDEConfig config( "khtmlrc", false, false );
+    TDEConfig config( "tdehtmlrc", false, false );
     config.setGroup( "Filter Settings" );
 
     TQRegExp rx;
diff --git a/khtml/khtml_settings.h b/tdehtml/tdehtml_settings.h
index 4d68845f7..4d68845f7 100644
--- a/khtml/khtml_settings.h
+++ b/tdehtml/tdehtml_settings.h
diff --git a/khtml/khtmldefaults.h b/tdehtml/tdehtmldefaults.h
index 8b674ffe0..8b674ffe0 100644
--- a/khtml/khtmldefaults.h
+++ b/tdehtml/tdehtmldefaults.h
diff --git a/khtml/khtmlimage.cpp b/tdehtml/tdehtmlimage.cpp
index f9593e504..cc244ed80 100644
--- a/khtml/khtmlimage.cpp
+++ b/tdehtml/tdehtmlimage.cpp
@@ -17,9 +17,9 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "khtmlimage.h"
-#include "khtmlview.h"
-#include "khtml_ext.h"
+#include "tdehtmlimage.h"
+#include "tdehtmlview.h"
+#include "tdehtml_ext.h"
 #include "xml/dom_docimpl.h"
 #include "html/html_documentimpl.h"
 #include "html/html_elementimpl.h"
@@ -34,13 +34,13 @@
 #include <kmimetype.h>
 #include <klocale.h>
 
-K_EXPORT_COMPONENT_FACTORY( khtmlimagefactory /*NOT the part name, see Makefile.am*/, KHTMLImageFactory )
+K_EXPORT_COMPONENT_FACTORY( tdehtmlimagefactory /*NOT the part name, see Makefile.am*/, KHTMLImageFactory )
 
 TDEInstance *KHTMLImageFactory::s_instance = 0;
 
 KHTMLImageFactory::KHTMLImageFactory()
 {
-    s_instance = new TDEInstance( "khtmlimage" );
+    s_instance = new TDEInstance( "tdehtmlimage" );
 }
 
 KHTMLImageFactory::~KHTMLImageFactory()
@@ -67,15 +67,15 @@ KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName,
 
     TQVBox *box = new TQVBox( parentWidget, widgetName );
 
-    m_khtml = new KHTMLPart( box, widgetName, this, "htmlimagepart", prof );
-    m_khtml->setAutoloadImages( true );
-    m_khtml->widget()->installEventFilter(this);
-    connect( m_khtml->view(), TQT_SIGNAL( finishedLayout() ), this, TQT_SLOT( restoreScrollPosition() ) );
+    m_tdehtml = new KHTMLPart( box, widgetName, this, "htmlimagepart", prof );
+    m_tdehtml->setAutoloadImages( true );
+    m_tdehtml->widget()->installEventFilter(this);
+    connect( m_tdehtml->view(), TQT_SIGNAL( finishedLayout() ), this, TQT_SLOT( restoreScrollPosition() ) );
 
     setWidget( box );
 
     // VBox can't take focus, so pass it on to sub-widget
-    box->setFocusProxy( m_khtml->widget() );
+    box->setFocusProxy( m_tdehtml->widget() );
 
     m_ext = new KHTMLImageBrowserExtension( this, "be" );
 
@@ -100,19 +100,19 @@ KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName,
         delete selectAllAction;
     }
 
-    // forward important signals from the khtml part
+    // forward important signals from the tdehtml part
 
     // forward opening requests to parent frame (if existing)
     KHTMLPart *p = ::tqqt_cast<KHTMLPart *>(parent);
     KParts::BrowserExtension *be = p ? p->browserExtension() : m_ext;
-    connect(m_khtml->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)),
+    connect(m_tdehtml->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)),
     		be, TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)));
 
-    connect( m_khtml->browserExtension(), TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,
+    connect( m_tdehtml->browserExtension(), TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,
              const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ), m_ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,
              const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ) );
 
-    connect( m_khtml->browserExtension(), TQT_SIGNAL( enableAction( const char *, bool ) ),
+    connect( m_tdehtml->browserExtension(), TQT_SIGNAL( enableAction( const char *, bool ) ),
              m_ext, TQT_SIGNAL( enableAction( const char *, bool ) ) );
 
     m_ext->setURLDropHandlingEnabled( true );
@@ -129,8 +129,8 @@ KHTMLImage::~KHTMLImage()
     // ### additional note: it _can_ be that the part has been deleted before:
     // when we're in a html frameset and the view dies first, then it will also
     // kill the htmlpart
-    if ( m_khtml )
-        delete static_cast<KHTMLPart *>( m_khtml );
+    if ( m_tdehtml )
+        delete static_cast<KHTMLPart *>( m_tdehtml );
 }
 
 bool KHTMLImage::openURL( const KURL &url )
@@ -152,24 +152,24 @@ bool KHTMLImage::openURL( const KURL &url )
     m_xOffset = args.xOffset;
     m_yOffset = args.yOffset;
 
-    m_khtml->begin( m_url );
-    m_khtml->setAutoloadImages( true );
+    m_tdehtml->begin( m_url );
+    m_tdehtml->setAutoloadImages( true );
 
-    DOM::DocumentImpl *impl = dynamic_cast<DOM::DocumentImpl *>( m_khtml->document().handle() ); // ### hack ;-)
+    DOM::DocumentImpl *impl = dynamic_cast<DOM::DocumentImpl *>( m_tdehtml->document().handle() ); // ### hack ;-)
     if (!impl) return false;
     if ( m_ext->urlArgs().reload )
         impl->docLoader()->setCachePolicy( TDEIO::CC_Reload );
 
-    khtml::DocLoader *dl = impl->docLoader();
+    tdehtml::DocLoader *dl = impl->docLoader();
     m_image = dl->requestImage( m_url.url() );
     if ( m_image )
         m_image->ref( this );
 
-    m_khtml->write( html.arg( m_url.url() ) );
-    m_khtml->end();
+    m_tdehtml->write( html.arg( m_url.url() ) );
+    m_tdehtml->end();
 
     /*
-    connect( khtml::Cache::loader(), TQT_SIGNAL( requestDone( khtml::DocLoader*, khtml::CachedObject *) ),
+    connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
             this, TQT_SLOT( updateWindowCaption() ) );
             */
     return true;
@@ -178,11 +178,11 @@ bool KHTMLImage::openURL( const KURL &url )
 bool KHTMLImage::closeURL()
 {
     disposeImage();
-    return m_khtml->closeURL();
+    return m_tdehtml->closeURL();
 }
 
 // This can happen after openURL returns, or directly from m_image->ref()
-void KHTMLImage::notifyFinished( khtml::CachedObject *o )
+void KHTMLImage::notifyFinished( tdehtml::CachedObject *o )
 {
     if ( !m_image || o != m_image )
         return;
@@ -216,8 +216,8 @@ void KHTMLImage::notifyFinished( khtml::CachedObject *o )
 
 void KHTMLImage::restoreScrollPosition()
 {
-    if ( m_khtml->view()->contentsY() == 0 ) {
-        m_khtml->view()->setContentsPos( m_xOffset, m_yOffset );
+    if ( m_tdehtml->view()->contentsY() == 0 ) {
+        m_tdehtml->view()->setContentsPos( m_xOffset, m_yOffset );
     }
 }
 
@@ -248,10 +248,10 @@ void KHTMLImage::slotImageJobFinished( TDEIO::Job *job )
 
 void KHTMLImage::updateWindowCaption()
 {
-    if ( !m_khtml )
+    if ( !m_tdehtml )
         return;
 
-    DOM::HTMLDocumentImpl *impl = dynamic_cast<DOM::HTMLDocumentImpl *>( m_khtml->document().handle() );
+    DOM::HTMLDocumentImpl *impl = dynamic_cast<DOM::HTMLDocumentImpl *>( m_tdehtml->document().handle() );
     if ( !impl )
         return;
 
@@ -263,7 +263,7 @@ void KHTMLImage::updateWindowCaption()
     if ( !image )
         return;
 
-    khtml::RenderImage *renderImage = dynamic_cast<khtml::RenderImage *>( image->renderer() );
+    tdehtml::RenderImage *renderImage = dynamic_cast<tdehtml::RenderImage *>( image->renderer() );
     if ( !renderImage )
         return;
 
@@ -354,4 +354,4 @@ using namespace KParts;
 /* vim: et sw=4 ts=4
  */
 
-#include "khtmlimage.moc"
+#include "tdehtmlimage.moc"
diff --git a/khtml/khtmlimage.desktop b/tdehtml/tdehtmlimage.desktop
index 83868964f..4703bbabb 100644
--- a/khtml/khtmlimage.desktop
+++ b/tdehtml/tdehtmlimage.desktop
@@ -167,4 +167,4 @@ Name[zh_TW]=�嵌入的影�檢視器
 Name[zu]=Isithombe Sombukisi Oshuthisekayo
 ServiceTypes=KParts/ReadOnlyPart,Browser/View
 InitialPreference=4
-X-TDE-Library=khtmlimagepart
+X-TDE-Library=tdehtmlimagepart
diff --git a/khtml/khtmlimage.h b/tdehtml/tdehtmlimage.h
index 5f165bd8d..b8d2d86d4 100644
--- a/khtml/khtmlimage.h
+++ b/tdehtml/tdehtmlimage.h
@@ -17,19 +17,19 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __khtmlimage_h__
-#define __khtmlimage_h__
+#ifndef __tdehtmlimage_h__
+#define __tdehtmlimage_h__
 
-#include "khtml_part.h"
-#include <kparts/factory.h>
-#include <kparts/browserextension.h>
+#include "tdehtml_part.h"
+#include <tdeparts/factory.h>
+#include <tdeparts/browserextension.h>
 
 #include "misc/loader_client.h"
 
 class KHTMLPart;
 class TDEInstance;
 
-namespace khtml
+namespace tdehtml
 {
     class CachedImage;
 }
@@ -57,7 +57,7 @@ private:
 /**
  * @internal
  */
-class KHTMLImage : public KParts::ReadOnlyPart, public khtml::CachedObjectClient
+class KHTMLImage : public KParts::ReadOnlyPart, public tdehtml::CachedObjectClient
 {
     Q_OBJECT
 public:
@@ -71,9 +71,9 @@ public:
 
     virtual bool closeURL();
 
-    KHTMLPart *doc() const { return m_khtml; }
+    KHTMLPart *doc() const { return m_tdehtml; }
 
-    virtual void notifyFinished( khtml::CachedObject *o );
+    virtual void notifyFinished( tdehtml::CachedObject *o );
 
 protected:
     virtual void guiActivateEvent( KParts::GUIActivateEvent *e );
@@ -88,10 +88,10 @@ private slots:
 private:
     void disposeImage();
 
-    TQGuardedPtr<KHTMLPart> m_khtml;
+    TQGuardedPtr<KHTMLPart> m_tdehtml;
     KParts::BrowserExtension *m_ext;
     TQString m_mimeType;
-    khtml::CachedImage *m_image;
+    tdehtml::CachedImage *m_image;
     int m_xOffset, m_yOffset;
 };
 
diff --git a/khtml/khtmlpart_p.h b/tdehtml/tdehtmlpart_p.h
index f914ef296..a18aa5cf8 100644
--- a/khtml/khtmlpart_p.h
+++ b/tdehtml/tdehtmlpart_p.h
@@ -1,5 +1,5 @@
-#ifndef khtmlpart_p_h
-#define khtmlpart_p_h
+#ifndef tdehtmlpart_p_h
+#define tdehtmlpart_p_h
 
 /* This file is part of the KDE project
  *
@@ -30,11 +30,11 @@
 #include <klibloader.h>
 #include <kxmlguifactory.h>
 #include <kaction.h>
-#include <kparts/partmanager.h>
-#include <kparts/statusbarextension.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/partmanager.h>
+#include <tdeparts/statusbarextension.h>
+#include <tdeparts/browserextension.h>
 #ifndef KHTML_NO_WALLET
-#include <kwallet.h>
+#include <tdewallet.h>
 #endif
 
 #include <tqguardedptr.h>
@@ -43,12 +43,12 @@
 #include <tqvaluelist.h>
 
 #include "html/html_formimpl.h"
-#include "khtml_run.h"
-#include "khtml_factory.h"
-#include "khtml_events.h"
-#include "khtml_ext.h"
-#include "khtml_iface.h"
-#include "khtml_settings.h"
+#include "tdehtml_run.h"
+#include "tdehtml_factory.h"
+#include "tdehtml_events.h"
+#include "tdehtml_ext.h"
+#include "tdehtml_iface.h"
+#include "tdehtml_settings.h"
 #include "misc/decoder.h"
 #include "ecma/kjs_proxy.h"
 
@@ -70,7 +70,7 @@ namespace KParts
   class StatusBarExtension;
 }
 
-namespace khtml
+namespace tdehtml
 {
   class KDE_EXPORT ChildFrame : public TQObject
   {
@@ -78,7 +78,7 @@ namespace khtml
   public:
       enum Type { Frame, IFrame, Object };
 
-      ChildFrame() : TQObject (0L, "khtml_child_frame") {
+      ChildFrame() : TQObject (0L, "tdehtml_child_frame") {
           m_jscript = 0L;
           m_kjs_lib = 0;
           m_bCompleted = false; m_bPreloaded = false; m_type = Frame; m_bNotify = false;
@@ -92,7 +92,7 @@ namespace khtml
               m_kjs_lib->unload();
       }
 
-    TQGuardedPtr<khtml::RenderPart> m_frame;
+    TQGuardedPtr<tdehtml::RenderPart> m_frame;
     TQGuardedPtr<KParts::ReadOnlyPart> m_part;
     TQGuardedPtr<KParts::BrowserExtension> m_extension;
     TQGuardedPtr<KParts::LiveConnectExtension> m_liveconnect;
@@ -116,7 +116,7 @@ namespace khtml
 
 }
 
-struct KHTMLFrameList : public TQValueList<khtml::ChildFrame*>
+struct KHTMLFrameList : public TQValueList<tdehtml::ChildFrame*>
 {
     Iterator find( const TQString &name ) KDE_NO_EXPORT;
 };
@@ -124,7 +124,7 @@ struct KHTMLFrameList : public TQValueList<khtml::ChildFrame*>
 typedef KHTMLFrameList::ConstIterator ConstFrameIt;
 typedef KHTMLFrameList::Iterator FrameIt;
 
-static int khtml_part_dcop_counter = 0;
+static int tdehtml_part_dcop_counter = 0;
 
 
 class KHTMLWalletQueue : public TQObject
@@ -249,7 +249,7 @@ public:
     m_bFirstData = true;
     m_submitForm = 0;
     m_delayRedirect = 0;
-    m_autoDetectLanguage = khtml::Decoder::SemiautomaticDetection;
+    m_autoDetectLanguage = tdehtml::Decoder::SemiautomaticDetection;
 
     // inherit settings from parent
     if(parent && parent->inherits("KHTMLPart"))
@@ -282,7 +282,7 @@ public:
     m_newJSInterpreterExists = false;
     m_dcopobject = 0;
     m_jobspeed = 0;
-    m_dcop_counter = ++khtml_part_dcop_counter;
+    m_dcop_counter = ++tdehtml_part_dcop_counter;
     m_statusBarWalletLabel = 0L;
     m_statusBarUALabel = 0L;
     m_statusBarJSErrorLabel = 0L;
@@ -303,7 +303,7 @@ public:
 #endif
   }
 
-  TQGuardedPtr<khtml::ChildFrame> m_frame;
+  TQGuardedPtr<tdehtml::ChildFrame> m_frame;
   KHTMLFrameList m_frames;
   KHTMLFrameList m_objects;
 
@@ -319,7 +319,7 @@ public:
   TQValueList<TQGuardedPtr<KHTMLPart> > m_suppressedPopupOriginParts;
   int m_openableSuppressedPopups;
   DOM::DocumentImpl *m_doc;
-  khtml::Decoder *m_decoder;
+  tdehtml::Decoder *m_decoder;
   TQString m_encoding;
   TQString m_sheetUsed;
   long m_cacheId;
@@ -547,7 +547,7 @@ public:
   bool m_openedByJS;
   bool m_newJSInterpreterExists; // set to 1 by setOpenedByJS, for window.open
 
-  khtml::Decoder::AutoDetectLanguage m_autoDetectLanguage;
+  tdehtml::Decoder::AutoDetectLanguage m_autoDetectLanguage;
   KPopupMenu *m_automaticDetection;
   KSelectAction *m_manualDetection;
 
diff --git a/khtml/khtmlview.cpp b/tdehtml/tdehtmlview.cpp
index 4a5c7cf2d..383c7628a 100644
--- a/khtml/khtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -24,12 +24,12 @@
  */
 
 
-#include "khtmlview.moc"
+#include "tdehtmlview.moc"
 
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 
-#include "khtml_part.h"
-#include "khtml_events.h"
+#include "tdehtml_part.h"
+#include "tdehtml_events.h"
 
 #include "html/html_documentimpl.h"
 #include "html/html_inlineimpl.h"
@@ -51,13 +51,13 @@
 #include "misc/htmlhashes.h"
 #include "misc/helper.h"
 #include "misc/loader.h"
-#include "khtml_settings.h"
-#include "khtml_printsettings.h"
+#include "tdehtml_settings.h"
+#include "tdehtml_printsettings.h"
 
-#include "khtmlpart_p.h"
+#include "tdehtmlpart_p.h"
 
 #ifndef KHTML_NO_CARET
-#include "khtml_caret_p.h"
+#include "tdehtml_caret_p.h"
 #include "xml/dom2_rangeimpl.h"
 #endif
 
@@ -102,13 +102,13 @@
 #define PAINT_BUFFER_HEIGHT 128
 
 #if 0
-namespace khtml {
+namespace tdehtml {
     void dumpLineBoxes(RenderFlow *flow);
 }
 #endif
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 class KHTMLToolTip;
 
 
@@ -779,7 +779,7 @@ static int cnt=0;
 //    p->setPen(TQPen(magenta,0,DashDotDotLine));
 //    p->drawRect(dbg_paint_rect);
 
-    khtml::DrawContentsEvent event( p, ex, ey, ew, eh );
+    tdehtml::DrawContentsEvent event( p, ex, ey, ew, eh );
     TQApplication::sendEvent( m_part, &event );
 
     d->painting = false;
@@ -802,7 +802,7 @@ void KHTMLView::layout()
     if( m_part && m_part->xmlDocImpl() ) {
         DOM::DocumentImpl *document = m_part->xmlDocImpl();
 
-        khtml::RenderCanvas* canvas = static_cast<khtml::RenderCanvas *>(document->renderer());
+        tdehtml::RenderCanvas* canvas = static_cast<tdehtml::RenderCanvas *>(document->renderer());
         if ( !canvas ) return;
 
         d->layoutSchedulingEnabled=false;
@@ -1045,14 +1045,14 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
     bool swallowEvent = dispatchMouseEvent(EventImpl::MOUSEDOWN_EVENT,mev.innerNode.handle(),mev.innerNonSharedNode.handle(),true,
                                            d->clickCount,_mouse,true,DOM::NodeImpl::MousePress);
 
-    khtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
+    tdehtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
     if (r && r->isWidget())
 	_mouse->ignore();
 
     if (!swallowEvent) {
 	emit m_part->nodeActivated(mev.innerNode);
 
-	khtml::MousePressEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode );
+	tdehtml::MousePressEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode );
         TQApplication::sendEvent( m_part, &event );
         // we might be deleted after this
     }
@@ -1085,12 +1085,12 @@ void KHTMLView::viewportMouseDoubleClickEvent( TQMouseEvent *_mouse )
     bool swallowEvent = dispatchMouseEvent(EventImpl::MOUSEDOWN_EVENT,mev.innerNode.handle(),mev.innerNonSharedNode.handle(),true,
                                            d->clickCount,_mouse,true,DOM::NodeImpl::MouseDblClick);
 
-    khtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
+    tdehtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
     if (r && r->isWidget())
 	_mouse->ignore();
 
     if (!swallowEvent) {
-	khtml::MouseDoubleClickEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode, d->clickCount );
+	tdehtml::MouseDoubleClickEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode, d->clickCount );
 	TQApplication::sendEvent( m_part, &event );
     }
 
@@ -1104,7 +1104,7 @@ void KHTMLView::tripleClickTimeout()
     d->clickCount = 0;
 }
 
-static inline void forwardPeripheralEvent(khtml::RenderWidget* r, TQMouseEvent* me, int x, int y)
+static inline void forwardPeripheralEvent(tdehtml::RenderWidget* r, TQMouseEvent* me, int x, int y)
 {
     int absx = 0;
     int absy = 0;
@@ -1114,9 +1114,9 @@ static inline void forwardPeripheralEvent(khtml::RenderWidget* r, TQMouseEvent*
     TQWidget* w = r->widget();
     TQScrollView* sc = ::tqqt_cast<TQScrollView*>(w);
     if (sc && !::tqqt_cast<TQListBox*>(w))
-        static_cast<khtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(TQT_TQEVENT(&fw));
+        static_cast<tdehtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(TQT_TQEVENT(&fw));
     else if(w)
-        static_cast<khtml::RenderWidget::EventPropagator*>(w)->sendEvent(TQT_TQEVENT(&fw));
+        static_cast<tdehtml::RenderWidget::EventPropagator*>(w)->sendEvent(TQT_TQEVENT(&fw));
 }
 
 
@@ -1188,11 +1188,11 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
     DOM::NodeImpl* fn = m_part->xmlDocImpl()->focusNode();
     if (fn && fn != mev.innerNode.handle() &&
         fn->renderer() && fn->renderer()->isWidget()) {
-        forwardPeripheralEvent(static_cast<khtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym);
+        forwardPeripheralEvent(static_cast<tdehtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym);
     }
 
-    khtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
-    khtml::RenderStyle* style = (r && r->style()) ? r->style() : 0;
+    tdehtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
+    tdehtml::RenderStyle* style = (r && r->style()) ? r->style() : 0;
     TQCursor c;
     bool mailtoCursor = false;
     bool newWindowCursor = false;
@@ -1311,7 +1311,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
     d->prevMouseY = ym;
 
     if (!swallowEvent) {
-        khtml::MouseMoveEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode );
+        tdehtml::MouseMoveEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode );
         TQApplication::sendEvent( m_part, &event );
     }
 }
@@ -1342,16 +1342,16 @@ void KHTMLView::viewportMouseReleaseEvent( TQMouseEvent * _mouse )
         if (fn && fn != mev.innerNode.handle() &&
             fn->renderer() && fn->renderer()->isWidget() &&
             _mouse->button() != Qt::MidButton) {
-            forwardPeripheralEvent(static_cast<khtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym);
+            forwardPeripheralEvent(static_cast<tdehtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym);
         }
 
-        khtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
+        tdehtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
         if (r && r->isWidget())
             _mouse->ignore();
     }
 
     if (!swallowEvent) {
-	khtml::MouseReleaseEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode );
+	tdehtml::MouseReleaseEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode );
 	TQApplication::sendEvent( m_part, &event );
     }
 }
@@ -1904,7 +1904,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
 		TQWidget *w = TQT_TQWIDGET(c);
 		// don't install the event filter on toplevels
 		if (w->parentWidget(true) == view) {
-		    if (!strcmp(w->name(), "__khtml")) {
+		    if (!strcmp(w->name(), "__tdehtml")) {
 			w->installEventFilter(this);
 			w->unsetCursor();
 			if (!::tqqt_cast<TQFrame*>(w))
@@ -1934,7 +1934,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
 	    v = v->parentWidget(true);
 	}
 
-	if (v && !strcmp(c->name(), "__khtml")) {
+	if (v && !strcmp(c->name(), "__tdehtml")) {
 	    bool block = false;
 	    TQWidget *w = TQT_TQWIDGET(o);
 	    switch(e->type()) {
@@ -1956,7 +1956,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
 
 		    // TQScrollView needs fast repaints
 		    if ( asap && !d->painting && m_part->xmlDocImpl() && m_part->xmlDocImpl()->renderer() &&
-		         !static_cast<khtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer())->needsLayout() ) {
+		         !static_cast<tdehtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer())->needsLayout() ) {
 		        repaintContents(x + pe->rect().x(), y + pe->rect().y(),
 	                                        pe->rect().width(), pe->rect().height(), true);
                     } else {
@@ -2512,7 +2512,7 @@ static TQMap< NodeImpl*, TQString > buildLabels( NodeImpl* start )
     return ret;
 }
 
-namespace khtml {
+namespace tdehtml {
 struct AccessKeyData {
     ElementImpl* element;
     TQString text;
@@ -2543,7 +2543,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const
             bool text_before = false;
             switch( element->id()) {
                 case ID_A:
-                    url = khtml::parseURL(element->getAttribute(ATTR_HREF)).string();
+                    url = tdehtml::parseURL(element->getAttribute(ATTR_HREF)).string();
                     if( url.isEmpty()) // doesn't have href, it's only an anchor
                         continue;
                     text = static_cast< HTMLElementImpl* >( element )->innerText().string().simplifyWhiteSpace();
@@ -2776,7 +2776,7 @@ void KHTMLView::print()
 void KHTMLView::print(bool quick)
 {
     if(!m_part->xmlDocImpl()) return;
-    khtml::RenderCanvas *root = static_cast<khtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer());
+    tdehtml::RenderCanvas *root = static_cast<tdehtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer());
     if(!root) return;
 
     KPrinter *printer = new KPrinter(true, TQPrinter::ScreenResolution);
@@ -2793,7 +2793,7 @@ void KHTMLView::print(bool quick)
 
         TQPainter *p = new TQPainter;
         p->begin( printer );
-        khtml::setPrintPainter( p );
+        tdehtml::setPrintPainter( p );
 
         m_part->xmlDocImpl()->setPaintDevice( printer );
         TQString oldMediaType = mediaType();
@@ -2801,7 +2801,7 @@ void KHTMLView::print(bool quick)
         // We ignore margin settings for html and body when printing
         // and use the default margins from the print-system
         // (In Qt 3.0.x the default margins are hardcoded in Qt)
-        m_part->xmlDocImpl()->setPrintStyleSheet( printer->option("app-khtml-printfriendly") == "true" ?
+        m_part->xmlDocImpl()->setPrintStyleSheet( printer->option("app-tdehtml-printfriendly") == "true" ?
                                                   "* { background-image: none !important;"
                                                   "    background-color: white !important;"
                                                   "    color: black !important; }"
@@ -2825,16 +2825,16 @@ void KHTMLView::print(bool quick)
 
         m_part->xmlDocImpl()->styleSelector()->computeFontSizes(&metrics, 100);
         m_part->xmlDocImpl()->updateStyleSelector();
-        root->setPrintImages( printer->option("app-khtml-printimages") == "true");
+        root->setPrintImages( printer->option("app-tdehtml-printimages") == "true");
         root->makePageBreakAvoidBlocks();
 
         root->setNeedsLayoutAndMinMaxRecalc();
         root->layout();
-        khtml::RenderWidget::flushWidgetResizes(); // make sure widgets have their final size
+        tdehtml::RenderWidget::flushWidgetResizes(); // make sure widgets have their final size
 
         // check sizes ask for action.. (scale or clip)
 
-        bool printHeader = (printer->option("app-khtml-printheader") == "true");
+        bool printHeader = (printer->option("app-tdehtml-printheader") == "true");
 
         int headerHeight = 0;
         TQFont headerFont("Sans Serif", 8);
@@ -2953,7 +2953,7 @@ void KHTMLView::print(bool quick)
         root->setPagedMode(false);
         root->setStaticMode(false);
         d->paged = false;
-        khtml::setPrintPainter( 0 );
+        tdehtml::setPrintPainter( 0 );
         setMediaType( oldMediaType );
         m_part->xmlDocImpl()->setPaintDevice( TQT_TQPAINTDEVICE(this) );
         m_part->xmlDocImpl()->styleSelector()->computeFontSizes(m_part->xmlDocImpl()->paintDeviceMetrics(), m_part->zoomFactor());
@@ -2968,7 +2968,7 @@ void KHTMLView::slotPaletteChanged()
     if(!m_part->xmlDocImpl()) return;
     DOM::DocumentImpl *document = m_part->xmlDocImpl();
     if (!document->isHTMLDocument()) return;
-    khtml::RenderCanvas *root = static_cast<khtml::RenderCanvas *>(document->renderer());
+    tdehtml::RenderCanvas *root = static_cast<tdehtml::RenderCanvas *>(document->renderer());
     if(!root) return;
     root->style()->resetPalette();
     NodeImpl *body = static_cast<HTMLDocumentImpl*>(document)->body();
@@ -2980,7 +2980,7 @@ void KHTMLView::slotPaletteChanged()
 void KHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more)
 {
     if(!m_part->xmlDocImpl()) return;
-    khtml::RenderCanvas *root = static_cast<khtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer());
+    tdehtml::RenderCanvas *root = static_cast<tdehtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer());
     if(!root) return;
 
     m_part->xmlDocImpl()->setPaintDevice(p->device());
@@ -3051,7 +3051,7 @@ TQStringList KHTMLView::formCompletionItems(const TQString &name) const
     if (!m_part->settings()->isFormCompletionEnabled())
         return TQStringList();
     if (!d->formCompletions)
-        d->formCompletions = new KSimpleConfig(locateLocal("data", "khtml/formcompletions"));
+        d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions"));
     return d->formCompletions->readListEntry(name);
 }
 
@@ -3059,7 +3059,7 @@ void KHTMLView::clearCompletionHistory(const TQString& name)
 {
     if (!d->formCompletions)
     {
-        d->formCompletions = new KSimpleConfig(locateLocal("data", "khtml/formcompletions"));
+        d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions"));
     }
     d->formCompletions->writeEntry(name, "");
     d->formCompletions->sync();
@@ -3105,7 +3105,7 @@ void KHTMLView::removeFormCompletionItem(const TQString &name, const TQString &v
 void KHTMLView::addNonPasswordStorableSite(const TQString& host)
 {
     if (!d->formCompletions) {
-        d->formCompletions = new KSimpleConfig(locateLocal("data", "khtml/formcompletions"));
+        d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions"));
     }
 
     d->formCompletions->setGroup("NonPasswordStorableSites");
@@ -3119,7 +3119,7 @@ void KHTMLView::addNonPasswordStorableSite(const TQString& host)
 bool KHTMLView::nonPasswordStorableSite(const TQString& host) const
 {
     if (!d->formCompletions) {
-        d->formCompletions = new KSimpleConfig(locateLocal("data", "khtml/formcompletions"));
+        d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions"));
     }
     d->formCompletions->setGroup("NonPasswordStorableSites");
     TQStringList sites =  d->formCompletions->readListEntry("Sites");
@@ -3348,8 +3348,8 @@ void KHTMLView::focusInEvent( TQFocusEvent *e )
     DOM::NodeImpl* fn = m_part->xmlDocImpl() ? m_part->xmlDocImpl()->focusNode() : 0;
     if (fn && fn->renderer() && fn->renderer()->isWidget() &&
         (e->reason() != TQFocusEvent::Mouse) &&
-        static_cast<khtml::RenderWidget*>(fn->renderer())->widget())
-        static_cast<khtml::RenderWidget*>(fn->renderer())->widget()->setFocus();
+        static_cast<tdehtml::RenderWidget*>(fn->renderer())->widget())
+        static_cast<tdehtml::RenderWidget*>(fn->renderer())->widget()->setFocus();
 #ifndef KHTML_NO_CARET
     // Restart blink frequency timer if it has been killed, but only on
     // editable nodes
@@ -3420,7 +3420,7 @@ void KHTMLView::slotScrollBarMoved()
     if ( !d->firstRelayout && !d->complete && m_part->xmlDocImpl() &&
           d->layoutSchedulingEnabled) {
         // contents scroll while we are not complete: we need to check our layout *now*
-        khtml::RenderCanvas* root = static_cast<khtml::RenderCanvas *>( m_part->xmlDocImpl()->renderer() );
+        tdehtml::RenderCanvas* root = static_cast<tdehtml::RenderCanvas *>( m_part->xmlDocImpl()->renderer() );
         if (root && root->needsLayout()) {
             unscheduleRelayout();
             layout();
@@ -3498,7 +3498,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
     d->contentsMoving = false;
     if( m_part->xmlDocImpl() ) {
 	DOM::DocumentImpl *document = m_part->xmlDocImpl();
-	khtml::RenderCanvas* root = static_cast<khtml::RenderCanvas *>(document->renderer());
+	tdehtml::RenderCanvas* root = static_cast<tdehtml::RenderCanvas *>(document->renderer());
 
 	if ( root && root->needsLayout() ) {
 	    killTimer(d->repaintTimerId);
@@ -3571,7 +3571,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
     }
 }
 
-void KHTMLView::scheduleRelayout(khtml::RenderObject * /*clippedObj*/)
+void KHTMLView::scheduleRelayout(tdehtml::RenderObject * /*clippedObj*/)
 {
     if (!d->layoutSchedulingEnabled || d->layoutTimerId)
         return;
@@ -3676,7 +3676,7 @@ void KHTMLView::slotMouseScrollTimer()
 // ### the dependencies on static functions are a nightmare. just be
 // hacky and include the implementation here. Clean me up, please.
 
-#include "khtml_caret.cpp"
+#include "tdehtml_caret.cpp"
 
 void KHTMLView::initCaret(bool keepSelection)
 {
diff --git a/khtml/khtmlview.h b/tdehtml/tdehtmlview.h
index 45d90b09f..5448f32f8 100644
--- a/khtml/khtmlview.h
+++ b/tdehtml/tdehtmlview.h
@@ -54,7 +54,7 @@ namespace KJS {
     class ExternalFunc;
 }
 
-namespace khtml {
+namespace tdehtml {
     class RenderObject;
     class RenderCanvas;
     class RenderStyle;
@@ -87,16 +87,16 @@ class KHTML_EXPORT KHTMLView : public TQScrollView
     friend class DOM::HTMLInputElementImpl;
     friend class DOM::DocumentImpl;
     friend class KHTMLPart;
-    friend class khtml::RenderCanvas;
-    friend class khtml::RenderObject;
-    friend class khtml::RenderLineEdit;
-    friend class khtml::RenderPartObject;
-    friend class khtml::RenderWidget;
-    friend class khtml::CSSStyleSelector;
-    friend class khtml::LineEditWidget;
+    friend class tdehtml::RenderCanvas;
+    friend class tdehtml::RenderObject;
+    friend class tdehtml::RenderLineEdit;
+    friend class tdehtml::RenderPartObject;
+    friend class tdehtml::RenderWidget;
+    friend class tdehtml::CSSStyleSelector;
+    friend class tdehtml::LineEditWidget;
     friend class KJS::WindowFunc;
     friend class KJS::ExternalFunc;
-    friend void khtml::applyRule(DOM::CSSProperty *prop);
+    friend void tdehtml::applyRule(DOM::CSSProperty *prop);
 
 
 public:
@@ -248,7 +248,7 @@ private slots:
 
 private:
 
-    void scheduleRelayout(khtml::RenderObject* clippedObj=0);
+    void scheduleRelayout(tdehtml::RenderObject* clippedObj=0);
     void unscheduleRelayout();
 
     void scheduleRepaint(int x, int y, int w, int h, bool asap=false);
@@ -365,7 +365,7 @@ private:
      * @param hintBox caret box whose coordinates will be used if the
      * caret position could not be determined otherwise.
      */
-    void recalcAndStoreCaretPos(khtml::CaretBox *hintBox = 0);
+    void recalcAndStoreCaretPos(tdehtml::CaretBox *hintBox = 0);
     /** displays the caret and reinitializes the blink frequency timer.
      *
      * The caret will only be displayed on screen if the view has focus, or
@@ -428,7 +428,7 @@ private:
      * caret position could not be determined otherwise.
      * @return @p true if the caret has been displayed.
      */
-    bool placeCaret(khtml::CaretBox *hintBox = 0);
+    bool placeCaret(tdehtml::CaretBox *hintBox = 0);
 
     /** extends the selection up to the current caret position.
      *
@@ -540,7 +540,7 @@ private:
      * @param hintBox caret box whose coordinates will be used if the
      * caret position could not be determined otherwise.
      */
-    void placeCaretOnChar(khtml::CaretBox *hintBox);
+    void placeCaretOnChar(tdehtml::CaretBox *hintBox);
 
     /** does the actual caret placement so that it becomes visible at
      * the new position.
@@ -558,7 +558,7 @@ private:
      * @param absy absolute y-coordinate of containing block, needed for
      *		calculation of final caret position
      */
-    void placeCaretOnLine(khtml::CaretBox *caretBox, int x, int absx, int absy);
+    void placeCaretOnLine(tdehtml::CaretBox *caretBox, int x, int absx, int absy);
 
     /** moves the caret by a page length.
      * @param next @p true, move down, @p false, move up.
@@ -606,7 +606,7 @@ private:
     // ------------------------------------- member variables ------------------------------------
  private:
 
-    void setWidgetVisible(::khtml::RenderWidget*, bool visible);
+    void setWidgetVisible(::tdehtml::RenderWidget*, bool visible);
 
     int _width;
     int _height;
diff --git a/khtml/kmultipart/CMakeLists.txt b/tdehtml/tdemultipart/CMakeLists.txt
index 3f07007bd..f0d03953e 100644
--- a/khtml/kmultipart/CMakeLists.txt
+++ b/tdehtml/tdemultipart/CMakeLists.txt
@@ -15,12 +15,12 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_SOURCE_DIR}/kio
   ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
 link_directories(
@@ -30,19 +30,19 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kmultipart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdemultipart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkmultipart #############################
+##### libtdemultipart #############################
 
-set( target libkmultipart )
+set( target libtdemultipart )
 
 set( ${target}_SRCS
-  kmultipart.cpp
+  tdemultipart.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK httpfilter-static kparts-shared
+  LINK httpfilter-static tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdehtml/tdemultipart/Makefile.am b/tdehtml/tdemultipart/Makefile.am
new file mode 100644
index 000000000..f02b5931e
--- /dev/null
+++ b/tdehtml/tdemultipart/Makefile.am
@@ -0,0 +1,17 @@
+INCLUDES = -I$(top_srcdir)/tdehtml -I$(top_srcdir)/kio/httpfilter -I$(top_srcdir)/tdeutils $(all_includes)
+
+# These are not really libraries, but modules dynamically opened.
+# So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/trinity
+kde_module_LTLIBRARIES = libtdemultipart.la
+
+libtdemultipart_la_SOURCES = tdemultipart.cpp
+libtdemultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIBZ)
+libtdemultipart_la_DEPENDENCIES = $(LIB_KPARTS)
+libtdemultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+
+# Automatically generate moc files
+METASOURCES = AUTO
+
+# Install the .desktop file into the kde_services directory
+kde_services_DATA = tdemultipart.desktop
+
diff --git a/khtml/kmultipart/README b/tdehtml/tdemultipart/README
index c8a342d68..c8a342d68 100644
--- a/khtml/kmultipart/README
+++ b/tdehtml/tdemultipart/README
diff --git a/khtml/kmultipart/kmultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp
index 32c514f1b..d5195186d 100644
--- a/khtml/kmultipart/kmultipart.cpp
+++ b/tdehtml/tdemultipart/tdemultipart.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kmultipart.h"
+#include "tdemultipart.h"
 
 #include <tqvbox.h>
 #include <kinstance.h>
@@ -27,15 +27,15 @@
 #include <tqfile.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
-#include <kparts/componentfactory.h>
-#include <kparts/genericfactory.h>
-#include <khtml_part.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/genericfactory.h>
+#include <tdehtml_part.h>
 #include <unistd.h>
 #include <kxmlguifactory.h>
 #include <tqtimer.h>
 
 typedef KParts::GenericFactory<KMultiPart> KMultiPartFactory; // factory for the part
-K_EXPORT_COMPONENT_FACTORY( libkmultipart /*library name*/, KMultiPartFactory )
+K_EXPORT_COMPONENT_FACTORY( libtdemultipart /*library name*/, KMultiPartFactory )
 
 //#define DEBUG_PARSING
 
@@ -347,7 +347,7 @@ void KMultiPart::setPart( const TQString& mimeType )
         connect( childExtension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ),
                  m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) );
 
-        // Keep in sync with khtml_part.cpp
+        // Keep in sync with tdehtml_part.cpp
         connect( childExtension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
                  m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) );
         connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
@@ -537,16 +537,16 @@ void KMultiPart::slotJobFinished( TDEIO::Job *job )
 {
     if ( job->error() )
     {
-        // TODO use khtml's error:// scheme
+        // TODO use tdehtml's error:// scheme
         job->showErrorDialog();
         emit canceled( job->errorString() );
     }
     else
     {
-        /*if ( m_khtml->view()->contentsY() == 0 )
+        /*if ( m_tdehtml->view()->contentsY() == 0 )
         {
             KParts::URLArgs args = m_ext->urlArgs();
-            m_khtml->view()->setContentsPos( args.xOffset, args.yOffset );
+            m_tdehtml->view()->setContentsPos( args.xOffset, args.yOffset );
         }*/
 
         emit completed();
@@ -573,7 +573,7 @@ void KMultiPart::slotProgressInfo()
 
 TDEAboutData* KMultiPart::createAboutData()
 {
-    TDEAboutData* aboutData = new TDEAboutData( "kmultipart", I18N_NOOP("KMultiPart"),
+    TDEAboutData* aboutData = new TDEAboutData( "tdemultipart", I18N_NOOP("KMultiPart"),
                                              "0.1",
                                             I18N_NOOP( "Embeddable component for multipart/mixed" ),
                                              TDEAboutData::License_GPL,
@@ -610,4 +610,4 @@ void KMultiPartBrowserExtension::reparseConfiguration()
 }
 #endif
 
-#include "kmultipart.moc"
+#include "tdemultipart.moc"
diff --git a/khtml/kmultipart/kmultipart.desktop b/tdehtml/tdemultipart/tdemultipart.desktop
index 0dbfd06f7..d5808d928 100644
--- a/khtml/kmultipart/kmultipart.desktop
+++ b/tdehtml/tdemultipart/tdemultipart.desktop
@@ -70,4 +70,4 @@ Name[zh_CN]=�嵌入的 multipart/mixed 组件
 Name[zh_HK]=multipart/mixed 的�嵌入元件
 Name[zh_TW]=multipart/mixed 的�嵌入元件
 ServiceTypes=KParts/ReadOnlyPart
-X-TDE-Library=libkmultipart
+X-TDE-Library=libtdemultipart
diff --git a/khtml/kmultipart/kmultipart.h b/tdehtml/tdemultipart/tdemultipart.h
index 1e6f83620..e4add0816 100644
--- a/khtml/kmultipart/kmultipart.h
+++ b/tdehtml/tdemultipart/tdemultipart.h
@@ -17,14 +17,14 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kmultipart_h__
-#define __kmultipart_h__
+#ifndef __tdemultipart_h__
+#define __tdemultipart_h__
 
 #include <httpfilter/httpfilter.h>
 
-#include <kparts/part.h>
-#include <kparts/factory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/browserextension.h>
 #include <kaboutdata.h>
 #include <tqdatetime.h>
 
diff --git a/khtml/test/README b/tdehtml/test/README
index 2ffc4a940..9ab2df3c4 100644
--- a/khtml/test/README
+++ b/tdehtml/test/README
@@ -1,6 +1,6 @@
-The contents of this directory will be moved to the toplevel directory khtmltests
+The contents of this directory will be moved to the toplevel directory tdehtmltests
 
 PLEASE DO NOT POST TEST CASES HERE ANY MORE
 
 
-See  khtmltests/README
+See  tdehtmltests/README
diff --git a/khtml/test/align.html b/tdehtml/test/align.html
index ab663bf42..ab663bf42 100644
--- a/khtml/test/align.html
+++ b/tdehtml/test/align.html
diff --git a/khtml/test/align1.html b/tdehtml/test/align1.html
index f288b52ef..f288b52ef 100644
--- a/khtml/test/align1.html
+++ b/tdehtml/test/align1.html
diff --git a/khtml/test/align2.html b/tdehtml/test/align2.html
index 56f3feb70..56f3feb70 100644
--- a/khtml/test/align2.html
+++ b/tdehtml/test/align2.html
diff --git a/khtml/test/anchor1.html b/tdehtml/test/anchor1.html
index 4dfb26134..4dfb26134 100644
--- a/khtml/test/anchor1.html
+++ b/tdehtml/test/anchor1.html
diff --git a/khtml/test/anchor2.html b/tdehtml/test/anchor2.html
index 4f54e83f9..4f54e83f9 100644
--- a/khtml/test/anchor2.html
+++ b/tdehtml/test/anchor2.html
diff --git a/khtml/test/button.html b/tdehtml/test/button.html
index b9c3ae177..b9c3ae177 100644
--- a/khtml/test/button.html
+++ b/tdehtml/test/button.html
diff --git a/khtml/test/color.html b/tdehtml/test/color.html
index ff5617214..ff5617214 100644
--- a/khtml/test/color.html
+++ b/tdehtml/test/color.html
diff --git a/khtml/test/fixed-background.html b/tdehtml/test/fixed-background.html
index 754a6987f..a1cdaec81 100644
--- a/khtml/test/fixed-background.html
+++ b/tdehtml/test/fixed-background.html
@@ -20,7 +20,7 @@ Now follows a short listing, after the listing the text
 
 #include <stdio.h>
 #include <stdarg.h>
-#include "khtml.h"
+#include "tdehtml.h"
 
 #ifdef MARTINSDEBUG
 void debugM( const char *msg, ...)
diff --git a/khtml/test/image.gif b/tdehtml/test/image.gif
index ba019efb8..ba019efb8 100644
--- a/khtml/test/image.gif
+++ b/tdehtml/test/image.gif
diff --git a/khtml/test/image_map.html b/tdehtml/test/image_map.html
index 21e002382..21e002382 100644
--- a/khtml/test/image_map.html
+++ b/tdehtml/test/image_map.html
diff --git a/khtml/test/java.html b/tdehtml/test/java.html
index dfe8d698a..dfe8d698a 100644
--- a/khtml/test/java.html
+++ b/tdehtml/test/java.html
diff --git a/khtml/test/jsplugins.html b/tdehtml/test/jsplugins.html
index 7af7a25f7..7af7a25f7 100644
--- a/khtml/test/jsplugins.html
+++ b/tdehtml/test/jsplugins.html
diff --git a/khtml/test/konqi.gif b/tdehtml/test/konqi.gif
index b80293aa9..b80293aa9 100644
--- a/khtml/test/konqi.gif
+++ b/tdehtml/test/konqi.gif
diff --git a/khtml/test/lake.class b/tdehtml/test/lake.class
index 3196702b1..3196702b1 100644
--- a/khtml/test/lake.class
+++ b/tdehtml/test/lake.class
diff --git a/khtml/test/lists.html b/tdehtml/test/lists.html
index 8f781653c..8f781653c 100644
--- a/khtml/test/lists.html
+++ b/tdehtml/test/lists.html
diff --git a/khtml/test/nav_bar.gif b/tdehtml/test/nav_bar.gif
index 174348da4..174348da4 100644
--- a/khtml/test/nav_bar.gif
+++ b/tdehtml/test/nav_bar.gif
diff --git a/khtml/test/nbsp.html b/tdehtml/test/nbsp.html
index 7a8bde9de..7a8bde9de 100644
--- a/khtml/test/nbsp.html
+++ b/tdehtml/test/nbsp.html
diff --git a/khtml/test/object.html b/tdehtml/test/object.html
index 91da9f575..91da9f575 100644
--- a/khtml/test/object.html
+++ b/tdehtml/test/object.html
diff --git a/khtml/test/pseudo.html b/tdehtml/test/pseudo.html
index caba3bfee..caba3bfee 100644
--- a/khtml/test/pseudo.html
+++ b/tdehtml/test/pseudo.html
diff --git a/khtml/test/testpages.html b/tdehtml/test/testpages.html
index e117a7db9..e117a7db9 100644
--- a/khtml/test/testpages.html
+++ b/tdehtml/test/testpages.html
diff --git a/khtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 172e63e4a..233ac8402 100644
--- a/khtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -42,7 +42,7 @@
 #include <dom_string.h>
 #include "rendering/render_style.h"
 #include "rendering/render_layer.h"
-#include "khtmldefaults.h"
+#include "tdehtmldefaults.h"
 
 //We don't use the default fonts, though, but traditional testregression ones
 #undef HTML_DEFAULT_VIEW_FONT
@@ -61,7 +61,7 @@
 
 #include <kaction.h>
 #include <kcmdlineargs.h>
-#include "khtml_factory.h"
+#include "tdehtml_factory.h"
 #include <kio/job.h>
 #include <kmainwindow.h>
 #include <ksimpleconfig.h>
@@ -87,11 +87,11 @@
 #include "dom/dom_exception.h"
 #include "dom/html_document.h"
 #include "html/htmltokenizer.h"
-#include "khtml_part.h"
-#include "khtmlpart_p.h"
-#include <kparts/browserextension.h>
+#include "tdehtml_part.h"
+#include "tdehtmlpart_p.h"
+#include <tdeparts/browserextension.h>
 
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 #include "rendering/render_replaced.h"
 #include "xml/dom_docimpl.h"
 #include "html/html_baseimpl.h"
@@ -103,7 +103,7 @@
 #include "ecma/kjs_binding.h"
 #include "ecma/kjs_proxy.h"
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 using namespace KJS;
 
@@ -450,7 +450,7 @@ int main(int argc, char *argv[])
     TQApplication::setColorSpec( TQApplication::ManyColor );
 
     TDECmdLineArgs::init(argc, argv, "testregression", "TestRegression",
-                       "Regression tester for khtml", "1.0");
+                       "Regression tester for tdehtml", "1.0");
     TDECmdLineArgs::addCmdLineOptions(options);
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs( );
@@ -521,7 +521,7 @@ int main(int argc, char *argv[])
     a.config()->writeEntry( "kjscupguard_alarmhandler", true );
     a.config()->setGroup("HTML Settings");
     a.config()->writeEntry("ReportJSErrors", false);
-    TDEConfig cfg( "khtmlrc" );
+    TDEConfig cfg( "tdehtmlrc" );
     cfg.setGroup("HTML Settings");
     cfg.writeEntry( "StandardFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT );
     cfg.writeEntry( "FixedFont", HTML_DEFAULT_VIEW_FIXED_FONT );
@@ -657,9 +657,9 @@ int main(int argc, char *argv[])
     delete toplevel;
     delete fac;
 
-    khtml::Cache::clear();
-    khtml::CSSStyleSelector::clear();
-    khtml::RenderStyle::cleanup();
+    tdehtml::Cache::clear();
+    tdehtml::CSSStyleSelector::clear();
+    tdehtml::RenderStyle::cleanup();
 
     kill( xvfb, SIGINT );
 
@@ -788,7 +788,7 @@ bool RegressionTest::runTests(TQString relPath, bool mustExist, int known_failur
 
         alarm( 400 );
 
-        khtml::Cache::init();
+        tdehtml::Cache::init();
 
 	TQString relativeDir = TQFileInfo(relPath).dirPath();
 	TQString filename = info.fileName();
@@ -1406,7 +1406,7 @@ void RegressionTest::testJSFile(const TQString & filename )
     // note: this is different from the interpreter used by the part,
     // it contains regression test-specific objects & functions
     Object global(new GlobalImp());
-    khtml::ChildFrame frame;
+    tdehtml::ChildFrame frame;
     frame.m_part = m_part;
     ScriptInterpreter interp(global,&frame);
     ExecState *exec = interp.globalExec();
diff --git a/khtml/test_regression.h b/tdehtml/test_regression.h
index df76f4439..74f56cc72 100644
--- a/khtml/test_regression.h
+++ b/tdehtml/test_regression.h
@@ -23,7 +23,7 @@
 #ifndef TEST_REGRESSION_H
 #define TEST_REGRESSION_H
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kurl.h>
 #include <tqobject.h>
 #include <kjs/ustring.h>
diff --git a/khtml/test_regression_fontoverload.cpp b/tdehtml/test_regression_fontoverload.cpp
index 88e95031e..f3102b20b 100644
--- a/khtml/test_regression_fontoverload.cpp
+++ b/tdehtml/test_regression_fontoverload.cpp
@@ -27,7 +27,7 @@
 #include <tqfontdatabase.h>
 #include <tqfont.h>
 #include <tqpainter.h>
-#include "khtml_settings.h"
+#include "tdehtml_settings.h"
 #include <tqwidget.h>
 #include <assert.h>
 
@@ -359,7 +359,7 @@ void TDEApplication::dcopFailure( const TQString & )
     tqDebug( "TDEApplication::dcopFailure" );
 }
 
-#include <kparts/historyprovider.h>
+#include <tdeparts/historyprovider.h>
 
 bool KParts::HistoryProvider::contains( const TQString& t ) const
 {
@@ -378,7 +378,7 @@ bool KSSLSettings::warnOnEnter() const       { return false; }
 bool KSSLSettings::warnOnUnencrypted() const { return false; }
 bool KSSLSettings::warnOnLeave() const       { return false; }
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 KParts::Plugin* KParts::Plugin::loadPlugin( TQObject * parent, const char* libname ) { return 0; }
 
diff --git a/khtml/testkhtml.cpp b/tdehtml/testtdehtml.cpp
index e0135d091..84ace61fe 100644
--- a/khtml/testkhtml.cpp
+++ b/tdehtml/testtdehtml.cpp
@@ -1,4 +1,4 @@
-// program to test the new khtml implementation
+// program to test the new tdehtml implementation
 
 #include <stdlib.h>
 #include "decoder.h"
@@ -8,11 +8,11 @@
 // to be able to delete a static protected member pointer in kbrowser...
 // just for memory debugging
 #define protected public
-#include "khtml_part.h"
-#include "khtmlview.h"
+#include "tdehtml_part.h"
+#include "tdehtmlview.h"
 #undef protected
-#include "testkhtml.h"
-#include "testkhtml.moc"
+#include "testtdehtml.h"
+#include "testtdehtml.moc"
 #include "misc/loader.h"
 #include <tqcursor.h>
 #include <dom_string.h>
@@ -21,7 +21,7 @@
 #include "dom/dom_exception.h"
 #include <stdio.h>
 #define protected public
-#include "khtml_factory.h"
+#include "tdehtml_factory.h"
 #undef protected
 #include "css/cssstyleselector.h"
 #include "html/html_imageimpl.h"
@@ -37,7 +37,7 @@ static KCmdLineOptions options[] = { { "+file", "url to open", 0 } , KCmdLineLas
 int main(int argc, char *argv[])
 {
 
-    TDECmdLineArgs::init(argc, argv, "testkhtml", "Testkhtml",
+    TDECmdLineArgs::init(argc, argv, "testtdehtml", "Testtdehtml",
             "a basic web browser using the KHTML library", "1.0");
     TDECmdLineArgs::addCmdLineOptions(options);
 
diff --git a/khtml/testkhtml.h b/tdehtml/testtdehtml.h
index 4fd76d044..4fd76d044 100644
--- a/khtml/testkhtml.h
+++ b/tdehtml/testtdehtml.h
diff --git a/khtml/xml/CMakeLists.txt b/tdehtml/xml/CMakeLists.txt
index 82fe99d4c..904d8ba09 100644
--- a/khtml/xml/CMakeLists.txt
+++ b/tdehtml/xml/CMakeLists.txt
@@ -17,19 +17,19 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/dcop
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_SOURCE_DIR}/kio
   ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kwallet/client
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
+  ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
 
-##### khtmlxml-static ############################
+##### tdehtmlxml-static ############################
 
-set( target khtmlxml )
+set( target tdehtmlxml )
 
 set( ${target}_SRCS
   dom_docimpl.cpp dom_nodeimpl.cpp dom_textimpl.cpp
diff --git a/khtml/xml/Makefile.am b/tdehtml/xml/Makefile.am
index 17a9779aa..257f63813 100644
--- a/khtml/xml/Makefile.am
+++ b/tdehtml/xml/Makefile.am
@@ -19,15 +19,15 @@
 
 KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
 
-noinst_LTLIBRARIES = libkhtmlxml.la
-libkhtmlxml_la_SOURCES = \
+noinst_LTLIBRARIES = libtdehtmlxml.la
+libtdehtmlxml_la_SOURCES = \
 	dom_docimpl.cpp      dom_nodeimpl.cpp     dom_textimpl.cpp \
 	dom_elementimpl.cpp  dom_stringimpl.cpp   dom2_rangeimpl.cpp \
 	dom2_traversalimpl.cpp xml_tokenizer.cpp  dom_xmlimpl.cpp \
 	dom2_eventsimpl.cpp  dom2_viewsimpl.cpp	  dom_restyler.cpp
 
-#libkhtmlxml_la_LDFLAGS = -no-undefined
-libkhtmlxml_la_METASOURCES = AUTO
+#libtdehtmlxml_la_LDFLAGS = -no-undefined
+libtdehtmlxml_la_METASOURCES = AUTO
 
 noinst_HEADERS = \
 	dom_docimpl.h      dom_nodeimpl.h     dom_textimpl.h \
@@ -36,10 +36,10 @@ noinst_HEADERS = \
 	dom2_eventsimpl.h  dom2_viewsimpl.h dom_restyler.h
 
 INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
- -I$(top_srcdir)/khtml -I$(top_srcdir) -I$(top_srcdir)/kwallet/client \
- -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(all_includes)
+ -I$(top_srcdir)/tdehtml -I$(top_srcdir) -I$(top_srcdir)/tdewallet/client \
+ -I$(top_srcdir)/tdeutils -I$(top_builddir)/kjs $(all_includes)
 
-SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
 
 ## generate lib documentation
 srcdoc:
diff --git a/khtml/xml/dom2_eventsimpl.cpp b/tdehtml/xml/dom2_eventsimpl.cpp
index 5121e9caf..c0bb10f9a 100644
--- a/khtml/xml/dom2_eventsimpl.cpp
+++ b/tdehtml/xml/dom2_eventsimpl.cpp
@@ -29,12 +29,12 @@
 #include "xml/dom_nodeimpl.h"
 #include "xml/dom_docimpl.h"
 #include "rendering/render_layer.h"
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 
 #include <kdebug.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 EventImpl::EventImpl()
 {
@@ -253,15 +253,15 @@ DOMString EventImpl::idToType(EventImpl::EventId id)
     case KEYPRESS_EVENT:
         return "keypress"; //DOM3 ev. suggests textInput, but it's better for compat this way
 
-    //khtml extensions
+    //tdehtml extensions
     case KHTML_ECMA_DBLCLICK_EVENT:
         return "dblclick";
     case KHTML_ECMA_CLICK_EVENT:
         return "click";
     case KHTML_DRAGDROP_EVENT:
-        return "khtml_dragdrop";
+        return "tdehtml_dragdrop";
     case KHTML_MOVE_EVENT:
-        return "khtml_move";
+        return "tdehtml_move";
     case KHTML_READYSTATECHANGE_EVENT:
         return "readystatechange";
 
@@ -409,7 +409,7 @@ void MouseEventImpl::computeLayerPos()
 
     DocumentImpl* doc = view() ? view()->document() : 0;
     if (doc) {
-        khtml::RenderObject::NodeInfo renderInfo(true, false);
+        tdehtml::RenderObject::NodeInfo renderInfo(true, false);
         doc->renderer()->layer()->nodeAtPoint(renderInfo, m_pageX, m_pageY);
 
         NodeImpl *node = renderInfo.innerNonSharedNode();
diff --git a/khtml/xml/dom2_eventsimpl.h b/tdehtml/xml/dom2_eventsimpl.h
index fab2225e5..5d99afbbe 100644
--- a/khtml/xml/dom2_eventsimpl.h
+++ b/tdehtml/xml/dom2_eventsimpl.h
@@ -39,7 +39,7 @@ class NodeImpl;
 
 // ### support user-defined events
 
-class EventImpl : public khtml::Shared<EventImpl>
+class EventImpl : public tdehtml::Shared<EventImpl>
 {
 public:
     enum EventId {
@@ -80,7 +80,7 @@ public:
 	KEYDOWN_EVENT,
 	KEYUP_EVENT,
 	KEYPRESS_EVENT, //Mostly corresponds to DOM3 textInput event.
-	// khtml events (not part of DOM)
+	// tdehtml events (not part of DOM)
 	KHTML_ECMA_DBLCLICK_EVENT, // for html ondblclick
 	KHTML_ECMA_CLICK_EVENT, // for html onclick
 	KHTML_DRAGDROP_EVENT,
diff --git a/khtml/xml/dom2_rangeimpl.cpp b/tdehtml/xml/dom2_rangeimpl.cpp
index b160ce23f..b160ce23f 100644
--- a/khtml/xml/dom2_rangeimpl.cpp
+++ b/tdehtml/xml/dom2_rangeimpl.cpp
diff --git a/khtml/xml/dom2_rangeimpl.h b/tdehtml/xml/dom2_rangeimpl.h
index 35d532f23..9cf7a3b23 100644
--- a/khtml/xml/dom2_rangeimpl.h
+++ b/tdehtml/xml/dom2_rangeimpl.h
@@ -31,7 +31,7 @@
 
 namespace DOM {
 
-class RangeImpl : public khtml::Shared<RangeImpl>
+class RangeImpl : public tdehtml::Shared<RangeImpl>
 {
     friend class DocumentImpl;
 public:
diff --git a/khtml/xml/dom2_traversalimpl.cpp b/tdehtml/xml/dom2_traversalimpl.cpp
index 2abdadead..2abdadead 100644
--- a/khtml/xml/dom2_traversalimpl.cpp
+++ b/tdehtml/xml/dom2_traversalimpl.cpp
diff --git a/khtml/xml/dom2_traversalimpl.h b/tdehtml/xml/dom2_traversalimpl.h
index 3c5ea1dac..43800c4aa 100644
--- a/khtml/xml/dom2_traversalimpl.h
+++ b/tdehtml/xml/dom2_traversalimpl.h
@@ -35,7 +35,7 @@ namespace DOM {
 class NodeImpl;
 class DocumentImpl;
 
-class NodeIteratorImpl : public khtml::Shared<NodeIteratorImpl>
+class NodeIteratorImpl : public tdehtml::Shared<NodeIteratorImpl>
 {
 public:
     NodeIteratorImpl(NodeImpl *_root, unsigned long _whatToShow, NodeFilter _filter, bool _entityReferenceExpansion);
@@ -74,7 +74,7 @@ protected:
     DocumentImpl *m_doc;
 };
 
-class NodeFilterImpl : public khtml::Shared<NodeFilterImpl>
+class NodeFilterImpl : public tdehtml::Shared<NodeFilterImpl>
 {
 public:
     NodeFilterImpl();
@@ -89,7 +89,7 @@ protected:
 
 };
 
-class TreeWalkerImpl : public khtml::Shared<TreeWalkerImpl>
+class TreeWalkerImpl : public tdehtml::Shared<TreeWalkerImpl>
 {
 public:
     TreeWalkerImpl();
diff --git a/khtml/xml/dom2_viewsimpl.cpp b/tdehtml/xml/dom2_viewsimpl.cpp
index 2195a9db1..217184aa1 100644
--- a/khtml/xml/dom2_viewsimpl.cpp
+++ b/tdehtml/xml/dom2_viewsimpl.cpp
@@ -27,7 +27,7 @@
 #include "css/cssproperties.h"
 #include "css/css_stylesheetimpl.h"
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 AbstractViewImpl::AbstractViewImpl(DocumentImpl *_document)
diff --git a/khtml/xml/dom2_viewsimpl.h b/tdehtml/xml/dom2_viewsimpl.h
index caff63e11..e82685244 100644
--- a/khtml/xml/dom2_viewsimpl.h
+++ b/tdehtml/xml/dom2_viewsimpl.h
@@ -35,7 +35,7 @@ class ElementImpl;
 class DOMStringImpl;
 
 // Introduced in DOM Level 2:
-class AbstractViewImpl : public khtml::Shared<AbstractViewImpl>
+class AbstractViewImpl : public tdehtml::Shared<AbstractViewImpl>
 {
 public:
     AbstractViewImpl(DocumentImpl *_document);
diff --git a/khtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp
index ff206a1cc..3ab639867 100644
--- a/khtml/xml/dom_docimpl.cpp
+++ b/tdehtml/xml/dom_docimpl.cpp
@@ -57,14 +57,14 @@
 #include "rendering/render_frames.h"
 #include "rendering/render_image.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 
 #include <kglobalsettings.h>
 #include <kstringhandler.h>
 #include <krfcdate.h>
-#include "khtml_settings.h"
-#include "khtmlpart_p.h"
+#include "tdehtml_settings.h"
+#include "tdehtmlpart_p.h"
 
 #include "html/html_baseimpl.h"
 #include "html/html_blockimpl.h"
@@ -84,7 +84,7 @@
 #include "dom_docimpl.h"
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 // ------------------------------------------------------------------------
 
@@ -129,14 +129,14 @@ DocumentTypeImpl *DOMImplementationImpl::createDocumentType( const DOMString &qu
     }
 
     // INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an illegal character.
-    if (!Element::khtmlValidQualifiedName(qualifiedName)) {
+    if (!Element::tdehtmlValidQualifiedName(qualifiedName)) {
         exceptioncode = DOMException::INVALID_CHARACTER_ERR;
         return 0;
     }
 
     // NAMESPACE_ERR: Raised if the qualifiedName is malformed.
     // Added special case for the empty string, which seems to be a common pre-DOM2 misuse
-    if (!qualifiedName.isEmpty() && Element::khtmlMalformedQualifiedName(qualifiedName)) {
+    if (!qualifiedName.isEmpty() && Element::tdehtmlMalformedQualifiedName(qualifiedName)) {
         exceptioncode = DOMException::NAMESPACE_ERR;
         return 0;
     }
@@ -364,7 +364,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
     m_inSyncLoad = false;
     m_loadingXMLDoc = 0;
     m_cssTarget = 0;
-    m_dynamicDomRestyler = new khtml::DynamicDomRestyler();
+    m_dynamicDomRestyler = new tdehtml::DynamicDomRestyler();
 }
 
 void DocumentImpl::removedLastRef()
@@ -773,7 +773,7 @@ void DocumentImpl::setTextContent( const DOMString&, int& )
 
 ElementImpl *DocumentImpl::createHTMLElement( const DOMString &name )
 {
-    uint id = khtml::getTagID( name.string().lower().latin1(), name.string().length() );
+    uint id = tdehtml::getTagID( name.string().lower().latin1(), name.string().length() );
 //     id = makeId(xhtmlNamespace, id);
 
     ElementImpl *n = 0;
@@ -1126,7 +1126,7 @@ void DocumentImpl::recalcStyle( StyleChange change )
         _style->setVisuallyOrdered( visuallyOrdered );
         // ### make the font stuff _really_ work!!!!
 
-	khtml::FontDef fontDef;
+	tdehtml::FontDef fontDef;
 	TQFont f = TDEGlobalSettings::generalFont();
 	fontDef.family = f.family();
 	fontDef.italic = f.italic();
@@ -1293,9 +1293,9 @@ void DocumentImpl::clearSelection()
         static_cast<RenderCanvas*>(m_render)->clearSelection();
 }
 
-khtml::Tokenizer *DocumentImpl::createTokenizer()
+tdehtml::Tokenizer *DocumentImpl::createTokenizer()
 {
-    return new khtml::XMLTokenizer(docPtr(),m_view);
+    return new tdehtml::XMLTokenizer(docPtr(),m_view);
 }
 
 void DocumentImpl::setPaintDevice( TQPaintDevice *dev )
@@ -1752,7 +1752,7 @@ bool DocumentImpl::prepareMouseEvent( bool readonly, int _x, int _y, MouseEvent
             //tqDebug("urlnode: %s  (%d)", getTagName(renderInfo.URLElement()->id()).string().latin1(), renderInfo.URLElement()->id());
 
             ElementImpl* e =  static_cast<ElementImpl*>(renderInfo.URLElement());
-            DOMString href = khtml::parseURL(e->getAttribute(ATTR_HREF));
+            DOMString href = tdehtml::parseURL(e->getAttribute(ATTR_HREF));
             DOMString target = e->getAttribute(ATTR_TARGET);
 
             if (!target.isNull() && !href.isNull()) {
@@ -1902,7 +1902,7 @@ NodeImpl::Id DocumentImpl::getId( NodeImpl::IdType _type, DOMStringImpl* _nsURI,
     // unknown
     if (readonly) return 0;
 
-    if ( pExceptioncode && _type != NodeImpl::NamespaceId && !Element::khtmlValidQualifiedName(_name)) {
+    if ( pExceptioncode && _type != NodeImpl::NamespaceId && !Element::tdehtmlValidQualifiedName(_name)) {
         *pExceptioncode = DOMException::INVALID_CHARACTER_ERR;
         return 0;
     }
@@ -2520,7 +2520,7 @@ void DocumentImpl::defaultEventHandler(EventImpl *evt)
             continue;
 
         if ((*it).id == evt->id()) {
-            // currentTarget must be 0 in khtml for kjs_events to set "this" correctly.
+            // currentTarget must be 0 in tdehtml for kjs_events to set "this" correctly.
             // (this is how we identify events dispatched to the window, like window.onmousedown)
             // ## currentTarget is unimplemented in IE, and is "window" in Mozilla (how? not a DOM node)
             evt->setCurrentTarget(0);
diff --git a/khtml/xml/dom_docimpl.h b/tdehtml/xml/dom_docimpl.h
index 5e50c09a4..18b164643 100644
--- a/khtml/xml/dom_docimpl.h
+++ b/tdehtml/xml/dom_docimpl.h
@@ -49,7 +49,7 @@ class TQTextCodec;
 class TQPaintDeviceMetrics;
 class KHTMLView;
 
-namespace khtml {
+namespace tdehtml {
     class Tokenizer;
     class CSSStyleSelector;
     class DocLoader;
@@ -93,7 +93,7 @@ namespace DOM {
     class TextImpl;
     class TreeWalkerImpl;
 
-class DOMImplementationImpl : public khtml::Shared<DOMImplementationImpl>
+class DOMImplementationImpl : public tdehtml::Shared<DOMImplementationImpl>
 {
 public:
     DOMImplementationImpl();
@@ -180,7 +180,7 @@ private:
 /**
  * @internal
  */
-class DocumentImpl : public TQObject, private khtml::CachedObjectClient, public NodeBaseImpl
+class DocumentImpl : public TQObject, private tdehtml::CachedObjectClient, public NodeBaseImpl
 {
     Q_OBJECT
 public:
@@ -228,7 +228,7 @@ public:
 
     virtual ElementImpl *createHTMLElement ( const DOMString &tagName );
 
-    khtml::CSSStyleSelector *styleSelector() { return m_styleSelector; }
+    tdehtml::CSSStyleSelector *styleSelector() { return m_styleSelector; }
 
      /**
      * Updates the pending sheet count and then calls updateStyleSelector.
@@ -297,12 +297,12 @@ public:
     virtual void updateRendering();
     void updateLayout();
     static void updateDocumentsRendering();
-    khtml::DocLoader *docLoader() { return m_docLoader; }
+    tdehtml::DocLoader *docLoader() { return m_docLoader; }
 
     virtual void attach();
     virtual void detach();
 
-    khtml::RenderArena* renderArena() { return m_renderArena.get(); }
+    tdehtml::RenderArena* renderArena() { return m_renderArena.get(); }
 
     // to get visually ordered hebrew and arabic pages right
     void setVisuallyOrdered();
@@ -337,8 +337,8 @@ public:
     TQString printStyleSheet() const { return m_printSheet; }
 
     CSSStyleSheetImpl* elementSheet();
-    virtual khtml::Tokenizer *createTokenizer();
-    khtml::Tokenizer *tokenizer() { return m_tokenizer; }
+    virtual tdehtml::Tokenizer *createTokenizer();
+    tdehtml::Tokenizer *tokenizer() { return m_tokenizer; }
 
     TQPaintDeviceMetrics *paintDeviceMetrics() { return m_paintDeviceMetrics; }
     TQPaintDevice *paintDevice() const { return m_paintDevice; }
@@ -522,9 +522,9 @@ public:
     void incDOMTreeVersion() { ++m_domtree_version; }
     unsigned int domTreeVersion() const { return m_domtree_version; }
 
-    TQDict<khtml::CounterNode>* counters(const khtml::RenderObject* o) { return m_counterDict[(void*)o]; }
-    void setCounters(const khtml::RenderObject* o, TQDict<khtml::CounterNode> *dict) { m_counterDict.insert((void*)o, dict);}
-    void removeCounters(const khtml::RenderObject* o) { m_counterDict.remove((void*)o); }
+    TQDict<tdehtml::CounterNode>* counters(const tdehtml::RenderObject* o) { return m_counterDict[(void*)o]; }
+    void setCounters(const tdehtml::RenderObject* o, TQDict<tdehtml::CounterNode> *dict) { m_counterDict.insert((void*)o, dict);}
+    void removeCounters(const tdehtml::RenderObject* o) { m_counterDict.remove((void*)o); }
 
 
     ElementMappingCache& underDocNamedCache() {
@@ -542,19 +542,19 @@ public:
     TQString contentLanguage() const { return m_contentLanguage; }
     void setContentLanguage(const TQString& cl) { m_contentLanguage = cl; }
 
-    khtml::DynamicDomRestyler& dynamicDomRestyler() { return *m_dynamicDomRestyler; }
-    const khtml::DynamicDomRestyler& dynamicDomRestyler() const { return *m_dynamicDomRestyler; }
+    tdehtml::DynamicDomRestyler& dynamicDomRestyler() { return *m_dynamicDomRestyler; }
+    const tdehtml::DynamicDomRestyler& dynamicDomRestyler() const { return *m_dynamicDomRestyler; }
 
 signals:
     void finishedParsing();
 
 protected:
-    khtml::CSSStyleSelector *m_styleSelector;
+    tdehtml::CSSStyleSelector *m_styleSelector;
     KHTMLView *m_view;
     TQStringList m_state;
 
-    khtml::DocLoader *m_docLoader;
-    khtml::Tokenizer *m_tokenizer;
+    tdehtml::DocLoader *m_docLoader;
+    tdehtml::Tokenizer *m_tokenizer;
     KURL m_url;
     KURL m_baseURL;
     TQString m_baseTarget;
@@ -604,10 +604,10 @@ protected:
         TQDict<void> ids;
 
         void expandIfNeeded() {
-            if (ids.size() <= ids.count() && ids.size() != khtml_MaxSeed)
-                ids.resize( khtml::nextSeed(ids.count()) );
-            if (names.size() <= names.count() && names.size() != khtml_MaxSeed)
-                names.resize( khtml::nextSeed(names.count()) );
+            if (ids.size() <= ids.count() && ids.size() != tdehtml_MaxSeed)
+                ids.resize( tdehtml::nextSeed(ids.count()) );
+            if (names.size() <= names.count() && names.size() != tdehtml_MaxSeed)
+                names.resize( tdehtml::nextSeed(names.count()) );
         }
 
         void addAlias(DOMStringImpl* _prefix, DOMStringImpl* _name, bool cs, NodeImpl::Id id) {
@@ -640,9 +640,9 @@ protected:
     TQPtrList<NodeImpl> m_maintainsState;
 
     // ### evaluate for placement in RenderStyle
-    TQPtrDict<TQDict<khtml::CounterNode> > m_counterDict;
+    TQPtrDict<TQDict<tdehtml::CounterNode> > m_counterDict;
 
-    khtml::DynamicDomRestyler *m_dynamicDomRestyler;
+    tdehtml::DynamicDomRestyler *m_dynamicDomRestyler;
 
     bool visuallyOrdered;
     bool m_bParsing;
@@ -656,7 +656,7 @@ protected:
 
     DOMString m_title;
     DOMString m_preferredStylesheetSet;
-    khtml::CachedCSSStyleSheet *m_loadingXMLDoc;
+    tdehtml::CachedCSSStyleSheet *m_loadingXMLDoc;
 
     int m_decoderMibEnum;
 
@@ -673,7 +673,7 @@ protected:
     //Cache for getElementById
     mutable ElementMappingCache m_getElementByIdCache;
 
-    khtml::SharedPtr<khtml::RenderArena> m_renderArena;
+    tdehtml::SharedPtr<tdehtml::RenderArena> m_renderArena;
 private:
     mutable DOMString m_domain;
     int m_selfOnlyRefCount;
diff --git a/khtml/xml/dom_elementimpl.cpp b/tdehtml/xml/dom_elementimpl.cpp
index 875c5f2e4..75ed41dfc 100644
--- a/khtml/xml/dom_elementimpl.cpp
+++ b/tdehtml/xml/dom_elementimpl.cpp
@@ -55,7 +55,7 @@
 // ### check for INVALID_CHARACTER_ERR where appropriate
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 AttrImpl::AttrImpl(ElementImpl* element, DocumentImpl* docPtr, NodeImpl::Id attrId,
 		   DOMStringImpl *value, DOMStringImpl *prefix)
@@ -1160,7 +1160,7 @@ void NamedAttrMapImpl::setValue(NodeImpl::Id id, DOMStringImpl *value, DOMString
 {
     assert( !(qName && nsAware) );
     if (!id) return;
-    // Passing in a null value here causes the attribute to be removed. This is a khtml extension
+    // Passing in a null value here causes the attribute to be removed. This is a tdehtml extension
     // (the spec does not specify what to do in this situation).
     int exceptioncode = 0;
     if (!value) {
diff --git a/khtml/xml/dom_elementimpl.h b/tdehtml/xml/dom_elementimpl.h
index ee1be3e4a..e528d7e24 100644
--- a/khtml/xml/dom_elementimpl.h
+++ b/tdehtml/xml/dom_elementimpl.h
@@ -32,7 +32,7 @@
 #include "xml/dom_stringimpl.h"
 #include "misc/shared.h"
 
-namespace khtml {
+namespace tdehtml {
     class CSSStyleSelector;
 }
 
@@ -141,7 +141,7 @@ class ElementImpl : public NodeBaseImpl
     friend class NamedAttrMapImpl;
     friend class AttrImpl;
     friend class NodeImpl;
-    friend class khtml::CSSStyleSelector;
+    friend class tdehtml::CSSStyleSelector;
 public:
     ElementImpl(DocumentImpl *doc);
     ~ElementImpl();
@@ -197,8 +197,8 @@ public:
     virtual void backwardsStructureChanged();
     virtual void attributeChanged(NodeImpl::Id attrId);
 
-    virtual khtml::RenderStyle *styleForRenderer(khtml::RenderObject *parent);
-    virtual khtml::RenderObject *createRenderer(khtml::RenderArena *, khtml::RenderStyle *);
+    virtual tdehtml::RenderStyle *styleForRenderer(tdehtml::RenderObject *parent);
+    virtual tdehtml::RenderObject *createRenderer(tdehtml::RenderArena *, tdehtml::RenderStyle *);
     virtual void recalcStyle( StyleChange = NoChange );
 
     virtual void mouseEventHandler( MouseEvent* /*ev*/, bool /*inside*/ ) {}
@@ -334,7 +334,7 @@ inline bool checkQualifiedName(const DOMString &qualifiedName, const DOMString &
     }
 
     // INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an illegal character.
-    if (!qualifiedName.isNull() && !Element::khtmlValidQualifiedName(qualifiedName)
+    if (!qualifiedName.isNull() && !Element::tdehtmlValidQualifiedName(qualifiedName)
         && ( !qualifiedName.isEmpty() || !nameCanBeEmpty ) ) {
         if (pExceptioncode)
             *pExceptioncode = DOMException::INVALID_CHARACTER_ERR;
@@ -357,7 +357,7 @@ inline bool checkQualifiedName(const DOMString &qualifiedName, const DOMString &
         }
     }
 
-    if (!qualifiedName.isNull() && Element::khtmlMalformedQualifiedName(qualifiedName) ||
+    if (!qualifiedName.isNull() && Element::tdehtmlMalformedQualifiedName(qualifiedName) ||
         (colonpos >= 0 && namespaceURI.isNull()) ||
         (qualifiedName.isNull() && !namespaceURI.isNull()) ||
         (colonpos == 3 && qualifiedName[0] == 'x' && qualifiedName[1] == 'm' && qualifiedName[2] == 'l' &&
diff --git a/khtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp
index 5febe695e..251cb1444 100644
--- a/khtml/xml/dom_nodeimpl.cpp
+++ b/tdehtml/xml/dom_nodeimpl.cpp
@@ -41,18 +41,18 @@
 #include "rendering/render_line.h"
 
 #include "ecma/kjs_proxy.h"
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 #include "dom_nodeimpl.h"
 
-// from khtml_caret_p.h
-namespace khtml {
+// from tdehtml_caret_p.h
+namespace tdehtml {
 void /*KDE_NO_EXPORT*/ mapDOMPosToRenderPos(DOM::NodeImpl *node, long offset,
-		khtml::RenderObject *&r, long &r_ofs, bool &outside, bool &outsideEnd);
+		tdehtml::RenderObject *&r, long &r_ofs, bool &outside, bool &outsideEnd);
 }
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 NodeImpl::NodeImpl(DocumentImpl *doc)
     : m_document(doc),
@@ -272,7 +272,7 @@ void NodeImpl::setChanged(bool b)
 
 bool NodeImpl::isInline() const
 {
-    if (m_render) return m_render->style()->display() == khtml::INLINE;
+    if (m_render) return m_render->style()->display() == tdehtml::INLINE;
     return !isElementNode();
 }
 
@@ -390,7 +390,7 @@ void NodeImpl::dispatchGenericEvent( EventImpl *evt, int &/*exceptioncode */)
             it.current()->handleLocalEvents(evt,false);
         }
 
-        // now we call all default event handlers (this is not part of DOM - it is internal to khtml)
+        // now we call all default event handlers (this is not part of DOM - it is internal to tdehtml)
         evt->setCurrentTarget(0);
         evt->setEventPhase(0); // I guess this is correct, the spec does not seem to say
         for (it.toLast(); it.current() && it.current() != propagationSentinel &&
@@ -670,7 +670,7 @@ void NodeImpl::checkSetPrefix(const DOMString &_prefix, int &exceptioncode)
     // ElementImpl::setPrefix() and AttrImpl::setPrefix()
 
     // INVALID_CHARACTER_ERR: Raised if the specified prefix contains an illegal character.
-    if (!Element::khtmlValidPrefix(_prefix)) {
+    if (!Element::tdehtmlValidPrefix(_prefix)) {
         exceptioncode = DOMException::INVALID_CHARACTER_ERR;
         return;
     }
@@ -688,7 +688,7 @@ void NodeImpl::checkSetPrefix(const DOMString &_prefix, int &exceptioncode)
     // - if this node is an attribute and the specified prefix is "xmlns" and
     //   the namespaceURI of this node is different from "http://www.w3.org/2000/xmlns/",
     // - or if this node is an attribute and the qualifiedName of this node is "xmlns" [Namespaces].
-    if (Element::khtmlMalformedPrefix(_prefix) || (namespacePart(id()) == defaultNamespace && id() > ID_LAST_TAG) ||
+    if (Element::tdehtmlMalformedPrefix(_prefix) || (namespacePart(id()) == defaultNamespace && id() > ID_LAST_TAG) ||
         (_prefix == "xml" && namespaceURI() != "http://www.w3.org/XML/1998/namespace")) {
         exceptioncode = DOMException::NAMESPACE_ERR;
         return;
@@ -766,7 +766,7 @@ bool NodeImpl::childAllowed( NodeImpl *newChild )
     return childTypeAllowed(newChild->nodeType());
 }
 
-NodeImpl::StyleChange NodeImpl::diff( khtml::RenderStyle *s1, khtml::RenderStyle *s2 )
+NodeImpl::StyleChange NodeImpl::diff( tdehtml::RenderStyle *s1, tdehtml::RenderStyle *s2 )
 {
     // This method won't work when a style contains noninherited properties with "inherit" value.
     StyleChange ch = NoInherit;
@@ -789,27 +789,27 @@ NodeImpl::StyleChange NodeImpl::diff( khtml::RenderStyle *s1, khtml::RenderStyle
 
     // Because the first-letter implementation is so f..ked up, the easiest way
     // to update first-letter is to remove the entire node and readd it.
-    if (ch < Detach && pseudoDiff(s1, s2, khtml::RenderStyle::FIRST_LETTER))
+    if (ch < Detach && pseudoDiff(s1, s2, tdehtml::RenderStyle::FIRST_LETTER))
         ch = Detach;
     // If the other pseudoStyles have changed, we want to return NoInherit
-    if (ch == NoChange && pseudoDiff(s1, s2, khtml::RenderStyle::BEFORE))
+    if (ch == NoChange && pseudoDiff(s1, s2, tdehtml::RenderStyle::BEFORE))
         ch = NoInherit;
-    if (ch == NoChange && pseudoDiff(s1, s2, khtml::RenderStyle::AFTER))
+    if (ch == NoChange && pseudoDiff(s1, s2, tdehtml::RenderStyle::AFTER))
         ch = NoInherit;
-    if (ch == NoChange && pseudoDiff(s1, s2, khtml::RenderStyle::MARKER))
+    if (ch == NoChange && pseudoDiff(s1, s2, tdehtml::RenderStyle::MARKER))
         ch = NoInherit;
-    if (ch == NoChange && pseudoDiff(s1, s2, khtml::RenderStyle::SELECTION))
+    if (ch == NoChange && pseudoDiff(s1, s2, tdehtml::RenderStyle::SELECTION))
         ch = NoInherit;
-    if (ch == NoChange && pseudoDiff(s1, s2, khtml::RenderStyle::FIRST_LINE))
+    if (ch == NoChange && pseudoDiff(s1, s2, tdehtml::RenderStyle::FIRST_LINE))
         ch = NoInherit;
 
     return ch;
 }
 
-bool NodeImpl::pseudoDiff( khtml::RenderStyle *s1, khtml::RenderStyle *s2, unsigned int pid)
+bool NodeImpl::pseudoDiff( tdehtml::RenderStyle *s1, tdehtml::RenderStyle *s2, unsigned int pid)
 {
-    khtml::RenderStyle *ps1 = s1 ? s1->getPseudoStyle((khtml::RenderStyle::PseudoId)pid) : 0;
-    khtml::RenderStyle *ps2 = s2 ? s2->getPseudoStyle((khtml::RenderStyle::PseudoId)pid) : 0;
+    tdehtml::RenderStyle *ps1 = s1 ? s1->getPseudoStyle((tdehtml::RenderStyle::PseudoId)pid) : 0;
+    tdehtml::RenderStyle *ps2 = s2 ? s2->getPseudoStyle((tdehtml::RenderStyle::PseudoId)pid) : 0;
 
     if (ps1 == ps2)
         return false;
@@ -1990,7 +1990,7 @@ void RegisteredListenerList::removeEventListener(int id, EventListener *listener
 
 bool RegisteredListenerList::isHTMLEventListener(EventListener* listener)
 {
-    return (listener->eventListenerType() == "_khtml_HTMLEventListener");
+    return (listener->eventListenerType() == "_tdehtml_HTMLEventListener");
 }
 
 void RegisteredListenerList::setHTMLEventListener(int id, EventListener *listener)
diff --git a/khtml/xml/dom_nodeimpl.h b/tdehtml/xml/dom_nodeimpl.h
index 275452d69..c01e69c0a 100644
--- a/khtml/xml/dom_nodeimpl.h
+++ b/tdehtml/xml/dom_nodeimpl.h
@@ -43,7 +43,7 @@ class TQMouseEvent;
 class TQKeyEvent;
 class TQTextStream;
 
-namespace khtml {
+namespace tdehtml {
     class RenderStyle;
     class RenderObject;
     class RenderArena;
@@ -98,7 +98,7 @@ inline TQ_UINT32 makeId(TQ_UINT16 n, TQ_UINT16 l) { return (n << 16) | l; }
 
 const TQ_UINT32 anyQName = makeId(anyNamespace, anyLocalName);
 
-class NodeImpl : public khtml::TreeShared<NodeImpl>
+class NodeImpl : public tdehtml::TreeShared<NodeImpl>
 {
     friend class DocumentImpl;
 public:
@@ -261,8 +261,8 @@ public:
 
     enum StyleChange { NoChange, NoInherit, Inherit, Detach, Force };
     virtual void recalcStyle( StyleChange = NoChange ) {}
-    static StyleChange diff( khtml::RenderStyle *s1, khtml::RenderStyle *s2 );
-    static bool pseudoDiff( khtml::RenderStyle *s1, khtml::RenderStyle *s2, unsigned int pid);
+    static StyleChange diff( tdehtml::RenderStyle *s1, tdehtml::RenderStyle *s2 );
+    static bool pseudoDiff( tdehtml::RenderStyle *s1, tdehtml::RenderStyle *s2, unsigned int pid);
 
     unsigned long nodeIndex() const;
     // Returns the document that this node is associated with. This is guaranteed to always be non-null, as opposed to
@@ -320,10 +320,10 @@ public:
 
     DocumentImpl *docPtr() const { return m_document.get(); }
 
-    khtml::RenderObject *renderer() const { return m_render; }
-    khtml::RenderObject *nextRenderer();
-    khtml::RenderObject *previousRenderer();
-    void setRenderer(khtml::RenderObject* renderer) { m_render = renderer; }
+    tdehtml::RenderObject *renderer() const { return m_render; }
+    tdehtml::RenderObject *nextRenderer();
+    tdehtml::RenderObject *previousRenderer();
+    void setRenderer(tdehtml::RenderObject* renderer) { m_render = renderer; }
 
     void checkSetPrefix(const DOMString &_prefix, int &exceptioncode);
     void checkAddChild(NodeImpl *newChild, int &exceptioncode);
@@ -371,9 +371,9 @@ public:
     virtual void backwardsStructureChanged() {};
 
     void createRendererIfNeeded();
-    virtual khtml::RenderStyle *styleForRenderer(khtml::RenderObject *parent);
-    virtual bool rendererIsNeeded(khtml::RenderStyle *);
-    virtual khtml::RenderObject *createRenderer(khtml::RenderArena *, khtml::RenderStyle *);
+    virtual tdehtml::RenderStyle *styleForRenderer(tdehtml::RenderObject *parent);
+    virtual bool rendererIsNeeded(tdehtml::RenderStyle *);
+    virtual tdehtml::RenderObject *createRenderer(tdehtml::RenderArena *, tdehtml::RenderStyle *);
 
     // -----------------------------------------------------------------------------
     // Methods for maintaining the state of the element between history navigation
@@ -456,11 +456,11 @@ public:
     }
 
 private: // members
-    khtml::DocPtr<DocumentImpl> m_document;
+    tdehtml::DocPtr<DocumentImpl> m_document;
     NodeImpl *m_previous;
     NodeImpl *m_next;
 protected:
-    khtml::RenderObject *m_render;
+    tdehtml::RenderObject *m_render;
     RegisteredListenerList m_regdListeners;
 
     unsigned short m_tabIndex : 15;
@@ -546,7 +546,7 @@ protected:
 class Node;
 class NodeImpl;
 
-class NodeListImpl : public khtml::Shared<NodeListImpl>
+class NodeListImpl : public tdehtml::Shared<NodeListImpl>
 {
 public:
     //Type of the item stored in the cache.
@@ -580,7 +580,7 @@ public:
         }
     };
 
-    struct Cache: public khtml::Shared<Cache>
+    struct Cache: public tdehtml::Shared<Cache>
     {
         static Cache* make() { return new Cache; }
 
@@ -681,7 +681,7 @@ protected:
 // Generic NamedNodeMap interface
 // Other classes implement this for more specific situations e.g. attributes
 // of an element
-class NamedNodeMapImpl : public khtml::Shared<NamedNodeMapImpl>
+class NamedNodeMapImpl : public tdehtml::Shared<NamedNodeMapImpl>
 {
 public:
     NamedNodeMapImpl();
diff --git a/khtml/xml/dom_restyler.cpp b/tdehtml/xml/dom_restyler.cpp
index 0050c4a03..acd89620f 100644
--- a/khtml/xml/dom_restyler.cpp
+++ b/tdehtml/xml/dom_restyler.cpp
@@ -23,7 +23,7 @@
 #include "dom_restyler.h"
 #include "dom_elementimpl.h"
 
-namespace khtml {
+namespace tdehtml {
 
 DynamicDomRestyler::DynamicDomRestyler()
 {
diff --git a/khtml/xml/dom_restyler.h b/tdehtml/xml/dom_restyler.h
index eb8d795d5..54d5ad798 100644
--- a/khtml/xml/dom_restyler.h
+++ b/tdehtml/xml/dom_restyler.h
@@ -32,7 +32,7 @@ namespace DOM {
 
 // Restyle dependency tracker for dynamic DOM
 
-namespace khtml {
+namespace tdehtml {
 
 using DOM::ElementImpl;
 
diff --git a/khtml/xml/dom_stringimpl.cpp b/tdehtml/xml/dom_stringimpl.cpp
index 79bddf5d9..12f1481c0 100644
--- a/khtml/xml/dom_stringimpl.cpp
+++ b/tdehtml/xml/dom_stringimpl.cpp
@@ -31,7 +31,7 @@
 #include <tqstringlist.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 
 DOMStringImpl::DOMStringImpl(const char *str)
@@ -276,7 +276,7 @@ static Length parseLength(const TQChar *s, unsigned int l)
     return Length(0, Relative);
 }
 
-khtml::Length* DOMStringImpl::toCoordsArray(int& len) const
+tdehtml::Length* DOMStringImpl::toCoordsArray(int& len) const
 {
     TQString str(s, l);
     for(unsigned int i=0; i < l; i++) {
@@ -287,7 +287,7 @@ khtml::Length* DOMStringImpl::toCoordsArray(int& len) const
     str = str.simplifyWhiteSpace();
 
     len = str.contains(' ') + 1;
-    khtml::Length* r = new khtml::Length[len];
+    tdehtml::Length* r = new tdehtml::Length[len];
 
     int i = 0;
     int pos = 0;
@@ -302,7 +302,7 @@ khtml::Length* DOMStringImpl::toCoordsArray(int& len) const
     return r;
 }
 
-khtml::Length* DOMStringImpl::toLengthArray(int& len) const
+tdehtml::Length* DOMStringImpl::toLengthArray(int& len) const
 {
     TQString str(s, l);
     str = str.simplifyWhiteSpace();
@@ -313,7 +313,7 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const
     if( len == 1 )
         return 0L;
 
-    khtml::Length* r = new khtml::Length[len];
+    tdehtml::Length* r = new tdehtml::Length[len];
 
     int i = 0;
     int pos = 0;
diff --git a/khtml/xml/dom_stringimpl.h b/tdehtml/xml/dom_stringimpl.h
index cd7128967..c8f5ce7d8 100644
--- a/khtml/xml/dom_stringimpl.h
+++ b/tdehtml/xml/dom_stringimpl.h
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 
 #include "dom/dom_misc.h"
-#include "misc/khtmllayout.h"
+#include "misc/tdehtmllayout.h"
 #include "misc/shared.h"
 
 #define QT_ALLOC_QCHAR_VEC( N ) (TQChar*) new char[ sizeof(TQChar)*( N ) ]
@@ -34,7 +34,7 @@
 
 namespace DOM {
 
-class DOMStringImpl : public khtml::Shared<DOMStringImpl>
+class DOMStringImpl : public tdehtml::Shared<DOMStringImpl>
 {
 private:
     DOMStringImpl(const DOMStringImpl&);
@@ -84,8 +84,8 @@ public:
     // ignores trailing garbage, unlike QString
     int toInt(bool* ok = 0) const;
 
-    khtml::Length* toLengthArray(int& len) const;
-    khtml::Length* toCoordsArray(int& len) const;
+    tdehtml::Length* toLengthArray(int& len) const;
+    tdehtml::Length* toCoordsArray(int& len) const;
     bool isLower() const;
     DOMStringImpl *lower() const;
     DOMStringImpl *upper() const;
diff --git a/khtml/xml/dom_textimpl.cpp b/tdehtml/xml/dom_textimpl.cpp
index 86317293d..aa478b922 100644
--- a/khtml/xml/dom_textimpl.cpp
+++ b/tdehtml/xml/dom_textimpl.cpp
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 static DOMString escapeHTML( const DOMString& in )
 {
diff --git a/khtml/xml/dom_textimpl.h b/tdehtml/xml/dom_textimpl.h
index 07e4909f6..07d2c0011 100644
--- a/khtml/xml/dom_textimpl.h
+++ b/tdehtml/xml/dom_textimpl.h
@@ -127,8 +127,8 @@ public:
     virtual bool isTextNode() const { return true; }
     virtual Id id() const;
     virtual void attach();
-    virtual bool rendererIsNeeded(khtml::RenderStyle *);
-    virtual khtml::RenderObject *createRenderer(khtml::RenderArena *, khtml::RenderStyle *);
+    virtual bool rendererIsNeeded(tdehtml::RenderStyle *);
+    virtual tdehtml::RenderObject *createRenderer(tdehtml::RenderArena *, tdehtml::RenderStyle *);
     virtual void recalcStyle( StyleChange = NoChange );
     virtual bool childTypeAllowed( unsigned short type );
 
diff --git a/khtml/xml/dom_xmlimpl.cpp b/tdehtml/xml/dom_xmlimpl.cpp
index 121ad436a..121ad436a 100644
--- a/khtml/xml/dom_xmlimpl.cpp
+++ b/tdehtml/xml/dom_xmlimpl.cpp
diff --git a/khtml/xml/dom_xmlimpl.h b/tdehtml/xml/dom_xmlimpl.h
index d88dc041f..29ad1471f 100644
--- a/khtml/xml/dom_xmlimpl.h
+++ b/tdehtml/xml/dom_xmlimpl.h
@@ -28,7 +28,7 @@
 
 #include <tqxml.h>
 
-namespace khtml {
+namespace tdehtml {
 class CachedCSSStyleSheet;
 }
 
@@ -123,7 +123,7 @@ protected:
 };
 
 
-class ProcessingInstructionImpl : public NodeBaseImpl, private khtml::CachedObjectClient
+class ProcessingInstructionImpl : public NodeBaseImpl, private tdehtml::CachedObjectClient
 {
 public:
     ProcessingInstructionImpl(DocumentImpl *doc);
@@ -159,7 +159,7 @@ protected:
     DOMStringImpl *m_target;
     DOMStringImpl *m_data;
     DOMStringImpl *m_localHref;
-    khtml::CachedCSSStyleSheet *m_cachedSheet;
+    tdehtml::CachedCSSStyleSheet *m_cachedSheet;
     CSSStyleSheetImpl *m_sheet;
 };
 
diff --git a/khtml/xml/xml_tokenizer.cpp b/tdehtml/xml/xml_tokenizer.cpp
index 7c043815a..ff4a33a99 100644
--- a/khtml/xml/xml_tokenizer.cpp
+++ b/tdehtml/xml/xml_tokenizer.cpp
@@ -32,14 +32,14 @@
 #include "misc/htmlattrs.h"
 #include "misc/loader.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 #include <tqvariant.h>
 #include <kdebug.h>
 #include <klocale.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 XMLIncrementalSource::XMLIncrementalSource()
     : TQXmlInputSource(), m_pos( 0 ), m_unicode( 0 ),
diff --git a/khtml/xml/xml_tokenizer.h b/tdehtml/xml/xml_tokenizer.h
index 355c41b74..49a9c970d 100644
--- a/khtml/xml/xml_tokenizer.h
+++ b/tdehtml/xml/xml_tokenizer.h
@@ -33,7 +33,7 @@
 
 class KHTMLView;
 
-namespace khtml {
+namespace tdehtml {
     class CachedObject;
     class CachedScript;
 }
@@ -46,7 +46,7 @@ namespace DOM {
     class HTMLScriptElementImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 class XMLHandler : public TQXmlDefaultHandler
 {
@@ -124,7 +124,7 @@ public:
     // script output must be prepended, while new data
     // received during executing a script must be appended, hence the
     // extra bool to be able to distinguish between both cases. document.write()
-    // always uses false, while khtmlpart uses true
+    // always uses false, while tdehtmlpart uses true
     virtual void write( const TokenizerString &str, bool appendData) = 0;
     virtual void end() = 0;
     virtual void finish() = 0;
@@ -159,7 +159,7 @@ private:
     bool         m_finished;
 };
 
-class XMLTokenizer : public Tokenizer, public khtml::CachedObjectClient
+class XMLTokenizer : public Tokenizer, public tdehtml::CachedObjectClient
 {
 public:
     XMLTokenizer(DOM::DocumentImpl *, KHTMLView * = 0);
@@ -171,7 +171,7 @@ public:
     virtual void setAutoClose(bool b=true) { tqWarning("XMLTokenizer::setAutoClose: stub."); (void)b; }
 
     // from CachedObjectClient
-    void notifyFinished(khtml::CachedObject *finishedObj);
+    void notifyFinished(tdehtml::CachedObject *finishedObj);
 
     virtual bool isWaitingForScripts() const;
     virtual bool isExecutingScript() const { return false; }
@@ -185,7 +185,7 @@ protected:
 
     TQPtrList<DOM::HTMLScriptElementImpl> m_scripts;
     TQPtrListIterator<DOM::HTMLScriptElementImpl> *m_scriptsIt;
-    khtml::CachedScript *m_cachedScript;
+    tdehtml::CachedScript *m_cachedScript;
 
     XMLHandler m_handler;
     TQXmlSimpleReader m_reader;
diff --git a/kmdi/CMakeLists.txt b/tdemdi/CMakeLists.txt
index ab54cb550..e0837b136 100644
--- a/kmdi/CMakeLists.txt
+++ b/tdemdi/CMakeLists.txt
@@ -9,7 +9,7 @@
 #
 #################################################
 
-add_subdirectory( kmdi )
+add_subdirectory( tdemdi )
 
 include_directories(
   ${TQT_INCLUDE_DIRS}
@@ -21,8 +21,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kutils
-  ${CMAKE_SOURCE_DIR}/kmdi
+  ${CMAKE_SOURCE_DIR}/tdeutils
+  ${CMAKE_SOURCE_DIR}/tdemdi
 )
 
 link_directories(
@@ -33,28 +33,28 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    kmdichildarea.h kmdichildfrm.h kmdichildfrmcaption.h
-    kmdidefines.h kmdiiterator.h kmdilistiterator.h
-    kmdimainfrm.h kmdinulliterator.h kmditaskbar.h
-    kmdichildview.h kmditoolviewaccessor.h
+    tdemdichildarea.h tdemdichildfrm.h tdemdichildfrmcaption.h
+    tdemdidefines.h tdemdiiterator.h tdemdilistiterator.h
+    tdemdimainfrm.h tdemdinulliterator.h tdemditaskbar.h
+    tdemdichildview.h tdemditoolviewaccessor.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
-#### kmdi #######################################
+#### tdemdi #######################################
 
-set( target kmdi )
+set( target tdemdi )
 
 set( ${target}_SRCS
-  kmdichildarea.cpp kmdichildfrm.cpp kmdichildfrmcaption.cpp
-  kmdichildview.cpp kmdimainfrm.cpp kmditaskbar.cpp
-  kmdidockcontainer.cpp kmditoolviewaccessor.cpp
-  kmdiguiclient.cpp kmdidocumentviewtabwidget.cpp
-  kmdifocuslist.cpp
+  tdemdichildarea.cpp tdemdichildfrm.cpp tdemdichildfrmcaption.cpp
+  tdemdichildview.cpp tdemdimainfrm.cpp tdemditaskbar.cpp
+  tdemdidockcontainer.cpp tdemditoolviewaccessor.cpp
+  tdemdiguiclient.cpp tdemdidocumentviewtabwidget.cpp
+  tdemdifocuslist.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kmdi2-shared
+  LINK tdemdi2-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/tdemdi/Makefile.am b/tdemdi/Makefile.am
new file mode 100644
index 000000000..ec8547375
--- /dev/null
+++ b/tdemdi/Makefile.am
@@ -0,0 +1,20 @@
+SUBDIRS = tdemdi . test
+
+INCLUDES = -I$(top_srcdir)/tdemdi/res -I$(top_srcdir)/tdeutils -I$(top_srcdir) -I$(top_srcdir)/tdemdi $(all_includes)
+
+lib_LTLIBRARIES = libtdemdi.la
+libtdemdi_la_LDFLAGS = $(all_libraries) -version-info 1:0
+libtdemdi_la_LIBADD  = $(LIB_KPARTS) $(top_builddir)/tdeutils/libtdeutils.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_X11)
+
+libtdemdi_la_SOURCES = tdemdichildarea.cpp tdemdichildfrm.cpp tdemdichildfrmcaption.cpp \
+                     tdemdichildview.cpp tdemdimainfrm.cpp tdemditaskbar.cpp tdemdidockcontainer.cpp \
+		     tdemditoolviewaccessor.cpp tdemdiguiclient.cpp tdemdidocumentviewtabwidget.cpp \
+                     tdemdifocuslist.cpp
+
+include_HEADERS = tdemdichildarea.h tdemdichildfrm.h tdemdichildfrmcaption.h tdemdidefines.h \
+                  tdemdiiterator.h tdemdilistiterator.h tdemdimainfrm.h tdemdinulliterator.h \
+                  tdemditaskbar.h tdemdichildview.h tdemditoolviewaccessor.h
+
+METASOURCES = AUTO
+
+include ../admin/Doxyfile.am
diff --git a/kmdi/TODO b/tdemdi/TODO
index b04df59db..b04df59db 100644
--- a/kmdi/TODO
+++ b/tdemdi/TODO
diff --git a/kmdi/res/filenew.xpm b/tdemdi/res/filenew.xpm
index b261800d6..b261800d6 100644
--- a/kmdi/res/filenew.xpm
+++ b/tdemdi/res/filenew.xpm
diff --git a/kmdi/res/kde2_closebutton.xpm b/tdemdi/res/kde2_closebutton.xpm
index 5c05e7149..5c05e7149 100644
--- a/kmdi/res/kde2_closebutton.xpm
+++ b/tdemdi/res/kde2_closebutton.xpm
diff --git a/kmdi/res/kde2_maxbutton.xpm b/tdemdi/res/kde2_maxbutton.xpm
index c8ef81139..c8ef81139 100644
--- a/kmdi/res/kde2_maxbutton.xpm
+++ b/tdemdi/res/kde2_maxbutton.xpm
diff --git a/kmdi/res/kde2_minbutton.xpm b/tdemdi/res/kde2_minbutton.xpm
index 98669195d..98669195d 100644
--- a/kmdi/res/kde2_minbutton.xpm
+++ b/tdemdi/res/kde2_minbutton.xpm
diff --git a/kmdi/res/kde2_restorebutton.xpm b/tdemdi/res/kde2_restorebutton.xpm
index a6e01fcba..a6e01fcba 100644
--- a/kmdi/res/kde2_restorebutton.xpm
+++ b/tdemdi/res/kde2_restorebutton.xpm
diff --git a/kmdi/res/kde2_undockbutton.xpm b/tdemdi/res/kde2_undockbutton.xpm
index 711bf01cc..711bf01cc 100644
--- a/kmdi/res/kde2_undockbutton.xpm
+++ b/tdemdi/res/kde2_undockbutton.xpm
diff --git a/kmdi/res/kde2laptop_closebutton.xpm b/tdemdi/res/kde2laptop_closebutton.xpm
index 6801e4e33..6801e4e33 100644
--- a/kmdi/res/kde2laptop_closebutton.xpm
+++ b/tdemdi/res/kde2laptop_closebutton.xpm
diff --git a/kmdi/res/kde2laptop_closebutton_menu.xpm b/tdemdi/res/kde2laptop_closebutton_menu.xpm
index 9d0712319..9d0712319 100644
--- a/kmdi/res/kde2laptop_closebutton_menu.xpm
+++ b/tdemdi/res/kde2laptop_closebutton_menu.xpm
diff --git a/kmdi/res/kde2laptop_maxbutton.xpm b/tdemdi/res/kde2laptop_maxbutton.xpm
index b8ce6de2c..b8ce6de2c 100644
--- a/kmdi/res/kde2laptop_maxbutton.xpm
+++ b/tdemdi/res/kde2laptop_maxbutton.xpm
diff --git a/kmdi/res/kde2laptop_minbutton.xpm b/tdemdi/res/kde2laptop_minbutton.xpm
index 6bcf76c57..6bcf76c57 100644
--- a/kmdi/res/kde2laptop_minbutton.xpm
+++ b/tdemdi/res/kde2laptop_minbutton.xpm
diff --git a/kmdi/res/kde2laptop_restorebutton.xpm b/tdemdi/res/kde2laptop_restorebutton.xpm
index 803ce6db4..803ce6db4 100644
--- a/kmdi/res/kde2laptop_restorebutton.xpm
+++ b/tdemdi/res/kde2laptop_restorebutton.xpm
diff --git a/kmdi/res/kde2laptop_undockbutton.xpm b/tdemdi/res/kde2laptop_undockbutton.xpm
index 1f23ecaf8..1f23ecaf8 100644
--- a/kmdi/res/kde2laptop_undockbutton.xpm
+++ b/tdemdi/res/kde2laptop_undockbutton.xpm
diff --git a/kmdi/res/kde_closebutton.xpm b/tdemdi/res/kde_closebutton.xpm
index e714359a8..e714359a8 100644
--- a/kmdi/res/kde_closebutton.xpm
+++ b/tdemdi/res/kde_closebutton.xpm
diff --git a/kmdi/res/kde_maxbutton.xpm b/tdemdi/res/kde_maxbutton.xpm
index 2af3bf882..2af3bf882 100644
--- a/kmdi/res/kde_maxbutton.xpm
+++ b/tdemdi/res/kde_maxbutton.xpm
diff --git a/kmdi/res/kde_minbutton.xpm b/tdemdi/res/kde_minbutton.xpm
index c4e609ae7..c4e609ae7 100644
--- a/kmdi/res/kde_minbutton.xpm
+++ b/tdemdi/res/kde_minbutton.xpm
diff --git a/kmdi/res/kde_restorebutton.xpm b/tdemdi/res/kde_restorebutton.xpm
index 4ec185133..4ec185133 100644
--- a/kmdi/res/kde_restorebutton.xpm
+++ b/tdemdi/res/kde_restorebutton.xpm
diff --git a/kmdi/res/kde_undockbutton.xpm b/tdemdi/res/kde_undockbutton.xpm
index de97e9e77..de97e9e77 100644
--- a/kmdi/res/kde_undockbutton.xpm
+++ b/tdemdi/res/kde_undockbutton.xpm
diff --git a/kmdi/res/win_closebutton.xpm b/tdemdi/res/win_closebutton.xpm
index d8be02435..d8be02435 100644
--- a/kmdi/res/win_closebutton.xpm
+++ b/tdemdi/res/win_closebutton.xpm
diff --git a/kmdi/res/win_maxbutton.xpm b/tdemdi/res/win_maxbutton.xpm
index 95e501a82..95e501a82 100644
--- a/kmdi/res/win_maxbutton.xpm
+++ b/tdemdi/res/win_maxbutton.xpm
diff --git a/kmdi/res/win_minbutton.xpm b/tdemdi/res/win_minbutton.xpm
index 1e8787e78..1e8787e78 100644
--- a/kmdi/res/win_minbutton.xpm
+++ b/tdemdi/res/win_minbutton.xpm
diff --git a/kmdi/res/win_restorebutton.xpm b/tdemdi/res/win_restorebutton.xpm
index 87bb5b30f..87bb5b30f 100644
--- a/kmdi/res/win_restorebutton.xpm
+++ b/tdemdi/res/win_restorebutton.xpm
diff --git a/kmdi/res/win_undockbutton.xpm b/tdemdi/res/win_undockbutton.xpm
index 386ebd8a9..386ebd8a9 100644
--- a/kmdi/res/win_undockbutton.xpm
+++ b/tdemdi/res/win_undockbutton.xpm
diff --git a/kmdi/kmdi/CMakeLists.txt b/tdemdi/tdemdi/CMakeLists.txt
index 2314d79ab..7f2b3c7ad 100644
--- a/kmdi/kmdi/CMakeLists.txt
+++ b/tdemdi/tdemdi/CMakeLists.txt
@@ -16,11 +16,11 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/kmdi
+  ${CMAKE_SOURCE_DIR}/tdemdi
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
 link_directories(
@@ -32,12 +32,12 @@ link_directories(
 
 install( FILES
     global.h mainwindow.h toolviewaccessor.h tabwidget.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kmdi )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdemdi )
 
 
-#### kmdi2 ######################################
+#### tdemdi2 ######################################
 
-set( target kmdi2 )
+set( target tdemdi2 )
 
 set( ${target}_SRCS
   mainwindow.cpp dockcontainer.cpp toolviewaccessor.cpp
@@ -47,6 +47,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kutils-shared
+  LINK tdeutils-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/tdemdi/tdemdi/Makefile.am b/tdemdi/tdemdi/Makefile.am
new file mode 100644
index 000000000..82abae6e6
--- /dev/null
+++ b/tdemdi/tdemdi/Makefile.am
@@ -0,0 +1,14 @@
+INCLUDES = -I$(top_srcdir)/tdeutils -I$(top_srcdir) -I$(top_srcdir)/tdemdi $(all_includes)
+
+lib_LTLIBRARIES = libtdemdi2.la
+libtdemdi2_la_LDFLAGS = $(all_libraries) -version-info 1:0
+libtdemdi2_la_LIBADD  = $(LIB_KPARTS) $(top_builddir)/tdeutils/libtdeutils.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
+
+libtdemdi2_la_SOURCES = mainwindow.cpp dockcontainer.cpp toolviewaccessor.cpp guiclient.cpp tabwidget.cpp
+
+tdemdiincludedir = $(includedir)/tdemdi
+tdemdiinclude_HEADERS = global.h mainwindow.h toolviewaccessor.h tabwidget.h
+
+METASOURCES = AUTO
+
+include ../../admin/Doxyfile.am
diff --git a/kmdi/kmdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp
index c9523f230..5dfe82d64 100644
--- a/kmdi/kmdi/dockcontainer.cpp
+++ b/tdemdi/tdemdi/dockcontainer.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 #include <kglobalsettings.h>
 
 #include <kdebug.h>
@@ -38,7 +38,7 @@
 #include <klocale.h>
 
 //TODO: Well, this is already defined in tdeui/kdockwidget.cpp
-static const char* const kmdi_not_close_xpm[]={
+static const char* const tdemdi_not_close_xpm[]={
 "5 5 2 1",
 "# c black",
 ". c None",
@@ -195,7 +195,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
       TQToolTip::add( btn, i18n("Switch between overlap and side by side mode", "Overlap") );
 
       btn->setToggleButton( true );
-      btn->setPixmap( const_cast< const char** >(kmdi_not_close_xpm) );
+      btn->setPixmap( const_cast< const char** >(tdemdi_not_close_xpm) );
       hdr->addButton(btn);
       m_overlapButtons.insert(w,btn);
       btn->setOn(!isOverlapMode());
diff --git a/kmdi/kmdi/dockcontainer.h b/tdemdi/tdemdi/dockcontainer.h
index 9b7478378..9b7478378 100644
--- a/kmdi/kmdi/dockcontainer.h
+++ b/tdemdi/tdemdi/dockcontainer.h
diff --git a/kmdi/kmdi/global.h b/tdemdi/tdemdi/global.h
index 6ea09a93e..6ea09a93e 100644
--- a/kmdi/kmdi/global.h
+++ b/tdemdi/tdemdi/global.h
diff --git a/kmdi/kmdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp
index 64b375ef0..490eb2b43 100644
--- a/kmdi/kmdi/guiclient.cpp
+++ b/tdemdi/tdemdi/guiclient.cpp
@@ -35,7 +35,7 @@
 #include "toolviewaccessor.h"
 #include "toolviewaccessor_p.h"
 
-static const char *actionListName = "show_kmdi_document_tool_view_actions";
+static const char *actionListName = "show_tdemdi_document_tool_view_actions";
 
 static const char *guiDescription = ""
         "<!DOCTYPE kpartgui><kpartgui name=\"KMDIViewActions\">"
@@ -46,7 +46,7 @@ static const char *guiDescription = ""
         "</MenuBar>"
         "</kpartgui>";
 
-static const char *resourceFileName = "kmdiviewactions.rc";
+static const char *resourceFileName = "tdemdiviewactions.rc";
 
 namespace KMDIPrivate
 {
@@ -76,22 +76,22 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
   if (actionCollection()->kaccel()==0)
     actionCollection()->setWidget(mdiMainFrm);
 
-  m_toolMenu=new KActionMenu(i18n("Tool &Views"),actionCollection(),"kmdi_toolview_menu");
+  m_toolMenu=new KActionMenu(i18n("Tool &Views"),actionCollection(),"tdemdi_toolview_menu");
 
-  m_gotoToolDockMenu=new KActionMenu(i18n("Tool &Docks"),actionCollection(),"kmdi_tooldock_menu");
+  m_gotoToolDockMenu=new KActionMenu(i18n("Tool &Docks"),actionCollection(),"tdemdi_tooldock_menu");
   m_gotoToolDockMenu->insert(new KAction(i18n("Switch Top Dock"),ALT+CTRL+SHIFT+Key_T,this,TQT_SIGNAL(toggleTop()),
-  actionCollection(),"kmdi_activate_top"));
+  actionCollection(),"tdemdi_activate_top"));
   m_gotoToolDockMenu->insert(new KAction(i18n("Switch Left Dock"),ALT+CTRL+SHIFT+Key_L,this,TQT_SIGNAL(toggleLeft()),
-  actionCollection(),"kmdi_activate_left"));
+  actionCollection(),"tdemdi_activate_left"));
   m_gotoToolDockMenu->insert(new KAction(i18n("Switch Right Dock"),ALT+CTRL+SHIFT+Key_R,this,TQT_SIGNAL(toggleRight()),
-  actionCollection(),"kmdi_activate_right"));
+  actionCollection(),"tdemdi_activate_right"));
   m_gotoToolDockMenu->insert(new KAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQT_SIGNAL(toggleBottom()),
-  actionCollection(),"kmdi_activate_bottom"));
-  m_gotoToolDockMenu->insert(new KActionSeparator(actionCollection(),"kmdi_goto_menu_separator"));
+  actionCollection(),"tdemdi_activate_bottom"));
+  m_gotoToolDockMenu->insert(new KActionSeparator(actionCollection(),"tdemdi_goto_menu_separator"));
   m_gotoToolDockMenu->insert(new KAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(prevToolViewInDock()),
-  actionCollection(),"kmdi_prev_toolview"));
+  actionCollection(),"tdemdi_prev_toolview"));
   m_gotoToolDockMenu->insert(new KAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(nextToolViewInDock()),
-  actionCollection(),"kmdi_next_toolview"));
+  actionCollection(),"tdemdi_next_toolview"));
 
   actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() );
 }
@@ -135,7 +135,7 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva)
 {
   kdDebug(760)<<"*****void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva)*****"<<endl;
 
-  TQString aname = TQString("kmdi_toolview_") + mtva->wrappedWidget()->name();
+  TQString aname = TQString("tdemdi_toolview_") + mtva->wrappedWidget()->name();
 
   // try to read the action shortcut
   KShortcut sc;
diff --git a/kmdi/kmdi/guiclient.h b/tdemdi/tdemdi/guiclient.h
index c3784fe6e..4d1609ce6 100644
--- a/kmdi/kmdi/guiclient.h
+++ b/tdemdi/tdemdi/guiclient.h
@@ -26,7 +26,7 @@
 #include <kxmlguiclient.h>
 #include <kaction.h>
 
-#include <kmdi/global.h>
+#include <tdemdi/global.h>
 
 class KMainWindow;
 class KToolBar;
diff --git a/kmdi/kmdi/mainwindow.cpp b/tdemdi/tdemdi/mainwindow.cpp
index 358791ab0..358791ab0 100644
--- a/kmdi/kmdi/mainwindow.cpp
+++ b/tdemdi/tdemdi/mainwindow.cpp
diff --git a/kmdi/kmdi/mainwindow.h b/tdemdi/tdemdi/mainwindow.h
index 953d248de..0916cb908 100644
--- a/kmdi/kmdi/mainwindow.h
+++ b/tdemdi/tdemdi/mainwindow.h
@@ -42,7 +42,7 @@
 #ifndef _KMDI_MAINWINDOW_H_
 #define _KMDI_MAINWINDOW_H_
 
-#include <kparts/dockmainwindow.h>
+#include <tdeparts/dockmainwindow.h>
 #include <kmenubar.h>
 #include <kpopupmenu.h>
 
@@ -51,12 +51,12 @@
 #include <tqapplication.h>
 #include <tqguardedptr.h>
 
-#include <kmdi/global.h>
+#include <tdemdi/global.h>
 
 class TQPopupMenu;
 class TQMenuBar;
 
-#include <kmdi/toolviewaccessor.h>
+#include <tdemdi/toolviewaccessor.h>
 
 namespace KMDIPrivate {
   class MainWindowPrivate;
diff --git a/kmdi/kmdi/tabwidget.cpp b/tdemdi/tdemdi/tabwidget.cpp
index 2d9603bf5..2d9603bf5 100644
--- a/kmdi/kmdi/tabwidget.cpp
+++ b/tdemdi/tdemdi/tabwidget.cpp
diff --git a/kmdi/kmdi/tabwidget.h b/tdemdi/tdemdi/tabwidget.h
index 61f9e7d32..992aa657d 100644
--- a/kmdi/kmdi/tabwidget.h
+++ b/tdemdi/tdemdi/tabwidget.h
@@ -43,7 +43,7 @@
 #define _KMDI_TABWIDGET_H_
 
 #include <ktabwidget.h>
-#include <kmdi/global.h>
+#include <tdemdi/global.h>
 
 namespace KMDIPrivate
 {
diff --git a/kmdi/kmdi/toolviewaccessor.cpp b/tdemdi/tdemdi/toolviewaccessor.cpp
index c0d191ff4..c0d191ff4 100644
--- a/kmdi/kmdi/toolviewaccessor.cpp
+++ b/tdemdi/tdemdi/toolviewaccessor.cpp
diff --git a/kmdi/kmdi/toolviewaccessor.h b/tdemdi/tdemdi/toolviewaccessor.h
index 75d9a863e..75d9a863e 100644
--- a/kmdi/kmdi/toolviewaccessor.h
+++ b/tdemdi/tdemdi/toolviewaccessor.h
diff --git a/kmdi/kmdi/toolviewaccessor_p.h b/tdemdi/tdemdi/toolviewaccessor_p.h
index 71ffb286a..71ffb286a 100644
--- a/kmdi/kmdi/toolviewaccessor_p.h
+++ b/tdemdi/tdemdi/toolviewaccessor_p.h
diff --git a/kmdi/kmdichildarea.cpp b/tdemdi/tdemdichildarea.cpp
index 342fbdd9c..ed5b0e009 100644
--- a/kmdi/kmdichildarea.cpp
+++ b/tdemdi/tdemdichildarea.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildarea.cpp
+//    filename             : tdemdichildarea.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -25,10 +25,10 @@
 //
 //----------------------------------------------------------------------------
 
-#include "kmdichildarea.h"
-#include "kmdichildarea.moc"
+#include "tdemdichildarea.h"
+#include "tdemdichildarea.moc"
 
-#include "kmdidefines.h"
+#include "tdemdidefines.h"
 
 #include <kconfig.h>
 #include <kdebug.h>
@@ -46,7 +46,7 @@
 //============ KMdiChildArea ============//
 
 KMdiChildArea::KMdiChildArea( TQWidget *parent )
-		: TQFrame( parent, "kmdi_childarea" )
+		: TQFrame( parent, "tdemdi_childarea" )
 {
 	setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
 	m_captionFont = TQFont();
diff --git a/kmdi/kmdichildarea.h b/tdemdi/tdemdichildarea.h
index 0a6076076..9d8f33f51 100644
--- a/kmdi/kmdichildarea.h
+++ b/tdemdi/tdemdichildarea.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildarea.h
+//    filename             : tdemdichildarea.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -31,8 +31,8 @@
 #include <tqframe.h>
 #include <tqptrlist.h>
 
-#include "kmdichildfrm.h"
-#include "kmdichildview.h"
+#include "tdemdichildfrm.h"
+#include "tdemdichildview.h"
 
 class KMdiChildAreaPrivate;
 
diff --git a/kmdi/kmdichildfrm.cpp b/tdemdi/tdemdichildfrm.cpp
index 449c8befe..cbc4f4b29 100644
--- a/kmdi/kmdichildfrm.cpp
+++ b/tdemdi/tdemdichildfrm.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildfrm.cpp
+//    filename             : tdemdichildfrm.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -27,13 +27,13 @@
 //
 //----------------------------------------------------------------------------
 
-#include "kmdichildfrm.h"
-#include "kmdichildfrm.moc"
+#include "tdemdichildfrm.h"
+#include "tdemdichildfrm.moc"
 
-#include "kmdidefines.h"
-#include "kmdichildfrmcaption.h"
-#include "kmdichildarea.h"
-#include "kmdimainfrm.h"
+#include "tdemdidefines.h"
+#include "tdemdichildfrmcaption.h"
+#include "tdemdichildarea.h"
+#include "tdemdimainfrm.h"
 
 #include <tqpainter.h>
 #include <tqapplication.h>
@@ -99,7 +99,7 @@ void KMdiWin32IconButton::mousePressEvent( TQMouseEvent* )
 //============ KMdiChildFrm ============//
 
 KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
-	: TQFrame( parent, "kmdi_childfrm" )
+	: TQFrame( parent, "tdemdi_childfrm" )
 	, m_pClient( 0L )
 	, m_pManager( 0L )
 	, m_pCaption( 0L )
@@ -131,12 +131,12 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
 
 	m_pManager = parent;
 
-	m_pWinIcon = new KMdiWin32IconButton( m_pCaption, "kmdi_iconbutton_icon" );
-	m_pUnixIcon = new TQToolButton( m_pCaption, "kmdi_toolbutton_icon" );
-	m_pMinimize = new TQToolButton( m_pCaption, "kmdi_toolbutton_min" );
-	m_pMaximize = new TQToolButton( m_pCaption, "kmdi_toolbutton_max" );
-	m_pClose = new TQToolButton( m_pCaption, "kmdi_toolbutton_close" );
-	m_pUndock = new TQToolButton( m_pCaption, "kmdi_toolbutton_undock" );
+	m_pWinIcon = new KMdiWin32IconButton( m_pCaption, "tdemdi_iconbutton_icon" );
+	m_pUnixIcon = new TQToolButton( m_pCaption, "tdemdi_toolbutton_icon" );
+	m_pMinimize = new TQToolButton( m_pCaption, "tdemdi_toolbutton_min" );
+	m_pMaximize = new TQToolButton( m_pCaption, "tdemdi_toolbutton_max" );
+	m_pClose = new TQToolButton( m_pCaption, "tdemdi_toolbutton_close" );
+	m_pUndock = new TQToolButton( m_pCaption, "tdemdi_toolbutton_undock" );
 
 	TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) );
 	TQObject::connect( m_pMaximize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( maximizePressed() ) );
diff --git a/kmdi/kmdichildfrm.h b/tdemdi/tdemdichildfrm.h
index 0fe2cd2b2..79a7dd821 100644
--- a/kmdi/kmdichildfrm.h
+++ b/tdemdi/tdemdichildfrm.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildfrm.h
+//    filename             : tdemdichildfrm.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -37,7 +37,7 @@
 
 #include <tqdict.h>
 
-#include "kmdichildfrmcaption.h"
+#include "tdemdichildfrmcaption.h"
 
 class KMdiChildArea;
 class KMdiChildView;
@@ -61,7 +61,7 @@ signals:
 };
 
 //==============================================================================
-/* some special events, see kmdidefines.h
+/* some special events, see tdemdidefines.h
 */ 
 //------------------------------------------------------------------------------
 /**
diff --git a/kmdi/kmdichildfrmcaption.cpp b/tdemdi/tdemdichildfrmcaption.cpp
index 9ebbefb34..cc1a4a187 100644
--- a/kmdi/kmdichildfrmcaption.cpp
+++ b/tdemdi/tdemdichildfrmcaption.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildfrmcaption.cpp
+//    filename             : tdemdichildfrmcaption.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -25,8 +25,8 @@
 //
 //----------------------------------------------------------------------------
 
-#include "kmdichildfrmcaption.h"
-#include "kmdichildfrmcaption.moc"
+#include "tdemdichildfrmcaption.h"
+#include "tdemdichildfrmcaption.moc"
 
 #include <tqpainter.h>
 #include <tqapplication.h>
@@ -34,10 +34,10 @@
 #include <tqtoolbutton.h>
 #include <tqpopupmenu.h>
 
-#include "kmdidefines.h"
-#include "kmdichildfrm.h"
-#include "kmdichildarea.h"
-#include "kmdimainfrm.h"
+#include "tdemdidefines.h"
+#include "tdemdichildfrm.h"
+#include "tdemdichildarea.h"
+#include "tdemdimainfrm.h"
 #include <klocale.h>
 #include <iostream>
 
@@ -66,7 +66,7 @@
 //============== KMdiChildFrmCaption =============//
 
 KMdiChildFrmCaption::KMdiChildFrmCaption( KMdiChildFrm *parent )
-		: TQWidget( parent, "kmdi_childfrmcaption" )
+		: TQWidget( parent, "tdemdi_childfrmcaption" )
 {
 	m_szCaption = i18n( "Unnamed" );
 	m_bActive = false;
diff --git a/kmdi/kmdichildfrmcaption.h b/tdemdi/tdemdichildfrmcaption.h
index 0a209bcd9..d9f0bb1b2 100644
--- a/kmdi/kmdichildfrmcaption.h
+++ b/tdemdi/tdemdichildfrmcaption.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildfrmcaption.h
+//    filename             : tdemdichildfrmcaption.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -29,7 +29,7 @@
 
 #include <tqwidget.h>
 
-#include "kmdidefines.h"
+#include "tdemdidefines.h"
 
 class KMdiChildFrm;
 
diff --git a/kmdi/kmdichildview.cpp b/tdemdi/tdemdichildview.cpp
index ad5328cc9..1c3f521f7 100644
--- a/kmdi/kmdichildview.cpp
+++ b/tdemdi/tdemdichildview.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildview.cpp
+//    filename             : tdemdichildview.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -29,15 +29,15 @@
 //
 //----------------------------------------------------------------------------
 
-#include "kmdichildview.h"
-#include "kmdichildview.moc"
+#include "tdemdichildview.h"
+#include "tdemdichildview.moc"
 
 #include <tqdatetime.h>
 #include <tqobjectlist.h>
 
-#include "kmdimainfrm.h"
-#include "kmdichildfrm.h"
-#include "kmdidefines.h"
+#include "tdemdimainfrm.h"
+#include "tdemdichildfrm.h"
+#include "tdemdidefines.h"
 #include <kdebug.h>
 #include <klocale.h>
 #include <tqiconset.h>
diff --git a/kmdi/kmdichildview.h b/tdemdi/tdemdichildview.h
index 11e74259e..04d784be3 100644
--- a/kmdi/kmdichildview.h
+++ b/tdemdi/tdemdichildview.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildview.h
+//    filename             : tdemdichildview.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -37,7 +37,7 @@
 #include <tqapplication.h>
 #include <tqdatetime.h>
 
-#include "kmdichildfrm.h"
+#include "tdemdichildfrm.h"
 
 class KMdiChildViewPrivate;
 
diff --git a/kmdi/kmdidefines.h b/tdemdi/tdemdidefines.h
index 8673876a5..13beb0b51 100644
--- a/kmdi/kmdidefines.h
+++ b/tdemdi/tdemdidefines.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdidefines.h
+//    filename             : tdemdidefines.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
diff --git a/kmdi/kmdidockcontainer.cpp b/tdemdi/tdemdidockcontainer.cpp
index af086ee51..3eb3bce44 100644
--- a/kmdi/kmdidockcontainer.cpp
+++ b/tdemdi/tdemdidockcontainer.cpp
@@ -17,9 +17,9 @@
  Boston, MA 02110-1301, USA.
 */
 
-#include "kmdimainfrm.h"
-#include "kmdidockcontainer.h"
-#include "kmdidockcontainer.moc"
+#include "tdemdimainfrm.h"
+#include "tdemdidockcontainer.h"
+#include "tdemdidockcontainer.moc"
 
 #include "kdockwidget_private.h"
 
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 #include <kglobalsettings.h>
 
 #include <kdebug.h>
@@ -37,7 +37,7 @@
 #include <klocale.h>
 
 //TODO: Well, this is already defined in tdeui/kdockwidget.cpp
-static const char* const kmdi_not_close_xpm[] =
+static const char* const tdemdi_not_close_xpm[] =
     {
         "5 5 2 1",
         "# c black",
@@ -218,7 +218,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
 			TQToolTip::add( btn, i18n( "Switch between overlap and side by side mode", "Overlap" ) );
 
 			btn->setToggleButton( true );
-			btn->setPixmap( const_cast< const char** >( kmdi_not_close_xpm ) );
+			btn->setPixmap( const_cast< const char** >( tdemdi_not_close_xpm ) );
 			hdr->addButton( btn );
 			m_overlapButtons.insert( w, btn );
 			btn->setOn( !isOverlapMode() );
diff --git a/kmdi/kmdidockcontainer.h b/tdemdi/tdemdidockcontainer.h
index 8dfe6664b..8dfe6664b 100644
--- a/kmdi/kmdidockcontainer.h
+++ b/tdemdi/tdemdidockcontainer.h
diff --git a/kmdi/kmdidocumentviewtabwidget.cpp b/tdemdi/tdemdidocumentviewtabwidget.cpp
index 90b618e47..dcfa60976 100644
--- a/kmdi/kmdidocumentviewtabwidget.cpp
+++ b/tdemdi/tdemdidocumentviewtabwidget.cpp
@@ -11,7 +11,7 @@
 
 #include <ktabbar.h>
 #include <kpopupmenu.h>
-#include "kmdidocumentviewtabwidget.h"
+#include "tdemdidocumentviewtabwidget.h"
 
 KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const char* name ) : KTabWidget( parent, name )
 {
@@ -141,7 +141,7 @@ KMdi::TabWidgetVisibility KMdiDocumentViewTabWidget::tabWidgetVisibility( )
 
 
 #ifndef NO_INCLUDE_MOCFILES
-#include "kmdidocumentviewtabwidget.moc"
+#include "tdemdidocumentviewtabwidget.moc"
 #endif
 
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kmdi/kmdidocumentviewtabwidget.h b/tdemdi/tdemdidocumentviewtabwidget.h
index d731a9a03..668ef5b87 100644
--- a/kmdi/kmdidocumentviewtabwidget.h
+++ b/tdemdi/tdemdidocumentviewtabwidget.h
@@ -11,7 +11,7 @@
 #define _KMDI_DOCUMENT_VIEW_TAB_WIDGET_H_
 
 #include <ktabwidget.h>
-#include <kmdidefines.h>
+#include <tdemdidefines.h>
 
 class KPopupMenu;
 
diff --git a/kmdi/kmdifocuslist.cpp b/tdemdi/tdemdifocuslist.cpp
index e8f71ff25..a4592e38b 100644
--- a/kmdi/kmdifocuslist.cpp
+++ b/tdemdi/tdemdifocuslist.cpp
@@ -16,8 +16,8 @@
   Boston, MA 02110-1301, USA.
 */
 
-#include "kmdifocuslist.h"
-#include "kmdifocuslist.moc"
+#include "tdemdifocuslist.h"
+#include "tdemdifocuslist.moc"
 #include <tqobjectlist.h>
 #include <kdebug.h>
 
diff --git a/kmdi/kmdifocuslist.h b/tdemdi/tdemdifocuslist.h
index 8de19bf33..8de19bf33 100644
--- a/kmdi/kmdifocuslist.h
+++ b/tdemdi/tdemdifocuslist.h
diff --git a/kmdi/kmdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp
index c2c34c55f..1bb00faf1 100644
--- a/kmdi/kmdiguiclient.cpp
+++ b/tdemdi/tdemdiguiclient.cpp
@@ -17,8 +17,8 @@
   Boston, MA 02110-1301, USA.
 */
 
-#include "kmdiguiclient.h"
-#include "kmdiguiclient.moc"
+#include "tdemdiguiclient.h"
+#include "tdemdiguiclient.moc"
 
 #include <tqpopupmenu.h>
 #include <kapplication.h>
@@ -32,12 +32,12 @@
 #include <kdebug.h>
 #include <kdockwidget.h>
 #include <tdeversion.h>
-#include "kmdimainfrm.h"
-#include "kmditoolviewaccessor.h"
-#include "kmditoolviewaccessor_p.h"
+#include "tdemdimainfrm.h"
+#include "tdemditoolviewaccessor.h"
+#include "tdemditoolviewaccessor_p.h"
 namespace
 {
-const char *actionListName = "show_kmdi_document_tool_view_actions";
+const char *actionListName = "show_tdemdi_document_tool_view_actions";
 
 const char *guiDescription = ""
                              "<!DOCTYPE kpartgui><kpartgui name=\"KMDIViewActions\">"
@@ -48,7 +48,7 @@ const char *guiDescription = ""
                              "</MenuBar>"
                              "</kpartgui>";
 
-const char *resourceFileName = "kmdiviewactions.rc";
+const char *resourceFileName = "tdemdiviewactions.rc";
 
 }
 
@@ -136,7 +136,7 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 
 	if ( actionCollection() ->kaccel() == 0 )
 		actionCollection() ->setWidget( mdiMainFrm );
-	m_toolMenu = new KActionMenu( i18n( "Tool &Views" ), actionCollection(), "kmdi_toolview_menu" );
+	m_toolMenu = new KActionMenu( i18n( "Tool &Views" ), actionCollection(), "tdemdi_toolview_menu" );
 	if ( showMDIModeAction )
 	{
 		m_mdiModeAction = new KSelectAction( i18n( "MDI Mode" ), 0, actionCollection() );
@@ -151,20 +151,20 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 	connect( m_mdiMainFrm, TQT_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ),
 	         this, TQT_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) );
 
-	m_gotoToolDockMenu = new KActionMenu( i18n( "Tool &Docks" ), actionCollection(), "kmdi_tooldock_menu" );
+	m_gotoToolDockMenu = new KActionMenu( i18n( "Tool &Docks" ), actionCollection(), "tdemdi_tooldock_menu" );
 	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, this, TQT_SIGNAL( toggleTop() ),
-	                            actionCollection(), "kmdi_activate_top" ) );
+	                            actionCollection(), "tdemdi_activate_top" ) );
 	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, this, TQT_SIGNAL( toggleLeft() ),
-	                            actionCollection(), "kmdi_activate_left" ) );
+	                            actionCollection(), "tdemdi_activate_left" ) );
 	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, this, TQT_SIGNAL( toggleRight() ),
-	                            actionCollection(), "kmdi_activate_right" ) );
+	                            actionCollection(), "tdemdi_activate_right" ) );
 	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQT_SIGNAL( toggleBottom() ),
-	                            actionCollection(), "kmdi_activate_bottom" ) );
-	m_gotoToolDockMenu->insert( new KActionSeparator( actionCollection(), "kmdi_goto_menu_separator" ) );
+	                            actionCollection(), "tdemdi_activate_bottom" ) );
+	m_gotoToolDockMenu->insert( new KActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) );
 	m_gotoToolDockMenu->insert( new KAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ),
-	                            actionCollection(), "kmdi_prev_toolview" ) );
+	                            actionCollection(), "tdemdi_prev_toolview" ) );
 	m_gotoToolDockMenu->insert( new KAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ),
-	                            actionCollection(), "kmdi_next_toolview" ) );
+	                            actionCollection(), "tdemdi_next_toolview" ) );
 
 	actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() );
 }
@@ -247,7 +247,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
 {
 	kdDebug( 760 ) << "*****void KMDIGUIClient::addToolView(KMdiToolViewAccessor* mtva)*****" << endl;
 	//	kdDebug()<<"name: "<<mtva->wrappedWidget()->name()<<endl;
-	TQString aname = TQString( "kmdi_toolview_" ) + mtva->wrappedWidget() ->name();
+	TQString aname = TQString( "tdemdi_toolview_" ) + mtva->wrappedWidget() ->name();
 
 	// try to read the action shortcut
 	KShortcut sc;
diff --git a/kmdi/kmdiguiclient.h b/tdemdi/tdemdiguiclient.h
index 9c9634314..ba899a2a0 100644
--- a/kmdi/kmdiguiclient.h
+++ b/tdemdi/tdemdiguiclient.h
@@ -23,7 +23,7 @@
 #include <tqguardedptr.h>
 #include <kxmlguiclient.h>
 #include <kaction.h>
-#include "kmdidefines.h"
+#include "tdemdidefines.h"
 
 class KMainWindow;
 class KToolBar;
diff --git a/kmdi/kmdiiterator.h b/tdemdi/tdemdiiterator.h
index 0b0ec235a..59949529d 100644
--- a/kmdi/kmdiiterator.h
+++ b/tdemdi/tdemdiiterator.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdiiterator.h
+//    filename             : tdemdiiterator.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
diff --git a/kmdi/kmdilistiterator.h b/tdemdi/tdemdilistiterator.h
index 2bc5d6bc0..9c6980783 100644
--- a/kmdi/kmdilistiterator.h
+++ b/tdemdi/tdemdilistiterator.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdilistiterator.h
+//    filename             : tdemdilistiterator.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -27,7 +27,7 @@
 #ifndef _KMDILISTITERATOR_H_
 #define _KMDILISTITERATOR_H_
 
-#include <kmdiiterator.h>
+#include <tdemdiiterator.h>
 
 template <class I>
 class TQPtrList;
diff --git a/kmdi/kmdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp
index f101ff700..05bb7a4ca 100644
--- a/kmdi/kmdimainfrm.cpp
+++ b/tdemdi/tdemdimainfrm.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdimainfrm.cpp
+//    filename             : tdemdimainfrm.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -52,7 +52,7 @@
 #include <kstdaccel.h>
 
 #include <kiconloader.h>
-#include <kmdidockcontainer.h>
+#include <tdemdidockcontainer.h>
 
 
 #include <tqtoolbutton.h>
@@ -64,16 +64,16 @@
 #include <tqmap.h>
 #include <tqvaluelist.h>
 
-#include "kmdimainfrm.h"
-#include "kmditaskbar.h"
-#include "kmdichildfrm.h"
-#include "kmdichildarea.h"
-#include "kmdichildview.h"
-#include "kmdidockcontainer.h"
-#include "kmditoolviewaccessor_p.h"
-#include "kmdifocuslist.h"
-#include "kmdidocumentviewtabwidget.h"
-#include "kmdiguiclient.h"
+#include "tdemdimainfrm.h"
+#include "tdemditaskbar.h"
+#include "tdemdichildfrm.h"
+#include "tdemdichildarea.h"
+#include "tdemdichildview.h"
+#include "tdemdidockcontainer.h"
+#include "tdemditoolviewaccessor_p.h"
+#include "tdemdifocuslist.h"
+#include "tdemdidocumentviewtabwidget.h"
+#include "tdemdiguiclient.h"
 
 #include "win_undockbutton.xpm"
 #include "win_minbutton.xpm"
@@ -1418,22 +1418,22 @@ void KMdiMainFrm::switchToToplevelMode()
    
 	//FIXME although i don't know what to fix
 	// 5. show the child views again
-	TQPtrListIterator<KMdiChildView> kmdicvit( *m_pDocumentViews );
-	for ( kmdicvit.toFirst(); ( *kmdicvit ); ++kmdicvit )
+	TQPtrListIterator<KMdiChildView> tdemdicvit( *m_pDocumentViews );
+	for ( tdemdicvit.toFirst(); ( *tdemdicvit ); ++tdemdicvit )
 	{
 #ifdef Q_WS_X11
-		XSetTransientForHint( tqt_xdisplay(), ( *kmdicvit )->winId(), winId() );
+		XSetTransientForHint( tqt_xdisplay(), ( *tdemdicvit )->winId(), winId() );
 #endif
-		( *kmdicvit )->show();
+		( *tdemdicvit )->show();
 	}
 
 	// 6.) reset all memorized positions of the undocked ones and show them again
 	TQValueList<TQRect>::Iterator qvlqrit;
 	TQValueList<TQRect>::Iterator qvlEnd = positionList.end();
-	for ( kmdicvit.toFirst(), qvlqrit = positionList.begin() ; ( *kmdicvit ) && qvlqrit != qvlEnd; ++kmdicvit, ++qvlqrit )
+	for ( tdemdicvit.toFirst(), qvlqrit = positionList.begin() ; ( *tdemdicvit ) && qvlqrit != qvlEnd; ++tdemdicvit, ++qvlqrit )
 	{
-		( *kmdicvit )->setGeometry( ( *qvlqrit ) );
-		( *kmdicvit )->show();
+		( *tdemdicvit )->setGeometry( ( *qvlqrit ) );
+		( *tdemdicvit )->show();
 	}
 
 	m_pDockbaseAreaOfDocumentViews->setDockSite( KDockWidget::DockNone );
@@ -2931,7 +2931,7 @@ KTabWidget * KMdiMainFrm::tabWidget() const
 	return m_documentTabWidget;
 }
 
-#include "kmdimainfrm.moc"
+#include "tdemdimainfrm.moc"
 
 // vim: ts=2 sw=2 et
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kmdi/kmdimainfrm.h b/tdemdi/tdemdimainfrm.h
index af2134a39..08dc83db9 100644
--- a/kmdi/kmdimainfrm.h
+++ b/tdemdi/tdemdimainfrm.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdimainfrm.h
+//    filename             : tdemdimainfrm.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -31,7 +31,7 @@
 #ifndef _KMDIMAINFRM_H_
 #define _KMDIMAINFRM_H_
 
-#include <kparts/dockmainwindow.h>
+#include <tdeparts/dockmainwindow.h>
 #include <kmenubar.h>
 #include <kpopupmenu.h>
 
@@ -41,13 +41,13 @@
 #include <tqdom.h>
 #include <tqguardedptr.h>
 
-#include "kmditaskbar.h"
-#include "kmdichildarea.h"
-#include "kmdichildview.h"
-#include "kmdiiterator.h"
-#include "kmdilistiterator.h"
-#include "kmdinulliterator.h"
-#include "kmditoolviewaccessor.h"
+#include "tdemditaskbar.h"
+#include "tdemdichildarea.h"
+#include "tdemdichildview.h"
+#include "tdemdiiterator.h"
+#include "tdemdilistiterator.h"
+#include "tdemdinulliterator.h"
+#include "tdemditoolviewaccessor.h"
 
 class TQTimer;
 class TQPopupMenu;
diff --git a/kmdi/kmdinulliterator.h b/tdemdi/tdemdinulliterator.h
index ffa375d36..6eb36ab16 100644
--- a/kmdi/kmdinulliterator.h
+++ b/tdemdi/tdemdinulliterator.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdinulliterator.h
+//    filename             : tdemdinulliterator.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -27,7 +27,7 @@
 #ifndef _KMDINULLITERATOR_H_
 #define _KMDINULLITERATOR_H_
 
-#include "kmdiiterator.h"
+#include "tdemdiiterator.h"
 
 template <class Item>
 class KMdiNullIterator : public KMdiIterator<Item> {
diff --git a/kmdi/kmditaskbar.cpp b/tdemdi/tdemditaskbar.cpp
index 018e2b38e..98e479f1e 100644
--- a/kmdi/kmditaskbar.cpp
+++ b/tdemdi/tdemditaskbar.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmditaskbar.cpp
+//    filename             : tdemditaskbar.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -30,12 +30,12 @@
 #undef None
 #endif
 
-#include "kmditaskbar.h"
-#include "kmditaskbar.moc"
+#include "tdemditaskbar.h"
+#include "tdemditaskbar.moc"
 
-#include "kmdimainfrm.h"
-#include "kmdichildview.h"
-#include "kmdidefines.h"
+#include "tdemdimainfrm.h"
+#include "tdemdichildview.h"
+#include "tdemdidefines.h"
 
 #include <tqtooltip.h>
 #include <tqlabel.h>
diff --git a/kmdi/kmditaskbar.h b/tdemdi/tdemditaskbar.h
index 35393b733..ec968a75d 100644
--- a/kmdi/kmditaskbar.h
+++ b/tdemdi/tdemditaskbar.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmditaskbar.h
+//    filename             : tdemditaskbar.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -34,7 +34,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
-#include "kmdidefines.h"
+#include "tdemdidefines.h"
 
 class KMdiMainFrm;
 class KMdiChildView;
diff --git a/kmdi/kmditoolviewaccessor.cpp b/tdemdi/tdemditoolviewaccessor.cpp
index c85921a27..3baaafd07 100644
--- a/kmdi/kmditoolviewaccessor.cpp
+++ b/tdemdi/tdemditoolviewaccessor.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmditoolviewaccessor.h
+//    filename             : tdemditoolviewaccessor.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -22,12 +22,12 @@
 #ifndef NO_KDE
 # include <kdebug.h>
 #endif
-#include "kmditoolviewaccessor_p.h"
-#include "kmdiguiclient.h"
-#include "kmdimainfrm.h"
+#include "tdemditoolviewaccessor_p.h"
+#include "tdemdiguiclient.h"
+#include "tdemdimainfrm.h"
 
-#include "kmditoolviewaccessor.h"
-#include "kmditoolviewaccessor_p.h"
+#include "tdemditoolviewaccessor.h"
+#include "tdemditoolviewaccessor_p.h"
 
 KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *parent, TQWidget *widgetToWrap, const TQString& tabToolTip, const TQString& tabCaption )
 		: TQObject( parent )
@@ -263,7 +263,7 @@ void KMdiToolViewAccessor::show()
 
 
 #ifndef NO_INCLUDE_MOCFILES
-#include "kmditoolviewaccessor.moc"
+#include "tdemditoolviewaccessor.moc"
 #endif 
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
 
diff --git a/kmdi/kmditoolviewaccessor.h b/tdemdi/tdemditoolviewaccessor.h
index a58375ec8..8c1448cae 100644
--- a/kmdi/kmditoolviewaccessor.h
+++ b/tdemdi/tdemditoolviewaccessor.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmditoolviewaccessor.h
+//    filename             : tdemditoolviewaccessor.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
diff --git a/kmdi/kmditoolviewaccessor_p.h b/tdemdi/tdemditoolviewaccessor_p.h
index ecbaa76a3..81e770e85 100644
--- a/kmdi/kmditoolviewaccessor_p.h
+++ b/tdemdi/tdemditoolviewaccessor_p.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmditoolviewaccessor_p.h
+//    filename             : tdemditoolviewaccessor_p.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
diff --git a/kmdi/test/Makefile.am b/tdemdi/test/Makefile.am
index 73e0b8a13..4a5b21458 100644
--- a/kmdi/test/Makefile.am
+++ b/tdemdi/test/Makefile.am
@@ -1,10 +1,10 @@
 check_PROGRAMS = kfourchildren
 METASOURCES = AUTO
 
-INCLUDES = -I$(top_srcdir)/kmdi -I.. $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdemdi -I.. $(all_includes)
 
 kfourchildren_SOURCES = hello.cpp main.cpp mainwidget.cpp
 kfourchildren_LDFLAGS = -no-undefined $(all_libraries)
-kfourchildren_LDADD = $(top_builddir)/kmdi/libkmdi.la \
-	$(top_builddir)/kutils/libkutils.la
+kfourchildren_LDADD = $(top_builddir)/tdemdi/libtdemdi.la \
+	$(top_builddir)/tdeutils/libtdeutils.la
 
diff --git a/kmdi/test/README b/tdemdi/test/README
index cf3902083..cf3902083 100644
--- a/kmdi/test/README
+++ b/tdemdi/test/README
diff --git a/kmdi/test/hello.cpp b/tdemdi/test/hello.cpp
index d92233ea6..d92233ea6 100644
--- a/kmdi/test/hello.cpp
+++ b/tdemdi/test/hello.cpp
diff --git a/kmdi/test/hello.h b/tdemdi/test/hello.h
index 808d25b90..b6ce589a0 100644
--- a/kmdi/test/hello.h
+++ b/tdemdi/test/hello.h
@@ -12,7 +12,7 @@
 #define HELLO_H
 
 #include <tqstring.h>
-#include <kmdichildview.h>
+#include <tdemdichildview.h>
 
 class TQWidget;
 class TQMouseEvent;
diff --git a/kmdi/test/main.cpp b/tdemdi/test/main.cpp
index 4f14a410c..4f14a410c 100644
--- a/kmdi/test/main.cpp
+++ b/tdemdi/test/main.cpp
diff --git a/kmdi/test/mainwidget.cpp b/tdemdi/test/mainwidget.cpp
index e8aa8da1d..fd166ee95 100644
--- a/kmdi/test/mainwidget.cpp
+++ b/tdemdi/test/mainwidget.cpp
@@ -21,8 +21,8 @@
 #include <tqmultilineedit.h>
 #include <tqlistview.h>
 #include <tqfile.h>
-#include <kmdimainfrm.h>
-#include <kmditoolviewaccessor.h>
+#include <tdemdimainfrm.h>
+#include <tdemditoolviewaccessor.h>
 
 #include "mainwidget.h"
 
diff --git a/kmdi/test/mainwidget.h b/tdemdi/test/mainwidget.h
index 953512005..74ec7a654 100644
--- a/kmdi/test/mainwidget.h
+++ b/tdemdi/test/mainwidget.h
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqdom.h>
-#include <kmdimainfrm.h>
+#include <tdemdimainfrm.h>
 
 /**
   *@author Falk Brettschneider
diff --git a/kparts/AUTHORS b/tdeparts/AUTHORS
index 7c8680a5a..7c8680a5a 100644
--- a/kparts/AUTHORS
+++ b/tdeparts/AUTHORS
diff --git a/kparts/CMakeLists.txt b/tdeparts/CMakeLists.txt
index aeda0cb81..267d64655 100644
--- a/kparts/CMakeLists.txt
+++ b/tdeparts/CMakeLists.txt
@@ -35,7 +35,7 @@ install( FILES
     event.h browserextension.h factory.h historyprovider.h
     browserinterface.h genericfactory.h componentfactory.h
     browserrun.h statusbarextension.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kparts )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeparts )
 
 
 ##### other data ################################
@@ -45,9 +45,9 @@ install( FILES
   DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-#### kparts #####################################
+#### tdeparts #####################################
 
-set( target kparts )
+set( target tdeparts )
 
 set( ${target}_SRCS
   part.cpp plugin.cpp partmanager.cpp mainwindow.cpp
diff --git a/kparts/COMMENTS b/tdeparts/COMMENTS
index 1a9773212..abf24ca84 100644
--- a/kparts/COMMENTS
+++ b/tdeparts/COMMENTS
@@ -28,7 +28,7 @@ In this case, yes, that could be saved in the part.
 --------------
 
 4) Perhaps a part wants to know if it got activated, so we might want to
-   re-introduce that PartActivateEvent from tdelibs/kparts.
+   re-introduce that PartActivateEvent from tdelibs/tdeparts.
    Question: Shall this event be sent when the GUI of the part is activated
    or shall it be sent when the part "really" got activated (via KPartManager)?
 
@@ -243,7 +243,7 @@ changes.
 
 <weis> Hi
 <dfaure> Hi !
-<weis> dfaure: Just looked into new kparts
+<weis> dfaure: Just looked into new tdeparts
 <dfaure> ah ?
 <weis> dfaure: You have a major problem: One can NOT mix QDomElements of different documents!
 <dfaure> weis: why ?
@@ -253,7 +253,7 @@ changes.
 <dfaure> the problem is .. memory management, right ?
 <weis> dfaure: I just checked in my CVS irc stuff :-)
 <dfaure> ok :-)
-<weis> dfaure: Can you have a look at kparts/COMMENTS ?
+<weis> dfaure: Can you have a look at tdeparts/COMMENTS ?
 --
 <dfaure> weis: you should have come before. coolo is talking about re-writing libkio.
 <dfaure> well in fact he started the rewrite
@@ -322,7 +322,7 @@ changes.
 <dfaure> ah yes
 <weis> dfaure: If window W1 becomes active (focus) it may activate its KPartManager. If W2 becomes active its KPartManager may do something.
 <weis> dfaure: Ooooops, I think I am on the wrong track perhaps.....
-<weis> dfaure: I started dealing with kparts like I do with widgets. If a kpart is just a widget that you can load at runtime, then it wont do gui merging anyway. So may above example seems to be very theoretically, perhaps ....
+<weis> dfaure: I started dealing with tdeparts like I do with widgets. If a kpart is just a widget that you can load at runtime, then it wont do gui merging anyway. So may above example seems to be very theoretically, perhaps ....
 <dfaure> yes, if you have two KPartManager you have a problem anyway (if the parts have a GUI)
 <dfaure> you want only ONE part active at a time ... one gui .
 <dfaure> so you can't have one part active in each kpartmanager, unless the whole partmanager can be deactivated.
@@ -383,7 +383,7 @@ Torben brainstorming about Nested Parts
 
 Imagine a very complex situation like this:
 
-KOfficeMainWindow (a kparts aware shell)
+KOfficeMainWindow (a tdeparts aware shell)
  |
  |- KWordView/Part (a koffice component)
     |
@@ -454,7 +454,7 @@ This is no problem, since the Part never directly talks to the GUIBuilder anyway
 
 Now imagine someone made a KOffice component out of KalenderWidget and embeds it in KWord:
 
-KOfficeMainWindow (a kparts aware shell)
+KOfficeMainWindow (a tdeparts aware shell)
  |
  |- KWordView/Part (a koffice component)
     |
@@ -479,7 +479,7 @@ Observation 4) There may be multiple KPartManagers in one toplevel window, but o
 
 Lets take another look at our first example:
 
-KOfficeMainWindow (a kparts aware shell)
+KOfficeMainWindow (a tdeparts aware shell)
  |
  |- KWordView/Part (a koffice component)
     |
@@ -498,7 +498,7 @@ action() function if queried for an action named "HTMLSettings".
 Observation 5) In addition to turning GUI building on or off for components one may do partial gui merging.
                That means actions of some child component are propagated by the parent component.
 
-Observation5 does not cause additional code in libkparts. It just shows a possible usage and the flexibility of the
+Observation5 does not cause additional code in libtdeparts. It just shows a possible usage and the flexibility of the
 action concept.
 
 
diff --git a/kparts/Mainpage.dox b/tdeparts/Mainpage.dox
index 994503d44..994503d44 100644
--- a/kparts/Mainpage.dox
+++ b/tdeparts/Mainpage.dox
diff --git a/kparts/Makefile.am b/tdeparts/Makefile.am
index e4991bbbd..8fea0f517 100644
--- a/kparts/Makefile.am
+++ b/tdeparts/Makefile.am
@@ -4,26 +4,26 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED)
 
 INCLUDES= -I$(srcdir)/../ -I$(top_srcdir)/kio/ -I$(top_srcdir)/libltdl \
 	-I$(top_srcdir)/kfile $(all_includes)
-libkparts_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 3:0:1 -no-undefined
-libkparts_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
+libtdeparts_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 3:0:1 -no-undefined
+libtdeparts_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
 
 check-local:
 	(cd tests && $(MAKE) check )
 
 ####### Files
 
-lib_LTLIBRARIES = libkparts.la
+lib_LTLIBRARIES = libtdeparts.la
 
-libkparts_la_SOURCES = part.cpp plugin.cpp partmanager.cpp mainwindow.cpp dockmainwindow.cpp \
+libtdeparts_la_SOURCES = part.cpp plugin.cpp partmanager.cpp mainwindow.cpp dockmainwindow.cpp \
 		       event.cpp browserextension.cpp factory.cpp  historyprovider.cpp \
 		       browserinterface.cpp browserrun.cpp statusbarextension.cpp
 
-kpartsincludedir = $(includedir)/kparts
-kpartsinclude_HEADERS = part.h plugin.h partmanager.h mainwindow.h dockmainwindow.h event.h \
+tdepartsincludedir = $(includedir)/tdeparts
+tdepartsinclude_HEADERS = part.h plugin.h partmanager.h mainwindow.h dockmainwindow.h event.h \
 	browserextension.h factory.h historyprovider.h browserinterface.h genericfactory.h \
 	componentfactory.h browserrun.h statusbarextension.h
 
-libkparts_la_METASOURCES = AUTO
+libtdeparts_la_METASOURCES = AUTO
 
 servicetype_DATA = kpart.desktop krop.desktop krwp.desktop browserview.desktop 
 servicetypedir = $(kde_servicetypesdir)
diff --git a/kparts/browserextension.cpp b/tdeparts/browserextension.cpp
index 630e4cb5a..630e4cb5a 100644
--- a/kparts/browserextension.cpp
+++ b/tdeparts/browserextension.cpp
diff --git a/kparts/browserextension.h b/tdeparts/browserextension.h
index d225c8e84..8d3a109ff 100644
--- a/kparts/browserextension.h
+++ b/tdeparts/browserextension.h
@@ -18,8 +18,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kparts_browserextension_h__
-#define __kparts_browserextension_h__
+#ifndef __tdeparts_browserextension_h__
+#define __tdeparts_browserextension_h__
 
 #include <sys/types.h>
 
@@ -29,8 +29,8 @@
 #include <tqstringlist.h>
 #include <tqpair.h>
 
-#include <kparts/part.h>
-#include <kparts/event.h>
+#include <tdeparts/part.h>
+#include <tdeparts/event.h>
 
 class KFileItem;
 typedef TQPtrList<KFileItem> KFileItemList;
diff --git a/kparts/browserinterface.cpp b/tdeparts/browserinterface.cpp
index e02ae34cc..e02ae34cc 100644
--- a/kparts/browserinterface.cpp
+++ b/tdeparts/browserinterface.cpp
diff --git a/kparts/browserinterface.h b/tdeparts/browserinterface.h
index 82521376f..82521376f 100644
--- a/kparts/browserinterface.h
+++ b/tdeparts/browserinterface.h
diff --git a/kparts/browserrun.cpp b/tdeparts/browserrun.cpp
index 582460c6d..4cff3f8a4 100644
--- a/kparts/browserrun.cpp
+++ b/tdeparts/browserrun.cpp
@@ -333,7 +333,7 @@ BrowserRun::AskSaveResult BrowserRun::askEmbedOrSave( const KURL & url, const TQ
     // - images (reasoning: no need to save, most of the time, because fast to see)
     // e.g. postscript is different, because takes longer to read, so
     // it's more likely that the user might want to save it.
-    // - multipart/* ("server push", see kmultipart)
+    // - multipart/* ("server push", see tdemultipart)
     // - other strange 'internal' mimetypes like print/manager...
     // KEEP IN SYNC!!!
     if (flags != (int)AttachmentDisposition && (
@@ -463,7 +463,7 @@ void BrowserRun::redirectToError( int error, const TQString& errorText )
     /**
      * To display this error in KHTMLPart instead of inside a dialog box,
      * we tell konq that the mimetype is text/html, and we redirect to
-     * an error:/ URL that sends the info to khtml.
+     * an error:/ URL that sends the info to tdehtml.
      *
      * The format of the error:/ URL is error:/?query#url,
      * where two variables are passed in the query:
diff --git a/kparts/browserrun.h b/tdeparts/browserrun.h
index 23709fd2b..edd46d40d 100644
--- a/kparts/browserrun.h
+++ b/tdeparts/browserrun.h
@@ -16,12 +16,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef kparts_browserrun_h
-#define kparts_browserrun_h
+#ifndef tdeparts_browserrun_h
+#define tdeparts_browserrun_h
 
 #include <krun.h>
 #include <kservice.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 namespace KParts {
 
diff --git a/kparts/browserview.desktop b/tdeparts/browserview.desktop
index 42d6131ec..42d6131ec 100644
--- a/kparts/browserview.desktop
+++ b/tdeparts/browserview.desktop
diff --git a/kparts/componentfactory.h b/tdeparts/componentfactory.h
index da3c5c7d5..6d1b7876b 100644
--- a/kparts/componentfactory.h
+++ b/tdeparts/componentfactory.h
@@ -1,8 +1,8 @@
-#ifndef __kparts_componentfactory_h__
-#define __kparts_componentfactory_h__
+#ifndef __tdeparts_componentfactory_h__
+#define __tdeparts_componentfactory_h__
 
-#include <kparts/factory.h>
-#include <kparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
 #include <ktrader.h>
 #include <tqmetaobject.h>
 
@@ -73,7 +73,7 @@ namespace KParts
         }
 
         /**
-         * This template function allows to ask the given kparts factory to create an
+         * This template function allows to ask the given tdeparts factory to create an
          * instance of the given template type.
          *
          * Example of usage:
diff --git a/kparts/design.h b/tdeparts/design.h
index ba608d777..ba608d777 100644
--- a/kparts/design.h
+++ b/tdeparts/design.h
diff --git a/kparts/dockmainwindow.cpp b/tdeparts/dockmainwindow.cpp
index 9d8d73057..ce462e691 100644
--- a/kparts/dockmainwindow.cpp
+++ b/tdeparts/dockmainwindow.cpp
@@ -19,11 +19,11 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kparts/dockmainwindow.h>
-#include <kparts/event.h>
-#include <kparts/part.h>
+#include <tdeparts/dockmainwindow.h>
+#include <tdeparts/event.h>
+#include <tdeparts/part.h>
 #include <kaccel.h>
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <kstatusbar.h>
 #include <kinstance.h>
 #include <khelpmenu.h>
diff --git a/kparts/dockmainwindow.h b/tdeparts/dockmainwindow.h
index 32b1df1d4..223bd3a42 100644
--- a/kparts/dockmainwindow.h
+++ b/tdeparts/dockmainwindow.h
@@ -26,7 +26,7 @@
 
 #include <kdockwidget.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 class TQString;
 
diff --git a/kparts/event.cpp b/tdeparts/event.cpp
index 4f0efd617..a25d61640 100644
--- a/kparts/event.cpp
+++ b/tdeparts/event.cpp
@@ -17,7 +17,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 
 using namespace KParts;
 
diff --git a/kparts/event.h b/tdeparts/event.h
index 70916dd47..65f1c7be9 100644
--- a/kparts/event.h
+++ b/tdeparts/event.h
@@ -17,8 +17,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef __kparts_event_h__
-#define __kparts_event_h__
+#ifndef __tdeparts_event_h__
+#define __tdeparts_event_h__
 
 #include <tqevent.h>
 
diff --git a/kparts/factory.cpp b/tdeparts/factory.cpp
index a3985fd05..a3985fd05 100644
--- a/kparts/factory.cpp
+++ b/tdeparts/factory.cpp
diff --git a/kparts/factory.h b/tdeparts/factory.h
index 05b23d9d9..3a6f3e4ed 100644
--- a/kparts/factory.h
+++ b/tdeparts/factory.h
@@ -17,8 +17,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef __kparts_factory_h__
-#define __kparts_factory_h__
+#ifndef __tdeparts_factory_h__
+#define __tdeparts_factory_h__
 
 #include <klibloader.h>
 
@@ -50,7 +50,7 @@ public:
      * The TQStringList can be used to pass additional arguments to the part.
      * If the part needs additional arguments, it should take them as
      * name="value" pairs. This is the way additional arguments will get passed
-     * to the part from eg. khtml. You can for example embed the part into HTML
+     * to the part from eg. tdehtml. You can for example embed the part into HTML
      * by using the following code:
      * \code
      *    <object type="my_mimetype" data="url_to_my_data">
@@ -98,7 +98,7 @@ protected:
      * The TQStringList can be used to pass additional arguments to the part.
      * If the part needs additional arguments, it should take them as
      * name="value" pairs. This is the way additional arguments will get passed
-     * to the part from eg. khtml. You can for example emebed the part into HTML
+     * to the part from eg. tdehtml. You can for example emebed the part into HTML
      * by using the following code:
      * \code
      *    <object type="my_mimetype" data="url_to_my_data">
diff --git a/kparts/genericfactory.h b/tdeparts/genericfactory.h
index 7deea1248..40e61be9f 100644
--- a/kparts/genericfactory.h
+++ b/tdeparts/genericfactory.h
@@ -1,8 +1,8 @@
-#ifndef __kparts__genericfactory_h__
-#define __kparts__genericfactory_h__
+#ifndef __tdeparts__genericfactory_h__
+#define __tdeparts__genericfactory_h__
 
-#include <kparts/factory.h>
-#include <kparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
 #include <kgenericfactory.h>
 #include <kaboutdata.h>
 #include <kdebug.h>
diff --git a/kparts/historyprovider.cpp b/tdeparts/historyprovider.cpp
index 17cf609a1..17cf609a1 100644
--- a/kparts/historyprovider.cpp
+++ b/tdeparts/historyprovider.cpp
diff --git a/kparts/historyprovider.h b/tdeparts/historyprovider.h
index 1acd8d272..1123981ec 100644
--- a/kparts/historyprovider.h
+++ b/tdeparts/historyprovider.h
@@ -32,9 +32,9 @@ namespace KParts {
  * for fast lookup, if an item is in the history or not.
  *
  * May be subclassed to implement a persistent history for example.
- * For usage with khtml, just create your provider and call the
- * HistoryProvider constructor _before_ you do any khtml stuff. That way,
- * khtml, using the self()-method, will use your subclassed provider.
+ * For usage with tdehtml, just create your provider and call the
+ * HistoryProvider constructor _before_ you do any tdehtml stuff. That way,
+ * tdehtml, using the self()-method, will use your subclassed provider.
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
diff --git a/kparts/kpart.desktop b/tdeparts/kpart.desktop
index ba69bd704..ba69bd704 100644
--- a/kparts/kpart.desktop
+++ b/tdeparts/kpart.desktop
diff --git a/kparts/krop.desktop b/tdeparts/krop.desktop
index 62de2d454..62de2d454 100644
--- a/kparts/krop.desktop
+++ b/tdeparts/krop.desktop
diff --git a/kparts/krwp.desktop b/tdeparts/krwp.desktop
index 5c6bfee1a..5c6bfee1a 100644
--- a/kparts/krwp.desktop
+++ b/tdeparts/krwp.desktop
diff --git a/kparts/mainwindow.cpp b/tdeparts/mainwindow.cpp
index ce963c23a..37fc97acd 100644
--- a/kparts/mainwindow.cpp
+++ b/tdeparts/mainwindow.cpp
@@ -18,10 +18,10 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kparts/mainwindow.h>
-#include <kparts/event.h>
-#include <kparts/part.h>
-#include <kparts/plugin.h>
+#include <tdeparts/mainwindow.h>
+#include <tdeparts/event.h>
+#include <tdeparts/part.h>
+#include <tdeparts/plugin.h>
 #include <kinstance.h>
 #include <kstatusbar.h>
 #include <khelpmenu.h>
diff --git a/kparts/mainwindow.h b/tdeparts/mainwindow.h
index f1c386a6a..b99527c00 100644
--- a/kparts/mainwindow.h
+++ b/tdeparts/mainwindow.h
@@ -25,7 +25,7 @@
 
 #include <kmainwindow.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 class TQString;
 
diff --git a/kparts/part.cpp b/tdeparts/part.cpp
index b7bdc7cfa..94d096db5 100644
--- a/kparts/part.cpp
+++ b/tdeparts/part.cpp
@@ -18,11 +18,11 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kparts/part.h>
-#include <kparts/event.h>
-#include <kparts/plugin.h>
-#include <kparts/mainwindow.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/part.h>
+#include <tdeparts/event.h>
+#include <tdeparts/plugin.h>
+#include <tdeparts/mainwindow.h>
+#include <tdeparts/partmanager.h>
 
 #include <tqapplication.h>
 #include <tqfile.h>
diff --git a/kparts/part.h b/tdeparts/part.h
index 7b5e39b2f..6b2051f72 100644
--- a/kparts/part.h
+++ b/tdeparts/part.h
@@ -230,7 +230,7 @@ public:
      * Returns the part (this, or a child part) at the given global position.
      * This is called by the part manager to ask whether a part should be activated
      * when clicking somewhere. In most cases the default implementation is enough.
-     * Reimplement this if your part has child parts in some areas (like in khtml or koffice)
+     * Reimplement this if your part has child parts in some areas (like in tdehtml or koffice)
      * @param widget the part widget being clicked - usually the same as widget(), except in koffice.
      * @param globalPos the mouse coordinates in global coordinates
      */
diff --git a/kparts/partmanager.cpp b/tdeparts/partmanager.cpp
index 0f3bc347d..1af0f1ee3 100644
--- a/kparts/partmanager.cpp
+++ b/tdeparts/partmanager.cpp
@@ -20,8 +20,8 @@
 */
 
 #include "partmanager.h"
-#include <kparts/event.h>
-#include <kparts/part.h>
+#include <tdeparts/event.h>
+#include <tdeparts/part.h>
 #include <kglobal.h>
 #include <kdebug.h>
 
diff --git a/kparts/partmanager.h b/tdeparts/partmanager.h
index 604e5ff92..604e5ff92 100644
--- a/kparts/partmanager.h
+++ b/tdeparts/partmanager.h
diff --git a/kparts/plugin.cpp b/tdeparts/plugin.cpp
index 0dc729de1..457caa71f 100644
--- a/kparts/plugin.cpp
+++ b/tdeparts/plugin.cpp
@@ -19,9 +19,9 @@
 */
 
 #include <config.h>
-#include <kparts/plugin.h>
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/plugin.h>
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
 
 #include <assert.h>
 
diff --git a/kparts/plugin.h b/tdeparts/plugin.h
index df1200ee9..df1200ee9 100644
--- a/kparts/plugin.h
+++ b/tdeparts/plugin.h
diff --git a/kparts/statusbarextension.cpp b/tdeparts/statusbarextension.cpp
index a90a50689..02dd79acb 100644
--- a/kparts/statusbarextension.cpp
+++ b/tdeparts/statusbarextension.cpp
@@ -27,8 +27,8 @@
 #include <kmainwindow.h>
 #include <kdebug.h>
 #include <tdelibs_export.h>
-#include <kparts/part.h>
-#include <kparts/event.h>
+#include <tdeparts/part.h>
+#include <tdeparts/event.h>
 
 using namespace KParts;
 
diff --git a/kparts/statusbarextension.h b/tdeparts/statusbarextension.h
index fa635a12b..fa635a12b 100644
--- a/kparts/statusbarextension.h
+++ b/tdeparts/statusbarextension.h
diff --git a/kparts/tests/Makefile.am b/tdeparts/tests/Makefile.am
index e593cb6da..df0a2a5be 100644
--- a/kparts/tests/Makefile.am
+++ b/tdeparts/tests/Makefile.am
@@ -3,10 +3,10 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/kfile -I$(top_
 AM_LDFLAGS = $(all_libraries)
 LDADD = $(LIB_KPARTS)
 
-check_PROGRAMS = kpartstest normalktmtest ghostviewtest
+check_PROGRAMS = tdepartstest normalktmtest ghostviewtest
 
-kpartstest_SOURCES = example.cpp parts.cpp
-kpartstest_LDADD = libnotepad.la $(LIB_KPARTS)
+tdepartstest_SOURCES = example.cpp parts.cpp
+tdepartstest_LDADD = libnotepad.la $(LIB_KPARTS)
 normalktmtest_SOURCES = normalktm.cpp parts.cpp
 normalktmtest_LDADD = libnotepad.la $(LIB_KPARTS)
 ghostviewtest_SOURCES = ghostview.cpp
@@ -27,11 +27,11 @@ libnotepadpart_la_LDFLAGS = -module $(KDE_PLUGIN)
 noinst_LTLIBRARIES = libnotepad.la
 libnotepad_la_SOURCES = notepad.cpp
 
-rcdir = $(kde_datadir)/kpartstest
-rc_DATA = kpartstest_shell.rc
+rcdir = $(kde_datadir)/tdepartstest
+rc_DATA = tdepartstest_shell.rc
 
-testpartdir = $(kde_datadir)/kpartstestpart
-testpart_DATA = kpartstest_part1.rc
+testpartdir = $(kde_datadir)/tdepartstestpart
+testpart_DATA = tdepartstest_part1.rc
 
 notepaddir = $(kde_datadir)/notepadpart
 notepad_DATA = notepadpart.rc
diff --git a/kparts/tests/README b/tdeparts/tests/README
index a0bee7ca6..a0bee7ca6 100644
--- a/kparts/tests/README
+++ b/tdeparts/tests/README
diff --git a/kparts/tests/example.cpp b/tdeparts/tests/example.cpp
index 4628e8ca7..e8495ffe9 100644
--- a/kparts/tests/example.cpp
+++ b/tdeparts/tests/example.cpp
@@ -16,7 +16,7 @@
 
 Shell::Shell()
 {
-  setXMLFile( "kpartstest_shell.rc" );
+  setXMLFile( "tdepartstest_shell.rc" );
 
   m_manager = new KParts::PartManager( this );
 
@@ -63,7 +63,7 @@ Shell::~Shell()
 
 void Shell::slotFileOpen()
 {
-  if ( ! m_part1->openURL( locate("data", TDEGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) )
+  if ( ! m_part1->openURL( locate("data", TDEGlobal::instance()->instanceName()+"/tdepartstest_shell.rc" ) ) )
     KMessageBox::error(this,"Couldn't open file !");
 }
 
@@ -115,13 +115,13 @@ void Shell::slotFileEdit()
   if ( !m_editorpart )
     embedEditor();
   // TODO use KFileDialog to allow testing remote files
-  if ( ! m_editorpart->openURL( TQDir::current().absPath()+"/kpartstest_shell.rc" ) )
+  if ( ! m_editorpart->openURL( TQDir::current().absPath()+"/tdepartstest_shell.rc" ) )
     KMessageBox::error(this,"Couldn't open file !");
 }
 
 int main( int argc, char **argv )
 {
-  TDEApplication app( argc, argv, "kpartstest" );
+  TDEApplication app( argc, argv, "tdepartstest" );
 
   Shell *shell = new Shell;
 
diff --git a/kparts/tests/example.h b/tdeparts/tests/example.h
index 87c907390..b4bdead61 100644
--- a/kparts/tests/example.h
+++ b/tdeparts/tests/example.h
@@ -2,8 +2,8 @@
 #ifndef __example_h__
 #define __example_h__
 
-#include <kparts/partmanager.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/partmanager.h>
+#include <tdeparts/mainwindow.h>
 
 class KAction;
 class TQWidget;
diff --git a/kparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp
index 5d1bbe5b3..5d1bbe5b3 100644
--- a/kparts/tests/ghostview.cpp
+++ b/tdeparts/tests/ghostview.cpp
diff --git a/kparts/tests/ghostview.h b/tdeparts/tests/ghostview.h
index 5d99d4f0e..2974ded5e 100644
--- a/kparts/tests/ghostview.h
+++ b/tdeparts/tests/ghostview.h
@@ -1,7 +1,7 @@
 #ifndef __example_h__
 #define __example_h__
 
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 class Shell : public KParts::MainWindow
 {
diff --git a/kparts/tests/ghostviewtest_shell.rc b/tdeparts/tests/ghostviewtest_shell.rc
index 0bae67c82..0bae67c82 100644
--- a/kparts/tests/ghostviewtest_shell.rc
+++ b/tdeparts/tests/ghostviewtest_shell.rc
diff --git a/kparts/tests/normalktm.cpp b/tdeparts/tests/normalktm.cpp
index 913686bf9..277f3ccde 100644
--- a/kparts/tests/normalktm.cpp
+++ b/tdeparts/tests/normalktm.cpp
@@ -61,7 +61,7 @@ Shell::~Shell()
 
 void Shell::slotFileOpen()
 {
-  if ( ! m_part1->openURL( locate("data", TDEGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) )
+  if ( ! m_part1->openURL( locate("data", TDEGlobal::instance()->instanceName()+"/tdepartstest_shell.rc" ) ) )
     KMessageBox::error(this,"Couldn't open file !");
 }
 
@@ -102,13 +102,13 @@ void Shell::slotFileEdit()
   if ( !m_editorpart )
     embedEditor();
   // TODO use KFileDialog to allow testing remote files
-  if ( ! m_editorpart->openURL( TQDir::current().absPath()+"/kpartstest_shell.rc" ) )
+  if ( ! m_editorpart->openURL( TQDir::current().absPath()+"/tdepartstest_shell.rc" ) )
     KMessageBox::error(this,"Couldn't open file !");
 }
 
 int main( int argc, char **argv )
 {
-  TDEApplication app( argc, argv, "kpartstest" ); // we cheat and call ourselves kpartstest for Shell::slotFileOpen()
+  TDEApplication app( argc, argv, "tdepartstest" ); // we cheat and call ourselves tdepartstest for Shell::slotFileOpen()
 
   Shell *shell = new Shell;
 
diff --git a/kparts/tests/normalktm.h b/tdeparts/tests/normalktm.h
index e8b1e12ef..26a93a52a 100644
--- a/kparts/tests/normalktm.h
+++ b/tdeparts/tests/normalktm.h
@@ -2,7 +2,7 @@
 #ifndef __normalktm_h__
 #define __normalktm_h__
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kmainwindow.h>
 
 class KAction;
diff --git a/kparts/tests/notepad.cpp b/tdeparts/tests/notepad.cpp
index 844a4ba17..6494288cd 100644
--- a/kparts/tests/notepad.cpp
+++ b/tdeparts/tests/notepad.cpp
@@ -1,7 +1,7 @@
 
 #include "notepad.h"
-#include <kparts/partmanager.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/partmanager.h>
+#include <tdeparts/mainwindow.h>
 
 #include <tqsplitter.h>
 #include <tqfile.h>
diff --git a/kparts/tests/notepad.desktop b/tdeparts/tests/notepad.desktop
index a529d69a1..a529d69a1 100644
--- a/kparts/tests/notepad.desktop
+++ b/tdeparts/tests/notepad.desktop
diff --git a/kparts/tests/notepad.h b/tdeparts/tests/notepad.h
index 9cc4f2d9a..bd502599b 100644
--- a/kparts/tests/notepad.h
+++ b/tdeparts/tests/notepad.h
@@ -2,8 +2,8 @@
 #ifndef __notepad_h__
 #define __notepad_h__
 
-#include <kparts/genericfactory.h>
-#include <kparts/part.h>
+#include <tdeparts/genericfactory.h>
+#include <tdeparts/part.h>
 
 class TDEAboutData;
 class TQMultiLineEdit;
diff --git a/kparts/tests/notepadpart.cpp b/tdeparts/tests/notepadpart.cpp
index 072503fd1..072503fd1 100644
--- a/kparts/tests/notepadpart.cpp
+++ b/tdeparts/tests/notepadpart.cpp
diff --git a/kparts/tests/notepadpart.rc b/tdeparts/tests/notepadpart.rc
index ba30eb322..ba30eb322 100644
--- a/kparts/tests/notepadpart.rc
+++ b/tdeparts/tests/notepadpart.rc
diff --git a/kparts/tests/parts.cpp b/tdeparts/tests/parts.cpp
index 97ebdd4fb..2fc63c225 100644
--- a/kparts/tests/parts.cpp
+++ b/tdeparts/tests/parts.cpp
@@ -1,5 +1,5 @@
 
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 
 #include "parts.h"
 
@@ -21,11 +21,11 @@
 Part1::Part1( TQObject *parent, TQWidget * parentWidget )
  : KParts::ReadOnlyPart( parent, "Part1" )
 {
-  m_instance = new TDEInstance( "kpartstestpart" );
+  m_instance = new TDEInstance( "tdepartstestpart" );
   setInstance( m_instance );
   m_edit = new TQMultiLineEdit( parentWidget );
   setWidget( m_edit );
-  setXMLFile( "kpartstest_part1.rc" );
+  setXMLFile( "tdepartstest_part1.rc" );
 
   /*KAction * paBlah = */ new KAction( "Blah", "filemail", 0, actionCollection(), "p1_blah" );
 }
diff --git a/kparts/tests/parts.h b/tdeparts/tests/parts.h
index 0d4e6480a..37af4911e 100644
--- a/kparts/tests/parts.h
+++ b/tdeparts/tests/parts.h
@@ -2,7 +2,7 @@
 #ifndef __parts_h__
 #define __parts_h__
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 class TQMultiLineEdit;
 namespace KParts {
diff --git a/kparts/tests/plugin_foobar.rc b/tdeparts/tests/plugin_foobar.rc
index e614e505f..e614e505f 100644
--- a/kparts/tests/plugin_foobar.rc
+++ b/tdeparts/tests/plugin_foobar.rc
diff --git a/kparts/tests/plugin_spellcheck.cpp b/tdeparts/tests/plugin_spellcheck.cpp
index 5521bf22f..5521bf22f 100644
--- a/kparts/tests/plugin_spellcheck.cpp
+++ b/tdeparts/tests/plugin_spellcheck.cpp
diff --git a/kparts/tests/plugin_spellcheck.h b/tdeparts/tests/plugin_spellcheck.h
index 56f0e657a..d27966c0c 100644
--- a/kparts/tests/plugin_spellcheck.h
+++ b/tdeparts/tests/plugin_spellcheck.h
@@ -1,7 +1,7 @@
 #ifndef __plugin_spellcheck_h
 #define __plugin_spellcheck_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class PluginSpellCheck : public KParts::Plugin
 {
diff --git a/kparts/tests/plugin_spellcheck.rc b/tdeparts/tests/plugin_spellcheck.rc
index 1980186cf..1980186cf 100644
--- a/kparts/tests/plugin_spellcheck.rc
+++ b/tdeparts/tests/plugin_spellcheck.rc
diff --git a/kparts/tests/kpartstest_part1.rc b/tdeparts/tests/tdepartstest_part1.rc
index 9f4a75687..9f4a75687 100644
--- a/kparts/tests/kpartstest_part1.rc
+++ b/tdeparts/tests/tdepartstest_part1.rc
diff --git a/kparts/tests/kpartstest_shell.rc b/tdeparts/tests/tdepartstest_shell.rc
index 52790f9b6..52790f9b6 100644
--- a/kparts/tests/kpartstest_shell.rc
+++ b/tdeparts/tests/tdepartstest_shell.rc
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index 19270727e..d5102ed3c 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqvbox.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kaccel.h>
 #include <kaction.h>
 #include <klibloader.h>
diff --git a/krandr/CMakeLists.txt b/tderandr/CMakeLists.txt
index 4a6d1803d..efcd8519d 100644
--- a/krandr/CMakeLists.txt
+++ b/tderandr/CMakeLists.txt
@@ -28,16 +28,16 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    randr.h lowlevel_randr.h ktimerdialog.h libkrandr.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/libkrandr )
+    randr.h lowlevel_randr.h ktimerdialog.h libtderandr.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/libtderandr )
 
 
-##### krandr ####################################
+##### tderandr ####################################
 
-set( target krandr )
+set( target tderandr )
 
 set( ${target}_SRCS
-  randr.cpp lowlevel_randr.c ktimerdialog.cpp libkrandr.cc
+  randr.cpp lowlevel_randr.c ktimerdialog.cpp libtderandr.cc
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/krandr/Mainpage.dox b/tderandr/Mainpage.dox
index c173d52aa..c173d52aa 100644
--- a/krandr/Mainpage.dox
+++ b/tderandr/Mainpage.dox
diff --git a/tderandr/Makefile.am b/tderandr/Makefile.am
new file mode 100644
index 000000000..7818014df
--- /dev/null
+++ b/tderandr/Makefile.am
@@ -0,0 +1,19 @@
+
+INCLUDES =  -I$(srcdir)/.. $(all_includes)
+
+# For the future: examine if condensing the tons of *_LDFLAGS variables
+# into $(all_libraries) isn't better
+AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
+
+libtderandrincludedir = $(includedir)/libtderandr
+libtderandrinclude_HEADERS = randr.h lowlevel_randr.h ktimerdialog.h libtderandr.h
+
+lib_LTLIBRARIES = libtderandr.la
+libtderandr_la_SOURCES  = randr.cpp lowlevel_randr.c ktimerdialog.cpp libtderandr.cc
+METASOURCES = AUTO
+
+libtderandr_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
+libtderandr_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_QT) $(LIB_XRANDR)
+
+DOXYGEN_REFERENCES = tdecore
+include ../admin/Doxyfile.am
diff --git a/krandr/configure.in.in b/tderandr/configure.in.in
index 6feca241b..3dd4a9319 100644
--- a/krandr/configure.in.in
+++ b/tderandr/configure.in.in
@@ -17,5 +17,5 @@ fi
 AC_SUBST(LIB_XRANDR)
 AM_CONDITIONAL(system_has_xrandr, test -n "$RANDR_SUBDIR")
 if test $system_has_xrandr = no; then
-  DO_NOT_COMPILE="$DO_NOT_COMPILE libkrandr"
+  DO_NOT_COMPILE="$DO_NOT_COMPILE libtderandr"
 fi
diff --git a/krandr/ktimerdialog.cpp b/tderandr/ktimerdialog.cpp
index 0be416be7..0be416be7 100644
--- a/krandr/ktimerdialog.cpp
+++ b/tderandr/ktimerdialog.cpp
diff --git a/krandr/ktimerdialog.h b/tderandr/ktimerdialog.h
index 965a72393..965a72393 100644
--- a/krandr/ktimerdialog.h
+++ b/tderandr/ktimerdialog.h
diff --git a/krandr/libkrandr.cc b/tderandr/libtderandr.cc
index 923b9f1a0..65005f91e 100644
--- a/krandr/libkrandr.cc
+++ b/tderandr/libtderandr.cc
@@ -1,4 +1,4 @@
-/*  libkrandr.cc     - class KRandr that makes it easy to use XRandr in KDE
+/*  libtderandr.cc     - class KRandr that makes it easy to use XRandr in KDE
     This file is part of KRandr 0.9.5
     Copyright (C) 2010  Timothy Pearson
     LibKRandr's homepage : http://www.trinitydesktop.org
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <cmath>
 
-#include "libkrandr.h"
+#include "libtderandr.h"
 
 #include <X11/extensions/dpms.h>
 
diff --git a/krandr/libkrandr.h b/tderandr/libtderandr.h
index 3e00d73f7..b2b362a90 100644
--- a/krandr/libkrandr.h
+++ b/tderandr/libtderandr.h
@@ -1,4 +1,4 @@
-/*  libkrandr.h     - class KRandr that makes it easy to use XRandr in KDE
+/*  libtderandr.h     - class KRandr that makes it easy to use XRandr in KDE
     This file is part of KRandr 0.9.5
     Copyright (C) 2010  Timothy Pearson
     LibKRandr's homepage : http://www.trinitydesktop.org
@@ -41,12 +41,12 @@
 #define ROTATION_270_DEGREES_STRING "270 degrees"
 
 /**
- * Simple API covering most of the uses of libkrandr.
+ * Simple API covering most of the uses of libtderandr.
  *
  * You can use the members of this class in pure C applications, just by using
  * the same name as the corresponding function member.
  *
- * @short A simple API around the rest of libkrandr.
+ * @short A simple API around the rest of libtderandr.
  * @version 0.9.5 27/04/2010
  * @author Timothy Pearson <kb9vqf@pearsoncomputing.net>
  */
@@ -306,12 +306,12 @@ class KRANDR_EXPORT KRandrSimpleAPI : public RandRDisplay
     bool kRandrHasRandr();
 
     /**
-     * Returns the version number of libkrandr, i.e. "0.9.5" or "1.0 Beta"
+     * Returns the version number of libtderandr, i.e. "0.9.5" or "1.0 Beta"
      */
     static const char *kRandrVersion(void);
 
     /**
-     * Returns the copyright notice that applications using libkrandr should print
+     * Returns the copyright notice that applications using libtderandr should print
      * to the user in an about box or somewhere visible.
      * I.e.
      *
diff --git a/krandr/lowlevel_randr.c b/tderandr/lowlevel_randr.c
index c7a2edc2a..c7a2edc2a 100644
--- a/krandr/lowlevel_randr.c
+++ b/tderandr/lowlevel_randr.c
diff --git a/krandr/lowlevel_randr.h b/tderandr/lowlevel_randr.h
index b5825e450..b5825e450 100644
--- a/krandr/lowlevel_randr.h
+++ b/tderandr/lowlevel_randr.h
diff --git a/krandr/randr.cpp b/tderandr/randr.cpp
index 334da5a79..334da5a79 100644
--- a/krandr/randr.cpp
+++ b/tderandr/randr.cpp
diff --git a/krandr/randr.h b/tderandr/randr.h
index af3712e71..af3712e71 100644
--- a/krandr/randr.h
+++ b/tderandr/randr.h
diff --git a/kresources/CMakeLists.txt b/tderesources/CMakeLists.txt
index f6932baaa..05ea5a5af 100644
--- a/kresources/CMakeLists.txt
+++ b/tderesources/CMakeLists.txt
@@ -33,20 +33,20 @@ install( FILES
     resource.h configwidget.h factory.h manageriface.h
     managerimpl.h manager.h selectdialog.h configdialog.h
     configpage.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kresources )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tderesources )
 
 
 ##### other data ################################
 
-install( FILES kresources_plugin.desktop kresources_manager.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+install( FILES tderesources_plugin.desktop tderesources_manager.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
-# FIXME what is xdg_apps_DATA = kresources.desktop
-install( FILES kresources.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+# FIXME what is xdg_apps_DATA = tderesources.desktop
+install( FILES tderesources.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 
-##### kresources ################################
+##### tderesources ################################
 
-set( target kresources )
+set( target tderesources )
 
 set( ${target}_SRCS
   resource.cpp factory.cpp managerimpl.cpp configwidget.cpp
@@ -63,16 +63,16 @@ tde_add_library( ${target} SHARED AUTOMOC
 )
 
 
-##### kcm_kresources ############################
+##### kcm_tderesources ############################
 
-set( target kcm_kresources )
+set( target kcm_tderesources )
 
 set( ${target}_SRCS
-  kcmkresources.cpp
+  kcmtderesources.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kresources-shared
+  LINK tderesources-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tderesources/Makefile.am b/tderesources/Makefile.am
new file mode 100644
index 000000000..fb7040ef5
--- /dev/null
+++ b/tderesources/Makefile.am
@@ -0,0 +1,49 @@
+INCLUDES = $(all_includes)
+
+METASOURCES = AUTO
+
+lib_LTLIBRARIES = libtderesources.la
+
+libtderesources_la_SOURCES = resource.cpp \
+  factory.cpp \
+  manageriface.skel \
+  manageriface.stub \
+  managerimpl.cpp \
+  configwidget.cpp \
+  configdialog.cpp \
+  selectdialog.cpp \
+  configpage.cpp
+
+libtderesources_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
+libtderesources_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
+
+kresincludedir = $(includedir)/tderesources
+kresinclude_HEADERS = resource.h \
+  configwidget.h \
+  factory.h \
+  manageriface.h \
+  managerimpl.h \
+  manager.h \
+  selectdialog.h \
+  configdialog.h \
+  configpage.h
+
+kde_module_LTLIBRARIES = kcm_tderesources.la
+
+kcm_tderesources_la_SOURCES = kcmtderesources.cpp
+kcm_tderesources_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+kcm_tderesources_la_LIBADD = libtderesources.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
+
+
+check_PROGRAMS = testresources
+
+testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testresources_LDADD   = libtderesources.la
+testresources_SOURCES = testresources.cpp
+
+xdg_apps_DATA = tderesources.desktop
+
+servicetypedir = $(kde_servicetypesdir)
+servicetype_DATA = tderesources_plugin.desktop tderesources_manager.desktop
+
+include ../admin/Doxyfile.am
diff --git a/kresources/README.design b/tderesources/README.design
index f883c7d13..fc31a2078 100644
--- a/kresources/README.design
+++ b/tderesources/README.design
@@ -1,4 +1,4 @@
-kresources
+tderesources
 README.design
 
 KDE RESOURCES
@@ -112,7 +112,7 @@ with libkcal:
 The "exchange" calendar resource is compiled in a separate 
 library, dynamically loaded by the resource manager if 
 resources of this type are used. This resource is in
-tdepim/kresources/exchange:
+tdepim/tderesources/exchange:
 - resourceexchange.{h,cpp}
   Defines the exchange resource
 - resourceexchangeconfig.{h,cpp}
diff --git a/kresources/TODO b/tderesources/TODO
index 5034327a7..5034327a7 100644
--- a/kresources/TODO
+++ b/tderesources/TODO
diff --git a/kresources/configdialog.cpp b/tderesources/configdialog.cpp
index 0d306d29c..b6d29dcd3 100644
--- a/kresources/configdialog.cpp
+++ b/tderesources/configdialog.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/kresources/configdialog.h b/tderesources/configdialog.h
index 9e7809bb1..c29d89273 100644
--- a/kresources/configdialog.h
+++ b/tderesources/configdialog.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
diff --git a/kresources/configpage.cpp b/tderesources/configpage.cpp
index ba3b89a47..5b574c593 100644
--- a/kresources/configpage.cpp
+++ b/tderesources/configpage.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -145,7 +145,7 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name )
 
   mLastItem = 0;
 
-  mConfig = new TDEConfig( "kcmkresourcesrc" );
+  mConfig = new TDEConfig( "kcmtderesourcesrc" );
   mConfig->setGroup( "General" );
 
   load();
diff --git a/kresources/configpage.h b/tderesources/configpage.h
index d00372ac6..c7cc1156d 100644
--- a/kresources/configpage.h
+++ b/tderesources/configpage.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/kresources/configwidget.cpp b/tderesources/configwidget.cpp
index 5d6f0f6b1..7f203842c 100644
--- a/kresources/configwidget.cpp
+++ b/tderesources/configwidget.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/kresources/configwidget.h b/tderesources/configwidget.h
index 3a2fe3f55..30ebf2a5a 100644
--- a/kresources/configwidget.h
+++ b/tderesources/configwidget.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
diff --git a/kresources/factory.cpp b/tderesources/factory.cpp
index e76d318a7..ea19e3b8a 100644
--- a/kresources/factory.cpp
+++ b/tderesources/factory.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/kresources/factory.h b/tderesources/factory.h
index 694b470a4..e4b9f0af1 100644
--- a/kresources/factory.h
+++ b/tderesources/factory.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/kresources/kcmkresources.cpp b/tderesources/kcmtderesources.cpp
index 1baf11f41..6afc1c1f6 100644
--- a/kresources/kcmkresources.cpp
+++ b/tderesources/kcmtderesources.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
@@ -27,10 +27,10 @@
 
 #include "configpage.h"
 
-#include "kcmkresources.h"
+#include "kcmtderesources.h"
 
 typedef KGenericFactory<KCMKResources, TQWidget> ResourcesFactory;
-K_EXPORT_COMPONENT_FACTORY( kcm_kresources, ResourcesFactory( "kcmkresources" ) )
+K_EXPORT_COMPONENT_FACTORY( kcm_tderesources, ResourcesFactory( "kcmtderesources" ) )
 
 KCMKResources::KCMKResources( TQWidget *parent, const char *name, const TQStringList& )
   : TDECModule( ResourcesFactory::instance(), parent, name )
@@ -41,7 +41,7 @@ KCMKResources::KCMKResources( TQWidget *parent, const char *name, const TQString
   connect( mConfigPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
   setButtons( Help | Apply );
   TDEAboutData *about =
-   new TDEAboutData( I18N_NOOP( "kcmkresources" ),
+   new TDEAboutData( I18N_NOOP( "kcmtderesources" ),
                    I18N_NOOP( "TDE Resources configuration module" ),
                    0, 0, TDEAboutData::License_GPL,
                    I18N_NOOP( "(c) 2003 Tobias Koenig" ) );
@@ -65,4 +65,4 @@ void KCMKResources::defaults()
   mConfigPage->defaults();
 }
 
-#include "kcmkresources.moc"
+#include "kcmtderesources.moc"
diff --git a/kresources/kcmkresources.h b/tderesources/kcmtderesources.h
index 29adc6583..21176dff8 100644
--- a/kresources/kcmkresources.h
+++ b/tderesources/kcmtderesources.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
diff --git a/kresources/manager.h b/tderesources/manager.h
index 0363d959e..8fd35632b 100644
--- a/kresources/manager.h
+++ b/tderesources/manager.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -28,8 +28,8 @@
 #include <tqstringlist.h>
 
 #include <kdebug.h>
-#include <kresources/factory.h>
-#include <kresources/managerimpl.h>
+#include <tderesources/factory.h>
+#include <tderesources/managerimpl.h>
 
 namespace KRES {
 
diff --git a/kresources/manageriface.h b/tderesources/manageriface.h
index 8f82ea4b7..63cab83f9 100644
--- a/kresources/manageriface.h
+++ b/tderesources/manageriface.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
     Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/managerimpl.cpp b/tderesources/managerimpl.cpp
index 1f7b08444..43c39964e 100644
--- a/kresources/managerimpl.cpp
+++ b/tderesources/managerimpl.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -444,5 +444,5 @@ Resource *ManagerImpl::getResource( const TQString &identifier )
 
 TQString ManagerImpl::defaultConfigFile( const TQString &family )
 {
-  return TQString( "kresources/%1/stdrc" ).arg( family );
+  return TQString( "tderesources/%1/stdrc" ).arg( family );
 }
diff --git a/kresources/managerimpl.h b/tderesources/managerimpl.h
index 4fdd4d96c..137fd9528 100644
--- a/kresources/managerimpl.h
+++ b/tderesources/managerimpl.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -28,7 +28,7 @@
 #include <tqdict.h>
 
 #include "manageriface.h"
-#include <kresources/resource.h>
+#include <tderesources/resource.h>
 
 class TDEConfig;
 
diff --git a/kresources/resource.cpp b/tderesources/resource.cpp
index e652f61f5..00cdb8768 100644
--- a/kresources/resource.cpp
+++ b/tderesources/resource.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/kresources/resource.h b/tderesources/resource.h
index 9fd50db69..65578bcd1 100644
--- a/kresources/resource.h
+++ b/tderesources/resource.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources
+    This file is part of libtderesources
 
     Copyright (c) 2001-2003 Cornelius Schumacher <schumacher@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -67,7 +67,7 @@ class ConfigWidget;
   <B>resourceexample.h</B>:
 \code
 #include <kconfig.h>
-#include <kresources/resource.h>
+#include <tderesources/resource.h>
 
 class ResourceExample : public KRES::Resource
 {
@@ -122,7 +122,7 @@ extern "C"
   <B>resourceexampleconfig.h</B>:
 \code
 #include <klineedit.h>
-#include <kresources/resourceconfigwidget.h>
+#include <tderesources/resourceconfigwidget.h>
 
 #include "resourceexample.h"
 
@@ -146,7 +146,7 @@ class ResourceExampleConfig : public KRES::ResourceConfigWidget
 \code
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <kresources/resourceconfigwidget.h>
+#include <tderesources/resourceconfigwidget.h>
 #include "resourceexample.h"
 #include "resourceexampleconfig.h"
 
@@ -208,7 +208,7 @@ kde_module_LTLIBRARIES = resourceexample.la
 
 resourceexample_la_SOURCES = resourceexample.cpp resourceexampleconfig.cpp
 resourceexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-resourceexample_la_LIBADD = -lkresources
+resourceexample_la_LIBADD = -ltderesources
 
 servicedir = $(kde_datadir)/resources/example
 service_DATA = resourceexample.desktop
@@ -237,7 +237,7 @@ service_DATA = resourceexample.desktop
   - Different application ususally share the same set of Resources.
 
   The Resource base class provides the management functionality. Classes
-  inheriting from Resource automatically appear in the general kresources
+  inheriting from Resource automatically appear in the general tderesources
   kcontrol module.
 
   Concrete functionality of Resources is specified per family by a subclass of
diff --git a/kresources/selectdialog.cpp b/tderesources/selectdialog.cpp
index 3eb8ad332..e505140a6 100644
--- a/kresources/selectdialog.cpp
+++ b/tderesources/selectdialog.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/kresources/selectdialog.h b/tderesources/selectdialog.h
index 26905e47b..878c32431 100644
--- a/kresources/selectdialog.h
+++ b/tderesources/selectdialog.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/kresources/kresources.desktop b/tderesources/tderesources.desktop
index 5bc2cf768..0d907e0e0 100644
--- a/kresources/kresources.desktop
+++ b/tderesources/tderesources.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Exec=kcmshell kresources
+Exec=kcmshell tderesources
 Icon=about_kde
 Type=Application
 Terminal=false
 
 X-TDE-ModuleType=Library
-X-TDE-Library=kresources
-X-TDE-FactoryName=kresources
+X-TDE-Library=tderesources
+X-TDE-FactoryName=tderesources
 X-TDE-HasReadOnlyMode=false
 
 Name=TDE Resources
diff --git a/kresources/kresources_manager.desktop b/tderesources/tderesources_manager.desktop
index 35a0d1b5d..35a0d1b5d 100644
--- a/kresources/kresources_manager.desktop
+++ b/tderesources/tderesources_manager.desktop
diff --git a/kresources/kresources_plugin.desktop b/tderesources/tderesources_plugin.desktop
index 56cfe5bad..56cfe5bad 100644
--- a/kresources/kresources_plugin.desktop
+++ b/tderesources/tderesources_plugin.desktop
diff --git a/kresources/testresources.cpp b/tderesources/testresources.cpp
index 515563172..515563172 100644
--- a/kresources/testresources.cpp
+++ b/tderesources/testresources.cpp
diff --git a/krsync/CMakeLists.txt b/tdersync/CMakeLists.txt
index 365429946..20ea5b777 100644
--- a/krsync/CMakeLists.txt
+++ b/tdersync/CMakeLists.txt
@@ -30,16 +30,16 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    krsync.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/libkrsync )
+    tdersync.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/libtdersync )
 
 
-##### krsync ####################################
+##### tdersync ####################################
 
-set( target krsync )
+set( target tdersync )
 
 set( ${target}_SRCS
-  krsync.cpp rsyncconfigdialog.cpp
+  tdersync.cpp rsyncconfigdialog.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/krsync/rsyncconfigdialog.cpp b/tdersync/rsyncconfigdialog.cpp
index 5a983efb1..0c1cd532a 100644
--- a/krsync/rsyncconfigdialog.cpp
+++ b/tdersync/rsyncconfigdialog.cpp
@@ -91,7 +91,7 @@
 #include <kiconviewsearchline.h>
 #include <kstaticdeleter.h>
 #include <kgenericfactory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 #include "rsyncconfigdialog.h"
 
diff --git a/krsync/rsyncconfigdialog.h b/tdersync/rsyncconfigdialog.h
index 3da9e6f79..3da9e6f79 100644
--- a/krsync/rsyncconfigdialog.h
+++ b/tdersync/rsyncconfigdialog.h
diff --git a/krsync/krsync.cpp b/tdersync/tdersync.cpp
index d184a0507..3e9e49981 100644
--- a/krsync/krsync.cpp
+++ b/tdersync/tdersync.cpp
@@ -53,7 +53,7 @@
 #include <kio/global.h>
 #include <kio/slavebase.h>
 
-#include "krsync.h"
+#include "tdersync.h"
 #include "rsyncconfigdialog.h"
 
 #define myDebug(x) kdDebug(7127) << __LINE__ << ": " x
@@ -1068,4 +1068,4 @@ KDE_EXPORT void KRsync::slotSync()
 	emit transferDone();
 }
 
-#include "krsync.moc"
+#include "tdersync.moc"
diff --git a/krsync/krsync.h b/tdersync/tdersync.h
index 50ff7a7d9..c0af479f2 100644
--- a/krsync/krsync.h
+++ b/tdersync/tdersync.h
@@ -26,7 +26,7 @@
 #include <kprocess.h>
 #include <kfileitem.h>
 #include <klibloader.h>
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <kio/global.h>
 #include <kio/slavebase.h>
 
@@ -70,7 +70,7 @@
 #include <kiconviewsearchline.h>
 #include <kstaticdeleter.h>
 #include <kgenericfactory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 class KActionMenu;
 class KonqDirPart;
diff --git a/kspell2/CMakeLists.txt b/tdespell2/CMakeLists.txt
index a6acda11f..ffd852066 100644
--- a/kspell2/CMakeLists.txt
+++ b/tdespell2/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/kio
   ${CMAKE_SOURCE_DIR}/kio/kio
 )
@@ -35,17 +35,17 @@ link_directories(
 install( FILES
     settings.h filter.h dictionary.h broker.h
     backgroundchecker.h defaultdictionary.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kspell2 )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdespell2 )
 
 
 ##### other data ################################
 
-install( FILES kspellclient.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+install( FILES tdespellclient.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-#### kspell2base ################################
+#### tdespell2base ################################
 
-set( target kspell2base )
+set( target tdespell2base )
 
 set( ${target}_SRCS
   settings.cpp broker.cpp client.cpp filter.cpp
diff --git a/tdespell2/Makefile.am b/tdespell2/Makefile.am
new file mode 100644
index 000000000..00ee8a81d
--- /dev/null
+++ b/tdespell2/Makefile.am
@@ -0,0 +1,24 @@
+SUBDIRS = . ui tests plugins
+METASOURCES = AUTO
+
+noinst_LTLIBRARIES = libtdespell2base.la
+
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -I$(top_srcdir)/tdeutils $(all_includes)
+
+tdespell2baseincludedir = $(includedir)/tdespell2
+
+tdespell2baseinclude_HEADERS = settings.h filter.h \
+	dictionary.h broker.h \
+	backgroundchecker.h defaultdictionary.h 
+
+libtdespell2base_la_SOURCES = settings.cpp broker.cpp \
+	client.cpp filter.cpp backgroundchecker.cpp \
+	backgroundthread.cpp backgroundengine.cpp \
+	defaultdictionary.cpp 
+
+libtdespell2base_la_LDFLAGS = -no-undefined $(all_libraries)
+
+servicetype_DATA = tdespellclient.desktop
+servicetypedir = $(kde_servicetypesdir)
+
+include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kspell2/README b/tdespell2/README
index 6dfbc1601..4cba772b6 100644
--- a/kspell2/README
+++ b/tdespell2/README
@@ -43,8 +43,8 @@ synchronous so once you pass a word to check you don't have to wait
 for any signals - you get corrections right back.
 Sample usage of KSpell 2 looks like follows:
 
-#include <kspell_broker.h>
-#include <kspell_dictionary.h>
+#include <tdespell_broker.h>
+#include <tdespell_dictionary.h>
 using namespace KSpell;
 
 
diff --git a/kspell2/backgroundchecker.cpp b/tdespell2/backgroundchecker.cpp
index 799edf120..799edf120 100644
--- a/kspell2/backgroundchecker.cpp
+++ b/tdespell2/backgroundchecker.cpp
diff --git a/kspell2/backgroundchecker.h b/tdespell2/backgroundchecker.h
index 9346b0c89..9346b0c89 100644
--- a/kspell2/backgroundchecker.h
+++ b/tdespell2/backgroundchecker.h
diff --git a/kspell2/backgroundengine.cpp b/tdespell2/backgroundengine.cpp
index 9eafe1b2e..9eafe1b2e 100644
--- a/kspell2/backgroundengine.cpp
+++ b/tdespell2/backgroundengine.cpp
diff --git a/kspell2/backgroundengine.h b/tdespell2/backgroundengine.h
index d5bee8ca5..d5bee8ca5 100644
--- a/kspell2/backgroundengine.h
+++ b/tdespell2/backgroundengine.h
diff --git a/kspell2/backgroundthread.cpp b/tdespell2/backgroundthread.cpp
index 0f3471537..0f3471537 100644
--- a/kspell2/backgroundthread.cpp
+++ b/tdespell2/backgroundthread.cpp
diff --git a/kspell2/backgroundthread.h b/tdespell2/backgroundthread.h
index 12c631c2b..12c631c2b 100644
--- a/kspell2/backgroundthread.h
+++ b/tdespell2/backgroundthread.h
diff --git a/kspell2/broker.cpp b/tdespell2/broker.cpp
index 6d17c403f..4dfc0f211 100644
--- a/kspell2/broker.cpp
+++ b/tdespell2/broker.cpp
@@ -25,8 +25,8 @@
 #include "defaultdictionary.h"
 #include "dictionary.h"
 
-#include <kparts/plugin.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/plugin.h>
+#include <tdeparts/componentfactory.h>
 
 #include <kplugininfo.h>
 #include <ktrader.h>
@@ -37,7 +37,7 @@
 #include <tqptrdict.h>
 #include <tqmap.h>
 
-#define DEFAULT_CONFIG_FILE   "kspellrc"
+#define DEFAULT_CONFIG_FILE   "tdespellrc"
 
 namespace KSpell2
 {
diff --git a/kspell2/broker.h b/tdespell2/broker.h
index 2539fbbec..26be0e11e 100644
--- a/kspell2/broker.h
+++ b/tdespell2/broker.h
@@ -63,7 +63,7 @@ namespace KSpell2
          * @param config is the name of config file which
          *        broker should use to read default language
          *        and default client values. If no value will
-         *        be passed Broker will use global kspellrc file.
+         *        be passed Broker will use global tdespellrc file.
          */
         static Broker *openBroker( KSharedConfig *config = 0 );
 
diff --git a/kspell2/client.cpp b/tdespell2/client.cpp
index ae470a77e..ae470a77e 100644
--- a/kspell2/client.cpp
+++ b/tdespell2/client.cpp
diff --git a/kspell2/client.h b/tdespell2/client.h
index 5bc5a2bb9..5bc5a2bb9 100644
--- a/kspell2/client.h
+++ b/tdespell2/client.h
diff --git a/kspell2/defaultdictionary.cpp b/tdespell2/defaultdictionary.cpp
index 39b80e7cf..39b80e7cf 100644
--- a/kspell2/defaultdictionary.cpp
+++ b/tdespell2/defaultdictionary.cpp
diff --git a/kspell2/defaultdictionary.h b/tdespell2/defaultdictionary.h
index 287bb7c21..287bb7c21 100644
--- a/kspell2/defaultdictionary.h
+++ b/tdespell2/defaultdictionary.h
diff --git a/kspell2/dictionary.h b/tdespell2/dictionary.h
index 31567ece9..31567ece9 100644
--- a/kspell2/dictionary.h
+++ b/tdespell2/dictionary.h
diff --git a/kspell2/filter.cpp b/tdespell2/filter.cpp
index 1604bcae1..1604bcae1 100644
--- a/kspell2/filter.cpp
+++ b/tdespell2/filter.cpp
diff --git a/kspell2/filter.h b/tdespell2/filter.h
index c89ce6fc7..c89ce6fc7 100644
--- a/kspell2/filter.h
+++ b/tdespell2/filter.h
diff --git a/kspell2/plugins/CMakeLists.txt b/tdespell2/plugins/CMakeLists.txt
index 062d033d2..062d033d2 100644
--- a/kspell2/plugins/CMakeLists.txt
+++ b/tdespell2/plugins/CMakeLists.txt
diff --git a/kspell2/plugins/Makefile.am b/tdespell2/plugins/Makefile.am
index ffd383c87..ffd383c87 100644
--- a/kspell2/plugins/Makefile.am
+++ b/tdespell2/plugins/Makefile.am
diff --git a/kspell2/plugins/aspell/CMakeLists.txt b/tdespell2/plugins/aspell/CMakeLists.txt
index 6d1e1ac9b..9ae66d01b 100644
--- a/kspell2/plugins/aspell/CMakeLists.txt
+++ b/tdespell2/plugins/aspell/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kspell2
+  ${CMAKE_SOURCE_DIR}/tdespell2
   ${CMAKE_SOURCE_DIR}/tdecore
   ${ASPELL_INCLUDE_DIRS}
 )
@@ -26,19 +26,19 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kspell_aspell.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdespell_aspell.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kspell_aspell ##############################
+#### tdespell_aspell ##############################
 
-set( target kspell_aspell )
+set( target tdespell_aspell )
 
 set( ${target}_SRCS
-  kspell_aspellclient.cpp kspell_aspelldict.cpp
+  tdespell_aspellclient.cpp tdespell_aspelldict.cpp
 )
 
 tde_add_kpart( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kspell2-shared ${ASPELL_LIBRARIES}
+  LINK tdespell2-shared ${ASPELL_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdespell2/plugins/aspell/Makefile.am b/tdespell2/plugins/aspell/Makefile.am
new file mode 100644
index 000000000..4d40583f1
--- /dev/null
+++ b/tdespell2/plugins/aspell/Makefile.am
@@ -0,0 +1,17 @@
+METASOURCES = AUTO
+
+AM_CPPFLAGS = -I$(top_srcdir)/tdespell2 -I$(top_srcdir) $(all_includes)
+
+# For the future: examine if condensing the tons of *_LDFLAGS variables
+# into $(all_libraries) isn't better
+AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
+
+kde_module_LTLIBRARIES = tdespell_aspell.la
+
+tdespell_aspell_la_SOURCES = tdespell_aspellclient.cpp tdespell_aspelldict.cpp
+
+tdespell_aspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
+tdespell_aspell_la_LIBADD = ../../ui/libtdespell2.la -laspell $(LIB_QT) $(LIB_TDECORE)
+
+service_DATA = tdespell_aspell.desktop
+servicedir = $(kde_servicesdir)
diff --git a/kspell2/plugins/aspell/kspell_aspell.desktop b/tdespell2/plugins/aspell/tdespell_aspell.desktop
index 3b66458de..af78175f0 100644
--- a/kspell2/plugins/aspell/kspell_aspell.desktop
+++ b/tdespell2/plugins/aspell/tdespell_aspell.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KSpell/Client
-X-TDE-Library=kspell_aspell
+X-TDE-Library=tdespell_aspell
 X-TDE-PluginInfo-Author=Zack Rusin
 X-TDE-PluginInfo-Email=zack@kde.org
-X-TDE-PluginInfo-Name=kspell_aspell
+X-TDE-PluginInfo-Name=tdespell_aspell
 X-TDE-PluginInfo-Version=0.0.1
 X-TDE-PluginInfo-Website=http://www.kde.org
 X-TDE-PluginInfo-Category=Clients
diff --git a/kspell2/plugins/aspell/kspell_aspellclient.cpp b/tdespell2/plugins/aspell/tdespell_aspellclient.cpp
index 3577dd795..a9dcf4241 100644
--- a/kspell2/plugins/aspell/kspell_aspellclient.cpp
+++ b/tdespell2/plugins/aspell/tdespell_aspellclient.cpp
@@ -1,5 +1,5 @@
 /*
- * kspell_aspellclient.cpp
+ * tdespell_aspellclient.cpp
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  *
@@ -18,15 +18,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
-#include "kspell_aspellclient.h"
+#include "tdespell_aspellclient.h"
 
-#include "kspell_aspelldict.h"
+#include "tdespell_aspelldict.h"
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
 typedef KGenericFactory<ASpellClient> ASpellClientFactory;
-K_EXPORT_COMPONENT_FACTORY( kspell_aspell, ASpellClientFactory( "kspell_aspell" )  )
+K_EXPORT_COMPONENT_FACTORY( tdespell_aspell, ASpellClientFactory( "tdespell_aspell" )  )
 
 using namespace KSpell2;
 
@@ -63,4 +63,4 @@ TQStringList ASpellClient::languages() const
     return langs;
 }
 
-#include "kspell_aspellclient.moc"
+#include "tdespell_aspellclient.moc"
diff --git a/kspell2/plugins/aspell/kspell_aspellclient.h b/tdespell2/plugins/aspell/tdespell_aspellclient.h
index f2439989c..6da78f000 100644
--- a/kspell2/plugins/aspell/kspell_aspellclient.h
+++ b/tdespell2/plugins/aspell/tdespell_aspellclient.h
@@ -1,5 +1,5 @@
 /*
- * kspell_aspellclient.h
+ * tdespell_aspellclient.h
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  *
diff --git a/kspell2/plugins/aspell/kspell_aspelldict.cpp b/tdespell2/plugins/aspell/tdespell_aspelldict.cpp
index 6687f2106..c88508c6f 100644
--- a/kspell2/plugins/aspell/kspell_aspelldict.cpp
+++ b/tdespell2/plugins/aspell/tdespell_aspelldict.cpp
@@ -1,5 +1,5 @@
 /**
- * kspell_aspelldict.cpp
+ * tdespell_aspelldict.cpp
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  *
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
-#include "kspell_aspelldict.h"
+#include "tdespell_aspelldict.h"
 
 #include <kdebug.h>
 
diff --git a/kspell2/plugins/aspell/kspell_aspelldict.h b/tdespell2/plugins/aspell/tdespell_aspelldict.h
index 2ff51c056..6b6174a1c 100644
--- a/kspell2/plugins/aspell/kspell_aspelldict.h
+++ b/tdespell2/plugins/aspell/tdespell_aspelldict.h
@@ -1,5 +1,5 @@
 /**
- * kspell_aspelldict.h
+ * tdespell_aspelldict.h
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  *
diff --git a/kspell2/plugins/configure.in.bot b/tdespell2/plugins/configure.in.bot
index e47c874e0..e47c874e0 100644
--- a/kspell2/plugins/configure.in.bot
+++ b/tdespell2/plugins/configure.in.bot
diff --git a/kspell2/plugins/configure.in.in b/tdespell2/plugins/configure.in.in
index 8aaf6de2c..8aaf6de2c 100644
--- a/kspell2/plugins/configure.in.in
+++ b/tdespell2/plugins/configure.in.in
diff --git a/kspell2/plugins/hspell/CMakeLists.txt b/tdespell2/plugins/hspell/CMakeLists.txt
index 188e92c84..960b54ff4 100644
--- a/kspell2/plugins/hspell/CMakeLists.txt
+++ b/tdespell2/plugins/hspell/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kspell2
+  ${CMAKE_SOURCE_DIR}/tdespell2
   ${CMAKE_SOURCE_DIR}/tdecore
   ${HSPELL_INCLUDE_DIRS}
 )
@@ -26,24 +26,24 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kspell_hspell.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdespell_hspell.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kspell_hspell ##############################
+#### tdespell_hspell ##############################
 
 ### FIXME Not checked because hspell was removed from gentoo few years ago.
 ### FIXME The maintainer recommend to use aspell with hebrew dictionary.
 ### FIXME Maybe support for hspell will be removed too?
 ### FIXME http://bugs.gentoo.org/show_bug.cgi?id=177546
 
-set( target kspell_hspell )
+set( target tdespell_hspell )
 
 set( ${target}_SRCS
-  kspell_hspellclient.cpp kspell_hspelldict.cpp
+  tdespell_hspellclient.cpp tdespell_hspelldict.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kspell2-shared ${HSPELL_LIBRARIES}
+  LINK tdespell2-shared ${HSPELL_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdespell2/plugins/hspell/Makefile.am b/tdespell2/plugins/hspell/Makefile.am
new file mode 100644
index 000000000..fb4a193f9
--- /dev/null
+++ b/tdespell2/plugins/hspell/Makefile.am
@@ -0,0 +1,17 @@
+METASOURCES = AUTO
+
+AM_CPPFLAGS = -I$(top_srcdir)/tdespell2 -I$(top_srcdir) $(all_includes)
+
+# For the future: examine if condensing the tons of *_LDFLAGS variables
+# into $(all_libraries) isn't better
+AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
+
+kde_module_LTLIBRARIES = tdespell_hspell.la
+
+tdespell_hspell_la_SOURCES = tdespell_hspellclient.cpp tdespell_hspelldict.cpp
+
+tdespell_hspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
+tdespell_hspell_la_LIBADD = ../../ui/libtdespell2.la -lhspell -lz $(LIB_QT) $(LIB_TDECORE)
+
+service_DATA = tdespell_hspell.desktop
+servicedir = $(kde_servicesdir)
diff --git a/kspell2/plugins/hspell/kspell_hspell.desktop b/tdespell2/plugins/hspell/tdespell_hspell.desktop
index 0194c9ffb..dbeaac73f 100644
--- a/kspell2/plugins/hspell/kspell_hspell.desktop
+++ b/tdespell2/plugins/hspell/tdespell_hspell.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KSpell/Client
-X-TDE-Library=kspell_hspell
+X-TDE-Library=tdespell_hspell
 X-TDE-PluginInfo-Author=Mashrab Kuvatov
 X-TDE-PluginInfo-Email=kmashrab@uni-bremen.de
-X-TDE-PluginInfo-Name=kspell_hspell
+X-TDE-PluginInfo-Name=tdespell_hspell
 X-TDE-PluginInfo-Version=0.0.1
 X-TDE-PluginInfo-Website=http://www.kde.org
 X-TDE-PluginInfo-Category=Clients
diff --git a/kspell2/plugins/hspell/kspell_hspellclient.cpp b/tdespell2/plugins/hspell/tdespell_hspellclient.cpp
index 716300c20..331b0a9cb 100644
--- a/kspell2/plugins/hspell/kspell_hspellclient.cpp
+++ b/tdespell2/plugins/hspell/tdespell_hspellclient.cpp
@@ -1,5 +1,5 @@
 /**
- * kspell_hspellclient.cpp
+ * tdespell_hspellclient.cpp
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  * Copyright (C)  2005  Mashrab Kuvatov <kmashrab@uni-bremen.de>
@@ -19,15 +19,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
-#include "kspell_hspellclient.h"
+#include "tdespell_hspellclient.h"
 
-#include "kspell_hspelldict.h"
+#include "tdespell_hspelldict.h"
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
 typedef KGenericFactory<HSpellClient> HSpellClientFactory;
-K_EXPORT_COMPONENT_FACTORY( kspell_hspell, HSpellClientFactory( "kspell_hspell" )  )
+K_EXPORT_COMPONENT_FACTORY( tdespell_hspell, HSpellClientFactory( "tdespell_hspell" )  )
 
 using namespace KSpell2;
 
@@ -54,4 +54,4 @@ TQStringList HSpellClient::languages() const
     return langs;
 }
 
-#include "kspell_hspellclient.moc"
+#include "tdespell_hspellclient.moc"
diff --git a/kspell2/plugins/hspell/kspell_hspellclient.h b/tdespell2/plugins/hspell/tdespell_hspellclient.h
index a26aca227..993cfe907 100644
--- a/kspell2/plugins/hspell/kspell_hspellclient.h
+++ b/tdespell2/plugins/hspell/tdespell_hspellclient.h
@@ -1,5 +1,5 @@
 /**
- * kspell_hspellclient.h
+ * tdespell_hspellclient.h
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  * Copyright (C)  2005  Mashrab Kuvatov <kmashrab@uni-bremen.de>
diff --git a/kspell2/plugins/hspell/kspell_hspelldict.cpp b/tdespell2/plugins/hspell/tdespell_hspelldict.cpp
index 04f055e86..fa2efaccb 100644
--- a/kspell2/plugins/hspell/kspell_hspelldict.cpp
+++ b/tdespell2/plugins/hspell/tdespell_hspelldict.cpp
@@ -1,5 +1,5 @@
 /**
- * kspell_hspelldict.cpp
+ * tdespell_hspelldict.cpp
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  * Copyright (C)  2005  Mashrab Kuvatov <kmashrab@uni-bremen.de>
@@ -20,7 +20,7 @@
  * 02110-1301  USA
  */
 
-#include "kspell_hspelldict.h"
+#include "tdespell_hspelldict.h"
 #include <kdebug.h>
 
 #include <tqtextcodec.h>
diff --git a/kspell2/plugins/hspell/kspell_hspelldict.h b/tdespell2/plugins/hspell/tdespell_hspelldict.h
index ff0302e4b..7b18003be 100644
--- a/kspell2/plugins/hspell/kspell_hspelldict.h
+++ b/tdespell2/plugins/hspell/tdespell_hspelldict.h
@@ -1,5 +1,5 @@
 /**
- * kspell_hspelldict.h
+ * tdespell_hspelldict.h
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  * Copyright (C)  2005  Mashrab Kuvatov <kmashrab@uni-bremen.de>
diff --git a/kspell2/plugins/ispell/CMakeLists.txt b/tdespell2/plugins/ispell/CMakeLists.txt
index f3179ed8a..c8e5a4ec6 100644
--- a/kspell2/plugins/ispell/CMakeLists.txt
+++ b/tdespell2/plugins/ispell/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kspell2
+  ${CMAKE_SOURCE_DIR}/tdespell2
   ${CMAKE_SOURCE_DIR}/tdecore
 )
 
@@ -24,21 +24,21 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kspell_ispell.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdespell_ispell.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kspell_ispell ##############################
+#### tdespell_ispell ##############################
 
-set( target kspell_ispell )
+set( target tdespell_ispell )
 
 set( ${target}_SRCS
-  kspell_ispellclient.cpp kspell_ispelldict.cpp
+  tdespell_ispellclient.cpp tdespell_ispelldict.cpp
   correct.cpp good.cpp hash.cpp lookup.cpp makedent.cpp
   tgood.cpp ispell_checker.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kspell2-shared
+  LINK tdespell2-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdespell2/plugins/ispell/Makefile.am b/tdespell2/plugins/ispell/Makefile.am
new file mode 100644
index 000000000..15dffda28
--- /dev/null
+++ b/tdespell2/plugins/ispell/Makefile.am
@@ -0,0 +1,24 @@
+METASOURCES = AUTO
+
+AM_CPPFLAGS = -I$(top_srcdir)/tdespell2 -I$(top_srcdir) $(all_includes)
+
+# For the future: examine if condensing the tons of *_LDFLAGS variables
+# into $(all_libraries) isn't better
+AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
+
+kde_module_LTLIBRARIES = tdespell_ispell.la
+
+tdespell_ispell_la_SOURCES = tdespell_ispellclient.cpp tdespell_ispelldict.cpp \
+	correct.cpp		\
+	good.cpp		\
+	hash.cpp		\
+	lookup.cpp		\
+	makedent.cpp		\
+	tgood.cpp		\
+	ispell_checker.cpp
+
+tdespell_ispell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
+tdespell_ispell_la_LIBADD = ../../ui/libtdespell2.la  $(LIB_QT) $(LIB_TDECORE)
+
+service_DATA = tdespell_ispell.desktop
+servicedir = $(kde_servicesdir)
diff --git a/kspell2/plugins/ispell/correct.cpp b/tdespell2/plugins/ispell/correct.cpp
index 65e98fa6d..65e98fa6d 100644
--- a/kspell2/plugins/ispell/correct.cpp
+++ b/tdespell2/plugins/ispell/correct.cpp
diff --git a/kspell2/plugins/ispell/good.cpp b/tdespell2/plugins/ispell/good.cpp
index 351106d99..351106d99 100644
--- a/kspell2/plugins/ispell/good.cpp
+++ b/tdespell2/plugins/ispell/good.cpp
diff --git a/kspell2/plugins/ispell/hash.cpp b/tdespell2/plugins/ispell/hash.cpp
index 03bd880bb..03bd880bb 100644
--- a/kspell2/plugins/ispell/hash.cpp
+++ b/tdespell2/plugins/ispell/hash.cpp
diff --git a/kspell2/plugins/ispell/ispell.h b/tdespell2/plugins/ispell/ispell.h
index 587defc07..587defc07 100644
--- a/kspell2/plugins/ispell/ispell.h
+++ b/tdespell2/plugins/ispell/ispell.h
diff --git a/kspell2/plugins/ispell/ispell_checker.cpp b/tdespell2/plugins/ispell/ispell_checker.cpp
index fba7d3479..c07d9a55f 100644
--- a/kspell2/plugins/ispell/ispell_checker.cpp
+++ b/tdespell2/plugins/ispell/ispell_checker.cpp
@@ -1,5 +1,5 @@
 /* vim: set sw=8: -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* kspell2 - adopted from Enchant
+/* tdespell2 - adopted from Enchant
  * Copyright (C) 2003 Dom Lachowicz
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  *
diff --git a/kspell2/plugins/ispell/ispell_checker.h b/tdespell2/plugins/ispell/ispell_checker.h
index 08783922a..84faa34f9 100644
--- a/kspell2/plugins/ispell/ispell_checker.h
+++ b/tdespell2/plugins/ispell/ispell_checker.h
@@ -1,5 +1,5 @@
 /* vim: set sw=8: -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* kspell2 - adopted from Enchant
+/* tdespell2 - adopted from Enchant
  * Copyright (C) 2003 Dom Lachowicz
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  *
diff --git a/kspell2/plugins/ispell/ispell_def.h b/tdespell2/plugins/ispell/ispell_def.h
index b3d149c43..b3d149c43 100644
--- a/kspell2/plugins/ispell/ispell_def.h
+++ b/tdespell2/plugins/ispell/ispell_def.h
diff --git a/kspell2/plugins/ispell/lookup.cpp b/tdespell2/plugins/ispell/lookup.cpp
index 6030f49d0..b815ebd98 100644
--- a/kspell2/plugins/ispell/lookup.cpp
+++ b/tdespell2/plugins/ispell/lookup.cpp
@@ -1,5 +1,5 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* kspell2 - adopted from enchant
+/* tdespell2 - adopted from enchant
  * Copyright (C) 2003 Dom Lachowicz
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  *
diff --git a/kspell2/plugins/ispell/makedent.cpp b/tdespell2/plugins/ispell/makedent.cpp
index 9c168dc17..9c168dc17 100644
--- a/kspell2/plugins/ispell/makedent.cpp
+++ b/tdespell2/plugins/ispell/makedent.cpp
diff --git a/kspell2/plugins/ispell/msgs.h b/tdespell2/plugins/ispell/msgs.h
index e3f30220c..e3f30220c 100644
--- a/kspell2/plugins/ispell/msgs.h
+++ b/tdespell2/plugins/ispell/msgs.h
diff --git a/kspell2/plugins/ispell/sp_spell.h b/tdespell2/plugins/ispell/sp_spell.h
index 9e1d7b903..9e1d7b903 100644
--- a/kspell2/plugins/ispell/sp_spell.h
+++ b/tdespell2/plugins/ispell/sp_spell.h
diff --git a/kspell2/plugins/ispell/kspell_ispell.desktop b/tdespell2/plugins/ispell/tdespell_ispell.desktop
index 8ce0cc05b..4b1aebcb7 100644
--- a/kspell2/plugins/ispell/kspell_ispell.desktop
+++ b/tdespell2/plugins/ispell/tdespell_ispell.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KSpell/Client
-X-TDE-Library=kspell_ispell
+X-TDE-Library=tdespell_ispell
 X-TDE-PluginInfo-Author=Zack Rusin
 X-TDE-PluginInfo-Email=zack@kde.org
-X-TDE-PluginInfo-Name=kspell_ispell
+X-TDE-PluginInfo-Name=tdespell_ispell
 X-TDE-PluginInfo-Version=0.0.1
 X-TDE-PluginInfo-Website=http://www.kde.org
 X-TDE-PluginInfo-Category=Clients
diff --git a/kspell2/plugins/ispell/kspell_ispellclient.cpp b/tdespell2/plugins/ispell/tdespell_ispellclient.cpp
index 3b2fda4e0..1f2e9c8ba 100644
--- a/kspell2/plugins/ispell/kspell_ispellclient.cpp
+++ b/tdespell2/plugins/ispell/tdespell_ispellclient.cpp
@@ -1,5 +1,5 @@
 /*
- * kspell_aspellclient.cpp
+ * tdespell_aspellclient.cpp
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  *
@@ -18,16 +18,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
-#include "kspell_ispellclient.h"
+#include "tdespell_ispellclient.h"
 
-#include "kspell_ispelldict.h"
+#include "tdespell_ispelldict.h"
 #include "ispell_checker.h"
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
 typedef KGenericFactory<ISpellClient> ISpellClientFactory;
-K_EXPORT_COMPONENT_FACTORY( kspell_ispell, ISpellClientFactory( "kspell_ispell" )  )
+K_EXPORT_COMPONENT_FACTORY( tdespell_ispell, ISpellClientFactory( "tdespell_ispell" )  )
 
 using namespace KSpell2;
 
@@ -51,4 +51,4 @@ TQStringList ISpellClient::languages() const
     return ISpellChecker::allDics();
 }
 
-#include "kspell_ispellclient.moc"
+#include "tdespell_ispellclient.moc"
diff --git a/kspell2/plugins/ispell/kspell_ispellclient.h b/tdespell2/plugins/ispell/tdespell_ispellclient.h
index 6a67bb1a6..06cbe0bab 100644
--- a/kspell2/plugins/ispell/kspell_ispellclient.h
+++ b/tdespell2/plugins/ispell/tdespell_ispellclient.h
@@ -1,5 +1,5 @@
 /*
- * kspell_ispellclient.h
+ * tdespell_ispellclient.h
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  *
diff --git a/kspell2/plugins/ispell/kspell_ispelldict.cpp b/tdespell2/plugins/ispell/tdespell_ispelldict.cpp
index 35c1e9276..089fabc9d 100644
--- a/kspell2/plugins/ispell/kspell_ispelldict.cpp
+++ b/tdespell2/plugins/ispell/tdespell_ispelldict.cpp
@@ -1,5 +1,5 @@
 /**
- * kspell_aspelldict.cpp
+ * tdespell_aspelldict.cpp
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  *
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
-#include "kspell_ispelldict.h"
+#include "tdespell_ispelldict.h"
 
 #include <kdebug.h>
 
diff --git a/kspell2/plugins/ispell/kspell_ispelldict.h b/tdespell2/plugins/ispell/tdespell_ispelldict.h
index 2ca9e7d93..7513d094c 100644
--- a/kspell2/plugins/ispell/kspell_ispelldict.h
+++ b/tdespell2/plugins/ispell/tdespell_ispelldict.h
@@ -1,5 +1,5 @@
 /**
- * kspell_ispelldict.h
+ * tdespell_ispelldict.h
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  *
diff --git a/kspell2/plugins/ispell/tgood.cpp b/tdespell2/plugins/ispell/tgood.cpp
index 06fbc99ef..06fbc99ef 100644
--- a/kspell2/plugins/ispell/tgood.cpp
+++ b/tdespell2/plugins/ispell/tgood.cpp
diff --git a/kspell2/settings.cpp b/tdespell2/settings.cpp
index 63b45e89d..63b45e89d 100644
--- a/kspell2/settings.cpp
+++ b/tdespell2/settings.cpp
diff --git a/kspell2/settings.h b/tdespell2/settings.h
index 2346f0772..2346f0772 100644
--- a/kspell2/settings.h
+++ b/tdespell2/settings.h
diff --git a/kspell2/kspellclient.desktop b/tdespell2/tdespellclient.desktop
index a637e7a0f..a637e7a0f 100644
--- a/kspell2/kspellclient.desktop
+++ b/tdespell2/tdespellclient.desktop
diff --git a/tdespell2/tests/Makefile.am b/tdespell2/tests/Makefile.am
new file mode 100644
index 000000000..682ad272a
--- /dev/null
+++ b/tdespell2/tests/Makefile.am
@@ -0,0 +1,24 @@
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -I$(top_srcdir)/tdespell2 -I$(top_srcdir)/tdespell2/ui $(all_includes)
+METASOURCES = AUTO
+
+
+check_PROGRAMS = test test_filter backgroundtest \
+	test_dialog test_highlighter test_configdialog
+
+test_SOURCES = test.cpp
+test_LDADD = ../ui/libtdespell2.la $(LIB_TDECORE)
+
+test_filter_SOURCES = test_filter.cpp
+test_filter_LDADD = ../ui/libtdespell2.la $(LIB_TDECORE)
+
+backgroundtest_SOURCES = backgroundtest.cpp
+backgroundtest_LDADD = ../ui/libtdespell2.la $(LIB_TDECORE)
+
+test_dialog_SOURCES = test_dialog.cpp
+test_dialog_LDADD = ../ui/libtdespell2.la $(LIB_TDECORE)
+
+test_highlighter_SOURCES = test_highlighter.cpp
+test_highlighter_LDADD = ../ui/libtdespell2_noinst.la ../libtdespell2base.la $(LIB_TDECORE) $(LIB_KPARTS) ../../tdeutils/libtdeutils.la
+
+test_configdialog_SOURCES = test_configdialog.cpp
+test_configdialog_LDADD = ../ui/libtdespell2_noinst.la ../libtdespell2base.la $(LIB_TDECORE) $(LIB_KPARTS) ../../tdeutils/libtdeutils.la
diff --git a/kspell2/tests/backgroundtest.cpp b/tdespell2/tests/backgroundtest.cpp
index a732799e5..aca02af53 100644
--- a/kspell2/tests/backgroundtest.cpp
+++ b/tdespell2/tests/backgroundtest.cpp
@@ -89,7 +89,7 @@ KHTML XPath\
 There are some advantages to the XPath implementation Zack and I are working\
 on, namely: \
  \
-- Ease of integration with the rest of kjs/khtml.\
+- Ease of integration with the rest of kjs/tdehtml.\
 - Use of dom2 traversal (which will also be available to use directly).\
 - C++ rather than C and a wrapper (reducing the overheads).\
 - The code is clean and uses familiar types and idioms. \
@@ -105,10 +105,10 @@ seems sensible.\
 Building \
 ========\
  \
-This code needs to live in a subdir off the khtml directory in tdelibs. The\
+This code needs to live in a subdir off the tdehtml directory in tdelibs. The\
 subdir should be called 'xpath'. The easiest way to regenerate the makefiles\
 is to go to the root of the tdelibs tree and run: \
-  create_makefiles khtml/xpath\
+  create_makefiles tdehtml/xpath\
  \
 This code is intended to compile, but not to work.\
  \
diff --git a/kspell2/tests/backgroundtest.h b/tdespell2/tests/backgroundtest.h
index 2f08e9ce0..2f08e9ce0 100644
--- a/kspell2/tests/backgroundtest.h
+++ b/tdespell2/tests/backgroundtest.h
diff --git a/kspell2/tests/test.cpp b/tdespell2/tests/test.cpp
index e8ceabaf7..e8ceabaf7 100644
--- a/kspell2/tests/test.cpp
+++ b/tdespell2/tests/test.cpp
diff --git a/kspell2/tests/test_config.cpp b/tdespell2/tests/test_config.cpp
index 2d243bd46..2d243bd46 100644
--- a/kspell2/tests/test_config.cpp
+++ b/tdespell2/tests/test_config.cpp
diff --git a/kspell2/tests/test_configdialog.cpp b/tdespell2/tests/test_configdialog.cpp
index a9ff16cdd..a9ff16cdd 100644
--- a/kspell2/tests/test_configdialog.cpp
+++ b/tdespell2/tests/test_configdialog.cpp
diff --git a/kspell2/tests/test_dialog.cpp b/tdespell2/tests/test_dialog.cpp
index 19503e307..19503e307 100644
--- a/kspell2/tests/test_dialog.cpp
+++ b/tdespell2/tests/test_dialog.cpp
diff --git a/kspell2/tests/test_dialog.h b/tdespell2/tests/test_dialog.h
index e8a6cf970..e8a6cf970 100644
--- a/kspell2/tests/test_dialog.h
+++ b/tdespell2/tests/test_dialog.h
diff --git a/kspell2/tests/test_filter.cpp b/tdespell2/tests/test_filter.cpp
index 430f157dd..430f157dd 100644
--- a/kspell2/tests/test_filter.cpp
+++ b/tdespell2/tests/test_filter.cpp
diff --git a/kspell2/tests/test_highlighter.cpp b/tdespell2/tests/test_highlighter.cpp
index c11972254..c11972254 100644
--- a/kspell2/tests/test_highlighter.cpp
+++ b/tdespell2/tests/test_highlighter.cpp
diff --git a/kspell2/threadevents.h b/tdespell2/threadevents.h
index 87a516148..87a516148 100644
--- a/kspell2/threadevents.h
+++ b/tdespell2/threadevents.h
diff --git a/kspell2/ui/CMakeLists.txt b/tdespell2/ui/CMakeLists.txt
index a83774ddd..8d0521c76 100644
--- a/kspell2/ui/CMakeLists.txt
+++ b/tdespell2/ui/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kspell2
+  ${CMAKE_SOURCE_DIR}/tdespell2
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
 )
@@ -32,16 +32,16 @@ link_directories(
 
 install( FILES
     dialog.h highlighter.h configdialog.h configwidget.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kspell2 )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdespell2 )
 
 
-#### kspell2 (static) ###########################
+#### tdespell2 (static) ###########################
 
-set( target kspell2 )
+set( target tdespell2 )
 
 set( ${target}_SRCS
    configwidget.cpp highlighter.cpp configdialog.cpp
-   kspell2ui.ui configui.ui
+   tdespell2ui.ui configui.ui
 )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
@@ -49,19 +49,19 @@ tde_add_library( ${target} STATIC_PIC AUTOMOC
 )
 
 
-#### kspell2 ####################################
+#### tdespell2 ####################################
 
-set( target kspell2 )
+set( target tdespell2 )
 
 set( ${target}_SRCS
   configwidget.cpp highlighter.cpp configdialog.cpp
-  kspell2ui.ui configui.ui
+  tdespell2ui.ui configui.ui
   dialog.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kspell2base-static kutils-shared
+  LINK tdespell2base-static tdeutils-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/tdespell2/ui/Makefile.am b/tdespell2/ui/Makefile.am
new file mode 100644
index 000000000..713270c9d
--- /dev/null
+++ b/tdespell2/ui/Makefile.am
@@ -0,0 +1,21 @@
+METASOURCES = AUTO
+
+lib_LTLIBRARIES = libtdespell2.la
+# Put most of the code in a noinst lib, for the unit tests to be able to use internal classes.
+noinst_LTLIBRARIES = libtdespell2_noinst.la
+
+KDE_CXXFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT
+INCLUDES = -I$(top_srcdir)/tdespell2 $(all_includes)
+
+tdespell2includedir = $(includedir)/tdespell2
+tdespell2include_HEADERS = dialog.h highlighter.h configdialog.h \
+	configwidget.h
+
+libtdespell2_noinst_la_SOURCES = tdespell2ui.ui configwidget.cpp \
+	highlighter.cpp configui.ui configdialog.cpp
+
+dialog.lo: tdespell2ui.h
+
+libtdespell2_la_SOURCES = dialog.cpp
+libtdespell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
+libtdespell2_la_LIBADD = libtdespell2_noinst.la ../libtdespell2base.la ../../tdeutils/libtdeutils.la  $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KFILE)
diff --git a/kspell2/ui/configdialog.cpp b/tdespell2/ui/configdialog.cpp
index 56e39ca2b..56e39ca2b 100644
--- a/kspell2/ui/configdialog.cpp
+++ b/tdespell2/ui/configdialog.cpp
diff --git a/kspell2/ui/configdialog.h b/tdespell2/ui/configdialog.h
index ead508d34..ead508d34 100644
--- a/kspell2/ui/configdialog.h
+++ b/tdespell2/ui/configdialog.h
diff --git a/kspell2/ui/configui.ui b/tdespell2/ui/configui.ui
index d6f6e596b..d6f6e596b 100644
--- a/kspell2/ui/configui.ui
+++ b/tdespell2/ui/configui.ui
diff --git a/kspell2/ui/configwidget.cpp b/tdespell2/ui/configwidget.cpp
index 6d98955ae..6d98955ae 100644
--- a/kspell2/ui/configwidget.cpp
+++ b/tdespell2/ui/configwidget.cpp
diff --git a/kspell2/ui/configwidget.h b/tdespell2/ui/configwidget.h
index e3fd1542b..e3fd1542b 100644
--- a/kspell2/ui/configwidget.h
+++ b/tdespell2/ui/configwidget.h
diff --git a/kspell2/ui/dialog.cpp b/tdespell2/ui/dialog.cpp
index e8444bec6..82548a406 100644
--- a/kspell2/ui/dialog.cpp
+++ b/tdespell2/ui/dialog.cpp
@@ -19,7 +19,7 @@
  * 02110-1301  USA
  */
 #include "dialog.h"
-#include "kspell2ui.h"
+#include "tdespell2ui.h"
 
 #include "backgroundchecker.h"
 #include "broker.h"
diff --git a/kspell2/ui/dialog.h b/tdespell2/ui/dialog.h
index 1da714c7c..1da714c7c 100644
--- a/kspell2/ui/dialog.h
+++ b/tdespell2/ui/dialog.h
diff --git a/kspell2/ui/highlighter.cpp b/tdespell2/ui/highlighter.cpp
index 2d185462d..2d185462d 100644
--- a/kspell2/ui/highlighter.cpp
+++ b/tdespell2/ui/highlighter.cpp
diff --git a/kspell2/ui/highlighter.h b/tdespell2/ui/highlighter.h
index 2309c3a64..2309c3a64 100644
--- a/kspell2/ui/highlighter.h
+++ b/tdespell2/ui/highlighter.h
diff --git a/kspell2/ui/kspell2ui.ui b/tdespell2/ui/tdespell2ui.ui
index e221c69ba..e221c69ba 100644
--- a/kspell2/ui/kspell2ui.ui
+++ b/tdespell2/ui/tdespell2ui.ui
diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt
index f7c1027d7..e738e7be3 100644
--- a/tdeui/CMakeLists.txt
+++ b/tdeui/CMakeLists.txt
@@ -72,7 +72,7 @@ install( FILES
     kstringvalidator.h twindowinfo.h
     ktextedit.h kpassivepopup.h
     kdatetimewidget.h ktimewidget.h ktimezonewidget.h kscrollview.h
-    kspell.h ksconfig.h kspelldlg.h ksyntaxhighlighter.h
+    tdespell.h ksconfig.h tdespelldlg.h ksyntaxhighlighter.h
     ktabbar.h ktabwidget.h ksplashscreen.h kconfigdialog.h
     kactionselector.h klanguagebutton.h klistviewsearchline.h
     kpixmapregionselectorwidget.h kpixmapregionselectordialog.h
@@ -136,9 +136,9 @@ set( ${target}_SRCS
   kstringvalidator.cpp kactivelabel.cpp
   twindowinfo.cpp ktextedit.cpp kwizard.cpp kpassivepopup.cpp
   ktoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp
-  ksconfig.cpp kspelldlg.cpp
-  kspell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp
-  ksplashscreen.cpp kspellui.ui kconfigdialog.cpp
+  ksconfig.cpp tdespelldlg.cpp
+  tdespell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp
+  ksplashscreen.cpp tdespellui.ui kconfigdialog.cpp
   kactionselector.cpp klanguagebutton.cpp klistviewsearchline.cpp
   kpixmapregionselectorwidget.cpp kpixmapregionselectordialog.cpp
   kwhatsthismanager.cpp kiconviewsearchline.cpp
@@ -154,9 +154,9 @@ tde_add_library( ${target} SHARED AUTOMOC
 )
 
 
-##### libkspell #################################
+##### libtdespell #################################
 
-set( target kspell )
+set( target tdespell )
 
 configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY )
 
diff --git a/tdeui/Makefile.am b/tdeui/Makefile.am
index b28c38584..f3ccef8b7 100644
--- a/tdeui/Makefile.am
+++ b/tdeui/Makefile.am
@@ -26,12 +26,12 @@ INCLUDES= -I/usr/include/freetype2/ -I$(top_srcdir)/tdefx -I$(top_srcdir)/interf
 # into $(all_libraries) isn't better
 AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
 
-lib_LTLIBRARIES = libtdeui.la libkspell.la
+lib_LTLIBRARIES = libtdeui.la libtdespell.la
 libtdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
 libtdeui_la_LIBADD = ../tdecore/libtdecore.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/tdefx/libtdefx.la $(LIB_XEXT)
 
-libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined
-libkspell_la_SOURCES = dummy.cpp
+libtdespell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined
+libtdespell_la_SOURCES = dummy.cpp
 
 picsdir = $(kde_datadir)/tdeui/pics
 pics_DATA = aboutkde.png ktip-bulb.png ktip-background.png
@@ -69,7 +69,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 		kstringvalidator.h twindowinfo.h \
 		ktextedit.h kpassivepopup.h \
 		kdatetimewidget.h ktimewidget.h ktimezonewidget.h kscrollview.h \
-		kspell.h ksconfig.h kspelldlg.h ksyntaxhighlighter.h \
+		tdespell.h ksconfig.h tdespelldlg.h ksyntaxhighlighter.h \
 		ktabbar.h ktabwidget.h ksplashscreen.h kconfigdialog.h \
 		kactionselector.h klanguagebutton.h klistviewsearchline.h \
 		kpixmapregionselectorwidget.h kpixmapregionselectordialog.h \
@@ -117,9 +117,9 @@ libtdeui_la_SOURCES = \
 		kstringvalidator.cpp kactivelabel.cpp \
 		twindowinfo.cpp ktextedit.cpp kwizard.cpp kpassivepopup.cpp \
 		ktoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp \
-		ksconfig.cpp kspelldlg.cpp \
-		kspell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp \
-		ksplashscreen.cpp kspellui.ui kconfigdialog.cpp \
+		ksconfig.cpp tdespelldlg.cpp \
+		tdespell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp \
+		ksplashscreen.cpp tdespellui.ui kconfigdialog.cpp \
 		kactionselector.cpp klanguagebutton.cpp klistviewsearchline.cpp \
 		kpixmapregionselectorwidget.cpp kpixmapregionselectordialog.cpp \
 		kwhatsthismanager.cpp kiconviewsearchline.cpp \
@@ -166,6 +166,6 @@ dummy.cpp:
 	echo "}" >> dummy.cpp
 	echo "#endif" >> dummy.cpp
 
-DOXYGEN_REFERENCES = tdecore tdefx dcop kio kutils
+DOXYGEN_REFERENCES = tdecore tdefx dcop kio tdeutils
 DOXYGEN_SET_INTERNAL_DOCS = YES
 include ../admin/Doxyfile.am
diff --git a/tdeui/README.kspell b/tdeui/README.tdespell
index 9ae1afe84..e5262f057 100644
--- a/tdeui/README.kspell
+++ b/tdeui/README.tdespell
@@ -2,7 +2,7 @@ KSpell, by David Sweet
 ----------------------
 KSpell provides an interface to ASpell and International ISpell 3.1.  You
 should use it like a UI widget to provide spellchecking in your application. 
-See kspell.h and http://www.chaos.umd.edu/~dsweet/KDE/KSpell for
+See tdespell.h and http://www.chaos.umd.edu/~dsweet/KDE/KSpell for
 documentation.
 
 Settings
@@ -12,6 +12,6 @@ not only as a widget allowing the user to set KSpell preferences, but also
 as a data abstraction class allowing you to get and set the preferences from
 within your program.  You can pass an instance of KSpellConfig to KSpell
 and the spellchecker will run with the appropriate preference settings.  The
-preferences, when saved (see kspelldlg.h) are saved globally.  If needed,
+preferences, when saved (see tdespelldlg.h) are saved globally.  If needed,
 you can read them with KSpellDlg and set and use application-specific
 spellchecking settings.
diff --git a/tdeui/TODO.kspell b/tdeui/TODO.tdespell
index 99c9df408..99c9df408 100644
--- a/tdeui/TODO.kspell
+++ b/tdeui/TODO.tdespell
diff --git a/tdeui/kdepackages.h b/tdeui/kdepackages.h
index 92907a4bc..58ea0f867 100644
--- a/tdeui/kdepackages.h
+++ b/tdeui/kdepackages.h
@@ -341,7 +341,7 @@ const char * const packages[] = {
 "kcontrol/kcmknotify",
 "kcontrol/kcmkonq",
 "kcontrol/kcmkonqhtml",
-"kcontrol/kcmkresources",
+"kcontrol/kcmtderesources",
 "kcontrol/kcmksplash",
 "kcontrol/kcmkurifilt",
 "kcontrol/kcmkvaio",
@@ -408,12 +408,12 @@ const char * const packages[] = {
 "tdeaddons/kate-filetemplates",
 "tdeaddons/kate-insertcommand",
 "tdeaddons/kate-xmltools",
-"tdeaddons/khtmlsettings-plugin",
+"tdeaddons/tdehtmlsettings-plugin",
 "tdeaddons/useragent-plugin",
 "kdebugdialog",
 "tdelibs",
 "tdelibs/kbugreport",
-"tdelibs/kcertpart",
+"tdelibs/tdecertpart",
 "tdelibs/tdecore",
 "tdelibs/kded",
 "tdelibs/tdeinit",
@@ -423,14 +423,14 @@ const char * const packages[] = {
 "tdelibs/kimgio",
 "tdelibs/klauncher",
 "tdelibs/klocale",
-"tdelibs/kmdi",
+"tdelibs/tdemdi",
 "tdelibs/knetwork",
 "tdelibs/knewstuff",
 "tdelibs/knotify",
-"tdelibs/kspell",
+"tdelibs/tdespell",
 "tdelibs/kstyle",
-"tdelibs/ksycoca",
-"tdelibs/kwallet",
+"tdelibs/tdesycoca",
+"tdelibs/tdewallet",
 "tdelibs/qt",
 "kdelirc",
 "kdelirc/irkick",
@@ -782,8 +782,8 @@ const char * const packages[] = {
 "kmenuedit",
 "kmerlin",
 "kmessedwords",
-"kmid",
-"kmidi",
+"tdemid",
+"tdemidi",
 "kmilo",
 "kmilo/Asus",
 "kmilo/Dell i8k",
@@ -859,17 +859,17 @@ const char * const packages[] = {
 "konqueror/fsview",
 "konqueror/imagerotation",
 "konqueror/kcookiejar",
-"konqueror/khtml adblock",
-"konqueror/khtml ecma",
-"konqueror/khtml event",
-"konqueror/khtml forms",
-"konqueror/khtml image part",
-"konqueror/khtml parsing",
-"konqueror/khtml part",
-"konqueror/khtml printing",
-"konqueror/khtml renderer",
-"konqueror/khtml xml",
-"konqueror/khtml",
+"konqueror/tdehtml adblock",
+"konqueror/tdehtml ecma",
+"konqueror/tdehtml event",
+"konqueror/tdehtml forms",
+"konqueror/tdehtml image part",
+"konqueror/tdehtml parsing",
+"konqueror/tdehtml part",
+"konqueror/tdehtml printing",
+"konqueror/tdehtml renderer",
+"konqueror/tdehtml xml",
+"konqueror/tdehtml",
 "konqueror/kimgalleryplugin",
 "konqueror/kjava",
 "konqueror/kjs",
@@ -1005,9 +1005,9 @@ const char * const packages[] = {
 "kpresenter/usability",
 "kqf",
 "kquick",
-"krandr",
-"krandr/control center",
-"krandr/krandrtray",
+"tderandr",
+"tderandr/control center",
+"tderandr/tderandrtray",
 "krdc",
 "kreatecd",
 "krec",
@@ -1016,22 +1016,22 @@ const char * const packages[] = {
 "krec/wave_export",
 "krecord",
 "kregexpeditor",
-"kresources",
-"kresources/SLOX",
-"kresources/birthdays",
-"kresources/blogging",
-"kresources/bugzilla",
-"kresources/egroupware",
-"kresources/exchange",
-"kresources/featureplan",
-"kresources/framework",
-"kresources/groupdav",
-"kresources/groupwise",
-"kresources/imap",
-"kresources/ldap",
-"kresources/local",
-"kresources/newexchange",
-"kresources/remote",
+"tderesources",
+"tderesources/SLOX",
+"tderesources/birthdays",
+"tderesources/blogging",
+"tderesources/bugzilla",
+"tderesources/egroupware",
+"tderesources/exchange",
+"tderesources/featureplan",
+"tderesources/framework",
+"tderesources/groupdav",
+"tderesources/groupwise",
+"tderesources/imap",
+"tderesources/ldap",
+"tderesources/local",
+"tderesources/newexchange",
+"tderesources/remote",
 "kreversi",
 "krfb",
 "krichtexteditor",
@@ -1051,12 +1051,12 @@ const char * const packages[] = {
 "ksame",
 "ksayit",
 "kscd",
-"kscreensaver",
-"kscreensaver/kcheckpass",
-"kscreensaver/kpartsaver",
-"kscreensaver/ktux",
-"kscreensaver/kxsrun",
-"kscreensaver/screensavers",
+"tdescreensaver",
+"tdescreensaver/kcheckpass",
+"tdescreensaver/tdepartsaver",
+"tdescreensaver/ktux",
+"tdescreensaver/kxsrun",
+"tdescreensaver/screensavers",
 "kshisen",
 "ksim",
 "ksirc",
@@ -1145,7 +1145,7 @@ const char * const packages[] = {
 "kvim",
 "kvim/Vim KPart",
 "kvoctrain",
-"kwalletmanager",
+"tdewalletmanager",
 "kweather",
 "kwebget",
 "kwifimanager",
@@ -1271,7 +1271,7 @@ const char * const packages[] = {
 "systemsettings/joystick",
 "systemsettings/kcm_useraccount",
 "systemsettings/kcmkded",
-"systemsettings/kcmkdnssd",
+"systemsettings/kcmtdednssd",
 "systemsettings/kcmknotify",
 "systemsettings/kcmlaunch",
 "systemsettings/tdm",
diff --git a/tdeui/kdockwidget_private.h b/tdeui/kdockwidget_private.h
index e97a5affd..a72532e3d 100644
--- a/tdeui/kdockwidget_private.h
+++ b/tdeui/kdockwidget_private.h
@@ -241,7 +241,7 @@ private:
 
 /**
  * A mini-button usually placed in the dockpanel.
- * @internal (but used by kmdi/dockcontainer.cpp)
+ * @internal (but used by tdemdi/dockcontainer.cpp)
  *
  * @author Max Judin.
 */
diff --git a/tdeui/keditcl2.cpp b/tdeui/keditcl2.cpp
index 4bbc12c30..92ca542d4 100644
--- a/tdeui/keditcl2.cpp
+++ b/tdeui/keditcl2.cpp
@@ -1023,9 +1023,9 @@ void KEdit::misspelling (const TQString &word, const TQStringList &, unsigned in
 
   /*
   if (cursorPoint().y()>height()/2)
-    kspell->moveDlg (10, height()/2-kspell->heightDlg()-15);
+    tdespell->moveDlg (10, height()/2-tdespell->heightDlg()-15);
   else
-    kspell->moveDlg (10, height()/2 + 15);
+    tdespell->moveDlg (10, height()/2 + 15);
   */
 
 }
diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp
index 3f116b903..563b007c0 100644
--- a/tdeui/kedittoolbar.cpp
+++ b/tdeui/kedittoolbar.cpp
@@ -292,7 +292,7 @@ public:
           name = i18n( txt );
 
       // the name of the toolbar might depend on whether or not
-      // it is in kparts
+      // it is in tdeparts
       if ( ( xmlData.m_type == XmlData::Shell ) ||
            ( xmlData.m_type == XmlData::Part ) )
       {
diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp
index c5ec9dcf0..d74a40706 100644
--- a/tdeui/ksconfig.cpp
+++ b/tdeui/ksconfig.cpp
@@ -965,7 +965,7 @@ void KSpellConfig::activateHelp( void )
 
 void KSpellConfig::sHelp( void )
 {
-  kapp->invokeHelp("configuration", "kspell");
+  kapp->invokeHelp("configuration", "tdespell");
 }
 
 /*
diff --git a/tdeui/ksconfig.h b/tdeui/ksconfig.h
index 941405854..b0ca46fd9 100644
--- a/tdeui/ksconfig.h
+++ b/tdeui/ksconfig.h
@@ -238,7 +238,7 @@ class TDEUI_EXPORT KSpellConfig : public TQWidget
 
   protected slots:
     /**
-     * Invokes the help documentation for kspell
+     * Invokes the help documentation for tdespell
      */ 
     void sHelp();
     //void sBrowseDict();
diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp
index 50f594c89..866bcfce1 100644
--- a/tdeui/ksyntaxhighlighter.cpp
+++ b/tdeui/ksyntaxhighlighter.cpp
@@ -30,7 +30,7 @@
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kspell.h>
+#include <tdespell.h>
 #include <kapplication.h>
 
 #include "ksyntaxhighlighter.h"
@@ -371,7 +371,7 @@ bool KDictSpellingHighlighter::isMisspelled( const TQString &word )
     // This debug is expensive, only enable it locally
     //kdDebug(0) << "KDictSpellingHighlighter::isMisspelled( \"" << word << "\" )" << endl;
     // Normally isMisspelled would look up a dictionary and return
-    // true or false, but kspell is asynchronous and slow so things
+    // true or false, but tdespell is asynchronous and slow so things
     // get tricky...
     // For auto detection ignore signature and reply prefix
     if ( !d->autoReady )
diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp
index aff96f9a5..e447eab26 100644
--- a/tdeui/ktabwidget.cpp
+++ b/tdeui/ktabwidget.cpp
@@ -414,7 +414,7 @@ void KTabWidget::moveTab( int from, int to )
     blockSignals(true);
     removePage( w );
 
-    // Work-around kmdi brain damage which calls showPage() in insertTab()
+    // Work-around tdemdi brain damage which calls showPage() in insertTab()
     TQTab * t = new TQTab();
     t->setText(tablabel);
     TQTabWidget::insertTab( w, t, to );
diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp
index 5b1795321..eac18058b 100644
--- a/tdeui/ktextedit.cpp
+++ b/tdeui/ktextedit.cpp
@@ -24,7 +24,7 @@
 #include <tqpopupmenu.h>
 
 #include <ksyntaxhighlighter.h>
-#include <kspell.h>
+#include <tdespell.h>
 #include <kcursor.h>
 #include <kglobalsettings.h>
 #include <kstdaccel.h>
diff --git a/tdeui/kspell.cpp b/tdeui/tdespell.cpp
index b91c74a4d..90919c1f3 100644
--- a/tdeui/kspell.cpp
+++ b/tdeui/tdespell.cpp
@@ -41,8 +41,8 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include "kspell.h"
-#include "kspelldlg.h"
+#include "tdespell.h"
+#include "tdespelldlg.h"
 #include <twin.h>
 #include <kprocio.h>
 
@@ -236,7 +236,7 @@ KSpell::startIspell()
 
   //Note to potential debuggers:  -Tlatin2 _is_ being added on the
   //  _first_ try.  But, some versions of ispell will fail with this
-  // option, so kspell tries again without it.  That's why as 'ps -ax'
+  // option, so tdespell tries again without it.  That's why as 'ps -ax'
   // shows "ispell -a -S ..." withou the "-Tlatin2" option.
 
     if ( trystart<1 ) {
@@ -595,7 +595,7 @@ void KSpell::checkWord2( KProcIO* )
 
 void KSpell::checkNext()
 {
-// Queue words to prevent kspell from turning into a fork bomb
+// Queue words to prevent tdespell from turning into a fork bomb
   d->checking = false;
   if (!d->unchecked.empty()) {
     BufferedWord buf = d->unchecked.front();
@@ -1558,7 +1558,7 @@ void KSpell::initialize( TQWidget *_parent, const TQString &_caption,
   maxtrystart = 2;
 
   if ( obj && slot )
-      // caller wants to know when kspell is ready
+      // caller wants to know when tdespell is ready
       connect( this, TQT_SIGNAL(ready(KSpell *)), obj, slot);
   else
       // Hack for modal spell checking
@@ -1573,5 +1573,5 @@ TQString KSpell::modaltext;
 int KSpell::modalreturn = 0;
 TQWidget* KSpell::modalWidgetHack = 0;
 
-#include "kspell.moc"
+#include "tdespell.moc"
 
diff --git a/tdeui/kspell.h b/tdeui/tdespell.h
index fef733507..812c3e0d7 100644
--- a/tdeui/kspell.h
+++ b/tdeui/tdespell.h
@@ -227,7 +227,7 @@ public:
    * After calling checkWord, you can use this to get the dialog box's
    *  result code.
    * The possible
-   *  values are (from kspelldlg.h):
+   *  values are (from tdespelldlg.h):
    *    @li KS_CANCEL
    *    @li KS_REPLACE
    *    @li KS_REPLACEALL
diff --git a/tdeui/kspelldlg.cpp b/tdeui/tdespelldlg.cpp
index d21b6975e..b0752cfd1 100644
--- a/tdeui/kspelldlg.cpp
+++ b/tdeui/tdespelldlg.cpp
@@ -36,8 +36,8 @@
 #include <kdebug.h>
 
 #include "ksconfig.h"
-#include "kspelldlg.h"
-#include "kspellui.h"
+#include "tdespelldlg.h"
+#include "tdespellui.h"
 
 //to initially disable sorting in the suggestions listview
 #define NONSORTINGCOLUMN 2
@@ -99,7 +99,7 @@ KSpellDlg::KSpellDlg( TQWidget * parent, const char * name, bool _progressbar, b
   connect( d->spellConfig, TQT_SIGNAL(configChanged()),
            TQT_SLOT(slotConfigChanged()) );
 
-  setHelp( "spelldlg", "kspell" );
+  setHelp( "spelldlg", "tdespell" );
   setMinimumSize( sizeHint() );
   emit ready( false );
 }
@@ -282,4 +282,4 @@ KSpellDlg::slotConfigChanged()
   done( KS_CONFIG );
 }
 
-#include "kspelldlg.moc"
+#include "tdespelldlg.moc"
diff --git a/tdeui/kspelldlg.h b/tdeui/tdespelldlg.h
index c42476814..c42476814 100644
--- a/tdeui/kspelldlg.h
+++ b/tdeui/tdespelldlg.h
diff --git a/tdeui/kspellui.ui b/tdeui/tdespellui.ui
index ac1deecd7..ac1deecd7 100644
--- a/tdeui/kspellui.ui
+++ b/tdeui/tdespellui.ui
diff --git a/tdeui/tests/CMakeLists.txt b/tdeui/tests/CMakeLists.txt
index 9b3cc6568..3d53611c4 100644
--- a/tdeui/tests/CMakeLists.txt
+++ b/tdeui/tests/CMakeLists.txt
@@ -39,7 +39,7 @@ set( test_PROGS
   kxmlguitest kaccelgentest ksystemtraytest klistviewtest
   ktextedittest kmainwindowtest kmainwindowrestoretest
   kactiontest kdatetimewidgettest ktimewidgettest
-  kspelltest kinputdialogtest ktabwidgettest kwordwraptest
+  tdespelltest kinputdialogtest ktabwidgettest kwordwraptest
   kdocktest qxembedtest ksqueezedtextlabeltest
   kpixmapregionselectordialogtest kjanuswidgettest ktoolbarlabelactiontest
 )
diff --git a/tdeui/tests/Makefile.am b/tdeui/tests/Makefile.am
index a7c0cb26d..9af863946 100644
--- a/tdeui/tests/Makefile.am
+++ b/tdeui/tests/Makefile.am
@@ -38,7 +38,7 @@ check_PROGRAMS = kaboutdialogtest kblendtest kbuttonboxtest kcharselecttest \
 	kxmlguitest kaccelgentest ksystemtraytest klistviewtest \
 	ktextedittest kmainwindowtest kmainwindowrestoretest \
 	kactiontest kdatetimewidgettest ktimewidgettest \
-	kspelltest kinputdialogtest ktabwidgettest kwordwraptest \
+	tdespelltest kinputdialogtest ktabwidgettest kwordwraptest \
 	kdocktest qxembedtest ksqueezedtextlabeltest \
 	kpixmapregionselectordialogtest kjanuswidgettest ktoolbarlabelactiontest
 
@@ -93,7 +93,7 @@ ktextedittest_SOURCES = ktextedittest.cpp
 kmainwindowtest_SOURCES = kmainwindowtest.cpp
 kmainwindowrestoretest_SOURCES = kmainwindowrestoretest.cpp
 kactiontest_SOURCES = kactiontest.cpp
-kspelltest_SOURCES = kspelltest.cpp
+tdespelltest_SOURCES = tdespelltest.cpp
 kinputdialogtest_SOURCES = kinputdialogtest.cpp
 ktabwidgettest_SOURCES = ktabwidgettest.cpp
 kwordwraptest_SOURCES = kwordwraptest.cpp
diff --git a/tdeui/tests/kxmlguitest_part.rc b/tdeui/tests/kxmlguitest_part.rc
index 84f5e4f57..b6454cf30 100644
--- a/tdeui/tests/kxmlguitest_part.rc
+++ b/tdeui/tests/kxmlguitest_part.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="khtmlpart" version="7">
+<kpartgui name="tdehtmlpart" version="7">
 <ToolBar name="mainToolBar"><text>Main Toolbar</text>
  <Action name="decFontSizes" />
  <Separator />
diff --git a/tdeui/tests/kspelltest.cpp b/tdeui/tests/tdespelltest.cpp
index 7941ade87..b4b5e571e 100644
--- a/tdeui/tests/kspelltest.cpp
+++ b/tdeui/tests/tdespelltest.cpp
@@ -16,7 +16,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kspell.h"
+#include "tdespell.h"
 #include <kapplication.h>
 #include <kdebug.h>
 
diff --git a/kunittest/CMakeLists.txt b/tdeunittest/CMakeLists.txt
index 74ab23e13..5509d9026 100644
--- a/kunittest/CMakeLists.txt
+++ b/tdeunittest/CMakeLists.txt
@@ -24,12 +24,12 @@ link_directories(
 ##### headers ###################################
 
 install( FILES runner.h tester.h module.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kunittest )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeunittest )
 
 
-##### libkunittest ##############################
+##### libtdeunittest ##############################
 
-set( target kunittest )
+set( target tdeunittest )
 
 set( ${target}_SRCS
   runner.cpp tester.cpp
@@ -43,10 +43,10 @@ tde_add_library( ${target} SHARED AUTOMOC
 )
 
 
-##### kunittestmodrunner ########################
+##### tdeunittestmodrunner ########################
 
-tde_add_executable( kunittestmodrunner
+tde_add_executable( tdeunittestmodrunner
   SOURCES modrunner.cpp
-  LINK kunittest-shared
+  LINK tdeunittest-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/tdeunittest/Makefile.am b/tdeunittest/Makefile.am
new file mode 100644
index 000000000..5eb6852ab
--- /dev/null
+++ b/tdeunittest/Makefile.am
@@ -0,0 +1,27 @@
+INCLUDES = $(all_includes)
+METASOURCES = AUTO
+
+lib_LTLIBRARIES = libtdeunittest.la
+libtdeunittest_la_SOURCES = runner.cpp tester.cpp
+libtdeunittest_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0:0
+libtdeunittest_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+
+libtdeunittestinclude_HEADERS = runner.h tester.h module.h
+libtdeunittestincludedir = $(includedir)/tdeunittest
+
+bin_PROGRAMS = tdeunittestmodrunner
+tdeunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeunittestmodrunner_LDADD = libtdeunittest.la $(LIB_TDECORE)
+tdeunittestmodrunner_SOURCES = modrunner.cpp
+
+# The check_ target makes sure we don't install the modules,
+# $(KDE_CHECK_PLUGIN) assures a shared library is created.
+check_LTLIBRARIES = tdeunittest_samplemodule.la
+tdeunittest_samplemodule_la_SOURCES = samplemodule.cpp
+tdeunittest_samplemodule_la_LIBADD = libtdeunittest.la
+tdeunittest_samplemodule_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+
+check-local:
+	./tdeunittestmodrunner
+
+include ../admin/Doxyfile.am
diff --git a/kunittest/modrunner.cpp b/tdeunittest/modrunner.cpp
index 93dcff8ef..45129ddee 100644
--- a/kunittest/modrunner.cpp
+++ b/tdeunittest/modrunner.cpp
@@ -39,7 +39,7 @@ static const char version[] = "0.1";
 
 static KCmdLineOptions options[] =
 {
-    {"query [regexp]", I18N_NOOP("Only run modules whose filenames match the regexp."), "^kunittest_.*\\.la$"},
+    {"query [regexp]", I18N_NOOP("Only run modules whose filenames match the regexp."), "^tdeunittest_.*\\.la$"},
     {"folder [folder]", I18N_NOOP("Only run tests modules which are found in the folder. Use the query option to select modules."), "."},
     { "enable-dbgcap", I18N_NOOP("Disables debug capturing. You typically use this option when you use the GUI."), 0},
     KCmdLineLastOption
diff --git a/kunittest/module.h b/tdeunittest/module.h
index 7f4b24789..d30c248c7 100644
--- a/kunittest/module.h
+++ b/tdeunittest/module.h
@@ -34,7 +34,7 @@
 #include <tqstring.h>
 
 #include <klibloader.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
 
 namespace KUnitTest
 {
@@ -45,10 +45,10 @@ namespace KUnitTest
     * There is no need in calling the K_EXPORT_COMPONENT_FACTORY macro,
     * this is taken care of automatically.
     * 
-    * @code KUNITTEST_MODULE(kunittest_samplemodule,"TestSuite") @endcode
+    * @code KUNITTEST_MODULE(tdeunittest_samplemodule,"TestSuite") @endcode
     */
     #define KUNITTEST_MODULE(library,suite)                                                 \
-    static const TQString s_kunittest_suite  = TQString::fromLatin1(suite);                   \
+    static const TQString s_tdeunittest_suite  = TQString::fromLatin1(suite);                   \
     class library##Module : public TQObject                                                  \
     {                                                                                       \
     public:                                                                                 \
@@ -64,7 +64,7 @@ namespace KUnitTest
                                                                                             \
     KUnitTest::RegistryType library##Module::s_registry;                                    \
                                                                                             \
-    void kunittest_registerModuleTester(const char *name, KUnitTest::Tester *test)          \
+    void tdeunittest_registerModuleTester(const char *name, KUnitTest::Tester *test)          \
     {                                                                                       \
         library##Module::s_registry.insert(name, test);                                     \
     }                                                                                       \
@@ -93,9 +93,9 @@ namespace KUnitTest
         tester##ModuleAutoregister()                                                            \
         {                                                                                       \
             KUnitTest::Tester *test = new tester();                                             \
-            TQString name = s_kunittest_suite + TQString::fromLatin1("::") + TQString::fromLocal8Bit(#tester); \
+            TQString name = s_tdeunittest_suite + TQString::fromLatin1("::") + TQString::fromLocal8Bit(#tester); \
             test->setName(name.local8Bit());                                                    \
-            kunittest_registerModuleTester(name.local8Bit(), test );                            \
+            tdeunittest_registerModuleTester(name.local8Bit(), test );                            \
         }                                                                                       \
     } tester##ModuleAutoregisterInstance;
 
@@ -110,9 +110,9 @@ namespace KUnitTest
     public:                                                                                   \
         tester##ModuleAutoregister()                                                          \
         {                                                                                     \
-            TQString fullName = s_kunittest_suite + TQString("::") + TQString::fromLocal8Bit(name); \
+            TQString fullName = s_tdeunittest_suite + TQString("::") + TQString::fromLocal8Bit(name); \
             KUnitTest::Tester *test = new tester(fullName.local8Bit());                       \
-            kunittest_registerModuleTester(fullName.local8Bit(), test);                       \
+            tdeunittest_registerModuleTester(fullName.local8Bit(), test);                       \
         }                                                                                     \
     } tester##ModuleAutoregisterInstance;
 }
diff --git a/kunittest/runner.cpp b/tdeunittest/runner.cpp
index e3a8830bb..6a961fecd 100644
--- a/kunittest/runner.cpp
+++ b/tdeunittest/runner.cpp
@@ -54,7 +54,7 @@ namespace KUnitTest
     void Runner::loadModules(const TQString &folder, const TQString &query)
     {
         TQRegExp reQuery(query);
-        TQDir dir(folder, "kunittest_*.la");
+        TQDir dir(folder, "tdeunittest_*.la");
 
         // Add the folder to the "module" resource such that the KLibLoader can
         // find the modules in this folder.
diff --git a/kunittest/runner.h b/tdeunittest/runner.h
index 5ed386b00..3b1c3d90d 100644
--- a/kunittest/runner.h
+++ b/tdeunittest/runner.h
@@ -1,5 +1,5 @@
 /*
- * kunittest.h
+ * tdeunittest.h
  *
  * Copyright (C)  2004  Zack Rusin <zack@kde.org>
  *
@@ -54,7 +54,7 @@ namespace KUnitTest
      * defines the name of the test suite.
      */
     #define KUNITTEST_SUITE(suite)\
-    static const TQString s_kunittest_suite  = suite;
+    static const TQString s_tdeunittest_suite  = suite;
 
     /*! @def KUNITTEST_REGISTER_TESTER( tester )
      * @brief Automatic registration of Tester classes.
@@ -66,10 +66,10 @@ namespace KUnitTest
      * You can always use the static Runner::registerTester(const char *name, Tester *test) method.
     */
     #define KUNITTEST_REGISTER_TESTER( tester )\
-    static TesterAutoregister tester##Autoregister( TQString(s_kunittest_suite + TQString("::") + TQString::fromLocal8Bit(#tester)).local8Bit() , new tester ())
+    static TesterAutoregister tester##Autoregister( TQString(s_tdeunittest_suite + TQString("::") + TQString::fromLocal8Bit(#tester)).local8Bit() , new tester ())
 
     #define KUNITTEST_REGISTER_NAMEDTESTER( name, tester )\
-    static TesterAutoregister tester##Autoregister( TQString(s_kunittest_suite + TQString("::") + TQString::fromLocal8Bit(name)).local8Bit() , new tester ())
+    static TesterAutoregister tester##Autoregister( TQString(s_tdeunittest_suite + TQString("::") + TQString::fromLocal8Bit(name)).local8Bit() , new tester ())
 
     /*! The type of the registry. */
     typedef TQAsciiDict<Tester> RegistryType;
@@ -123,7 +123,7 @@ namespace KUnitTest
          */
         static void loadModules(const TQString &folder, const TQString &query);
 
-        /*! The runner can spit out special debug messages needed by the Perl script: kunittest_debughelper.
+        /*! The runner can spit out special debug messages needed by the Perl script: tdeunittest_debughelper.
          * This script can attach the debug output of each suite to the results in the KUnitTest GUI.
          * Not very useful for console minded developers, so this static method can be used to disable
          * those debug messages.
diff --git a/kunittest/samplemodule.cpp b/tdeunittest/samplemodule.cpp
index 390102c38..8dede090a 100644
--- a/kunittest/samplemodule.cpp
+++ b/tdeunittest/samplemodule.cpp
@@ -23,14 +23,14 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
 
 #include "samplemodule.h"
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( kunittest_samplemodule, "Suite1" );
+KUNITTEST_MODULE( tdeunittest_samplemodule, "Suite1" );
 KUNITTEST_MODULE_REGISTER_TESTER( SampleTester );
 
 void SampleTester::allTests()
diff --git a/kunittest/samplemodule.h b/tdeunittest/samplemodule.h
index b5fd2bcd4..0798ed1e3 100644
--- a/kunittest/samplemodule.h
+++ b/tdeunittest/samplemodule.h
@@ -27,7 +27,7 @@
 #define SAMPLETESTMODULE_H
 
 #include "tester.h"
-// Outside of tdelibs you would use: #include <kunittest/tester.h>
+// Outside of tdelibs you would use: #include <tdeunittest/tester.h>
 
 class SampleTester : public KUnitTest::Tester
 {
diff --git a/kunittest/tester.cpp b/tdeunittest/tester.cpp
index 11a24e653..11a24e653 100644
--- a/kunittest/tester.cpp
+++ b/tdeunittest/tester.cpp
diff --git a/kunittest/tester.h b/tdeunittest/tester.h
index e654b1b46..61794f229 100644
--- a/kunittest/tester.h
+++ b/tdeunittest/tester.h
@@ -53,20 +53,20 @@
  * You are responsible for what you do with it though. It
  * is licensed under a BSD license - read the top of each file.
  *
- * All the GUI related stuff is in tdesdk/kunittest, the core libraries are in tdelibs/kunittest.
- * A simple example modules is in kdelisbs/kunittest/samplemodule.{h,cpp}, however more examples
- * can be found in tdesdk/kunittest/example.
+ * All the GUI related stuff is in tdesdk/tdeunittest, the core libraries are in tdelibs/tdeunittest.
+ * A simple example modules is in kdelisbs/tdeunittest/samplemodule.{h,cpp}, however more examples
+ * can be found in tdesdk/tdeunittest/example.
  *
  * There are roughly two ways to use the KUnitTest library. Either you create dynamically
- * loadable modules and use the kunittestmodrunner or kunittestguimodrunner programs to run
- * the tests, or you use the kunittest/kunittestgui library to create your own test runner
+ * loadable modules and use the tdeunittestmodrunner or tdeunittestguimodrunner programs to run
+ * the tests, or you use the tdeunittest/tdeunittestgui library to create your own test runner
  * application.
  *
  * The main parts of the KUnitTest library are:
  * @li runner.{h,cpp} - it is the tester runner, holds all tests and runs
  * them.
  * @li runnergui.{h,cpp} - the GUI wrapper around the runner. The GUI neatly organizes the
- *   test results. With the kunittest helper script it can even add the debug output
+ *   test results. With the tdeunittest helper script it can even add the debug output
  *   to the test results. For this you need to have the tdesdk module installed.
  * @li tester.h - which holds the base of a pure test object (Tester).
  * @li module.h - defines macros to create a dynamically loadable module.
@@ -139,7 +139,7 @@ SampleTest - 1 test passed, 1 test failed
  * #include <kcmdlineargs.h>
  * #include <kcmdlineargs.h>
  * #include <klocale.h>
- * #include <kunittest/runnergui.h>
+ * #include <tdeunittest/runnergui.h>
  *
  * static const char description[] = I18N_NOOP("SampleTests");
  * static const char version[] = "0.1";
@@ -170,11 +170,11 @@ SampleTest - 1 test passed, 1 test failed
  * check_PROGRAMS = sampletests
  * sampletests_SOURCES = main.cpp sampletest.cpp
  * sampletests_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- * sampletests_LDADD = -lkunittest
+ * sampletests_LDADD = -ltdeunittest
  * noinst_HEADERS = sampletest.h
  *
  * check:
- *    kunittest $(top_builddir)/src/sampletests SampleTests
+ *    tdeunittest $(top_builddir)/src/sampletests SampleTests
  * @endcode
  *
  * Most of this Makefile.am will be self-explanatory. After running
@@ -183,7 +183,7 @@ SampleTest - 1 test passed, 1 test failed
  * to rebuild the test suite everytime you run make.
  *
  * You can run the binary on its own, but you get more functionality if you use
- * the kunittest helper script. The Makefile.am is set up in such
+ * the tdeunittest helper script. The Makefile.am is set up in such
  * a way that this helper script is automatically run after you do a
  * "make check". This scripts take two arguments, the first is the path
  * to the binary to run. The second the application name, in this case SampleTests.
@@ -193,7 +193,7 @@ SampleTest - 1 test passed, 1 test failed
  * @section module Creating test modules
  *
  * If you think that writing your own test runner if too much work then you can also
- * use the kunittestermodrunner application or the kunitguimodrunner script to run
+ * use the tdeunittestermodrunner application or the kunitguimodrunner script to run
  * the tests for you. You do have to put your tests in a dynamically loadable module though.
  * Fortunately KUnitTest comes with a few macros to help you do this.
  *
@@ -203,21 +203,21 @@ SampleTest - 1 test passed, 1 test failed
  * modifications. First we need to include the module.h header:
  *
  * @code
- * #include <kunittest/module.h>
+ * #include <tdeunittest/module.h>
  * @endcode
  *
  * This header file is needed because it defines some macro you'll need. In fact this is
  * how you use them:
  *
  * @code
- * KUNITTEST_MODULE( kunittest_samplemodule, "Tests for sample module" );
+ * KUNITTEST_MODULE( tdeunittest_samplemodule, "Tests for sample module" );
  * KUNITTEST_MODULE_REGISTER_TESTER( SimpleSampleTester );
  * KUNITTEST_MODULE_REGISTER_TESTER( SomeSampleTester );
  * @endcode
  *
  * The first macro, KUNITTEST_MODULE(), makes sure that the module can be loaded and that
- * the test classes are created. The first argument "kunittest_samplemodule" is the library
- * name, in this case the library we're creating a kunittest_samplemodule.la module. The
+ * the test classes are created. The first argument "tdeunittest_samplemodule" is the library
+ * name, in this case the library we're creating a tdeunittest_samplemodule.la module. The
  * second argument is name which will appear in the test runner for this test suite.
  *
  * The tester class are now added by the KUNITTEST_MODULE_REGISTER_TESTER() macro, not the
@@ -229,10 +229,10 @@ SampleTest - 1 test passed, 1 test failed
  * @code
  * INCLUDES = -I$(top_srcdir)/include $(all_includes)
  * METASOURCES = AUTO
- * check_LTLIBRARIES = kunittest_samplemodule.la
- * kunittest_samplemodule_la_SOURCES = samplemodule.cpp
- * kunittest_samplemodule_la_LIBADD = $(LIB_KUNITTEST)
- * kunittest_samplemodule_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+ * check_LTLIBRARIES = tdeunittest_samplemodule.la
+ * tdeunittest_samplemodule_la_SOURCES = samplemodule.cpp
+ * tdeunittest_samplemodule_la_LIBADD = $(LIB_KUNITTEST)
+ * tdeunittest_samplemodule_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
  * @endcode
  *
  * The $(KDE_CHECK_PLUGIN) macro is there to make sure a dynamically loadable
@@ -242,19 +242,19 @@ SampleTest - 1 test passed, 1 test failed
  * the tests in the module is now as easy as:
  *
  * @code
- * $ make check && kunittestmodrunner
+ * $ make check && tdeunittestmodrunner
  * @endcode
  *
- * The kunittestmodrunner application loads all kunittest_*.la modules in the current
+ * The tdeunittestmodrunner application loads all tdeunittest_*.la modules in the current
  * directory. The exit code of this console application is the number of unexpected failures.
  *
- * If you want the GUI, you should use the kunittestmod script:
+ * If you want the GUI, you should use the tdeunittestmod script:
  *
  * @code
- * $ make check && kunittestmod
+ * $ make check && tdeunittestmod
  * @endcode
  *
- * This script starts kunittestguimodrunner application and a helper script to take
+ * This script starts tdeunittestguimodrunner application and a helper script to take
  * care of dealing with debug output.
  *
  * @section advanced Advanced usage
@@ -310,11 +310,11 @@ SampleTest - 1 test passed, 1 test failed
  *
  * The library comes with several helper scripts:
  *
- * @li kunittest [app] [dcopobject] : Runs the application app and redirects all debug output to the dcopobject.
- * @li kunittestmod --folder [folder] --query [query] : Loads and runs all modules in the folder matching the query. Use a GUI.
- * @li kunittest_debughelper [dcopobject] : A PERL script that is able to redirect debug output to a RunnerGUI instance.
+ * @li tdeunittest [app] [dcopobject] : Runs the application app and redirects all debug output to the dcopobject.
+ * @li tdeunittestmod --folder [folder] --query [query] : Loads and runs all modules in the folder matching the query. Use a GUI.
+ * @li tdeunittest_debughelper [dcopobject] : A PERL script that is able to redirect debug output to a RunnerGUI instance.
  *
- * These scripts are part of the tdesdk/kunittest module.
+ * These scripts are part of the tdesdk/tdeunittest module.
  */
 
 /*!
diff --git a/kutils/CMakeLists.txt b/tdeutils/CMakeLists.txt
index 073ffe3a0..6f647a2b5 100644
--- a/kutils/CMakeLists.txt
+++ b/tdeutils/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor
 )
 
@@ -34,7 +34,7 @@ link_directories(
 install( FILES
     kfind.h kfinddialog.h kreplace.h kreplacedialog.h
     tdecmoduleinfo.h tdecmoduleloader.h kcmultidialog.h
-    kmultitabbar.h kplugininfo.h tdecmoduleproxy.h
+    tdemultitabbar.h kplugininfo.h tdecmoduleproxy.h
     kpluginselector.h tdecmodulecontainer.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
@@ -44,14 +44,14 @@ install( FILES
 install( FILES kplugininfo.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-#### kutils #####################################
+#### tdeutils #####################################
 
-set( target kutils )
+set( target tdeutils )
 
 set( ${target}_SRCS
   kfind.cpp kfinddialog.cpp kreplace.cpp
   kreplacedialog.cpp tdecmoduleinfo.cpp tdecmoduleloader.cpp
-  kcmultidialog.cpp kmultitabbar.cpp kplugininfo.cpp
+  kcmultidialog.cpp tdemultitabbar.cpp kplugininfo.cpp
   tdecmoduleproxy.cpp kpluginselector.cpp tdecmodulecontainer.cpp
   tdecmoduleproxyIface.skel tdecmoduleproxyIfaceImpl.cpp
 )
@@ -60,7 +60,7 @@ tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.2.0
   EMBED ksettings-static
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${LIB_INSTALL_DIR}
   DEPENDENCIES dcopidl
 )
diff --git a/kutils/Mainpage.dox b/tdeutils/Mainpage.dox
index 77abe5777..77abe5777 100644
--- a/kutils/Mainpage.dox
+++ b/tdeutils/Mainpage.dox
diff --git a/kutils/Makefile.am b/tdeutils/Makefile.am
index 5ff9bd041..5ba725545 100644
--- a/kutils/Makefile.am
+++ b/tdeutils/Makefile.am
@@ -1,24 +1,24 @@
 SUBDIRS = ksettings .
 INCLUDES = -I$(top_srcdir)/interfaces/kregexpeditor $(all_includes)
 
-lib_LTLIBRARIES   = libkutils.la
-libkutils_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
+lib_LTLIBRARIES   = libtdeutils.la
+libtdeutils_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
 # Needs KTrader
-libkutils_la_LIBADD  = ../kio/libkio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_X11)
+libtdeutils_la_LIBADD  = ../kio/libkio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_X11)
 
-libkutils_la_SOURCES = kfind.cpp kfinddialog.cpp kreplace.cpp \
+libtdeutils_la_SOURCES = kfind.cpp kfinddialog.cpp kreplace.cpp \
                        kreplacedialog.cpp tdecmoduleinfo.cpp tdecmoduleloader.cpp \
-                       kcmultidialog.cpp kmultitabbar.cpp kplugininfo.cpp \
+                       kcmultidialog.cpp tdemultitabbar.cpp kplugininfo.cpp \
                        tdecmoduleproxy.cpp kpluginselector.cpp \
                        tdecmodulecontainer.cpp tdecmoduleproxyIface.skel \
                        tdecmoduleproxyIfaceImpl.cpp
 
 include_HEADERS = kfind.h kfinddialog.h kreplace.h kreplacedialog.h \
                   tdecmoduleinfo.h tdecmoduleloader.h kcmultidialog.h \
-                  kmultitabbar.h kplugininfo.h tdecmoduleproxy.h \
+                  tdemultitabbar.h kplugininfo.h tdecmoduleproxy.h \
                   kpluginselector.h tdecmodulecontainer.h
 
-noinst_HEADERS = kmultitabbar_p.h kpluginselector_p.h \
+noinst_HEADERS = tdemultitabbar_p.h kpluginselector_p.h \
                  tdecmoduleproxyIface.h tdecmoduleproxyIfaceImpl.h
 
 kde_servicetypes_DATA = kplugininfo.desktop
diff --git a/kutils/TODO b/tdeutils/TODO
index 7d9f473ab..7d9f473ab 100644
--- a/kutils/TODO
+++ b/tdeutils/TODO
diff --git a/kutils/groups.dox b/tdeutils/groups.dox
index a4e0a633f..a4e0a633f 100644
--- a/kutils/groups.dox
+++ b/tdeutils/groups.dox
diff --git a/kutils/kcmultidialog.cpp b/tdeutils/kcmultidialog.cpp
index b09f25e88..b09f25e88 100644
--- a/kutils/kcmultidialog.cpp
+++ b/tdeutils/kcmultidialog.cpp
diff --git a/kutils/kcmultidialog.h b/tdeutils/kcmultidialog.h
index 46dde98fb..46dde98fb 100644
--- a/kutils/kcmultidialog.h
+++ b/tdeutils/kcmultidialog.h
diff --git a/kutils/kdeglobals.kcfg b/tdeutils/kdeglobals.kcfg
index 02b25f909..02b25f909 100644
--- a/kutils/kdeglobals.kcfg
+++ b/tdeutils/kdeglobals.kcfg
diff --git a/kutils/kdeglobals.kcfgc b/tdeutils/kdeglobals.kcfgc
index fee74fc45..fee74fc45 100644
--- a/kutils/kdeglobals.kcfgc
+++ b/tdeutils/kdeglobals.kcfgc
diff --git a/kutils/kfind.cpp b/tdeutils/kfind.cpp
index 7b2da6899..7b2da6899 100644
--- a/kutils/kfind.cpp
+++ b/tdeutils/kfind.cpp
diff --git a/kutils/kfind.h b/tdeutils/kfind.h
index ab088ef33..ab088ef33 100644
--- a/kutils/kfind.h
+++ b/tdeutils/kfind.h
diff --git a/kutils/kfinddialog.cpp b/tdeutils/kfinddialog.cpp
index ef3c131cc..d9a5284e1 100644
--- a/kutils/kfinddialog.cpp
+++ b/tdeutils/kfinddialog.cpp
@@ -35,7 +35,7 @@
 #include <tqwhatsthis.h>
 
 #include <kregexpeditorinterface.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 class KFindDialog::KFindDialogPrivate
 {
diff --git a/kutils/kfinddialog.h b/tdeutils/kfinddialog.h
index fcf870836..fcf870836 100644
--- a/kutils/kfinddialog.h
+++ b/tdeutils/kfinddialog.h
diff --git a/kutils/kplugininfo.cpp b/tdeutils/kplugininfo.cpp
index aec0a095c..aec0a095c 100644
--- a/kutils/kplugininfo.cpp
+++ b/tdeutils/kplugininfo.cpp
diff --git a/kutils/kplugininfo.desktop b/tdeutils/kplugininfo.desktop
index d88712b9d..d88712b9d 100644
--- a/kutils/kplugininfo.desktop
+++ b/tdeutils/kplugininfo.desktop
diff --git a/kutils/kplugininfo.h b/tdeutils/kplugininfo.h
index 0ba051d2c..0ba051d2c 100644
--- a/kutils/kplugininfo.h
+++ b/tdeutils/kplugininfo.h
diff --git a/kutils/kpluginselector.cpp b/tdeutils/kpluginselector.cpp
index fb1386106..8e30f75d4 100644
--- a/kutils/kpluginselector.cpp
+++ b/tdeutils/kpluginselector.cpp
@@ -570,7 +570,7 @@ void KPluginSelector::checkNeedForTabWidget()
     }
 }
 
-static TQValueList<KPluginInfo*> kpartsPluginInfos( const TQString& instanceName )
+static TQValueList<KPluginInfo*> tdepartsPluginInfos( const TQString& instanceName )
 {
     if( instanceName.isNull() )
         return TQValueList<KPluginInfo*>(); //nothing
@@ -583,7 +583,7 @@ static TQValueList<KPluginInfo*> kpartsPluginInfos( const TQString& instanceName
 void KPluginSelector::addPlugins( const TQString & instanceName,
         const TQString & catname, const TQString & category, TDEConfig * config )
 {
-    const TQValueList<KPluginInfo*> plugininfos = kpartsPluginInfos( instanceName );
+    const TQValueList<KPluginInfo*> plugininfos = tdepartsPluginInfos( instanceName );
     if ( plugininfos.isEmpty() )
         return;
     checkNeedForTabWidget();
diff --git a/kutils/kpluginselector.h b/tdeutils/kpluginselector.h
index 4316f4880..4316f4880 100644
--- a/kutils/kpluginselector.h
+++ b/tdeutils/kpluginselector.h
diff --git a/kutils/kpluginselector_p.h b/tdeutils/kpluginselector_p.h
index c287ce555..c287ce555 100644
--- a/kutils/kpluginselector_p.h
+++ b/tdeutils/kpluginselector_p.h
diff --git a/kutils/kreplace.cpp b/tdeutils/kreplace.cpp
index f825e93cc..f825e93cc 100644
--- a/kutils/kreplace.cpp
+++ b/tdeutils/kreplace.cpp
diff --git a/kutils/kreplace.h b/tdeutils/kreplace.h
index ea385189b..ea385189b 100644
--- a/kutils/kreplace.h
+++ b/tdeutils/kreplace.h
diff --git a/kutils/kreplacedialog.cpp b/tdeutils/kreplacedialog.cpp
index 88c006b4d..88c006b4d 100644
--- a/kutils/kreplacedialog.cpp
+++ b/tdeutils/kreplacedialog.cpp
diff --git a/kutils/kreplacedialog.h b/tdeutils/kreplacedialog.h
index 409666dbd..409666dbd 100644
--- a/kutils/kreplacedialog.h
+++ b/tdeutils/kreplacedialog.h
diff --git a/kutils/ksettings/CMakeLists.txt b/tdeutils/ksettings/CMakeLists.txt
index 3e4744bd8..7a1d5034d 100644
--- a/kutils/ksettings/CMakeLists.txt
+++ b/tdeutils/ksettings/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_SOURCE_DIR}/kio/kio
diff --git a/kutils/ksettings/Makefile.am b/tdeutils/ksettings/Makefile.am
index 39e7183b2..39e7183b2 100644
--- a/kutils/ksettings/Makefile.am
+++ b/tdeutils/ksettings/Makefile.am
diff --git a/kutils/ksettings/README.dox b/tdeutils/ksettings/README.dox
index 88268f671..88268f671 100644
--- a/kutils/ksettings/README.dox
+++ b/tdeutils/ksettings/README.dox
diff --git a/kutils/ksettings/TODO b/tdeutils/ksettings/TODO
index 9950ddfd9..9950ddfd9 100644
--- a/kutils/ksettings/TODO
+++ b/tdeutils/ksettings/TODO
diff --git a/kutils/ksettings/componentsdialog.cpp b/tdeutils/ksettings/componentsdialog.cpp
index 097d1f6d7..097d1f6d7 100644
--- a/kutils/ksettings/componentsdialog.cpp
+++ b/tdeutils/ksettings/componentsdialog.cpp
diff --git a/kutils/ksettings/componentsdialog.h b/tdeutils/ksettings/componentsdialog.h
index e3f8b60a0..e3f8b60a0 100644
--- a/kutils/ksettings/componentsdialog.h
+++ b/tdeutils/ksettings/componentsdialog.h
diff --git a/kutils/ksettings/dialog.cpp b/tdeutils/ksettings/dialog.cpp
index e3bfa579f..e3bfa579f 100644
--- a/kutils/ksettings/dialog.cpp
+++ b/tdeutils/ksettings/dialog.cpp
diff --git a/kutils/ksettings/dialog.h b/tdeutils/ksettings/dialog.h
index 58115426c..1a3c741a6 100644
--- a/kutils/ksettings/dialog.h
+++ b/tdeutils/ksettings/dialog.h
@@ -52,10 +52,10 @@ namespace KSettings
  * If you use a KPart that was not especially designed for your app you can use
  * the second constructor:
  * \code
- * TQStringList kpartslist;
- * for( all my kparts )
- *   kpartslist += m_mypart->instance().instanceName();
- * m_cfgdlg = new Dialog( kpartslist, this );
+ * TQStringList tdepartslist;
+ * for( all my tdeparts )
+ *   tdepartslist += m_mypart->instance().instanceName();
+ * m_cfgdlg = new Dialog( tdepartslist, this );
  * \endcode
  * and the action for the config dialog is connected to the show slot:
  * \code
diff --git a/kutils/ksettings/dispatcher.cpp b/tdeutils/ksettings/dispatcher.cpp
index 590ca7e3c..590ca7e3c 100644
--- a/kutils/ksettings/dispatcher.cpp
+++ b/tdeutils/ksettings/dispatcher.cpp
diff --git a/kutils/ksettings/dispatcher.h b/tdeutils/ksettings/dispatcher.h
index fa0c9e6c9..fa0c9e6c9 100644
--- a/kutils/ksettings/dispatcher.h
+++ b/tdeutils/ksettings/dispatcher.h
diff --git a/kutils/ksettings/pluginpage.cpp b/tdeutils/ksettings/pluginpage.cpp
index c7208dc69..c7208dc69 100644
--- a/kutils/ksettings/pluginpage.cpp
+++ b/tdeutils/ksettings/pluginpage.cpp
diff --git a/kutils/ksettings/pluginpage.h b/tdeutils/ksettings/pluginpage.h
index 7f5c7e952..7f5c7e952 100644
--- a/kutils/ksettings/pluginpage.h
+++ b/tdeutils/ksettings/pluginpage.h
diff --git a/kutils/tdecmodulecontainer.cpp b/tdeutils/tdecmodulecontainer.cpp
index 04cbf6751..04cbf6751 100644
--- a/kutils/tdecmodulecontainer.cpp
+++ b/tdeutils/tdecmodulecontainer.cpp
diff --git a/kutils/tdecmodulecontainer.h b/tdeutils/tdecmodulecontainer.h
index 5708f80cf..5708f80cf 100644
--- a/kutils/tdecmodulecontainer.h
+++ b/tdeutils/tdecmodulecontainer.h
diff --git a/kutils/tdecmoduleinfo.cpp b/tdeutils/tdecmoduleinfo.cpp
index 3a7fdfd63..3a7fdfd63 100644
--- a/kutils/tdecmoduleinfo.cpp
+++ b/tdeutils/tdecmoduleinfo.cpp
diff --git a/kutils/tdecmoduleinfo.h b/tdeutils/tdecmoduleinfo.h
index 0bd7c44e3..0bd7c44e3 100644
--- a/kutils/tdecmoduleinfo.h
+++ b/tdeutils/tdecmoduleinfo.h
diff --git a/kutils/tdecmoduleloader.cpp b/tdeutils/tdecmoduleloader.cpp
index c661ac22f..73f6983d3 100644
--- a/kutils/tdecmoduleloader.cpp
+++ b/tdeutils/tdecmoduleloader.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include "tdecmoduleloader.h"
 
diff --git a/kutils/tdecmoduleloader.h b/tdeutils/tdecmoduleloader.h
index 1ae9f6b9f..1ae9f6b9f 100644
--- a/kutils/tdecmoduleloader.h
+++ b/tdeutils/tdecmoduleloader.h
diff --git a/kutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp
index 673074c16..673074c16 100644
--- a/kutils/tdecmoduleproxy.cpp
+++ b/tdeutils/tdecmoduleproxy.cpp
diff --git a/kutils/tdecmoduleproxy.h b/tdeutils/tdecmoduleproxy.h
index 9fc559d97..9fc559d97 100644
--- a/kutils/tdecmoduleproxy.h
+++ b/tdeutils/tdecmoduleproxy.h
diff --git a/kutils/tdecmoduleproxyIface.h b/tdeutils/tdecmoduleproxyIface.h
index 22bfa8e52..22bfa8e52 100644
--- a/kutils/tdecmoduleproxyIface.h
+++ b/tdeutils/tdecmoduleproxyIface.h
diff --git a/kutils/tdecmoduleproxyIfaceImpl.cpp b/tdeutils/tdecmoduleproxyIfaceImpl.cpp
index 53019f72f..53019f72f 100644
--- a/kutils/tdecmoduleproxyIfaceImpl.cpp
+++ b/tdeutils/tdecmoduleproxyIfaceImpl.cpp
diff --git a/kutils/tdecmoduleproxyIfaceImpl.h b/tdeutils/tdecmoduleproxyIfaceImpl.h
index fec8c6e5c..fec8c6e5c 100644
--- a/kutils/tdecmoduleproxyIfaceImpl.h
+++ b/tdeutils/tdecmoduleproxyIfaceImpl.h
diff --git a/kutils/kmultitabbar.cpp b/tdeutils/tdemultitabbar.cpp
index 082470538..313d23d55 100644
--- a/kutils/kmultitabbar.cpp
+++ b/tdeutils/tdemultitabbar.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kmultitabbar.cpp -  description
+                          tdemultitabbar.cpp -  description
                              -------------------
     begin                :  2001
     copyright            : (C) 2001,2002,2003 by Joseph Wenninger <jowenn@kde.org>
@@ -22,10 +22,10 @@
     Boston, MA 02110-1301, USA.
  ***************************************************************************/
 
-#include "kmultitabbar.h"
-#include "kmultitabbar.moc"
-#include "kmultitabbar_p.h"
-#include "kmultitabbar_p.moc"
+#include "tdemultitabbar.h"
+#include "tdemultitabbar.moc"
+#include "tdemultitabbar_p.h"
+#include "tdemultitabbar_p.moc"
 #include <tqbutton.h>
 #include <tqpopupmenu.h>
 #include <tqlayout.h>
diff --git a/kutils/kmultitabbar.h b/tdeutils/tdemultitabbar.h
index ffc3fca5f..b14d9518b 100644
--- a/kutils/kmultitabbar.h
+++ b/tdeutils/tdemultitabbar.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kmultitabbar.h -  description
+                          tdemultitabbar.h -  description
                              -------------------
     begin                :  2001
     copyright            : (C) 2001,2002,2003 by Joseph Wenninger <jowenn@kde.org>
diff --git a/kutils/kmultitabbar_p.h b/tdeutils/tdemultitabbar_p.h
index f8d552b40..53b43a861 100644
--- a/kutils/kmultitabbar_p.h
+++ b/tdeutils/tdemultitabbar_p.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kmultitabbar_p.h -  description
+                          tdemultitabbar_p.h -  description
                              -------------------
     begin                :  2003
     copyright            : (C) 2003 by Joseph Wenninger <jowenn@kde.org>
@@ -25,7 +25,7 @@
 #ifndef K_MULTI_TAB_BAR_P_H
 #define K_MULTI_TAB_BAR_P_H
 #include <tqscrollview.h>
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 
 class KMultiTabBarInternal: public TQScrollView
 {
diff --git a/kutils/tests/Makefile.am b/tdeutils/tests/Makefile.am
index 3bde7a9a2..f669e7914 100644
--- a/kutils/tests/Makefile.am
+++ b/tdeutils/tests/Makefile.am
@@ -5,11 +5,11 @@ check_PROGRAMS = kfindtest kreplacetest
 TESTS = kfindtest kreplacetest
 
 kfindtest_SOURCES = kfindtest.cpp
-kfindtest_LDADD = ../libkutils.la
+kfindtest_LDADD = ../libtdeutils.la
 kfindtest_LDFLAGS = $(all_libraries)
 
 kreplacetest_SOURCES = kreplacetest.cpp
-kreplacetest_LDADD = ../libkutils.la
+kreplacetest_LDADD = ../libtdeutils.la
 kreplacetest_LDFLAGS = $(all_libraries)
 
 METASOURCES = AUTO
diff --git a/kutils/tests/kfindtest.cpp b/tdeutils/tests/kfindtest.cpp
index 6c64245dc..6c64245dc 100644
--- a/kutils/tests/kfindtest.cpp
+++ b/tdeutils/tests/kfindtest.cpp
diff --git a/kutils/tests/kfindtest.h b/tdeutils/tests/kfindtest.h
index 847d9579c..847d9579c 100644
--- a/kutils/tests/kfindtest.h
+++ b/tdeutils/tests/kfindtest.h
diff --git a/kutils/tests/kreplacetest.cpp b/tdeutils/tests/kreplacetest.cpp
index 26b0f7c9e..26b0f7c9e 100644
--- a/kutils/tests/kreplacetest.cpp
+++ b/tdeutils/tests/kreplacetest.cpp
diff --git a/kutils/tests/kreplacetest.h b/tdeutils/tests/kreplacetest.h
index b8fb8120b..b8fb8120b 100644
--- a/kutils/tests/kreplacetest.h
+++ b/tdeutils/tests/kreplacetest.h
diff --git a/kwallet/CMakeLists.txt b/tdewallet/CMakeLists.txt
index fcc0f90d5..fcc0f90d5 100644
--- a/kwallet/CMakeLists.txt
+++ b/tdewallet/CMakeLists.txt
diff --git a/kwallet/Makefile.am b/tdewallet/Makefile.am
index 18a2cc6e7..18a2cc6e7 100644
--- a/kwallet/Makefile.am
+++ b/tdewallet/Makefile.am
diff --git a/kwallet/README b/tdewallet/README
index 9d662c0a9..661729a2f 100644
--- a/kwallet/README
+++ b/tdewallet/README
@@ -4,7 +4,7 @@ It has been updated to 10/22/2003.
 
 -----------
 
-This directory consists of two libraries: kwalletbackend and kwalletclient
+This directory consists of two libraries: tdewalletbackend and tdewalletclient
 
 KWallet::Backend is used inside kded to manage the actual files and
 encryption.  On the other hand, KWallet::Wallet is used to represent
diff --git a/kwallet/backend/CMakeLists.txt b/tdewallet/backend/CMakeLists.txt
index d8888afce..59c0bf942 100644
--- a/kwallet/backend/CMakeLists.txt
+++ b/tdewallet/backend/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kwallet/client
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
 )
@@ -23,14 +23,14 @@ link_directories(
 )
 
 
-##### libkwalletbackend #########################
+##### libtdewalletbackend #########################
 
-set( target kwalletbackend )
+set( target tdewalletbackend )
 
 set( ${target}_SRCS
   blockcipher.cc blowfish.cc
-  cbc.cc sha1.cc kwalletentry.cc
-  kwalletbackend.cc
+  cbc.cc sha1.cc tdewalletentry.cc
+  tdewalletbackend.cc
 )
 
 tde_add_library( ${target} SHARED
diff --git a/tdewallet/backend/Makefile.am b/tdewallet/backend/Makefile.am
new file mode 100644
index 000000000..79bfc0820
--- /dev/null
+++ b/tdewallet/backend/Makefile.am
@@ -0,0 +1,25 @@
+
+INCLUDES = -I$(srcdir)/../client $(all_includes)
+
+lib_LTLIBRARIES = libtdewalletbackend.la
+
+libtdewalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined
+libtdewalletbackend_la_LIBADD = $(LIB_QT) ../../tdecore/libtdecore.la
+libtdewalletbackend_la_SOURCES = blockcipher.cc		\
+			       blowfish.cc		\
+			       cbc.cc			\
+			       sha1.cc			\
+			       tdewalletentry.cc		\
+			       tdewalletbackend.cc
+
+
+libtdewalletbackend_la_METASOURCES = AUTO
+
+noinst_HEADERS = blowfishtables.h	\
+		 cbc.h			\
+		 sha1.h			\
+		 blockcipher.h		\
+		 tdewalletentry.h		\
+		 tdewalletbackend.h	\
+		 blowfish.h
+
diff --git a/kwallet/backend/blockcipher.cc b/tdewallet/backend/blockcipher.cc
index 9d770098e..9d770098e 100644
--- a/kwallet/backend/blockcipher.cc
+++ b/tdewallet/backend/blockcipher.cc
diff --git a/kwallet/backend/blockcipher.h b/tdewallet/backend/blockcipher.h
index aadff6e70..aadff6e70 100644
--- a/kwallet/backend/blockcipher.h
+++ b/tdewallet/backend/blockcipher.h
diff --git a/kwallet/backend/blowfish.cc b/tdewallet/backend/blowfish.cc
index c708935de..c708935de 100644
--- a/kwallet/backend/blowfish.cc
+++ b/tdewallet/backend/blowfish.cc
diff --git a/kwallet/backend/blowfish.h b/tdewallet/backend/blowfish.h
index 581ac31c0..581ac31c0 100644
--- a/kwallet/backend/blowfish.h
+++ b/tdewallet/backend/blowfish.h
diff --git a/kwallet/backend/blowfishtables.h b/tdewallet/backend/blowfishtables.h
index dae448f96..dae448f96 100644
--- a/kwallet/backend/blowfishtables.h
+++ b/tdewallet/backend/blowfishtables.h
diff --git a/kwallet/backend/cbc.cc b/tdewallet/backend/cbc.cc
index 7bc5f3891..7bc5f3891 100644
--- a/kwallet/backend/cbc.cc
+++ b/tdewallet/backend/cbc.cc
diff --git a/kwallet/backend/cbc.h b/tdewallet/backend/cbc.h
index 1ce971ab3..1ce971ab3 100644
--- a/kwallet/backend/cbc.h
+++ b/tdewallet/backend/cbc.h
diff --git a/kwallet/backend/sha1.cc b/tdewallet/backend/sha1.cc
index 7420b5f16..7420b5f16 100644
--- a/kwallet/backend/sha1.cc
+++ b/tdewallet/backend/sha1.cc
diff --git a/kwallet/backend/sha1.h b/tdewallet/backend/sha1.h
index de40cc692..de40cc692 100644
--- a/kwallet/backend/sha1.h
+++ b/tdewallet/backend/sha1.h
diff --git a/kwallet/backend/kwalletbackend.cc b/tdewallet/backend/tdewalletbackend.cc
index cfc296a61..9871b9d7b 100644
--- a/kwallet/backend/kwalletbackend.cc
+++ b/tdewallet/backend/tdewalletbackend.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "kwalletbackend.h"
+#include "tdewalletbackend.h"
 
 #include <stdlib.h>
 
@@ -56,7 +56,7 @@ using namespace KWallet;
 
 static void initKWalletDir()
 {
-    TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
+    TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
 }
 
 Backend::Backend(const TQString& name, bool isPath) : _name(name), _ref(0) {
@@ -64,7 +64,7 @@ Backend::Backend(const TQString& name, bool isPath) : _name(name), _ref(0) {
 	if (isPath) {
 		_path = name;
 	} else {
-		_path = TDEGlobal::dirs()->saveLocation("kwallet") + "/" + _name + ".kwl";
+		_path = TDEGlobal::dirs()->saveLocation("tdewallet") + "/" + _name + ".kwl";
 	}
 
 	_open = false;
@@ -245,7 +245,7 @@ static int password2hash(const TQByteArray& password, TQByteArray& hash) {
 
 bool Backend::exists(const TQString& wallet) {
 	initKWalletDir();
-	TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + "/" + wallet + ".kwl";
+	TQString path = TDEGlobal::dirs()->saveLocation("tdewallet") + "/" + wallet + ".kwl";
 	// Note: 60 bytes is presently the minimum size of a wallet file.
 	//       Anything smaller is junk.
 return TQFile::exists(path) && TQFileInfo(path).size() >= 60;
diff --git a/kwallet/backend/kwalletbackend.h b/tdewallet/backend/tdewalletbackend.h
index f43f56ec8..105d421db 100644
--- a/kwallet/backend/kwalletbackend.h
+++ b/tdewallet/backend/tdewalletbackend.h
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
-#include "kwalletentry.h"
+#include "tdewalletentry.h"
 
 
 namespace KWallet {
diff --git a/kwallet/backend/kwalletentry.cc b/tdewallet/backend/tdewalletentry.cc
index 4e74c03e3..a7e8a0425 100644
--- a/kwallet/backend/kwalletentry.cc
+++ b/tdewallet/backend/tdewalletentry.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */ 
 
-#include "kwalletentry.h"
+#include "tdewalletentry.h"
 
 
 using namespace KWallet;
diff --git a/kwallet/backend/kwalletentry.h b/tdewallet/backend/tdewalletentry.h
index 530e1a828..bd39e97d1 100644
--- a/kwallet/backend/kwalletentry.h
+++ b/tdewallet/backend/tdewalletentry.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqdatastream.h>
 
-#include "kwallet.h"
+#include "tdewallet.h"
 
 namespace KWallet {
 
diff --git a/kwallet/backend/tests/Makefile.am b/tdewallet/backend/tests/Makefile.am
index 3191b06a8..5f5da74d9 100644
--- a/kwallet/backend/tests/Makefile.am
+++ b/tdewallet/backend/tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kwallet/backend -I$(top_srcdir)/kwallet/client $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdewallet/backend -I$(top_srcdir)/tdewallet/client $(all_includes)
 
 AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
 
@@ -6,7 +6,7 @@ check_PROGRAMS = backendtest testbf testsha
 
 METASOURCES = AUTO
 
-LDADD = ../libkwalletbackend.la ../../client/libkwalletclient.la
+LDADD = ../libtdewalletbackend.la ../../client/libtdewalletclient.la
 backendtest_SOURCES = backendtest.cpp
 
 testbf_SOURCES = testbf.cpp
diff --git a/kwallet/backend/tests/backendtest.cpp b/tdewallet/backend/tests/backendtest.cpp
index ea74054b7..4e19ce43f 100644
--- a/kwallet/backend/tests/backendtest.cpp
+++ b/tdewallet/backend/tests/backendtest.cpp
@@ -4,10 +4,10 @@
 #include <kapplication.h>
 #include <tqstring.h>
 
-#include "kwalletbackend.h"
+#include "tdewalletbackend.h"
 
 int main(int argc, char **argv) {
-   TDEApplication a(argc, argv, "kwalletbackendtest");
+   TDEApplication a(argc, argv, "tdewalletbackendtest");
 
    KWallet::Backend be("ktestwallet");
    printf("KWalletBackend constructed\n");
diff --git a/kwallet/backend/tests/testbf.cpp b/tdewallet/backend/tests/testbf.cpp
index 12dc74630..12dc74630 100644
--- a/kwallet/backend/tests/testbf.cpp
+++ b/tdewallet/backend/tests/testbf.cpp
diff --git a/kwallet/backend/tests/testsha.cpp b/tdewallet/backend/tests/testsha.cpp
index 70879f015..70879f015 100644
--- a/kwallet/backend/tests/testsha.cpp
+++ b/tdewallet/backend/tests/testsha.cpp
diff --git a/kwallet/client/CMakeLists.txt b/tdewallet/client/CMakeLists.txt
index 13056ccc2..f222f8bde 100644
--- a/kwallet/client/CMakeLists.txt
+++ b/tdewallet/client/CMakeLists.txt
@@ -25,16 +25,16 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    kwallet.h kwallettypes.h
+    tdewallet.h tdewallettypes.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
-##### libkwalletclient ##############################
+##### libtdewalletclient ##############################
 
-set( target kwalletclient )
+set( target tdewalletclient )
 
 set( ${target}_SRCS
-  kwallet.skel kwallet.cc
+  tdewallet.skel tdewallet.cc
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/tdewallet/client/Makefile.am b/tdewallet/client/Makefile.am
new file mode 100644
index 000000000..d10938a4f
--- /dev/null
+++ b/tdewallet/client/Makefile.am
@@ -0,0 +1,14 @@
+
+INCLUDES= -I$(srcdir) $(all_includes)
+
+lib_LTLIBRARIES = libtdewalletclient.la
+
+libtdewalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined
+libtdewalletclient_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
+libtdewalletclient_la_SOURCES =   tdewallet.skel \
+				tdewallet.cc
+
+libtdewalletclient_la_METASOURCES = AUTO
+
+include_HEADERS = tdewallet.h tdewallettypes.h
+
diff --git a/kwallet/client/kwallet.cc b/tdewallet/client/tdewallet.cc
index 4edb421b2..73b423cbc 100644
--- a/kwallet/client/kwallet.cc
+++ b/tdewallet/client/tdewallet.cc
@@ -18,8 +18,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "kwallettypes.h"
-#include "kwallet.h"
+#include "tdewallettypes.h"
+#include "tdewallet.h"
 #include <kconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
@@ -34,7 +34,7 @@ using namespace KWallet;
 
 
 const TQString Wallet::LocalWallet() {
-	TDEConfig cfg("kwalletrc", true);
+	TDEConfig cfg("tdewalletrc", true);
 	cfg.setGroup("Wallet");
 	if (!cfg.readBoolEntry("Use One Wallet", true)) {
 		TQString tmp = cfg.readEntry("Local Wallet", "localwallet");
@@ -52,7 +52,7 @@ const TQString Wallet::LocalWallet() {
 }
 
 const TQString Wallet::NetworkWallet() {
-	TDEConfig cfg("kwalletrc", true);
+	TDEConfig cfg("tdewalletrc", true);
 	cfg.setGroup("Wallet");
 
 	TQString tmp = cfg.readEntry("Default Wallet", "kdewallet");
@@ -75,7 +75,7 @@ const TQString Wallet::FormDataFolder() {
 Wallet::Wallet(int handle, const TQString& name)
 : TQObject(0L), DCOPObject(), d(0L), _name(name), _handle(handle) {
 
-	_dcopRef = new DCOPRef("kded", "kwalletd");
+	_dcopRef = new DCOPRef("kded", "tdewalletd");
 
 	_dcopRef->dcopClient()->setNotifications(true);
 	connect(_dcopRef->dcopClient(),
@@ -117,7 +117,7 @@ Wallet::~Wallet() {
 
 
 TQStringList Wallet::walletList() {
-	DCOPReply r = DCOPRef("kded", "kwalletd").call("wallets");
+	DCOPReply r = DCOPRef("kded", "tdewalletd").call("wallets");
 	TQStringList rc;
 	if (r.isValid()) {
 		r.get(rc);
@@ -127,12 +127,12 @@ TQStringList Wallet::walletList() {
 
 
 void Wallet::changePassword(const TQString& name, WId w) {
-	DCOPRef("kded", "kwalletd").send("changePassword", name, uint(w));
+	DCOPRef("kded", "tdewalletd").send("changePassword", name, uint(w));
 }
 
 
 bool Wallet::isEnabled() {
-	DCOPReply r = DCOPRef("kded", "kwalletd").call("isEnabled");
+	DCOPReply r = DCOPRef("kded", "tdewalletd").call("isEnabled");
 	bool rc = false;
 	if (r.isValid()) {
 		r.get(rc);
@@ -142,7 +142,7 @@ bool Wallet::isEnabled() {
 
 
 bool Wallet::isOpen(const TQString& name) {
-	DCOPReply r = DCOPRef("kded", "kwalletd").call("isOpen", name);
+	DCOPReply r = DCOPRef("kded", "tdewalletd").call("isOpen", name);
 	bool rc = false;
 	if (r.isValid()) {
 		r.get(rc);
@@ -152,7 +152,7 @@ bool Wallet::isOpen(const TQString& name) {
 
 
 int Wallet::closeWallet(const TQString& name, bool force) {
-	DCOPReply r = DCOPRef("kded", "kwalletd").call("close", name, force);
+	DCOPReply r = DCOPRef("kded", "tdewalletd").call("close", name, force);
 	int rc = -1;
 	if (r.isValid()) {
 		r.get(rc);
@@ -162,7 +162,7 @@ int Wallet::closeWallet(const TQString& name, bool force) {
 
 
 int Wallet::deleteWallet(const TQString& name) {
-	DCOPReply r = DCOPRef("kded", "kwalletd").call("deleteWallet", name);
+	DCOPReply r = DCOPRef("kded", "tdewalletd").call("deleteWallet", name);
 	int rc = -1;
 	if (r.isValid()) {
 		r.get(rc);
@@ -174,7 +174,7 @@ int Wallet::deleteWallet(const TQString& name) {
 Wallet *Wallet::openWallet(const TQString& name, WId w, OpenType ot) {
 	if (ot == Asynchronous) {
 		Wallet *wallet = new Wallet(-1, name);
-		DCOPRef("kded", "kwalletd").send("openAsynchronous", name, wallet->objId(), uint(w));
+		DCOPRef("kded", "tdewalletd").send("openAsynchronous", name, wallet->objId(), uint(w));
 		return wallet;
 	}
 
@@ -186,9 +186,9 @@ Wallet *Wallet::openWallet(const TQString& name, WId w, OpenType ot) {
 	DCOPReply r;
 
 	if (isPath) {
-		r = DCOPRef("kded", "kwalletd").call("openPath", name, uint(w));
+		r = DCOPRef("kded", "tdewalletd").call("openPath", name, uint(w));
 	} else {
-		r = DCOPRef("kded", "kwalletd").call("open", name, uint(w));
+		r = DCOPRef("kded", "tdewalletd").call("open", name, uint(w));
 	}
 
 	if (r.isValid()) {
@@ -204,7 +204,7 @@ Wallet *Wallet::openWallet(const TQString& name, WId w, OpenType ot) {
 
 
 bool Wallet::disconnectApplication(const TQString& wallet, const TQCString& app) {
-	DCOPReply r = DCOPRef("kded", "kwalletd").call("disconnectApplication", wallet, app);
+	DCOPReply r = DCOPRef("kded", "tdewalletd").call("disconnectApplication", wallet, app);
 	bool rc = false;
 	if (r.isValid()) {
 		r.get(rc);
@@ -214,7 +214,7 @@ bool Wallet::disconnectApplication(const TQString& wallet, const TQCString& app)
 
 
 TQStringList Wallet::users(const TQString& name) {
-	DCOPReply r = DCOPRef("kded", "kwalletd").call("users", name);
+	DCOPReply r = DCOPRef("kded", "tdewalletd").call("users", name);
 	TQStringList drc;
 	if (r.isValid()) {
 		r.get(drc);
@@ -687,7 +687,7 @@ void Wallet::walletOpenResult(int id) {
 
 
 bool Wallet::folderDoesNotExist(const TQString& wallet, const TQString& folder) {
-DCOPReply r = DCOPRef("kded", "kwalletd").call("folderDoesNotExist", wallet, folder);
+DCOPReply r = DCOPRef("kded", "tdewalletd").call("folderDoesNotExist", wallet, folder);
 bool rc = true;
 	if (r.isValid()) {
 		r.get(rc);
@@ -697,7 +697,7 @@ return rc;
 
 
 bool Wallet::keyDoesNotExist(const TQString& wallet, const TQString& folder, const TQString& key) {
-DCOPReply r = DCOPRef("kded", "kwalletd").call("keyDoesNotExist", wallet, folder, key);
+DCOPReply r = DCOPRef("kded", "tdewalletd").call("keyDoesNotExist", wallet, folder, key);
 bool rc = true;
 	if (r.isValid()) {
 		r.get(rc);
@@ -710,4 +710,4 @@ void Wallet::virtual_hook(int, void*) {
 	//BASE::virtual_hook( id, data );
 }
 
-#include "kwallet.moc"
+#include "tdewallet.moc"
diff --git a/kwallet/client/kwallet.h b/tdewallet/client/tdewallet.h
index 38157955b..fa5dbcbb2 100644
--- a/kwallet/client/kwallet.h
+++ b/tdewallet/client/tdewallet.h
@@ -491,7 +491,7 @@ class TDEIO_EXPORT Wallet : public TQObject, public DCOPObject {
 
 		/**
 		 *  @internal
-		 *  Callback for kwalletd
+		 *  Callback for tdewalletd
 		 */
 		ASYNC walletOpenResult(int rc);
 
diff --git a/kwallet/client/kwallettypes.h b/tdewallet/client/tdewallettypes.h
index 918dc0a3f..918dc0a3f 100644
--- a/kwallet/client/kwallettypes.h
+++ b/tdewallet/client/tdewallettypes.h
diff --git a/tdewallet/tests/Makefile.am b/tdewallet/tests/Makefile.am
new file mode 100644
index 000000000..83aa39dc0
--- /dev/null
+++ b/tdewallet/tests/Makefile.am
@@ -0,0 +1,20 @@
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_ASCII_CAST $(all_includes)
+
+METASOURCES = AUTO
+check_PROGRAMS = tdewalletasync tdewalletsync tdewalletboth
+
+tdewalletasync_SOURCES = tdewalletasync.cpp tdewallettest.cpp
+tdewalletasync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
+tdewalletasync_LDADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la \
+	$(LIB_TDECORE) $(LIB_QT)
+
+tdewalletsync_SOURCES = tdewalletsync.cpp
+tdewalletsync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
+tdewalletsync_LDADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la \
+	$(LIB_TDECORE) $(LIB_QT)
+
+tdewalletboth_SOURCES = tdewalletboth.cpp tdewallettest.cpp
+tdewalletboth_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
+tdewalletboth_LDADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la \
+	$(LIB_TDECORE) $(LIB_QT)
+INCLUDES = -I$(top_srcdir)/tdewallet/client
diff --git a/tdewallet/tests/README b/tdewallet/tests/README
new file mode 100644
index 000000000..0996c216d
--- /dev/null
+++ b/tdewallet/tests/README
@@ -0,0 +1,5 @@
+Tests for opening the wallet synchronously and asynchronously
+
+tdewalletsync - open synchronously
+tdewalletasync - open asynchronously
+tdewalletboth - start opening asynchronously, then, during the async call, open synchronously
diff --git a/kwallet/tests/kwalletasync.cpp b/tdewallet/tests/tdewalletasync.cpp
index e4371448c..3512cc799 100644
--- a/kwallet/tests/kwalletasync.cpp
+++ b/tdewallet/tests/tdewalletasync.cpp
@@ -8,9 +8,9 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 
-#include "kwallettest.h"
+#include "tdewallettest.h"
 
 static TQTextStream _out( stdout, IO_WriteOnly );
 
@@ -43,9 +43,9 @@ void WalletReceiver::walletOpened( bool got )
 
 int main( int argc, char *argv[] )
 {
-	TDEAboutData aboutData( "kwalletasync", "kwalletasync", "version" );
+	TDEAboutData aboutData( "tdewalletasync", "tdewalletasync", "version" );
 	TDECmdLineArgs::init( argc, argv, &aboutData );
-	TDEApplication app( "kwalletasync" );
+	TDEApplication app( "tdewalletasync" );
 
 	// register with DCOP
 	_out << "DCOP registration returned " << app.dcopClient()->registerAs(app.name()) << endl;
diff --git a/kwallet/tests/kwalletboth.cpp b/tdewallet/tests/tdewalletboth.cpp
index 5df7b56ab..eabb26eaa 100644
--- a/kwallet/tests/kwalletboth.cpp
+++ b/tdewallet/tests/tdewalletboth.cpp
@@ -8,9 +8,9 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 
-#include "kwallettest.h"
+#include "tdewallettest.h"
 
 static TQTextStream _out( stdout, IO_WriteOnly );
 
@@ -65,9 +65,9 @@ void WalletReceiver::walletOpened( bool got )
 
 int main( int argc, char *argv[] )
 {
-	TDEAboutData aboutData( "kwalletboth", "kwalletboth", "version" );
+	TDEAboutData aboutData( "tdewalletboth", "tdewalletboth", "version" );
 	TDECmdLineArgs::init( argc, argv, &aboutData );
-	TDEApplication app( "kwalletboth" );
+	TDEApplication app( "tdewalletboth" );
 
 	// register with DCOP
 	_out << "DCOP registration returned " << app.dcopClient()->registerAs(app.name()) << endl;
diff --git a/kwallet/tests/kwalletsync.cpp b/tdewallet/tests/tdewalletsync.cpp
index 743692740..54ffd6a12 100644
--- a/kwallet/tests/kwalletsync.cpp
+++ b/tdewallet/tests/tdewalletsync.cpp
@@ -8,7 +8,7 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 
 static TQTextStream _out( stdout, IO_WriteOnly );
 
@@ -23,9 +23,9 @@ void openWallet()
 
 int main( int argc, char *argv[] )
 {
-	TDEAboutData aboutData( "kwalletsync", "kwalletsync", "version" );
+	TDEAboutData aboutData( "tdewalletsync", "tdewalletsync", "version" );
 	TDECmdLineArgs::init( argc, argv, &aboutData );
-	TDEApplication app( "kwalletsync" );
+	TDEApplication app( "tdewalletsync" );
 
 	// register with DCOP
 	_out << "DCOP registration returned " << app.dcopClient()->registerAs(app.name()) << endl;
diff --git a/tdewallet/tests/tdewallettest.cpp b/tdewallet/tests/tdewallettest.cpp
new file mode 100644
index 000000000..c0acac812
--- /dev/null
+++ b/tdewallet/tests/tdewallettest.cpp
@@ -0,0 +1,2 @@
+#include "tdewallettest.h"
+#include "tdewallettest.moc"
diff --git a/kwallet/tests/kwallettest.h b/tdewallet/tests/tdewallettest.h
index c062760a4..c062760a4 100644
--- a/kwallet/tests/kwallettest.h
+++ b/tdewallet/tests/tdewallettest.h
diff --git a/win/pro_files/interfaces/interfaces.pro b/win/pro_files/interfaces/interfaces.pro
index b766eec14..bffab613b 100644
--- a/win/pro_files/interfaces/interfaces.pro
+++ b/win/pro_files/interfaces/interfaces.pro
@@ -1,4 +1,4 @@
 TEMPLATE	= subdirs
 
 SUBDIRS += \
-ktexteditor
+tdetexteditor
diff --git a/win/pro_files/interfaces/ktexteditor/ktexteditor.pro b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro
index 192530e70..421267305 100644
--- a/win/pro_files/interfaces/ktexteditor/ktexteditor.pro
+++ b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro
@@ -5,20 +5,20 @@ include( $(KDELIBS)/win/common.pro )
 
 LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \
     $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \
-    $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kparts$$KDELIB_SUFFIX \
+    $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeparts$$KDELIB_SUFFIX \
     $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kabc$$KDELIB_SUFFIX \
     $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX
 
-INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/ktexteditor \
+INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/tdetexteditor \
  $(KDELIBS)/kabc
 
-TARGET		= ktexteditor$$KDEBUG
+TARGET		= tdetexteditor$$KDEBUG
 
 system( bash kmoc )
 system( bash kdcopidl )
 
 SOURCES = \
-    ktexteditor.cpp \
+    tdetexteditor.cpp \
     editinterface.cpp editinterfaceext.cpp \
     clipboardinterface.cpp  selectioninterface.cpp searchinterface.cpp \
     codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \
diff --git a/win/pro_files/kabc/kabc.pro b/win/pro_files/kabc/kabc.pro
index 95f08b747..7e38e3c7d 100644
--- a/win/pro_files/kabc/kabc.pro
+++ b/win/pro_files/kabc/kabc.pro
@@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro )
 # needed to export library classes:
 DEFINES += MAKE_KABC_LIB
 LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR\kresources$$KDELIB_SUFFIX $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX \
+	$$KDELIBDESTDIR\tderesources$$KDELIB_SUFFIX $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kvcard$$KDELIB_SUFFIX
 
 INCLUDEPATH += $(KDELIBS)/kabc/vcard/include $(KDELIBS)/kabc/vcard/include/generated \
diff --git a/win/pro_files/kate/interfaces/interfaces.pro b/win/pro_files/kate/interfaces/interfaces.pro
index 22a1527fe..bfcfef97e 100644
--- a/win/pro_files/kate/interfaces/interfaces.pro
+++ b/win/pro_files/kate/interfaces/interfaces.pro
@@ -8,8 +8,8 @@ DEFINES += MAKE_KATEPARTINTERFACES_LIB
 TARGET		= katepartinterfaces$$KDEBUG
 
 LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX 
+	$$KDELIBDESTDIR/tdetexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX \
+	$$KDELIBDESTDIR/tdetexteditor$$KDELIB_SUFFIX 
 
 INCLUDEPATH += $(KDELIBS)/interfaces
 
diff --git a/win/pro_files/kate/part/part.pro b/win/pro_files/kate/part/part.pro
index 69bfed0be..ad3acfee7 100644
--- a/win/pro_files/kate/part/part.pro
+++ b/win/pro_files/kate/part/part.pro
@@ -9,13 +9,13 @@ DEFINES += MAKE_KATEPART_LIB
 TARGET		= katepart$$KDELIBDEBUG
 
 LIBS += $$KDELIBDESTDIR/katepartinterfaces$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \
+	$$KDELIBDESTDIR/tdetexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/kutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \
+	$$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX
 
 INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/kregexpeditor \
-	$(KDELIBS)/kutils $(KDELIBS)/tdeprint
+	$(KDELIBS)/tdeutils $(KDELIBS)/tdeprint
 
 system( bash kmoc )
 system( bash kdcopidl )
diff --git a/win/pro_files/kdewidgets/kdewidgets.pro b/win/pro_files/kdewidgets/kdewidgets.pro
index f3c5cd1f8..8bbf93cd9 100644
--- a/win/pro_files/kdewidgets/kdewidgets.pro
+++ b/win/pro_files/kdewidgets/kdewidgets.pro
@@ -13,8 +13,8 @@ DESTDIR		= $$KDELIBDESTDIR/trinity/plugins/designer
 
 LIBS +=  $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/kabc$$KDELIB_SUFFIX $$KDELIBDESTDIR/kutils$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/kresources$$KDELIB_SUFFIX 
+	$$KDELIBDESTDIR/kabc$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX \
+	$$KDELIBDESTDIR/tderesources$$KDELIB_SUFFIX 
 
 SOURCES += classpreviews.cpp kdewidgets.cpp
 
diff --git a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro
index 4e09b8bb9..c2d4afa73 100644
--- a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro
+++ b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro
@@ -13,7 +13,7 @@ TARGET		= kfiletreeviewtest
 
 LIBS +=  $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \
   $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \
-  $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \
+  $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX \
   $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX
 
 # icon
diff --git a/win/pro_files/kio/kio.pro b/win/pro_files/kio/kio.pro
index a6b567661..179de7086 100644
--- a/win/pro_files/kio/kio.pro
+++ b/win/pro_files/kio/kio.pro
@@ -19,7 +19,7 @@ INCLUDEPATH += $(KDELIBS)/tdecore/network $(KDELIBS)/kio/kio $(KDELIBS)/kio/misc
   $(KDELIBS)/kio/kio/moc $(KDELIBS)/kio/misc/moc $(KDELIBS)/kio/kfile/moc \
   $(KDELIBS)/kio/misc/moc \
   $(KDELIBS)/kio/bookmarks/moc \
-  $(KDELIBS)/kio/kssl/moc $(KDELIBS)/kwallet/client 
+  $(KDELIBS)/kio/kssl/moc $(KDELIBS)/tdewallet/client 
 
 system( cd kio && dcopidl kdirnotify.h > kdirnotify.kidl && dcopidl2cpp --no-stub kdirnotify.kidl )
 system( cd kio && dcopidl observer.h > observer.kidl && dcopidl2cpp observer.kidl )
diff --git a/win/pro_files/kmdi/kmdi.pro b/win/pro_files/kmdi/kmdi.pro
deleted file mode 100644
index 2bcc97053..000000000
--- a/win/pro_files/kmdi/kmdi.pro
+++ /dev/null
@@ -1,31 +0,0 @@
-TEMPLATE	= lib
-
-include( $(KDELIBS)/win/common.pro )
-
-
-# needed to export library classes:
-DEFINES += MAKE_KMDI_LIB
-
-TARGET		= kmdi$$KDEBUG
-
-LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/kutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX
-
-INCLUDEPATH += res $(KDELIBS)/kutils $(KDELIBS)/tdeui
-
-system( bash kmoc )
-
-SOURCES = \
-kmdichildarea.cpp \
-kmdichildfrm.cpp \
-kmdichildfrmcaption.cpp \
-kmdichildview.cpp \
-kmdidockcontainer.cpp \
-kmdidocumentviewtabwidget.cpp \
-kmdifocuslist.cpp \
-kmdiguiclient.cpp \
-kmdimainfrm.cpp \
-kmditaskbar.cpp \
-kmditoolviewaccessor.cpp
-
-HEADERS		=
diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro
index 21426a32e..ed6662391 100644
--- a/win/pro_files/tdecore/tdecore.pro
+++ b/win/pro_files/tdecore/tdecore.pro
@@ -80,9 +80,9 @@ kglobalaccel.cpp \
 kglobalaccel_win.cpp \
 kaccelaction.cpp \
 kuniqueapplication.cpp \
-ksycoca.cpp \
-ksycocadict.cpp \
-ksycocafactory.cpp \
+tdesycoca.cpp \
+tdesycocadict.cpp \
+tdesycocafactory.cpp \
 kapplication.cpp \
 kapplication_win.cpp \
 kappdcopiface.cpp \
@@ -105,7 +105,7 @@ kclipboard.cpp \
 kdebugdcopiface.cpp \
 krandomsequence.cpp \
 krfcdate.cpp \
-kmultipledrag.cpp \
+tdemultipledrag.cpp \
 kipc.cpp \
 kuser.cpp \
 kaudioplayer.cpp \
@@ -130,8 +130,8 @@ kqiodevicegzip_p.cpp
 SOURCES += \
 kappdcopiface_stub.cpp \
 kappdcopiface_skel.cpp \
-ksycoca_stub.cpp \
-ksycoca_skel.cpp \
+tdesycoca_stub.cpp \
+tdesycoca_skel.cpp \
 kdebugdcopiface_stub.cpp \
 kdebugdcopiface_skel.cpp
 
diff --git a/win/pro_files/tdemdi/tdemdi.pro b/win/pro_files/tdemdi/tdemdi.pro
new file mode 100644
index 000000000..7fee597d0
--- /dev/null
+++ b/win/pro_files/tdemdi/tdemdi.pro
@@ -0,0 +1,31 @@
+TEMPLATE	= lib
+
+include( $(KDELIBS)/win/common.pro )
+
+
+# needed to export library classes:
+DEFINES += MAKE_KMDI_LIB
+
+TARGET		= tdemdi$$KDEBUG
+
+LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
+	$$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX
+
+INCLUDEPATH += res $(KDELIBS)/tdeutils $(KDELIBS)/tdeui
+
+system( bash kmoc )
+
+SOURCES = \
+tdemdichildarea.cpp \
+tdemdichildfrm.cpp \
+tdemdichildfrmcaption.cpp \
+tdemdichildview.cpp \
+tdemdidockcontainer.cpp \
+tdemdidocumentviewtabwidget.cpp \
+tdemdifocuslist.cpp \
+tdemdiguiclient.cpp \
+tdemdimainfrm.cpp \
+tdemditaskbar.cpp \
+tdemditoolviewaccessor.cpp
+
+HEADERS		=
diff --git a/win/pro_files/kmdi/test/test.pro b/win/pro_files/tdemdi/test/test.pro
index e9536cf43..4a60cd714 100644
--- a/win/pro_files/kmdi/test/test.pro
+++ b/win/pro_files/tdemdi/test/test.pro
@@ -10,10 +10,10 @@ CONFIG += debug
 CONFIG += console
 
 unix:DEFINES   = NO_INCLUDE_MOCFILES QT_NO_COMPAT
-unix:LIBS       += -lkmdi -L$(TDEDIR)/lib -ltdecore -ltdeui -lDCOP -lkparts
+unix:LIBS       += -ltdemdi -L$(TDEDIR)/lib -ltdecore -ltdeui -lDCOP -ltdeparts
 unix:INCLUDEPATH     += . .. $(TDEDIR)/include
 
-LIBS += $$KDELIBDESTDIR\kmdi$$KDELIB_SUFFIX $$KDELIBDESTDIR\kparts$$KDELIB_SUFFIX
+LIBS += $$KDELIBDESTDIR\tdemdi$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeparts$$KDELIB_SUFFIX
 
 HEADERS = hello.h \
           mainwidget.h
diff --git a/win/pro_files/kparts/kparts.pro b/win/pro_files/tdeparts/tdeparts.pro
index aabdc4d37..5e724cd1f 100644
--- a/win/pro_files/kparts/kparts.pro
+++ b/win/pro_files/tdeparts/tdeparts.pro
@@ -6,7 +6,7 @@ include( $(KDELIBS)/win/common.pro )
 # needed to export library classes:
 DEFINES += MAKE_KPARTS_LIB
 
-TARGET		= kparts$$KDEBUG
+TARGET		= tdeparts$$KDEBUG
 
 LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
  $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX
diff --git a/win/pro_files/kresources/kresources.pro b/win/pro_files/tderesources/tderesources.pro
index a485b2fba..b14c48102 100644
--- a/win/pro_files/kresources/kresources.pro
+++ b/win/pro_files/tderesources/tderesources.pro
@@ -14,14 +14,14 @@ LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUF
 system( bash kmoc )
 system( bash kdcopidl )
 
-TARGET = kresources$$KDEBUG
+TARGET = tderesources$$KDEBUG
 
 SOURCES = \
 configdialog.cpp \
 configpage.cpp \
 configwidget.cpp \
 factory.cpp \
-kcmkresources.cpp \
+kcmtderesources.cpp \
 managerimpl.cpp \
 resource.cpp \
 selectdialog.cpp \
diff --git a/win/pro_files/tdeui/tdeui.pro b/win/pro_files/tdeui/tdeui.pro
index 26813b1b7..0c8733d55 100644
--- a/win/pro_files/tdeui/tdeui.pro
+++ b/win/pro_files/tdeui/tdeui.pro
@@ -93,8 +93,8 @@ ksconfig.cpp \
 kselect.cpp \
 kseparator.cpp \
 kshortcutdialog.cpp \
-kspell.cpp \
-kspelldlg.cpp \
+tdespell.cpp \
+tdespelldlg.cpp \
 ksplashscreen.cpp \
 ksqueezedtextlabel.cpp \
 kstatusbar.cpp \
@@ -143,6 +143,6 @@ kmainwindowiface_skel.cpp
 FORMS = \
 kshortcutdialog_advanced.ui \
 kshortcutdialog_simple.ui \
-kspellui.ui
+tdespellui.ui
 
 HEADERS =
diff --git a/win/pro_files/kutils/kutils.pro b/win/pro_files/tdeutils/tdeutils.pro
index ce4d7fe79..f8e035d72 100644
--- a/win/pro_files/kutils/kutils.pro
+++ b/win/pro_files/tdeutils/tdeutils.pro
@@ -6,7 +6,7 @@ include( $(KDELIBS)/win/common.pro )
 # needed to export library classes:
 DEFINES += MAKE_KUTILS_LIB
 
-TARGET		= kutils$$KDEBUG
+TARGET		= tdeutils$$KDEBUG
 
 LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR/kio$$KDELIB_SUFFIX 
@@ -18,7 +18,7 @@ system( bash kmoc )
 SOURCES = \
 kfind.cpp \
 kfinddialog.cpp \
-kmultitabbar.cpp \
+tdemultitabbar.cpp \
 kplugininfo.cpp \
 kreplace.cpp \
 kreplacedialog.cpp
diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg
index b252b10ac..5a6c31512 100644
--- a/win/tools/build_tdelibs_dbg
+++ b/win/tools/build_tdelibs_dbg
@@ -47,15 +47,15 @@ $additional \
 tdecore \
 tdeui \
 kio \
-kresources \
+tderesources \
 kabc/vcard \
 kabc \
-kutils \
-kparts \
-kmdi \
+tdeutils \
+tdeparts \
+tdemdi \
 kioslave/gzip \
 kioslave/bzip2 \
-interfaces/ktexteditor \
+interfaces/tdetexteditor \
 kate/interfaces \
 kate/part \
  ; do 
diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel
index 2a9cabbd6..2cd412542 100644
--- a/win/tools/build_tdelibs_rel
+++ b/win/tools/build_tdelibs_rel
@@ -47,15 +47,15 @@ tdecore \
 tdeui \
 kstyles/thinkeramik/widget-engine \
 kio \
-kresources \
+tderesources \
 kabc/vcard \
 kabc \
-kutils \
-kparts \
-kmdi \
+tdeutils \
+tdeparts \
+tdemdi \
 kioslave/gzip \
 kioslave/bzip2 \
-interfaces/ktexteditor \
+interfaces/tdetexteditor \
 kate/interfaces \
 kate/part \
  ; do 
diff --git a/win/tools/kde_env b/win/tools/kde_env
index a8c721a5d..0fbf1410c 100755
--- a/win/tools/kde_env
+++ b/win/tools/kde_env
@@ -14,7 +14,7 @@ fi
 
 # Generic settings
 export KDELIBS=$KDEWIN\\tdelibs  # KDElibs/win32 source directory
-export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\tdecore;$KDELIBS\\tdefx;$KDELIBS\\tdeprint;$KDELIBS\\tdeui;$KDELIBS\\kmdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\kfile;$INCLUDE"
+export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\tdecore;$KDELIBS\\tdefx;$KDELIBS\\tdeprint;$KDELIBS\\tdeui;$KDELIBS\\tdemdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\kfile;$INCLUDE"
 
 # Version information for binaries
 # We're changing this from time to time