diff --git a/README b/README
index b863879..fcf478b 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-ftps KIO-slave.
+ftps TDEIO-slave.
 
-written by Magnus Kulke <magnus.kulke@radicalapproach.de>, based on rfc4217 and build upon the ftp KIO-slave sources. it should work yet with most server implementations. it issues an "AUTH TLS" command after connecting and refuses to continue, when it's not supported. in prior to every data channel io command ("STOR", "RETR", etc) it tries to secure the data channel via "PBSZ" and "PROT" commands. if that fails it will transfer data unencrypted. there is currently no support for ssl-certificates. this might be added on demand.
+written by Magnus Kulke <magnus.kulke@radicalapproach.de>, based on rfc4217 and build upon the ftp TDEIO-slave sources. it should work yet with most server implementations. it issues an "AUTH TLS" command after connecting and refuses to continue, when it's not supported. in prior to every data channel io command ("STOR", "RETR", etc) it tries to secure the data channel via "PBSZ" and "PROT" commands. if that fails it will transfer data unencrypted. there is currently no support for ssl-certificates. this might be added on demand.
  
 magnus kulke 1.3.2006
\ No newline at end of file
diff --git a/acinclude.m4 b/acinclude.m4
index 8cc298b..e0cf792 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2065,35 +2065,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/tdeio_ftps/Makefile.am b/tdeio_ftps/Makefile.am
index 651c0ed..f18fad9 100644
--- a/tdeio_ftps/Makefile.am
+++ b/tdeio_ftps/Makefile.am
@@ -12,7 +12,7 @@ kde_module_LTLIBRARIES = tdeio_ftps.la
 tdeio_ftps_la_SOURCES = ftp.cc ftp.h
 
 # Die Bibliothek libtdesycoca wird fr Slaves ben�igt
-tdeio_ftps_la_LIBADD = $(LIB_KSYCOCA)
+tdeio_ftps_la_LIBADD = $(LIB_TDESYCOCA)
 
 # Die Link-Pfade inklusive all_libraries (siehe oben)
 # -module gibt an, dass es von anderen Programmen geladen wird und
diff --git a/tdeio_ftps/ftp.cc b/tdeio_ftps/ftp.cc
index 0859411..2bacb8e 100644
--- a/tdeio_ftps/ftp.cc
+++ b/tdeio_ftps/ftp.cc
@@ -81,17 +81,17 @@
 //#undef  kdDebug
 #define ENABLE_CAN_RESUME
 
-// JPF: somebody should find a better solution for this or move this to KIO
+// JPF: somebody should find a better solution for this or move this to TDEIO
 // JPF: anyhow, in KDE 3.2.0 I found diffent MAX_IPC_SIZE definitions!
 namespace TDEIO {
     enum buffersizes
     {  /**
         * largest buffer size that should be used to transfer data between
-        * KIO slaves using the data() function
+        * TDEIO slaves using the data() function
         */
         maximumIpcSize = 32 * 1024,
         /**
-         * this is a reasonable value for an initial read() that a KIO slave
+         * this is a reasonable value for an initial read() that a TDEIO slave
          * can do to obtain data via a slow network connection.
          */
         initialIpcSize =  2 * 1024,