From 1e81063308485e2f5f6375a410a41cb310ef7bbd Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 5 Nov 2011 21:46:23 -0500
Subject: [PATCH] Rename kde libraries to tde

---
 KDE2PORTING.html                              | 10 +++---
 TODO                                          |  2 +-
 arts/message/Makefile.am                      |  2 +-
 configure.in.in                               |  8 ++---
 dcop/Makefile.am                              |  2 +-
 dnssd/Makefile.am                             |  2 +-
 kab/Makefile.am                               |  2 +-
 kabc/plugins/evolution/Makefile.am            |  2 +-
 kabc/plugins/sql/Makefile.am                  |  2 +-
 kdecore/CMakeLists.txt                        |  4 +--
 kdecore/Makefile.am                           | 36 +++++++++----------
 .../example/exampleprefs_base.kcfgc           |  2 +-
 kdecore/kconfig_compiler/tests/test1.kcfgc    |  2 +-
 kdecore/kconfig_compiler/tests/test9.kcfgc    |  2 +-
 kdecore/kdebug.areas                          |  8 ++---
 kdecore/ksock.h                               |  6 ++--
 kdecore/kstandarddirs.h                       | 12 +++----
 kdecore/malloc/README                         |  2 +-
 kdecore/network/Makefile.am                   |  4 +--
 kdecore/tests/Makefile.am                     |  2 +-
 kdefx/CMakeLists.txt                          |  2 +-
 kdefx/Makefile.am                             | 12 +++----
 kdeprint/Makefile.am                          | 14 ++++----
 kdeprint/cups/Makefile.am                     |  6 ++--
 kdeprint/foomatic/Makefile.am                 |  2 +-
 kdeprint/kmmanager.cpp                        |  4 +--
 kdeprint/kxmlcommand.cpp                      |  2 +-
 kdeprint/lpd/Makefile.am                      |  4 +--
 kdeprint/lpr/Makefile.am                      |  4 +--
 kdeprint/management/CMakeLists.txt            |  4 +--
 kdeprint/management/Makefile.am               | 18 +++++-----
 kdeprint/rlpr/Makefile.am                     |  2 +-
 kdeprint/tests/Makefile.am                    |  4 +--
 kdesu/CMakeLists.txt                          |  2 +-
 kdesu/Mainpage.dox                            |  2 +-
 kdesu/Makefile.am                             | 14 ++++----
 kdesu/README                                  |  4 +--
 kdeui/CMakeLists.txt                          |  2 +-
 kdeui/Mainpage.dox                            |  2 +-
 kdeui/Makefile.am                             | 14 ++++----
 kdeui/kdepackages.h                           |  6 ++--
 kdeui/kpixmapregionselectorwidget.cpp         |  2 +-
 kdeui/kpixmapregionselectorwidget.h           |  2 +-
 kdeui/tests/Makefile.am                       |  2 +-
 kdewidgets/Makefile.am                        |  2 +-
 khtml/Makefile.am                             |  2 +-
 kimgio/Makefile.am                            |  2 +-
 kinit/Makefile.am                             |  2 +-
 kinit/README                                  |  4 +--
 kio/DESIGN                                    |  4 +--
 kio/Makefile.am                               |  2 +-
 kio/kio/Makefile.am                           |  2 +-
 kio/misc/kdesasl/Makefile.am                  |  8 ++---
 kioslave/http/kcookiejar/Makefile.am          |  2 +-
 krandr/Makefile.am                            |  2 +-
 kstyles/highcolor/Makefile.am                 |  2 +-
 kstyles/highcontrast/Makefile.am              |  2 +-
 kstyles/keramik/Makefile.am                   |  4 +--
 kstyles/kthemestyle/Makefile.am               |  2 +-
 kstyles/light/Makefile.am                     |  2 +-
 kstyles/plastik/Makefile.am                   |  2 +-
 kwallet/backend/Makefile.am                   |  2 +-
 libkmid/Makefile.am                           |  2 +-
 63 files changed, 146 insertions(+), 146 deletions(-)

diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index 0cd2e8a80..111d2c45f 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -56,7 +56,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
 <LI><A HREF="#KDockWidget">KDockWidget</A></LI>
 <LI><A HREF="#KPixmap">KPixmap, KPixmapEffect</A></LI>
 <LI><A HREF="#KControlCenter">KDE Control Center</A></LI>
-<LI><A HREF="#KWMModuleApplication">KWMModuleApplication libkdeui/kwmmapp.h</A></LI>
+<LI><A HREF="#KWMModuleApplication">KWMModuleApplication libtdeui/kwmmapp.h</A></LI>
 <LI><A HREF="#KDebug">KDebug</A></LI>
 <LI><A HREF="#KFileDialog">KFileDialog - General Stuff</A></LI>
 <LI><A HREF="#KFileDialogPreview">KFileDialog - Preview Mode</A></LI>
@@ -678,7 +678,7 @@ Gradients. See kdelibs/kdetest/kgradienttest &amp; kunbalancedgradienttest for
 information on how they actually look.<P>
 
 Look further in this document for other info about pixmap effect code 
-reorganization (essentially, all effects are now in libkdeui.so: gradient(), 
+reorganization (essentially, all effects are now in libtdeui.so: gradient(), 
 unbalancedGradient(), hash(), desaturate(), pattern(), fade(), blend() etc.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -763,7 +763,7 @@ See <A HREF="KTMainWindow">KTMainWindow</A> for more details.
 
 KPixmap::gradientFill, KPixmap::patternFill, KPixmap::tile and
 KPixmap::mapFill have been moved to KPixmapEffect, which is now part
-of libkdeui.<P>
+of libtdeui.<P>
 
 KPixmap::tile() has been renamed to KPixmapEffects::createTile().<P>
 
@@ -787,10 +787,10 @@ Matthias Hoelzer-Kluepfel &lt;<A HREF="mailto:hoelzer@kde.org">hoelzer@kde.org</
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
 
-<H3><A NAME="KWMModuleApplication">KWMModuleApplication libkdeui/kwmmapp.h</A></H3>
+<H3><A NAME="KWMModuleApplication">KWMModuleApplication libtdeui/kwmmapp.h</A></H3>
 
 The KWMModuleApplication has been removed. Instead, use the class
-KWinModule in libkdecore. The API is a bit cleaner but very similar,
+KWinModule in libtdecore. The API is a bit cleaner but very similar,
 so you will feel comfortable immediately. One of the advantages of
 KWinModule is that it doesn't require a special KApplication
 subclass. This lead to many problems and misunderstandings in the
diff --git a/TODO b/TODO
index 2adb8eee1..3d3087051 100644
--- a/TODO
+++ b/TODO
@@ -182,7 +182,7 @@ that we would like to make for the next binary incompatible release.
 
 - Make libkwalletclient part of libkio and get rid of libkwalletclient.
 
-- Get rid of libkdesu dependency in libkio, get rid of SessionData::AuthData*,
+- Get rid of libtdesu dependency in libkio, get rid of SessionData::AuthData*,
   get rid of SlaveInterface::authorizationKey and SlaveInterface::delAuthorization
 
 - Make functions in KHelpMenu virtual so they can be overridden (ex: to provide
diff --git a/arts/message/Makefile.am b/arts/message/Makefile.am
index be67e4bd8..19dbe8f2f 100644
--- a/arts/message/Makefile.am
+++ b/arts/message/Makefile.am
@@ -4,5 +4,5 @@ bin_PROGRAMS = artsmessage
 
 artsmessage_SOURCES = artsmessage.cc
 
-artsmessage_LDADD = ../../kdeui/libkdeui.la
+artsmessage_LDADD = ../../kdeui/libtdeui.la
 artsmessage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_MT_LDFLAGS)
diff --git a/configure.in.in b/configure.in.in
index 6548b353e..658ca039e 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -250,19 +250,19 @@ AC_SUBST(LIBICE)
 
 AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la')
 AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la')
-AC_SUBST(LIB_KDECORE, '$(top_builddir)/kdecore/libkdecore.la')
-AC_SUBST(LIB_KDEUI, '$(top_builddir)/kdeui/libkdeui.la')
+AC_SUBST(LIB_KDECORE, '$(top_builddir)/kdecore/libtdecore.la')
+AC_SUBST(LIB_KDEUI, '$(top_builddir)/kdeui/libtdeui.la')
 AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la')
 AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la')
 AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la')
 AC_SUBST(LIB_KHTML, '$(top_builddir)/khtml/libkhtml.la')
-AC_SUBST(LIB_KDEPRINT, '$(top_builddir)/kdeprint/libkdeprint.la')
+AC_SUBST(LIB_KDEPRINT, '$(top_builddir)/kdeprint/libtdeprint.la')
 AC_SUBST(LIB_KPARTS, '$(top_builddir)/kparts/libkparts.la')
 AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la')
 AC_SUBST(LIB_KNEWSTUFF, '$(top_builddir)/knewstuff/libknewstuff.la')
 AC_SUBST(LIB_KUNITTEST, '$(top_builddir)/kunittest/libkunittest.la')
 case $host in 
-	*cygwin*) lib_kded='$(top_builddir)/kded/libkdeinit_kded.la' ;;
+	*cygwin*) lib_kded='$(top_builddir)/kded/libtdeinit_kded.la' ;;
 	*) lib_kded='' ;;
 esac
 AC_SUBST(LIB_KDED, $lib_kded)
