256 files changed, 733 insertions, 733 deletions

diff --git a/ChangeLog b/ChangeLog
index 13abe9e..5a59ac2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -147,7 +147,7 @@ for second ctors ItemInt64 and ItemUInt64
 ------------------------------------------------------------------------
 r92 | (jim) | 2006-01-14 14:03:35 -0800 (Sat, 14 Jan 2006) | 2 lines
 
-reversed tdecore/kconfigskeleton change
+reversed tdecore/tdeconfigskeleton change
 
 ------------------------------------------------------------------------
 r91 | (jim) | 2006-01-14 13:40:37 -0800 (Sat, 14 Jan 2006) | 2 lines
@@ -157,9 +157,9 @@ remove erroneous files
 ------------------------------------------------------------------------
 r90 | (jim) | 2006-01-14 13:38:39 -0800 (Sat, 14 Jan 2006) | 5 lines
 
-Fix sio syntax errors in tdecore/kconfigskeleton.sip
+Fix sio syntax errors in tdecore/tdeconfigskeleton.sip
 (TQValueList<int>() as arg default value) and
-kio/slaveinterface.sip (%TypeHeaderCode in namespace
+tdeio/slaveinterface.sip (%TypeHeaderCode in namespace
 instead of %ModuleHeaderCode outside)
 
 ------------------------------------------------------------------------
diff --git a/Changelog b/Changelog
index b0efa96..900e318 100644
--- a/Changelog
+++ b/Changelog
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------
 r160 | (no author) | 2006-09-22 00:23:44 -0700 (Fri, 22 Sep 2006) | 2 lines
 
-kio/kfileshare changed in error - reverted
+tdeio/tdefileshare changed in error - reverted
 
 ------------------------------------------------------------------------
 r159 | (no author) | 2006-09-22 00:22:47 -0700 (Fri, 22 Sep 2006) | 3 lines
@@ -162,17 +162,17 @@ r126 | (no author) | 2006-01-22 23:08:28 -0800 (Sun, 22 Jan 2006) | 4 lines
 
 changed configure.py to concatenate by default for
 gcc >= 4.0.3; deleted unneeded mapped type from
-kio/global.sip
+tdeio/global.sip
 
 ------------------------------------------------------------------------
 r125 | (no author) | 2006-01-22 21:45:55 -0800 (Sun, 22 Jan 2006) | 8 lines
 
 modify configure.py to drop tderesources for KDE < 3.2;
 version Resource class in kabc/resource.sip; version
-64 bit read/write stuff in tdecore/kconfigbase.sip;
+64 bit read/write stuff in tdecore/tdeconfigbase.sip;
 version copy ctor in tdecore/kprocctrl.sip; version
-out longlong/ulonglong mapped types in kio/global.sip;
-version one method in kio/tdesycoca.sip; fix line with
+out longlong/ulonglong mapped types in tdeio/global.sip;
+version one method in tdeio/tdesycoca.sip; fix line with
 illegal char (?) in extensions/dcopexport.py
 
 ------------------------------------------------------------------------
@@ -324,7 +324,7 @@ for second ctors ItemInt64 and ItemUInt64
 ------------------------------------------------------------------------
 r92 | (no author) | 2006-01-14 14:03:35 -0800 (Sat, 14 Jan 2006) | 2 lines
 
-reversed tdecore/kconfigskeleton change
+reversed tdecore/tdeconfigskeleton change
 
 ------------------------------------------------------------------------
 r91 | (no author) | 2006-01-14 13:40:37 -0800 (Sat, 14 Jan 2006) | 2 lines
@@ -334,9 +334,9 @@ remove erroneous files
 ------------------------------------------------------------------------
 r90 | (no author) | 2006-01-14 13:38:39 -0800 (Sat, 14 Jan 2006) | 5 lines
 
-Fix sio syntax errors in tdecore/kconfigskeleton.sip
+Fix sio syntax errors in tdecore/tdeconfigskeleton.sip
 (TQValueList<int>() as arg default value) and
-kio/slaveinterface.sip (%TypeHeaderCode in namespace
+tdeio/slaveinterface.sip (%TypeHeaderCode in namespace
 instead of %ModuleHeaderCode outside)
 
 ------------------------------------------------------------------------
diff --git a/configure.py b/configure.py
index 9c9a388..3136629 100644
--- a/configure.py
+++ b/configure.py
@@ -96,7 +96,7 @@ opt_dep_warnings  = 0
 opt_libdir        = "lib"
 opt_dist_name     = ""
 
-pytde_modules     = ["dcop", "tdecore", "tdefx", "tdeui", "kio", "tderesources", "kabc", "tdeutils", "kfile", "tdeparts",\
+pytde_modules     = ["dcop", "tdecore", "tdefx", "tdeui", "kio", "tderesources", "kabc", "tdeutils", "tdefile", "tdeparts",\
                      "tdehtml", "tdespell", "tdeprint", "tdemdi"] #, "tdespell2"]
 
 pytde_imports     = {
@@ -109,10 +109,10 @@ pytde_imports     = {
                     "tderesources": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"],
                     "kabc":       ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "tderesources"],
                     "tdeutils":     ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"],
-                    "kfile":      ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"],
+                    "tdefile":      ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"],
                     "tdeparts":     ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"],
                     "tdehtml":      ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeutils", "kio", "tdeparts"],
-                    "tdespell":     ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "kfile"],
+                    "tdespell":     ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "tdefile"],
                     "tdeprint":   ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"],
                     "tdemdi":       ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "tdeparts"],
                     "tdespell2":    ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"]
@@ -125,15 +125,15 @@ kde_includes      = {
                     "tdefx":      None,
                     "tdeui":      None,
                     "kio":        ["kio"],
-                    "tderesources": ["kio", "../kio", "tderesources"],
-                    "kabc":       ["kio", "../kio", "tderesources", "kabc"],
-                    "kfile":      ["kio", "../kio"],
-                    "tdeparts":     ["kio", "../kio", "tdeparts"],
-                    "tdehtml":      ["kio", "../kio", "tdeparts", "dom"],
+                    "tderesources": ["kio", "../tdeio", "tderesources"],
+                    "kabc":       ["kio", "../tdeio", "tderesources", "kabc"],
+                    "tdefile":      ["kio", "../tdeio"],
+                    "tdeparts":     ["kio", "../tdeio", "tdeparts"],
+                    "tdehtml":      ["kio", "../tdeio", "tdeparts", "dom"],
                     "tdespell":     ["kio"],
                     "tdeprint":   ["tdeprint"],
-                    "tdemdi":       ["tdemdi", "kio", "../kio", "tdeparts"],
-                    "tdeutils":     ["kio", "../kio"] #,
+                    "tdemdi":       ["tdemdi", "kio", "../tdeio", "tdeparts"],
+                    "tdeutils":     ["kio", "../tdeio"] #,
 #                    "tdespell2":    None
                     }
 
@@ -148,7 +148,7 @@ postProcess       = {
                     "tderesources": None,
                     "kabc":       None,
                     "kio":        None,
-                    "kfile":      None,
+                    "tdefile":      None,
                     "tdeparts":     None,
                     "tdehtml":      None,
                     "tdespell":     None,
@@ -749,7 +749,7 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e
 
     if extra_lib == "dcop":
         extra_lib = "DCOP"
-    elif extra_lib == "kfile":
+    elif extra_lib == "tdefile":
         extra_lib = "kio"
         
     makefile.extra_libs.append(extra_lib)
diff --git a/doc/classref/allclasses.html b/doc/classref/allclasses.html
index 771f32b..9c5d260 100644
--- a/doc/classref/allclasses.html
+++ b/doc/classref/allclasses.html
@@ -207,7 +207,7 @@
 <tr ><td><a href="kabc/KABC.VCardFormat.html">KABC.VCardFormat</A></td></tr>
 <tr ><td><a href="kabc/KABC.VCardFormatPlugin.html">KABC.VCardFormatPlugin</A></td></tr>
 <tr ><td><a href="kabc/KABC.html">KABC</A></td></tr>
-<tr ><td><a href="kio/KACL.html">KACL</A></td></tr>
+<tr ><td><a href="tdeio/KACL.html">KACL</A></td></tr>
 <tr ><td><a href="tdeui/KAboutApplication.html">KAboutApplication</A></td></tr>
 <tr ><td><a href="tdeui/KAboutContainer.html">KAboutContainer</A></td></tr>
 <tr ><td><a href="tdeui/KAboutContributor.html">KAboutContributor</A></td></tr>
@@ -231,20 +231,20 @@
 <tr ><td><a href="tdeui/KActionShortcutList.html">KActionShortcutList</A></td></tr>
 <tr ><td><a href="tdeui/KActiveLabel.html">KActiveLabel</A></td></tr>
 <tr ><td><a href="tdeui/KAnimWidget.html">KAnimWidget</A></td></tr>
-<tr ><td><a href="kfile/KAppTreeListItem.html">KAppTreeListItem</A></td></tr>
+<tr ><td><a href="tdefile/KAppTreeListItem.html">KAppTreeListItem</A></td></tr>
 <tr ><td><a href="tdecore/TDEApplication.html">TDEApplication</A></td></tr>
-<tr ><td><a href="kfile/TDEApplicationPropsPlugin.html">TDEApplicationPropsPlugin</A></td></tr>
-<tr ><td><a href="kfile/TDEApplicationTree.html">TDEApplicationTree</A></td></tr>
-<tr ><td><a href="kio/KAr.html">KAr</A></td></tr>
-<tr ><td><a href="kio/KArchive.html"><i>KArchive</i></A></td></tr>
-<tr ><td><a href="kio/KArchiveDirectory.html">KArchiveDirectory</A></td></tr>
-<tr ><td><a href="kio/KArchiveEntry.html">KArchiveEntry</A></td></tr>
-<tr ><td><a href="kio/KArchiveFile.html">KArchiveFile</A></td></tr>
+<tr ><td><a href="tdefile/TDEApplicationPropsPlugin.html">TDEApplicationPropsPlugin</A></td></tr>
+<tr ><td><a href="tdefile/TDEApplicationTree.html">TDEApplicationTree</A></td></tr>
+<tr ><td><a href="tdeio/KAr.html">KAr</A></td></tr>
+<tr ><td><a href="tdeio/KArchive.html"><i>KArchive</i></A></td></tr>
+<tr ><td><a href="tdeio/KArchiveDirectory.html">KArchiveDirectory</A></td></tr>
+<tr ><td><a href="tdeio/KArchiveEntry.html">KArchiveEntry</A></td></tr>
+<tr ><td><a href="tdeio/KArchiveFile.html">KArchiveFile</A></td></tr>
 <tr ><td><a href="tdeui/KArrowButton.html">KArrowButton</A></td></tr>
 <tr ><td><a href="tdecore/KAsyncIO.html"><i>KAsyncIO</i></A></td></tr>
 <tr ><td><a href="tdecore/KAudioPlayer.html">KAudioPlayer</A></td></tr>
 <tr ><td><a href="tdeui/KAuthIcon.html"><i>KAuthIcon</i></A></td></tr>
-<tr ><td><a href="kfile/KBindingPropsPlugin.html">KBindingPropsPlugin</A></td></tr>
+<tr ><td><a href="tdefile/KBindingPropsPlugin.html">KBindingPropsPlugin</A></td></tr>
 <tr ><td><a href="tdecore/TDEBufferedIO.html"><i>TDEBufferedIO</i></A></td></tr>
 <tr ><td><a href="tdeui/KBugReport.html">KBugReport</A></td></tr>
 <tr ><td><a href="tdeui/KButtonBox.html">KButtonBox</A></td></tr>
@@ -271,7 +271,7 @@
 <tr ><td><a href="tdeui/KColorDialog.html">KColorDialog</A></td></tr>
 <tr ><td><a href="tdeui/KColorDrag.html">KColorDrag</A></td></tr>
 <tr ><td><a href="tdeui/KColorPatch.html">KColorPatch</A></td></tr>
-<tr ><td><a href="kfile/KCombiView.html">KCombiView</A></td></tr>
+<tr ><td><a href="tdefile/KCombiView.html">KCombiView</A></td></tr>
 <tr ><td><a href="tdeui/KComboBox.html">KComboBox</A></td></tr>
 <tr ><td><a href="tdeui/KCommand.html"><i>KCommand</i></A></td></tr>
 <tr ><td><a href="tdeui/KCommandHistory.html">KCommandHistory</A></td></tr>
@@ -316,16 +316,16 @@
 <tr ><td><a href="tdeui/KContextMenuManager.html">KContextMenuManager</A></td></tr>
 <tr ><td><a href="tdecore/KCrash.html">KCrash</A></td></tr>
 <tr ><td><a href="tdeui/KCursor.html">KCursor</A></td></tr>
-<tr ><td><a href="kfile/KCustomMenuEditor.html">KCustomMenuEditor</A></td></tr>
+<tr ><td><a href="tdefile/KCustomMenuEditor.html">KCustomMenuEditor</A></td></tr>
 <tr ><td><a href="tdeui/KDCOPActionProxy.html">KDCOPActionProxy</A></td></tr>
 <tr ><td><a href="tdecore/KDCOPPropertyProxy.html">KDCOPPropertyProxy</A></td></tr>
-<tr ><td><a href="kio/KDCOPServiceStarter.html">KDCOPServiceStarter</A></td></tr>
+<tr ><td><a href="tdeio/KDCOPServiceStarter.html">KDCOPServiceStarter</A></td></tr>
 <tr ><td><a href="tdecore/KDE.html">KDE</A></td></tr>
-<tr ><td><a href="kio/KDEDesktopMimeType.Service.html">KDEDesktopMimeType.Service</A></td></tr>
-<tr ><td><a href="kio/KDEDesktopMimeType.html">KDEDesktopMimeType</A></td></tr>
-<tr ><td><a href="kio/KDataTool.html"><i>KDataTool</i></A></td></tr>
-<tr ><td><a href="kio/KDataToolAction.html">KDataToolAction</A></td></tr>
-<tr ><td><a href="kio/KDataToolInfo.html">KDataToolInfo</A></td></tr>
+<tr ><td><a href="tdeio/KDEDesktopMimeType.Service.html">KDEDesktopMimeType.Service</A></td></tr>
+<tr ><td><a href="tdeio/KDEDesktopMimeType.html">KDEDesktopMimeType</A></td></tr>
+<tr ><td><a href="tdeio/KDataTool.html"><i>KDataTool</i></A></td></tr>
+<tr ><td><a href="tdeio/KDataToolAction.html">KDataToolAction</A></td></tr>
+<tr ><td><a href="tdeio/KDataToolInfo.html">KDataToolInfo</A></td></tr>
 <tr ><td><a href="tdeui/KDateInternalMonthPicker.html">KDateInternalMonthPicker</A></td></tr>
 <tr ><td><a href="tdeui/KDateInternalWeekSelector.html">KDateInternalWeekSelector</A></td></tr>
 <tr ><td><a href="tdeui/KDateInternalYearSelector.html">KDateInternalYearSelector</A></td></tr>
@@ -335,19 +335,19 @@
 <tr ><td><a href="tdeui/KDateValidator.html">KDateValidator</A></td></tr>
 <tr ><td><a href="tdeui/KDateWidget.html">KDateWidget</A></td></tr>
 <tr ><td><a href="tdecore/KDesktopFile.html">KDesktopFile</A></td></tr>
-<tr ><td><a href="kfile/KDesktopPropsPlugin.html">KDesktopPropsPlugin</A></td></tr>
-<tr ><td><a href="kfile/KDevicePropsPlugin.html">KDevicePropsPlugin</A></td></tr>
+<tr ><td><a href="tdefile/KDesktopPropsPlugin.html">KDesktopPropsPlugin</A></td></tr>
+<tr ><td><a href="tdefile/KDevicePropsPlugin.html">KDevicePropsPlugin</A></td></tr>
 <tr ><td><a href="tdeui/KDialog.html">KDialog</A></td></tr>
 <tr ><td><a href="tdeui/KDialogBase.html">KDialogBase</A></td></tr>
 <tr ><td><a href="tdeui/KDialogQueue.html">KDialogQueue</A></td></tr>
 <tr ><td><a href="tdespell/KDictSpellingHighlighter.html">KDictSpellingHighlighter</A></td></tr>
-<tr ><td><a href="kio/KDirLister.html">KDirLister</A></td></tr>
-<tr ><td><a href="kio/KDirNotify.html"><i>KDirNotify</i></A></td></tr>
-<tr ><td><a href="kfile/KDirOperator.html">KDirOperator</A></td></tr>
-<tr ><td><a href="kfile/KDirSelectDialog.html">KDirSelectDialog</A></td></tr>
-<tr ><td><a href="kfile/KDirSize.html">KDirSize</A></td></tr>
-<tr ><td><a href="kio/KDirWatch.html">KDirWatch</A></td></tr>
-<tr ><td><a href="kfile/KDiskFreeSp.html">KDiskFreeSp</A></td></tr>
+<tr ><td><a href="tdeio/KDirLister.html">KDirLister</A></td></tr>
+<tr ><td><a href="tdeio/KDirNotify.html"><i>KDirNotify</i></A></td></tr>
+<tr ><td><a href="tdefile/KDirOperator.html">KDirOperator</A></td></tr>
+<tr ><td><a href="tdefile/KDirSelectDialog.html">KDirSelectDialog</A></td></tr>
+<tr ><td><a href="tdefile/KDirSize.html">KDirSize</A></td></tr>
+<tr ><td><a href="tdeio/KDirWatch.html">KDirWatch</A></td></tr>
+<tr ><td><a href="tdefile/KDiskFreeSp.html">KDiskFreeSp</A></td></tr>
 <tr ><td><a href="tdeui/KDockArea.html">KDockArea</A></td></tr>
 <tr ><td><a href="tdeui/KDockMainWindow.html">KDockMainWindow</A></td></tr>
 <tr ><td><a href="tdeui/KDockManager.html">KDockManager</A></td></tr>
@@ -361,7 +361,7 @@
 <tr ><td><a href="tdeui/KDoubleSpinBox.html">KDoubleSpinBox</A></td></tr>
 <tr ><td><a href="tdeui/KDoubleValidator.html">KDoubleValidator</A></td></tr>
 <tr ><td><a href="tdeui/KDualColorButton.html">KDualColorButton</A></td></tr>
-<tr ><td><a href="kio/KEMailSettings.html">KEMailSettings</A></td></tr>
+<tr ><td><a href="tdeio/KEMailSettings.html">KEMailSettings</A></td></tr>
 <tr ><td><a href="tdeui/KEdFind.html">KEdFind</A></td></tr>
 <tr ><td><a href="tdeui/KEdGotoLine.html">KEdGotoLine</A></td></tr>
 <tr ><td><a href="tdeui/KEdReplace.html">KEdReplace</A></td></tr>
@@ -370,47 +370,47 @@
 <tr ><td><a href="tdeui/KEditListBox.html">KEditListBox</A></td></tr>
 <tr ><td><a href="tdeui/KEditToolbar.html">KEditToolbar</A></td></tr>
 <tr ><td><a href="tdeui/KEditToolbarWidget.html">KEditToolbarWidget</A></td></tr>
-<tr ><td><a href="kfile/KEncodingFileDialog.Result.html">KEncodingFileDialog.Result</A></td></tr>
-<tr ><td><a href="kfile/KEncodingFileDialog.html">KEncodingFileDialog</A></td></tr>
+<tr ><td><a href="tdefile/KEncodingFileDialog.Result.html">KEncodingFileDialog.Result</A></td></tr>
+<tr ><td><a href="tdefile/KEncodingFileDialog.html">KEncodingFileDialog</A></td></tr>
 <tr ><td><a href="tdecore/KEntry.html">KEntry</A></td></tr>
 <tr ><td><a href="tdecore/KEntryKey.html">KEntryKey</A></td></tr>
-<tr ><td><a href="kio/KExecMimeType.html">KExecMimeType</A></td></tr>
-<tr ><td><a href="kfile/KExecPropsPlugin.html">KExecPropsPlugin</A></td></tr>
-<tr ><td><a href="kfile/KFile.html">KFile</A></td></tr>
-<tr ><td><a href="kfile/KFileDetailView.html">KFileDetailView</A></td></tr>
-<tr ><td><a href="kfile/KFileDialog.html">KFileDialog</A></td></tr>
-<tr ><td><a href="kio/KFileFilter.html"><i>KFileFilter</i></A></td></tr>
-<tr ><td><a href="kfile/KFileFilterCombo.html">KFileFilterCombo</A></td></tr>
-<tr ><td><a href="kfile/KFileIconView.html">KFileIconView</A></td></tr>
-<tr ><td><a href="kfile/KFileIconViewItem.html">KFileIconViewItem</A></td></tr>
-<tr ><td><a href="kio/KFileItem.html">KFileItem</A></td></tr>
-<tr ><td><a href="kfile/KFileListViewItem.html">KFileListViewItem</A></td></tr>
-<tr ><td><a href="kio/KFileMetaInfo.html">KFileMetaInfo</A></td></tr>
-<tr ><td><a href="kio/KFileMetaInfoGroup.html">KFileMetaInfoGroup</A></td></tr>
-<tr ><td><a href="kio/KFileMetaInfoItem.html">KFileMetaInfoItem</A></td></tr>
-<tr ><td><a href="kio/KFileMetaInfoProvider.html">KFileMetaInfoProvider</A></td></tr>
-<tr ><td><a href="kio/KFileMimeTypeInfo.GroupInfo.html">KFileMimeTypeInfo.GroupInfo</A></td></tr>
-<tr ><td><a href="kio/KFileMimeTypeInfo.ItemInfo.html">KFileMimeTypeInfo.ItemInfo</A></td></tr>
-<tr ><td><a href="kio/KFileMimeTypeInfo.html">KFileMimeTypeInfo</A></td></tr>
-<tr ><td><a href="kfile/KFileOpenWithHandler.html">KFileOpenWithHandler</A></td></tr>
-<tr ><td><a href="kfile/KFilePermissionsPropsPlugin.html">KFilePermissionsPropsPlugin</A></td></tr>
-<tr ><td><a href="kio/KFilePlugin.html"><i>KFilePlugin</i></A></td></tr>
-<tr ><td><a href="kfile/KFilePreview.html">KFilePreview</A></td></tr>
-<tr ><td><a href="kfile/KFilePropsPlugin.html">KFilePropsPlugin</A></td></tr>
-<tr ><td><a href="kio/KFileShare.html">KFileShare</A></td></tr>
-<tr ><td><a href="kfile/KFileSharePropsPlugin.html">KFileSharePropsPlugin</A></td></tr>
-<tr ><td><a href="kfile/KFileTreeBranch.html">KFileTreeBranch</A></td></tr>
-<tr ><td><a href="kfile/KFileTreeView.html">KFileTreeView</A></td></tr>
-<tr ><td><a href="kfile/KFileTreeViewItem.html">KFileTreeViewItem</A></td></tr>
-<tr ><td><a href="kfile/KFileTreeViewToolTip.html">KFileTreeViewToolTip</A></td></tr>
-<tr ><td><a href="kfile/KFileView.html"><i>KFileView</i></A></td></tr>
-<tr ><td><a href="kfile/KFileViewSignaler.html">KFileViewSignaler</A></td></tr>
-<tr ><td><a href="kio/KFilterBase.html"><i>KFilterBase</i></A></td></tr>
-<tr ><td><a href="kio/KFilterDev.html">KFilterDev</A></td></tr>
+<tr ><td><a href="tdeio/KExecMimeType.html">KExecMimeType</A></td></tr>
+<tr ><td><a href="tdefile/KExecPropsPlugin.html">KExecPropsPlugin</A></td></tr>
+<tr ><td><a href="tdefile/KFile.html">KFile</A></td></tr>
+<tr ><td><a href="tdefile/KFileDetailView.html">KFileDetailView</A></td></tr>
+<tr ><td><a href="tdefile/KFileDialog.html">KFileDialog</A></td></tr>
+<tr ><td><a href="tdeio/KFileFilter.html"><i>KFileFilter</i></A></td></tr>
+<tr ><td><a href="tdefile/KFileFilterCombo.html">KFileFilterCombo</A></td></tr>
+<tr ><td><a href="tdefile/KFileIconView.html">KFileIconView</A></td></tr>
+<tr ><td><a href="tdefile/KFileIconViewItem.html">KFileIconViewItem</A></td></tr>
+<tr ><td><a href="tdeio/KFileItem.html">KFileItem</A></td></tr>
+<tr ><td><a href="tdefile/KFileListViewItem.html">KFileListViewItem</A></td></tr>
+<tr ><td><a href="tdeio/KFileMetaInfo.html">KFileMetaInfo</A></td></tr>
+<tr ><td><a href="tdeio/KFileMetaInfoGroup.html">KFileMetaInfoGroup</A></td></tr>
+<tr ><td><a href="tdeio/KFileMetaInfoItem.html">KFileMetaInfoItem</A></td></tr>
+<tr ><td><a href="tdeio/KFileMetaInfoProvider.html">KFileMetaInfoProvider</A></td></tr>
+<tr ><td><a href="tdeio/KFileMimeTypeInfo.GroupInfo.html">KFileMimeTypeInfo.GroupInfo</A></td></tr>
+<tr ><td><a href="tdeio/KFileMimeTypeInfo.ItemInfo.html">KFileMimeTypeInfo.ItemInfo</A></td></tr>
+<tr ><td><a href="tdeio/KFileMimeTypeInfo.html">KFileMimeTypeInfo</A></td></tr>
+<tr ><td><a href="tdefile/KFileOpenWithHandler.html">KFileOpenWithHandler</A></td></tr>
+<tr ><td><a href="tdefile/KFilePermissionsPropsPlugin.html">KFilePermissionsPropsPlugin</A></td></tr>
+<tr ><td><a href="tdeio/KFilePlugin.html"><i>KFilePlugin</i></A></td></tr>
+<tr ><td><a href="tdefile/KFilePreview.html">KFilePreview</A></td></tr>
+<tr ><td><a href="tdefile/KFilePropsPlugin.html">KFilePropsPlugin</A></td></tr>
+<tr ><td><a href="tdeio/KFileShare.html">KFileShare</A></td></tr>
+<tr ><td><a href="tdefile/KFileSharePropsPlugin.html">KFileSharePropsPlugin</A></td></tr>
+<tr ><td><a href="tdefile/KFileTreeBranch.html">KFileTreeBranch</A></td></tr>
+<tr ><td><a href="tdefile/KFileTreeView.html">KFileTreeView</A></td></tr>
+<tr ><td><a href="tdefile/KFileTreeViewItem.html">KFileTreeViewItem</A></td></tr>
+<tr ><td><a href="tdefile/KFileTreeViewToolTip.html">KFileTreeViewToolTip</A></td></tr>
+<tr ><td><a href="tdefile/KFileView.html"><i>KFileView</i></A></td></tr>
+<tr ><td><a href="tdefile/KFileViewSignaler.html">KFileViewSignaler</A></td></tr>
+<tr ><td><a href="tdeio/KFilterBase.html"><i>KFilterBase</i></A></td></tr>
+<tr ><td><a href="tdeio/KFilterDev.html">KFilterDev</A></td></tr>
 <tr ><td><a href="tdeutils/KFind.html">KFind</A></td></tr>
 <tr ><td><a href="tdeutils/KFindDialog.html">KFindDialog</A></td></tr>
 <tr ><td><a href="tdeui/KFloatValidator.html">KFloatValidator</A></td></tr>
-<tr ><td><a href="kio/KFolderType.html">KFolderType</A></td></tr>
+<tr ><td><a href="tdeio/KFolderType.html">KFolderType</A></td></tr>
 <tr ><td><a href="tdeui/KFontAction.html">KFontAction</A></td></tr>
 <tr ><td><a href="tdeui/KFontChooser.html">KFontChooser</A></td></tr>
 <tr ><td><a href="tdeui/KFontCombo.html">KFontCombo</A></td></tr>
@@ -430,49 +430,49 @@
 <tr ><td><a href="tdeui/KHelpMenu.html">KHelpMenu</A></td></tr>
 <tr ><td><a href="tdeui/KHistoryCombo.html">KHistoryCombo</A></td></tr>
 <tr ><td><a href="tdecore/KIDNA.html">KIDNA</A></td></tr>
-<tr ><td><a href="kio/KIO.AuthInfo.html">KIO.AuthInfo</A></td></tr>
-<tr ><td><a href="kio/KIO.ChmodJob.html">KIO.ChmodJob</A></td></tr>
-<tr ><td><a href="kio/KIO.Connection.html">KIO.Connection</A></td></tr>
-<tr ><td><a href="kio/KIO.CopyInfo.html">KIO.CopyInfo</A></td></tr>
-<tr ><td><a href="kio/KIO.CopyJob.html">KIO.CopyJob</A></td></tr>
-<tr ><td><a href="kio/KIO.DavJob.html">KIO.DavJob</A></td></tr>
-<tr ><td><a href="kio/KIO.DefaultProgress.html">KIO.DefaultProgress</A></td></tr>
-<tr ><td><a href="kio/KIO.DeleteJob.html">KIO.DeleteJob</A></td></tr>
-<tr ><td><a href="kio/KIO.DirectCopyJob.html">KIO.DirectCopyJob</A></td></tr>
-<tr ><td><a href="kio/KIO.FileCopyJob.html">KIO.FileCopyJob</A></td></tr>
-<tr ><td><a href="kio/KIO.ForwardingSlaveBase.html"><i>KIO.ForwardingSlaveBase</i></A></td></tr>
-<tr ><td><a href="kio/KIO.Job.html">KIO.Job</A></td></tr>
-<tr ><td><a href="kio/KIO.ListJob.html">KIO.ListJob</A></td></tr>
-<tr ><td><a href="kio/KIO.MetaInfoJob.html">KIO.MetaInfoJob</A></td></tr>
-<tr ><td><a href="kio/KIO.MimetypeJob.html">KIO.MimetypeJob</A></td></tr>
-<tr ><td><a href="kio/KIO.MkdirJob.html">KIO.MkdirJob</A></td></tr>
-<tr ><td><a href="kio/KIO.MultiGetJob.html">KIO.MultiGetJob</A></td></tr>
-<tr ><td><a href="kio/KIO.NetAccess.html">KIO.NetAccess</A></td></tr>
-<tr ><td><a href="kio/KIO.NetRC.AutoLogin.html">KIO.NetRC.AutoLogin</A></td></tr>
-<tr ><td><a href="kio/KIO.NetRC.html">KIO.NetRC</A></td></tr>
-<tr ><td><a href="kio/KIO.PasswordDialog.html">KIO.PasswordDialog</A></td></tr>
-<tr ><td><a href="kio/KIO.PreviewJob.html">KIO.PreviewJob</A></td></tr>
-<tr ><td><a href="kio/KIO.ProgressBase.html">KIO.ProgressBase</A></td></tr>
-<tr ><td><a href="kio/KIO.Scheduler.html">KIO.Scheduler</A></td></tr>
-<tr ><td><a href="kio/KIO.SessionData.html">KIO.SessionData</A></td></tr>
-<tr ><td><a href="kio/KIO.SimpleJob.html">KIO.SimpleJob</A></td></tr>
-<tr ><td><a href="kio/KIO.Slave.html">KIO.Slave</A></td></tr>
-<tr ><td><a href="kio/KIO.SlaveBase.html">KIO.SlaveBase</A></td></tr>
-<tr ><td><a href="kio/KIO.SlaveConfig.html">KIO.SlaveConfig</A></td></tr>
-<tr ><td><a href="kio/KIO.SlaveInterface.html">KIO.SlaveInterface</A></td></tr>
-<tr ><td><a href="kio/KIO.StatJob.html">KIO.StatJob</A></td></tr>
-<tr ><td><a href="kio/KIO.StatusbarProgress.html">KIO.StatusbarProgress</A></td></tr>
-<tr ><td><a href="kio/KIO.StoredTransferJob.html">KIO.StoredTransferJob</A></td></tr>
-<tr ><td><a href="kio/KIO.TCPSlaveBase.html">KIO.TCPSlaveBase</A></td></tr>
-<tr ><td><a href="kio/KIO.Task.html">KIO.Task</A></td></tr>
-<tr ><td><a href="kio/KIO.TransferJob.html">KIO.TransferJob</A></td></tr>
-<tr ><td><a href="kio/KIO.UDSAtom.html">KIO.UDSAtom</A></td></tr>
-<tr ><td><a href="kio/KIO.html">KIO</A></td></tr>
+<tr ><td><a href="tdeio/KIO.AuthInfo.html">KIO.AuthInfo</A></td></tr>
+<tr ><td><a href="tdeio/KIO.ChmodJob.html">KIO.ChmodJob</A></td></tr>
+<tr ><td><a href="tdeio/KIO.Connection.html">KIO.Connection</A></td></tr>
+<tr ><td><a href="tdeio/KIO.CopyInfo.html">KIO.CopyInfo</A></td></tr>
+<tr ><td><a href="tdeio/KIO.CopyJob.html">KIO.CopyJob</A></td></tr>
+<tr ><td><a href="tdeio/KIO.DavJob.html">KIO.DavJob</A></td></tr>
+<tr ><td><a href="tdeio/KIO.DefaultProgress.html">KIO.DefaultProgress</A></td></tr>
+<tr ><td><a href="tdeio/KIO.DeleteJob.html">KIO.DeleteJob</A></td></tr>
+<tr ><td><a href="tdeio/KIO.DirectCopyJob.html">KIO.DirectCopyJob</A></td></tr>
+<tr ><td><a href="tdeio/KIO.FileCopyJob.html">KIO.FileCopyJob</A></td></tr>
+<tr ><td><a href="tdeio/KIO.ForwardingSlaveBase.html"><i>KIO.ForwardingSlaveBase</i></A></td></tr>
+<tr ><td><a href="tdeio/KIO.Job.html">KIO.Job</A></td></tr>
+<tr ><td><a href="tdeio/KIO.ListJob.html">KIO.ListJob</A></td></tr>
+<tr ><td><a href="tdeio/KIO.MetaInfoJob.html">KIO.MetaInfoJob</A></td></tr>
+<tr ><td><a href="tdeio/KIO.MimetypeJob.html">KIO.MimetypeJob</A></td></tr>
+<tr ><td><a href="tdeio/KIO.MkdirJob.html">KIO.MkdirJob</A></td></tr>
+<tr ><td><a href="tdeio/KIO.MultiGetJob.html">KIO.MultiGetJob</A></td></tr>
+<tr ><td><a href="tdeio/KIO.NetAccess.html">KIO.NetAccess</A></td></tr>
+<tr ><td><a href="tdeio/KIO.NetRC.AutoLogin.html">KIO.NetRC.AutoLogin</A></td></tr>
+<tr ><td><a href="tdeio/KIO.NetRC.html">KIO.NetRC</A></td></tr>
+<tr ><td><a href="tdeio/KIO.PasswordDialog.html">KIO.PasswordDialog</A></td></tr>
+<tr ><td><a href="tdeio/KIO.PreviewJob.html">KIO.PreviewJob</A></td></tr>
+<tr ><td><a href="tdeio/KIO.ProgressBase.html">KIO.ProgressBase</A></td></tr>
+<tr ><td><a href="tdeio/KIO.Scheduler.html">KIO.Scheduler</A></td></tr>
+<tr ><td><a href="tdeio/KIO.SessionData.html">KIO.SessionData</A></td></tr>
+<tr ><td><a href="tdeio/KIO.SimpleJob.html">KIO.SimpleJob</A></td></tr>
+<tr ><td><a href="tdeio/KIO.Slave.html">KIO.Slave</A></td></tr>
+<tr ><td><a href="tdeio/KIO.SlaveBase.html">KIO.SlaveBase</A></td></tr>
+<tr ><td><a href="tdeio/KIO.SlaveConfig.html">KIO.SlaveConfig</A></td></tr>
+<tr ><td><a href="tdeio/KIO.SlaveInterface.html">KIO.SlaveInterface</A></td></tr>
+<tr ><td><a href="tdeio/KIO.StatJob.html">KIO.StatJob</A></td></tr>
+<tr ><td><a href="tdeio/KIO.StatusbarProgress.html">KIO.StatusbarProgress</A></td></tr>
+<tr ><td><a href="tdeio/KIO.StoredTransferJob.html">KIO.StoredTransferJob</A></td></tr>
+<tr ><td><a href="tdeio/KIO.TCPSlaveBase.html">KIO.TCPSlaveBase</A></td></tr>
+<tr ><td><a href="tdeio/KIO.Task.html">KIO.Task</A></td></tr>
+<tr ><td><a href="tdeio/KIO.TransferJob.html">KIO.TransferJob</A></td></tr>
+<tr ><td><a href="tdeio/KIO.UDSAtom.html">KIO.UDSAtom</A></td></tr>
+<tr ><td><a href="tdeio/KIO.html">KIO</A></td></tr>
 <tr ><td><a href="tdecore/KIPC.html">KIPC</A></td></tr>
 <tr ><td><a href="tdecore/KIcon.html">KIcon</A></td></tr>
-<tr ><td><a href="kfile/KIconButton.html">KIconButton</A></td></tr>
-<tr ><td><a href="kfile/KIconCanvas.html">KIconCanvas</A></td></tr>
-<tr ><td><a href="kfile/KIconDialog.html">KIconDialog</A></td></tr>
+<tr ><td><a href="tdefile/KIconButton.html">KIconButton</A></td></tr>
+<tr ><td><a href="tdefile/KIconCanvas.html">KIconCanvas</A></td></tr>
+<tr ><td><a href="tdefile/KIconDialog.html">KIconDialog</A></td></tr>
 <tr ><td><a href="tdecore/KIconEffect.html">KIconEffect</A></td></tr>
 <tr ><td><a href="tdecore/KIconLoader.html">KIconLoader</A></td></tr>
 <tr ><td><a href="tdecore/KIconTheme.html">KIconTheme</A></td></tr>
@@ -480,8 +480,8 @@
 <tr ><td><a href="tdeui/KIconViewItem.html">KIconViewItem</A></td></tr>
 <tr ><td><a href="tdeui/KIconViewSearchLine.html">KIconViewSearchLine</A></td></tr>
 <tr ><td><a href="tdefx/KImageEffect.html">KImageEffect</A></td></tr>
-<tr ><td><a href="kfile/KImageFilePreview.html">KImageFilePreview</A></td></tr>
-<tr ><td><a href="kio/KImageIO.html">KImageIO</A></td></tr>
+<tr ><td><a href="tdefile/KImageFilePreview.html">KImageFilePreview</A></td></tr>
+<tr ><td><a href="tdeio/KImageIO.html">KImageIO</A></td></tr>
 <tr ><td><a href="tdeui/KInputDialog.html">KInputDialog</A></td></tr>
 <tr ><td><a href="tdecore/TDEInstance.html">TDEInstance</A></td></tr>
 <tr ><td><a href="tdeui/KIntNumInput.html">KIntNumInput</A></td></tr>
@@ -547,34 +547,34 @@
 <tr ><td><a href="tdemdi/KMdiWin32IconButton.html">KMdiWin32IconButton</A></td></tr>
 <tr ><td><a href="tdeui/KMenuBar.html">KMenuBar</A></td></tr>
 <tr ><td><a href="tdeui/KMessageBox.html">KMessageBox</A></td></tr>
-<tr ><td><a href="kio/KMimeMagic.html">KMimeMagic</A></td></tr>
-<tr ><td><a href="kio/KMimeMagicResult.html">KMimeMagicResult</A></td></tr>
+<tr ><td><a href="tdeio/KMimeMagic.html">KMimeMagic</A></td></tr>
+<tr ><td><a href="tdeio/KMimeMagicResult.html">KMimeMagicResult</A></td></tr>
 <tr ><td><a href="tdecore/KMimeSourceFactory.html">KMimeSourceFactory</A></td></tr>
-<tr ><td><a href="kio/KMimeType.Format.html">KMimeType.Format</A></td></tr>
-<tr ><td><a href="kio/KMimeType.html">KMimeType</A></td></tr>
-<tr ><td><a href="kio/KMimeTypeChooser.html">KMimeTypeChooser</A></td></tr>
-<tr ><td><a href="kio/KMimeTypeChooserDialog.html">KMimeTypeChooserDialog</A></td></tr>
+<tr ><td><a href="tdeio/KMimeType.Format.html">KMimeType.Format</A></td></tr>
+<tr ><td><a href="tdeio/KMimeType.html">KMimeType</A></td></tr>
+<tr ><td><a href="tdeio/KMimeTypeChooser.html">KMimeTypeChooser</A></td></tr>
+<tr ><td><a href="tdeio/KMimeTypeChooserDialog.html">KMimeTypeChooserDialog</A></td></tr>
 <tr ><td><a href="tdeui/KMimeTypeValidator.html">KMimeTypeValidator</A></td></tr>
 <tr ><td><a href="tdecore/KMountPoint.html">KMountPoint</A></td></tr>
 <tr ><td><a href="tdeutils/KMultiTabBar.html">KMultiTabBar</A></td></tr>
 <tr ><td><a href="tdeutils/KMultiTabBarButton.html">KMultiTabBarButton</A></td></tr>
 <tr ><td><a href="tdeutils/KMultiTabBarTab.html">KMultiTabBarTab</A></td></tr>
 <tr ><td><a href="tdecore/KMultipleDrag.html">KMultipleDrag</A></td></tr>
-<tr ><td><a href="kio/KNFSShare.html">KNFSShare</A></td></tr>
+<tr ><td><a href="tdeio/KNFSShare.html">KNFSShare</A></td></tr>
 <tr ><td><a href="tdeui/KNamedCommand.html">KNamedCommand</A></td></tr>
-<tr ><td><a href="kfile/KNotify.Application.html">KNotify.Application</A></td></tr>
-<tr ><td><a href="kfile/KNotify.ApplicationList.html">KNotify.ApplicationList</A></td></tr>
-<tr ><td><a href="kfile/KNotify.Event.html">KNotify.Event</A></td></tr>
-<tr ><td><a href="kfile/KNotify.KNotifyWidget.html">KNotify.KNotifyWidget</A></td></tr>
-<tr ><td><a href="kfile/KNotify.html">KNotify</A></td></tr>
+<tr ><td><a href="tdefile/KNotify.Application.html">KNotify.Application</A></td></tr>
+<tr ><td><a href="tdefile/KNotify.ApplicationList.html">KNotify.ApplicationList</A></td></tr>
+<tr ><td><a href="tdefile/KNotify.Event.html">KNotify.Event</A></td></tr>
+<tr ><td><a href="tdefile/KNotify.KNotifyWidget.html">KNotify.KNotifyWidget</A></td></tr>
+<tr ><td><a href="tdefile/KNotify.html">KNotify</A></td></tr>
 <tr ><td><a href="tdecore/KNotifyClient.Instance.html">KNotifyClient.Instance</A></td></tr>
 <tr ><td><a href="tdecore/KNotifyClient.html">KNotifyClient</A></td></tr>
-<tr ><td><a href="kfile/KNotifyDialog.html">KNotifyDialog</A></td></tr>
+<tr ><td><a href="tdefile/KNotifyDialog.html">KNotifyDialog</A></td></tr>
 <tr ><td><a href="tdeui/KNumInput.html"><i>KNumInput</i></A></td></tr>
-<tr ><td><a href="kio/KOCRDialog.html">KOCRDialog</A></td></tr>
-<tr ><td><a href="kio/KOCRDialogFactory.html"><i>KOCRDialogFactory</i></A></td></tr>
-<tr ><td><a href="kfile/KOpenWithDlg.html">KOpenWithDlg</A></td></tr>
-<tr ><td><a href="kio/KOpenWithHandler.html">KOpenWithHandler</A></td></tr>
+<tr ><td><a href="tdeio/KOCRDialog.html">KOCRDialog</A></td></tr>
+<tr ><td><a href="tdeio/KOCRDialogFactory.html"><i>KOCRDialogFactory</i></A></td></tr>
+<tr ><td><a href="tdefile/KOpenWithDlg.html">KOpenWithDlg</A></td></tr>
+<tr ><td><a href="tdeio/KOpenWithHandler.html">KOpenWithHandler</A></td></tr>
 <tr ><td><a href="tdeprint/KPReloadObject.html"><i>KPReloadObject</i></A></td></tr>
 <tr ><td><a href="tdecore/KPalette.html">KPalette</A></td></tr>
 <tr ><td><a href="tdeui/KPaletteTable.html">KPaletteTable</A></td></tr>
@@ -623,7 +623,7 @@
 <tr ><td><a href="tdeui/KPopupFrame.html">KPopupFrame</A></td></tr>
 <tr ><td><a href="tdeui/KPopupMenu.html">KPopupMenu</A></td></tr>
 <tr ><td><a href="tdeui/KPopupTitle.html">KPopupTitle</A></td></tr>
-<tr ><td><a href="kfile/KPreviewWidgetBase.html"><i>KPreviewWidgetBase</i></A></td></tr>
+<tr ><td><a href="tdefile/KPreviewWidgetBase.html"><i>KPreviewWidgetBase</i></A></td></tr>
 <tr ><td><a href="tdeprint/KPrintAction.html">KPrintAction</A></td></tr>
 <tr ><td><a href="tdeprint/KPrintDialog.html">KPrintDialog</A></td></tr>
 <tr ><td><a href="tdeprint/KPrintDialogPage.html">KPrintDialogPage</A></td></tr>
@@ -631,14 +631,14 @@
 <tr ><td><a href="tdecore/KProcIO.html">KProcIO</A></td></tr>
 <tr ><td><a href="tdecore/TDEProcess.html">TDEProcess</A></td></tr>
 <tr ><td><a href="tdecore/TDEProcessController.html">TDEProcessController</A></td></tr>
-<tr ><td><a href="kio/TDEProcessRunner.html">TDEProcessRunner</A></td></tr>
+<tr ><td><a href="tdeio/TDEProcessRunner.html">TDEProcessRunner</A></td></tr>
 <tr ><td><a href="tdeui/KProgress.html">KProgress</A></td></tr>
 <tr ><td><a href="tdeui/KProgressDialog.html">KProgressDialog</A></td></tr>
-<tr ><td><a href="kfile/KPropertiesDialog.html">KPropertiesDialog</A></td></tr>
-<tr ><td><a href="kfile/KPropsDlgPlugin.html">KPropsDlgPlugin</A></td></tr>
-<tr ><td><a href="kio/KProtocolInfo.ExtraField.html">KProtocolInfo.ExtraField</A></td></tr>
-<tr ><td><a href="kio/KProtocolInfo.html">KProtocolInfo</A></td></tr>
-<tr ><td><a href="kio/KProtocolManager.html">KProtocolManager</A></td></tr>
+<tr ><td><a href="tdefile/KPropertiesDialog.html">KPropertiesDialog</A></td></tr>
+<tr ><td><a href="tdefile/KPropsDlgPlugin.html">KPropsDlgPlugin</A></td></tr>
+<tr ><td><a href="tdeio/KProtocolInfo.ExtraField.html">KProtocolInfo.ExtraField</A></td></tr>
+<tr ><td><a href="tdeio/KProtocolInfo.html">KProtocolInfo</A></td></tr>
+<tr ><td><a href="tdeio/KProtocolManager.html">KProtocolManager</A></td></tr>
 <tr ><td><a href="tdeui/KPushButton.html">KPushButton</A></td></tr>
 <tr ><td><a href="tderesources/KRES.ConfigDialog.html">KRES.ConfigDialog</A></td></tr>
 <tr ><td><a href="tderesources/KRES.ConfigWidget.html"><i>KRES.ConfigWidget</i></A></td></tr>
@@ -651,10 +651,10 @@
 <tr ><td><a href="tdecore/KRFCDate.html">KRFCDate</A></td></tr>
 <tr ><td><a href="tdeui/KRadioAction.html">KRadioAction</A></td></tr>
 <tr ><td><a href="tdecore/KRandomSequence.html">KRandomSequence</A></td></tr>
-<tr ><td><a href="kfile/KRecentDocument.html">KRecentDocument</A></td></tr>
+<tr ><td><a href="tdefile/KRecentDocument.html">KRecentDocument</A></td></tr>
 <tr ><td><a href="tdeui/KRecentFilesAction.html">KRecentFilesAction</A></td></tr>
 <tr ><td><a href="tdecore/KRegExp.html">KRegExp</A></td></tr>
-<tr ><td><a href="kio/KRemoteEncoding.html">KRemoteEncoding</A></td></tr>
+<tr ><td><a href="tdeio/KRemoteEncoding.html">KRemoteEncoding</A></td></tr>
 <tr ><td><a href="tdeutils/KReplace.html">KReplace</A></td></tr>
 <tr ><td><a href="tdeutils/KReplaceDialog.html">KReplaceDialog</A></td></tr>
 <tr ><td><a href="tdeui/KRestrictedLine.html">KRestrictedLine</A></td></tr>
@@ -662,35 +662,35 @@
 <tr ><td><a href="tdeui/KRootPixmap.html">KRootPixmap</A></td></tr>
 <tr ><td><a href="tdecore/KRootProp.html">KRootProp</A></td></tr>
 <tr ><td><a href="tdeui/KRuler.html">KRuler</A></td></tr>
-<tr ><td><a href="kio/KRun.html">KRun</A></td></tr>
-<tr ><td><a href="kio/KSambaShare.html">KSambaShare</A></td></tr>
+<tr ><td><a href="tdeio/KRun.html">KRun</A></td></tr>
+<tr ><td><a href="tdeio/KSambaShare.html">KSambaShare</A></td></tr>
 <tr ><td><a href="tdecore/KSaveFile.html">KSaveFile</A></td></tr>
-<tr ><td><a href="kio/KScanDialog.html">KScanDialog</A></td></tr>
-<tr ><td><a href="kio/KScanDialogFactory.html"><i>KScanDialogFactory</i></A></td></tr>
+<tr ><td><a href="tdeio/KScanDialog.html">KScanDialog</A></td></tr>
+<tr ><td><a href="tdeio/KScanDialogFactory.html"><i>KScanDialogFactory</i></A></td></tr>
 <tr ><td><a href="tdeui/KScrollView.html">KScrollView</A></td></tr>
 <tr ><td><a href="tdeui/KSelectAction.html">KSelectAction</A></td></tr>
 <tr ><td><a href="tdecore/KSelectionOwner.html">KSelectionOwner</A></td></tr>
 <tr ><td><a href="tdecore/KSelectionWatcher.html">KSelectionWatcher</A></td></tr>
 <tr ><td><a href="tdeui/KSelector.html">KSelector</A></td></tr>
 <tr ><td><a href="tdeui/KSeparator.html">KSeparator</A></td></tr>
-<tr ><td><a href="kio/KService.html">KService</A></td></tr>
-<tr ><td><a href="kio/KServiceGroup.html">KServiceGroup</A></td></tr>
-<tr ><td><a href="kio/KServiceOffer.html">KServiceOffer</A></td></tr>
-<tr ><td><a href="kio/KServiceSeparator.html">KServiceSeparator</A></td></tr>
-<tr ><td><a href="kio/KServiceType.html">KServiceType</A></td></tr>
-<tr ><td><a href="kio/KServiceTypeProfile.html">KServiceTypeProfile</A></td></tr>
+<tr ><td><a href="tdeio/KService.html">KService</A></td></tr>
+<tr ><td><a href="tdeio/KServiceGroup.html">KServiceGroup</A></td></tr>
+<tr ><td><a href="tdeio/KServiceOffer.html">KServiceOffer</A></td></tr>
+<tr ><td><a href="tdeio/KServiceSeparator.html">KServiceSeparator</A></td></tr>
+<tr ><td><a href="tdeio/KServiceType.html">KServiceType</A></td></tr>
+<tr ><td><a href="tdeio/KServiceTypeProfile.html">KServiceTypeProfile</A></td></tr>
 <tr ><td><a href="tdecore/KSessionManaged.html">KSessionManaged</A></td></tr>
 <tr ><td><a href="tdecore/KShared.html">KShared</A></td></tr>
 <tr ><td><a href="tdecore/KSharedConfig.html">KSharedConfig</A></td></tr>
 <tr ><td><a href="tdecore/KShell.html">KShell</A></td></tr>
-<tr ><td><a href="kio/KShellCompletion.html">KShellCompletion</A></td></tr>
+<tr ><td><a href="tdeio/KShellCompletion.html">KShellCompletion</A></td></tr>
 <tr ><td><a href="tdecore/KShellProcess.html">KShellProcess</A></td></tr>
 <tr ><td><a href="tdecore/KShortcut.html">KShortcut</A></td></tr>
 <tr ><td><a href="tdeui/KShortcutDialog.html">KShortcutDialog</A></td></tr>
 <tr ><td><a href="tdecore/KShortcutList.html"><i>KShortcutList</i></A></td></tr>
-<tr ><td><a href="kio/KShred.html">KShred</A></td></tr>
+<tr ><td><a href="tdeio/KShred.html">KShred</A></td></tr>
 <tr ><td><a href="tdecore/KSimpleConfig.html">KSimpleConfig</A></td></tr>
-<tr ><td><a href="kio/KSimpleFileFilter.html">KSimpleFileFilter</A></td></tr>
+<tr ><td><a href="tdeio/KSimpleFileFilter.html">KSimpleFileFilter</A></td></tr>
 <tr ><td><a href="tdespell/KSpell.html">KSpell</A></td></tr>
 <tr ><td><a href="tdespell/KSpellConfig.html">KSpellConfig</A></td></tr>
 <tr ><td><a href="tdespell/KSpellDlg.html">KSpellDlg</A></td></tr>
@@ -710,15 +710,15 @@
 <tr ><td><a href="tdecore/KStringHandler.html">KStringHandler</A></td></tr>
 <tr ><td><a href="tdeui/KStringListValidator.html">KStringListValidator</A></td></tr>
 <tr ><td><a href="tdefx/KStyle.html">KStyle</A></td></tr>
-<tr ><td><a href="kio/KSycoca.html">KSycoca</A></td></tr>
-<tr ><td><a href="kio/KSycocaEntry.html"><i>KSycocaEntry</i></A></td></tr>
-<tr ><td><a href="kio/KSycocaFactory.html"><i>KSycocaFactory</i></A></td></tr>
+<tr ><td><a href="tdeio/KSycoca.html">KSycoca</A></td></tr>
+<tr ><td><a href="tdeio/KSycocaEntry.html"><i>KSycocaEntry</i></A></td></tr>
+<tr ><td><a href="tdeio/KSycocaFactory.html"><i>KSycocaFactory</i></A></td></tr>
 <tr ><td><a href="tdespell/KSyntaxHighlighter.html">KSyntaxHighlighter</A></td></tr>
 <tr ><td><a href="tdeui/KSystemTray.html">KSystemTray</A></td></tr>
 <tr ><td><a href="tdeui/KTabBar.html">KTabBar</A></td></tr>
 <tr ><td><a href="tdeui/KTabCtl.html">KTabCtl</A></td></tr>
 <tr ><td><a href="tdeui/KTabWidget.html">KTabWidget</A></td></tr>
-<tr ><td><a href="kio/KTar.html">KTar</A></td></tr>
+<tr ><td><a href="tdeio/KTar.html">KTar</A></td></tr>
 <tr ><td><a href="tdecore/KTempDir.html">KTempDir</A></td></tr>
 <tr ><td><a href="tdecore/KTempFile.html">KTempFile</A></td></tr>
 <tr ><td><a href="tdeui/KTextBrowser.html">KTextBrowser</A></td></tr>
@@ -740,25 +740,25 @@
 <tr ><td><a href="tdeui/KToolBarPopupAction.html">KToolBarPopupAction</A></td></tr>
 <tr ><td><a href="tdeui/KToolBarRadioGroup.html">KToolBarRadioGroup</A></td></tr>
 <tr ><td><a href="tdeui/KToolBarSeparator.html">KToolBarSeparator</A></td></tr>
-<tr ><td><a href="kio/KTrader.html">KTrader</A></td></tr>
-<tr ><td><a href="kio/KURIFilter.html">KURIFilter</A></td></tr>
-<tr ><td><a href="kio/KURIFilterData.html">KURIFilterData</A></td></tr>
-<tr ><td><a href="kio/KURIFilterPlugin.html"><i>KURIFilterPlugin</i></A></td></tr>
+<tr ><td><a href="tdeio/KTrader.html">KTrader</A></td></tr>
+<tr ><td><a href="tdeio/KURIFilter.html">KURIFilter</A></td></tr>
+<tr ><td><a href="tdeio/KURIFilterData.html">KURIFilterData</A></td></tr>
+<tr ><td><a href="tdeio/KURIFilterPlugin.html"><i>KURIFilterPlugin</i></A></td></tr>
 <tr ><td><a href="tdecore/KURL.List.html">KURL.List</A></td></tr>
 <tr ><td><a href="tdecore/KURL.html">KURL</A></td></tr>
-<tr ><td><a href="kfile/KURLBar.html">KURLBar</A></td></tr>
-<tr ><td><a href="kfile/KURLBarItem.html">KURLBarItem</A></td></tr>
-<tr ><td><a href="kfile/KURLBarItemDialog.html">KURLBarItemDialog</A></td></tr>
-<tr ><td><a href="kfile/KURLBarListBox.html">KURLBarListBox</A></td></tr>
-<tr ><td><a href="kfile/KURLComboBox.html">KURLComboBox</A></td></tr>
-<tr ><td><a href="kfile/KURLComboRequester.html">KURLComboRequester</A></td></tr>
-<tr ><td><a href="kio/KURLCompletion.html">KURLCompletion</A></td></tr>
+<tr ><td><a href="tdefile/KURLBar.html">KURLBar</A></td></tr>
+<tr ><td><a href="tdefile/KURLBarItem.html">KURLBarItem</A></td></tr>
+<tr ><td><a href="tdefile/KURLBarItemDialog.html">KURLBarItemDialog</A></td></tr>
+<tr ><td><a href="tdefile/KURLBarListBox.html">KURLBarListBox</A></td></tr>
+<tr ><td><a href="tdefile/KURLComboBox.html">KURLComboBox</A></td></tr>
+<tr ><td><a href="tdefile/KURLComboRequester.html">KURLComboRequester</A></td></tr>
+<tr ><td><a href="tdeio/KURLCompletion.html">KURLCompletion</A></td></tr>
 <tr ><td><a href="tdecore/KURLDrag.html">KURLDrag</A></td></tr>
 <tr ><td><a href="tdeui/KURLLabel.html">KURLLabel</A></td></tr>
-<tr ><td><a href="kio/KURLPixmapProvider.html">KURLPixmapProvider</A></td></tr>
-<tr ><td><a href="kfile/KURLPropsPlugin.html">KURLPropsPlugin</A></td></tr>
-<tr ><td><a href="kfile/KURLRequester.html">KURLRequester</A></td></tr>
-<tr ><td><a href="kfile/KURLRequesterDlg.html">KURLRequesterDlg</A></td></tr>
+<tr ><td><a href="tdeio/KURLPixmapProvider.html">KURLPixmapProvider</A></td></tr>
+<tr ><td><a href="tdefile/KURLPropsPlugin.html">KURLPropsPlugin</A></td></tr>
+<tr ><td><a href="tdefile/KURLRequester.html">KURLRequester</A></td></tr>
+<tr ><td><a href="tdefile/KURLRequesterDlg.html">KURLRequesterDlg</A></td></tr>
 <tr ><td><a href="tdecore/KUniqueApplication.html">KUniqueApplication</A></td></tr>
 <tr ><td><a href="tdeui/KValueSelector.html">KValueSelector</A></td></tr>
 <tr ><td><a href="tdeui/KWidgetAction.html">KWidgetAction</A></td></tr>
@@ -773,8 +773,8 @@
 <tr ><td><a href="tdeui/KXMLGUIClient.html">KXMLGUIClient</A></td></tr>
 <tr ><td><a href="tdeui/KXMLGUIFactory.html">KXMLGUIFactory</A></td></tr>
 <tr ><td><a href="tdeui/KXYSelector.html">KXYSelector</A></td></tr>
-<tr ><td><a href="kio/KZip.html">KZip</A></td></tr>
-<tr ><td><a href="kio/KZipFileEntry.html">KZipFileEntry</A></td></tr>
+<tr ><td><a href="tdeio/KZip.html">KZip</A></td></tr>
+<tr ><td><a href="tdeio/KZipFileEntry.html">KZipFileEntry</A></td></tr>
 <tr ><td><a href="tdecore/KZoneAllocator.html">KZoneAllocator</A></td></tr>
 <tr ><td><a href="tdecore/NET.html">NET</A></td></tr>
 <tr ><td><a href="tdecore/NETExtendedStrut.html">NETExtendedStrut</A></td></tr>
@@ -788,11 +788,11 @@
 <tr ><td><a href="tdecore/NETSize.html">NETSize</A></td></tr>
 <tr ><td><a href="tdecore/NETStrut.html">NETStrut</A></td></tr>
 <tr ><td><a href="tdecore/NETWinInfo.html">NETWinInfo</A></td></tr>
-<tr ><td><a href="kio/Observer.html">Observer</A></td></tr>
+<tr ><td><a href="tdeio/Observer.html">Observer</A></td></tr>
 <tr ><td><a href="tdeui/QXEmbed.html">QXEmbed</A></td></tr>
-<tr ><td><a href="kio/RenameDlgPlugin.html">RenameDlgPlugin</A></td></tr>
+<tr ><td><a href="tdeio/RenameDlgPlugin.html">RenameDlgPlugin</A></td></tr>
 <tr ><td><a href="tdeparts/TerminalInterface.html"><i>TerminalInterface</i></A></td></tr>
-<tr ><td><a href="kio/ThumbCreator.html"><i>ThumbCreator</i></A></td></tr>
+<tr ><td><a href="tdeio/ThumbCreator.html"><i>ThumbCreator</i></A></td></tr>
 <tr ><td><a href="tdeparts/konsoleBrowserExtension.html">konsoleBrowserExtension</A></td></tr>
 <tr ><td><a href="tdeparts/konsoleFactory.html">konsoleFactory</A></td></tr>
 <tr ><td><a href="tdeparts/konsolePart.html">konsolePart</A></td></tr>
diff --git a/doc/classref/index.html b/doc/classref/index.html
index f51a507..857322e 100644
--- a/doc/classref/index.html
+++ b/doc/classref/index.html
@@ -27,9 +27,9 @@
 <li><a href="tdefx/index.html">tdefx</a></li>
 <li><a href="tdeprint/index.html">tdeprint</a></li>
 <li><a href="tdeui/index.html">tdeui</a></li>
-<li><a href="kfile/index.html">kfile</a></li>
+<li><a href="tdefile/index.html">tdefile</a></li>
 <li><a href="tdehtml/index.html">tdehtml</a></li>
-<li><a href="kio/index.html">kio</a></li>
+<li><a href="tdeio/index.html">kio</a></li>
 <li><a href="tdemdi/index.html">tdemdi</a></li>
 <li><a href="tdeparts/index.html">tdeparts</a></li>
 <li><a href="tderesources/index.html">tderesources</a></li>
diff --git a/doc/classref/kio/kio-globals.html b/doc/classref/kio/kio-globals.html
index 3c245a5..5ed17e5 100644
--- a/doc/classref/kio/kio-globals.html
+++ b/doc/classref/kio/kio-globals.html
@@ -24,9 +24,9 @@
             </td>
         </tr></table>
         <h3>enums</h3><ul>
-<li><b><a href="sip/kio/all-globals.html#KSycocaFactoryId">KSycocaFactoryId</a></b> = {KST_KServiceFactory, KST_KServiceTypeFactory, KST_KServiceGroupFactory, KST_KImageIO, KST_KProtocolInfoFactory, KST_CTimeInfo
-}<li><b><a href="sip/kio/all-globals.html#KSycocaType">KSycocaType</a></b> = {KST_KSycocaEntry, KST_KService, KST_KServiceType, KST_KMimeType, KST_KFolderType, KST_KDEDesktopMimeType, KST_KExecMimeType, KST_KServiceGroup, KST_KImageIOFormat, KST_KProtocolInfo, KST_KServiceSeparator, KST_KCustom
-}<li><b><a href="sip/kio/all-globals.html#KSycocaType">KSycocaType</a></b> = {KST_KSycocaEntry, KST_KService, KST_KServiceType, KST_KMimeType, KST_KFolderType, KST_KDEDesktopMimeType, KST_KExecMimeType, KST_KServiceGroup, KST_KImageIOFormat, KST_KProtocolInfo, KST_KCustom
+<li><b><a href="sip/tdeio/all-globals.html#KSycocaFactoryId">KSycocaFactoryId</a></b> = {KST_KServiceFactory, KST_KServiceTypeFactory, KST_KServiceGroupFactory, KST_KImageIO, KST_KProtocolInfoFactory, KST_CTimeInfo
+}<li><b><a href="sip/tdeio/all-globals.html#KSycocaType">KSycocaType</a></b> = {KST_KSycocaEntry, KST_KService, KST_KServiceType, KST_KMimeType, KST_KFolderType, KST_KDEDesktopMimeType, KST_KExecMimeType, KST_KServiceGroup, KST_KImageIOFormat, KST_KProtocolInfo, KST_KServiceSeparator, KST_KCustom
+}<li><b><a href="sip/tdeio/all-globals.html#KSycocaType">KSycocaType</a></b> = {KST_KSycocaEntry, KST_KService, KST_KServiceType, KST_KMimeType, KST_KFolderType, KST_KDEDesktopMimeType, KST_KExecMimeType, KST_KServiceGroup, KST_KImageIOFormat, KST_KProtocolInfo, KST_KCustom
 }</ul>
 <h3>global methods</h3><ul>
 <li><b>testKIOMetaData</b> (dict)
diff --git a/doc/classref/kfile/KAppTreeListItem.html b/doc/classref/tdefile/KAppTreeListItem.html
index 82ac583..68b34da 100644
--- a/doc/classref/kfile/KAppTreeListItem.html
+++ b/doc/classref/tdefile/KAppTreeListItem.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KAppTreeListItem</td>
diff --git a/doc/classref/kfile/KBindingPropsPlugin.html b/doc/classref/tdefile/KBindingPropsPlugin.html
index 2120862..02fff29 100644
--- a/doc/classref/kfile/KBindingPropsPlugin.html
+++ b/doc/classref/tdefile/KBindingPropsPlugin.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KBindingPropsPlugin</td>
diff --git a/doc/classref/kfile/KCombiView.html b/doc/classref/tdefile/KCombiView.html
index c5f301c..115ee55 100644
--- a/doc/classref/kfile/KCombiView.html
+++ b/doc/classref/tdefile/KCombiView.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KCombiView</td>
diff --git a/doc/classref/kfile/KCustomMenuEditor.html b/doc/classref/tdefile/KCustomMenuEditor.html
index e2e2242..9a30714 100644
--- a/doc/classref/kfile/KCustomMenuEditor.html
+++ b/doc/classref/tdefile/KCustomMenuEditor.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KCustomMenuEditor</td>
diff --git a/doc/classref/kfile/KDesktopPropsPlugin.html b/doc/classref/tdefile/KDesktopPropsPlugin.html
index 4179cc1..34ca959 100644
--- a/doc/classref/kfile/KDesktopPropsPlugin.html
+++ b/doc/classref/tdefile/KDesktopPropsPlugin.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KDesktopPropsPlugin</td>
diff --git a/doc/classref/kfile/KDevicePropsPlugin.html b/doc/classref/tdefile/KDevicePropsPlugin.html
index d4c4440..5dc3ab2 100644
--- a/doc/classref/kfile/KDevicePropsPlugin.html
+++ b/doc/classref/tdefile/KDevicePropsPlugin.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KDevicePropsPlugin</td>
diff --git a/doc/classref/kfile/KDirOperator.html b/doc/classref/tdefile/KDirOperator.html
index 3c5e663..c7c40fb 100644
--- a/doc/classref/kfile/KDirOperator.html
+++ b/doc/classref/tdefile/KDirOperator.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KDirOperator</td>
diff --git a/doc/classref/kfile/KDirSelectDialog.html b/doc/classref/tdefile/KDirSelectDialog.html
index d9f0682..427d7b5 100644
--- a/doc/classref/kfile/KDirSelectDialog.html
+++ b/doc/classref/tdefile/KDirSelectDialog.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KDirSelectDialog</td>
diff --git a/doc/classref/kfile/KDirSize.html b/doc/classref/tdefile/KDirSize.html
index 186a180..b310cb2 100644
--- a/doc/classref/kfile/KDirSize.html
+++ b/doc/classref/tdefile/KDirSize.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KDirSize</td>
diff --git a/doc/classref/kfile/KDiskFreeSp.html b/doc/classref/tdefile/KDiskFreeSp.html
index ff9815d..cdf41ff 100644
--- a/doc/classref/kfile/KDiskFreeSp.html
+++ b/doc/classref/tdefile/KDiskFreeSp.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KDiskFreeSp</td>
diff --git a/doc/classref/kfile/KEncodingFileDialog.Result.html b/doc/classref/tdefile/KEncodingFileDialog.Result.html
index 2b65d45..c17d7ef 100644
--- a/doc/classref/kfile/KEncodingFileDialog.Result.html
+++ b/doc/classref/tdefile/KEncodingFileDialog.Result.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KEncodingFileDialog.Result</td>
diff --git a/doc/classref/kfile/KEncodingFileDialog.html b/doc/classref/tdefile/KEncodingFileDialog.html
index 07dc7a5..9e86a0f 100644
--- a/doc/classref/kfile/KEncodingFileDialog.html
+++ b/doc/classref/tdefile/KEncodingFileDialog.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KEncodingFileDialog</td>
diff --git a/doc/classref/kfile/KExecPropsPlugin.html b/doc/classref/tdefile/KExecPropsPlugin.html
index 2e5f55a..d5178db 100644
--- a/doc/classref/kfile/KExecPropsPlugin.html
+++ b/doc/classref/tdefile/KExecPropsPlugin.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KExecPropsPlugin</td>
diff --git a/doc/classref/kfile/KFile.html b/doc/classref/tdefile/KFile.html
index eb76475..c83a961 100644
--- a/doc/classref/kfile/KFile.html
+++ b/doc/classref/tdefile/KFile.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFile</td>
diff --git a/doc/classref/kfile/KFileDetailView.html b/doc/classref/tdefile/KFileDetailView.html
index 79effa8..f9f0c15 100644
--- a/doc/classref/kfile/KFileDetailView.html
+++ b/doc/classref/tdefile/KFileDetailView.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFileDetailView</td>
diff --git a/doc/classref/kfile/KFileDialog.html b/doc/classref/tdefile/KFileDialog.html
index 0c0e2b3..e8dd15c 100644
--- a/doc/classref/kfile/KFileDialog.html
+++ b/doc/classref/tdefile/KFileDialog.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFileDialog</td>
diff --git a/doc/classref/kfile/KFileFilterCombo.html b/doc/classref/tdefile/KFileFilterCombo.html
index be9d62c..3239b7a 100644
--- a/doc/classref/kfile/KFileFilterCombo.html
+++ b/doc/classref/tdefile/KFileFilterCombo.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFileFilterCombo</td>
diff --git a/doc/classref/kfile/KFileIconView.html b/doc/classref/tdefile/KFileIconView.html
index 9495144..4a9f10e 100644
--- a/doc/classref/kfile/KFileIconView.html
+++ b/doc/classref/tdefile/KFileIconView.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFileIconView</td>
diff --git a/doc/classref/kfile/KFileIconViewItem.html b/doc/classref/tdefile/KFileIconViewItem.html
index ca5f22a..428a28f 100644
--- a/doc/classref/kfile/KFileIconViewItem.html
+++ b/doc/classref/tdefile/KFileIconViewItem.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFileIconViewItem</td>
diff --git a/doc/classref/kfile/KFileListViewItem.html b/doc/classref/tdefile/KFileListViewItem.html
index 0b417b4..06501fe 100644
--- a/doc/classref/kfile/KFileListViewItem.html
+++ b/doc/classref/tdefile/KFileListViewItem.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFileListViewItem</td>
diff --git a/doc/classref/kfile/KFileOpenWithHandler.html b/doc/classref/tdefile/KFileOpenWithHandler.html
index ef4b6f5..1af7b74 100644
--- a/doc/classref/kfile/KFileOpenWithHandler.html
+++ b/doc/classref/tdefile/KFileOpenWithHandler.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFileOpenWithHandler</td>
diff --git a/doc/classref/kfile/KFilePermissionsPropsPlugin.html b/doc/classref/tdefile/KFilePermissionsPropsPlugin.html
index 75115f3..d441395 100644
--- a/doc/classref/kfile/KFilePermissionsPropsPlugin.html
+++ b/doc/classref/tdefile/KFilePermissionsPropsPlugin.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFilePermissionsPropsPlugin</td>
diff --git a/doc/classref/kfile/KFilePreview.html b/doc/classref/tdefile/KFilePreview.html
index f0fff46..7cdc67a 100644
--- a/doc/classref/kfile/KFilePreview.html
+++ b/doc/classref/tdefile/KFilePreview.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFilePreview</td>
diff --git a/doc/classref/kfile/KFilePropsPlugin.html b/doc/classref/tdefile/KFilePropsPlugin.html
index 6648553..1b5ec88 100644
--- a/doc/classref/kfile/KFilePropsPlugin.html
+++ b/doc/classref/tdefile/KFilePropsPlugin.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFilePropsPlugin</td>
diff --git a/doc/classref/kfile/KFileSharePropsPlugin.html b/doc/classref/tdefile/KFileSharePropsPlugin.html
index 2781223..80982f4 100644
--- a/doc/classref/kfile/KFileSharePropsPlugin.html
+++ b/doc/classref/tdefile/KFileSharePropsPlugin.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFileSharePropsPlugin</td>
diff --git a/doc/classref/kfile/KFileTreeBranch.html b/doc/classref/tdefile/KFileTreeBranch.html
index eaccd00..184b019 100644
--- a/doc/classref/kfile/KFileTreeBranch.html
+++ b/doc/classref/tdefile/KFileTreeBranch.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFileTreeBranch</td>
diff --git a/doc/classref/kfile/KFileTreeView.html b/doc/classref/tdefile/KFileTreeView.html
index 5cb4afa..4836044 100644
--- a/doc/classref/kfile/KFileTreeView.html
+++ b/doc/classref/tdefile/KFileTreeView.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFileTreeView</td>
diff --git a/doc/classref/kfile/KFileTreeViewItem.html b/doc/classref/tdefile/KFileTreeViewItem.html
index 021e7ba..ab11198 100644
--- a/doc/classref/kfile/KFileTreeViewItem.html
+++ b/doc/classref/tdefile/KFileTreeViewItem.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFileTreeViewItem</td>
diff --git a/doc/classref/kfile/KFileTreeViewToolTip.html b/doc/classref/tdefile/KFileTreeViewToolTip.html
index 94957de..42c584c 100644
--- a/doc/classref/kfile/KFileTreeViewToolTip.html
+++ b/doc/classref/tdefile/KFileTreeViewToolTip.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFileTreeViewToolTip</td>
diff --git a/doc/classref/kfile/KFileView.html b/doc/classref/tdefile/KFileView.html
index dde37ce..c30ded7 100644
--- a/doc/classref/kfile/KFileView.html
+++ b/doc/classref/tdefile/KFileView.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFileView <a href = "sip/glossary.html#abstract">(<i>abstract</i>)</a></td>
diff --git a/doc/classref/kfile/KFileViewSignaler.html b/doc/classref/tdefile/KFileViewSignaler.html
index e1188f4..a4a3d62 100644
--- a/doc/classref/kfile/KFileViewSignaler.html
+++ b/doc/classref/tdefile/KFileViewSignaler.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KFileViewSignaler</td>
diff --git a/doc/classref/kfile/KIconButton.html b/doc/classref/tdefile/KIconButton.html
index 79cca19..920e558 100644
--- a/doc/classref/kfile/KIconButton.html
+++ b/doc/classref/tdefile/KIconButton.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KIconButton</td>
diff --git a/doc/classref/kfile/KIconCanvas.html b/doc/classref/tdefile/KIconCanvas.html
index 9113e02..a67ed4a 100644
--- a/doc/classref/kfile/KIconCanvas.html
+++ b/doc/classref/tdefile/KIconCanvas.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KIconCanvas</td>
diff --git a/doc/classref/kfile/KIconDialog.html b/doc/classref/tdefile/KIconDialog.html
index 6efece4..4988574 100644
--- a/doc/classref/kfile/KIconDialog.html
+++ b/doc/classref/tdefile/KIconDialog.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KIconDialog</td>
diff --git a/doc/classref/kfile/KImageFilePreview.html b/doc/classref/tdefile/KImageFilePreview.html
index 3a768d9..60079a8 100644
--- a/doc/classref/kfile/KImageFilePreview.html
+++ b/doc/classref/tdefile/KImageFilePreview.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KImageFilePreview</td>
diff --git a/doc/classref/kfile/KNotify.Application.html b/doc/classref/tdefile/KNotify.Application.html
index bcc2774..f02533e 100644
--- a/doc/classref/kfile/KNotify.Application.html
+++ b/doc/classref/tdefile/KNotify.Application.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KNotify.Application</td>
diff --git a/doc/classref/kfile/KNotify.ApplicationList.html b/doc/classref/tdefile/KNotify.ApplicationList.html
index 6d63509..b654284 100644
--- a/doc/classref/kfile/KNotify.ApplicationList.html
+++ b/doc/classref/tdefile/KNotify.ApplicationList.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KNotify.ApplicationList</td>
diff --git a/doc/classref/kfile/KNotify.Event.html b/doc/classref/tdefile/KNotify.Event.html
index 785ba6f..13940ad 100644
--- a/doc/classref/kfile/KNotify.Event.html
+++ b/doc/classref/tdefile/KNotify.Event.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KNotify.Event</td>
diff --git a/doc/classref/kfile/KNotify.KNotifyWidget.html b/doc/classref/tdefile/KNotify.KNotifyWidget.html
index 8f41f25..5cf012f 100644
--- a/doc/classref/kfile/KNotify.KNotifyWidget.html
+++ b/doc/classref/tdefile/KNotify.KNotifyWidget.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KNotify.KNotifyWidget</td>
diff --git a/doc/classref/kfile/KNotify.ListViewItem.html b/doc/classref/tdefile/KNotify.ListViewItem.html
index 65fd8c8..7c2a670 100644
--- a/doc/classref/kfile/KNotify.ListViewItem.html
+++ b/doc/classref/tdefile/KNotify.ListViewItem.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KNotify.ListViewItem</td>
diff --git a/doc/classref/kfile/KNotify.html b/doc/classref/tdefile/KNotify.html
index c43b05a..7d50ed2 100644
--- a/doc/classref/kfile/KNotify.html
+++ b/doc/classref/tdefile/KNotify.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KNotify</td>
diff --git a/doc/classref/kfile/KNotifyDialog.html b/doc/classref/tdefile/KNotifyDialog.html
index c235121..9fd2d62 100644
--- a/doc/classref/kfile/KNotifyDialog.html
+++ b/doc/classref/tdefile/KNotifyDialog.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KNotifyDialog</td>
diff --git a/doc/classref/kfile/KOpenWithDlg.html b/doc/classref/tdefile/KOpenWithDlg.html
index e3499cb..354a4de 100644
--- a/doc/classref/kfile/KOpenWithDlg.html
+++ b/doc/classref/tdefile/KOpenWithDlg.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KOpenWithDlg</td>
diff --git a/doc/classref/kfile/KPreviewWidgetBase.html b/doc/classref/tdefile/KPreviewWidgetBase.html
index f913d16..6a55949 100644
--- a/doc/classref/kfile/KPreviewWidgetBase.html
+++ b/doc/classref/tdefile/KPreviewWidgetBase.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KPreviewWidgetBase <a href = "sip/glossary.html#abstract">(<i>abstract</i>)</a></td>
diff --git a/doc/classref/kfile/KPropertiesDialog.html b/doc/classref/tdefile/KPropertiesDialog.html
index f1614ab..664bbe2 100644
--- a/doc/classref/kfile/KPropertiesDialog.html
+++ b/doc/classref/tdefile/KPropertiesDialog.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KPropertiesDialog</td>
diff --git a/doc/classref/kfile/KPropsDlgPlugin.html b/doc/classref/tdefile/KPropsDlgPlugin.html
index af586e0..5d692f8 100644
--- a/doc/classref/kfile/KPropsDlgPlugin.html
+++ b/doc/classref/tdefile/KPropsDlgPlugin.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KPropsDlgPlugin</td>
diff --git a/doc/classref/kfile/KRecentDirs.html b/doc/classref/tdefile/KRecentDirs.html
index c5c1409..f6cedbc 100644
--- a/doc/classref/kfile/KRecentDirs.html
+++ b/doc/classref/tdefile/KRecentDirs.html
@@ -17,14 +17,14 @@
             <td  width="30%" valign="top" align="right">
                 <table>
                     <tr><td align="right"><a href= "../../index.html">Table of contents</a></td></tr>                    <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KRecentDirs</td>
diff --git a/doc/classref/kfile/KRecentDocument.html b/doc/classref/tdefile/KRecentDocument.html
index 9f9f6a9..92529f5 100644
--- a/doc/classref/kfile/KRecentDocument.html
+++ b/doc/classref/tdefile/KRecentDocument.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KRecentDocument</td>
diff --git a/doc/classref/kfile/KURLBar.html b/doc/classref/tdefile/KURLBar.html
index 3c1aae1..4ca5b97 100644
--- a/doc/classref/kfile/KURLBar.html
+++ b/doc/classref/tdefile/KURLBar.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KURLBar</td>
diff --git a/doc/classref/kfile/KURLBarItem.html b/doc/classref/tdefile/KURLBarItem.html
index ede3c47..5bcc92c 100644
--- a/doc/classref/kfile/KURLBarItem.html
+++ b/doc/classref/tdefile/KURLBarItem.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KURLBarItem</td>
diff --git a/doc/classref/kfile/KURLBarItemDialog.html b/doc/classref/tdefile/KURLBarItemDialog.html
index 7344e51..0317498 100644
--- a/doc/classref/kfile/KURLBarItemDialog.html
+++ b/doc/classref/tdefile/KURLBarItemDialog.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KURLBarItemDialog</td>
diff --git a/doc/classref/kfile/KURLBarListBox.html b/doc/classref/tdefile/KURLBarListBox.html
index f6113ed..afc419c 100644
--- a/doc/classref/kfile/KURLBarListBox.html
+++ b/doc/classref/tdefile/KURLBarListBox.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KURLBarListBox</td>
diff --git a/doc/classref/kfile/KURLComboBox.html b/doc/classref/tdefile/KURLComboBox.html
index 35e1ddc..2712438 100644
--- a/doc/classref/kfile/KURLComboBox.html
+++ b/doc/classref/tdefile/KURLComboBox.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KURLComboBox</td>
diff --git a/doc/classref/kfile/KURLComboRequester.html b/doc/classref/tdefile/KURLComboRequester.html
index 7165561..930eda3 100644
--- a/doc/classref/kfile/KURLComboRequester.html
+++ b/doc/classref/tdefile/KURLComboRequester.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KURLComboRequester</td>
diff --git a/doc/classref/kfile/KURLPropsPlugin.html b/doc/classref/tdefile/KURLPropsPlugin.html
index 60e8ced..3f95298 100644
--- a/doc/classref/kfile/KURLPropsPlugin.html
+++ b/doc/classref/tdefile/KURLPropsPlugin.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KURLPropsPlugin</td>
diff --git a/doc/classref/kfile/KURLRequester.html b/doc/classref/tdefile/KURLRequester.html
index 57758e8..031a809 100644
--- a/doc/classref/kfile/KURLRequester.html
+++ b/doc/classref/tdefile/KURLRequester.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KURLRequester</td>
diff --git a/doc/classref/kfile/KURLRequesterDlg.html b/doc/classref/tdefile/KURLRequesterDlg.html
index af094d4..5b8584a 100644
--- a/doc/classref/kfile/KURLRequesterDlg.html
+++ b/doc/classref/tdefile/KURLRequesterDlg.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>KURLRequesterDlg</td>
diff --git a/doc/classref/kfile/TDEApplicationPropsPlugin.html b/doc/classref/tdefile/TDEApplicationPropsPlugin.html
index aa94fb5..a998cab 100644
--- a/doc/classref/kfile/TDEApplicationPropsPlugin.html
+++ b/doc/classref/tdefile/TDEApplicationPropsPlugin.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>TDEApplicationPropsPlugin</td>
diff --git a/doc/classref/kfile/TDEApplicationTree.html b/doc/classref/tdefile/TDEApplicationTree.html
index 33aa877..e6b51d6 100644
--- a/doc/classref/kfile/TDEApplicationTree.html
+++ b/doc/classref/tdefile/TDEApplicationTree.html
@@ -18,14 +18,14 @@
                 <table>
                     <tr><td align="right"><a href="doc/index.html">Table of contents</a></td></tr>
                     <tr><td align="right"><a href="../index.html">Modules</a></td></tr>
-                    <tr><td align="right"><a href="index.html">kfile Classes</a></td></tr>
+                    <tr><td align="right"><a href="index.html">tdefile Classes</a></td></tr>
                     <tr><td align="right"><a href="../allclasses.html">All Classes</a></td></tr>
                 </table>
             </td>
         </tr></table>
         <table>
         <tr><td width="10%" align=left>Module</td>
-            <td width="30%" align=left>kfile</td>
+            <td width="30%" align=left>tdefile</td>
         </tr>
         <tr><td>Class</td>
             <td>TDEApplicationTree</td>
diff --git a/doc/classref/kfile/index.html b/doc/classref/tdefile/index.html
index 0bea76f..15d4521 100644
--- a/doc/classref/kfile/index.html
+++ b/doc/classref/tdefile/index.html
@@ -3,7 +3,7 @@
         "http://www.w3.org/TR/html4/loose.dtd"">
 <html>
 <head>
-  <title>module kfile</title>
+  <title>module tdefile</title>
   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   <meta name="GENERATOR" content="wabbit dumphtml">
 </head>
@@ -12,7 +12,7 @@
 <hr>
 <table width="100%"><tr>
             <td width ="70%">
-                <h1>kfile Class Index</h1><hr>
+                <h1>tdefile Class Index</h1><hr>
             </td>
             <td  width="30%" valign="top" align="right">
                 <table>
diff --git a/doc/index1.html b/doc/index1.html
index d4a0cec..430457e 100644
--- a/doc/index1.html
+++ b/doc/index1.html
@@ -38,7 +38,7 @@ the names of the separate KDE libraries, i.e.
 <TT CLASS="LITERAL">kio</TT>,
 <TT CLASS="LITERAL">tderesources</TT>,
 <TT CLASS="LITERAL">kabc</TT>,
-<TT CLASS="LITERAL">kfile</TT>,
+<TT CLASS="LITERAL">tdefile</TT>,
 <TT CLASS="LITERAL">tdeparts</TT>,
 <TT CLASS="LITERAL">tdehtml</TT>,
 <TT CLASS="LITERAL">tdespell</TT>,
diff --git a/doc/static.html b/doc/static.html
index d16c0be..b95e3df 100644
--- a/doc/static.html
+++ b/doc/static.html
@@ -69,7 +69,7 @@ TQFrame.TabFocus
 <H2>Namespaces</H2>
 <P>
 The C++ code in KDE makes extensive use of namespaces (especially in the kio, kjs,
-tdehtml, kfile, and tdeparts modules). In PyKDE, namespaces are treated as a "superclass".
+tdehtml, tdefile, and tdeparts modules). In PyKDE, namespaces are treated as a "superclass".
 For example, "from tdeparts import KParts" will import the KParts namespace and all
 its members. To reference a class in the namespace, use &lt;namespace name&gt;..&lt;classname&gt;,
 for example, KParts.ReadOnlyPart. It isn't necessary to import the &lt;classname&gt; (ReadOnlyPart
diff --git a/doc/switches.html b/doc/switches.html
index 1af4b51..c1d4e40 100644
--- a/doc/switches.html
+++ b/doc/switches.html
@@ -163,7 +163,7 @@ The path to KDE's library files (libtdecore.so, etc).
 <td width = "20%"> </td>
 </tr></table>
 The path to KDE's h files. (May require installation of tdelibs3-devel rpm package)
-configure.py. PyKDE will locate h files in subdirectories of this path automatically (eg trinity/include/kio/*.h)
+configure.py. PyKDE will locate h files in subdirectories of this path automatically (eg trinity/include/tdeio/*.h)
 </dd>
 <hr>
 <dt><b>-r generate code with tracing enabled</b></dt>
diff --git a/doc/trouble.html b/doc/trouble.html
index 3c589df..1e09b4b 100644
--- a/doc/trouble.html
+++ b/doc/trouble.html
@@ -263,14 +263,14 @@ other module.
 <h3>SuSE 8.2/9.0</h3>
 <p>
 Some (but by no means all) versions of the KDE rpms for recent SuSE distributions appear
-to have been built with a different version of kfileshare.h than what they ship with. This
+to have been built with a different version of tdefileshare.h than what they ship with. This
 version is also in disagreement with the "official" KDE version (as found in the kdelib
 source files on kde.org, for example). The "incorrect" versions use a setShared(...) method
 with a different argument list that doesn't match the h files.
 </p>
 <p>
 To fix this problem, all versions of the setShared method should be commented out in
-kfileshare.sip.
+tdefileshare.sip.
 </p>
 <h3>Mandrake 9.1</h3><h4>(rpm install - PyKDE-3.8, not 3.11 so far)</h4>
 <p>
diff --git a/examples/kdeform1.ui b/examples/kdeform1.ui
index 46d5ff6..176ec6e 100644
--- a/examples/kdeform1.ui
+++ b/examples/kdeform1.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>Form1</class>
 <comment>Python:#import all necessary widgets
-Python:from kfile import KURLRequester</comment>
+Python:from tdefile import KURLRequester</comment>
 <widget class="TQDialog">
     <property name="name">
         <cstring>Form1</cstring>
diff --git a/examples/pytde-sampler/gen_todo.py b/examples/pytde-sampler/gen_todo.py
index d094ab6..da65214 100644
--- a/examples/pytde-sampler/gen_todo.py
+++ b/examples/pytde-sampler/gen_todo.py
@@ -1,4 +1,4 @@
-mods = ['dcop', 'tdecore', 'tdefx', 'tdeprint', 'tdesu', 'tdeui', 'kfile', 'tdehtml', 'kio', 'tdemdi', 'tdeparts', 'tdespell', ]
+mods = ['dcop', 'tdecore', 'tdefx', 'tdeprint', 'tdesu', 'tdeui', 'tdefile', 'tdehtml', 'kio', 'tdemdi', 'tdeparts', 'tdespell', ]
 all = []
 
 
diff --git a/examples/pytde-sampler/qt_widgets/CONTRIB b/examples/pytde-sampler/qt_widgets/CONTRIB
index ea10773..4e46cd7 100644
--- a/examples/pytde-sampler/qt_widgets/CONTRIB
+++ b/examples/pytde-sampler/qt_widgets/CONTRIB
@@ -342,56 +342,56 @@ tdeui,KXMLGUIFactory,,,
 tdeui,KXYSelector,,,
 tdeui,QXEmbed,,,
 tdeui,testKActionList,,,
-kfile,TDEApplicationPropsPlugin,,,
-kfile,KBindingPropsPlugin,,,
-kfile,KCombiView,,,
-kfile,KCustomMenuEditor,,,
-kfile,KDesktopPropsPlugin,,,
-kfile,KDevicePropsPlugin,,,
-kfile,KDirOperator,,,
-kfile,KDirSelectDialog,,,
-kfile,KDirSize,,,
-kfile,KDiskFreeSp,,,
-kfile,KEncodingFileDialog,,,
-kfile,KExecPropsPlugin,,,
-kfile,KFile,,,
-kfile,KFileDetailView,,,
-kfile,KFileDialog,,,
-kfile,KFileFilterCombo,,,
-kfile,KFileIconView,,,
-kfile,KFileIconViewItem,,,
-kfile,KFileListViewItem,,,
-kfile,KFileOpenWithHandler,,,
-kfile,KFilePermissionsPropsPlugin,,,
-kfile,KFilePreview,,,
-kfile,KFilePropsPlugin,,,
-kfile,KFileSharePropsPlugin,,,
-kfile,KFileTreeBranch,,,
-kfile,KFileTreeView,,,
-kfile,KFileTreeViewItem,,,
-kfile,KFileTreeViewToolTip,,,
-kfile,KFileView,,,
-kfile,KFileViewSignaler,,,
-kfile,KIconButton,,,
-kfile,KIconCanvas,,,
-kfile,KIconDialog,,,
-kfile,KImageFilePreview,,,
-kfile,KNotify,,,
-kfile,KNotifyDialog,,,
-kfile,KOpenWithDlg,,,
-kfile,KPreviewWidgetBase,,,
-kfile,KPropertiesDialog,,,
-kfile,KPropsDlgPlugin,,,
-kfile,KRecentDocument,,,
-kfile,KURLBar,,,
-kfile,KURLBarItem,,,
-kfile,KURLBarItemDialog,,,
-kfile,KURLBarListBox,,,
-kfile,KURLComboBox,,,
-kfile,KURLComboRequester,,,
-kfile,KURLPropsPlugin,,,
-kfile,KURLRequester,,,
-kfile,KURLRequesterDlg,,,
+tdefile,TDEApplicationPropsPlugin,,,
+tdefile,KBindingPropsPlugin,,,
+tdefile,KCombiView,,,
+tdefile,KCustomMenuEditor,,,
+tdefile,KDesktopPropsPlugin,,,
+tdefile,KDevicePropsPlugin,,,
+tdefile,KDirOperator,,,
+tdefile,KDirSelectDialog,,,
+tdefile,KDirSize,,,
+tdefile,KDiskFreeSp,,,
+tdefile,KEncodingFileDialog,,,
+tdefile,KExecPropsPlugin,,,
+tdefile,KFile,,,
+tdefile,KFileDetailView,,,
+tdefile,KFileDialog,,,
+tdefile,KFileFilterCombo,,,
+tdefile,KFileIconView,,,
+tdefile,KFileIconViewItem,,,
+tdefile,KFileListViewItem,,,
+tdefile,KFileOpenWithHandler,,,
+tdefile,KFilePermissionsPropsPlugin,,,
+tdefile,KFilePreview,,,
+tdefile,KFilePropsPlugin,,,
+tdefile,KFileSharePropsPlugin,,,
+tdefile,KFileTreeBranch,,,
+tdefile,KFileTreeView,,,
+tdefile,KFileTreeViewItem,,,
+tdefile,KFileTreeViewToolTip,,,
+tdefile,KFileView,,,
+tdefile,KFileViewSignaler,,,
+tdefile,KIconButton,,,
+tdefile,KIconCanvas,,,
+tdefile,KIconDialog,,,
+tdefile,KImageFilePreview,,,
+tdefile,KNotify,,,
+tdefile,KNotifyDialog,,,
+tdefile,KOpenWithDlg,,,
+tdefile,KPreviewWidgetBase,,,
+tdefile,KPropertiesDialog,,,
+tdefile,KPropsDlgPlugin,,,
+tdefile,KRecentDocument,,,
+tdefile,KURLBar,,,
+tdefile,KURLBarItem,,,
+tdefile,KURLBarItemDialog,,,
+tdefile,KURLBarListBox,,,
+tdefile,KURLComboBox,,,
+tdefile,KURLComboRequester,,,
+tdefile,KURLPropsPlugin,,,
+tdefile,KURLRequester,,,
+tdefile,KURLRequesterDlg,,,
 tdehtml,DOM,,,
 tdehtml,KHTMLPart,,,
 tdehtml,KHTMLSettings,,,
diff --git a/extra/kde300/konsole_part.h b/extra/kde300/konsole_part.h
index 8fbf1b6..ae66062 100644
--- a/extra/kde300/konsole_part.h
+++ b/extra/kde300/konsole_part.h
@@ -158,7 +158,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde301/konsole_part.h b/extra/kde301/konsole_part.h
index 8fbf1b6..ae66062 100644
--- a/extra/kde301/konsole_part.h
+++ b/extra/kde301/konsole_part.h
@@ -158,7 +158,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde303/konsole_part.h b/extra/kde303/konsole_part.h
index 8fbf1b6..ae66062 100644
--- a/extra/kde303/konsole_part.h
+++ b/extra/kde303/konsole_part.h
@@ -158,7 +158,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde310/konsole_part.h b/extra/kde310/konsole_part.h
index 8fbf1b6..ae66062 100644
--- a/extra/kde310/konsole_part.h
+++ b/extra/kde310/konsole_part.h
@@ -158,7 +158,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde311/konsole_part.h b/extra/kde311/konsole_part.h
index 8fbf1b6..ae66062 100644
--- a/extra/kde311/konsole_part.h
+++ b/extra/kde311/konsole_part.h
@@ -158,7 +158,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde312/konsole_part.h b/extra/kde312/konsole_part.h
index 8fbf1b6..ae66062 100644
--- a/extra/kde312/konsole_part.h
+++ b/extra/kde312/konsole_part.h
@@ -158,7 +158,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde313/konsole_part.h b/extra/kde313/konsole_part.h
index 8fbf1b6..ae66062 100644
--- a/extra/kde313/konsole_part.h
+++ b/extra/kde313/konsole_part.h
@@ -158,7 +158,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde314/konsole_part.h b/extra/kde314/konsole_part.h
index 8fbf1b6..ae66062 100644
--- a/extra/kde314/konsole_part.h
+++ b/extra/kde314/konsole_part.h
@@ -158,7 +158,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde315/konsole_part.h b/extra/kde315/konsole_part.h
index 8fbf1b6..ae66062 100644
--- a/extra/kde315/konsole_part.h
+++ b/extra/kde315/konsole_part.h
@@ -158,7 +158,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde320/configwidget.h b/extra/kde320/configwidget.h
index 3c2052c..ec3a9a4 100644
--- a/extra/kde320/configwidget.h
+++ b/extra/kde320/configwidget.h
@@ -24,7 +24,7 @@
 
 #include "resource.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwidget.h>
 
diff --git a/extra/kde320/konsole_part.h b/extra/kde320/konsole_part.h
index 8fbf1b6..ae66062 100644
--- a/extra/kde320/konsole_part.h
+++ b/extra/kde320/konsole_part.h
@@ -158,7 +158,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde321/configwidget.h b/extra/kde321/configwidget.h
index 3c2052c..ec3a9a4 100644
--- a/extra/kde321/configwidget.h
+++ b/extra/kde321/configwidget.h
@@ -24,7 +24,7 @@
 
 #include "resource.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwidget.h>
 
diff --git a/extra/kde321/konsole_part.h b/extra/kde321/konsole_part.h
index 8fbf1b6..ae66062 100644
--- a/extra/kde321/konsole_part.h
+++ b/extra/kde321/konsole_part.h
@@ -158,7 +158,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde322/configwidget.h b/extra/kde322/configwidget.h
index 3c2052c..ec3a9a4 100644
--- a/extra/kde322/configwidget.h
+++ b/extra/kde322/configwidget.h
@@ -24,7 +24,7 @@
 
 #include "resource.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwidget.h>
 
diff --git a/extra/kde322/konsole_part.h b/extra/kde322/konsole_part.h
index 8fbf1b6..ae66062 100644
--- a/extra/kde322/konsole_part.h
+++ b/extra/kde322/konsole_part.h
@@ -158,7 +158,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde323/configwidget.h b/extra/kde323/configwidget.h
index 3c2052c..ec3a9a4 100644
--- a/extra/kde323/configwidget.h
+++ b/extra/kde323/configwidget.h
@@ -24,7 +24,7 @@
 
 #include "resource.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwidget.h>
 
diff --git a/extra/kde323/konsole_part.h b/extra/kde323/konsole_part.h
index 8fbf1b6..ae66062 100644
--- a/extra/kde323/konsole_part.h
+++ b/extra/kde323/konsole_part.h
@@ -158,7 +158,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde330/configwidget.h b/extra/kde330/configwidget.h
index 3c2052c..ec3a9a4 100644
--- a/extra/kde330/configwidget.h
+++ b/extra/kde330/configwidget.h
@@ -24,7 +24,7 @@
 
 #include "resource.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwidget.h>
 
diff --git a/extra/kde330/konsole_part.h b/extra/kde330/konsole_part.h
index 88da3f9..76f7880 100644
--- a/extra/kde330/konsole_part.h
+++ b/extra/kde330/konsole_part.h
@@ -161,7 +161,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;            // characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde331/configwidget.h b/extra/kde331/configwidget.h
index 3c2052c..ec3a9a4 100644
--- a/extra/kde331/configwidget.h
+++ b/extra/kde331/configwidget.h
@@ -24,7 +24,7 @@
 
 #include "resource.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwidget.h>
 
diff --git a/extra/kde331/konsole_part.h b/extra/kde331/konsole_part.h
index 88da3f9..76f7880 100644
--- a/extra/kde331/konsole_part.h
+++ b/extra/kde331/konsole_part.h
@@ -161,7 +161,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;            // characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde332/configwidget.h b/extra/kde332/configwidget.h
index 3c2052c..ec3a9a4 100644
--- a/extra/kde332/configwidget.h
+++ b/extra/kde332/configwidget.h
@@ -24,7 +24,7 @@
 
 #include "resource.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwidget.h>
 
diff --git a/extra/kde332/konsole_part.h b/extra/kde332/konsole_part.h
index 88da3f9..76f7880 100644
--- a/extra/kde332/konsole_part.h
+++ b/extra/kde332/konsole_part.h
@@ -161,7 +161,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;            // characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde340/configwidget.h b/extra/kde340/configwidget.h
index 30ebf2a..a5b1143 100644
--- a/extra/kde340/configwidget.h
+++ b/extra/kde340/configwidget.h
@@ -24,7 +24,7 @@
 
 #include "resource.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwidget.h>
 
diff --git a/extra/kde340/konsole_part.h b/extra/kde340/konsole_part.h
index ecc7924..5647257 100644
--- a/extra/kde340/konsole_part.h
+++ b/extra/kde340/konsole_part.h
@@ -161,7 +161,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde341/configwidget.h b/extra/kde341/configwidget.h
index 30ebf2a..a5b1143 100644
--- a/extra/kde341/configwidget.h
+++ b/extra/kde341/configwidget.h
@@ -24,7 +24,7 @@
 
 #include "resource.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwidget.h>
 
diff --git a/extra/kde341/konsole_part.h b/extra/kde341/konsole_part.h
index ecc7924..5647257 100644
--- a/extra/kde341/konsole_part.h
+++ b/extra/kde341/konsole_part.h
@@ -161,7 +161,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde342/configwidget.h b/extra/kde342/configwidget.h
index 30ebf2a..a5b1143 100644
--- a/extra/kde342/configwidget.h
+++ b/extra/kde342/configwidget.h
@@ -24,7 +24,7 @@
 
 #include "resource.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwidget.h>
 
diff --git a/extra/kde342/konsole_part.h b/extra/kde342/konsole_part.h
index ecc7924..5647257 100644
--- a/extra/kde342/konsole_part.h
+++ b/extra/kde342/konsole_part.h
@@ -161,7 +161,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde343/configwidget.h b/extra/kde343/configwidget.h
index 30ebf2a..a5b1143 100644
--- a/extra/kde343/configwidget.h
+++ b/extra/kde343/configwidget.h
@@ -24,7 +24,7 @@
 
 #include "resource.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwidget.h>
 
diff --git a/extra/kde343/konsole_part.h b/extra/kde343/konsole_part.h
index ecc7924..5647257 100644
--- a/extra/kde343/konsole_part.h
+++ b/extra/kde343/konsole_part.h
@@ -161,7 +161,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
     TQString     fontNotFound_par;
 
diff --git a/extra/kde350/configwidget.h b/extra/kde350/configwidget.h
index 30ebf2a..a5b1143 100644
--- a/extra/kde350/configwidget.h
+++ b/extra/kde350/configwidget.h
@@ -24,7 +24,7 @@
 
 #include "resource.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwidget.h>
 
diff --git a/extra/kde350/konsole_part.h b/extra/kde350/konsole_part.h
index a50b5af..6472231 100644
--- a/extra/kde350/konsole_part.h
+++ b/extra/kde350/konsole_part.h
@@ -170,7 +170,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
 
     bool        b_framevis:1;
diff --git a/extra/kde351/konsole_part.h b/extra/kde351/konsole_part.h
index a50b5af..6472231 100644
--- a/extra/kde351/konsole_part.h
+++ b/extra/kde351/konsole_part.h
@@ -170,7 +170,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
 
     bool        b_framevis:1;
diff --git a/extra/kde352/konsole_part.h b/extra/kde352/konsole_part.h
index a50b5af..6472231 100644
--- a/extra/kde352/konsole_part.h
+++ b/extra/kde352/konsole_part.h
@@ -170,7 +170,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
 
     bool        b_framevis:1;
diff --git a/extra/kde353/konsole_part.h b/extra/kde353/konsole_part.h
index a50b5af..6472231 100644
--- a/extra/kde353/konsole_part.h
+++ b/extra/kde353/konsole_part.h
@@ -170,7 +170,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
 
     bool        b_framevis:1;
diff --git a/importTest.py b/importTest.py
index 33fc9bc..14c2104 100644
--- a/importTest.py
+++ b/importTest.py
@@ -7,7 +7,7 @@ except:
 
 pytdecfg = pytdeconfig.Configuration ()
 
-#modules = ["dcop", "tdecore", "tdesu", "tdefx", "tdeui", "kio", "kfile", "tdeparts", "tdehtml", "kjs", "tdespell", "tdeprint"]
+#modules = ["dcop", "tdecore", "tdesu", "tdefx", "tdeui", "kio", "tdefile", "tdeparts", "tdehtml", "kjs", "tdespell", "tdeprint"]
 print "Modules built:"
 print " ",pytdecfg.pytde_modules
 print
diff --git a/pytde350.prj b/pytde350.prj
index 9047e2d..3820593 100644
--- a/pytde350.prj
+++ b/pytde350.prj
@@ -170,10 +170,10 @@ retain
 
 module = kio
 
-source     = $SRC/kio/kio  $DST/extra/kde350/kio
+source     = $SRC/tdeio/tdeio  $DST/extra/kde350/tdeio
 ignore     = kmdbase.h uiserver_stub.h kdirnotify_stub.h uiserver.h http_slave_defaults.h ioslave_defaults.h
 ignore     = kmimetyperesolver.h
-compare    = $COMP  $COMP/kio
+compare    = $COMP  $COMP/tdeio
 subst      = $DST/extra/kde350
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -184,7 +184,7 @@ import     = tdeui
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = ../extra/kde350/kio @KDE_INCLUDEPATH@/kio ../tdecore
+include    = ../extra/kde350/tdeio @KDE_INCLUDEPATH@/tdeio ../tdecore
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule
 sipslot    =
@@ -257,7 +257,7 @@ import     = qtxmlmod.sip
 import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
-//import     = kfilemod.sip
+//import     = tdefilemod.sip
 //import     = tdepartsmod.sip
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
@@ -271,11 +271,11 @@ retain
 
 // -----------------------------------------
 
-module = kfile
+module = tdefile
 
-source     = $SRC/kio/kfile
+source     = $SRC/tdeio/tdefile
 ignore     = kpropsdlg.h
-compare    = $COMP  $COMP/kio
+compare    = $COMP  $COMP/tdeio
 subst      = $DST/extra/kde350
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -287,7 +287,7 @@ import     = kio
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/kio  ../tdecore  ../kio
+include    = @KDE_INCLUDEPATH@/tdeio  ../tdecore  ../tdeio
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule -lkiocmodule
 
@@ -311,7 +311,7 @@ import     = kio
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/tdeparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
+include    = @KDE_INCLUDEPATH@/tdeparts  @KDE_INCLUDEPATH@/tdeio  ../tdecore ../tdeio
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
              -ltdecorecmodule -lkiocmodule -ldcopcmodule -lkiocmodule
 
@@ -338,7 +338,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/tdehtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/tdeparts\
-             @KDE_INCLUDEPATH@/kio ../tdecore ../kio
+             @KDE_INCLUDEPATH@/tdeio ../tdecore ../tdeio
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -ltdehtml -ltdeparts -ltdecore -lkio\
             -ltdeuicmodule -ltdecorecmodule -lkiocmodule -ltdepartscmodule -ldcopcmodule
 
@@ -363,8 +363,8 @@ retain
 //import     = tdeparts
 //import     = tdehtml
 //importpath = $IMP
-//include    = @KDE_INCLUDEPATH@/kjs @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/kio\
-//             ../tdecore  ../kio
+//include    = @KDE_INCLUDEPATH@/kjs @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/tdeio\
+//             ../tdecore  ../tdeio
 //amend      = * ctor parent /TransferThis/
 //amend      = * all parent /Transfer/
 //libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -ltdehtml\
@@ -386,19 +386,19 @@ import     = dcop
 import     = tdecore
 import     = tdefx
 import     = tdeui
-import     = kfile
+import     = tdefile
 importpath = $IMP
-include    = ../tdecore  @KDE_INCLUDEPATH@/kio
+include    = ../tdecore  @KDE_INCLUDEPATH@/tdeio
 amend      = * ctor parent /TransferThis/        const KGuiItem& nullGuiItem (TQString::null);
 
 amend      = * all parent /Transfer/
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdespell -ltdeui -ltdecore -lkio\
-             -ltdecorecmodule -ltdeuicmodule -lkfilecmodule -ldcopcmodule
+             -ltdecorecmodule -ltdeuicmodule -ltdefilecmodule -ldcopcmodule
 sipslot    = obj slot tdespell
 
 code
 %PrePythonCode
-import kfile
+import tdefile
 %End
 end
 
@@ -442,7 +442,7 @@ import     = qtxmlmod.sip
 import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
-//import     = kfilemod.sip
+//import     = tdefilemod.sip
 //import     = tdepartsmod.sip
 importpath = $IMP
 ignore     = tdemdiiterator.h tdemdilistiterator.h tdemdinulliterator.h
@@ -472,7 +472,7 @@ retain
 //import     = tdefxmod.sip
 //import     = tdeuimod.sip
 ////import     = kiomod.sip
-////import     = kfilemod.sip
+////import     = tdefilemod.sip
 ////import     = tdepartsmod.sip
 //importpath = $IMP
 //include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
diff --git a/pytde351.prj b/pytde351.prj
index cd30eb2..dc7f95f 100644
--- a/pytde351.prj
+++ b/pytde351.prj
@@ -170,10 +170,10 @@ retain
 
 module = kio
 
-source     = $SRC/kio/kio  $DST/extra/kde351/kio
+source     = $SRC/tdeio/tdeio  $DST/extra/kde351/tdeio
 ignore     = kmdbase.h uiserver_stub.h kdirnotify_stub.h uiserver.h http_slave_defaults.h ioslave_defaults.h
 ignore     = kmimetyperesolver.h
-compare    = $COMP  $COMP/kio
+compare    = $COMP  $COMP/tdeio
 subst      = $DST/extra/kde351
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -184,7 +184,7 @@ import     = tdeui
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = ../extra/kde351/kio @KDE_INCLUDEPATH@/kio ../tdecore
+include    = ../extra/kde351/tdeio @KDE_INCLUDEPATH@/tdeio ../tdecore
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule
 sipslot    =
@@ -257,7 +257,7 @@ import     = qtxmlmod.sip
 import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
-//import     = kfilemod.sip
+//import     = tdefilemod.sip
 //import     = tdepartsmod.sip
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
@@ -271,11 +271,11 @@ retain
 
 // -----------------------------------------
 
-module = kfile
+module = tdefile
 
-source     = $SRC/kio/kfile
+source     = $SRC/tdeio/tdefile
 ignore     = kpropsdlg.h
-compare    = $COMP  $COMP/kio
+compare    = $COMP  $COMP/tdeio
 subst      = $DST/extra/kde351
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -287,7 +287,7 @@ import     = kio
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/kio  ../tdecore  ../kio
+include    = @KDE_INCLUDEPATH@/tdeio  ../tdecore  ../tdeio
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule -lkiocmodule
 
@@ -311,7 +311,7 @@ import     = kio
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/tdeparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
+include    = @KDE_INCLUDEPATH@/tdeparts  @KDE_INCLUDEPATH@/tdeio  ../tdecore ../tdeio
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
              -ltdecorecmodule -lkiocmodule -ldcopcmodule -lkiocmodule
 
@@ -338,7 +338,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/tdehtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/tdeparts\
-             @KDE_INCLUDEPATH@/kio ../tdecore ../kio
+             @KDE_INCLUDEPATH@/tdeio ../tdecore ../tdeio
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -ltdehtml -ltdeparts -ltdecore -lkio\
             -ltdeuicmodule -ltdecorecmodule -lkiocmodule -ltdepartscmodule -ldcopcmodule
 
@@ -363,8 +363,8 @@ retain
 //import     = tdeparts
 //import     = tdehtml
 //importpath = $IMP
-//include    = @KDE_INCLUDEPATH@/kjs @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/kio\
-//             ../tdecore  ../kio
+//include    = @KDE_INCLUDEPATH@/kjs @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/tdeio\
+//             ../tdecore  ../tdeio
 //amend      = * ctor parent /TransferThis/
 //amend      = * all parent /Transfer/
 //libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -ltdehtml\
@@ -386,19 +386,19 @@ import     = dcop
 import     = tdecore
 import     = tdefx
 import     = tdeui
-import     = kfile
+import     = tdefile
 importpath = $IMP
-include    = ../tdecore  @KDE_INCLUDEPATH@/kio
+include    = ../tdecore  @KDE_INCLUDEPATH@/tdeio
 amend      = * ctor parent /TransferThis/        const KGuiItem& nullGuiItem (TQString::null);
 
 amend      = * all parent /Transfer/
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdespell -ltdeui -ltdecore -lkio\
-             -ltdecorecmodule -ltdeuicmodule -lkfilecmodule -ldcopcmodule
+             -ltdecorecmodule -ltdeuicmodule -ltdefilecmodule -ldcopcmodule
 sipslot    = obj slot tdespell
 
 code
 %PrePythonCode
-import kfile
+import tdefile
 %End
 end
 
@@ -442,7 +442,7 @@ import     = qtxmlmod.sip
 import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
-//import     = kfilemod.sip
+//import     = tdefilemod.sip
 //import     = tdepartsmod.sip
 importpath = $IMP
 ignore     = tdemdiiterator.h tdemdilistiterator.h tdemdinulliterator.h
@@ -472,7 +472,7 @@ retain
 //import     = tdefxmod.sip
 //import     = tdeuimod.sip
 ////import     = kiomod.sip
-////import     = kfilemod.sip
+////import     = tdefilemod.sip
 ////import     = tdepartsmod.sip
 //importpath = $IMP
 //include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
diff --git a/pytde352.prj b/pytde352.prj
index b648841..13529df 100644
--- a/pytde352.prj
+++ b/pytde352.prj
@@ -170,10 +170,10 @@ retain
 
 module = kio
 
-source     = $SRC/kio/kio  $DST/extra/kde352/kio
+source     = $SRC/tdeio/tdeio  $DST/extra/kde352/tdeio
 ignore     = kmdbase.h uiserver_stub.h kdirnotify_stub.h uiserver.h http_slave_defaults.h ioslave_defaults.h
 ignore     = kmimetyperesolver.h
-compare    = $COMP  $COMP/kio
+compare    = $COMP  $COMP/tdeio
 subst      = $DST/extra/kde352
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -184,7 +184,7 @@ import     = tdeui
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = ../extra/kde352/kio @KDE_INCLUDEPATH@/kio ../tdecore
+include    = ../extra/kde352/tdeio @KDE_INCLUDEPATH@/tdeio ../tdecore
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule
 sipslot    =
@@ -257,7 +257,7 @@ import     = qtxmlmod.sip
 import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
-//import     = kfilemod.sip
+//import     = tdefilemod.sip
 //import     = tdepartsmod.sip
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
@@ -271,11 +271,11 @@ retain
 
 // -----------------------------------------
 
-module = kfile
+module = tdefile
 
-source     = $SRC/kio/kfile
+source     = $SRC/tdeio/tdefile
 ignore     = kpropsdlg.h
-compare    = $COMP  $COMP/kio
+compare    = $COMP  $COMP/tdeio
 subst      = $DST/extra/kde352
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -287,7 +287,7 @@ import     = kio
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/kio  ../tdecore  ../kio
+include    = @KDE_INCLUDEPATH@/tdeio  ../tdecore  ../tdeio
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule -lkiocmodule
 
@@ -311,7 +311,7 @@ import     = kio
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/tdeparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
+include    = @KDE_INCLUDEPATH@/tdeparts  @KDE_INCLUDEPATH@/tdeio  ../tdecore ../tdeio
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
              -ltdecorecmodule -lkiocmodule -ldcopcmodule -lkiocmodule
 
@@ -338,7 +338,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/tdehtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/tdeparts\
-             @KDE_INCLUDEPATH@/kio ../tdecore ../kio
+             @KDE_INCLUDEPATH@/tdeio ../tdecore ../tdeio
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -ltdehtml -ltdeparts -ltdecore -lkio\
             -ltdeuicmodule -ltdecorecmodule -lkiocmodule -ltdepartscmodule -ldcopcmodule
 
@@ -363,8 +363,8 @@ retain
 //import     = tdeparts
 //import     = tdehtml
 //importpath = $IMP
-//include    = @KDE_INCLUDEPATH@/kjs @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/kio\
-//             ../tdecore  ../kio
+//include    = @KDE_INCLUDEPATH@/kjs @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/tdeio\
+//             ../tdecore  ../tdeio
 //amend      = * ctor parent /TransferThis/
 //amend      = * all parent /Transfer/
 //libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -ltdehtml\
@@ -386,19 +386,19 @@ import     = dcop
 import     = tdecore
 import     = tdefx
 import     = tdeui
-import     = kfile
+import     = tdefile
 importpath = $IMP
-include    = ../tdecore  @KDE_INCLUDEPATH@/kio
+include    = ../tdecore  @KDE_INCLUDEPATH@/tdeio
 amend      = * ctor parent /TransferThis/        const KGuiItem& nullGuiItem (TQString::null);
 
 amend      = * all parent /Transfer/
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdespell -ltdeui -ltdecore -lkio\
-             -ltdecorecmodule -ltdeuicmodule -lkfilecmodule -ldcopcmodule
+             -ltdecorecmodule -ltdeuicmodule -ltdefilecmodule -ldcopcmodule
 sipslot    = obj slot tdespell
 
 code
 %PrePythonCode
-import kfile
+import tdefile
 %End
 end
 
@@ -442,7 +442,7 @@ import     = qtxmlmod.sip
 import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
-//import     = kfilemod.sip
+//import     = tdefilemod.sip
 //import     = tdepartsmod.sip
 importpath = $IMP
 ignore     = tdemdiiterator.h tdemdilistiterator.h tdemdinulliterator.h
@@ -472,7 +472,7 @@ retain
 //import     = tdefxmod.sip
 //import     = tdeuimod.sip
 ////import     = kiomod.sip
-////import     = kfilemod.sip
+////import     = tdefilemod.sip
 ////import     = tdepartsmod.sip
 //importpath = $IMP
 //include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
diff --git a/pytde353.prj b/pytde353.prj
index e2ae43b..ba4dfe2 100644
--- a/pytde353.prj
+++ b/pytde353.prj
@@ -170,10 +170,10 @@ retain
 
 module = kio
 
-source     = $SRC/kio/kio  $DST/extra/kde353/kio
+source     = $SRC/tdeio/tdeio  $DST/extra/kde353/tdeio
 ignore     = kmdbase.h uiserver_stub.h kdirnotify_stub.h uiserver.h http_slave_defaults.h ioslave_defaults.h
 ignore     = kmimetyperesolver.h
-compare    = $COMP  $COMP/kio
+compare    = $COMP  $COMP/tdeio
 subst      = $DST/extra/kde353
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -184,7 +184,7 @@ import     = tdeui
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = ../extra/kde353/kio @KDE_INCLUDEPATH@/kio ../tdecore
+include    = ../extra/kde353/tdeio @KDE_INCLUDEPATH@/tdeio ../tdecore
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule
 sipslot    =
@@ -257,7 +257,7 @@ import     = qtxmlmod.sip
 import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
-//import     = kfilemod.sip
+//import     = tdefilemod.sip
 //import     = tdepartsmod.sip
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
@@ -271,11 +271,11 @@ retain
 
 // -----------------------------------------
 
-module = kfile
+module = tdefile
 
-source     = $SRC/kio/kfile
+source     = $SRC/tdeio/tdefile
 ignore     = kpropsdlg.h
-compare    = $COMP  $COMP/kio
+compare    = $COMP  $COMP/tdeio
 subst      = $DST/extra/kde353
 import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = qtxmlmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
@@ -287,7 +287,7 @@ import     = kio
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/kio  ../tdecore  ../kio
+include    = @KDE_INCLUDEPATH@/tdeio  ../tdecore  ../tdeio
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule -lkiocmodule
 
@@ -311,7 +311,7 @@ import     = kio
 importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
-include    = @KDE_INCLUDEPATH@/tdeparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
+include    = @KDE_INCLUDEPATH@/tdeparts  @KDE_INCLUDEPATH@/tdeio  ../tdecore ../tdeio
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
              -ltdecorecmodule -lkiocmodule -ldcopcmodule -lkiocmodule
 
@@ -338,7 +338,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/tdehtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/tdeparts\
-             @KDE_INCLUDEPATH@/kio ../tdecore ../kio
+             @KDE_INCLUDEPATH@/tdeio ../tdecore ../tdeio
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -ltdehtml -ltdeparts -ltdecore -lkio\
             -ltdeuicmodule -ltdecorecmodule -lkiocmodule -ltdepartscmodule -ldcopcmodule
 
@@ -363,8 +363,8 @@ retain
 //import     = tdeparts
 //import     = tdehtml
 //importpath = $IMP
-//include    = @KDE_INCLUDEPATH@/kjs @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/kio\
-//             ../tdecore  ../kio
+//include    = @KDE_INCLUDEPATH@/kjs @KDE_INCLUDEPATH@/dom @KDE_INCLUDEPATH@/tdeio\
+//             ../tdecore  ../tdeio
 //amend      = * ctor parent /TransferThis/
 //amend      = * all parent /Transfer/
 //libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -ltdehtml\
@@ -386,19 +386,19 @@ import     = dcop
 import     = tdecore
 import     = tdefx
 import     = tdeui
-import     = kfile
+import     = tdefile
 importpath = $IMP
-include    = ../tdecore  @KDE_INCLUDEPATH@/kio
+include    = ../tdecore  @KDE_INCLUDEPATH@/tdeio
 amend      = * ctor parent /TransferThis/        const KGuiItem& nullGuiItem (TQString::null);
 
 amend      = * all parent /Transfer/
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdespell -ltdeui -ltdecore -lkio\
-             -ltdecorecmodule -ltdeuicmodule -lkfilecmodule -ldcopcmodule
+             -ltdecorecmodule -ltdeuicmodule -ltdefilecmodule -ldcopcmodule
 sipslot    = obj slot tdespell
 
 code
 %PrePythonCode
-import kfile
+import tdefile
 %End
 end
 
@@ -442,7 +442,7 @@ import     = qtxmlmod.sip
 import     = tdefxmod.sip
 import     = tdeuimod.sip
 //import     = kiomod.sip
-//import     = kfilemod.sip
+//import     = tdefilemod.sip
 //import     = tdepartsmod.sip
 importpath = $IMP
 ignore     = tdemdiiterator.h tdemdilistiterator.h tdemdinulliterator.h
@@ -472,7 +472,7 @@ retain
 //import     = tdefxmod.sip
 //import     = tdeuimod.sip
 ////import     = kiomod.sip
-////import     = kfilemod.sip
+////import     = tdefilemod.sip
 ////import     = tdepartsmod.sip
 //importpath = $IMP
 //include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
diff --git a/pytdeconfig.py b/pytdeconfig.py
index e3f5fb8..9b2af0f 100644
--- a/pytdeconfig.py
+++ b/pytdeconfig.py
@@ -38,7 +38,7 @@ _pkg_config = {
     'libdir':               'lib',
     'pytde_kde_sip_flags':  '-t ALL -x TQt_STYLE_WINDOWSXP -x TQt_STYLE_INTERLACE -x TQt_STYLE_WINDOWSXP -x TQt_SIP_PRE_4_7_2 -x VendorID -t WS_X11 -t TQt_3_3_6 -t KDE_3_5_3',
     'pytde_mod_dir':        '/usr/lib/python2.5/site-packages',
-    'pytde_modules':        'dcop tdecore tdefx tdeui kio tderesources kabc tdeutils kfile tdeparts tdehtml tdespell tdeprint tdemdi',
+    'pytde_modules':        'dcop tdecore tdefx tdeui kio tderesources kabc tdeutils tdefile tdeparts tdehtml tdespell tdeprint tdemdi',
     'pytde_sip_dir':        '/usr/share/sip',
     'pytde_version':        0x031000,
     'pytde_version_str':    '3.16.0'
@@ -155,7 +155,7 @@ class KioModuleMakefile(KdeuiModuleMakefile):
         KdeuiModuleMakefile.finalise(self)
 
 class KfileModuleMakefile(KioModuleMakefile):
-    """The Makefile class for modules that %Import kfile.
+    """The Makefile class for modules that %Import tdefile.
     """
     def finalise(self):
         """Finalise the macros.
@@ -164,7 +164,7 @@ class KfileModuleMakefile(KioModuleMakefile):
             # Note that we don't use self.extra_lib_dirs because we don't want
             # it to be added to the rpath.
             self.LIBDIR.append(self.config.pyqt_mod_dir)
-            self.extra_libs.append(self.module_as_lib("kfile"))
+            self.extra_libs.append(self.module_as_lib("tdefile"))
 
         KioModuleMakefile.finalise(self)
 
diff --git a/pytdeconfig.py.in b/pytdeconfig.py.in
index f04957d..3574e23 100644
--- a/pytdeconfig.py.in
+++ b/pytdeconfig.py.in
@@ -137,7 +137,7 @@ class KioModuleMakefile(KdeuiModuleMakefile):
         KdeuiModuleMakefile.finalise(self)
 
 class KfileModuleMakefile(KioModuleMakefile):
-    """The Makefile class for modules that %Import kfile.
+    """The Makefile class for modules that %Import tdefile.
     """
     def finalise(self):
         """Finalise the macros.
@@ -146,7 +146,7 @@ class KfileModuleMakefile(KioModuleMakefile):
             # Note that we don't use self.extra_lib_dirs because we don't want
             # it to be added to the rpath.
             self.LIBDIR.append(self.config.pyqt_mod_dir)
-            self.extra_libs.append(self.module_as_lib("kfile"))
+            self.extra_libs.append(self.module_as_lib("tdefile"))
 
         KioModuleMakefile.finalise(self)
 
diff --git a/sip/kfile/kfile-kde314.diff b/sip/kfile/kfile-kde314.diff
deleted file mode 100644
index ddad6d6..0000000
--- a/sip/kfile/kfile-kde314.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
-+ %Include knotifywidgetbase.sip
diff --git a/sip/kfile/kfile-kde315.diff b/sip/kfile/kfile-kde315.diff
deleted file mode 100644
index ddad6d6..0000000
--- a/sip/kfile/kfile-kde315.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
-+ %Include knotifywidgetbase.sip
diff --git a/sip/kfile/kfile-kde331.diff b/sip/kfile/kfile-kde331.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde331.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde332.diff b/sip/kfile/kfile-kde332.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde332.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde340.diff b/sip/kfile/kfile-kde340.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde340.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde341.diff b/sip/kfile/kfile-kde341.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde341.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde342.diff b/sip/kfile/kfile-kde342.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde342.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde343.diff b/sip/kfile/kfile-kde343.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde343.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde350.diff b/sip/kfile/kfile-kde350.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde350.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde351.diff b/sip/kfile/kfile-kde351.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde351.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde353.diff b/sip/kfile/kfile-kde353.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde353.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kio/global.sip b/sip/kio/global.sip
index 6ba32e2..0923e77 100644
--- a/sip/kio/global.sip
+++ b/sip/kio/global.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 %ModuleHeaderCode
-#include <kio/global.h>
+#include <tdeio/global.h>
 %End
 
 namespace TDEIO
diff --git a/sip/kio/kdirlister.sip b/sip/kio/kdirlister.sip
index f41aa68..6adce18 100644
--- a/sip/kio/kdirlister.sip
+++ b/sip/kio/kdirlister.sip
@@ -129,7 +129,7 @@ protected:
 //converts a Python list of KFileItem
 {
 %TypeHeaderCode
-#include <kfileitem.h>
+#include <tdefileitem.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/kio/kio-kde310.diff b/sip/kio/kio-kde310.diff
index 89a40fb..7abe6b3 100644
--- a/sip/kio/kio-kde310.diff
+++ b/sip/kio/kio-kde310.diff
@@ -1,5 +1,5 @@
 + %Include davjob.sip
 + %Include kar.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde312.diff b/sip/kio/kio-kde312.diff
index 89a40fb..7abe6b3 100644
--- a/sip/kio/kio-kde312.diff
+++ b/sip/kio/kio-kde312.diff
@@ -1,5 +1,5 @@
 + %Include davjob.sip
 + %Include kar.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde313.diff b/sip/kio/kio-kde313.diff
index 89a40fb..7abe6b3 100644
--- a/sip/kio/kio-kde313.diff
+++ b/sip/kio/kio-kde313.diff
@@ -1,5 +1,5 @@
 + %Include davjob.sip
 + %Include kar.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde314.diff b/sip/kio/kio-kde314.diff
index 89a40fb..7abe6b3 100644
--- a/sip/kio/kio-kde314.diff
+++ b/sip/kio/kio-kde314.diff
@@ -1,5 +1,5 @@
 + %Include davjob.sip
 + %Include kar.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde315.diff b/sip/kio/kio-kde315.diff
index 89a40fb..7abe6b3 100644
--- a/sip/kio/kio-kde315.diff
+++ b/sip/kio/kio-kde315.diff
@@ -1,5 +1,5 @@
 + %Include davjob.sip
 + %Include kar.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde320.diff b/sip/kio/kio-kde320.diff
index 5124944..db94510 100644
--- a/sip/kio/kio-kde320.diff
+++ b/sip/kio/kio-kde320.diff
@@ -1,6 +1,6 @@
 + %Include davjob.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde321.diff b/sip/kio/kio-kde321.diff
index 5124944..db94510 100644
--- a/sip/kio/kio-kde321.diff
+++ b/sip/kio/kio-kde321.diff
@@ -1,6 +1,6 @@
 + %Include davjob.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde322.diff b/sip/kio/kio-kde322.diff
index 5124944..db94510 100644
--- a/sip/kio/kio-kde322.diff
+++ b/sip/kio/kio-kde322.diff
@@ -1,6 +1,6 @@
 + %Include davjob.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde323.diff b/sip/kio/kio-kde323.diff
index 5124944..db94510 100644
--- a/sip/kio/kio-kde323.diff
+++ b/sip/kio/kio-kde323.diff
@@ -1,6 +1,6 @@
 + %Include davjob.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde330.diff b/sip/kio/kio-kde330.diff
index 901fbeb..acae23f 100644
--- a/sip/kio/kio-kde330.diff
+++ b/sip/kio/kio-kde330.diff
@@ -1,7 +1,7 @@
 + %Include davjob.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde331.diff b/sip/kio/kio-kde331.diff
index 901fbeb..acae23f 100644
--- a/sip/kio/kio-kde331.diff
+++ b/sip/kio/kio-kde331.diff
@@ -1,7 +1,7 @@
 + %Include davjob.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde332.diff b/sip/kio/kio-kde332.diff
index 901fbeb..acae23f 100644
--- a/sip/kio/kio-kde332.diff
+++ b/sip/kio/kio-kde332.diff
@@ -1,7 +1,7 @@
 + %Include davjob.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde340.diff b/sip/kio/kio-kde340.diff
index 324b1d4..ee6caf2 100644
--- a/sip/kio/kio-kde340.diff
+++ b/sip/kio/kio-kde340.diff
@@ -2,7 +2,7 @@
 + %Include forwardingslavebase.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde341.diff b/sip/kio/kio-kde341.diff
index 324b1d4..ee6caf2 100644
--- a/sip/kio/kio-kde341.diff
+++ b/sip/kio/kio-kde341.diff
@@ -2,7 +2,7 @@
 + %Include forwardingslavebase.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde342.diff b/sip/kio/kio-kde342.diff
index 324b1d4..ee6caf2 100644
--- a/sip/kio/kio-kde342.diff
+++ b/sip/kio/kio-kde342.diff
@@ -2,7 +2,7 @@
 + %Include forwardingslavebase.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde343.diff b/sip/kio/kio-kde343.diff
index 324b1d4..ee6caf2 100644
--- a/sip/kio/kio-kde343.diff
+++ b/sip/kio/kio-kde343.diff
@@ -2,7 +2,7 @@
 + %Include forwardingslavebase.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde350.diff b/sip/kio/kio-kde350.diff
index 3d0cb01..a601d8b 100644
--- a/sip/kio/kio-kde350.diff
+++ b/sip/kio/kio-kde350.diff
@@ -3,7 +3,7 @@
 + %Include kacl.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde351.diff b/sip/kio/kio-kde351.diff
index 3d0cb01..a601d8b 100644
--- a/sip/kio/kio-kde351.diff
+++ b/sip/kio/kio-kde351.diff
@@ -3,7 +3,7 @@
 + %Include kacl.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde352.diff b/sip/kio/kio-kde352.diff
index 3d0cb01..a601d8b 100644
--- a/sip/kio/kio-kde352.diff
+++ b/sip/kio/kio-kde352.diff
@@ -3,7 +3,7 @@
 + %Include kacl.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde353.diff b/sip/kio/kio-kde353.diff
index 3d0cb01..a601d8b 100644
--- a/sip/kio/kio-kde353.diff
+++ b/sip/kio/kio-kde353.diff
@@ -3,7 +3,7 @@
 + %Include kacl.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kiomod.sip.in b/sip/kio/kiomod.sip.in
index 5439424..913a7dc 100644
--- a/sip/kio/kiomod.sip.in
+++ b/sip/kio/kiomod.sip.in
@@ -49,9 +49,9 @@
 %Include kdirnotify.sip
 %Include kdirwatch.sip
 %Include kemailsettings.sip
-%Include kfilefilter.sip
-%Include kfileitem.sip
-%Include kfilemetainfo.sip
+%Include tdefilefilter.sip
+%Include tdefileitem.sip
+%Include tdefilemetainfo.sip
 %Include kfilterbase.sip
 %Include kfilterdev.sip
 %Include kimageio.sip
diff --git a/sip/kio/metainfojob.sip b/sip/kio/metainfojob.sip
index 3433bd3..a20eb05 100644
--- a/sip/kio/metainfojob.sip
+++ b/sip/kio/metainfojob.sip
@@ -31,7 +31,7 @@ namespace TDEIO
 class MetaInfoJob : TDEIO::Job
 {
 %TypeHeaderCode
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <jobclasses.h>
 #include <metainfojob.h>
 %End
diff --git a/sip/kio/kfilefilter.sip b/sip/kio/tdefilefilter.sip
index 481f004..d86093a 100644
--- a/sip/kio/kfilefilter.sip
+++ b/sip/kio/tdefilefilter.sip
@@ -27,7 +27,7 @@
 class KFileFilter
 {
 %TypeHeaderCode
-#include <kfilefilter.h>
+#include <tdefilefilter.h>
 %End
 
 
@@ -43,7 +43,7 @@ protected:
 class KSimpleFileFilter : KFileFilter
 {
 %TypeHeaderCode
-#include <kfilefilter.h>
+#include <tdefilefilter.h>
 %End
 
 
diff --git a/sip/kio/kfileitem.sip b/sip/kio/tdefileitem.sip
index 3cf982b..da88569 100644
--- a/sip/kio/kfileitem.sip
+++ b/sip/kio/tdefileitem.sip
@@ -27,7 +27,7 @@
 class KFileItem
 {
 %TypeHeaderCode
-#include <kfileitem.h>
+#include <tdefileitem.h>
 %End
 
 
diff --git a/sip/kio/kfilemetainfo.sip b/sip/kio/tdefilemetainfo.sip
index a5d8b78..3053f6e 100644
--- a/sip/kio/kfilemetainfo.sip
+++ b/sip/kio/tdefilemetainfo.sip
@@ -27,7 +27,7 @@
 class KFileMimeTypeInfo
 {
 %TypeHeaderCode
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 %End
 
 
@@ -194,7 +194,7 @@ public:
 class KFileMetaInfoItem
 {
 %TypeHeaderCode
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 %End
 
 
@@ -237,7 +237,7 @@ protected:
 class KFileMetaInfoGroup
 {
 %TypeHeaderCode
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 %End
 
 
@@ -295,7 +295,7 @@ protected:
 class KFileMetaInfo
 {
 %TypeHeaderCode
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 %End
 
 
@@ -380,7 +380,7 @@ protected:
 class KFilePlugin : TQObject
 {
 %TypeHeaderCode
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 %End
 
 
@@ -413,7 +413,7 @@ protected:
 class KFileMetaInfoProvider : TQObject
 {
 %TypeHeaderCode
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 %End
 
 
diff --git a/sip/kio/kfileshare.sip b/sip/kio/tdefileshare.sip
index 8b917dd..a4e5aa2 100644
--- a/sip/kio/kfileshare.sip
+++ b/sip/kio/tdefileshare.sip
@@ -32,7 +32,7 @@
 class KFileShare
 {
 %TypeHeaderCode
-#include <kfileshare.h>
+#include <tdefileshare.h>
 %End
 
 
diff --git a/sip/tdecore/bytearray.sip b/sip/tdecore/bytearray.sip
index 507ef3c..743aff6 100644
--- a/sip/tdecore/bytearray.sip
+++ b/sip/tdecore/bytearray.sip
@@ -785,7 +785,7 @@ void dcop_add (TQDataStream& s, TQByteArray value)
 };
 
 
-//%MappedType TQMap<TQString,TQString> is available in tdecore/kconfig.sip
+//%MappedType TQMap<TQString,TQString> is available in tdecore/tdeconfig.sip
 
 
 %MappedType TQMap<TQString,TQByteArray>
diff --git a/sip/tdecore/kshortcutlist.sip b/sip/tdecore/kshortcutlist.sip
index 53ce168..e5eca23 100644
--- a/sip/tdecore/kshortcutlist.sip
+++ b/sip/tdecore/kshortcutlist.sip
@@ -27,7 +27,7 @@
 class KShortcutList
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kshortcut.h>
 #include <kshortcutlist.h>
 %End
@@ -68,7 +68,7 @@ protected:
 class KAccelShortcutList : KShortcutList
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kshortcut.h>
 #include <kshortcutlist.h>
 %End
@@ -104,7 +104,7 @@ namespace KStdAccel
 class ShortcutList : KShortcutList
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kshortcut.h>
 #include <kshortcutlist.h>
 %End
diff --git a/sip/tdecore/kconfig.sip b/sip/tdecore/tdeconfig.sip
index 1e30b31..c60c002 100644
--- a/sip/tdecore/kconfig.sip
+++ b/sip/tdecore/tdeconfig.sip
@@ -27,7 +27,7 @@
 class TDEConfig : TDEConfigBase
 {
 %TypeHeaderCode
-#include <kconfig.h>
+#include <tdeconfig.h>
 %End
 
 
@@ -82,7 +82,7 @@ protected:
 class KSharedConfig : TDEConfig, KShared
 {
 %TypeHeaderCode
-#include <kconfig.h>
+#include <tdeconfig.h>
 %End
 
 
@@ -197,7 +197,7 @@ private:
 {
 %TypeHeaderCode
 #include <ksharedptr.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/tdecore/kconfigbackend.sip b/sip/tdecore/tdeconfigbackend.sip
index 2df5316..1afa8e2 100644
--- a/sip/tdecore/kconfigbackend.sip
+++ b/sip/tdecore/tdeconfigbackend.sip
@@ -27,7 +27,7 @@
 class TDEConfigBackEnd
 {
 %TypeHeaderCode
-#include <kconfigbackend.h>
+#include <tdeconfigbackend.h>
 %End
 
 
@@ -66,8 +66,8 @@ protected:
 class TDEConfigINIBackEnd : TDEConfigBackEnd
 {
 %TypeHeaderCode
-#include <kconfigdata.h>
-#include <kconfigbackend.h>
+#include <tdeconfigdata.h>
+#include <tdeconfigbackend.h>
 %End
 
 
diff --git a/sip/tdecore/kconfigbase.sip b/sip/tdecore/tdeconfigbase.sip
index 2f9d9c9..53b36a2 100644
--- a/sip/tdecore/kconfigbase.sip
+++ b/sip/tdecore/tdeconfigbase.sip
@@ -33,7 +33,7 @@ typedef unsigned long long ulonglong;
 class TDEConfigBase : TQObject
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 %End
 
 
@@ -212,7 +212,7 @@ protected:
 class TDEConfigGroupSaver
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 %End
 
 
@@ -231,7 +231,7 @@ private:
 class TDEConfigGroup : TDEConfigBase
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 %End
 
 
diff --git a/sip/tdecore/kconfigdata.sip b/sip/tdecore/tdeconfigdata.sip
index 96a22cf..6c20ab9 100644
--- a/sip/tdecore/kconfigdata.sip
+++ b/sip/tdecore/tdeconfigdata.sip
@@ -27,7 +27,7 @@
 class KEntry
 {
 %TypeHeaderCode
-#include <kconfigdata.h>
+#include <tdeconfigdata.h>
 %End
 
 
@@ -51,7 +51,7 @@ public:
 class KEntryKey
 {
 %TypeHeaderCode
-#include <kconfigdata.h>
+#include <tdeconfigdata.h>
 %End
 
 
@@ -90,7 +90,7 @@ KEntryMap            testKEntryMap (SIP_PYOBJECT) [KEntryMap (KEntryMap)];
 {
 %TypeHeaderCode
 #include <tqmap.h>
-#include <kconfigdata.h>
+#include <tdeconfigdata.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/tdecore/kconfigdialogmanager.sip b/sip/tdecore/tdeconfigdialogmanager.sip
index cec0949..52e4951 100644
--- a/sip/tdecore/kconfigdialogmanager.sip
+++ b/sip/tdecore/tdeconfigdialogmanager.sip
@@ -29,7 +29,7 @@
 class TDEConfigDialogManager : TQObject
 {
 %TypeHeaderCode
-#include <kconfigdialogmanager.h>
+#include <tdeconfigdialogmanager.h>
 %End
 
 
diff --git a/sip/tdecore/kconfigskeleton.sip b/sip/tdecore/tdeconfigskeleton.sip
index 61e9b52..6e588c1 100644
--- a/sip/tdecore/kconfigskeleton.sip
+++ b/sip/tdecore/tdeconfigskeleton.sip
@@ -30,7 +30,7 @@ class TDEConfigSkeletonItem
 {
 %TypeHeaderCode
 #include <typeinfo>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 %End
 
 
@@ -122,7 +122,7 @@ protected:
 class TDEConfigSkeleton
 {
 %TypeHeaderCode
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 typedef TQValueList<int> IntList;
 %End
 
@@ -1080,7 +1080,7 @@ public:
 %MappedType TQValueList<TDEConfigSkeleton::ItemEnum::Choice>
 {
 %TypeHeaderCode
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/tdecore/tdecore-kde320.diff b/sip/tdecore/tdecore-kde320.diff
index 91d9a2c..5bce785 100644
--- a/sip/tdecore/tdecore-kde320.diff
+++ b/sip/tdecore/tdecore-kde320.diff
@@ -1,8 +1,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde321.diff b/sip/tdecore/tdecore-kde321.diff
index 70ae29c..1e2c244 100644
--- a/sip/tdecore/tdecore-kde321.diff
+++ b/sip/tdecore/tdecore-kde321.diff
@@ -1,8 +1,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde322.diff b/sip/tdecore/tdecore-kde322.diff
index 2114627..a4eb42c 100644
--- a/sip/tdecore/tdecore-kde322.diff
+++ b/sip/tdecore/tdecore-kde322.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde323.diff b/sip/tdecore/tdecore-kde323.diff
index 2114627..a4eb42c 100644
--- a/sip/tdecore/tdecore-kde323.diff
+++ b/sip/tdecore/tdecore-kde323.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde330.diff b/sip/tdecore/tdecore-kde330.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde330.diff
+++ b/sip/tdecore/tdecore-kde330.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde331.diff b/sip/tdecore/tdecore-kde331.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde331.diff
+++ b/sip/tdecore/tdecore-kde331.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde332.diff b/sip/tdecore/tdecore-kde332.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde332.diff
+++ b/sip/tdecore/tdecore-kde332.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde340.diff b/sip/tdecore/tdecore-kde340.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde340.diff
+++ b/sip/tdecore/tdecore-kde340.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde341.diff b/sip/tdecore/tdecore-kde341.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde341.diff
+++ b/sip/tdecore/tdecore-kde341.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde342.diff b/sip/tdecore/tdecore-kde342.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde342.diff
+++ b/sip/tdecore/tdecore-kde342.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde343.diff b/sip/tdecore/tdecore-kde343.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde343.diff
+++ b/sip/tdecore/tdecore-kde343.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde350.diff b/sip/tdecore/tdecore-kde350.diff
index 72166a8..1d1dca9 100644
--- a/sip/tdecore/tdecore-kde350.diff
+++ b/sip/tdecore/tdecore-kde350.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde351.diff b/sip/tdecore/tdecore-kde351.diff
index 72166a8..1d1dca9 100644
--- a/sip/tdecore/tdecore-kde351.diff
+++ b/sip/tdecore/tdecore-kde351.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde352.diff b/sip/tdecore/tdecore-kde352.diff
index 72166a8..1d1dca9 100644
--- a/sip/tdecore/tdecore-kde352.diff
+++ b/sip/tdecore/tdecore-kde352.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde353.diff b/sip/tdecore/tdecore-kde353.diff
index 72166a8..1d1dca9 100644
--- a/sip/tdecore/tdecore-kde353.diff
+++ b/sip/tdecore/tdecore-kde353.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecoremod.sip.in b/sip/tdecore/tdecoremod.sip.in
index 27f0764..28b89d6 100644
--- a/sip/tdecore/tdecoremod.sip.in
+++ b/sip/tdecore/tdecoremod.sip.in
@@ -45,10 +45,10 @@
 %Include kcharsets.sip
 %Include kcmdlineargs.sip
 %Include kcompletion.sip
-%Include kconfig.sip
-%Include kconfigbackend.sip
-%Include kconfigbase.sip
-%Include kconfigdata.sip
+%Include tdeconfig.sip
+%Include tdeconfigbackend.sip
+%Include tdeconfigbase.sip
+%Include tdeconfigdata.sip
 %Include kcrash.sip
 %Include kdcoppropertyproxy.sip
 %Include kdesktopfile.sip
diff --git a/sip/kfile/booktoken.sip b/sip/tdefile/booktoken.sip
index 182f5cd..2b44f8e 100644
--- a/sip/kfile/booktoken.sip
+++ b/sip/tdefile/booktoken.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE_3_1_1
+//            module tdefile  version KDE_3_1_1
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kcombiview.sip b/sip/tdefile/kcombiview.sip
index 6e44ab4..e78209d 100644
--- a/sip/kfile/kcombiview.sip
+++ b/sip/tdefile/kcombiview.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kcustommenueditor.sip b/sip/tdefile/kcustommenueditor.sip
index 733d7bd..fe8376e 100644
--- a/sip/kfile/kcustommenueditor.sip
+++ b/sip/tdefile/kcustommenueditor.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kdiroperator.sip b/sip/tdefile/kdiroperator.sip
index 31ac0e2..4fa74b2 100644
--- a/sip/kfile/kdiroperator.sip
+++ b/sip/tdefile/kdiroperator.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kdirselectdialog.sip b/sip/tdefile/kdirselectdialog.sip
index d464907..f026846 100644
--- a/sip/kfile/kdirselectdialog.sip
+++ b/sip/tdefile/kdirselectdialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kdirsize.sip b/sip/tdefile/kdirsize.sip
index 2f0a553..ae05e31 100644
--- a/sip/kfile/kdirsize.sip
+++ b/sip/tdefile/kdirsize.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kdiskfreesp.sip b/sip/tdefile/kdiskfreesp.sip
index 4e8433b..53d2a7f 100644
--- a/sip/kfile/kdiskfreesp.sip
+++ b/sip/tdefile/kdiskfreesp.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kencodingfiledialog.sip b/sip/tdefile/kencodingfiledialog.sip
index 9214b47..7528fd9 100644
--- a/sip/kfile/kencodingfiledialog.sip
+++ b/sip/tdefile/kencodingfiledialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kicondialog.sip b/sip/tdefile/kicondialog.sip
index 819bac2..eebdcb0 100644
--- a/sip/kfile/kicondialog.sip
+++ b/sip/tdefile/kicondialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kimagefilepreview.sip b/sip/tdefile/kimagefilepreview.sip
index 808b307..8c8cbe7 100644
--- a/sip/kfile/kimagefilepreview.sip
+++ b/sip/tdefile/kimagefilepreview.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/knotifydialog.sip b/sip/tdefile/knotifydialog.sip
index ad16340..4f20a13 100644
--- a/sip/kfile/knotifydialog.sip
+++ b/sip/tdefile/knotifydialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/knotifywidgetbase.sip b/sip/tdefile/knotifywidgetbase.sip
index f83b853..d5ec44d 100644
--- a/sip/kfile/knotifywidgetbase.sip
+++ b/sip/tdefile/knotifywidgetbase.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE_3_1_4
+//            module tdefile  version KDE_3_1_4
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kopenwith.sip b/sip/tdefile/kopenwith.sip
index 840186d..a85e671 100644
--- a/sip/kfile/kopenwith.sip
+++ b/sip/tdefile/kopenwith.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kpreviewwidgetbase.sip b/sip/tdefile/kpreviewwidgetbase.sip
index cb44f70..eb49029 100644
--- a/sip/kfile/kpreviewwidgetbase.sip
+++ b/sip/tdefile/kpreviewwidgetbase.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kpropertiesdialog.sip b/sip/tdefile/kpropertiesdialog.sip
index 5229058..63047e6 100644
--- a/sip/kfile/kpropertiesdialog.sip
+++ b/sip/tdefile/kpropertiesdialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kpropsdlg.sip b/sip/tdefile/kpropsdlg.sip
index 81d697f..f245a6f 100644
--- a/sip/kfile/kpropsdlg.sip
+++ b/sip/tdefile/kpropsdlg.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE_3_1_1
+//            module tdefile  version KDE_3_1_1
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/krecentdirs.sip b/sip/tdefile/krecentdirs.sip
index 31fed75..ef79698 100644
--- a/sip/kfile/krecentdirs.sip
+++ b/sip/tdefile/krecentdirs.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE_3_5_0
+//            module tdefile  version KDE_3_5_0
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/krecentdocument.sip b/sip/tdefile/krecentdocument.sip
index 7e4c8cc..c81a337 100644
--- a/sip/kfile/krecentdocument.sip
+++ b/sip/tdefile/krecentdocument.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kurlbar.sip b/sip/tdefile/kurlbar.sip
index d6e92f9..cbfc1c4 100644
--- a/sip/kfile/kurlbar.sip
+++ b/sip/tdefile/kurlbar.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kurlcombobox.sip b/sip/tdefile/kurlcombobox.sip
index 09e36a5..2f3079a 100644
--- a/sip/kfile/kurlcombobox.sip
+++ b/sip/tdefile/kurlcombobox.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kurlrequester.sip b/sip/tdefile/kurlrequester.sip
index 9d44788..5fee9c5 100644
--- a/sip/kfile/kurlrequester.sip
+++ b/sip/tdefile/kurlrequester.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kurlrequesterdlg.sip b/sip/tdefile/kurlrequesterdlg.sip
index d58e786..62177af 100644
--- a/sip/kfile/kurlrequesterdlg.sip
+++ b/sip/tdefile/kurlrequesterdlg.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kfile-kde310.diff b/sip/tdefile/tdefile-kde310.diff
index ddad6d6..2b12be0 100644
--- a/sip/kfile/kfile-kde310.diff
+++ b/sip/tdefile/tdefile-kde310.diff
@@ -1,5 +1,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
 + %Include knotifywidgetbase.sip
diff --git a/sip/kfile/kfile-kde311.diff b/sip/tdefile/tdefile-kde311.diff
index ddad6d6..2b12be0 100644
--- a/sip/kfile/kfile-kde311.diff
+++ b/sip/tdefile/tdefile-kde311.diff
@@ -1,5 +1,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
 + %Include knotifywidgetbase.sip
diff --git a/sip/kfile/kfile-kde312.diff b/sip/tdefile/tdefile-kde312.diff
index ddad6d6..2b12be0 100644
--- a/sip/kfile/kfile-kde312.diff
+++ b/sip/tdefile/tdefile-kde312.diff
@@ -1,5 +1,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
 + %Include knotifywidgetbase.sip
diff --git a/sip/kfile/kfile-kde313.diff b/sip/tdefile/tdefile-kde313.diff
index ddad6d6..2b12be0 100644
--- a/sip/kfile/kfile-kde313.diff
+++ b/sip/tdefile/tdefile-kde313.diff
@@ -1,5 +1,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
 + %Include knotifywidgetbase.sip
diff --git a/sip/tdefile/tdefile-kde314.diff b/sip/tdefile/tdefile-kde314.diff
new file mode 100644
index 0000000..2b12be0
--- /dev/null
+++ b/sip/tdefile/tdefile-kde314.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
++ %Include knotifywidgetbase.sip
diff --git a/sip/tdefile/tdefile-kde315.diff b/sip/tdefile/tdefile-kde315.diff
new file mode 100644
index 0000000..2b12be0
--- /dev/null
+++ b/sip/tdefile/tdefile-kde315.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
++ %Include knotifywidgetbase.sip
diff --git a/sip/kfile/kfile-kde320.diff b/sip/tdefile/tdefile-kde320.diff
index f5ab9bd..ad75de7 100644
--- a/sip/kfile/kfile-kde320.diff
+++ b/sip/tdefile/tdefile-kde320.diff
@@ -1,6 +1,6 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
 + %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
 + %Include knotifywidgetbase.sip
\ No newline at end of file
diff --git a/sip/kfile/kfile-kde330.diff b/sip/tdefile/tdefile-kde321.diff
index 2545aae..199a42d 100644
--- a/sip/kfile/kfile-kde330.diff
+++ b/sip/tdefile/tdefile-kde321.diff
@@ -1,5 +1,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
 + %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde321.diff b/sip/tdefile/tdefile-kde322.diff
index 2545aae..199a42d 100644
--- a/sip/kfile/kfile-kde321.diff
+++ b/sip/tdefile/tdefile-kde322.diff
@@ -1,5 +1,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
 + %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde322.diff b/sip/tdefile/tdefile-kde323.diff
index 2545aae..199a42d 100644
--- a/sip/kfile/kfile-kde322.diff
+++ b/sip/tdefile/tdefile-kde323.diff
@@ -1,5 +1,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
 + %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde323.diff b/sip/tdefile/tdefile-kde330.diff
index 2545aae..199a42d 100644
--- a/sip/kfile/kfile-kde323.diff
+++ b/sip/tdefile/tdefile-kde330.diff
@@ -1,5 +1,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
 + %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde331.diff b/sip/tdefile/tdefile-kde331.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde331.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde332.diff b/sip/tdefile/tdefile-kde332.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde332.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde340.diff b/sip/tdefile/tdefile-kde340.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde340.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde341.diff b/sip/tdefile/tdefile-kde341.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde341.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde342.diff b/sip/tdefile/tdefile-kde342.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde342.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde343.diff b/sip/tdefile/tdefile-kde343.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde343.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde350.diff b/sip/tdefile/tdefile-kde350.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde350.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde351.diff b/sip/tdefile/tdefile-kde351.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde351.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde352.diff b/sip/tdefile/tdefile-kde352.diff
index 81a0603..9083bb6 100644
--- a/sip/kfile/kfile-kde352.diff
+++ b/sip/tdefile/tdefile-kde352.diff
@@ -2,5 +2,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
 + %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde353.diff b/sip/tdefile/tdefile-kde353.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde353.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile.sip b/sip/tdefile/tdefile.sip
index e145655..4ec3611 100644
--- a/sip/kfile/kfile.sip
+++ b/sip/tdefile/tdefile.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFile
 {
 %TypeHeaderCode
-#include <kfile.h>
+#include <tdefile.h>
 %End
 
 
diff --git a/sip/kfile/kfilebookmark.sip b/sip/tdefile/tdefilebookmark.sip
index 59315ab..9623a7a 100644
--- a/sip/kfile/kfilebookmark.sip
+++ b/sip/tdefile/tdefilebookmark.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE_3_1_1
+//            module tdefile  version KDE_3_1_1
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileBookmark
 {
 %TypeHeaderCode
-#include <kfilebookmark.h>
+#include <tdefilebookmark.h>
 %End
 
 
@@ -56,7 +56,7 @@ public:
 class KFileBookmarkManager : TQObject
 {
 %TypeHeaderCode
-#include <kfilebookmark.h>
+#include <tdefilebookmark.h>
 %End
 
 
diff --git a/sip/kfile/kfiledetailview.sip b/sip/tdefile/tdefiledetailview.sip
index 0b7e13e..a75da9d 100644
--- a/sip/kfile/kfiledetailview.sip
+++ b/sip/tdefile/tdefiledetailview.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileListViewItem : KListViewItem
 {
 %TypeHeaderCode
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 %End
 
 
@@ -55,7 +55,7 @@ public:
 class KFileDetailView : KListView, KFileView
 {
 %TypeHeaderCode
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 %End
 
 
diff --git a/sip/kfile/kfiledialog.sip b/sip/tdefile/tdefiledialog.sip
index 9b68e13..c7142ee 100644
--- a/sip/kfile/kfiledialog.sip
+++ b/sip/tdefile/tdefiledialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileDialog : KDialogBase
 {
 %TypeHeaderCode
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 %End
 
 
diff --git a/sip/kfile/kfilefiltercombo.sip b/sip/tdefile/tdefilefiltercombo.sip
index 28f43d2..78e5969 100644
--- a/sip/kfile/kfilefiltercombo.sip
+++ b/sip/tdefile/tdefilefiltercombo.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileFilterCombo : KComboBox
 {
 %TypeHeaderCode
-#include <kfilefiltercombo.h>
+#include <tdefilefiltercombo.h>
 %End
 
 
diff --git a/sip/kfile/kfileiconview.sip b/sip/tdefile/tdefileiconview.sip
index e7717ae..bd69889 100644
--- a/sip/kfile/kfileiconview.sip
+++ b/sip/tdefile/tdefileiconview.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileIconViewItem : KIconViewItem
 {
 %TypeHeaderCode
-#include <kfileiconview.h>
+#include <tdefileiconview.h>
 %End
 
 
@@ -46,7 +46,7 @@ public:
 class KFileIconView : KIconView, KFileView
 {
 %TypeHeaderCode
-#include <kfileiconview.h>
+#include <tdefileiconview.h>
 %End
 
 
diff --git a/sip/kfile/kfilemod.sip.in b/sip/tdefile/tdefilemod.sip.in
index 34e1179..7246ceb 100644
--- a/sip/kfile/kfilemod.sip.in
+++ b/sip/tdefile/tdefilemod.sip.in
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE_3_5_2
+//            module tdefile  version KDE_3_5_2
 
 %Copying
 
@@ -26,7 +26,7 @@
 
 %End
 
-%Module kfile
+%Module tdefile
 
 %Import qt/qtmod.sip
 %Import qtxml/qtxmlmod.sip
@@ -40,16 +40,16 @@
 %Include kdiroperator.sip
 %Include kdirselectdialog.sip
 %Include kdirsize.sip
-%Include kfile.sip
-%Include kfiledetailview.sip
-%Include kfiledialog.sip
-%Include kfilefiltercombo.sip
-%Include kfileiconview.sip
-%Include kfilepreview.sip
-%Include kfiletreebranch.sip
-%Include kfiletreeview.sip
-%Include kfiletreeviewitem.sip
-%Include kfileview.sip
+%Include tdefile.sip
+%Include tdefiledetailview.sip
+%Include tdefiledialog.sip
+%Include tdefilefiltercombo.sip
+%Include tdefileiconview.sip
+%Include tdefilepreview.sip
+%Include tdefiletreebranch.sip
+%Include tdefiletreeview.sip
+%Include tdefiletreeviewitem.sip
+%Include tdefileview.sip
 %Include kicondialog.sip
 %Include kimagefilepreview.sip
 %Include kopenwith.sip
diff --git a/sip/kfile/kfilepreview.sip b/sip/tdefile/tdefilepreview.sip
index 6d2095e..d9301df 100644
--- a/sip/kfile/kfilepreview.sip
+++ b/sip/tdefile/tdefilepreview.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFilePreview : TQSplitter, KFileView
 {
 %TypeHeaderCode
-#include <kfilepreview.h>
+#include <tdefilepreview.h>
 %End
 
 
diff --git a/sip/kfile/kfilereader.sip b/sip/tdefile/tdefilereader.sip
index 8f4a5d6..4f78f7b 100644
--- a/sip/kfile/kfilereader.sip
+++ b/sip/tdefile/tdefilereader.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE_3_1_1
+//            module tdefile  version KDE_3_1_1
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileReader : KDirLister
 {
 %TypeHeaderCode
-#include <kfilereader.h>
+#include <tdefilereader.h>
 %End
 
 
diff --git a/sip/kfile/kfilesharedlg.sip b/sip/tdefile/tdefilesharedlg.sip
index b3d78ff..49f3952 100644
--- a/sip/kfile/kfilesharedlg.sip
+++ b/sip/tdefile/tdefilesharedlg.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@
 class KFileSharePropsPlugin : KPropsDlgPlugin
 {
 %TypeHeaderCode
-#include <kfilesharedlg.h>
+#include <tdefilesharedlg.h>
 %End
 
 
diff --git a/sip/kfile/kfiletreebranch.sip b/sip/tdefile/tdefiletreebranch.sip
index 15c9d47..75e7874 100644
--- a/sip/kfile/kfiletreebranch.sip
+++ b/sip/tdefile/tdefiletreebranch.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileTreeBranch : KDirLister
 {
 %TypeHeaderCode
-#include <kfiletreebranch.h>
+#include <tdefiletreebranch.h>
 %End
 
 
@@ -85,7 +85,7 @@ typedef TQPtrList<KFileTreeBranch> KFileTreeBranchList;
 //converts a Python list of KFileTreeViewItem
 {
 %TypeHeaderCode
-#include <kfiletreeviewitem.h>
+#include <tdefiletreeviewitem.h>
 typedef TQPtrList<KFileTreeViewItem> KFileTreeViewItemList;
 %End
 
@@ -160,7 +160,7 @@ typedef TQPtrList<KFileTreeViewItem> KFileTreeViewItemList;
 //converts a Python list of KFileTreeBranch
 {
 %TypeHeaderCode
-#include <kfiletreebranch.h>
+#include <tdefiletreebranch.h>
 //typedef TQPtrList<KFileTreeBranch> KFileTreeBList;
 %End
 
diff --git a/sip/kfile/kfiletreeview.sip b/sip/tdefile/tdefiletreeview.sip
index d89e59a..50296f5 100644
--- a/sip/kfile/kfiletreeview.sip
+++ b/sip/tdefile/tdefiletreeview.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileTreeViewToolTip : TQToolTip
 {
 %TypeHeaderCode
-#include <kfiletreeview.h>
+#include <tdefiletreeview.h>
 %End
 
 
@@ -43,7 +43,7 @@ protected:
 class KFileTreeView : KListView
 {
 %TypeHeaderCode
-#include <kfiletreeview.h>
+#include <tdefiletreeview.h>
 %End
 
 
diff --git a/sip/kfile/kfiletreeviewitem.sip b/sip/tdefile/tdefiletreeviewitem.sip
index 1d52d86..ed330b2 100644
--- a/sip/kfile/kfiletreeviewitem.sip
+++ b/sip/tdefile/tdefiletreeviewitem.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileTreeViewItem : KListViewItem
 {
 %TypeHeaderCode
-#include <kfiletreeviewitem.h>
+#include <tdefiletreeviewitem.h>
 %End
 
 
diff --git a/sip/kfile/kfileview.sip b/sip/tdefile/tdefileview.sip
index b29fe7e..43b935f 100644
--- a/sip/kfile/kfileview.sip
+++ b/sip/tdefile/tdefileview.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileViewSignaler : TQObject
 {
 %TypeHeaderCode
-#include <kfileview.h>
+#include <tdefileview.h>
 %End
 
 
@@ -60,7 +60,7 @@ signals:
 class KFileView
 {
 %TypeHeaderCode
-#include <kfileview.h>
+#include <tdefileview.h>
 %End
 
 
diff --git a/sip/kfile/kfileviewitem.sip b/sip/tdefile/tdefileviewitem.sip
index 4193b3a..22119ca 100644
--- a/sip/kfile/kfileviewitem.sip
+++ b/sip/tdefile/tdefileviewitem.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE_3_1_1
+//            module tdefile  version KDE_3_1_1
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileViewItem : KFileItem
 {
 %TypeHeaderCode
-#include <kfileviewitem.h>
+#include <tdefileviewitem.h>
 %End
 
 
diff --git a/sip/tderesources/resource.sip b/sip/tderesources/resource.sip
index 0831a82..972d3a1 100644
--- a/sip/tderesources/resource.sip
+++ b/sip/tderesources/resource.sip
@@ -31,7 +31,7 @@ namespace KRES
 class Resource : TQObject
 {
 %TypeHeaderCode
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <resource.h>
 %End
 
diff --git a/sip/tdespell/tdespellmod.sip.in b/sip/tdespell/tdespellmod.sip.in
index cc6d5c4..95670ca 100644
--- a/sip/tdespell/tdespellmod.sip.in
+++ b/sip/tdespell/tdespellmod.sip.in
@@ -34,7 +34,7 @@
 %Import tdecoremod.sip
 %Import tdefxmod.sip
 %Import tdeuimod.sip
-%Import kfilemod.sip
+%Import tdefilemod.sip
 
 %Include ksconfig.sip
 %Include tdespell.sip
diff --git a/sip/tdeui/kactionshortcutlist.sip b/sip/tdeui/kactionshortcutlist.sip
index 2d5a0d7..22a07a4 100644
--- a/sip/tdeui/kactionshortcutlist.sip
+++ b/sip/tdeui/kactionshortcutlist.sip
@@ -27,7 +27,7 @@
 class KActionShortcutList : KShortcutList
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kshortcut.h>
 #include <kaction.h>
 #include <kactionshortcutlist.h>
@@ -65,7 +65,7 @@ protected:
 class KActionPtrShortcutList : KShortcutList
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kshortcut.h>
 #include <kaction.h>
 #include <kactionshortcutlist.h>
diff --git a/sip/tdeui/kconfigdialog.sip b/sip/tdeui/tdeconfigdialog.sip
index 30a7234..ea5d046 100644
--- a/sip/tdeui/kconfigdialog.sip
+++ b/sip/tdeui/tdeconfigdialog.sip
@@ -29,7 +29,7 @@
 class TDEConfigDialog : KDialogBase
 {
 %TypeHeaderCode
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 %End
 
 
diff --git a/sip/tdeui/tdeui-kde320.diff b/sip/tdeui/tdeui-kde320.diff
index 2e22393..f1c0755 100644
--- a/sip/tdeui/tdeui-kde320.diff
+++ b/sip/tdeui/tdeui-kde320.diff
@@ -1,6 +1,6 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde321.diff b/sip/tdeui/tdeui-kde321.diff
index 2e22393..f1c0755 100644
--- a/sip/tdeui/tdeui-kde321.diff
+++ b/sip/tdeui/tdeui-kde321.diff
@@ -1,6 +1,6 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde322.diff b/sip/tdeui/tdeui-kde322.diff
index 2e22393..f1c0755 100644
--- a/sip/tdeui/tdeui-kde322.diff
+++ b/sip/tdeui/tdeui-kde322.diff
@@ -1,6 +1,6 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde323.diff b/sip/tdeui/tdeui-kde323.diff
index a5989d4..18841bb 100644
--- a/sip/tdeui/tdeui-kde323.diff
+++ b/sip/tdeui/tdeui-kde323.diff
@@ -1,6 +1,6 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde330.diff b/sip/tdeui/tdeui-kde330.diff
index dfe8ea4..0e78196 100644
--- a/sip/tdeui/tdeui-kde330.diff
+++ b/sip/tdeui/tdeui-kde330.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde331.diff b/sip/tdeui/tdeui-kde331.diff
index dfe8ea4..0e78196 100644
--- a/sip/tdeui/tdeui-kde331.diff
+++ b/sip/tdeui/tdeui-kde331.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde332.diff b/sip/tdeui/tdeui-kde332.diff
index dfe8ea4..0e78196 100644
--- a/sip/tdeui/tdeui-kde332.diff
+++ b/sip/tdeui/tdeui-kde332.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde340.diff b/sip/tdeui/tdeui-kde340.diff
index 57d6793..a59386a 100644
--- a/sip/tdeui/tdeui-kde340.diff
+++ b/sip/tdeui/tdeui-kde340.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde341.diff b/sip/tdeui/tdeui-kde341.diff
index 57d6793..a59386a 100644
--- a/sip/tdeui/tdeui-kde341.diff
+++ b/sip/tdeui/tdeui-kde341.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde342.diff b/sip/tdeui/tdeui-kde342.diff
index 57d6793..a59386a 100644
--- a/sip/tdeui/tdeui-kde342.diff
+++ b/sip/tdeui/tdeui-kde342.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde343.diff b/sip/tdeui/tdeui-kde343.diff
index 57d6793..a59386a 100644
--- a/sip/tdeui/tdeui-kde343.diff
+++ b/sip/tdeui/tdeui-kde343.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde350.diff b/sip/tdeui/tdeui-kde350.diff
index 381467e..b78a05a 100644
--- a/sip/tdeui/tdeui-kde350.diff
+++ b/sip/tdeui/tdeui-kde350.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde351.diff b/sip/tdeui/tdeui-kde351.diff
index 381467e..b78a05a 100644
--- a/sip/tdeui/tdeui-kde351.diff
+++ b/sip/tdeui/tdeui-kde351.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde352.diff b/sip/tdeui/tdeui-kde352.diff
index 381467e..b78a05a 100644
--- a/sip/tdeui/tdeui-kde352.diff
+++ b/sip/tdeui/tdeui-kde352.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde353.diff b/sip/tdeui/tdeui-kde353.diff
index 381467e..b78a05a 100644
--- a/sip/tdeui/tdeui-kde353.diff
+++ b/sip/tdeui/tdeui-kde353.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip