diff --git a/blinken/src/Makefile.am b/blinken/src/Makefile.am
index a9c5e6a7..df9be98f 100644
--- a/blinken/src/Makefile.am
+++ b/blinken/src/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = blinken
 
 INCLUDES = $(all_includes)
 
-blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 blinken_LDADD = $(LIB_KDEUI) $(LIB_KIO) $(artslib)
 
 blinken_SOURCES = main.cpp blinken.cpp artsplayer.cpp blinkengame.cpp number.cpp highscoredialog.cpp counter.cpp fontutils.cpp fontchecker.cpp button.cpp settings.kcfgc
diff --git a/kalzium/Makefile.am b/kalzium/Makefile.am
index 294144f0..eccd27a1 100644
--- a/kalzium/Makefile.am
+++ b/kalzium/Makefile.am
@@ -2,5 +2,5 @@ SUBDIRS = src
 
 AUTOMAKE_OPTIONS = foreign 
 
-DOXYGEN_REFERENCES = kdeui kdecore kfile libkdeedu
+DOXYGEN_REFERENCES = tdeui tdecore kfile libkdeedu
 include ../admin/Doxyfile.am
diff --git a/kalzium/src/Makefile.am b/kalzium/src/Makefile.am
index ba759011..baf68f49 100644
--- a/kalzium/src/Makefile.am
+++ b/kalzium/src/Makefile.am
@@ -79,7 +79,7 @@ rcui_DATA = kalziumui.rc
 KDE_ICON = AUTO
 
 # the library search path. 
-kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 #this RegExp-monster grep for <name origin=foo">bar</name> and puts the i18n() around foo and bar
 messages-old: rc.cpp
diff --git a/kanagram/src/Makefile.am b/kanagram/src/Makefile.am
index 9b0dfa1c..b620ad0a 100644
--- a/kanagram/src/Makefile.am
+++ b/kanagram/src/Makefile.am
@@ -28,7 +28,7 @@ bin_PROGRAMS = kanagram
 
 # the application source, library search path, and link libraries
 kanagram_SOURCES = main.cpp kanagram.cpp kanagramgame.cpp fontutils.cpp kanagramsettings.kcfgc mainsettingswidget.ui vocabsettingswidget.ui vocabeditwidget.ui mainsettings.cpp vocabsettings.cpp vocabedit.cpp keduvocdocument.cpp keduvocexpression.cpp keduvockvtmlreader.cpp keduvockvtmlwriter.cpp leitnerbox.cpp leitnersystem.cpp multiplechoice.cpp grammarmanager.cpp leitnersystemview.cpp newstuffwidget.ui newstuffdialog.cpp newstuff.cpp
-kanagram_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kanagram_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kanagram_LDADD =  $(LIB_KDEUI) $(LIB_KNEWSTUFF) $(LIB_KIO) $(artslib)
 
 kde_kcfg_DATA=kanagram.kcfg
diff --git a/kbruch/src/Makefile.am b/kbruch/src/Makefile.am
index ea747942..6fe844f5 100644
--- a/kbruch/src/Makefile.am
+++ b/kbruch/src/Makefile.am
@@ -4,7 +4,7 @@ kbruch_COMPILE_FIRST = version.h
 kbruch_SOURCES = exercisebase.cpp taskvieweroptionsbase.ui task.cpp ratio.cpp taskview.cpp statisticsview.cpp primenumber.cpp kbruch.cpp mainqtwidget.cpp taskwidget.cpp fractionbasewidget.cpp resultwidget.cpp exercisecompare.cpp ratiowidget.cpp rationalwidget.cpp exerciseconvert.cpp exercisefactorize.cpp factorizedwidget.cpp settingsclass.kcfgc
 kbruch_LDADD   =  $(LIB_KDEUI)
 # the library search path.
-kbruch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kbruch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 EXTRA_DIST = kbruch.cpp kbruch.h kbruch.desktop hi32-app-kbruch.png hi16-app-kbruch.png lo32-app-kbruch.png lo16-app-kbruch.png mainqtwidget.cpp mainqtwidget.h primenumber.cpp primenumber.h statisticsview.cpp statisticsview.h exercisebase.cpp exercisebase.h taskview.cpp taskview.h ratio.cpp ratio.h task.cpp task.h taskwidget.cpp taskwidget.h fractionbasewidget.cpp fractionbasewidget.h resultwidget.cpp resultwidget.h exercisecompare.cpp exercisecompare.h ratiowidget.cpp ratiowidget.h rationalwidget.cpp rationalwidget.h exerciseconvert.cpp exerciseconvert.h exercisefactorize.cpp exercisefactorize.h factorizedwidget.cpp factorizedwidget.h kbruch.rc taskvieweroptionsbase.ui
 