diff --git a/dcop/Makefile.am b/dcop/Makefile.am
index f6ef2a47f..ced19c79e 100644
--- a/dcop/Makefile.am
+++ b/dcop/Makefile.am
@@ -56,7 +56,7 @@ testdcop_LDADD = libDCOP.la
 
 dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp
-dcop_deadlock_test_LDADD = ../kdecore/libkdecore.la
+dcop_deadlock_test_LDADD = ../kdecore/libtdecore.la
 
 testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 testdcopc_SOURCES = testdcopc.c dcopc.c
diff --git a/dnssd/Makefile.am b/dnssd/Makefile.am
index 268e72a5d..37df3485c 100644
--- a/dnssd/Makefile.am
+++ b/dnssd/Makefile.am
@@ -14,7 +14,7 @@ libkdnssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \
 dnssdincludedir = $(includedir)/dnssd
 dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
 	publicservice.h servicebase.h servicebrowser.h settings.h
-libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(AVAHI_LIBS) $(LIB_QT)
+libkdnssd_la_LIBADD = ../kdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
 libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
 
 #kde_kcfg_DATA = kcm_kdnssd.kcfg
diff --git a/kab/Makefile.am b/kab/Makefile.am
index 301c5d952..e29e87b9c 100644
--- a/kab/Makefile.am
+++ b/kab/Makefile.am
@@ -10,6 +10,6 @@ libkab_la_SOURCES	= \
 	qconfigDB.cc 
 
 libkab_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
-libkab_la_LIBADD = ../kdeui/libkdeui.la
+libkab_la_LIBADD = ../kdeui/libtdeui.la
 
 libkab_la_METASOURCES = AUTO
diff --git a/kabc/plugins/evolution/Makefile.am b/kabc/plugins/evolution/Makefile.am
index ea3f950f7..0ffc7e18d 100644
--- a/kabc/plugins/evolution/Makefile.am
+++ b/kabc/plugins/evolution/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_evo.la
 kabc_evo_la_SOURCES = dbwrapper.cpp resourceevo.cpp
 
 kabc_evo_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN)
-kabc_evo_la_LIBADD	= ../../../kabc/libkabc.la ../../../kdeui/libkdeui.la -ldb ../../../kabc/vcardparser/libvcards.la
+kabc_evo_la_LIBADD	= ../../../kabc/libkabc.la ../../../kdeui/libtdeui.la -ldb ../../../kabc/vcardparser/libvcards.la
 
 METASOURCES = AUTO
 
diff --git a/kabc/plugins/sql/Makefile.am b/kabc/plugins/sql/Makefile.am
index 93c86f061..810938683 100644
--- a/kabc/plugins/sql/Makefile.am
+++ b/kabc/plugins/sql/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_sql.la
 kabc_sql_la_SOURCES = resourcesql.cpp resourcesqlconfig.cpp
 
 kabc_sql_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN)
-kabc_sql_la_LIBADD	= ../../libkabc.la ../../../kdeui/libkdeui.la
+kabc_sql_la_LIBADD	= ../../libkabc.la ../../../kdeui/libtdeui.la
 
 METASOURCES = AUTO
 
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index efe2c8f3c..2cad31cb0 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -88,7 +88,7 @@ install( FILES eventsrc
   DESTINATION ${DATA_INSTALL_DIR}/knotify )
 
 
-##### libkdecore ################################
+##### libtdecore ################################
 
 set( target kdecore )
 
@@ -162,7 +162,7 @@ tde_add_library( ${target} STATIC_PIC
 )
 
 
-##### libkdefakes ###############################
+##### libtdefakes ###############################
 
 set( target kdefakes )
 
diff --git a/kdecore/Makefile.am b/kdecore/Makefile.am
index b5a9c5a80..32ccec1ca 100644
--- a/kdecore/Makefile.am
+++ b/kdecore/Makefile.am
@@ -33,8 +33,8 @@ SUBDIRS = malloc network $(SVGICONS) . kconfig_compiler tests
 # into $(all_libraries) isn't better
 AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
 
-lib_LTLIBRARIES = libkdefakes.la libkdecore.la
-lib_LIBRARIES = libkdefakes_nonpic.a libkdefakes_pic.a
+lib_LTLIBRARIES = libtdefakes.la libtdecore.la
+lib_LIBRARIES = libtdefakes_nonpic.a libtdefakes_pic.a
 
 include_HEADERS = kconfig.h kconfigskeleton.h \
 	kconfigdata.h ksimpleconfig.h kconfigdialogmanager.h \
@@ -61,11 +61,11 @@ include_HEADERS = kconfig.h kconfigskeleton.h \
 	kidna.h ktempdir.h kshell.h fixx11h.h kxerrorhandler.h kdelibs_export.h \
 	kdemacros.h kde_file.h ktimezones.h
 
-libkdefakes_la_SOURCES = fakes.c vsnprintf.c
-libkdefakes_la_LDFLAGS = -version-info 6:0:2
-libkdefakes_la_LIBADD  = $(LIBSOCKET)
+libtdefakes_la_SOURCES = fakes.c vsnprintf.c
+libtdefakes_la_LDFLAGS = -version-info 6:0:2
+libtdefakes_la_LIBADD  = $(LIBSOCKET)
 
-libkdefakes_nonpic_a_SOURCES = fakes_nonpic.c vsnprintf_nonpic.c
+libtdefakes_nonpic_a_SOURCES = fakes_nonpic.c vsnprintf_nonpic.c
 
 fakes_nonpic.c:$(srcdir)/fakes.c
 	-rm -f fakes_nonpic.c
@@ -75,11 +75,11 @@ vsnprintf_nonpic.c:  $(srcdir)/vsnprintf.c
 	-rm -f vsnprintf_nonpic.c
 	$(LN_S) $(srcdir)/vsnprintf.c vsnprintf_nonpic.c
 
-libkdefakes_pic.a: libkdefakes.la
-	-rm -f libkdefakes_pic.a fakes_pic.o vsnprintf_pic.o
+libtdefakes_pic.a: libtdefakes.la
+	-rm -f libtdefakes_pic.a fakes_pic.o vsnprintf_pic.o
 	cp -f .libs/fakes.o fakes_pic.o; cp -f .libs/vsnprintf.o vsnprintf_pic.o
-	ar cru libkdefakes_pic.a fakes_pic.o vsnprintf_pic.o
-	ranlib libkdefakes_pic.a
+	ar cru libtdefakes_pic.a fakes_pic.o vsnprintf_pic.o
+	ranlib libtdefakes_pic.a
 
 noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \
 	kcompletion_private.h netwm_p.h \
@@ -89,7 +89,7 @@ noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \
 	kcalendarsystemhijri.h kcalendarsystemhebrew.h kcalendarsystemjalali.h \
 	kprotocolinfofactory.h kqiodevicegzip_p.h kiconloader_p.h
 
-libkdecore_la_SOURCES = libintl.cpp kapplication.cpp \
+libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
 	kdebug.cpp netwm.cpp kconfigbase.cpp kconfig.cpp  ksimpleconfig.cpp \
 	kconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \
 	kstandarddirs.cpp ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp \
@@ -121,14 +121,14 @@ libkdecore_la_SOURCES = libintl.cpp kapplication.cpp \
 	kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
 	kqiodevicegzip_p.cpp ktimezones.cpp
 
-libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
-libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la \
-	$(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/kdefx/libkdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL)
-libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
-libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
+libtdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
+libtdecore_la_LIBADD = malloc/libklmalloc.la network/libtdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la \
+	$(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/kdefx/libtdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL)
+libtdecore_la_NMCHECK = $(srcdir)/libtdecore.nmcheck
+libtdecore_la_NMCHECKWEAK = $(srcdir)/libtdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
 	$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck
 
-libkdecore_la_METASOURCES = AUTO
+libtdecore_la_METASOURCES = AUTO
 
 SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/kdecore
 
@@ -171,7 +171,7 @@ parser: kentities.gperf
 bin_PROGRAMS = kde-config kgrantpty
 
 kde_config_SOURCES = kde-config.cpp
-kde_config_LDADD = ./libkdecore.la
+kde_config_LDADD = ./libtdecore.la
 kde_config_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS)
 
 kgrantpty_SOURCES = kgrantpty.c
diff --git a/kdecore/kconfig_compiler/example/exampleprefs_base.kcfgc b/kdecore/kconfig_compiler/example/exampleprefs_base.kcfgc
index 957ed9123..829ec2e29 100644
--- a/kdecore/kconfig_compiler/example/exampleprefs_base.kcfgc
+++ b/kdecore/kconfig_compiler/example/exampleprefs_base.kcfgc
@@ -5,7 +5,7 @@ ClassName=ExamplePrefsBase
 #
 # Inherits=KConfigSkeleton
 #
-# IncludeFiles=libkdepim/kpimprefs.h
+# IncludeFiles=libtdepim/kpimprefs.h
 #
 # MemberVariables=public
 #
diff --git a/kdecore/kconfig_compiler/tests/test1.kcfgc b/kdecore/kconfig_compiler/tests/test1.kcfgc
index 6e0edd366..3b74d7c51 100644
--- a/kdecore/kconfig_compiler/tests/test1.kcfgc
+++ b/kdecore/kconfig_compiler/tests/test1.kcfgc
@@ -5,7 +5,7 @@ ClassName=Test1
 #
 # Inherits=KConfigSkeleton
 #
-# IncludeFiles=libkdepim/kpimprefs.h
+# IncludeFiles=libtdepim/kpimprefs.h
 #
 # MemberVariables=public
 #
diff --git a/kdecore/kconfig_compiler/tests/test9.kcfgc b/kdecore/kconfig_compiler/tests/test9.kcfgc
index d44233380..8f124fc25 100644
--- a/kdecore/kconfig_compiler/tests/test9.kcfgc
+++ b/kdecore/kconfig_compiler/tests/test9.kcfgc
@@ -5,7 +5,7 @@ ClassName=Test9
 #
 # Inherits=KConfigSkeleton
 #
-# IncludeFiles=libkdepim/kpimprefs.h
+# IncludeFiles=libtdepim/kpimprefs.h
 #
 MemberVariables=public
 #
diff --git a/kdecore/kdebug.areas b/kdecore/kdebug.areas
index d1dc1ffa1..e4c526be1 100644
--- a/kdecore/kdebug.areas
+++ b/kdecore/kdebug.areas
@@ -172,7 +172,7 @@
 5230	    kitchensync SyncEntry
 5231	    kitchensync SyncUI
 5250        kitchensync (Syncing Algorithm)
-5300        libkdepim
+5300        libtdepim
 5310        kprefs
 5400        calendarsystem
 5500        knotes
@@ -346,9 +346,9 @@
 # toys and games
 10000        amor
 10500        KBackgammon
-11000        libkdegames
-11001        libkdegames (KGame)
-11002        libkdegames (Highscores)
+11000        libtdegames
+11001        libtdegames (KGame)
+11002        libtdegames (Highscores)
 11111        kpat
 12000        KPoker
 12001        KPoker (Server)
diff --git a/kdecore/ksock.h b/kdecore/ksock.h
index 67de00dc3..5c3eced8a 100644
--- a/kdecore/ksock.h
+++ b/kdecore/ksock.h
@@ -146,7 +146,7 @@ public:
     void enableWrite( bool enable );
 
 #ifdef KSOCK_NO_BROKEN
-    // BCI: remove in libkdecore.so.4
+    // BCI: remove in libtdecore.so.4
     /**
      * Return address.
      * This function is dumb. Don't ever use it
@@ -156,7 +156,7 @@ public:
      */
     unsigned long ipv4_addr() KDE_DEPRECATED;
 
