167 files changed, 375 insertions, 375 deletions

diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
index 99d359979..533f0153f 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( kio )
+add_subdirectory( tdemediaplayer )
+add_subdirectory( tdeio )
 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/kio/Makefile.am b/interfaces/kio/Makefile.am
deleted file mode 100644
index 8fad24200..000000000
--- a/interfaces/kio/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-kioincludedir = $(includedir)/kio
-kioinclude_HEADERS = http.h
-
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/kmediaplayer/kfileaudiopreview/Makefile.am b/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am
deleted file mode 100644
index e4232cd78..000000000
--- a/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-INCLUDES = -I$(top_srcdir)/interfaces/ -I$(top_srcdir)/arts/kde -I$(includedir)/arts $(all_includes)
-METASOURCES = AUTO
-
-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)
-
-noinst_HEADERS = kfileaudiopreview.h
-
-messages:
-	$(XGETTEXT) $(kfileaudiopreview_la_SOURCES) -o $(podir)/kfileaudiopreview.pot
diff --git a/interfaces/kregexpeditor/Makefile.am b/interfaces/kregexpeditor/Makefile.am
index 2007129da..4e8f5af2a 100644
--- a/interfaces/kregexpeditor/Makefile.am
+++ b/interfaces/kregexpeditor/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) $(all_includes)
 
 include_HEADERS = kregexpeditorinterface.h
 
diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h
index 3c96d8d93..4124849d6 100644
--- a/interfaces/kregexpeditor/kregexpeditorinterface.h
+++ b/interfaces/kregexpeditor/kregexpeditorinterface.h
@@ -15,7 +15,7 @@
  * To check if kregexpeditor in tdeutils is installed and available use this line:
  * 
  * \code
