diff --git a/acinclude.m4 b/acinclude.m4
index 74860ed..089a838 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2261,8 +2261,8 @@ if test $kde_qtver = 4; then
                *) lib_kded="" ;;
        esac
    AC_SUBST(LIB_KDED, $lib_kded)
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2271,9 +2271,9 @@ if test $kde_qtver = 4; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
    AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-ltdepim")
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
    AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
    AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@@ -2287,8 +2287,8 @@ elif test $kde_qtver = 3; then
                *) lib_kded="" ;;
        esac
    AC_SUBST(LIB_KDED, $lib_kded)
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2297,9 +2297,9 @@ elif test $kde_qtver = 3; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
    AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-ltdepim")
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
    AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
    AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@@ -2308,8 +2308,8 @@ elif test $kde_qtver = 3; then
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-lksycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2318,13 +2318,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
 
diff --git a/aclocal.m4 b/aclocal.m4
index 28ce05c..66687fb 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2080,8 +2080,8 @@ if test $kde_qtver = 3; then
                *) lib_kded="" ;;
        esac
    AC_SUBST(LIB_KDED, $lib_kded)
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2090,9 +2090,9 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
    AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-ltdepim")
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
    AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
    AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@@ -2101,8 +2101,8 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-lksycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2111,13 +2111,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
 
diff --git a/adept/batch/Makefile.am b/adept/batch/Makefile.am
index a2535cc..8f69721 100644
--- a/adept/batch/Makefile.am
+++ b/adept/batch/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = adept_batch
 noinst_HEADERS = app.h
 adept_batch_SOURCES = main.cpp app.cpp
-adept_batch_LDADD = ../adept/libadept.la -lapt-front -ltagcoll2 $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI)
+adept_batch_LDADD = ../adept/libadept.la -lapt-front -ltagcoll2 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI)
 adept_batch_LDFLAGS = -L/usr/lib/debug
 INCLUDES = $(all_includes) $(TAGCOLL2_CFLAGS) $(LIBAPT_FRONT_CFLAGS) -I$(srcdir)/.. -I..
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) -DQT_NO_ASCII_CAST -DQT_NO_CAST_ASCII
diff --git a/adept/installer/Makefile.am b/adept/installer/Makefile.am
index 5b25c1d..fcd9db6 100644
--- a/adept/installer/Makefile.am
+++ b/adept/installer/Makefile.am
@@ -2,7 +2,7 @@
 bin_PROGRAMS = adept_installer
 noinst_HEADERS = app.h
 adept_installer_SOURCES = main.cpp app.cpp
-adept_installer_LDADD = ../adept/libadept.la -lapt-front $(LIBTAGCOLL2_LIBS) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI)
+adept_installer_LDADD = ../adept/libadept.la -lapt-front $(LIBTAGCOLL2_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI)
 adept_installer_LDFLAGS = -L/usr/lib/debug
 INCLUDES = $(all_includes) $(LIBEPT_CFLAGS) $(LIBTAGCOLL2_CFLAGS) $(LIBAPT_FRONT_CFLAGS) $(LIBWIBBLE_CFLAGS)  -I$(srcdir)/.. -I.. $(TAGCOLL2_CFLAGS)
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) -DQT_NO_ASCII_CAST -DQT_NO_CAST_ASCII \
diff --git a/adept/manager/Makefile.am b/adept/manager/Makefile.am
index cc5c23f..c32e0c1 100644
--- a/adept/manager/Makefile.am
+++ b/adept/manager/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = adept_manager
 noinst_HEADERS = app.h
 adept_manager_SOURCES = main.cpp app.cpp
-adept_manager_LDADD = ../adept/libadept.la -lapt-front $(LIBEPT_LIBS) $(TAGCOLL2_LIBS) $(LIBWIBBLE_LIBS) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI)
+adept_manager_LDADD = ../adept/libadept.la -lapt-front $(LIBEPT_LIBS) $(TAGCOLL2_LIBS) $(LIBWIBBLE_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI)
 adept_manager_LDFLAGS = -L/usr/lib/debug
 INCLUDES = $(all_includes) $(LIBAPT_FRONT_CFLAGS) $(LIBEPT_CFLAGS) $(TAGCOLL2_CFLAGS) $(LIBWIBBLE_CFLAGS) -I$(srcdir)/.. -I..
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) -DQT_NO_ASCII_CAST -DQT_NO_CAST_ASCII
diff --git a/adept/notifier/Makefile.am b/adept/notifier/Makefile.am
index 44651bb..54a5005 100644
--- a/adept/notifier/Makefile.am
+++ b/adept/notifier/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = adept_notifier
 noinst_HEADERS = app.h
 
 adept_notifier_SOURCES = app.cpp
-adept_notifier_LDADD = ../adept/libadept.la $(LIBAPT_FRONT_LIBS) $(LIBEPT_LIBS) $(TAGCOLL2_LIBS) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI)
+adept_notifier_LDADD = ../adept/libadept.la $(LIBAPT_FRONT_LIBS) $(LIBEPT_LIBS) $(TAGCOLL2_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI)
 adept_notifier_LDFLAGS = -L/usr/lib/debug
 
 INCLUDES = $(all_includes) $(LIBAPT_FRONT_CFLAGS) $(LIBEPT_CFLAGS) $(TAGCOLL2_CFLAGS) $(LIBWIBBLE_CFLAGS) -I$(srcdir)/.. -I..
diff --git a/adept/updater/Makefile.am b/adept/updater/Makefile.am
index d25e21b..3e924db 100644
--- a/adept/updater/Makefile.am
+++ b/adept/updater/Makefile.am
@@ -2,7 +2,7 @@
 bin_PROGRAMS = adept_updater
 noinst_HEADERS = app.h
 adept_updater_SOURCES = main.cpp app.cpp
-adept_updater_LDADD = ../adept/libadept.la $(LIBAPT_FRONT_LIBS) $(LIBEPT_LIBS) $(TAGCOLL2_LIBS) $(LIBWIBBLE_LIBS) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI)
+adept_updater_LDADD = ../adept/libadept.la $(LIBAPT_FRONT_LIBS) $(LIBEPT_LIBS) $(TAGCOLL2_LIBS) $(LIBWIBBLE_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI)
 adept_updater_LDFLAGS = -L/usr/lib/debug
 INCLUDES = $(all_includes) $(LIBAPT_FRONT_CFLAGS) $(LIBEPT_CFLAGS) $(TAGCOLL2_CFLAGS) $(LIBWIBBLE_CFLAGS) -I$(srcdir)/.. -I..
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) -DQT_NO_ASCII_CAST -DQT_NO_CAST_ASCII