-    // BCI: remove in libkdecore.so.4
+    // BCI: remove in libtdecore.so.4
     /**
       *  A small wrapper around gethostbyname() and such.
       *  Don't use this in new programs. Use KExtendedSocket::lookup
@@ -300,7 +300,7 @@ public:
     unsigned short int port();
 
 #ifdef KSOCK_NO_BROKEN
-    // BCI: remove in libkdecore.so.4
+    // BCI: remove in libtdecore.so.4
     /**
      * The address.
      * This is dumb. Don't use it
diff --git a/kdecore/kstandarddirs.h b/kdecore/kstandarddirs.h
index 16bfd1847..3f1fd14c1 100644
--- a/kdecore/kstandarddirs.h
+++ b/kdecore/kstandarddirs.h
@@ -210,11 +210,11 @@ public:
 	 * @li All absolute paths (most recent first).
 	 *
 	 * The filename should be a filename relative to the base dir
-	 * for resources. So is a way to get the path to libkdecore.la
-	 * to findResource("lib", "libkdecore.la"). KStandardDirs will
+	 * for resources. So is a way to get the path to libtdecore.la
+	 * to findResource("lib", "libtdecore.la"). KStandardDirs will
 	 * then look into the subdir lib of all elements of all prefixes
-	 * ($KDEDIRS) for a file libkdecore.la and return the path to
-	 * the first one it finds (e.g. /opt/kde/lib/libkdecore.la)
+	 * ($KDEDIRS) for a file libtdecore.la and return the path to
+	 * the first one it finds (e.g. /opt/kde/lib/libtdecore.la)
 	 *
 	 * @param type The type of the wanted resource
 	 * @param filename A relative filename of the resource.
@@ -286,8 +286,8 @@ public:
 	 * that have been installed into the same directory without
 	 * having to look for each file.
 	 *
-	 * findResourceDir("lib", "libkdecore.la") would return the
-	 * path of the subdir libkdecore.la is found first in
+	 * findResourceDir("lib", "libtdecore.la") would return the
+	 * path of the subdir libtdecore.la is found first in
 	 * (e.g. /opt/kde/lib/)
 	 *
 	 * @param type The type of the wanted resource
diff --git a/kdecore/malloc/README b/kdecore/malloc/README
index 181c29764..6a24a39db 100644
--- a/kdecore/malloc/README
+++ b/kdecore/malloc/README
@@ -19,7 +19,7 @@ the system libc malloc is used, otherwise this malloc is used.
 
 
  If you have any problem with this malloc, try first using --enable-fast-malloc=debug and
-recompiling libkdecore, or use valgrind. This malloc seems to be more vulnerable to heap
+recompiling libtdecore, or use valgrind. This malloc seems to be more vulnerable to heap
 corruption, such as deleting a block twice, so faulty code may run without problems
 with standard malloc shipped with your libc, but it will crash with this malloc. In case
 you think there's any problem with this malloc, please mail me.
diff --git a/kdecore/network/Makefile.am b/kdecore/network/Makefile.am
index 71ed013d9..f686a50ca 100644
--- a/kdecore/network/Makefile.am
+++ b/kdecore/network/Makefile.am
@@ -2,7 +2,7 @@
 
 # this is the program that gets installed.  it's name is used for all
 # of the other Makefile.am variables
-noinst_LTLIBRARIES = libkdecorenetwork.la
+noinst_LTLIBRARIES = libtdecorenetwork.la
 
 # set the include path for X, qt and KDE
 INCLUDES = $(all_includes)
@@ -11,7 +11,7 @@ INCLUDES = $(all_includes)
 # convenience lib - no LDFLAGS or LIBADD !
 # Note:
 #  ksocketdevice.cpp must appear before any inclusion of ksocketdevice.h
-libkdecorenetwork_la_SOURCES = kresolver.cpp \
+libtdecorenetwork_la_SOURCES = kresolver.cpp \
 		kresolvermanager.cpp \
 		kresolverworkerbase.cpp \
 		ksocketaddress.cpp \
diff --git a/kdecore/tests/Makefile.am b/kdecore/tests/Makefile.am
index 3d05e1ac2..71e6faa92 100644
--- a/kdecore/tests/Makefile.am
+++ b/kdecore/tests/Makefile.am
@@ -37,7 +37,7 @@ noinst_HEADERS = klocaletest.h kprocesstest.h KIDLTest.h \
 
 METASOURCES = AUTO
 
-LDADD = ../libkdecore.la
+LDADD = ../libtdecore.la
 kconfigtestgui_SOURCES = kconfigtestgui.cpp
 kdebugtest_SOURCES = kdebugtest.cpp
 klocaletest_SOURCES = klocaletest.cpp
diff --git a/kdefx/CMakeLists.txt b/kdefx/CMakeLists.txt
index d63b87889..1c33bb8f6 100644
--- a/kdefx/CMakeLists.txt
+++ b/kdefx/CMakeLists.txt
@@ -31,7 +31,7 @@ install( FILES
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
-##### libkdefx ##################################
+##### libtdefx ##################################
 
 set( target kdefx )
 
diff --git a/kdefx/Makefile.am b/kdefx/Makefile.am
index 52744c9cf..5c88a6e7e 100644
--- a/kdefx/Makefile.am
+++ b/kdefx/Makefile.am
@@ -22,17 +22,17 @@
 
 INCLUDES= $(all_includes)
 
-lib_LTLIBRARIES = libkdefx.la
-libkdefx_la_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined -version-info 6:0:2
-libkdefx_la_LIBADD = $(LIB_QT) $(LIB_XRENDER) $(LIB_X11)
-libkdefx_la_NMCHECK = $(srcdir)/libkdefx.nmcheck
-libkdefx_la_NMCHECKWEAK = $(srcdir)/libkdefx_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck \
+lib_LTLIBRARIES = libtdefx.la
+libtdefx_la_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined -version-info 6:0:2
+libtdefx_la_LIBADD = $(LIB_QT) $(LIB_XRENDER) $(LIB_X11)
+libtdefx_la_NMCHECK = $(srcdir)/libtdefx.nmcheck
+libtdefx_la_NMCHECKWEAK = $(srcdir)/libtdefx_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck \
 	$(top_srcdir)/kdecore/standard_weak.nmcheck
 
 include_HEADERS = kpixmap.h kpixmapsplitter.h \
 	kpixmapeffect.h kimageeffect.h kdrawutil.h kstyle.h kcpuinfo.h
 
-libkdefx_la_SOURCES = kpixmap.cpp kpixmapsplitter.cpp \
+libtdefx_la_SOURCES = kpixmap.cpp kpixmapsplitter.cpp \
 		kpixmapeffect.cpp kimageeffect.cpp kdrawutil.cpp kstyle.cpp \
 		kcpuinfo.cpp
 
diff --git a/kdeprint/Makefile.am b/kdeprint/Makefile.am
index 06f3a583c..8b63447e1 100644
--- a/kdeprint/Makefile.am
+++ b/kdeprint/Makefile.am
@@ -11,13 +11,13 @@ INCLUDES= -I$(top_srcdir)/kdefx -I$(top_srcdir)/kded -I$(top_srcdir) $(all_inclu
 kde_module_LTLIBRARIES = kded_kdeprintd.la
 
 kded_kdeprintd_la_SOURCES = kdeprintd.skel kdeprintd.cpp kprintprocess.cpp
-kded_kdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(top_builddir)/kded/libkdeinit_kded.la
+kded_kdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(top_builddir)/kded/libtdeinit_kded.la
 kded_kdeprintd_la_LDFLAGS = $(all_libraries) -module -avoid-version
 #kded_kdeprintd_la_METASOURCES = AUTO
 
-lib_LTLIBRARIES = libkdeprint.la
+lib_LTLIBRARIES = libtdeprint.la
 
-libkdeprint_la_SOURCES = kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp kmprinter.cpp \
+libtdeprint_la_SOURCES = kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp kmprinter.cpp \
 		         kmuimanager.cpp kmvirtualmanager.cpp driver.cpp driveritem.cpp droptionview.cpp \
 			 driverview.cpp kmdbentry.cpp \
 		         kprintpreview.cpp kprintdialog.cpp kprinter.cpp kprinterimpl.cpp kprintdialogpage.cpp \
@@ -29,10 +29,10 @@ libkdeprint_la_SOURCES = kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp
 			 kpmarginpage.cpp messagewindow.cpp posterpreview.cpp kpposterpage.cpp foomatic2loader.cpp \
 			 fooparser.cpp fooscanner.cpp ppdparser.cpp ppdscanner.cpp ppdloader.cpp
 
-libkdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
-libkdeprint_la_LIBADD = $(LIBZ) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KFILE)
-libkdeprint_la_DEPENDENCIES =  $(LIB_KPARTS) 
-libkdeprint_la_METASOURCES = AUTO
+libtdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
+libtdeprint_la_LIBADD = $(LIBZ) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KFILE)
+libtdeprint_la_DEPENDENCIES =  $(LIB_KPARTS) 
+libtdeprint_la_METASOURCES = AUTO
 
 noinst_HEADERS = kmdbentry.h kmfactory.h \
 		 kmuimanager.h kmvirtualmanager.h driveritem.h droptionview.h \
diff --git a/kdeprint/cups/Makefile.am b/kdeprint/cups/Makefile.am
index 4e21a545e..ed45a175e 100644
--- a/kdeprint/cups/Makefile.am
+++ b/kdeprint/cups/Makefile.am
@@ -15,7 +15,7 @@ kdeprint_cups_la_SOURCES = cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp kmcups
 				  kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \
 				  kptagspage.cpp
 kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kdeprint_cups_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI)
+kdeprint_cups_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI)
 kdeprint_cups_la_METASOURCES = AUTO
 
 noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \
@@ -27,11 +27,11 @@ noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmc
 
 bin_PROGRAMS = make_driver_db_cups cupsdoprint
 make_driver_db_cups_SOURCES = make_driver_db_cups.c
-make_driver_db_cups_LDADD = ../libdriverparse.a $(top_builddir)/kdecore/libkdefakes.la $(LIBDL) $(LIBZ)
+make_driver_db_cups_LDADD = ../libdriverparse.a $(top_builddir)/kdecore/libtdefakes.la $(LIBDL) $(LIBZ)
 make_driver_db_cups_LDFLAGS = $(all_libraries)
 
 cupsdoprint_SOURCES = cupsdoprint.c
-cupsdoprint_LDADD = $(LIB_CUPS) $(top_builddir)/kdecore/libkdefakes.la
+cupsdoprint_LDADD = $(LIB_CUPS) $(top_builddir)/kdecore/libtdefakes.la
 cupsdoprint_LDFLAGS = $(all_libraries)
 
 entry_DATA = cups.print
diff --git a/kdeprint/foomatic/Makefile.am b/kdeprint/foomatic/Makefile.am
index 5d05859d3..a35882fbc 100644
--- a/kdeprint/foomatic/Makefile.am
+++ b/kdeprint/foomatic/Makefile.am
@@ -6,7 +6,7 @@ kdeprint_foomatic_la_SOURCES = kmfoomaticfactory.cpp \
 				  kmfoomaticmanager.cpp \
 				  kfoomaticprinterimpl.cpp
 kdeprint_foomatic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kdeprint_foomatic_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la
+kdeprint_foomatic_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la
 kdeprint_foomatic_la_METASOURCES = AUTO
 
 noinst_HEADERS = kmfoomaticmanager.h \
diff --git a/kdeprint/kmmanager.cpp b/kdeprint/kmmanager.cpp
index 53d988a49..4fdc70f7e 100644
--- a/kdeprint/kmmanager.cpp
+++ b/kdeprint/kmmanager.cpp
@@ -481,7 +481,7 @@ TQStringList KMManager::detectLocalPrinters()
 
 int KMManager::addPrinterWizard(TQWidget *parent)
 {
-	KLibrary	*lib = KLibLoader::self()->library("libkdeprint_management_module");
+	KLibrary	*lib = KLibLoader::self()->library("libtdeprint_management_module");
 	if (!lib)
 		setErrorMsg(i18n("Unable to load KDE print management library: %1").arg(KLibLoader::self()->lastErrorMessage()));
 	else
@@ -497,7 +497,7 @@ int KMManager::addPrinterWizard(TQWidget *parent)
 
 bool KMManager::invokeOptionsDialog(TQWidget *parent)
 {
-	KLibrary	*lib = KLibLoader::self()->library("libkdeprint_management_module");
+	KLibrary	*lib = KLibLoader::self()->library("libtdeprint_management_module");
 	if (!lib)
 		setErrorMsg(i18n("Unable to load KDE print management library: %1").arg(KLibLoader::self()->lastErrorMessage()));
 	else
diff --git a/kdeprint/kxmlcommand.cpp b/kdeprint/kxmlcommand.cpp
index 55a208d88..24c0e88df 100644
--- a/kdeprint/kxmlcommand.cpp
+++ b/kdeprint/kxmlcommand.cpp
@@ -655,7 +655,7 @@ TQStringList KXmlCommandManager::commandListWithDescription()
 
 TQString KXmlCommandManager::selectCommand(TQWidget *parent)
 {
-	KLibrary *lib = KLibLoader::self()->library( "libkdeprint_management_module" );
+	KLibrary *lib = KLibLoader::self()->library( "libtdeprint_management_module" );
 	if ( !lib )
 	{
 		KMessageBox::error( parent, i18n( "Unable to load KDE print management library: %1" ).arg( KLibLoader::self()->lastErrorMessage() ) );
diff --git a/kdeprint/lpd/Makefile.am b/kdeprint/lpd/Makefile.am
index 41f285c3f..7230fba1b 100644
--- a/kdeprint/lpd/Makefile.am
+++ b/kdeprint/lpd/Makefile.am
@@ -5,14 +5,14 @@ kde_module_LTLIBRARIES = kdeprint_lpd.la
 kdeprint_lpd_la_SOURCES = kmlpdfactory.cpp kmlpdmanager.cpp klpdprinterimpl.cpp kmlpduimanager.cpp \
 			     lpdtools.cpp gschecker.cpp
 kdeprint_lpd_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kdeprint_lpd_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la 
+kdeprint_lpd_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la 
 kdeprint_lpd_la_METASOURCES = AUTO
 
 noinst_HEADERS = kmlpdfactory.h kmlpdmanager.h klpdprinterimpl.h kmlpduimanager.h lpdtools.h gschecker.h
 
 bin_PROGRAMS = make_driver_db_lpd
 make_driver_db_lpd_SOURCES = make_driver_db_lpd.c
-make_driver_db_lpd_LDADD = $(top_builddir)/kdecore/libkdefakes.la
+make_driver_db_lpd_LDADD = $(top_builddir)/kdecore/libtdefakes.la
 
 entry_DATA = lpd.print
 entrydir = $(kde_datadir)/kdeprint/plugins
diff --git a/kdeprint/lpr/Makefile.am b/kdeprint/lpr/Makefile.am
index 29944f348..cb40661f9 100644
--- a/kdeprint/lpr/Makefile.am
+++ b/kdeprint/lpr/Makefile.am
@@ -13,7 +13,7 @@ kdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \
 			     lprngtoolhandler.cpp \
 			     editentrydialog.cpp
 kdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kdeprint_lpr_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la \
+kdeprint_lpr_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la \
     $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KDECORE)
 kdeprint_lpr_la_METASOURCES = AUTO
 
@@ -31,7 +31,7 @@ kdeprintlprdir = $(includedir)/kdeprint/lpr
 bin_PROGRAMS = make_driver_db_lpr
 make_driver_db_lpr_SOURCES = make_driver_db_lpr.c
 make_driver_db_lpr_LDFLAGS = $(all_libraries) 
-make_driver_db_lpr_LDADD = $(top_builddir)/kdecore/libkdefakes.la ../libdriverparse.a $(LIBDL)
+make_driver_db_lpr_LDADD = $(top_builddir)/kdecore/libtdefakes.la ../libdriverparse.a $(LIBDL)
 
 entry_DATA = lpr.print
 entrydir = $(kde_datadir)/kdeprint/plugins
diff --git a/kdeprint/management/CMakeLists.txt b/kdeprint/management/CMakeLists.txt
index 8c4fb42ba..c9fe6a5a9 100644
--- a/kdeprint/management/CMakeLists.txt
+++ b/kdeprint/management/CMakeLists.txt
@@ -82,9 +82,9 @@ tde_add_library( ${target} SHARED AUTOMOC
 )
 
 
-#### libkdeprint_management_module ##############
+#### libtdeprint_management_module ##############
 
-set( target libkdeprint_management_module )
+set( target libtdeprint_management_module )
 
 set( ${target}_SRCS
   kdeprint_management_module.cpp
diff --git a/kdeprint/management/Makefile.am b/kdeprint/management/Makefile.am
index 42bdeba4d..0cc693b68 100644
--- a/kdeprint/management/Makefile.am
+++ b/kdeprint/management/Makefile.am
@@ -2,8 +2,8 @@ AM_CPPFLAGS = -D_KDEPRINT_COMPILE
 
 INCLUDES= -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdeprint -I$(top_builddir)/kdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes)
 
-lib_LTLIBRARIES = libkdeprint_management.la
-kde_module_LTLIBRARIES = libkdeprint_management_module.la
+lib_LTLIBRARIES = libtdeprint_management.la
+kde_module_LTLIBRARIES = libtdeprint_management_module.la
 kdeinit_LTLIBRARIES = kaddprinterwizard.la
 bin_PROGRAMS = 
 
@@ -11,7 +11,7 @@ kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp
 kaddprinterwizard_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_KDEUI)
 kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
 
-libkdeprint_management_la_SOURCES = \
+libtdeprint_management_la_SOURCES = \
 	kmdbcreator.cpp kmdriverdb.cpp kmdriverdbwidget.cpp \
 	kmiconview.cpp kminfopage.cpp kmmainview.cpp \
 	kmpages.cpp kmprinterview.cpp kmjobviewer.cpp \
@@ -25,13 +25,13 @@ libkdeprint_management_la_SOURCES = \
 	kmwlocal.cpp kiconselectaction.cpp kmconfigpreview.cpp sidepixmap.cpp \
 	pluginaction.cpp kxmlcommanddlg.cpp kxmlcommandselector.cpp kmconfigcommand.cpp \
 	kmconfigfilter.cpp kmconfigfonts.cpp kmconfigjobs.cpp networkscanner.cpp
-libkdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
-libkdeprint_management_la_LIBADD = ../libkdeprint.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
-libkdeprint_management_la_METASOURCES = AUTO
+libtdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
+libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
+libtdeprint_management_la_METASOURCES = AUTO
 
-libkdeprint_management_module_la_SOURCES = kdeprint_management_module.cpp
-libkdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
-libkdeprint_management_module_la_LIBADD = libkdeprint_management.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+libtdeprint_management_module_la_SOURCES = kdeprint_management_module.cpp
+libtdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
+libtdeprint_management_module_la_LIBADD = libtdeprint_management.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
 
 kdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h
 kdeprintdir = $(includedir)/kdeprint
diff --git a/kdeprint/rlpr/Makefile.am b/kdeprint/rlpr/Makefile.am
index d0ea535ec..2a42d106f 100644
--- a/kdeprint/rlpr/Makefile.am
+++ b/kdeprint/rlpr/Makefile.am
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kdeprint_rlpr.la
 kdeprint_rlpr_la_SOURCES = kmrlprfactory.cpp kmrlprmanager.cpp krlprprinterimpl.cpp kmrlpruimanager.cpp \
 			      kmwrlpr.cpp kmproprlpr.cpp kmproxywidget.cpp kmconfigproxy.cpp
 kdeprint_rlpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kdeprint_rlpr_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI)
+kdeprint_rlpr_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI)
 kdeprint_rlpr_la_METASOURCES = AUTO
 
 noinst_HEADERS = kmrlprmanager.h krlprprinterimpl.h kmrlpruimanager.h kmwrlpr.h kmproprlpr.h \
diff --git a/kdeprint/tests/Makefile.am b/kdeprint/tests/Makefile.am
index e27cad3db..7a2d1865c 100644
--- a/kdeprint/tests/Makefile.am
+++ b/kdeprint/tests/Makefile.am
@@ -4,12 +4,12 @@ check_PROGRAMS = helpviewer drawdemo
 
 helpviewer_SOURCES = helpwindow.cpp main.cpp richpage.cpp
 helpviewer_METASOURCES = helpwindow.moc
-helpviewer_LDADD = $(top_builddir)/kdeprint/libkdeprint.la
+helpviewer_LDADD = $(top_builddir)/kdeprint/libtdeprint.la
 helpviewer_LDFLAGS = $(all_libraries)
 
 drawdemo_SOURCES = drawdemo.cpp
 drawdemo_METASOURCES = drawdemo.moc
-drawdemo_LDADD = $(top_builddir)/kdeprint/libkdeprint.la
+drawdemo_LDADD = $(top_builddir)/kdeprint/libtdeprint.la
 drawdemo_LDFLAGS = $(all_libraries)
 
 EXTRA_DIST = home.xpm back.xpm forward.xpm
diff --git a/kdesu/CMakeLists.txt b/kdesu/CMakeLists.txt
index 9f5b9ef5b..02a871cd9 100644
--- a/kdesu/CMakeLists.txt
+++ b/kdesu/CMakeLists.txt
@@ -30,7 +30,7 @@ install( FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}/kdesu )
 
 
-##### libkdesu ##################################
+##### libtdesu ##################################
 
 set( target kdesu )
 
diff --git a/kdesu/Mainpage.dox b/kdesu/Mainpage.dox
index 8105f9069..a887e2255 100644
--- a/kdesu/Mainpage.dox
+++ b/kdesu/Mainpage.dox
@@ -1,6 +1,6 @@
 /** @mainpage Console-mode authentication
 
-libkdesu provides functionality for building GUI front ends for
+libtdesu provides functionality for building GUI front ends for
 (password asking) console mode programs. For example, kdesu and
 kdessh use it to interface with su and ssh respectively.
 
diff --git a/kdesu/Makefile.am b/kdesu/Makefile.am
index 691068966..31a553ec8 100644
--- a/kdesu/Makefile.am
+++ b/kdesu/Makefile.am
@@ -1,13 +1,13 @@
-## Makefile.am for libkdesu
+## Makefile.am for libtdesu
 
 INCLUDES = -I$(top_srcdir)/kio/ $(all_includes)
 
-lib_LTLIBRARIES = libkdesu.la
-libkdesu_la_SOURCES = client.cpp process.cpp kcookie.cpp su.cpp ssh.cpp stub.cpp kdesu_pty.cpp
-libkdesu_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) 
-libkdesu_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
-libkdesu_la_NMCHECK = $(srcdir)/libkdesu.nmcheck
-libkdesu_la_NMCHECKWEAK = $(srcdir)/libkdesu_weak.nmcheck $(top_srcdir)/kdecore/libkdecore_weak.nmcheck \
+lib_LTLIBRARIES = libtdesu.la
+libtdesu_la_SOURCES = client.cpp process.cpp kcookie.cpp su.cpp ssh.cpp stub.cpp kdesu_pty.cpp
+libtdesu_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) 
+libtdesu_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
+libtdesu_la_NMCHECK = $(srcdir)/libtdesu.nmcheck
+libtdesu_la_NMCHECKWEAK = $(srcdir)/libtdesu_weak.nmcheck $(top_srcdir)/kdecore/libtdecore_weak.nmcheck \
 	$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck
 
 kdesudir = $(includedir)/kdesu
diff --git a/kdesu/README b/kdesu/README
index 0a6acd9d3..2ed2228bd 100644
--- a/kdesu/README
+++ b/kdesu/README
@@ -2,12 +2,12 @@ Maintainer: Adriaan de Groot <groot@kde.org>
 Maintainer: kdesu was maintained by Alan Eldridge until his
             death in 2003.
 
-README for libkdesu.
+README for libtdesu.
 
 Libkdesu provides functionality for building GUI front ends for 
 (password asking) console mode programs. For example, kdesu and
 kdessh use it to interface with su and ssh respectively.
 
-libkdesu is Copyright (c) 1999,2000 Geert Jansen <jansen@kde.org>
+libtdesu is Copyright (c) 1999,2000 Geert Jansen <jansen@kde.org>
 
 Distributed under the GNU Library General Public License, version 2.
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index e40154333..2623a1cea 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -95,7 +95,7 @@ install( PROGRAMS
   DESTINATION ${BIN_INSTALL_DIR} )
 
 
-##### libkdeui ##################################
+##### libtdeui ##################################
 
 set( target kdeui )
 
diff --git a/kdeui/Mainpage.dox b/kdeui/Mainpage.dox
index bf6f6596d..778c962f1 100644
--- a/kdeui/Mainpage.dox
+++ b/kdeui/Mainpage.dox
@@ -10,7 +10,7 @@
 *
 * This library provides standard user interface elements for use in
 * Trinity applications. If your Trinity application has a GUI, you will almost
-* certainly link to libkdeui.
+* certainly link to libtdeui.
 *
 * Most applications with single or multiple toplevel widgets
 * should use the KMainWindow class in this library, which
diff --git a/kdeui/Makefile.am b/kdeui/Makefile.am
index e5ef761be..66719d8b1 100644
--- a/kdeui/Makefile.am
+++ b/kdeui/Makefile.am
@@ -26,9 +26,9 @@ INCLUDES= -I/usr/include/freetype2/ -I$(top_srcdir)/kdefx -I$(top_srcdir)/interf
 # into $(all_libraries) isn't better
 AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
 
-lib_LTLIBRARIES = libkdeui.la libkspell.la
-libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
-libkdeui_la_LIBADD = ../kdecore/libkdecore.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/kdefx/libkdefx.la $(LIB_XEXT)
+lib_LTLIBRARIES = libtdeui.la libkspell.la
+libtdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
+libtdeui_la_LIBADD = ../kdecore/libtdecore.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/kdefx/libtdefx.la $(LIB_XEXT)
 
 libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined
 libkspell_la_SOURCES = dummy.cpp
@@ -80,7 +80,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 # the files on the first line need to occur first when compiling
 # with --enable-final since they use X defines that get undefined
 # in ksharedpixmap.cpp
-libkdeui_la_SOURCES = \
+libtdeui_la_SOURCES = \
 		qxembed.cpp ksharedpixmap.cpp kpixmapio.cpp \
 		kpopupmenu.cpp ktoolbar.cpp kaction.cpp kstdaction.cpp \
 		kactioncollection.cpp kactionclasses.cpp \
@@ -133,9 +133,9 @@ noinst_HEADERS = kdockwidget_private.h kdockwidget_p.h klistviewlineedit.h \
 scripts_SCRIPTS = preparetips
 scriptsdir = $(kde_bindir)
 
-libkdeui_la_METASOURCES = AUTO
-libkdeui_la_NMCHECK = $(srcdir)/libkdeui.nmcheck
-libkdeui_la_NMCHECKWEAK = $(srcdir)/libkdeui_weak.nmcheck $(top_srcdir)/kdecore/libkdecore_weak.nmcheck \
+libtdeui_la_METASOURCES = AUTO
+libtdeui_la_NMCHECK = $(srcdir)/libtdeui.nmcheck
+libtdeui_la_NMCHECKWEAK = $(srcdir)/libtdeui_weak.nmcheck $(top_srcdir)/kdecore/libtdecore_weak.nmcheck \
 	$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck
 
 rcdir = $(kde_confdir)/ui
diff --git a/kdeui/kdepackages.h b/kdeui/kdepackages.h
index bda1788b5..28248210a 100644
--- a/kdeui/kdepackages.h
+++ b/kdeui/kdepackages.h
@@ -1176,9 +1176,9 @@ const char * const packages[] = {
 "kxsldbg/xsldbg",
 "lanbrowsing",
 "libkcddb",
-"libkdegames",
-"libkdepim",
-"libkdepim/libkpgp",
+"libtdegames",
+"libtdepim",
+"libtdepim/libkpgp",
 "libksane",
 "lilo-config",
 "lokalize",
diff --git a/kdeui/kpixmapregionselectorwidget.cpp b/kdeui/kpixmapregionselectorwidget.cpp
index 320f6569e..df096067e 100644
--- a/kdeui/kpixmapregionselectorwidget.cpp
+++ b/kdeui/kpixmapregionselectorwidget.cpp
@@ -18,7 +18,7 @@
 */
 
 /* NOTE: There are two copies of this .h and the .cpp file, with subtle differences.
- * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libkdepim
+ * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libtdepim
  * This is because kdepim has to remain backwards compatible.  Any changes
  * to either file should be made to the other.
  */
diff --git a/kdeui/kpixmapregionselectorwidget.h b/kdeui/kpixmapregionselectorwidget.h
index 647f6d76e..3709f1fde 100644
--- a/kdeui/kpixmapregionselectorwidget.h
+++ b/kdeui/kpixmapregionselectorwidget.h
@@ -34,7 +34,7 @@ class KPopupMenu;
  * user with a friendly way to select a rectangular subregion of the pixmap.
  *
  * NOTE: There are two copies of this .h and the .cpp file, with subtle differences.
- * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libkdepim
+ * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libtdepim
  * This is because kdepim has to remain backwards compatible.  Any changes
  * to either file should be made to the other.
  *
diff --git a/kdeui/tests/Makefile.am b/kdeui/tests/Makefile.am
index 560c9b6dc..607196380 100644
--- a/kdeui/tests/Makefile.am
+++ b/kdeui/tests/Makefile.am
@@ -44,7 +44,7 @@ check_PROGRAMS = kaboutdialogtest kblendtest kbuttonboxtest kcharselecttest \
 
 METASOURCES = AUTO
 
-LDADD = ../libkdeui.la
+LDADD = ../libtdeui.la
 
 kaboutdialogtest_SOURCES = kaboutdialogtest.cpp
 kblendtest_SOURCES = kblendtest.cpp