- * bool installed=!KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
+ * bool installed=!TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
  * \endcode
  *
  * The following is a template for what you need to do to create an instance of the
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 21ad69d89..4fe3e7c9a 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
@@ -219,7 +219,7 @@
      client->attach();
      if (!client->isApplicationRegistered("kttsd")) {
          TQString error;
-         if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
+         if (TDEApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
              cout << "Starting KTTSD failed with message " << error << endl;
      }
    @endverbatim
@@ -227,7 +227,7 @@
  * If you want to detect if KTTSD is installed without starting it, use this code.
  *
    @verbatim
-     KTrader::OfferList offers = KTrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
+     TDETrader::OfferList offers = TDETrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
      if (offers.count() > 0)
      {
        // KTTSD is installed.
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..a370a91a0 100644
--- a/interfaces/kimproxy/interface/kimiface.h
+++ b/interfaces/tdeimproxy/interface/kimiface.h
@@ -40,7 +40,7 @@
  *
  * Contacts are identified using unique identifier strings (UID) used by
  * KABC, the KDE address book library.
- * The UID generation is handled by KABC::Addressee so the your application
+ * The UID generation is handled by TDEABC::Addressee so the your application
  * will either have to access the address book or provide a possibility
  * for associating a contact of your application with an entry of the address
  * book.
@@ -76,8 +76,8 @@
  * @c SOURCES list in your @c Makefile.am
  *
  * @see KIMProxy
- * @see KABC::AddressBook
- * @see KABC::Addressee
+ * @see TDEABC::AddressBook
+ * @see TDEABC::Addressee
  *
  * @since 3.3
  * @author Will Stephenson <lists@stevello.free-online.co.uk>
@@ -100,7 +100,7 @@ k_dcop:
 	 * @see onlineContacts()
 	 * @see fileTransferContacts()
 	 * @see isPresent()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQStringList allContacts() = 0;
 
@@ -120,7 +120,7 @@ k_dcop:
 	 * @see onlineContacts()
 	 * @see fileTransferContacts()
 	 * @see messageContact()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQStringList reachableContacts() = 0;
 
@@ -138,7 +138,7 @@ k_dcop:
 	 * @see fileTransferContacts()
 	 * @see messageContact()
 	 * @see chatWithContact()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQStringList onlineContacts() = 0;
 
@@ -163,7 +163,7 @@ k_dcop:
 	 * @see onlineContacts()
 	 * @see canReceiveFiles()
 	 * @see sendFile()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQStringList fileTransferContacts() = 0;
 
@@ -180,7 +180,7 @@ k_dcop:
 	 * @see allContacts()
 	 * @see presenceString()
 	 * @see presenceStatus()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual bool isPresent( const TQString & uid ) = 0;
 
@@ -198,7 +198,7 @@ k_dcop:
 	 * @see isPresent()
 	 * @see presenceString()
 	 * @see presenceStatus()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQString displayName( const TQString & uid ) = 0;
 
@@ -215,7 +215,7 @@ k_dcop:
 	 *
 	 * @see isPresent()
 	 * @see presenceStatus()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQString presenceString( const TQString & uid ) = 0;
 
@@ -245,7 +245,7 @@ k_dcop:
 	 *
 	 * @see isPresent()
 	 * @see presenceString()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual int presenceStatus( const TQString & uid ) = 0;
 
@@ -256,7 +256,7 @@ k_dcop:
 	 * @return whether the specified contact can receive files
 	 *
 	 * @see fileTransferContacts()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual bool canReceiveFiles( const TQString & uid ) = 0;
 
@@ -274,7 +274,7 @@ k_dcop:
 	 * @return whether the specified contact can respond
 	 *
 	 * @see isPresent()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual bool canRespond( const TQString & uid ) = 0;
 
@@ -291,7 +291,7 @@ k_dcop:
 	 * @see protocols()
 	 * @see addContact()
 	 * @see isPresent()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQString locate( const TQString & contactId, const TQString & protocol ) = 0;
 
@@ -310,7 +310,7 @@ k_dcop:
 	 * @see isPresent()
 	 * @see presenceString()
 	 * @see presenceStatus()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQPixmap icon( const TQString & uid ) = 0;
 
@@ -325,7 +325,7 @@ k_dcop:
 	 *         supported or if the contact is unknown
 	 *
 	 * @see isPresent()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQString context( const TQString & uid ) = 0;
 
@@ -372,7 +372,7 @@ k_dcop:
 	 * @see sendFile()
 	 * @see isPresent()
 	 * @see reachableContacts()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual void messageContact( const TQString &uid, const TQString& message ) = 0;
 
@@ -410,7 +410,7 @@ k_dcop:
 	 * @see sendFile()
 	 * @see isPresent()
 	 * @see reachableContacts()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual void chatWithContact( const TQString &uid ) = 0;
 
@@ -436,7 +436,7 @@ k_dcop:
 	 * @see chatWithContact()
 	 * @see isPresent()
 	 * @see fileTransferContacts()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual void sendFile(const TQString &uid, const KURL &sourceURL,
 		const TQString &altFileName = TQString::null, uint fileSize = 0) = 0;
@@ -479,7 +479,7 @@ k_dcop_signals:
 	 * @param presence the new presence's numeric value. See presenceStatus()
 	 *
 	 * @see presenceStatus()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 * @see DCOPClient::appId()
 	 */
 	void contactPresenceChanged( TQString uid, TQCString appId, int presence );
diff --git a/interfaces/kimproxy/library/CMakeLists.txt b/interfaces/tdeimproxy/library/CMakeLists.txt
index 347e552a5..40974d722 100644
--- a/interfaces/kimproxy/library/CMakeLists.txt
+++ b/interfaces/tdeimproxy/library/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -29,23 +29,23 @@ 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
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
   DEPENDENCIES dcopidl
 )
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 9acfe00d6..fb2db0eb4 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
 	
@@ -24,10 +24,10 @@
 #include <tqglobal.h>
 #include <tqpixmapcache.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdcopservicestarter.h> 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <kiconloader.h>
 #include <kservice.h>
@@ -35,7 +35,7 @@
 
 #include "kimiface_stub.h"
 
-#include "kimproxy.h"
+#include "tdeimproxy.h"
 
 static KStaticDeleter<KIMProxy> _staticDeleter;
 
@@ -643,11 +643,11 @@ KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
 
 TQString KIMProxy::preferredApp()
 {
-	KConfig *store = new KSimpleConfig( IM_CLIENT_PREFERENCES_FILE );
+	TDEConfig *store = new KSimpleConfig( IM_CLIENT_PREFERENCES_FILE );
 	store->setGroup( IM_CLIENT_PREFERENCES_SECTION );
 	TQString preferredApp = store->readEntry( IM_CLIENT_PREFERENCES_ENTRY );
 	//kdDebug( 790 ) << k_funcinfo << "found preferred app: " << preferredApp << endl;
 	return preferredApp;
 }	
 
-#include "kimproxy.moc"
+#include "tdeimproxy.moc"
diff --git a/interfaces/kimproxy/library/kimproxy.h b/interfaces/tdeimproxy/library/tdeimproxy.h
index d4312b341..84b7d37dd 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;
@@ -98,8 +98,8 @@ typedef TQMap<TQString, ContactPresenceListCurrent> PresenceStringMap;
  * availability, capability and presence (online status) of IM-contacts.
  *
  * @see KIMIface
- * @see KABC::AddressBook
- * @see KABC::Addressee
+ * @see TDEABC::AddressBook
+ * @see TDEABC::Addressee
  *
  * @since 3.3
  * @author Will Stephenson <lists@stevello.free-online.co.uk>
@@ -161,7 +161,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see onlineContacts()
 		 * @see fileTransferContacts()
 		 * @see isPresent()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQStringList allContacts();
 
@@ -177,7 +177,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see onlineContacts()
 		 * @see fileTransferContacts()
 		 * @see messageContact()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQStringList reachableContacts();
 
@@ -197,7 +197,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see fileTransferContacts()
 		 * @see messageContact()
 		 * @see chatWithContact()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQStringList onlineContacts();
 
@@ -219,7 +219,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see reachableContacts()
 		 * @see onlineContacts()
 		 * @see canReceiveFiles()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQStringList fileTransferContacts();
 
@@ -239,7 +239,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see allContacts()
 		 * @see presenceString()
 		 * @see presenceNumeric()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		bool isPresent( const TQString& uid );
 
@@ -261,7 +261,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see isPresent()
 		 * @see presenceString()
 		 * @see presenceNumeric()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQString displayName( const TQString& uid );
 
@@ -302,7 +302,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see presenceString()
 		 * @see presenceIcon()
 		 * @see KIMIface::presenceStatus()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		int presenceNumeric( const TQString& uid );
 
@@ -338,7 +338,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see isPresent()
 		 * @see presenceNumeric()
 		 * @see presenceIcon()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQString presenceString( const TQString& uid );
 
@@ -367,7 +367,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see isPresent()
 		 * @see presenceString()
 		 * @see presenceNumeric()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQPixmap presenceIcon( const TQString& uid );
 
@@ -384,7 +384,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @return whether the specified contact can receive files
 		 *
 		 * @see fileTransferContacts()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		bool canReceiveFiles( const TQString & uid );
 
@@ -409,7 +409,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @return whether the specified contact can respond
 		 *
 		 * @see isPresent()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		bool canRespond( const TQString & uid );
 
@@ -427,7 +427,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see KIMIface::protocols()
 		 * @see addContact()
 		 * @see isPresent()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQString locate( const TQString & contactId, const TQString & protocol );
 
@@ -449,7 +449,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 *         supported or if the contact is unknown
 		 *
 		 * @see isPresent()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQString context( const TQString & uid );
 
@@ -462,7 +462,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see sendFile()
 		 * @see isPresent()
 		 * @see reachableContacts()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		void chatWithContact( const TQString& uid );
 
@@ -479,7 +479,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see sendFile()
 		 * @see isPresent()
 		 * @see reachableContacts()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		void messageContact( const TQString& uid, const TQString& message );
 
@@ -498,7 +498,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see chatWithContact()
 		 * @see isPresent()
 		 * @see fileTransferContacts()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		void sendFile(const TQString &uid, const KURL &sourceURL,
 			 const TQString &altFileName = TQString::null, uint fileSize = 0);
@@ -586,7 +586,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see isPresent()
 		 * @see presenceNumeric()
 		 * @see presenceIcon()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		void sigContactPresenceChanged( const TQString &uid );
 
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/kio/CMakeLists.txt b/interfaces/tdeio/CMakeLists.txt
index efcecf65e..a8d8a2189 100644
--- a/interfaces/kio/CMakeLists.txt
+++ b/interfaces/tdeio/CMakeLists.txt
@@ -13,5 +13,5 @@
 
 install( FILES
     http.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
 
diff --git a/interfaces/tdeio/Makefile.am b/interfaces/tdeio/Makefile.am
new file mode 100644
index 000000000..daa98db05
--- /dev/null
+++ b/interfaces/tdeio/Makefile.am
@@ -0,0 +1,3 @@
+kioincludedir = $(includedir)/tdeio
+kioinclude_HEADERS = http.h
+
diff --git a/interfaces/kio/http.h b/interfaces/tdeio/http.h
index 15803209c..6a07e9971 100644
--- a/interfaces/kio/http.h
+++ b/interfaces/tdeio/http.h
@@ -21,7 +21,7 @@
 #define KIOSLAVE_HTTP_H_
 
 
-namespace KIO {
+namespace TDEIO {
 
   /** HTTP / DAV method **/
   enum HTTP_METHOD {HTTP_GET, HTTP_PUT, HTTP_POST, HTTP_HEAD, HTTP_DELETE,
diff --git a/interfaces/kmediaplayer/CMakeLists.txt b/interfaces/tdemediaplayer/CMakeLists.txt
index 98346388c..0c9355560 100644
--- a/interfaces/kmediaplayer/CMakeLists.txt
+++ b/interfaces/tdemediaplayer/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 if( ARTS_FOUND )
-  add_subdirectory( kfileaudiopreview )
+  add_subdirectory( tdefileaudiopreview )
 endif( ARTS_FOUND )
 
 include_directories(
@@ -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..91ed342bd
--- /dev/null
+++ b/interfaces/tdemediaplayer/Makefile.am
@@ -0,0 +1,18 @@
+if include_ARTS
+tdefileaudiopreview_subdir = tdefileaudiopreview
+endif
+
+SUBDIRS = . $(tdefileaudiopreview_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/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..05582ca07 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.
 */
@@ -39,7 +39,7 @@ namespace KMediaPlayer
  *
  * There are two servicetypes for Player:  KMediaPlayer/Player and
  * KMediaPlayer/Engine.  KMediaPlayer/Player provides a widget (accessable
- * through view as well as XML GUI KActions.  KMediaPlayer/Engine omits
+ * through view as well as XML GUI TDEActions.  KMediaPlayer/Engine omits
  * the user interface facets, for those who wish to provide their own
  * interface.
  */
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/kfileaudiopreview/CMakeLists.txt b/interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt
index 03237da87..8e561e1f3 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt
@@ -19,9 +19,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/interfaces
   ${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}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${CMAKE_SOURCE_DIR}/arts/kde
 )
 
@@ -31,16 +31,16 @@ link_directories(
 )
 
 
-##### kfileaudiopreview #########################
+##### tdefileaudiopreview #########################
 
-set( target kfileaudiopreview )
+set( target tdefileaudiopreview )
 
 set( ${target}_SRCS
-  kfileaudiopreview.cpp
+  tdefileaudiopreview.cpp
 )
 
 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/tdemediaplayer/tdefileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
new file mode 100644
index 000000000..d73cf545f
--- /dev/null
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
@@ -0,0 +1,13 @@
+INCLUDES = -I$(top_srcdir)/interfaces/ -I$(top_srcdir)/arts/kde -I$(includedir)/arts $(all_includes)
+METASOURCES = AUTO
+
+kde_module_LTLIBRARIES = tdefileaudiopreview.la
+
+tdefileaudiopreview_la_SOURCES = tdefileaudiopreview.cpp
+tdefileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
+tdefileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
+
+noinst_HEADERS = tdefileaudiopreview.h
+
+messages:
+	$(XGETTEXT) $(tdefileaudiopreview_la_SOURCES) -o $(podir)/tdefileaudiopreview.pot
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
index 639be9bf1..370805a74 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
@@ -1,21 +1,21 @@
-#include "kfileaudiopreview.h"
+#include "tdefileaudiopreview.h"
 
 #include <tqcheckbox.h>
 #include <tqhbox.h>
 #include <tqlayout.h>
 #include <tqvgroupbox.h>
 
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmediaplayer/player.h>
+#include <tdelocale.h>
+#include <tdemediaplayer/player.h>
 #include <kmimetype.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <kplayobjectfactory.h>
 
-#include <config-kfile.h>
+#include <config-tdefile.h>
 
 class KFileAudioPreviewFactory : public KLibFactory
 {
@@ -29,7 +29,7 @@ protected:
     }
 };
 
-K_EXPORT_COMPONENT_FACTORY( kfileaudiopreview, KFileAudioPreviewFactory )
+K_EXPORT_COMPONENT_FACTORY( tdefileaudiopreview, KFileAudioPreviewFactory )
 
 
 ///////////////////////////////////////////////////////////////////
@@ -56,7 +56,7 @@ public:
 KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
     : KPreviewWidgetBase( parent, name )
 {
-    KGlobal::locale()->insertCatalogue("kfileaudiopreview");    
+    TDEGlobal::locale()->insertCatalogue("tdefileaudiopreview");    
 
     TQStringList formats = KDE::PlayObjectFactory::mimeTypes();
     // ###
@@ -91,14 +91,14 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
     }
 
     m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box );
-    KConfigGroup config( KGlobal::config(), ConfigGroup );
+    TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
     m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) );
     connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) );
 }
 
 KFileAudioPreview::~KFileAudioPreview()
 {
-    KConfigGroup config( KGlobal::config(), ConfigGroup );
+    TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
     config.writeEntry( "Autoplay sounds", m_autoPlay->isChecked() );
 
     delete d;
@@ -143,4 +143,4 @@ void KFileAudioPreview::toggleAuto( bool on )
 void KFileAudioPreview::virtual_hook( int, void* )
 {}
 
-#include "kfileaudiopreview.moc"
+#include "tdefileaudiopreview.moc"
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
index de48e4712..6eae52cf7 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEAUDIOPREVIEW_H
-#define KFILEAUDIOPREVIEW_H
+#ifndef TDEFILEAUDIOPREVIEW_H
+#define TDEFILEAUDIOPREVIEW_H
 
 #include <tqdict.h>
 
@@ -61,4 +61,4 @@ private:
     KFileAudioPreviewPrivate *d;
 };
 
