diff --git a/acinclude.m4 b/acinclude.m4
index 60985a2..d58e432 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$trinity2ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$trinity3ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libtdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    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_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
diff --git a/kerry/src/kcm/indexing.cpp b/kerry/src/kcm/indexing.cpp
index 73f2cb6..047f327 100644
--- a/kerry/src/kcm/indexing.cpp
+++ b/kerry/src/kcm/indexing.cpp
@@ -27,10 +27,10 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqradiobutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kdirselectdialog.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
diff --git a/kerry/src/kcm/kcmbeagle.desktop b/kerry/src/kcm/kcmbeagle.desktop
index 6d73c98..3a9047d 100644
--- a/kerry/src/kcm/kcmbeagle.desktop
+++ b/kerry/src/kcm/kcmbeagle.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Icon=kerry
-Exec=kcmshell beagle
+Exec=tdecmshell beagle
 
 X-TDE-Library=beagle
 X-TDE-FactoryName=beagle
diff --git a/kerry/src/kcm/kcmkerry.desktop b/kerry/src/kcm/kcmkerry.desktop
index 5e33dc9..fc21de1 100644
--- a/kerry/src/kcm/kcmkerry.desktop
+++ b/kerry/src/kcm/kcmkerry.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=Application
 Icon=kerry
-Exec=kcmshell kerry
+Exec=tdecmshell kerry
 
 X-TDE-Library=beagle
 X-TDE-FactoryName=kerry
diff --git a/kerry/src/kcm/search.cpp b/kerry/src/kcm/search.cpp
index 78342da..94b64a9 100644
--- a/kerry/src/kcm/search.cpp
+++ b/kerry/src/kcm/search.cpp
@@ -21,7 +21,7 @@
 
 #include "search.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 KCMKerrySearch::KCMKerrySearch(TQWidget *parent, const char * )
     : TDECModule(parent, "kcmkerrysearch")
diff --git a/kerry/src/kerryapp.cpp b/kerry/src/kerryapp.cpp
index 655731b..ba542e8 100644
--- a/kerry/src/kerryapp.cpp
+++ b/kerry/src/kerryapp.cpp
@@ -21,7 +21,7 @@
 #include <tqstringlist.h>
 #include <tqdir.h>
 #include <tqclipboard.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kcmdlineargs.h>
 #include <fcntl.h>
 #include <klocale.h>
@@ -223,7 +223,7 @@ void KerryApplication::clearHistory()
 void KerryApplication::configure()
 {
     TDEProcess proc;
-    proc << "kcmshell";
+    proc << "tdecmshell";
     proc << "kde-kcmkerry.desktop";
     proc.start(TDEProcess::DontCare);
 }
diff --git a/kerry/src/main.cpp b/kerry/src/main.cpp
index b1e20f9..1a5a583 100644
--- a/kerry/src/main.cpp
+++ b/kerry/src/main.cpp
@@ -25,13 +25,13 @@
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqfileinfo.h>
 #include <tqstringlist.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <unistd.h>
 
 static const char *description =
diff --git a/kerry/src/searchdlg.cpp b/kerry/src/searchdlg.cpp
index 2ad6460..2eb8074 100644
--- a/kerry/src/searchdlg.cpp
+++ b/kerry/src/searchdlg.cpp
@@ -26,12 +26,12 @@
 #include <tqlayout.h>
 #include <tqtextcodec.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <klineedit.h>
@@ -42,7 +42,7 @@
 #include <tqdir.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kprotocolinfo.h>
 #include <ktrader.h>
 #include <kprocess.h>
@@ -1829,16 +1829,16 @@ bool SearchDlg::ensureServiceRunning(const TQString& name)
         TQDataStream arg(data, IO_WriteOnly);
         arg << name << URLs;
 
-        if ( !kapp->dcopClient()->call( "klauncher", "klauncher", "start_service_by_desktop_name(TQString,TQStringList)",
+        if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)",
                           data, replyType, replyData) ) {
-            tqWarning( "call to klauncher failed.");
+            tqWarning( "call to tdelauncher failed.");
             return false;
         }
         TQDataStream reply(replyData, IO_ReadOnly);
 
         if ( replyType != "serviceResult" )
         {
-            tqWarning( "unexpected result '%s' from klauncher.", replyType.data());
+            tqWarning( "unexpected result '%s' from tdelauncher.", replyType.data());
             return false;
         }
         int result;
diff --git a/kerry/src/searchdlg.h b/kerry/src/searchdlg.h
index 61eb68c..e6cc037 100644
--- a/kerry/src/searchdlg.h
+++ b/kerry/src/searchdlg.h
@@ -24,8 +24,8 @@
 #include "kerryapp.h"
 #include "beaglesearch.h"
 #include "query.h"
-#include <kio/previewjob.h>
-#include <kfileitem.h>
+#include <tdeio/previewjob.h>
+#include <tdefileitem.h>
 #include <dcopinterface.h>
 #include <kabc/addressbook.h>
 #include <kabc/stdaddressbook.h>