diff --git a/kdewidgets/Makefile.am b/kdewidgets/Makefile.am
index 1242f1c90..ef57238d7 100644
--- a/kdewidgets/Makefile.am
+++ b/kdewidgets/Makefile.am
@@ -26,7 +26,7 @@ INCLUDES = -I$(top_srcdir)/kfile $(all_includes)
 bin_PROGRAMS = makekdewidgets
 makekdewidgets_SOURCES = makekdewidgets.cpp
 makekdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
-makekdewidgets_LDADD = $(LIB_QT) ../kdecore/libkdecore.la 
+makekdewidgets_LDADD = $(LIB_QT) ../kdecore/libtdecore.la 
 
 kde_widget_LTLIBRARIES = kdewidgets.la
 kdewidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
diff --git a/khtml/Makefile.am b/khtml/Makefile.am
index 6892ef0c9..a81d679d8 100644
--- a/khtml/Makefile.am
+++ b/khtml/Makefile.am
@@ -55,7 +55,7 @@ libkhtml_la_LIBADD = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \
 	./misc/libkhtmlmisc.la ecma/libkjs_html.la ./dom/libkhtmldom.la $(LIBKJAVA) \
 	$(LIB_KPARTS) \
 	$(LIBTHAI) \
-	$(top_builddir)/kdeprint/libkdeprint.la  \
+	$(top_builddir)/kdeprint/libtdeprint.la  \
 	$(top_builddir)/kutils/libkutils.la \
 	$(top_builddir)/kwallet/client/libkwalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11)
 