-#endif // KFILEAUDIOPREVIEW_H
+#endif // TDEFILEAUDIOPREVIEW_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..6b57cdeb9 100644
--- a/interfaces/kscript/CMakeLists.txt
+++ b/interfaces/tdescript/CMakeLists.txt
@@ -19,8 +19,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -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
@@ -51,6 +51,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/interfaces/tdescript/Makefile.am b/interfaces/tdescript/Makefile.am
new file mode 100644
index 000000000..03c7efc87
--- /dev/null
+++ b/interfaces/tdescript/Makefile.am
@@ -0,0 +1,21 @@
+SUBDIRS = . sample
+
+INCLUDES = -I$(top_srcdir)/tdeio -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..e20854c70 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)/tdeio -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 49aee0727..766613551 100644
--- a/interfaces/kscript/sample/shellscript.cpp
+++ b/interfaces/tdescript/sample/shellscript.cpp
@@ -19,7 +19,7 @@
 
 #include "shellscript.h"
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include <kgenericfactory.h>
@@ -30,10 +30,10 @@ K_EXPORT_COMPONENT_FACTORY( libshellscript, ShellScriptFactory( "ShellScript" )
 
 ShellScript::ShellScript(KScriptClientInterface *parent, const char *, const TQStringList & ) : ScriptClientInterface(parent)
 {
-	m_script =  new KProcess();
-	connect ( m_script, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(Exit(KProcess *)));
-	connect ( m_script, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(stdOut(KProcess *, char *, int )));
-	connect ( m_script, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(stdErr(KProcess *, char *, int )));
+	m_script =  new TDEProcess();
+	connect ( m_script, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(Exit(TDEProcess *)));
+	connect ( m_script, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(stdOut(TDEProcess *, char *, int )));
+	connect ( m_script, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(stdErr(TDEProcess *, char *, int )));
 	// Connect feedback signals and slots
 	//kdDebug() << "Building new script engine" << endl;
 }
@@ -60,7 +60,7 @@ void ShellScript::setScript( const TQString &, const TQString & )
 
 void ShellScript::run(TQObject *, const TQVariant &)
 {
-	 m_script->start(KProcess::NotifyOnExit,KProcess::All);
+	 m_script->start(TDEProcess::NotifyOnExit,TDEProcess::All);
 }
 void ShellScript::kill()
 {
@@ -68,16 +68,16 @@ void ShellScript::kill()
 		m_script->kill(9);	// Kill it harder
 }
 
-void ShellScript::Exit(KProcess *proc)
+void ShellScript::Exit(TDEProcess *proc)
 {
 	ScriptClientInterface->done((KScriptClientInterface::Result)proc->exitStatus(), "");
 }
 
-void ShellScript::stdErr(KProcess *, char *buffer, int)
+void ShellScript::stdErr(TDEProcess *, char *buffer, int)
 {
 	ScriptClientInterface->error(buffer);
 }
-void ShellScript::stdOut(KProcess *, char *buffer, int)
+void ShellScript::stdOut(TDEProcess *, char *buffer, int)
 {
 	ScriptClientInterface->output(buffer);
 }
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 853a7bd12..2cdaf7e5a 100644
--- a/interfaces/kscript/sample/shellscript.h
+++ b/interfaces/tdescript/sample/shellscript.h
@@ -36,11 +36,11 @@ public:
 	void run(TQObject *context = 0, const TQVariant &arg = 0);
 	void kill();
 private slots:
-	void Exit(KProcess *proc);
-	void stdErr(KProcess *proc, char *buffer, int buflen);
-	void stdOut(KProcess *proc, char *buffer, int buflen);
+	void Exit(TDEProcess *proc);
+	void stdErr(TDEProcess *proc, char *buffer, int buflen);
+	void stdOut(TDEProcess *proc, char *buffer, int buflen);
 private:
-	KProcess *m_script;
+	TDEProcess *m_script;
 	KScriptClientInterface *ScriptClientInterface;
 	TQString m_scriptName;
 };
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..803feb3a6 100644
--- a/interfaces/kscript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -18,26 +18,26 @@
 */
 #include "scriptloader.h"
 
