diff --git a/libtdepim/CMakeLists.txt b/libtdepim/CMakeLists.txt
index 2c79e018..e9308903 100644
--- a/libtdepim/CMakeLists.txt
+++ b/libtdepim/CMakeLists.txt
@@ -88,7 +88,7 @@ tde_add_library( tdepim SHARED AUTOMOC
     resourceabc.cpp diffalgo.cpp addresseediffalgo.cpp calendardiffalgo.cpp
     htmldiffalgodisplay.cpp ldapsearchdialog.cpp broadcaststatus.cpp
     kresourceprefs.cpp kpixmapregionselectorwidget.cpp
-    kpixmapregionselectordialog.cpp kabcresourcecached.cpp
+    kpixmapregionselectordialog.cpp tdeabcresourcecached.cpp
     kxface.cpp kaccount.cpp kaddrbook.cpp kfoldertree.cpp kregexp3.cpp
     kscoring.cpp kscoringeditor.cpp ksubscription.cpp kwidgetlister.cpp
     linklocator.cpp qutf7codec.cpp recentaddresses.cpp spellingfilter.cpp
diff --git a/libtdepim/Makefile.am b/libtdepim/Makefile.am
index 7b690c8b..935691b5 100644
--- a/libtdepim/Makefile.am
+++ b/libtdepim/Makefile.am
@@ -25,7 +25,7 @@ libtdepim_la_SOURCES = \
   resourceabc.cpp diffalgo.cpp addresseediffalgo.cpp calendardiffalgo.cpp \
   htmldiffalgodisplay.cpp ldapsearchdialog.cpp broadcaststatus.cpp kresourceprefs.cpp \
   kpixmapregionselectorwidget.cpp kpixmapregionselectordialog.cpp \
-  kabcresourcecached.cpp kxface.cpp \
+  tdeabcresourcecached.cpp kxface.cpp \
   kaccount.cpp kaddrbook.cpp kfoldertree.cpp kregexp3.cpp \
   kscoring.cpp kscoringeditor.cpp ksubscription.cpp kwidgetlister.cpp \
   linklocator.cpp qutf7codec.cpp \
diff --git a/libtdepim/kabcresourcecached.cpp b/libtdepim/tdeabcresourcecached.cpp
similarity index 99%
rename from libtdepim/kabcresourcecached.cpp
rename to libtdepim/tdeabcresourcecached.cpp
index 935fc942..4cb4901a 100644
--- a/libtdepim/kabcresourcecached.cpp
+++ b/libtdepim/tdeabcresourcecached.cpp
@@ -25,7 +25,7 @@
 #include <tdelocale.h>
 #include <kstandarddirs.h>
 
-#include "kabcresourcecached.h"
+#include "tdeabcresourcecached.h"
 
 using namespace KABC;
 
@@ -414,4 +414,4 @@ void ResourceCached::setIdMapperIdentifier()
   mIdMapper.setIdentifier( type() + "_" + identifier() );
 }
 
-#include "kabcresourcecached.moc"
+#include "tdeabcresourcecached.moc"
diff --git a/libtdepim/kabcresourcecached.h b/libtdepim/tdeabcresourcecached.h
similarity index 100%
rename from libtdepim/kabcresourcecached.h
rename to libtdepim/tdeabcresourcecached.h
diff --git a/libtdepim/kabcresourcenull.h b/libtdepim/tdeabcresourcenull.h
similarity index 100%
rename from libtdepim/kabcresourcenull.h
rename to libtdepim/tdeabcresourcenull.h
diff --git a/tderesources/carddav/configwidgets.cpp b/tderesources/carddav/configwidgets.cpp
index 2c22b3f1..800ea26d 100644
--- a/tderesources/carddav/configwidgets.cpp
+++ b/tderesources/carddav/configwidgets.cpp
@@ -34,7 +34,7 @@
 
 #include "configwidgets.h"
 
-#include <kabcresourcecached.h>
+#include <tdeabcresourcecached.h>
 
 #include <tdelocale.h>
 #include <kdebug.h>
diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h
index 2e2de628..24d72759 100644
--- a/tderesources/carddav/resource.h
+++ b/tderesources/carddav/resource.h
@@ -20,7 +20,7 @@
 #include <tqthread.h>
 #include <tqptrqueue.h>
 
-#include <kabcresourcecached.h>
+#include <tdeabcresourcecached.h>
 #include <libtdepim/progressmanager.h>
 
 #include <tdeabc/locknull.h>
diff --git a/tderesources/groupdav/groupdavaddressbookadaptor.cpp b/tderesources/groupdav/groupdavaddressbookadaptor.cpp
index f9d06179..278c261a 100644
--- a/tderesources/groupdav/groupdavaddressbookadaptor.cpp
+++ b/tderesources/groupdav/groupdavaddressbookadaptor.cpp
@@ -28,7 +28,7 @@
 
 #include <tdeabc/addressee.h>
 #include <tdeabc/vcardconverter.h>
-#include <kabcresourcecached.h>
+#include <tdeabcresourcecached.h>
 
 #include <tdeio/job.h>
 #include <kdebug.h>
diff --git a/tderesources/groupware/tdeabc_resourcegroupware.h b/tderesources/groupware/tdeabc_resourcegroupware.h
index 1c5feb84..68d7f632 100644
--- a/tderesources/groupware/tdeabc_resourcegroupware.h
+++ b/tderesources/groupware/tdeabc_resourcegroupware.h
@@ -20,7 +20,7 @@
 #ifndef KABC_RESOURCEGROUPWARE_H
 #define KABC_RESOURCEGROUPWARE_H
 
-#include <kabcresourcecached.h>
+#include <tdeabcresourcecached.h>
 
 #include <libtdepim/progressmanager.h>
 
diff --git a/tderesources/groupwise/soap/soapdebug.cpp b/tderesources/groupwise/soap/soapdebug.cpp
index 3c9cfc80..0afff20d 100644
--- a/tderesources/groupwise/soap/soapdebug.cpp
+++ b/tderesources/groupwise/soap/soapdebug.cpp
@@ -7,7 +7,7 @@
 #include <kdebug.h>
 #include <tdetempfile.h>
 
-#include <kabcresourcecached.h>
+#include <tdeabcresourcecached.h>
 
 #include <libkcal/icalformat.h>
 #include <libkcal/resourcelocal.h>
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h
index 0c7533ee..27cf363f 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwise.h
+++ b/tderesources/groupwise/tdeabc_resourcegroupwise.h
@@ -22,7 +22,7 @@
 
 #include "soap/groupwiseserver.h"
 
-#include <kabcresourcecached.h>
+#include <tdeabcresourcecached.h>
 #include <tdepimmacros.h>
 
 #include <libtdepim/progressmanager.h>
diff --git a/tderesources/lib/davaddressbookadaptor.cpp b/tderesources/lib/davaddressbookadaptor.cpp
index 2d90c7cb..b9213e88 100644
--- a/tderesources/lib/davaddressbookadaptor.cpp
+++ b/tderesources/lib/davaddressbookadaptor.cpp
@@ -28,7 +28,7 @@
 
 // #include <tdeabc/addressee.h>
 // #include <tdeabc/vcardconverter.h>
-// #include <kabcresourcecached.h>
+// #include <tdeabcresourcecached.h>
 
 #include <tdeio/davjob.h>
 // #include <tdeio/job.h>
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h
index 28ce5199..272a2cee 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebase.h
+++ b/tderesources/lib/tdeabc_resourcegroupwarebase.h
@@ -23,7 +23,7 @@
 #define KABC_RESOURCEGROUPWARE_H
 
 #include <kurl.h>
-#include <kabcresourcecached.h>
+#include <tdeabcresourcecached.h>
 #include <tdepimmacros.h>
 
 class TDEConfig;
