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

71 files changed, 140 insertions, 140 deletions

diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt
index 3bd4ba8b7..cd2dfd80e 100644
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@ -65,7 +65,7 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy
 tde_add_library( ${target} SHARED
   SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
   VERSION 4.2.0
-  EMBED kssl-static kiocore-static ksycoca-static kbookmarks-static kfile-static ${ELFICON_STATIC_LIB}
-  LINK ltdlc-static tdeui-shared tdesu-shared kwalletclient-shared ${LIBR_LIBRARIES}
+  EMBED kssl-static kiocore-static tdesycoca-static kbookmarks-static kfile-static ${ELFICON_STATIC_LIB}
+  LINK ltdlc-static tdeui-shared tdesu-shared tdewalletclient-shared ${LIBR_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kio/Makefile.am b/kio/Makefile.am
index b639d43df..fbe0d75dc 100644
--- a/kio/Makefile.am
+++ b/kio/Makefile.am
@@ -29,9 +29,9 @@ libkio_la_SOURCES = dummy.cpp
 libkio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) \
 	$(KDE_MT_LDFLAGS)
 libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \
-	kio/libksycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \
+	kio/libtdesycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \
 	../tdeui/libtdeui.la ../tdesu/libtdesu.la \
-	../kwallet/client/libkwalletclient.la \
+	../tdewallet/client/libtdewalletclient.la \
 	$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 kde_mime_DATA = magic
diff --git a/kio/kfile/ChangeLog b/kio/kfile/ChangeLog
index ac05c86d0..2c9651390 100644
--- a/kio/kfile/ChangeLog
+++ b/kio/kfile/ChangeLog
@@ -622,7 +622,7 @@ Mon Mar 16 11:36:07 1998 Daniel Grana <grana@ie.iwi.unibe.ch>
         a mkdir method to kdir in near future
 
 Mon Mar 16 20:04:00 1998  Martin Jones <mjones@kde.org>
-	* Added booktoken.* to remove dependancy on khtmlw and jscript
+	* Added booktoken.* to remove dependancy on tdehtmlw and jscript
 
 Thu Mar 12 09:32:06 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 	* worked on the dir and file completion, should do both now,
diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp
index 099a7cee5..da61d0a9f 100644
--- a/kio/kfile/kfiledetailview.cpp
+++ b/kio/kfile/kfiledetailview.cpp
@@ -543,7 +543,7 @@ TQDragObject *KFileDetailView::dragObject()
     }
     TQPixmap pixmap;
     if( urls.count() > 1 )
-        pixmap = DesktopIcon( "kmultiple", KIcon::SizeSmall );
+        pixmap = DesktopIcon( "tdemultiple", KIcon::SizeSmall );
     if( pixmap.isNull() )
         pixmap = currentFileItem()->pixmap( KIcon::SizeSmall );
 
diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp
index 5d9977de6..f0ef11bfe 100644
--- a/kio/kfile/kfileiconview.cpp
+++ b/kio/kfile/kfileiconview.cpp
@@ -817,7 +817,7 @@ TQDragObject *KFileIconView::dragObject()
     }
     TQPixmap pixmap;
     if( urls.count() > 1 )
-        pixmap = DesktopIcon( "kmultiple", iconSize() );
+        pixmap = DesktopIcon( "tdemultiple", iconSize() );
     if( pixmap.isNull() )
         pixmap = currentFileItem()->pixmap( iconSize() );
 
diff --git a/kio/kfile/kfiletreeview.cpp b/kio/kfile/kfiletreeview.cpp
index e8451077d..0b8504fd6 100644
--- a/kio/kfile/kfiletreeview.cpp
+++ b/kio/kfile/kfiletreeview.cpp
@@ -262,7 +262,7 @@ TQDragObject * KFileTreeView::dragObject()
    TQPoint hotspot;
    TQPixmap pixmap;
    if( urls.count() > 1 ){
-      pixmap = DesktopIcon( "kmultiple", 16 );
+      pixmap = DesktopIcon( "tdemultiple", 16 );
    }
    if( pixmap.isNull() )
       pixmap = currentKFileTreeViewItem()->fileItem()->pixmap( 16 );
diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp
index efeaa1f02..691487730 100644
--- a/kio/kfile/kopenwith.cpp
+++ b/kio/kfile/kopenwith.cpp
@@ -54,7 +54,7 @@
 #include <kmimetype.h>
 #include <kservicegroup.h>
 #include <klistview.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 #include <kstdguiitem.h>
 
 #include "kopenwith.h"
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
index e9296ca90..0b1f6c05b 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -117,7 +117,7 @@ extern "C" {
 #include <ksqueezedtextlabel.h>
 #include <klibloader.h>
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kmetaprops.h>
 #include <kpreviewprops.h>
 #include <kprocess.h>
@@ -818,7 +818,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
       if ( (*it)->mode() != mode )
         mode = (mode_t)0;
       if ( KMimeType::iconForURL(url, mode) != iconStr )
-        iconStr = "kmultiple";
+        iconStr = "tdemultiple";
       if ( url.directory() != directory )
         directory = TQString::null;
       if ( url.protocol() != protocol )
diff --git a/kio/kfile/kurlrequester.cpp b/kio/kfile/kurlrequester.cpp
index 5d1495127..99e6e96f0 100644
--- a/kio/kfile/kurlrequester.cpp
+++ b/kio/kfile/kurlrequester.cpp
@@ -389,7 +389,7 @@ bool KURLRequester::eventFilter( TQObject *obj, TQEvent *ev )
     if ( ( TQT_BASE_OBJECT(d->edit) == TQT_BASE_OBJECT(obj) ) || ( TQT_BASE_OBJECT(d->combo) == TQT_BASE_OBJECT(obj) ) )
     {
         if (( ev->type() == TQEvent::FocusIn ) || ( ev->type() == TQEvent::FocusOut ))
-            // Forward focusin/focusout events to the urlrequester; needed by file form element in khtml
+            // Forward focusin/focusout events to the urlrequester; needed by file form element in tdehtml
             TQApplication::sendEvent( this, ev );
     }
     return TQWidget::eventFilter( obj, ev );
diff --git a/kio/kio/CMakeLists.txt b/kio/kio/CMakeLists.txt
index 25d4fad83..1a2c3a263 100644
--- a/kio/kio/CMakeLists.txt
+++ b/kio/kio/CMakeLists.txt
@@ -90,9 +90,9 @@ tde_add_library( ${target} STATIC_PIC AUTOMOC
 )
 
 
-##### ksycoca ###################################
+##### tdesycoca ###################################
 
-set( target ksycoca )
+set( target tdesycoca )
 
 set( ${target}_SRCS
   kdirwatch.cpp kfileshare.cpp ksambashare.cpp
diff --git a/kio/kio/Makefile.am b/kio/kio/Makefile.am
index 2034a33b6..63d5fc5d8 100644
--- a/kio/kio/Makefile.am
+++ b/kio/kio/Makefile.am
@@ -20,11 +20,11 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
 
 INCLUDES=  -I$(top_srcdir) -I$(srcdir)/.. -I$(top_srcdir)/tdecore/network -I$(srcdir)/../kssl -I../kssl -I$(srcdir)/../../interfaces  $(all_includes) $(SSL_INCLUDES)
 
-noinst_LTLIBRARIES = libkiocore.la libksycoca.la
+noinst_LTLIBRARIES = libkiocore.la libtdesycoca.la
 
 # convenience lib - no LDFLAGS or LIBADD !
 
-libksycoca_la_SOURCES = \
+libtdesycoca_la_SOURCES = \
 	kdirwatch.cpp \
 	kfileshare.cpp ksambashare.cpp knfsshare.cpp \
 	ktrader.cpp ktraderparse.cpp ktraderparsetree.cpp \
@@ -43,7 +43,7 @@ libksycoca_la_SOURCES = \
 	kfilemetainfo.cpp kdcopservicestarter.cpp \
 	dataslave.cpp dataprotocol.cpp 
 #if USE_POSIX_ACL
-  libksycoca_la_SOURCES += kacl.cpp posixacladdons.cpp
+  libtdesycoca_la_SOURCES += kacl.cpp posixacladdons.cpp
 #endif
 
 include_HEADERS = \
diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp
index 17a220541..08630d110 100644
--- a/kio/kio/kdatatool.cpp
+++ b/kio/kio/kdatatool.cpp
@@ -26,7 +26,7 @@
 #include <kinstance.h>
 
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <tqpixmap.h>
 #include <tqfile.h>
diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp
index 85fb1a37f..a5d34fa07 100644
--- a/kio/kio/kfilemetainfo.cpp
+++ b/kio/kio/kfilemetainfo.cpp
@@ -27,7 +27,7 @@
 
 #include <ktrader.h>
 #include <kstaticdeleter.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kuserprofile.h>
 #include <kdebug.h>
 #include <kmimetype.h>
diff --git a/kio/kio/kimageio.cpp b/kio/kio/kimageio.cpp
index cdbaa8ea3..e983cb945 100644
--- a/kio/kio/kimageio.cpp
+++ b/kio/kio/kimageio.cpp
@@ -24,8 +24,8 @@
 #include <klibloader.h>
 #include <kglobal.h>
 #include <kmimetype.h>
-#include <ksycocaentry.h>
-#include <ksycoca.h>
+#include <tdesycocaentry.h>
+#include <tdesycoca.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 
diff --git a/kio/kio/kimageiofactory.h b/kio/kio/kimageiofactory.h
index 603ef2c0e..6d2d15940 100644
--- a/kio/kio/kimageiofactory.h
+++ b/kio/kio/kimageiofactory.h
@@ -8,7 +8,7 @@
 #ifndef SSK_KIMGIOFACTORY_H
 #define SSK_KIMGIOFACTORY_H
 
-#include "ksycocafactory.h"
+#include "tdesycocafactory.h"
 #include "kimageio.h"
 
 class KImageIOFormat;
diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp
index 397fbc9e9..c6f879a73 100644
--- a/kio/kio/kmimetype.cpp
+++ b/kio/kio/kmimetype.cpp
@@ -56,7 +56,7 @@
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 #include <kde_file.h>
 
 template class KSharedPtr<KMimeType>;
@@ -144,7 +144,7 @@ KMimeType::Ptr KMimeType::mimeType( const TQString& _name )
 
   if ( !mime || !mime->isType( KST_KMimeType ) )
   {
-    // When building ksycoca, findServiceTypeByName doesn't create an object
+    // When building tdesycoca, findServiceTypeByName doesn't create an object
     // but returns one from a dict.
     if ( !KSycoca::self()->isBuilding() )
         delete mime;
@@ -426,7 +426,7 @@ void KMimeType::save( TQDataStream& _str )
 {
   KServiceType::save( _str );
   // Warning adding/removing fields here involves a binary incompatible change - update version
-  // number in ksycoca.h
+  // number in tdesycoca.h
   _str << m_lstPatterns;
 }
 
diff --git a/kio/kio/kmimetype.h b/kio/kio/kmimetype.h
index 8302fa8da..19a846b46 100644
--- a/kio/kio/kmimetype.h
+++ b/kio/kio/kmimetype.h
@@ -29,7 +29,7 @@
 
 #include <kicontheme.h>
 #include <kurl.h>
-#include <ksycocatype.h>
+#include <tdesycocatype.h>
 #include <kservicetype.h>
 
 class KSimpleConfig;
diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp
index b22bbd8dc..8ab3a69ee 100644
--- a/kio/kio/kmimetypechooser.cpp
+++ b/kio/kio/kmimetypechooser.cpp
@@ -25,7 +25,7 @@
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <krun.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/kio/kio/kprotocolinfo.h b/kio/kio/kprotocolinfo.h
index 8ce7ce500..10addc610 100644
--- a/kio/kio/kprotocolinfo.h
+++ b/kio/kio/kprotocolinfo.h
@@ -24,8 +24,8 @@
 #include <tqdatastream.h>
 
 #include <kurl.h>
-#include <ksycocaentry.h>
-#include <ksycocatype.h>
+#include <tdesycocaentry.h>
+#include <tdesycocatype.h>
 
 /**
  * Information about I/O (Internet, etc.) protocols supported by KDE.
diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp
index a5216981f..547df4651 100644
--- a/kio/kio/kservice.cpp
+++ b/kio/kio/kservice.cpp
@@ -51,7 +51,7 @@
 #include "kservicetypefactory.h"
 #include "kservicetype.h"
 #include "kuserprofile.h"
-#include "ksycoca.h"
+#include "tdesycoca.h"
 
 class KService::KServicePrivate
 {
@@ -336,7 +336,7 @@ void KService::load( TQDataStream& s )
   // WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x!
   // !! This data structure should remain binary compatible at all times !!
   // You may add new fields at the end. Make sure to update the version
-  // number in ksycoca.h
+  // number in tdesycoca.h
   s >> m_strType >> m_strName >> m_strExec >> m_strIcon
     >> term >> m_strTerminalOptions
     >> m_strPath >> m_strComment >> m_lstServiceTypes >> def >> m_mapProps
@@ -369,7 +369,7 @@ void KService::save( TQDataStream& s )
   // WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x!
   // !! This data structure should remain binary compatible at all times !!
   // You may add new fields at the end. Make sure to update the version
-  // number in ksycoca.h
+  // number in tdesycoca.h
   s << m_strType << m_strName << m_strExec << m_strIcon
     << term << m_strTerminalOptions
     << m_strPath << m_strComment << m_lstServiceTypes << def << m_mapProps
@@ -879,7 +879,7 @@ void KService::virtual_hook( int id, void* data )
 
 void KService::rebuildKSycoca(TQWidget *parent)
 {
-  KServiceProgressDialog dlg(parent, "ksycoca_progress",
+  KServiceProgressDialog dlg(parent, "tdesycoca_progress",
                       i18n("Updating System Configuration"),
                       i18n("Updating system configuration."));
 
diff --git a/kio/kio/kservice.h b/kio/kio/kservice.h
index 800bacf11..4db478ba6 100644
--- a/kio/kio/kservice.h
+++ b/kio/kio/kservice.h
@@ -25,7 +25,7 @@
 #include <tqvariant.h>
 #include <kicontheme.h>
 
-#include "ksycocaentry.h"
+#include "tdesycocaentry.h"
 
 class TQDataStream;
 class KDesktopFile;
diff --git a/kio/kio/kservicefactory.cpp b/kio/kio/kservicefactory.cpp
index c5784e65a..f4646fa75 100644
--- a/kio/kio/kservicefactory.cpp
+++ b/kio/kio/kservicefactory.cpp
@@ -17,9 +17,9 @@
  **/
 
 #include "kservicefactory.h"
-#include "ksycoca.h"
-#include "ksycocatype.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocatype.h"
+#include "tdesycocadict.h"
 #include "kservice.h"
 
 #include <tqstring.h>
diff --git a/kio/kio/kservicefactory.h b/kio/kio/kservicefactory.h
index 2fd9dd822..4e6df6534 100644
--- a/kio/kio/kservicefactory.h
+++ b/kio/kio/kservicefactory.h
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 
 #include "kservice.h"
-#include "ksycocafactory.h"
+#include "tdesycocafactory.h"
 #include <assert.h>
 
 class KSycoca;
diff --git a/kio/kio/kservicegroup.cpp b/kio/kio/kservicegroup.cpp
index e85991f82..2e27c99b0 100644
--- a/kio/kio/kservicegroup.cpp
+++ b/kio/kio/kservicegroup.cpp
@@ -29,7 +29,7 @@
 #include "kservicegroupfactory.h"
 #include "kservicegroup.h"
 #include "kservice.h"
-#include "ksycoca.h"
+#include "tdesycoca.h"
 
 class KServiceGroup::Private
 {
diff --git a/kio/kio/kservicegroup.h b/kio/kio/kservicegroup.h
index 8e2fa42e6..f2cd5a09f 100644
--- a/kio/kio/kservicegroup.h
+++ b/kio/kio/kservicegroup.h
@@ -28,8 +28,8 @@
 #include <kdesktopfile.h>
 #include <ksortablevaluelist.h>
 
-#include "ksycocaentry.h"
-#include "ksycocatype.h"
+#include "tdesycocaentry.h"
+#include "tdesycocatype.h"
 #include "kservice.h"
 
 class KBuildServiceGroupFactory;
@@ -144,7 +144,7 @@ public:
 
   /**
    * Returns true if the NoDisplay flag was set, i.e. if this
-   * group should be hidden from menus, while still being in ksycoca.
+   * group should be hidden from menus, while still being in tdesycoca.
    * @return true to hide this service group, false to display it
    * @since 3.1
    */
diff --git a/kio/kio/kservicegroupfactory.cpp b/kio/kio/kservicegroupfactory.cpp
index d27fab3e2..56ec0c07f 100644
--- a/kio/kio/kservicegroupfactory.cpp
+++ b/kio/kio/kservicegroupfactory.cpp
@@ -17,9 +17,9 @@
  **/
 
 #include "kservicegroupfactory.h"
-#include "ksycoca.h"
-#include "ksycocatype.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocatype.h"
+#include "tdesycocadict.h"
 #include "kservice.h"
 
 #include <tqstring.h>
diff --git a/kio/kio/kservicegroupfactory.h b/kio/kio/kservicegroupfactory.h
index 5fad77ce6..77bc7c042 100644
--- a/kio/kio/kservicegroupfactory.h
+++ b/kio/kio/kservicegroupfactory.h
@@ -22,7 +22,7 @@
 #include <tqstringlist.h>
 
 #include "kservicegroup.h"
-#include "ksycocafactory.h"
+#include "tdesycocafactory.h"
 #include <assert.h>
 
 class KSycoca;
diff --git a/kio/kio/kservicetype.cpp b/kio/kio/kservicetype.cpp
index 994495921..8565029ee 100644
--- a/kio/kio/kservicetype.cpp
+++ b/kio/kio/kservicetype.cpp
@@ -18,7 +18,7 @@
  **/
 
 #include "kservice.h"
-#include "ksycoca.h"
+#include "tdesycoca.h"
 #include "kservicetype.h"
 #include "kservicetypefactory.h"
 #include "kservicefactory.h"
@@ -138,7 +138,7 @@ KServiceType::save( TQDataStream& _str )
   KSycocaEntry::save( _str );
   // !! This data structure should remain binary compatible at all times !!
   // You may add new fields at the end. Make sure to update the version
-  // number in ksycoca.h
+  // number in tdesycoca.h
   _str << m_strName << m_strIcon << m_strComment << m_mapProps << m_mapPropDefs
        << (TQ_INT8)m_bValid;
 }
diff --git a/kio/kio/kservicetype.h b/kio/kio/kservicetype.h
index f17eb0394..b1cad7284 100644
--- a/kio/kio/kservicetype.h
+++ b/kio/kio/kservicetype.h
@@ -21,7 +21,7 @@
 #ifndef __kservicetype_h__
 #define __kservicetype_h__
 
-#include "ksycocaentry.h"
+#include "tdesycocaentry.h"
 #include "kservice.h"
 
 #include <tqstring.h>
diff --git a/kio/kio/kservicetypefactory.cpp b/kio/kio/kservicetypefactory.cpp
index f7c0f5969..ecf527384 100644
--- a/kio/kio/kservicetypefactory.cpp
+++ b/kio/kio/kservicetypefactory.cpp
@@ -17,9 +17,9 @@
  **/
 
 #include "kservicetypefactory.h"
-#include "ksycoca.h"
-#include "ksycocatype.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocatype.h"
+#include "tdesycocadict.h"
 #include "kservicetype.h"
 #include "kmimetype.h"
 #include "kuserprofile.h"
diff --git a/kio/kio/kservicetypefactory.h b/kio/kio/kservicetypefactory.h
index b1a3c5dab..e18630b2c 100644
--- a/kio/kio/kservicetypefactory.h
+++ b/kio/kio/kservicetypefactory.h
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 #include <tqvaluevector.h>
 
-#include "ksycocafactory.h"
+#include "tdesycocafactory.h"
 #include "kmimetype.h"
 
 class KSycoca;
diff --git a/kio/kio/ktrader.h b/kio/kio/ktrader.h
index 772f0be3a..98891b48d 100644
--- a/kio/kio/ktrader.h
+++ b/kio/kio/ktrader.h
@@ -36,7 +36,7 @@
  * A few examples will make this a lot more clear.
  *
  * Say you have an application that will display HTML.  In this
- * example, you don't want to link to khtml... and furthermore, you
+ * example, you don't want to link to tdehtml... and furthermore, you
  * really don't care if the HTML browser is ours or not, as long as
  * it works.  The way that you formulate your query as well as the way
  * that you execute the browser depends on whether or not you want the
diff --git a/kio/kio/kurifilter.cpp b/kio/kio/kurifilter.cpp
index d1425e9eb..5c50f4fa9 100644
--- a/kio/kio/kurifilter.cpp
+++ b/kio/kio/kurifilter.cpp
@@ -26,7 +26,7 @@
 #include <kmimetype.h>
 #include <klibloader.h>
 #include <kstaticdeleter.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #ifdef HAVE_ELFICON
 #include <tqimage.h>
diff --git a/kio/kio/kuserprofile.cpp b/kio/kio/kuserprofile.cpp
index efc4cbae3..b413b3cd5 100644
--- a/kio/kio/kuserprofile.cpp
+++ b/kio/kio/kuserprofile.cpp
@@ -98,7 +98,7 @@ void KServiceTypeProfile::initStatic()
 //static
 void KServiceTypeProfile::clear()
 {
-    // HACK ksycoca may open the dummy db, in such case the first call to ksycoca
+    // HACK tdesycoca may open the dummy db, in such case the first call to tdesycoca
     // in initStatic() leads to closing the dummy db and clear() being called
     // in the middle of it, making s_lstProfiles be NULL
     if( s_lstProfiles == NULL || s_lstProfiles->count() == 0 )
diff --git a/kio/kio/metainfojob.cpp b/kio/kio/metainfojob.cpp
index 3787fac80..d28914f20 100644
--- a/kio/kio/metainfojob.cpp
+++ b/kio/kio/metainfojob.cpp
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <kfilemetainfo.h>
 #include <kio/kservice.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <tqtimer.h>
 
diff --git a/kio/kioexec/Makefile.am b/kio/kioexec/Makefile.am
index 277a62974..5325ce875 100644
--- a/kio/kioexec/Makefile.am
+++ b/kio/kioexec/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = $(all_includes)
 bin_PROGRAMS = kioexec
 
 kioexec_SOURCES = main.cpp
-kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kioexec_LDADD   = $(LIB_KIO)
 
 noinst_HEADERS = main.h
diff --git a/kio/kpasswdserver/CMakeLists.txt b/kio/kpasswdserver/CMakeLists.txt
index a02d3b50a..5209e53c9 100644
--- a/kio/kpasswdserver/CMakeLists.txt
+++ b/kio/kpasswdserver/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kwallet/client
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
   ${CMAKE_SOURCE_DIR}/kio
 )
 
diff --git a/kio/kpasswdserver/Makefile.am b/kio/kpasswdserver/Makefile.am
index 694718de4..9ba393ef3 100644
--- a/kio/kpasswdserver/Makefile.am
+++ b/kio/kpasswdserver/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 # Makefile.am of tdebase/kioslave/http
 
-INCLUDES= -I$(top_srcdir)/kwallet/client $(all_includes)
+INCLUDES= -I$(top_srcdir)/tdewallet/client $(all_includes)
 
 ####### Files
 
@@ -10,6 +10,6 @@ kde_module_LTLIBRARIES = kded_kpasswdserver.la
 kded_kpasswdserver_la_SOURCES = kpasswdserver.cpp kpasswdserver.skel 
 kded_kpasswdserver_la_METASOURCES = AUTO
 kded_kpasswdserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kpasswdserver_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+kded_kpasswdserver_la_LIBADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/kio/kpasswdserver/kpasswdserver.cpp
index 7b140c467..b6a9aa696 100644
--- a/kio/kpasswdserver/kpasswdserver.cpp
+++ b/kio/kpasswdserver/kpasswdserver.cpp
@@ -34,7 +34,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kio/passdlg.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 
 #include "config.h"
 #ifdef Q_WS_X11
@@ -361,7 +361,7 @@ KPasswdServer::processRequest()
             if ( ( username.isEmpty() || password.isEmpty() )
                 && !KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::PasswordFolder(), makeWalletKey( request->key, info.realmValue )) )
             {
-                // no login+pass provided, check if kwallet has one
+                // no login+pass provided, check if tdewallet has one
                 if ( openWallet( request->windowId ) )
                     hasWalletData = readFromWallet( m_wallet, request->key, info.realmValue, username, password, info.readOnly, knownLogins );
             }
diff --git a/kio/kssl/CMakeLists.txt b/kio/kssl/CMakeLists.txt
index 377cd9d01..a2c9f00d6 100644
--- a/kio/kssl/CMakeLists.txt
+++ b/kio/kssl/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore/network
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kwallet/client
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
 )
 
 
diff --git a/kio/kssl/Makefile.am b/kio/kssl/Makefile.am
index 54f2fc6f5..5d57ab7ab 100644
--- a/kio/kssl/Makefile.am
+++ b/kio/kssl/Makefile.am
@@ -3,7 +3,7 @@
 # somewhere else. Another option for the future (needs testing) would be to
 # change SSL_INCLUDES to .../include/openssl and make the source use #include <foo.h>
 # instead of #include <openssl/foo.h>
-INCLUDES=-I$(top_srcdir)/tdecore/network -I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES)
+INCLUDES=-I$(top_srcdir)/tdecore/network -I$(top_srcdir)/tdewallet/client $(all_includes) $(SSL_INCLUDES)
 
 noinst_LTLIBRARIES = libkssl.la
 KSSLVERSION=	3.0.0