diff --git a/kbruch/testcases/Makefile.am b/kbruch/testcases/Makefile.am
index c6ee62b8..023a4d24 100644
--- a/kbruch/testcases/Makefile.am
+++ b/kbruch/testcases/Makefile.am
@@ -5,7 +5,7 @@ kbruch_test_SOURCES = task.cpp ratio.cpp ratio_test.cpp primenumber.cpp primenum
 kbruch_test_LDADD   = -lboost_unit_test_framework-gcc $(LIB_KDEUI)
 
 # the library search path.
-kbruch_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kbruch_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 EXTRA_DIST = primenumber.cpp primenumber.h ratio.cpp ratio.h task.cpp task.h primenumber_test.cpp ratio_test.cpp kbruch_test.cpp
 
diff --git a/keduca/Makefile.am b/keduca/Makefile.am
index 548a2bfa..37f0a527 100644
--- a/keduca/Makefile.am
+++ b/keduca/Makefile.am
@@ -13,5 +13,5 @@ messages:
 	fi
 	rm -f rc.cpp
 
-DOXYGEN_REFERENCES = kdeui
+DOXYGEN_REFERENCES = tdeui
 include ../admin/Doxyfile.am
diff --git a/keduca/keducabuilder/Makefile.am b/keduca/keducabuilder/Makefile.am
index f0573b9f..6e63e400 100644
--- a/keduca/keducabuilder/Makefile.am
+++ b/keduca/keducabuilder/Makefile.am
@@ -23,7 +23,7 @@ INCLUDES= -I../libkeduca $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-keducabuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+keducabuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
 # KDE´s XML GUI builing
diff --git a/keduca/libkeduca/Makefile.am b/keduca/libkeduca/Makefile.am
index 007ab3cc..3d8db5db 100644
--- a/keduca/libkeduca/Makefile.am
+++ b/keduca/libkeduca/Makefile.am
@@ -2,8 +2,8 @@ INCLUDES=$(all_includes)
 
 noinst_LTLIBRARIES = libkeduca.la
 libkeduca_la_SOURCES = kgallerydialogbase.ui fileread.cpp kgallerydialog.cpp
-libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
-libkeduca_la_LIBADD  = -lkdeprint
+libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libkeduca_la_LIBADD  = -ltdeprint
 noinst_HEADERS = fileread.h kgallerydialog.h kgallerydialogbase.h
 
 METASOURCES=AUTO
diff --git a/kgeography/src/Makefile.am b/kgeography/src/Makefile.am
index 989b47ea..7a042be3 100644
--- a/kgeography/src/Makefile.am
+++ b/kgeography/src/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = kgeography
 INCLUDES         = $(all_includes)
 
 # the library search path.
-kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # the libraries to link against.
 kgeography_LDADD = $(LIB_KDEUI)
diff --git a/khangman/khangman/Makefile.am b/khangman/khangman/Makefile.am
index 011453af..474e78f6 100644
--- a/khangman/khangman/Makefile.am
+++ b/khangman/khangman/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES= -I$(top_srcdir)/libkdeedu/kdeeducore $(all_includes)
 METASOURCES = AUTO
 
 # the library search path.
-khangman_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+khangman_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 rc_DATA = khangmanui.rc
 rcdir = $(kde_datadir)/khangman
diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp
index 14e26e8e..b0492ac0 100644
--- a/khangman/khangman/khangman.cpp
+++ b/khangman/khangman/khangman.cpp
@@ -232,7 +232,7 @@ void KHangMan::setLanguages()
     }
 
     // We look in $KDEDIR/share/locale/all_languages from
-    // kdelibs/kdecore/all_languages to find the name of the country
+    // kdelibs/tdecore/all_languages to find the name of the country
     // corresponding to the code and the language the user set.
     KConfig entry(locate("locale", "all_languages"));
     const TQStringList::ConstIterator itEnd = m_languages.end();
diff --git a/kig/TODO b/kig/TODO
index 717d5124..3329bf08 100644
--- a/kig/TODO
+++ b/kig/TODO
@@ -8,7 +8,7 @@
    pressed esc square or sth like that ).  Anyway, this is due to how
    Kig works with some strange Qt event loop stuff to make its modes
    work, along with a strange way in kaccel of working.  I have a
