diff --git a/acinclude.m4 b/acinclude.m4
index 857a5e0..b20c5cc 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KDED, $lib_kded)
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-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")
-   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
+   AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
-   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
+   AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
    AC_SUBST(LIB_KFILE, "-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_KFILE, "-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/kshutdown.kdevelop b/kshutdown.tdevelop
similarity index 100%
rename from kshutdown.kdevelop
rename to kshutdown.tdevelop
diff --git a/kshutdown/Makefile.am b/kshutdown/Makefile.am
index 887b70a..ea5c676 100644
--- a/kshutdown/Makefile.am
+++ b/kshutdown/Makefile.am
@@ -20,7 +20,7 @@ kshutdown_SOURCES = \
 	progressbar.cpp \
 	systemconfig.cpp
 
-kshutdown_LDADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIB_KIO) $(LIB_QT) -lDCOP -ltdefx
+kshutdown_LDADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIB_TDEIO) $(LIB_QT) -lDCOP -ltdefx
 kshutdown_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
 EXTRA_DIST = \
diff --git a/kshutdownlockout/Makefile.am b/kshutdownlockout/Makefile.am
index b66ac8c..2c821f3 100644
--- a/kshutdownlockout/Makefile.am
+++ b/kshutdownlockout/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kshutdownlockout_panelapplet.la
 
 kshutdownlockout_panelapplet_la_SOURCES = lockout.cpp
 kshutdownlockout_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT) -lDCOP $(all_libraries)
-kshutdownlockout_panelapplet_la_LIBADD = $(LIB_KSYCOCA)
+kshutdownlockout_panelapplet_la_LIBADD = $(LIB_TDESYCOCA)
 
 noinst_HEADERS = lockout.h
 
diff --git a/po/nl.po b/po/nl.po
index 7294c23..e34f878 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2006-04-22 18:03+0200\n"
 "PO-Revision-Date: 2004-04-21 22:47+0000\n"
 "Last-Translator: Bram Schoenmakers <bram_s@softhome.net>\n"
-"Language-Team: Nederlands <tde-i18n-nl@kde.nl>\n"
+"Language-Team: Nederlands <kde-i18n-nl@kde.nl>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"