diff --git a/kimgio/Makefile.am b/kimgio/Makefile.am
index ae52d6597..bc94ff12a 100644
--- a/kimgio/Makefile.am
+++ b/kimgio/Makefile.am
@@ -45,7 +45,7 @@ kimg_ico_la_LIBADD  = $(LIB_QT)
 
 kimg_jp2_la_SOURCES = jp2.cpp
 kimg_jp2_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_jp2_la_LIBADD = $(LIB_QT) $(LIB_JASPER) ../kdecore/libkdecore.la
+kimg_jp2_la_LIBADD = $(LIB_QT) $(LIB_JASPER) ../kdecore/libtdecore.la
 
 kimg_pcx_la_SOURCES = pcx.cpp
 kimg_pcx_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
diff --git a/kinit/Makefile.am b/kinit/Makefile.am
index 1f887538a..05d8dd8ce 100644
--- a/kinit/Makefile.am
+++ b/kinit/Makefile.am
@@ -60,7 +60,7 @@ klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/l
 klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp
 
 kstartupconfig_SOURCES  = kstartupconfig.cpp
-kstartupconfig_LDADD  = $(top_builddir)/kdecore/libkdefakes.la $(LIB_QT)
+kstartupconfig_LDADD  = $(top_builddir)/kdecore/libtdefakes.la $(LIB_QT)
 kdostartupconfig_SOURCES = kdostartupconfig.cpp
 kdostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
                            $(KDE_RPATH)
diff --git a/kinit/README b/kinit/README
index ea52b0235..624847a47 100644
--- a/kinit/README
+++ b/kinit/README
@@ -29,7 +29,7 @@ it uses need to be linked.
 Startup Speed
 =============
 
-Starting an application linked against libqt, libkdecore and libkdeui
+Starting an application linked against libqt, libtdecore and libtdeui
 in the conventional way takes approx. 150ms on a Pentium III - 500Mhz. 
 Starting the same application via kdeinit takes less than 10ms.
 
@@ -39,7 +39,7 @@ constructor requires an extra 100ms in both cases)
 Memory Usage
 ============
 
-An application linked against libqt, libkdecore and libkdeui started
+An application linked against libqt, libtdecore and libtdeui started
 in the conventional way requires about 498Kb memory. 
 (average of 10 instances) If the same application is started via
 kdeinit it requires about 142Kb. A difference of 356Kb (application 
diff --git a/kio/DESIGN b/kio/DESIGN
index 30a037c81..8131573e1 100644
--- a/kio/DESIGN
+++ b/kio/DESIGN
@@ -163,9 +163,9 @@ Taj brought up the idea of deligating all progress informations to an extern
 GUI daemon which could be provided in several implementations - examples
 are popup dialogs (most are annoyed by them, like me :) or a kicker applet
 or something completely different. This would also remove the dependency on
-libkdeui (I hope).
+libtdeui (I hope).
 Conclusion: kio_uiserver is this single GUI daemon, but the dependency on
-libkdeui couldn't be removed (for many reasons, including Job::showErrorDialog())
+libtdeui couldn't be removed (for many reasons, including Job::showErrorDialog())
 
 A. progress handling
 ---------------------
diff --git a/kio/Makefile.am b/kio/Makefile.am
index 8349d4038..a0573f340 100644
--- a/kio/Makefile.am
+++ b/kio/Makefile.am
@@ -30,7 +30,7 @@ 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 \
-	../kdeui/libkdeui.la ../kdesu/libkdesu.la \
+	../kdeui/libtdeui.la ../kdesu/libtdesu.la \
 	../kwallet/client/libkwalletclient.la \
 	$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
diff --git a/kio/kio/Makefile.am b/kio/kio/Makefile.am
index addaa5fe3..374fb0ab1 100644
--- a/kio/kio/Makefile.am
+++ b/kio/kio/Makefile.am
@@ -63,7 +63,7 @@ include_HEADERS += kacl.h
 #endif
 
 #libkiocore_la_LDFLAGS = $(all_libraries)
-#libkiocore_la_LIBADD = ../../kdeui/libkdeui.la ../../kdesu/libkdesu.la $(LIBZ) $(LIBFAM) $(LIBVOLMGT)
+#libkiocore_la_LIBADD = ../../kdeui/libtdeui.la ../../kdesu/libtdesu.la $(LIBZ) $(LIBFAM) $(LIBVOLMGT)
 
 libkiocore_la_SOURCES = authinfo.cpp \
 	kshred.cpp \
diff --git a/kio/misc/kdesasl/Makefile.am b/kio/misc/kdesasl/Makefile.am
index 4020a966c..0160cdb67 100644
--- a/kio/misc/kdesasl/Makefile.am
+++ b/kio/misc/kdesasl/Makefile.am
@@ -1,12 +1,12 @@
 INCLUDES=$(all_includes)
 
-lib_LTLIBRARIES = libkdesasl.la
+lib_LTLIBRARIES = libtdesasl.la
 METASOURCES     = AUTO
 
 kdesaslincludedir = $(includedir)/kio
 kdesaslinclude_HEADERS = kdesasl.h
 
-libkdesasl_la_SOURCES = kdesasl.cpp
-libkdesasl_la_LDFLAGS = $(all_libraries) -version-info 3:0:2 -no-undefined
-libkdesasl_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+libtdesasl_la_SOURCES = kdesasl.cpp
+libtdesasl_la_LDFLAGS = $(all_libraries) -version-info 3:0:2 -no-undefined
+libtdesasl_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
 
diff --git a/kioslave/http/kcookiejar/Makefile.am b/kioslave/http/kcookiejar/Makefile.am
index c1c586b94..7478e09e3 100644
--- a/kioslave/http/kcookiejar/Makefile.am
+++ b/kioslave/http/kcookiejar/Makefile.am
@@ -18,7 +18,7 @@ kcookiejar_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
 kded_kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
 			kcookieserver.skel kcookiewin.cpp 
 kded_kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kcookiejar_la_LIBADD = $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_X11) $(LIB_KDEUI) $(top_builddir)/kded/libkdeinit_kded.la
