8 files changed, 17 insertions, 17 deletions
diff --git a/tdeioslave/mac/CMakeLists.txt b/tdeioslave/mac/CMakeLists.txt
index 6b1b92f6e..36c141a35 100644
--- a/tdeioslave/mac/CMakeLists.txt
+++ b/tdeioslave/mac/CMakeLists.txt
@@ -26,12 +26,12 @@ install( FILES mac.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 tde_install_icons( )
 
 
-##### kio_mac (module) ##########################
+##### tdeio_mac (module) ##########################
 
-set( target kio_mac )
+set( target tdeio_mac )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES kio_mac.cpp
+  SOURCES tdeio_mac.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/mac/ChangeLog b/tdeioslave/mac/ChangeLog
index 6c8f647ce..5de37eda2 100644
--- a/tdeioslave/mac/ChangeLog
+++ b/tdeioslave/mac/ChangeLog
@@ -18,7 +18,7 @@
 	- Converts some HFS+ file types and application labels into mimetypes
 	- Added a SuSE Makefile
 	- Hopefully managed to get the SuSE RPMs working
-	- When copying files kio-mac now reports the amount progressed so
+	- When copying files tdeio-mac now reports the amount progressed so
   	  you can see how much has been copied
 	- Text files are now copies over in text mode by default
 
diff --git a/tdeioslave/mac/Makefile.am b/tdeioslave/mac/Makefile.am
index dfd79d822..42f73b507 100644
--- a/tdeioslave/mac/Makefile.am
+++ b/tdeioslave/mac/Makefile.am
@@ -1,17 +1,17 @@
-## Makfile.am for kio_mac
+## Makfile.am for tdeio_mac
 
 INCLUDES= $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_mac.la
+kde_module_LTLIBRARIES = tdeio_mac.la
 
-kio_mac_la_SOURCES = kio_mac.cpp
-kio_mac_la_LIBADD = -lkio
-kio_mac_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_mac_la_SOURCES = tdeio_mac.cpp
+tdeio_mac_la_LIBADD = -ltdeio
+tdeio_mac_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
-noinst_HEADERS = kio_mac.h
+noinst_HEADERS = tdeio_mac.h
 
 kdelnk_DATA = mac.protocol
 kdelnkdir = $(kde_servicesdir)
diff --git a/tdeioslave/mac/README b/tdeioslave/mac/README
index bb907dd9c..7ac1b5a3d 100644
--- a/tdeioslave/mac/README
+++ b/tdeioslave/mac/README
@@ -7,7 +7,7 @@ From the hfsplus man page:
        2^64  blocks,  resulting in much more efficient storage of
        many small files on large disks."
 
-This kio slave lets you read an HFS+ partition from konqueror
+This tdeio slave lets you read an HFS+ partition from konqueror
 or any other KDE file dialogue.  It uses hfsplus tools so you will
 need these installed for it to work.
 
@@ -52,7 +52,7 @@ For some reason some directories in MacOS end in a funny tall f
 character.  This seems to confuse hfstools.
 
 You can't easiily use the command line tools while you are browsing
-using kio-mac in Konqueror.  Konqueror continuously refreshes it's
+using tdeio-mac in Konqueror.  Konqueror continuously refreshes it's
 view which mean hpmount is being called every few seconds.  Click on
 Konqueror's home button before using the tools yourself on the command
 line.
diff --git a/tdeioslave/mac/TODO b/tdeioslave/mac/TODO
index e94d88254..69fcb0d2e 100644
--- a/tdeioslave/mac/TODO
+++ b/tdeioslave/mac/TODO
@@ -1,7 +1,7 @@
 FIXMEs:
 	Amazingly, none that I can think of
 
-grep TODO kio_mac.cpp
+grep TODO tdeio_mac.cpp
         //TODO this means dev=foo must be the last argument in the query
         //TODO this error interrupts the user when typing ?dev=foo on each letter of foo
         //TODO are there any more characters to escape?
diff --git a/tdeioslave/mac/mac.protocol b/tdeioslave/mac/mac.protocol
index 9e94132bb..1a9044158 100644
--- a/tdeioslave/mac/mac.protocol
+++ b/tdeioslave/mac/mac.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_mac
+exec=tdeio_mac
 protocol=mac
 input=none
 output=filesystem
diff --git a/tdeioslave/mac/kio_mac.cpp b/tdeioslave/mac/tdeio_mac.cpp
index d26cc47e5..707d995ee 100644
--- a/tdeioslave/mac/kio_mac.cpp
+++ b/tdeioslave/mac/tdeio_mac.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kio_mac.cpp
+                          tdeio_mac.cpp
                              -------------------
     copyright            : (C) 2002 Jonathan Riddell
     email                : jr@jriddell.org
@@ -30,13 +30,13 @@
 #include <iostream>
 #include <time.h>
 
-#include "kio_mac.moc"
+#include "tdeio_mac.moc"
 
 using namespace TDEIO;
 
 extern "C" {
     int KDE_EXPORT kdemain(int, char **argv) {
-        TDEInstance instance("kio_mac");
+        TDEInstance instance("tdeio_mac");
         MacProtocol slave(argv[2], argv[3]);
         slave.dispatchLoop();
         return 0;
diff --git a/tdeioslave/mac/kio_mac.h b/tdeioslave/mac/tdeio_mac.h
index e497e9918..e497e9918 100644
--- a/tdeioslave/mac/kio_mac.h
+++ b/tdeioslave/mac/tdeio_mac.h