-#include <kapplication.h>
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kdesktopfile.h>
 #include <kstandarsdirs.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kdebug.h>
 
 #include <tqdir.h>
 #include <tqfileinfo.h>
 
 
-ScriptLoader::ScriptLoader(KMainWindow *parent) : TQObject (parent)
+ScriptLoader::ScriptLoader(TDEMainWindow *parent) : TQObject (parent)
 {
 	m_parent = parent;
 	m_scripts.clear();
-  	m_theAction = new KSelectAction ( i18n("KDE Scripts"),
+  	m_theAction = new TDESelectAction ( i18n("KDE Scripts"),
 		0,
 		this,
 		TQT_SLOT(runAction()),
@@ -51,7 +51,7 @@ ScriptLoader::~ScriptLoader()
 	m_scripts.clear();
 }
 
-KSelectAction * ScriptLoader::getScripts()
+TDESelectAction * ScriptLoader::getScripts()
 {
 	// Get the available scripts for this application.
 	TQStringList pluginList = "";
diff --git a/interfaces/kscript/scriptloader.h b/interfaces/tdescript/scriptloader.h
index 20b135231..7fa4fa93f 100644
--- a/interfaces/kscript/scriptloader.h
+++ b/interfaces/tdescript/scriptloader.h
@@ -19,9 +19,9 @@
 #ifndef _script_loader_h
 #define _script_loader_h
 #include <tqptrlist.h>
-#include <kmainwindow.h>
-#include <kaction.h>
-#include <kscript/scriptinterface.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
+#include <tdescript/scriptinterface.h>
 
 /**
  * Script loader
@@ -33,12 +33,12 @@ class ScriptLoader : virtual public QObject
 		/** 
 		* Default Constructor
 		*/
-		ScriptLoader(KMainWindow *parent=0);
+		ScriptLoader(TDEMainWindow *parent=0);
 		~ScriptLoader();
-		/** Return the a KSelectAction with all of the scripts
-		 * @returns KSelectAction containing access to all of the scripts
+		/** Return the a TDESelectAction with all of the scripts
+		 * @returns TDESelectAction containing access to all of the scripts
 		 */
-		KSelectAction *getScripts();
+		TDESelectAction *getScripts();
 	public slots:
 		/** Run the current action.
 		*/
@@ -52,8 +52,8 @@ class ScriptLoader : virtual public QObject
 		virtual void done(int errorCode);
 	private:
 		TQPtrList<KScriptInterface> m_scripts;
-		KSelectAction *m_theAction;
+		TDESelectAction *m_theAction;
 		int m_currentSelection;
-		KMainWindow *m_parent;
+		TDEMainWindow *m_parent;
 };
 #endif
diff --git a/interfaces/kscript/scriptmanager.cpp b/interfaces/tdescript/scriptmanager.cpp
index 647410b8b..a0dfbe921 100644
--- a/interfaces/kscript/scriptmanager.cpp
+++ b/interfaces/tdescript/scriptmanager.cpp
@@ -1,12 +1,12 @@
 #include "scriptmanager.h"
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
-#include <kapplication.h>
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeapplication.h>
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 //using namespace KScriptInterface;
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..a0fea2f48 100644
--- a/interfaces/ktexteditor/CMakeLists.txt
+++ b/interfaces/tdetexteditor/CMakeLists.txt
@@ -15,14 +15,14 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_BINARY_DIR}/kabc
+  ${CMAKE_BINARY_DIR}/tdeabc
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kabc
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeabc
   ${CMAKE_SOURCE_DIR}/interfaces
 )
 
