diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23bc2811..23a436a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,7 @@ option( BUILD_KAPPTEMPLATE "Build kapptemplate" ${BUILD_ALL} )
 option( BUILD_KBABEL "Build kbabel" ${BUILD_ALL} )
 option( BUILD_KBUGBUSTER "Build kbugbuster" ${BUILD_ALL} )
 option( BUILD_KDEACCOUNTS_PLUGIN "Build kdeaccounts-plugin" ${BUILD_ALL} )
-option( BUILD_KFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
+option( BUILD_TDEFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
 option( BUILD_KIOSLAVE "Build tdeioslave" ${BUILD_ALL} )
 option( BUILD_KMTRACE "Build kmtrace" ${BUILD_ALL} )
 option( BUILD_KOMPARE "Build kompare" ${BUILD_ALL} )
@@ -97,7 +97,7 @@ tde_conditional_add_subdirectory( BUILD_KAPPTEMPLATE kapptemplate )
 tde_conditional_add_subdirectory( BUILD_KBABEL kbabel )
 tde_conditional_add_subdirectory( BUILD_KBUGBUSTER kbugbuster )
 tde_conditional_add_subdirectory( BUILD_KDEACCOUNTS_PLUGIN kdeaccounts-plugin )
-tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS tdefile-plugins )
+tde_conditional_add_subdirectory( BUILD_TDEFILE_PLUGINS tdefile-plugins )
 tde_conditional_add_subdirectory( BUILD_KIOSLAVE tdeioslave )
 tde_conditional_add_subdirectory( BUILD_KMTRACE kmtrace )
 tde_conditional_add_subdirectory( BUILD_KOMPARE kompare )
diff --git a/cervisia/Makefile.am b/cervisia/Makefile.am
index 9131ac3b..c2616e95 100644
--- a/cervisia/Makefile.am
+++ b/cervisia/Makefile.am
@@ -25,7 +25,7 @@ libcervisiapart_la_SOURCES = updateview.cpp protocolview.cpp protocolview.skel \
 		   entry_status.cpp stringmatcher.cpp cvsinitdlg.cpp ignorelistbase.cpp dirignorelist.cpp \
 		   globalignorelist.cpp editwithmenu.cpp logmessageedit.cpp
 libcervisiapart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libcervisiapart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KUTILS) \
+libcervisiapart_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_KUTILS) \
 		   cvsservice/libcvsservice.la libcervisia.la
 libcervisiapart_la_COMPILE_FIRST = cvsservice/cvsservice_stub.h cervisiasettings.h
 
diff --git a/kapptemplate/existing/app-Makefile.am b/kapptemplate/existing/app-Makefile.am
index 79236a7f..4c03a65c 100644
--- a/kapptemplate/existing/app-Makefile.am
+++ b/kapptemplate/existing/app-Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = \$(all_includes)
 ${APP_NAME_LC}_LDFLAGS = \$(KDE_RPATH) \$(all_libraries)
 
 # the libraries to link against.
-${APP_NAME_LC}_LDADD   = \$(LIB_KFILE)
+${APP_NAME_LC}_LDADD   = \$(LIB_TDEFILE)
 
 # which sources should be compiled for $APP_NAME_LC
 ${APP_NAME_LC}_SOURCES = ${EXISTING_SOURCE}
diff --git a/kapptemplate/kapp/app-Makefile.am b/kapptemplate/kapp/app-Makefile.am
index bf17e8aa..ac039f6d 100644
--- a/kapptemplate/kapp/app-Makefile.am
+++ b/kapptemplate/kapp/app-Makefile.am
@@ -17,7 +17,7 @@ INCLUDES         = \$(all_includes)
 ${APP_NAME_LC}_LDFLAGS = \$(KDE_RPATH) \$(all_libraries)
 
 # the libraries to link against.
-${APP_NAME_LC}_LDADD   = \$(LIB_KFILE) -ltdeprint
+${APP_NAME_LC}_LDADD   = \$(LIB_TDEFILE) -ltdeprint
 
 # which sources should be compiled for $APP_NAME_LC
 ${APP_NAME_LC}_SOURCES =	main.cpp ${APP_NAME_LC}.cpp ${APP_NAME_LC}view.cpp \\
