6 files changed, 21 insertions, 21 deletions
diff --git a/tdeioslave/ftp/CMakeLists.txt b/tdeioslave/ftp/CMakeLists.txt
index 9f9125fc3..5cc0694b8 100644
--- a/tdeioslave/ftp/CMakeLists.txt
+++ b/tdeioslave/ftp/CMakeLists.txt
@@ -29,9 +29,9 @@ link_directories(
 install( FILES ftp.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_ftp ###################################
+##### tdeio_ftp ###################################
 
-set( target kio_ftp )
+set( target tdeio_ftp )
 
 set( ${target}_SRCS
   ftp.cc
diff --git a/tdeioslave/ftp/Makefile.am b/tdeioslave/ftp/Makefile.am
index c062d6430..93ee77a5a 100644
--- a/tdeioslave/ftp/Makefile.am
+++ b/tdeioslave/ftp/Makefile.am
@@ -2,11 +2,11 @@ INCLUDES= $(all_includes)
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_ftp.la
+kde_module_LTLIBRARIES = tdeio_ftp.la
 
-kio_ftp_la_SOURCES = ftp.cc
-kio_ftp_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
-kio_ftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 
+tdeio_ftp_la_SOURCES = ftp.cc
+tdeio_ftp_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
+tdeio_ftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 
 
 noinst_HEADERS = ftp.h
 
diff --git a/tdeioslave/ftp/configure.in.in b/tdeioslave/ftp/configure.in.in
index 0c94a9b9b..b072643ca 100644
--- a/tdeioslave/ftp/configure.in.in
+++ b/tdeioslave/ftp/configure.in.in
@@ -1,4 +1,4 @@
-dnl For kio_ftp
+dnl For tdeio_ftp
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 AC_CHECK_FUNCS( setfsent )
diff --git a/tdeioslave/ftp/ftp.cc b/tdeioslave/ftp/ftp.cc
index 2099457f2..dfe0f338e 100644
--- a/tdeioslave/ftp/ftp.cc
+++ b/tdeioslave/ftp/ftp.cc
@@ -22,7 +22,7 @@
 */
 
 
-#define  KIO_FTP_PRIVATE_INCLUDE
+#define  TDEIO_FTP_PRIVATE_INCLUDE
 #include "ftp.h"
 
 #include <sys/stat.h>
@@ -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,
@@ -140,14 +140,14 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
 int kdemain( int argc, char **argv )
 {
   KLocale::setMainCatalogue("tdelibs");
-  TDEInstance instance( "kio_ftp" );
+  TDEInstance instance( "tdeio_ftp" );
   ( void ) TDEGlobal::locale();
 
   kdDebug(7102) << "Starting " << getpid() << endl;
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_ftp protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_ftp protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
 
@@ -2481,7 +2481,7 @@ bool Ftp::ftpFolder(const TQString& path, bool bReportError)
 
 
 //===============================================================================
-// public: copy          don't use kio data pump if one side is a local file
+// public: copy          don't use tdeio data pump if one side is a local file
 // helper: ftpCopyPut    called from copy() on upload
 // helper: ftpCopyGet    called from copy() on download
 //===============================================================================
@@ -2590,7 +2590,7 @@ Ftp::StatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const TQString sCop
     sPart = TQFile::encodeName(sCopyFile);
   }
   else if(bPartExists && buff.st_size > 0)
-  { // must not be a folder! please fix a similar bug in kio_file!!
+  { // must not be a folder! please fix a similar bug in tdeio_file!!
     if(S_ISDIR(buff.st_mode))
     {
       iError = ERR_DIR_ALREADY_EXIST;
@@ -2607,7 +2607,7 @@ Ftp::StatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const TQString sCop
   if(bPartExists && !bResume)                  // get rid of an unwanted ".part" file
     remove(sPart.data());
 
-  // JPF: in kio_file overwrite disables ".part" operations. I do not believe
+  // JPF: in tdeio_file overwrite disables ".part" operations. I do not believe
   // JPF: that this is a good behaviour!
   if(bDestExists)                             // must delete for overwrite
     remove(sDest.data());
diff --git a/tdeioslave/ftp/ftp.h b/tdeioslave/ftp/ftp.h
index 4b2a1891d..c95b25410 100644
--- a/tdeioslave/ftp/ftp.h
+++ b/tdeioslave/ftp/ftp.h
@@ -53,7 +53,7 @@ struct FtpEntry
 // FtpTextReader  A helper class to read text lines from a socket
 //===============================================================================
 
-#ifdef  KIO_FTP_PRIVATE_INCLUDE
+#ifdef  TDEIO_FTP_PRIVATE_INCLUDE
 class FtpSocket;
 
 class FtpTextReader
@@ -131,12 +131,12 @@ private:
    */
   int m_iTextBuff;
 };
-#endif // KIO_FTP_PRIVATE_INCLUDE
+#endif // TDEIO_FTP_PRIVATE_INCLUDE
 
 //===============================================================================
 // FtpSocket  Helper Class for Data or Control Connections
 //===============================================================================
-#ifdef  KIO_FTP_PRIVATE_INCLUDE
+#ifdef  TDEIO_FTP_PRIVATE_INCLUDE
 class FtpSocket : public FtpTextReader, public KExtendedSocket
 {
 private:
@@ -228,7 +228,7 @@ private:
 };
 #else
    class FtpSocket;
-#endif // KIO_FTP_PRIVATE_INCLUDE
+#endif // TDEIO_FTP_PRIVATE_INCLUDE
 
 //===============================================================================
 // Ftp
diff --git a/tdeioslave/ftp/ftp.protocol b/tdeioslave/ftp/ftp.protocol
index dfed878a8..363b27c7c 100644
--- a/tdeioslave/ftp/ftp.protocol
+++ b/tdeioslave/ftp/ftp.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_ftp
+exec=tdeio_ftp
 protocol=ftp
 input=none
 output=filesystem