21 files changed, 6 insertions, 6 deletions
diff --git a/tderesources/kolab/CMakeLists.txt b/tderesources/kolab/CMakeLists.txt
index d8d194432..9fb08e18c 100644
--- a/tderesources/kolab/CMakeLists.txt
+++ b/tderesources/kolab/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_subdirectory( shared )
-add_subdirectory( kabc )
+add_subdirectory( tdeabc )
 add_subdirectory( knotes )
 add_subdirectory( kcal )
 
diff --git a/tderesources/kolab/Makefile.am b/tderesources/kolab/Makefile.am
index 3b8838433..a208ed949 100644
--- a/tderesources/kolab/Makefile.am
+++ b/tderesources/kolab/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = shared kabc knotes kcal
+SUBDIRS = shared tdeabc knotes kcal
 
 updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kolab-resource.upd
diff --git a/tderesources/kolab/kabc/CMakeLists.txt b/tderesources/kolab/tdeabc/CMakeLists.txt
index f3a5596e6..f3a5596e6 100644
--- a/tderesources/kolab/kabc/CMakeLists.txt
+++ b/tderesources/kolab/tdeabc/CMakeLists.txt
diff --git a/tderesources/kolab/kabc/Makefile.am b/tderesources/kolab/tdeabc/Makefile.am
index 7b552e903..7b552e903 100644
--- a/tderesources/kolab/kabc/Makefile.am
+++ b/tderesources/kolab/tdeabc/Makefile.am
diff --git a/tderesources/kolab/kabc/contact.cpp b/tderesources/kolab/tdeabc/contact.cpp
index fec56ec6f..fec56ec6f 100644
--- a/tderesources/kolab/kabc/contact.cpp
+++ b/tderesources/kolab/tdeabc/contact.cpp
diff --git a/tderesources/kolab/kabc/contact.h b/tderesources/kolab/tdeabc/contact.h
index 6e0de80bc..6e0de80bc 100644
--- a/tderesources/kolab/kabc/contact.h
+++ b/tderesources/kolab/tdeabc/contact.h
diff --git a/tderesources/kolab/kabc/kolab.desktop b/tderesources/kolab/tdeabc/kolab.desktop
index 6250176f4..6250176f4 100644
--- a/tderesources/kolab/kabc/kolab.desktop
+++ b/tderesources/kolab/tdeabc/kolab.desktop
diff --git a/tderesources/kolab/kabc/resourcekolab.cpp b/tderesources/kolab/tdeabc/resourcekolab.cpp
index 226d7da89..226d7da89 100644
--- a/tderesources/kolab/kabc/resourcekolab.cpp
+++ b/tderesources/kolab/tdeabc/resourcekolab.cpp
diff --git a/tderesources/kolab/kabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h
index 3a142b209..3a142b209 100644
--- a/tderesources/kolab/kabc/resourcekolab.h
+++ b/tderesources/kolab/tdeabc/resourcekolab.h
diff --git a/tderesources/kolab/kabc/resourcekolab_plugin.cpp b/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp
index 686f3403e..686f3403e 100644
--- a/tderesources/kolab/kabc/resourcekolab_plugin.cpp
+++ b/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp
diff --git a/tderesources/scalix/CMakeLists.txt b/tderesources/scalix/CMakeLists.txt
index 0be4fd954..9b5ce002b 100644
--- a/tderesources/scalix/CMakeLists.txt
+++ b/tderesources/scalix/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_subdirectory( shared )
-add_subdirectory( kabc )
+add_subdirectory( tdeabc )
 add_subdirectory( kcal )
 add_subdirectory( tdeioslave )
 add_subdirectory( knotes )
diff --git a/tderesources/scalix/Makefile.am b/tderesources/scalix/Makefile.am
index 6ba71e205..f779f1ded 100644
--- a/tderesources/scalix/Makefile.am
+++ b/tderesources/scalix/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = shared kabc kcal tdeioslave knotes scalixadmin
+SUBDIRS = shared tdeabc kcal tdeioslave knotes scalixadmin
 
 messages: rc.cpp
 	$(XGETTEXT) shared/*.cpp tdeabc/*.cpp kcal/*.cpp knotes/*.cpp -o $(podir)/kres_scalix.pot
diff --git a/tderesources/scalix/kabc/CMakeLists.txt b/tderesources/scalix/tdeabc/CMakeLists.txt
index bfdaa3478..bfdaa3478 100644
--- a/tderesources/scalix/kabc/CMakeLists.txt
+++ b/tderesources/scalix/tdeabc/CMakeLists.txt
diff --git a/tderesources/scalix/kabc/Makefile.am b/tderesources/scalix/tdeabc/Makefile.am
index e8bbc3bbc..e8bbc3bbc 100644
--- a/tderesources/scalix/kabc/Makefile.am
+++ b/tderesources/scalix/tdeabc/Makefile.am
diff --git a/tderesources/scalix/kabc/contact.cpp b/tderesources/scalix/tdeabc/contact.cpp
index 457a34e77..457a34e77 100644
--- a/tderesources/scalix/kabc/contact.cpp
+++ b/tderesources/scalix/tdeabc/contact.cpp
diff --git a/tderesources/scalix/kabc/contact.h b/tderesources/scalix/tdeabc/contact.h
index 33ea1a9cb..33ea1a9cb 100644
--- a/tderesources/scalix/kabc/contact.h
+++ b/tderesources/scalix/tdeabc/contact.h
diff --git a/tderesources/scalix/kabc/resourcescalix.cpp b/tderesources/scalix/tdeabc/resourcescalix.cpp
index ea3928a59..ea3928a59 100644
--- a/tderesources/scalix/kabc/resourcescalix.cpp
+++ b/tderesources/scalix/tdeabc/resourcescalix.cpp
diff --git a/tderesources/scalix/kabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h
index dbb0b93c6..dbb0b93c6 100644
--- a/tderesources/scalix/kabc/resourcescalix.h
+++ b/tderesources/scalix/tdeabc/resourcescalix.h
diff --git a/tderesources/scalix/kabc/resourcescalix_plugin.cpp b/tderesources/scalix/tdeabc/resourcescalix_plugin.cpp
index cdfc8f301..cdfc8f301 100644
--- a/tderesources/scalix/kabc/resourcescalix_plugin.cpp
+++ b/tderesources/scalix/tdeabc/resourcescalix_plugin.cpp
diff --git a/tderesources/scalix/kabc/scalix.desktop b/tderesources/scalix/tdeabc/scalix.desktop
index cc2a8c464..cc2a8c464 100644
--- a/tderesources/scalix/kabc/scalix.desktop
+++ b/tderesources/scalix/tdeabc/scalix.desktop
diff --git a/wizards/CMakeLists.txt b/wizards/CMakeLists.txt
index 418d13b1c..a82b735fb 100644
--- a/wizards/CMakeLists.txt
+++ b/wizards/CMakeLists.txt
@@ -110,8 +110,8 @@ if( WITH_SLOX )
 
   install( FILES slox.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
-  process_kcfg( sloxwizard.cpp kabcsloxprefs.h tderesources/slox
-    tderesources_tdeabc_slox.kcfg kabcsloxprefs.kcfgc )
+  process_kcfg( sloxwizard.cpp tdeabcsloxprefs.h tderesources/slox
+    tderesources_tdeabc_slox.kcfg tdeabcsloxprefs.kcfgc )
 
   process_kcfg( sloxwizard.cpp kcalsloxprefs.h tderesources/slox
     tderesources_kcal_slox.kcfg kcalsloxprefs.kcfgc )