diff --git a/kio/kssl/ksslkeygen.cc b/kio/kssl/ksslkeygen.cc
index a34773989..403632b3a 100644
--- a/kio/kssl/ksslkeygen.cc
+++ b/kio/kssl/ksslkeygen.cc
@@ -31,7 +31,7 @@
 #include <kprogress.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
diff --git a/kio/misc/CMakeLists.txt b/kio/misc/CMakeLists.txt
index 52aa2207a..5212444a2 100644
--- a/kio/misc/CMakeLists.txt
+++ b/kio/misc/CMakeLists.txt
@@ -14,8 +14,8 @@ add_subdirectory( kpac )
 add_subdirectory( tdesasl )
 add_subdirectory( kssld )
 add_subdirectory( kfile )
-add_subdirectory( kwalletd )
-add_subdirectory( kntlm )
+add_subdirectory( tdewalletd )
+add_subdirectory( tdentlm )
 
 add_definitions(
   -D_LARGEFILE64_SOURCE
diff --git a/kio/misc/Makefile.am b/kio/misc/Makefile.am
index cfa5a4c3e..0bafce0f5 100644
--- a/kio/misc/Makefile.am
+++ b/kio/misc/Makefile.am
@@ -20,7 +20,7 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
 
 INCLUDES=  -I$(srcdir)/.. -I$(top_srcdir) -I$(srcdir)/../kssl -I../kssl $(all_includes) $(SSL_INCLUDES)
 
-SUBDIRS = . ksendbugmail kpac tdesasl kssld kfile kwalletd kntlm
+SUBDIRS = . ksendbugmail kpac tdesasl kssld kfile tdewalletd tdentlm
 
 lib_LTLIBRARIES =
 tdeinit_LTLIBRARIES = kio_uiserver.la
@@ -38,11 +38,11 @@ kde_services_DATA = kio_uiserver.desktop
 
 kmailservice_SOURCES = kmailservice.cpp
 kmailservice_LDADD = $(LIB_TDECORE)
-kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 ktelnetservice_SOURCES = ktelnetservice.cpp
 ktelnetservice_LDADD = $(LIB_TDEUI)
-ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 protocol_DATA = kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \
 		mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol
diff --git a/kio/misc/kfile/Makefile.am b/kio/misc/kfile/Makefile.am
index ad5a377a2..605fef7d3 100644
--- a/kio/misc/kfile/Makefile.am
+++ b/kio/misc/kfile/Makefile.am
@@ -5,6 +5,6 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio/kio $(all_includes)
 
 bin_PROGRAMS = kfile
 kfile_SOURCES = fileprops.cpp
-kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kfile_LDADD = $(LIB_KIO)
 
diff --git a/kio/misc/kntlm/Makefile.am b/kio/misc/kntlm/Makefile.am
deleted file mode 100644
index 91efaf40f..000000000
--- a/kio/misc/kntlm/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-INCLUDES=$(all_includes)
-
-lib_LTLIBRARIES = libkntlm.la
-METASOURCES     = AUTO
-
-kntlmincludedir = $(includedir)/kio
-kntlminclude_HEADERS = kntlm.h
-
-libkntlm_la_SOURCES = kntlm.cpp des.cpp
-libkntlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
-libkntlm_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
-
diff --git a/kio/misc/ksendbugmail/Makefile.am b/kio/misc/ksendbugmail/Makefile.am
index f3efb2b2c..b24e36a26 100644
--- a/kio/misc/ksendbugmail/Makefile.am
+++ b/kio/misc/ksendbugmail/Makefile.am
@@ -20,7 +20,7 @@ bin_PROGRAMS = ksendbugmail
 INCLUDES= -I$(srcdir)/.. $(all_includes)
 
 ksendbugmail_SOURCES = main.cpp smtp.cpp
-ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 ksendbugmail_LDADD = ../../libkio.la
 
 METASOURCES = AUTO
diff --git a/kio/misc/kntlm/CMakeLists.txt b/kio/misc/tdentlm/CMakeLists.txt
index 0952f4535..a846d1dcc 100644
--- a/kio/misc/kntlm/CMakeLists.txt
+++ b/kio/misc/tdentlm/CMakeLists.txt
@@ -24,15 +24,15 @@ link_directories(
 
 ##### headers ###################################
 
-install(FILES kntlm.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+install(FILES tdentlm.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
 
 
-##### kntlm ###################################
+##### tdentlm ###################################
 
-set( target kntlm )
+set( target tdentlm )
 
 set( ${target}_SRCS
-  kntlm.cpp des.cpp
+  tdentlm.cpp des.cpp
 )
 
 tde_add_library( ${target} SHARED
diff --git a/kio/misc/tdentlm/Makefile.am b/kio/misc/tdentlm/Makefile.am
new file mode 100644
index 000000000..689d0921d
--- /dev/null
+++ b/kio/misc/tdentlm/Makefile.am
@@ -0,0 +1,12 @@
+INCLUDES=$(all_includes)
+
+lib_LTLIBRARIES = libtdentlm.la
+METASOURCES     = AUTO
+
+tdentlmincludedir = $(includedir)/kio
+tdentlminclude_HEADERS = tdentlm.h
+
+libtdentlm_la_SOURCES = tdentlm.cpp des.cpp
+libtdentlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
+libtdentlm_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+
diff --git a/kio/misc/kntlm/des.cpp b/kio/misc/tdentlm/des.cpp
index bb4fab88b..bb4fab88b 100644
--- a/kio/misc/kntlm/des.cpp
+++ b/kio/misc/tdentlm/des.cpp
diff --git a/kio/misc/kntlm/des.h b/kio/misc/tdentlm/des.h
index 0f6f59dc9..0f6f59dc9 100644
--- a/kio/misc/kntlm/des.h
+++ b/kio/misc/tdentlm/des.h
diff --git a/kio/misc/kntlm/kswap.h b/kio/misc/tdentlm/kswap.h
index 9eca243de..9eca243de 100644
--- a/kio/misc/kntlm/kswap.h
+++ b/kio/misc/tdentlm/kswap.h
diff --git a/kio/misc/kntlm/kntlm.cpp b/kio/misc/tdentlm/tdentlm.cpp
index dd9cd33ec..2ef5d1cb6 100644
--- a/kio/misc/kntlm/kntlm.cpp
+++ b/kio/misc/tdentlm/tdentlm.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 
 #include "des.h"
-#include "kntlm.h"
+#include "tdentlm.h"
 
 TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode )
 {
diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/tdentlm/tdentlm.h
index 06b8febab..06b8febab 100644
--- a/kio/misc/kntlm/kntlm.h
+++ b/kio/misc/tdentlm/tdentlm.h
diff --git a/kio/misc/kwalletd/CMakeLists.txt b/kio/misc/tdewalletd/CMakeLists.txt
index db4f56cb1..4aaa332aa 100644
--- a/kio/misc/kwalletd/CMakeLists.txt
+++ b/kio/misc/tdewalletd/CMakeLists.txt
@@ -17,8 +17,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kwallet/client
-  ${CMAKE_SOURCE_DIR}/kwallet/backend
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
+  ${CMAKE_SOURCE_DIR}/tdewallet/backend
   ${CMAKE_SOURCE_DIR}/kio/kio
 )
 
@@ -29,21 +29,21 @@ link_directories(
 
 ##### other data ################################
 
-install(FILES kwalletd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
+install(FILES tdewalletd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 
 
-#### kded_kwalletd ##############################
+#### kded_tdewalletd ##############################
 
-set( target kded_kwalletd )
+set( target kded_tdewalletd )
 
 set( ${target}_SRCS
-  kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui
+  tdewalletd.cpp tdewalletd.skel ktimeout.cpp tdewalletwizard.ui
   kbetterthankdialogbase.ui
 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdeinit_kded-shared kwalletbackend-shared
+  LINK tdeinit_kded-shared tdewalletbackend-shared
   DEPENDENCIES dcopidl
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kio/misc/kwalletd/Makefile.am b/kio/misc/tdewalletd/Makefile.am
index 1d5b1313c..5d52fa810 100644
--- a/kio/misc/kwalletd/Makefile.am
+++ b/kio/misc/tdewalletd/Makefile.am
@@ -16,20 +16,20 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/kwallet/backend -I$(top_builddir)/kwallet/backend -I$(top_srcdir)/kwallet/client -I$(top_builddir)/kwallet/client $(all_includes)
+INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/tdewallet/backend -I$(top_builddir)/tdewallet/backend -I$(top_srcdir)/tdewallet/client -I$(top_builddir)/tdewallet/client $(all_includes)
 
-kde_module_LTLIBRARIES = kded_kwalletd.la
+kde_module_LTLIBRARIES = kded_tdewalletd.la
 
-kded_kwalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEUI)
-kded_kwalletd_la_SOURCES = kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui kbetterthankdialogbase.ui
+kded_tdewalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version
+kded_tdewalletd_la_LIBADD = $(LIB_KIO) ../../../tdewallet/backend/libtdewalletbackend.la ../../../tdewallet/client/libtdewalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEUI)
+kded_tdewalletd_la_SOURCES = tdewalletd.cpp tdewalletd.skel ktimeout.cpp tdewalletwizard.ui kbetterthankdialogbase.ui
 
 METASOURCES = AUTO
 
-noinst_HEADERS = kwalletd.h ktimeout.h kwalletwizard.ui.h
+noinst_HEADERS = tdewalletd.h ktimeout.h tdewalletwizard.ui.h
 
-services_DATA = kwalletd.desktop
+services_DATA = tdewalletd.desktop
 servicesdir = $(kde_servicesdir)/kded
 
-kwalletwizard.lo: kwalletwizard.ui kwalletwizard.ui.h
+tdewalletwizard.lo: tdewalletwizard.ui tdewalletwizard.ui.h
 kbetterthankdialogbase.lo: kbetterthankdialogbase.ui kbetterthankdialogbase.ui.h
diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui b/kio/misc/tdewalletd/kbetterthankdialogbase.ui
index a02d5def7..a02d5def7 100644
--- a/kio/misc/kwalletd/kbetterthankdialogbase.ui
+++ b/kio/misc/tdewalletd/kbetterthankdialogbase.ui
diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui.h b/kio/misc/tdewalletd/kbetterthankdialogbase.ui.h
index 2b3e16b0d..2b3e16b0d 100644
--- a/kio/misc/kwalletd/kbetterthankdialogbase.ui.h
+++ b/kio/misc/tdewalletd/kbetterthankdialogbase.ui.h
diff --git a/kio/misc/kwalletd/ktimeout.cpp b/kio/misc/tdewalletd/ktimeout.cpp
index c431ecf69..c431ecf69 100644
--- a/kio/misc/kwalletd/ktimeout.cpp
+++ b/kio/misc/tdewalletd/ktimeout.cpp
diff --git a/kio/misc/kwalletd/ktimeout.h b/kio/misc/tdewalletd/ktimeout.h
index 441e4ed77..441e4ed77 100644
--- a/kio/misc/kwalletd/ktimeout.h
+++ b/kio/misc/tdewalletd/ktimeout.h
diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/tdewalletd/tdewalletd.cpp
index afa634c64..3f59f4e91 100644
--- a/kio/misc/kwalletd/kwalletd.cpp
+++ b/kio/misc/tdewalletd/tdewalletd.cpp
@@ -21,8 +21,8 @@
 */
 
 #include "kbetterthankdialogbase.h"
-#include "kwalletwizard.h"
-#include "kwalletd.h"
+#include "tdewalletwizard.h"
+#include "tdewalletd.h"
 #include "ktimeout.h"
 
 #include <dcopclient.h>
@@ -37,7 +37,7 @@
 #include <kmessagebox.h>
 #include <kpassdlg.h>
 #include <kstandarddirs.h>
-#include <kwalletentry.h>
+#include <tdewalletentry.h>
 #include <twin.h>
 
 #include <tqdir.h>
@@ -51,7 +51,7 @@
 #include <assert.h>
 
 extern "C" {
-   KDE_EXPORT KDEDModule *create_kwalletd(const TQCString &name) {
+   KDE_EXPORT KDEDModule *create_tdewalletd(const TQCString &name) {
 	   return new KWalletD(name);
    }
 }
@@ -94,13 +94,13 @@ KWalletD::KWalletD(const TQCString &name)
 	_idleTime = 0;
 	connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int)));
 	reconfigure();
-	TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
+	TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
 	connect(TDEApplication::dcopClient(),
 		TQT_SIGNAL(applicationRemoved(const TQCString&)),
 		this,
 		TQT_SLOT(slotAppUnregistered(const TQCString&)));
 	_dw = new KDirWatch(this, "KWallet Directory Watcher");
-	_dw->addDir(TDEGlobal::dirs()->saveLocation("kwallet"));
+	_dw->addDir(TDEGlobal::dirs()->saveLocation("tdewallet"));
 	_dw->startScan(true);
 	connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty()));
 }
@@ -272,15 +272,15 @@ int KWalletD::open(const TQString& wallet, uint wId) {
 }
 
 
-// Sets up a dialog that will be shown by kwallet.
+// Sets up a dialog that will be shown by tdewallet.
 void KWalletD::setupDialog( TQWidget* dialog, WId wId, const TQCString& appid, bool modal ) {
 	if( wId != 0 ) 
 		KWin::setMainWindow( dialog, wId ); // correct, set dialog parent
 	else {
 		if( appid.isEmpty())
-			kdWarning() << "Using kwallet without parent window!" << endl;
+			kdWarning() << "Using tdewallet without parent window!" << endl;
 		else
-			kdWarning() << "Application '" << appid << "' using kwallet without parent window!" << endl;
+			kdWarning() << "Application '" << appid << "' using tdewallet without parent window!" << endl;
 		// allow dialog activation even if it interrupts, better than trying hacks
 		// with keeping the dialog on top or on all desktops
 		kapp->updateUserTimestamp();
@@ -314,7 +314,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet,
 		setupDialog( wiz, wId, appid, modal );
 		int rc = wiz->exec();
 		if (rc == TQDialog::Accepted) {
-			TDEConfig cfg("kwalletrc");
+			TDEConfig cfg("tdewalletrc");
 			cfg.setGroup("Wallet");
 			cfg.writeEntry("First Use", false);
 			cfg.writeEntry("Enabled", wiz->_useWallet->isChecked());
@@ -344,7 +344,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet,
 			return -1;
 		}
 	} else if (_firstUse) {
-		TDEConfig cfg("kwalletrc");
+		TDEConfig cfg("tdewalletrc");
 		_firstUse = false;
 		cfg.setGroup("Wallet");
 		cfg.writeEntry("First Use", false);
@@ -526,7 +526,7 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
 		}
 		emitDCOPSignal("walletOpened(TQString)", data);
 		if (_wallets.count() == 1 && _launchManager) {
-			TDEApplication::startServiceByDesktopName("kwalletmanager-kwalletd");
+			TDEApplication::startServiceByDesktopName("tdewalletmanager-tdewalletd");
 		}
 	} else {
 		if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) {
@@ -564,7 +564,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 
 	if (response == 0 || response == 1) {
 		if (response == 1) {
-			TDEConfig cfg("kwalletrc");
+			TDEConfig cfg("tdewalletrc");
 			cfg.setGroup("Auto Allow");
 			TQStringList apps = cfg.readListEntry(wallet);
 			if (!apps.contains(thisApp)) {
@@ -575,7 +575,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 			}
 		}
 	} else if (response == 3) {
-		TDEConfig cfg("kwalletrc");
+		TDEConfig cfg("tdewalletrc");
 		cfg.setGroup("Auto Deny");
 		TQStringList apps = cfg.readListEntry(wallet);
 		if (!apps.contains(thisApp)) {
@@ -593,7 +593,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 
 
 int KWalletD::deleteWallet(const TQString& wallet) {
-	TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + TQDir::separator() + wallet + ".kwl";
+	TQString path = TDEGlobal::dirs()->saveLocation("tdewallet") + TQDir::separator() + wallet + ".kwl";
 
 	if (TQFile::exists(path)) {
 		close(wallet, true);
@@ -806,7 +806,7 @@ bool KWalletD::isOpen(int handle) {
 
 
 TQStringList KWalletD::wallets() const {
-	TQString path = TDEGlobal::dirs()->saveLocation("kwallet");
+	TQString path = TDEGlobal::dirs()->saveLocation("tdewallet");
 	TQDir dir(path, "*.kwl");
 	TQStringList rc;
 
@@ -1343,7 +1343,7 @@ void KWalletD::emitWalletListDirty() {
 
 
 void KWalletD::reconfigure() {
-	TDEConfig cfg("kwalletrc");
+	TDEConfig cfg("tdewalletrc");
 	cfg.setGroup("Wallet");
 	_firstUse = cfg.readBoolEntry("First Use", true);
 	_enabled = cfg.readBoolEntry("Enabled", true);
@@ -1511,4 +1511,4 @@ TQString KWalletD::localWallet() {
 }
 
 
-#include "kwalletd.moc"
+#include "tdewalletd.moc"
diff --git a/kio/misc/kwalletd/kwalletd.desktop b/kio/misc/tdewalletd/tdewalletd.desktop
index 7f07fd079..1e65fe0df 100644
--- a/kio/misc/kwalletd/kwalletd.desktop
+++ b/kio/misc/tdewalletd/tdewalletd.desktop
@@ -2,8 +2,8 @@
 Type=Service
 ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
-X-TDE-Library=kwalletd
-X-TDE-FactoryName=kwalletd
+X-TDE-Library=tdewalletd
+X-TDE-FactoryName=tdewalletd
 X-TDE-Kded-autoload=false
 X-TDE-Kded-load-on-demand=true
 Name=KWallet Daemon Module
diff --git a/kio/misc/kwalletd/kwalletd.h b/kio/misc/tdewalletd/tdewalletd.h
index 2aea371ba..b3a315413 100644
--- a/kio/misc/kwalletd/kwalletd.h
+++ b/kio/misc/tdewalletd/tdewalletd.h
@@ -28,7 +28,7 @@
 #include <tqwidget.h>
 #include <tqtimer.h>
 #include <tqguardedptr.h>
-#include "kwalletbackend.h"
+#include "tdewalletbackend.h"
 
 #include <time.h>
 #include <stdlib.h>
diff --git a/kio/misc/kwalletd/kwalletwizard.ui b/kio/misc/tdewalletd/tdewalletwizard.ui
index b79853549..aa3a1c09d 100644
--- a/kio/misc/kwalletd/kwalletwizard.ui
+++ b/kio/misc/tdewalletd/tdewalletwizard.ui
@@ -532,7 +532,7 @@
 <includes>
     <include location="global" impldecl="in declaration">tqcheckbox.h</include>
     <include location="global" impldecl="in implementation">klocale.h</include>
-    <include location="local" impldecl="in implementation">kwalletwizard.ui.h</include>
+    <include location="local" impldecl="in implementation">tdewalletwizard.ui.h</include>
 </includes>
 <Q_SLOTS>
     <slot access="private">passwordPageUpdate()</slot>
diff --git a/kio/misc/kwalletd/kwalletwizard.ui.h b/kio/misc/tdewalletd/tdewalletwizard.ui.h
index a42635e9b..a42635e9b 100644
--- a/kio/misc/kwalletd/kwalletwizard.ui.h
+++ b/kio/misc/tdewalletd/tdewalletwizard.ui.h
diff --git a/kio/tests/Makefile.am b/kio/tests/Makefile.am
index fe0b6d7ca..3a81dfc57 100644
--- a/kio/tests/Makefile.am
+++ b/kio/tests/Makefile.am
@@ -18,15 +18,15 @@
 
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes)
 LDADD = $(LIB_KIO)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
-check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\
+check_PROGRAMS = tdesycocatest getalltest kruntest ktartest kziptest\
                  kioslavetest kdirwatchtest kshredtest speed kurifiltertest \
                  kdefaultprogresstest kmimemagictest \
                  kfiltertest kiopassdlgtest kscantest kdirlistertest \
                  previewtest kionetrctest kdcopcheck metatest \
 		 kmimefromext kpropsdlgtest kmfitest dataprotocoltest \
-		 kprotocolinfotest ksycocaupdatetest netaccesstest jobtest \
+		 kprotocolinfotest tdesycocaupdatetest netaccesstest jobtest \
 		 kurlcompletiontest kmimetypetest kacltest
 
 # Unfortunately some tests depend on the network settings, it seems
@@ -48,7 +48,7 @@ kdefaultprogresstest_SOURCES = kdefaultprogresstest.cpp
 kionetrctest_SOURCES = kionetrctest.cpp
 kiopassdlgtest_SOURCES = kiopassdlgtest.cpp
 kurifiltertest_SOURCES = kurifiltertest.cpp
-ksycocatest_SOURCES = ksycocatest.cpp
+tdesycocatest_SOURCES = tdesycocatest.cpp
 kdcopcheck_SOURCES = kdcopcheck.cpp
 getalltest_SOURCES = getalltest.cpp
 kruntest_SOURCES = kruntest.cpp
@@ -67,7 +67,7 @@ kpropsdlgtest_SOURCES = kpropsdlgtest.cpp
 kmfitest_SOURCES = kmfitest.cpp
 dataprotocoltest_SOURCES = dataprotocoltest.cpp
 kprotocolinfotest_SOURCES = kprotocolinfotest.cpp
-ksycocaupdatetest_SOURCES = ksycocaupdatetest.cpp
+tdesycocaupdatetest_SOURCES = tdesycocaupdatetest.cpp
 netaccesstest_SOURCES = netaccesstest.cpp
 jobtest_SOURCES = jobtest.cpp
 kurlcompletiontest_SOURCES = kurlcompletiontest.cpp
@@ -75,10 +75,10 @@ kmimetypetest_SOURCES = kmimetypetest.cpp
 kacltest_SOURCES = kacltest.cpp
 
 
-check_LTLIBRARIES = kunittest_kdirwatch.la
-kunittest_kdirwatch_la_SOURCES = kdirwatchunittest.cpp
-kunittest_kdirwatch_la_LIBADD = $(LIB_KUNITTEST) $(LIB_KIO)
-kunittest_kdirwatch_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
+check_LTLIBRARIES = tdeunittest_kdirwatch.la
+tdeunittest_kdirwatch_la_SOURCES = kdirwatchunittest.cpp
+tdeunittest_kdirwatch_la_LIBADD = $(LIB_KUNITTEST) $(LIB_KIO)
+tdeunittest_kdirwatch_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
 
 # kfile meta stuff. Comment this in, if you want a small
 # metadata plugin test and "make install".
diff --git a/kio/tests/kdirwatchunittest.cpp b/kio/tests/kdirwatchunittest.cpp
index 870b85de9..3d7505a3f 100644
--- a/kio/tests/kdirwatchunittest.cpp
+++ b/kio/tests/kdirwatchunittest.cpp
@@ -106,7 +106,7 @@ void KDirWatchTest::rename_file(const TQString& from, const TQString& to)
   ::rename(TQFile::encodeName(from), TQFile::encodeName(to));
 }
 
-KUNITTEST_MODULE ( kunittest_kdirwatch, "KDirWatchTest" )
+KUNITTEST_MODULE ( tdeunittest_kdirwatch, "KDirWatchTest" )
 KUNITTEST_MODULE_REGISTER_TESTER (KDirWatchTest)
 
 #define SLEEP() TQApplication::processEvents();
diff --git a/kio/tests/kdirwatchunittest.h b/kio/tests/kdirwatchunittest.h
index 053ab2882..42222a787 100644
--- a/kio/tests/kdirwatchunittest.h
+++ b/kio/tests/kdirwatchunittest.h
@@ -19,8 +19,8 @@
 #include "kdirwatch.h"
 #include "kapplication.h"
 
-#include <kunittest/tester.h>
-#include <kunittest/module.h>
+#include <tdeunittest/tester.h>
+#include <tdeunittest/module.h>
 
 class KDirWatchTest : public KUnitTest::Tester
 {
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp
index a5ed8da9d..820f97403 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -154,7 +154,7 @@ static const KCmdLineOptions options[] =
 int main(int argc, char **argv)
 {
     // Ensure that user configuration doesn't change the results of those tests
-    // TDEHOME needs to be writable though, for a ksycoca database
+    // TDEHOME needs to be writable though, for a tdesycoca database
     setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-kurifiltertest" ), true );
     setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
diff --git a/kio/tests/ksycocatest.cpp b/kio/tests/tdesycocatest.cpp
index 45f94ac3c..45f94ac3c 100644
--- a/kio/tests/ksycocatest.cpp
+++ b/kio/tests/tdesycocatest.cpp
diff --git a/kio/tests/ksycocaupdatetest.cpp b/kio/tests/tdesycocaupdatetest.cpp
index e7778e056..e7778e056 100644
--- a/kio/tests/ksycocaupdatetest.cpp
+++ b/kio/tests/tdesycocaupdatetest.cpp