diff --git a/kapptemplate/kpartapp/app-Makefile.am b/kapptemplate/kpartapp/app-Makefile.am
index 3aa0495f..defeb588 100644
--- a/kapptemplate/kpartapp/app-Makefile.am
+++ b/kapptemplate/kpartapp/app-Makefile.am
@@ -46,7 +46,7 @@ kde_module_LTLIBRARIES = lib${APP_NAME_LC}part.la
 # the Part's source, library search path, and link libraries
 lib${APP_NAME_LC}part_la_SOURCES = ${APP_NAME_LC}_part.cpp
 lib${APP_NAME_LC}part_la_LDFLAGS = -module \$(KDE_PLUGIN) \$(all_libraries)
-lib${APP_NAME_LC}part_la_LIBADD  = \$(LIB_KPARTS) \$(LIB_KFILE)
+lib${APP_NAME_LC}part_la_LIBADD  = \$(LIB_KPARTS) \$(LIB_TDEFILE)
 
 # this is where the desktop file will go 
 partdesktopdir   = \$(kde_servicesdir)
diff --git a/kbabel/addons/tdefile-plugins/tdefile_po.h b/kbabel/addons/tdefile-plugins/tdefile_po.h
index 75ed429b..e1d449ae 100644
--- a/kbabel/addons/tdefile-plugins/tdefile_po.h
+++ b/kbabel/addons/tdefile-plugins/tdefile_po.h
@@ -29,8 +29,8 @@
  */
 
 
-#ifndef KFILE_PO_H
-#define KFILE_PO_H
+#ifndef TDEFILE_PO_H
+#define TDEFILE_PO_H
 
 #include <tdefilemetainfo.h>
 
@@ -47,4 +47,4 @@ class KPoPlugin : public KFilePlugin
     virtual bool readInfo(KFileMetaInfo& info, uint);
 };
 
-#endif // KFILE_PO_H
+#endif // TDEFILE_PO_H
diff --git a/kbugbuster/Makefile.am b/kbugbuster/Makefile.am
index f1e6939d..23f98061 100644
--- a/kbugbuster/Makefile.am
+++ b/kbugbuster/Makefile.am
@@ -1,11 +1,11 @@
 if include_kcalresource
-KRESOURCES_SUBDIR = tderesources
+TDERESOURCES_SUBDIR = tderesources
 LIBKCAL_INCLUDES= $(KDE_INCLUDES)/libkcal
 endif
 
 INCLUDES= -I$(top_srcdir)/kbugbuster/backend $(all_includes) $(LIBKCAL_INCLUDES)
 
-SUBDIRS = backend gui pics $(KRESOURCES_SUBDIR)
+SUBDIRS = backend gui pics $(TDERESOURCES_SUBDIR)
 
 bin_PROGRAMS = kbugbuster
 
diff --git a/kompare/komparepart/Makefile.am b/kompare/komparepart/Makefile.am
index f076448b..1a8bdbd5 100644
--- a/kompare/komparepart/Makefile.am
+++ b/kompare/komparepart/Makefile.am
@@ -34,7 +34,7 @@ libkomparepart_la_SOURCES = \
 	komparesaveoptionswidget.cpp
 
 libkomparepart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-libkomparepart_la_LIBADD  = $(LIB_KPARTS) $(LIB_KFILE) \
+libkomparepart_la_LIBADD  = $(LIB_KPARTS) $(LIB_TDEFILE) \
 	../libdialogpages/libdialogpages.la \
 	../libdiff2/libdiff2.la \
 	../interfaces/libkompareinterface.la
diff --git a/kompare/libdialogpages/Makefile.am b/kompare/libdialogpages/Makefile.am
index e13405eb..b4078910 100644
--- a/kompare/libdialogpages/Makefile.am
+++ b/kompare/libdialogpages/Makefile.am
@@ -29,4 +29,4 @@ libdialogpages_la_SOURCES = \
 	viewpage.cpp
 
 libdialogpages_la_LDFLAGS = $(all_libraries)
-libdialogpages_la_LIBADD  = $(LIB_KFILE)
+libdialogpages_la_LIBADD  = $(LIB_TDEFILE)
diff --git a/kompare/libdiff2/Makefile.am b/kompare/libdiff2/Makefile.am
index 6f9048d8..dec34126 100644
--- a/kompare/libdiff2/Makefile.am
+++ b/kompare/libdiff2/Makefile.am
@@ -33,5 +33,5 @@ libdiff2_la_SOURCES = \
 	perforceparser.cpp
 
 libdiff2_la_LDFLAGS = $(all_libraries)