@@ -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 tdeabc-shared tdeparts-shared
   DEPENDENCIES dcopidl dcopidl2cpp
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/interfaces/ktexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am
index cc41c788f..7588019e2 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)
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces  -I$(top_srcdir)/tdeabc -I$(top_builddir)/tdeabc $(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_TDEABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEFILE) $(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,17 +36,17 @@ 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
+templateinterface.lo: $(top_builddir)/tdeabc/addressee.h
 
 include ../../admin/Doxyfile.am
 
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 cb8538465..10a6173a0 100644
--- a/interfaces/ktexteditor/configinterface.h
+++ b/interfaces/tdetexteditor/configinterface.h
@@ -16,13 +16,13 @@
    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>
 
 class TQCString;
-class KConfig;
+class TDEConfig;
 
 namespace KTextEditor
 {
@@ -57,17 +57,17 @@ class KTEXTEDITOR_EXPORT ConfigInterface
     virtual void writeConfig () = 0;           
                                                                          
     /**
-      Read/Write the config of the part to a given kconfig object
+      Read/Write the config of the part to a given tdeconfig object
       to store the settings in a different place than the standard
     */
-    virtual void readConfig (KConfig *) = 0;
-    virtual void writeConfig (KConfig *) = 0;
+    virtual void readConfig (TDEConfig *) = 0;
+    virtual void writeConfig (TDEConfig *) = 0;
     
     /**
       Read/Write session config of only this document/view/plugin 
     */
-    virtual void readSessionConfig (KConfig *) = 0;
-    virtual void writeSessionConfig (KConfig *) = 0;
+    virtual void readSessionConfig (TDEConfig *) = 0;
+    virtual void writeSessionConfig (TDEConfig *) = 0;
     
     /**
       Shows a config dialog for the part, changes will be applied
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..23fa5bb38 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>
@@ -95,7 +95,7 @@ class KTEXTEDITOR_EXPORT ConfigInterfaceExtension
   
     virtual TQString configPageName (uint number = 0) const = 0;
     virtual TQString configPageFullName (uint number = 0) const = 0;
-    virtual TQPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const = 0;
+    virtual TQPixmap configPagePixmap (uint number = 0, int size = TDEIcon::SizeSmall) const = 0;
     
     
   private:
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 85466f55d..1eddfb8d6 100644
--- a/interfaces/ktexteditor/editorchooser.cpp
+++ b/interfaces/tdetexteditor/editorchooser.cpp
@@ -3,12 +3,12 @@
 
 #include <tqcombobox.h>
 #include <ktrader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqstringlist.h>
 #include <kservice.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqlayout.h>
 
 #include "editorchooser_ui.h"
@@ -46,14 +46,14 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
   grid->addWidget( d->chooser, 0, 0);
 
 
-	KTrader::OfferList offers = KTrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes");
-	KConfig *config=new KConfig("default_components");
+	TDETrader::OfferList offers = TDETrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes");
+	TDEConfig *config=new TDEConfig("default_components");
   	config->setGroup("KTextEditor");
   	TQString editor = config->readPathEntry("embeddedEditor");
 
         if (editor.isEmpty()) editor="katepart";
 
-	for (KTrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
+	for (TDETrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
 	{
     		if ((*it)->desktopEntryName().contains(editor))
 		{
@@ -62,7 +62,7 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
 		}
   	}
 
-  	for (KTrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
+  	for (TDETrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
   	{
     		d->chooser->editorCombo->insertItem((*it)->name());
 		d->elements.append((*it)->desktopEntryName());
@@ -75,7 +75,7 @@ EditorChooser:: ~EditorChooser(){
 }
 
 void EditorChooser::readAppSetting(const TQString& postfix){
-	KConfig *cfg=kapp->config();
+	TDEConfig *cfg=kapp->config();
 	TQString previousGroup=cfg->group();
 	cfg->setGroup("KTEXTEDITOR:"+postfix);
 	TQString editor=cfg->readPathEntry("editor");
@@ -90,7 +90,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){
 }
 
 void EditorChooser::writeAppSetting(const TQString& postfix){
-	KConfig *cfg=kapp->config();
+	TDEConfig *cfg=kapp->config();
 	TQString previousGroup=cfg->group();
 	cfg->setGroup("KTEXTEDITOR:"+postfix);
 	cfg->writeEntry("DEVELOPER_INFO","NEVER TRY TO USE VALUES FROM THAT GROUP, THEY ARE SUBJECT TO CHANGES");
@@ -105,14 +105,14 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char
 
 	KTextEditor::Document *tmpDoc=0;
 
-	KConfig *cfg=kapp->config();
+	TDEConfig *cfg=kapp->config();
         TQString previousGroup=cfg->group();
         cfg->setGroup("KTEXTEDITOR:"+postfix);
         TQString editor=cfg->readPathEntry("editor");
 	cfg->setGroup(previousGroup);
 	if (editor.isEmpty())
 	{
-		KConfig *config=new KConfig("default_components");
+		TDEConfig *config=new TDEConfig("default_components");
   		config->setGroup("KTextEditor");
 	  	editor = config->readPathEntry("embeddedEditor", "katepart");
 		delete config;
@@ -135,14 +135,14 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject
 
         KTextEditor::Editor *tmpEd=0;
 
-        KConfig *cfg=kapp->config();
+        TDEConfig *cfg=kapp->config();
         TQString previousGroup=cfg->group();
         cfg->setGroup("KTEXTEDITOR:"+postfix);
         TQString editor=cfg->readPathEntry("editor");
         cfg->setGroup(previousGroup);
         if (editor.isEmpty())
         {
-                KConfig *config=new KConfig("default_components");
+                TDEConfig *config=new TDEConfig("default_components");
                 config->setGroup("KTextEditor");
                 editor = config->readPathEntry("embeddedEditor", "katepart");
                 delete config;
diff --git a/interfaces/ktexteditor/editorchooser.h b/interfaces/tdetexteditor/editorchooser.h
index 0010dd3a8..251776c10 100644
--- a/interfaces/ktexteditor/editorchooser.h
+++ b/interfaces/tdetexteditor/editorchooser.h
@@ -1,12 +1,12 @@
 #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>
 
-class KConfig;
+class TDEConfig;
 class TQString;
 
 namespace KTextEditor
@@ -45,8 +45,8 @@ public:
 	virtual const TQStringList &choices();
 	virtual void saveSettings();
 
-	void readAppSetting(KConfig *cfg,const TQString& postfix);
-	void writeAppSetting(KConfig *cfg,const TQString& postfix);
+	void readAppSetting(TDEConfig *cfg,const TQString& postfix);
+	void writeAppSetting(TDEConfig *cfg,const TQString& postfix);
 
 public slots:
 	virtual void madeChoice(int pos,const TQString &choice);
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 c79de0011..f92502b36 100644
--- a/interfaces/ktexteditor/sessionconfiginterface.h
+++ b/interfaces/tdetexteditor/sessionconfiginterface.h
@@ -16,13 +16,13 @@
    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>
 
 class TQCString;
-class KConfig;
+class TDEConfig;
 
 namespace KTextEditor
 {
@@ -53,8 +53,8 @@ class KTEXTEDITOR_EXPORT SessionConfigInterface
      * In case of the document, that means for example it should reload the file,
      * restore all marks, ...
     */
-    virtual void readSessionConfig (KConfig *) = 0;
-    virtual void writeSessionConfig (KConfig *) = 0;
+    virtual void readSessionConfig (TDEConfig *) = 0;
+    virtual void writeSessionConfig (TDEConfig *) = 0;
 
   private:
     class PrivateSessionConfigInterface *d;
diff --git a/interfaces/ktexteditor/ktexteditor.cpp b/interfaces/tdetexteditor/tdetexteditor.cpp
index c822dc93c..25726577b 100644
--- a/interfaces/ktexteditor/ktexteditor.cpp
+++ b/interfaces/tdetexteditor/tdetexteditor.cpp
@@ -24,9 +24,9 @@
 #include "plugin.h"
 #include "editor.h"
 
-#include <kaction.h>
-#include <kparts/factory.h>
-#include <kparts/componentfactory.h>
+#include <tdeaction.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 894d23f6a..25c103196 100644
--- a/interfaces/ktexteditor/templateinterface.cpp
+++ b/interfaces/tdetexteditor/templateinterface.cpp
@@ -22,11 +22,11 @@
 #include <addressee.h>
 #include <addresseedialog.h>
 #include <tqstring.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tqdatetime.h>
 #include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcalendarsystem.h>
 #include <unistd.h>
 
@@ -54,16 +54,16 @@ void TemplateInterface::setTemplateInterfaceDCOPSuffix ( const TQCString &suffix
 
 #define INITKABC do { \
   if (addrBook==0) { \
-    addrBook=KABC::StdAddressBook::self(); \
+    addrBook=TDEABC::StdAddressBook::self(); \
     userAddress=addrBook->whoAmI(); \
     if (userAddress.isEmpty()) { \
       if ( KMessageBox::questionYesNo(parentWindow, \
            i18n( "This template uses personal data that is stored in the TDE addressbook, but you have not selected a personal entry. You can still use the template without one, but you will have to type personal data. Would you like to select one now?" ), \
            "Personal data requested", \
            KStdGuiItem::yes(), KStdGuiItem::no(), "select personal data entry") == KMessageBox::Yes ) { \
-        userAddress = KABC::AddresseeDialog::getAddressee(parentWindow); \
+        userAddress = TDEABC::AddresseeDialog::getAddressee(parentWindow); \
         if ( ! userAddress.isEmpty() ) \
-          KABC::StdAddressBook::self()->setWhoAmI( userAddress ); \
+          TDEABC::StdAddressBook::self()->setWhoAmI( userAddress ); \
       }\
       /*return false;//no, why??*/ \
     } \
@@ -72,8 +72,8 @@ void TemplateInterface::setTemplateInterfaceDCOPSuffix ( const TQCString &suffix
 
 bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *parentWindow )
 {
-  KABC::StdAddressBook *addrBook = 0;
-  KABC::Addressee userAddress;
+  TDEABC::StdAddressBook *addrBook = 0;
+  TDEABC::Addressee userAddress;
   TQDateTime datetime = TQDateTime::currentDateTime();
   TQDate date = TQT_TQDATE_OBJECT(datetime.date());
   TQTime time = TQT_TQTIME_OBJECT(datetime.time());
@@ -113,23 +113,23 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *
       }
       else if ( placeholder == "date" )
       {
-        map[ placeholder ] = KGlobal::locale() ->formatDate( date, true );
+        map[ placeholder ] = TDEGlobal::locale() ->formatDate( date, true );
       }
       else if ( placeholder == "time" )
       {
-        map[ placeholder ] = KGlobal::locale() ->formatTime( time, true, false );
+        map[ placeholder ] = TDEGlobal::locale() ->formatTime( time, true, false );
       }
       else if ( placeholder == "year" )
       {
-        map[ placeholder ] = KGlobal::locale() ->calendar() ->yearString( date, false );
+        map[ placeholder ] = TDEGlobal::locale() ->calendar() ->yearString( date, false );
       }
       else if ( placeholder == "month" )
       {
-        map[ placeholder ] = TQString::number( KGlobal::locale() ->calendar() ->month( date ) );
+        map[ placeholder ] = TQString::number( TDEGlobal::locale() ->calendar() ->month( date ) );
       }
       else if ( placeholder == "day" )
       {
-        map[ placeholder ] = TQString::number( KGlobal::locale() ->calendar() ->day( date ) );
+        map[ placeholder ] = TQString::number( TDEGlobal::locale() ->calendar() ->day( date ) );
       }
       else if ( placeholder == "hostname" )
       {
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/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h
index 6a65477c2..0624c0e8d 100644
--- a/interfaces/terminal/kde_terminal_interface.h
+++ b/interfaces/terminal/kde_terminal_interface.h
@@ -35,7 +35,7 @@ class TQStrList;
  * we can't have signals without having a TQObject, which
  * TerminalInterface is not.
  * These are the signals you can connect to:
- *  void processExited( KProcess *process );
+ *  void processExited( TDEProcess *process );
  *  void receivedData( const TQString& s );
  * See the example code below for how to connect to these..
  * 
diff --git a/interfaces/terminal/test/Makefile.am b/interfaces/terminal/test/Makefile.am
index 1c62aaced..7570f6d2b 100644
--- a/interfaces/terminal/test/Makefile.am
+++ b/interfaces/terminal/test/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES=$(all_includes)
 check_PROGRAMS=test
 test_SOURCES=main.cc
-test_LDADD=$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lkio
+test_LDADD=$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio
 test_LDFLAGS=$(all_libraries)
 METASOURCES=AUTO
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc
index dbf60616b..8130f85d6 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cc
@@ -1,14 +1,14 @@
 #include <kde_terminal_interface.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <ktrader.h>
 #include <klibloader.h>
-#include <kmainwindow.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdemainwindow.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <tqdir.h>
 #include <assert.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <cassert>
 #include "main.h"
 #include "main.moc"
@@ -33,9 +33,9 @@ Win::Win()
 
 int main( int argc, char** argv )
 {
-    KAboutData* about = new KAboutData( "tetest", "TETest", "0.1" );
-    KCmdLineArgs::init( argc, argv, about );
-    KApplication a;
+    TDEAboutData* about = new TDEAboutData( "tetest", "TETest", "0.1" );
+    TDECmdLineArgs::init( argc, argv, about );
+    TDEApplication a;
     Win* win = new Win();
     win->show();
     return a.exec();
diff --git a/interfaces/terminal/test/main.h b/interfaces/terminal/test/main.h
index 098c10d54..256b0840a 100644
--- a/interfaces/terminal/test/main.h
+++ b/interfaces/terminal/test/main.h
@@ -3,7 +3,7 @@
 
 
 class Win
-    : public KMainWindow
+    : public TDEMainWindow
 {
     Q_OBJECT
     KParts::Part* p;