+kded_kcookiejar_la_LIBADD = $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_X11) $(LIB_KDEUI) $(top_builddir)/kded/libtdeinit_kded.la
 
 kded_DATA = kcookiejar.desktop
 kdeddir = $(kde_servicesdir)/kded
diff --git a/krandr/Makefile.am b/krandr/Makefile.am
index 4db082a62..3d21c6dc2 100644
--- a/krandr/Makefile.am
+++ b/krandr/Makefile.am
@@ -13,7 +13,7 @@ libkrandr_la_SOURCES  = randr.cpp lowlevel_randr.c ktimerdialog.cpp libkrandr.cc
 METASOURCES = AUTO
 
 libkrandr_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
-libkrandr_la_LIBADD = $(LIBASOUND) ../kdecore/libkdecore.la $(LIB_QT) $(LIB_XRANDR)
+libkrandr_la_LIBADD = $(LIBASOUND) ../kdecore/libtdecore.la $(LIB_QT) $(LIB_XRANDR)
 
 DOXYGEN_REFERENCES = kdecore
 include ../admin/Doxyfile.am
diff --git a/kstyles/highcolor/Makefile.am b/kstyles/highcolor/Makefile.am
index 76146112e..635a37353 100644
--- a/kstyles/highcolor/Makefile.am
+++ b/kstyles/highcolor/Makefile.am
@@ -24,6 +24,6 @@ INCLUDES = -I$(top_srcdir)/kdefx $(all_includes)
 noinst_HEADERS = highcolor.h bitmaps.h
 kde_style_LTLIBRARIES = highcolor.la
 highcolor_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-highcolor_la_LIBADD = ../../kdefx/libkdefx.la $(LIB_QT)
+highcolor_la_LIBADD = ../../kdefx/libtdefx.la $(LIB_QT)
 highcolor_la_SOURCES = highcolor.cpp
 highcolor_la_METASOURCES = AUTO
diff --git a/kstyles/highcontrast/Makefile.am b/kstyles/highcontrast/Makefile.am
index af54fd949..9a6f38cd7 100644
--- a/kstyles/highcontrast/Makefile.am
+++ b/kstyles/highcontrast/Makefile.am
@@ -35,7 +35,7 @@ noinst_HEADERS = highcontrast.h
 kde_style_LTLIBRARIES = highcontrast.la
 highcontrast_la_SOURCES = highcontrast.cpp
 highcontrast_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-highcontrast_la_LIBADD = ../../kdefx/libkdefx.la $(LIB_QT)
+highcontrast_la_LIBADD = ../../kdefx/libtdefx.la $(LIB_QT)
 highcontrast_la_METASOURCES = AUTO
 
 DISTCLEANFILES = $(highcontrast_la_METASOURCES)
diff --git a/kstyles/keramik/Makefile.am b/kstyles/keramik/Makefile.am
index 00132f4d1..5931485be 100644
--- a/kstyles/keramik/Makefile.am
+++ b/kstyles/keramik/Makefile.am
@@ -6,7 +6,7 @@ KDE_CXXFLAGS = -UQT_NO_ASCII_CAST
 noinst_HEADERS = keramik.h pixmaploader.h keramikimage.h bitmaps.h gradients.h colorutil.h
 kde_style_LTLIBRARIES = keramik.la
 keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-keramik_la_LIBADD = ../../kdefx/libkdefx.la $(LIB_QT) $(LIB_XEXT)
+keramik_la_LIBADD = ../../kdefx/libtdefx.la $(LIB_QT) $(LIB_XEXT)
 keramik_la_SOURCES = keramik.cpp pixmaploader.cpp gradients.cpp colorutil.cpp
 keramik_la_COMPILE_FIRST = keramikrc.h
 keramik_la_METASOURCES = AUTO
@@ -14,7 +14,7 @@ keramik_la_METASOURCES = AUTO
 noinst_PROGRAMS = genembed
 
 genembed_SOURCES = genembed.cpp
-genembed_LDADD = ../../kdefx/libkdefx.la
+genembed_LDADD = ../../kdefx/libtdefx.la
 genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 pixmaps.keramik: pics/checkbox-off.png pics/checkbox-on.png pics/combobox-list-bc.png\
diff --git a/kstyles/kthemestyle/Makefile.am b/kstyles/kthemestyle/Makefile.am
index ccf9ad336..b2c3be33f 100644
--- a/kstyles/kthemestyle/Makefile.am
+++ b/kstyles/kthemestyle/Makefile.am
@@ -24,6 +24,6 @@ INCLUDES = -I$(top_srcdir)/kdefx $(all_includes)
 noinst_HEADERS = kthemestyle.h kthemebase.h kstyledirs.h
 kde_style_LTLIBRARIES = kthemestyle.la
 kthemestyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kthemestyle_la_LIBADD = ../../kdefx/libkdefx.la  ../../kdecore/libkdecore.la -ldl $(LIB_QT)
+kthemestyle_la_LIBADD = ../../kdefx/libtdefx.la  ../../kdecore/libtdecore.la -ldl $(LIB_QT)
 kthemestyle_la_SOURCES = kthemebase.cpp kthemestyle.cpp kstyledirs.cpp
 kthemestyle_la_METASOURCES = AUTO
diff --git a/kstyles/light/Makefile.am b/kstyles/light/Makefile.am
index bbd6929b0..8e2ebf301 100644
--- a/kstyles/light/Makefile.am
+++ b/kstyles/light/Makefile.am
@@ -24,6 +24,6 @@ INCLUDES = -I$(top_srcdir)/kdefx $(all_includes)
 noinst_HEADERS = lightstyle-v2.h lightstyle-v3.h
 kde_style_LTLIBRARIES = light.la
 light_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-light_la_LIBADD =  $(LIB_QT) ../../kdefx/libkdefx.la
+light_la_LIBADD =  $(LIB_QT) ../../kdefx/libtdefx.la
 light_la_SOURCES = light.cpp lightstyle-v2.cpp lightstyle-v3.cpp
 light_la_METASOURCES = AUTO
diff --git a/kstyles/plastik/Makefile.am b/kstyles/plastik/Makefile.am
index e74be711d..477e7f68c 100644
--- a/kstyles/plastik/Makefile.am
+++ b/kstyles/plastik/Makefile.am
@@ -16,7 +16,7 @@ noinst_HEADERS = plastik.h misc.h
 kde_style_LTLIBRARIES = plastik.la
 plastik_la_SOURCES = plastik.cpp misc.cpp
 plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-plastik_la_LIBADD = ../../kdefx/libkdefx.la $(LIB_QT)
+plastik_la_LIBADD = ../../kdefx/libtdefx.la $(LIB_QT)
 plastik_la_METASOURCES = AUTO
 
 DISTCLEANFILES = $(plastik_la_METASOURCES)
diff --git a/kwallet/backend/Makefile.am b/kwallet/backend/Makefile.am
index 9727718b5..fde36c41d 100644
--- a/kwallet/backend/Makefile.am
+++ b/kwallet/backend/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(srcdir)/../client $(all_includes)
 lib_LTLIBRARIES = libkwalletbackend.la
 
 libkwalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined
-libkwalletbackend_la_LIBADD = $(LIB_QT) ../../kdecore/libkdecore.la
+libkwalletbackend_la_LIBADD = $(LIB_QT) ../../kdecore/libtdecore.la
 libkwalletbackend_la_SOURCES = blockcipher.cc		\
 			       blowfish.cc		\
 			       cbc.cc			\
diff --git a/libkmid/Makefile.am b/libkmid/Makefile.am
index 8db9d5369..4e5a72a2e 100644
--- a/libkmid/Makefile.am
+++ b/libkmid/Makefile.am
@@ -18,7 +18,7 @@ libkmid_la_SOURCES  = midiout.cc player.cc track.cc midimapper.cc \
 	libkmid.cc
 
 libkmid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
-libkmid_la_LIBADD = $(LIBASOUND) ../kdecore/libkdecore.la $(LIB_QT)
+libkmid_la_LIBADD = $(LIBASOUND) ../kdecore/libtdecore.la $(LIB_QT)
 
 DOXYGEN_REFERENCES = kdecore
 include ../admin/Doxyfile.am