-libdiff2_la_LIBADD  = $(LIB_KFILE)
+libdiff2_la_LIBADD  = $(LIB_TDEFILE)
 
diff --git a/kuiviewer/Makefile.am b/kuiviewer/Makefile.am
index d3ba9a11..90a639c3 100644
--- a/kuiviewer/Makefile.am
+++ b/kuiviewer/Makefile.am
@@ -42,7 +42,7 @@ kde_module_LTLIBRARIES = libkuiviewerpart.la quithumbnail.la
 # the Part's source, library search path, and link libraries
 libkuiviewerpart_la_SOURCES = kuiviewer_part.cpp
 libkuiviewerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libkuiviewerpart_la_LIBADD  = $(LIB_KPARTS) $(LIB_KFILE) $(LIB_QUI)
+libkuiviewerpart_la_LIBADD  = $(LIB_KPARTS) $(LIB_TDEFILE) $(LIB_QUI)
 
 # this is where the desktop file will go 
 partdesktopdir   = $(kde_servicesdir)
diff --git a/scripts/tdesvn-build b/scripts/tdesvn-build
index 657b0390..ac998f28 100755
--- a/scripts/tdesvn-build
+++ b/scripts/tdesvn-build
@@ -2231,7 +2231,7 @@ DONE
 sub get_lock
 {
     my $lockfile = "$ENV{HOME}/.tdesvn-lock";
-    sysopen LOCKFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL;
+    sysopen LOCTDEFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL;
     my $errorCode = $!; # Save for later testing.
 
     # Install signal handlers to ensure that the lockfile gets closed.
@@ -2298,16 +2298,16 @@ sub get_lock
         # twice.
         warning " y[WARNING]: stale tdesvn-build lockfile found, deleting.";
         unlink $lockfile;
-        sysopen LOCKFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL and do
+        sysopen LOCTDEFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL and do
         {
-            print LOCKFILE "$$\n";
-            close LOCKFILE;
+            print LOCTDEFILE "$$\n";
+            close LOCTDEFILE;
         };
         return 1; # Hope the sysopen worked.
     }
 
-    print LOCKFILE "$$\n";
-    close LOCKFILE;
+    print LOCTDEFILE "$$\n";
+    close LOCTDEFILE;
 
     # Even if we fail it's generally better to allow the script to proceed
     # without being a jerk about things, especially as more non-CLI-skilled
@@ -2320,7 +2320,7 @@ sub close_lock
 {
     my $lockfile = "$ENV{HOME}/.tdesvn-lock";
 
-    close LOCKFILE;
+    close LOCTDEFILE;
     unlink $lockfile;
 }
 
diff --git a/tdefile-plugins/c++/tdefile_cpp.h b/tdefile-plugins/c++/tdefile_cpp.h
index f289b09b..3a01ff78 100644
--- a/tdefile-plugins/c++/tdefile_cpp.h
+++ b/tdefile-plugins/c++/tdefile_cpp.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __KFILE_CPP_H__
-#define __KFILE_CPP_H__
+#ifndef __TDEFILE_CPP_H__
+#define __TDEFILE_CPP_H__
 
 #include <tdefilemetainfo.h>
 #include <kurl.h>
diff --git a/tdefile-plugins/diff/tdefile_diff.h b/tdefile-plugins/diff/tdefile_diff.h
index 15e9abeb..ba6d08eb 100644
--- a/tdefile-plugins/diff/tdefile_diff.h
+++ b/tdefile-plugins/diff/tdefile_diff.h
@@ -15,8 +15,8 @@
 **
 ***************************************************************************/
 
-#ifndef __KFILE_PDF_H__
-#define __KFILE_PDF_H__
+#ifndef __TDEFILE_PDF_H__
+#define __TDEFILE_PDF_H__
 
 #include <tdefilemetainfo.h>
 
diff --git a/tdefile-plugins/ts/tdefile_ts.h b/tdefile-plugins/ts/tdefile_ts.h
index 0f03fac1..ea3d1a92 100644
--- a/tdefile-plugins/ts/tdefile_ts.h
+++ b/tdefile-plugins/ts/tdefile_ts.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __KFILE_TS_H_
-#define __KFILE_TS_H_
+#ifndef __TDEFILE_TS_H_
+#define __TDEFILE_TS_H_
 
 #include <tdefilemetainfo.h>