-   patch against kdecore/kaccel.cpp that should fix it, but the real
+   patch against tdecore/kaccel.cpp that should fix it, but the real
    fix is to get rid of the entire event loop stuff and think of a
    better way to manage all this. pino: seems pressing the stop button
    n times, where n are the times you pressed escape, cancel all the
diff --git a/kig/kig/Makefile.am b/kig/kig/Makefile.am
index 84ab9708..773cb287 100644
--- a/kig/kig/Makefile.am
+++ b/kig/kig/Makefile.am
@@ -23,7 +23,7 @@ bin_PROGRAMS = kig
 
 # the application source, library search path, and link libraries
 kig_SOURCES = main.cpp kig.cpp
-kig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kig_LDADD   = $(LIB_KPARTS)
 
 # this is where the desktop file will go 
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index 30b8b3db..089865f0 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -59,7 +59,7 @@
 #include <kstdaction.h>
 #include <ktoolbar.h>
 #include <kparts/genericfactory.h>
-#include <kdeprint/kprintdialogpage.h>
+#include <tdeprint/kprintdialogpage.h>
 
 #include <tqcheckbox.h>
 #include <tqfile.h>
diff --git a/kiten/Makefile.am b/kiten/Makefile.am
index 4c18a8d0..ba817553 100644
--- a/kiten/Makefile.am
+++ b/kiten/Makefile.am
@@ -6,7 +6,7 @@ kiten_SOURCES = main.cpp kiten.cpp learn.cpp kloader.cpp ksaver.cpp \
 	configsearching.ui configlearn.ui configfont.ui configdictionariesbase.ui \
 	configdictionaries.cpp optiondialog.cpp kitenconfig.kcfgc
 
-kiten_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kiten_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kiten_LDADD = libkiten.la $(LIB_KIO)
 
 bin_PROGRAMS = kiten kitengen
@@ -23,7 +23,7 @@ libkiteninclude_HEADERS = \
 	asyndeta.h dict.h widgets.h kromajiedit.h rad.h deinf.h
 
 kitengen_SOURCES = xjdxgen.c
-kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 METASOURCES = AUTO
 
diff --git a/klatin/klatin/Makefile.am b/klatin/klatin/Makefile.am
index a086dbbd..a43d49e7 100644
--- a/klatin/klatin/Makefile.am
+++ b/klatin/klatin/Makefile.am
@@ -12,7 +12,7 @@ bin_PROGRAMS = klatin
 INCLUDES         = $(all_includes)
 
 # the library search path.
-klatin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+klatin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # the libraries to link against.
 klatin_LDADD   = $(LIB_KFILE) $(top_builddir)/libkdeedu/kdeeducore/libkdeeducore.la
diff --git a/klettres/klettres/Makefile.am b/klettres/klettres/Makefile.am
index 9618e458..9dc4ccbc 100644
--- a/klettres/klettres/Makefile.am
+++ b/klettres/klettres/Makefile.am
@@ -24,7 +24,7 @@ METASOURCES = AUTO
 KDE_ICON = AUTO
 
 # the library search path.
-klettres_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+klettres_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/klettres.pot;
diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp
index ba72ec99..c2c056f0 100644
--- a/klettres/klettres/klettres.cpp
+++ b/klettres/klettres/klettres.cpp
@@ -129,7 +129,7 @@ void KLettres::findLanguages()
         if (!config->readEntry(tmp))
             config->writeEntry(tmp, TQString(TQDate::tqcurrentDate().toString()));
     }
-    //we look in $KDEDIR/share/locale/all_languages from /kdelibs/kdecore/all_languages
+    //we look in $KDEDIR/share/locale/all_languages from /kdelibs/tdecore/all_languages
     //to find the name of the country
     //corresponding to the code and the language the user set
     KConfig entry(locate("locale", "all_languages"));
diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp
index f3f6b7f6..f9d84256 100644
--- a/kmplot/kmplot/kmplot.cpp
+++ b/kmplot/kmplot/kmplot.cpp
@@ -172,7 +172,7 @@ void KmPlot::fileNew()
 	// in its initial state.  This is what we do here..
 	if ( !m_part->url().isEmpty() || isModified() )
 		//KApplication::startServiceByDesktopName("kmplot");
-		KApplication::kdeinitExec("kmplot");
+		KApplication::tdeinitExec("kmplot");
 }
 
 bool KmPlot::stopProgressBar()
