diff --git a/acinclude.m4 b/acinclude.m4
index 99195a6..b775cde 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2018,30 +2018,30 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
 if test $kde_qtver = 3; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEABC, "-ltdeabc")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-   AC_SUBST(LIB_KUTILS, "-ltdeutils")
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
    AC_SUBST(LIB_TDEFILE, "-ltdeio")
 elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
-   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_TDEFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
diff --git a/admin b/admin
index b4d585c..6b7f722 160000
--- a/admin
+++ b/admin
@@ -1 +1 @@
-Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360
+Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index ecdc810..4c288b1 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -1720,7 +1720,7 @@ problem. Just remember &kdirstat; knows how to deal with them. ;-)
 <para>
 Please note that this special handling is only in effect if &kdirstat;'s
 optimized read methods for local files are used (you can turn this on and off
-in the <guibutton>Settings -&gt; General</guibutton> dialog) - KDE's KIO
+in the <guibutton>Settings -&gt; General</guibutton> dialog) - KDE's TDEIO
 methods do not return this kind of information.
 </para>
 </answer>
@@ -1799,7 +1799,7 @@ difference, and this is why &kdirstat; has special handling for them.
 <para>
 Please note that this special handling is only in effect if &kdirstat;'s
 optimized read methods for local files are used (you can turn this on and off
-in the <guibutton>Settings -&gt; General</guibutton> dialog) - KDE's KIO
+in the <guibutton>Settings -&gt; General</guibutton> dialog) - KDE's TDEIO
 methods do not return this kind of information.
 </para>
 </answer>
diff --git a/kdirstat/Makefile.am b/kdirstat/Makefile.am
index d4312fc..cb54fd9 100644
--- a/kdirstat/Makefile.am
+++ b/kdirstat/Makefile.am
@@ -85,7 +85,7 @@ INCLUDES= $(all_includes)
 METASOURCES = AUTO
 
 # the library search path.
-kdirstat_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kdirstat_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 rcdir = $(kde_datadir)/kdirstat
 rc_DATA = kdirstatui.rc
diff --git a/kdirstat/kdirtree.cpp b/kdirstat/kdirtree.cpp
index ae8cf14..6bb6360 100644
--- a/kdirstat/kdirtree.cpp
+++ b/kdirstat/kdirtree.cpp
@@ -1231,7 +1231,7 @@ KDirTree::startReading( const KURL & url )
     }
     else
     {
-	// kdDebug() << "Using KIO methods for " << url.url() << endl;
+	// kdDebug() << "Using TDEIO methods for " << url.url() << endl;
 	KURL cleanUrl( url );
 	cleanUrl.cleanPath();	// Resolve relative paths, get rid of multiple '/'
 	_readMethod	= KDirReadKIO;
diff --git a/kdirstat/kdirtree.h b/kdirstat/kdirtree.h
index ca1eda4..e7a2a33 100644
--- a/kdirstat/kdirtree.h
+++ b/kdirstat/kdirtree.h
@@ -71,7 +71,7 @@ namespace KDirStat
     {
 	KDirReadUnknown,	// Unknown (yet)
 	KDirReadLocal,		// Use opendir() and lstat()
-	KDirReadKIO		// Use KDE 2.x's KIO network transparent methods
+	KDirReadKIO		// Use KDE 2.x's TDEIO network transparent methods
     } KDirReadMethod;
 
 
@@ -82,7 +82,7 @@ namespace KDirStat
      * Information about one single directory entry. This is the type of info
      * typically obtained by stat() / lstat() or similar calls.  Most of this
      * can also be obtained by @ref TDEIO::KDirListJob, but not all: The device
-     * this file resides on is something none of KIO's many classes will tell
+     * this file resides on is something none of TDEIO's many classes will tell
      * (since of course this only makes sense for local files) - yet this had
      * been _the_ single most requested feature of KDirStat <1.0: Stay on one
      * filesystem. To facilitate this, information about the device is
@@ -1071,13 +1071,13 @@ namespace KDirStat
 
     protected slots:
 	/**
-	 * Receive directory entries from a KIO job.
+	 * Receive directory entries from a TDEIO job.
 	 **/
         void entries( TDEIO::Job *		job,
 		      const TDEIO::UDSEntryList &	entryList );
 
 	/**
-	 * KIO job is finished.
+	 * TDEIO job is finished.
 	 **/
 	void finished( TDEIO::Job * job );