diff --git a/tderesources/slox/CMakeLists.txt b/tderesources/slox/CMakeLists.txt
index 47d6dc70..0d932ecb 100644
--- a/tderesources/slox/CMakeLists.txt
+++ b/tderesources/slox/CMakeLists.txt
@@ -41,7 +41,7 @@ tde_add_kpart( kcal_slox AUTOMOC
 ##### tdeabc_slox (module) ########################
 
 tde_add_kpart( tdeabc_slox AUTOMOC
-  SOURCES kabcresourceslox_plugin.cpp
+  SOURCES tdeabcresourceslox_plugin.cpp
   LINK tdeabc_slox-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
@@ -63,7 +63,7 @@ tde_add_library( kslox SHARED AUTOMOC
 
 tde_add_library( tdeabc_slox SHARED AUTOMOC
   SOURCES
-    kabcresourceslox.cpp kabcresourcesloxconfig.cpp kabcsloxprefs.kcfgc
+    tdeabcresourceslox.cpp tdeabcresourcesloxconfig.cpp tdeabcsloxprefs.kcfgc
   VERSION 0.0.0
   LINK kslox-shared
   DESTINATION ${LIB_INSTALL_DIR}
diff --git a/tderesources/slox/Makefile.am b/tderesources/slox/Makefile.am
index ee8a47f1..6175de16 100644
--- a/tderesources/slox/Makefile.am
+++ b/tderesources/slox/Makefile.am
@@ -15,10 +15,10 @@ libkcal_slox_la_SOURCES = kcalresourceslox.cpp kcalresourcesloxconfig.cpp \
 libkcal_slox_la_LDFLAGS = $(all_libraries)
 libkcal_slox_la_LIBADD  = libkslox.la $(top_builddir)/libkcal/libkcal.la
 
-libtdeabc_slox_la_SOURCES = kabcresourceslox.cpp kabcresourcesloxconfig.cpp \
-                          kabcsloxprefs.kcfgc
+libtdeabc_slox_la_SOURCES = tdeabcresourceslox.cpp tdeabcresourcesloxconfig.cpp \
+                          tdeabcsloxprefs.kcfgc
 libtdeabc_slox_la_LDFLAGS = $(all_libraries)
-libtdeabc_slox_la_LIBADD  = libkslox.la  -lkabc
+libtdeabc_slox_la_LIBADD  = libkslox.la  -ltdeabc
 
 
 kde_module_LTLIBRARIES = kcal_slox.la tdeabc_slox.la
@@ -27,7 +27,7 @@ kcal_slox_la_SOURCES = kcalresourceslox_plugin.cpp
 kcal_slox_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kcal_slox_la_LIBADD  = libkcal_slox.la
 
-tdeabc_slox_la_SOURCES = kabcresourceslox_plugin.cpp
+tdeabc_slox_la_SOURCES = tdeabcresourceslox_plugin.cpp
 tdeabc_slox_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 tdeabc_slox_la_LIBADD  = libtdeabc_slox.la
 
diff --git a/tderesources/slox/kabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp
similarity index 99%
rename from tderesources/slox/kabcresourceslox.cpp
rename to tderesources/slox/tdeabcresourceslox.cpp
index 17b28296..77fea0b0 100644
--- a/tderesources/slox/kabcresourceslox.cpp
+++ b/tderesources/slox/tdeabcresourceslox.cpp
@@ -34,9 +34,9 @@
 
 #include "webdavhandler.h"
 #include "sloxaccounts.h"
-#include "kabcsloxprefs.h"
+#include "tdeabcsloxprefs.h"
 
-#include "kabcresourceslox.h"
+#include "tdeabcresourceslox.h"
 
 using namespace KABC;
 
@@ -681,4 +681,4 @@ bool ResourceSlox::readOnly() const
     return true;
 }
 
-#include "kabcresourceslox.moc"
+#include "tdeabcresourceslox.moc"
diff --git a/tderesources/slox/kabcresourceslox.h b/tderesources/slox/tdeabcresourceslox.h
similarity index 100%
rename from tderesources/slox/kabcresourceslox.h
rename to tderesources/slox/tdeabcresourceslox.h
diff --git a/tderesources/slox/kabcresourceslox_plugin.cpp b/tderesources/slox/tdeabcresourceslox_plugin.cpp
similarity index 94%
rename from tderesources/slox/kabcresourceslox_plugin.cpp
rename to tderesources/slox/tdeabcresourceslox_plugin.cpp
index 93db76b3..b876c859 100644
--- a/tderesources/slox/kabcresourceslox_plugin.cpp
+++ b/tderesources/slox/tdeabcresourceslox_plugin.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include "kabcresourceslox.h"
-#include "kabcresourcesloxconfig.h"
+#include "tdeabcresourceslox.h"
+#include "tdeabcresourcesloxconfig.h"
 
 #include <tdeglobal.h>
 #include <tdelocale.h>
diff --git a/tderesources/slox/kabcresourcesloxconfig.cpp b/tderesources/slox/tdeabcresourcesloxconfig.cpp
similarity index 96%
rename from tderesources/slox/kabcresourcesloxconfig.cpp
rename to tderesources/slox/tdeabcresourcesloxconfig.cpp
index 72ba39d0..919d156a 100644
--- a/tderesources/slox/kabcresourcesloxconfig.cpp
+++ b/tderesources/slox/tdeabcresourcesloxconfig.cpp
@@ -18,10 +18,10 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include "kabcresourcesloxconfig.h"
+#include "tdeabcresourcesloxconfig.h"
 
-#include "kabcresourceslox.h"
-#include "kabcsloxprefs.h"
+#include "tdeabcresourceslox.h"
+#include "tdeabcsloxprefs.h"
 #include "sloxbase.h"
 #include "sloxfolder.h"
 #include "sloxfolderdialog.h"
@@ -118,4 +118,4 @@ void KABC::ResourceSloxConfig::selectAddressFolder( )
     mFolderId = dialog->selectedFolder();
 }
 
-#include "kabcresourcesloxconfig.moc"
+#include "tdeabcresourcesloxconfig.moc"
diff --git a/tderesources/slox/kabcresourcesloxconfig.h b/tderesources/slox/tdeabcresourcesloxconfig.h
similarity index 100%
rename from tderesources/slox/kabcresourcesloxconfig.h
rename to tderesources/slox/tdeabcresourcesloxconfig.h
diff --git a/tderesources/slox/kabcsloxprefs.kcfgc b/tderesources/slox/tdeabcsloxprefs.kcfgc
similarity index 100%
rename from tderesources/slox/kabcsloxprefs.kcfgc
rename to tderesources/slox/tdeabcsloxprefs.kcfgc
diff --git a/tderesources/slox/webdavhandler.cpp b/tderesources/slox/webdavhandler.cpp
index 65caebf2..f3f33d61 100644
--- a/tderesources/slox/webdavhandler.cpp
+++ b/tderesources/slox/webdavhandler.cpp
@@ -291,5 +291,5 @@ void WebdavHandler::setSloxAttributes( KCal::Incidence *i )
 
 void WebdavHandler::setSloxAttributes( KABC::Addressee & )
 {
-  // FIXME: libkabc doesn't allow to set an individual addressee to read-only
+  // FIXME: libtdeabc doesn't allow to set an individual addressee to read-only
 }