diff --git a/kmplot/kmplot/kprinterdlg.h b/kmplot/kmplot/kprinterdlg.h
index 656be463..c9b58ebf 100644
--- a/kmplot/kmplot/kprinterdlg.h
+++ b/kmplot/kmplot/kprinterdlg.h
@@ -32,7 +32,7 @@
 #include <tqcheckbox.h>
 
 // KDE includes
-#include <kdeprint/kprintdialogpage.h>
+#include <tdeprint/kprintdialogpage.h>
 
 /** @short A dialog page for the print dialog.
  *
diff --git a/kpercentage/kpercentage/Makefile.am b/kpercentage/kpercentage/Makefile.am
index 5aee63a0..dc6ba488 100644
--- a/kpercentage/kpercentage/Makefile.am
+++ b/kpercentage/kpercentage/Makefile.am
@@ -30,7 +30,7 @@ METASOURCES = AUTO
 
 
 # the library search path.
-kpercentage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kpercentage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 
 stringstocpp:
diff --git a/kpercentage/kpercentage/kpercentage.docbook b/kpercentage/kpercentage/kpercentage.docbook
index 29531710..444e32e4 100644
--- a/kpercentage/kpercentage/kpercentage.docbook
+++ b/kpercentage/kpercentage/kpercentage.docbook
@@ -473,7 +473,7 @@ main ftp site of the KDE project. </para>
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
 kdelibs, or kdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
diff --git a/kstars/kstars.kdevprj b/kstars/kstars.kdevprj
index 77b6886f..b5a8fc09 100644
--- a/kstars/kstars.kdevprj
+++ b/kstars/kstars.kdevprj
@@ -22,7 +22,7 @@ bin_program=kstars
 cflags=
 cppflags=
 cxxflags=\s-O0 -g3 -Wall
-ldadd=-lkio -lkdeprint -lm $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+ldadd=-lkio -ltdeprint -lm $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
 ldflags=\s\s
 
 [General]
diff --git a/kstars/kstars/Makefile.am b/kstars/kstars/Makefile.am
index 445388de..e3b7fb6d 100644
--- a/kstars/kstars/Makefile.am
+++ b/kstars/kstars/Makefile.am
@@ -28,7 +28,7 @@ kstars_SOURCES = addcatdialog.cpp addlinkdialog.cpp colorscheme.cpp \
 kde_kcfg_DATA = kstars.kcfg
 kde_conf_DATA = kstarsrc
 
-kstars_LDADD = indi/liblilxml.a indi/libindicom.a tools/libkstarstools.a $(top_builddir)/libkdeedu/kdeeduplot/libkdeeduplot.la $(top_builddir)/libkdeedu/kdeeduui/libkdeeduui.la $(top_builddir)/libkdeedu/extdate/libextdate.la -lkdeprint -lknewstuff -lm -lz
+kstars_LDADD = indi/liblilxml.a indi/libindicom.a tools/libkstarstools.a $(top_builddir)/libkdeedu/kdeeduplot/libkdeeduplot.la $(top_builddir)/libkdeedu/kdeeduui/libkdeeduui.la $(top_builddir)/libkdeedu/extdate/libextdate.la -ltdeprint -lknewstuff -lm -lz
 
 SUBDIRS = indi tools . data icons 
 
@@ -54,7 +54,7 @@ INCLUDES= -I$(top_srcdir) -Itools -I$(srcdir)/tools $(all_includes)
 METASOURCES = AUTO
 
 # the library search path.
-kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
 # KDE
diff --git a/ktouch/src/Makefile.am b/ktouch/src/Makefile.am
index b9eb4d82..6d6a10c3 100644
--- a/ktouch/src/Makefile.am
+++ b/ktouch/src/Makefile.am
@@ -50,7 +50,7 @@ ktouch_SOURCES = ktouchchartwidget.cpp ktouchcoloreditor_dlg.ui \
 		ktouchutils.cpp main.cpp prefs.kcfgc ktouchcoloreditor.cpp
 
 # the library search path.
-ktouch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+ktouch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
diff --git a/kturtle/TODO b/kturtle/TODO
index 83c33dff..efe2701a 100644
--- a/kturtle/TODO
+++ b/kturtle/TODO
@@ -292,7 +292,7 @@ dcop khelpcenter KHelpCenterIface openUrl "help:/kate/index.html#kate-part-selec
 Im tryered of this... I can fix it; too much for me. Sorry
 
 
-in kdelibs/kdecore/kapp... :
+in kdelibs/tdecore/kapp... :
 url = QString("help:/%1?anchor=%2").tqarg(appname).tqarg(anchor);
 and
 DCOPRef( "khelpcenter", "KHelpCenterIface" ).send( "openUrl", url, startup_id );
diff --git a/kturtle/file.txt b/kturtle/file.txt
index 99893afd..842af3c0 100644
--- a/kturtle/file.txt
+++ b/kturtle/file.txt
@@ -15,7 +15,7 @@ The following packages will be REMOVED:
   kappfinder karm kate kcontrol kde-cvs-snapshot kdeartwork kdeartwork-misc
   kdeartwork-style kdeartwork-theme-desktop kdeartwork-theme-window kdebase
   kdebase-bin kdebase-data kdebase-kio-plugins kdelibs kdelibs-bin kdelibs-data
-  kdelibs4 kdelibs4-doc kdepim kdepim-kfile-plugins kdepim-libs kdeprint
+  kdelibs4 kdelibs4-doc tdepim tdepim-kfile-plugins tdepim-libs tdeprint
   kdesktop kdm kfind kgpgcertmanager khelpcenter kicker kitchensync klipper
   kmail kmailcvt kmenuedit knode knotes konqueror konqueror-nsplugins konsole
   kontact korganizer korn kpager kpersonalizer kpilot kscreensaver ksmserver
diff --git a/kturtle/src/Makefile.am b/kturtle/src/Makefile.am
index c09c7e88..5a90e111 100644
--- a/kturtle/src/Makefile.am
+++ b/kturtle/src/Makefile.am
@@ -4,9 +4,9 @@ INCLUDES = $(all_includes)
 SUBDIRS = pics
 
 # added from kjots
-AM_LDFLAGS   = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS   = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
-kturtle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kturtle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kturtle_LDADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) $(LIB_KPARTS) -lkatepartinterfaces
 
 KDE_ICON = kturtle
diff --git a/kverbos/kverbos/Makefile.am b/kverbos/kverbos/Makefile.am
index 84803f73..c4766a55 100644
--- a/kverbos/kverbos/Makefile.am
+++ b/kverbos/kverbos/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES= $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-kverbos_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kverbos_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 rcdir = $(kde_datadir)/kverbos
 rc_DATA = kverbosui.rc
diff --git a/kvoctrain/kvoctrain/Makefile.am b/kvoctrain/kvoctrain/Makefile.am
index c3e43bef..d9b137a2 100644
--- a/kvoctrain/kvoctrain/Makefile.am
+++ b/kvoctrain/kvoctrain/Makefile.am
@@ -40,8 +40,8 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/kvt-core -Icommon-dialogs \
 bin_PROGRAMS = kvoctrain spotlight2kvtml
 
 # the library search path.
-kvoctrain_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
-spotlight2kvtml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kvoctrain_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+spotlight2kvtml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 CLEANFILES = *.i.c
 
diff --git a/kwordquiz/src/Makefile.am b/kwordquiz/src/Makefile.am
index 3183d389..165f8772 100644
--- a/kwordquiz/src/Makefile.am
+++ b/kwordquiz/src/Makefile.am
@@ -50,7 +50,7 @@ SUBDIRS = . pics examples
 METASOURCES = AUTO
 
 # the library search path.
-kwordquiz_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kwordquiz_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 rcdir = $(kde_datadir)/kwordquiz
 rc_DATA = kwordquizui.rc eventsrc
diff --git a/kwordquiz/src/wqprintdialogpage.h b/kwordquiz/src/wqprintdialogpage.h
index c3bc270d..3667862a 100644
--- a/kwordquiz/src/wqprintdialogpage.h
+++ b/kwordquiz/src/wqprintdialogpage.h
@@ -20,7 +20,7 @@
 #define WTQPRINTDIALOGPAGE_H
 
 
-#include <kdeprint/kprintdialogpage.h>
+#include <tdeprint/kprintdialogpage.h>
 
 /**
 Print dialog page to provide specific print options for KWordQuiz
diff --git a/libkdeedu/extdate/Makefile.am b/libkdeedu/extdate/Makefile.am
index 66507fea..13408d6e 100644
--- a/libkdeedu/extdate/Makefile.am
+++ b/libkdeedu/extdate/Makefile.am
@@ -11,11 +11,11 @@ libextdate_la_LIBADD = $(LIB_KDEUI)
 
 test_extdate_SOURCES = test_extdate.cc
 test_extdate_LDADD = libextdate.la
-test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 test_extdatepicker_SOURCES = testwidget.cpp main.cpp
 test_extdatepicker_LDADD = libextdate.la
-test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 METASOURCES = AUTO