diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index 63692b613..47e00c03b 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -694,15 +694,15 @@ can combine TreeView's and normal Tablists without problems.<P>
 <H3><A NAME="TDEToolBarButton">TDEToolBarButton &amp; TDERadioGroup</A></H3>
 
 If you need to do anything with TDEToolBarButton you now need to include 
-&lt;ktoolbarbutton.h&gt; TDERadioGroup has been renamed to TDEToolBarRadioGroup and
-requires you to include &lt;ktoolbarradiogroup.h&gt;<P>
+&lt;tdetoolbarbutton.h&gt; TDERadioGroup has been renamed to TDEToolBarRadioGroup and
+requires you to include &lt;tdetoolbarradiogroup.h&gt;<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
 <H3><A NAME="TDEAccel">TDEAccel</A></H3>
 
 The functions keyToString() and stringToKey() which were previously
-declared globally in kaccel.h are now static methods in TDEAccel.<P>
+declared globally in tdeaccel.h are now static methods in TDEAccel.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index 407d5c5ad..457fd0cfa 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -154,9 +154,9 @@ not be available.
 <ul>
 	<li> TDEAccel::insertItem() and TDEAccel::connectItem().
 <pre>
-	- kaccel-&gt;insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
-	- kaccel-&gt;connectItem( "Scroll Up", this, TQT_SLOT(scrollUp()) );
-	+ kaccel-&gt;insert( "Scroll Up", i18n("Scroll Up"), TQString::null,
+	- tdeaccel-&gt;insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
+	- tdeaccel-&gt;connectItem( "Scroll Up", this, TQT_SLOT(scrollUp()) );
+	+ tdeaccel-&gt;insert( "Scroll Up", i18n("Scroll Up"), TQString::null,
 		Key_Up, this, TQT_SLOT(scrollUp()) );
 </pre>
 	Note that a What's This parameter is now a part of the insert function.
@@ -168,8 +168,8 @@ not be available.
 	can replace it.  Note, however, that this would be handled automatically
 	by using TDEAction instead.
 <pre>
-	- kaccel-&gt;changeMenuAccel( menu, id, "file_open" );
-	+ menu-&gt;setAccel( kaccel-&gt;shortcut( "file_open" ).keyCodeQt(), id );
+	- tdeaccel-&gt;changeMenuAccel( menu, id, "file_open" );
+	+ menu-&gt;setAccel( tdeaccel-&gt;shortcut( "file_open" ).keyCodeQt(), id );
 </pre>
 	</li>
 </ul>
diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp
index a4307dbbf..389228d99 100644
--- a/arts/kde/kvideowidget.cpp
+++ b/arts/kde/kvideowidget.cpp
@@ -26,7 +26,7 @@
 #define XEvent void
 #endif
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include "kvideowidget.h"
 
diff --git a/dcop/dcopidl2cpp/dcopidl_test.h b/dcop/dcopidl2cpp/dcopidl_test.h
index a6c72a888..66f18f92f 100644
--- a/dcop/dcopidl2cpp/dcopidl_test.h
+++ b/dcop/dcopidl2cpp/dcopidl_test.h
@@ -1,4 +1,4 @@
-#include <klistview.h>
+#include <tdelistview.h>
 #include "main.h"
 
 #ifndef TEST_H
diff --git a/dnssd/README b/dnssd/README
index 304a7babb..49be40c48 100644
--- a/dnssd/README
+++ b/dnssd/README
@@ -1,4 +1,4 @@
-Checklist to ensure that zeroconf will work:
+Chectdelist to ensure that zeroconf will work:
 
 1) Install Avahi, at least version 0.3
 2) compile tdednssd-avahi and install it to replace 'stub' libtdednssd.so provided by tdelibs
diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index a11032ada..65b6604b5 100644
--- a/interfaces/tdescript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -26,7 +26,7 @@
 #include <tdeconfig.h>
 #include <kdesktopfile.h>
 #include <kstandarsdirs.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kdebug.h>
 
 #include <tqdir.h>
diff --git a/interfaces/tdescript/scriptloader.h b/interfaces/tdescript/scriptloader.h
index d0b338822..7fa4fa93f 100644
--- a/interfaces/tdescript/scriptloader.h
+++ b/interfaces/tdescript/scriptloader.h
@@ -19,8 +19,8 @@
 #ifndef _script_loader_h
 #define _script_loader_h
 #include <tqptrlist.h>
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 #include <tdescript/scriptinterface.h>
 
 /**
diff --git a/interfaces/tdetexteditor/CMakeLists.txt b/interfaces/tdetexteditor/CMakeLists.txt
index 0808a84f3..5ed7edeca 100644
--- a/interfaces/tdetexteditor/CMakeLists.txt
+++ b/interfaces/tdetexteditor/CMakeLists.txt
@@ -37,7 +37,7 @@ install( FILES
     document.h view.h editor.h plugin.h editinterface.h
     undointerface.h selectioninterface.h cursorinterface.h
     clipboardinterface.h popupmenuinterface.h viewcursorinterface.h
-    searchinterface.h highlightinginterface.h blockselectioninterface.h
+    searchinterface.h highlightinginterface.h bloctdeselectioninterface.h
     codecompletioninterface.h configinterface.h markinterface.h
     printinterface.h wordwrapinterface.h dynwordwrapinterface.h
     markinterfaceextension.h configinterfaceextension.h
@@ -69,7 +69,7 @@ set( target tdetexteditor )
 set( ${target}_SRCS
   tdetexteditor.cpp
   editinterface.cpp clipboardinterface.cpp  selectioninterface.cpp searchinterface.cpp
-  codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp
+  codecompletioninterface.cpp wordwrapinterface.cpp bloctdeselectioninterface.cpp
   configinterface.cpp cursorinterface.cpp  dynwordwrapinterface.cpp
   printinterface.cpp highlightinginterface.cpp markinterface.cpp
   popupmenuinterface.cpp undointerface.cpp viewcursorinterface.cpp
@@ -78,8 +78,8 @@ set( ${target}_SRCS
   searchdcopinterface.cpp searchdcopinterface.skel markinterfaceextension.cpp
   configinterfaceextension.cpp encodinginterface.cpp sessionconfiginterface.cpp
   viewstatusmsginterface.cpp editorchooser_ui.ui editorchooser.cpp
-  blockselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp
-  blockselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp
+  bloctdeselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp
+  bloctdeselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp
   encodingdcopinterface.skel printdcopinterface.cpp printdcopinterface.skel
   undodcopinterface.cpp undodcopinterface.skel viewcursordcopinterface.cpp
   viewcursordcopinterface.skel viewstatusmsgdcopinterface.cpp
diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am
index b535b39cc..7cba7d096 100644
--- a/interfaces/tdetexteditor/Makefile.am
+++ b/interfaces/tdetexteditor/Makefile.am
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libtdetexteditor.la
 
 libtdetexteditor_la_SOURCES = tdetexteditor.cpp \
     editinterface.cpp clipboardinterface.cpp  selectioninterface.cpp searchinterface.cpp \
-    codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \
+    codecompletioninterface.cpp wordwrapinterface.cpp bloctdeselectioninterface.cpp \
     configinterface.cpp cursorinterface.cpp  dynwordwrapinterface.cpp \
     printinterface.cpp highlightinginterface.cpp markinterface.cpp \
     popupmenuinterface.cpp undointerface.cpp viewcursorinterface.cpp \
@@ -13,8 +13,8 @@ libtdetexteditor_la_SOURCES = tdetexteditor.cpp \
     searchdcopinterface.cpp searchdcopinterface.skel markinterfaceextension.cpp \
     configinterfaceextension.cpp encodinginterface.cpp sessionconfiginterface.cpp \
     viewstatusmsginterface.cpp editorchooser_ui.ui editorchooser.cpp \
-    blockselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\
-    blockselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp \
+    bloctdeselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\
+    bloctdeselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp \
     encodingdcopinterface.skel printdcopinterface.cpp printdcopinterface.skel \
     undodcopinterface.cpp undodcopinterface.skel viewcursordcopinterface.cpp \
     viewcursordcopinterface.skel viewstatusmsgdcopinterface.cpp \
@@ -29,7 +29,7 @@ tdetexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface
                              selectioninterface.h cursorinterface.h \
                              clipboardinterface.h popupmenuinterface.h \
                              viewcursorinterface.h searchinterface.h highlightinginterface.h \
-                             blockselectioninterface.h codecompletioninterface.h \
+                             bloctdeselectioninterface.h codecompletioninterface.h \
                              configinterface.h markinterface.h printinterface.h wordwrapinterface.h \
                              dynwordwrapinterface.h markinterfaceextension.h configinterfaceextension.h \
                              encodinginterface.h viewstatusmsginterface.h  sessionconfiginterface.h editorchooser.h \
diff --git a/interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp b/interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp
index 34b7294b2..1648c3eb3 100644
--- a/interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp
+++ b/interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp
@@ -1,5 +1,5 @@
-#include "blockselectiondcopinterface.h"
-#include "blockselectioninterface.h"
+#include "bloctdeselectiondcopinterface.h"
+#include "bloctdeselectioninterface.h"
 
 #include <dcopclient.h>
 using namespace KTextEditor;
diff --git a/interfaces/tdetexteditor/bloctdeselectiondcopinterface.h b/interfaces/tdetexteditor/bloctdeselectiondcopinterface.h
index 4b74fd2a0..3117ee163 100644
--- a/interfaces/tdetexteditor/bloctdeselectiondcopinterface.h
+++ b/interfaces/tdetexteditor/bloctdeselectiondcopinterface.h
@@ -38,13 +38,13 @@ namespace KTextEditor
     /**
     * Returns the status of the selection mode - true indicates block selection mode is on.
     * If this is true, selections applied via the SelectionInterface are handled as
-    * blockselections and the paste functions of the ClipboardInterface works on
+    * bloctdeselections and the paste functions of the ClipboardInterface works on
     * rectangular blocks of text rather than normal. (copy too, but thats clear I hope ;)
     */
 		bool blockSelectionMode ();
 
 		/**
-		* set blockselection mode to state "on"
+		* set bloctdeselection mode to state "on"
 		*/
 		bool setBlockSelectionMode (bool on) ;
 
diff --git a/interfaces/tdetexteditor/bloctdeselectioninterface.cpp b/interfaces/tdetexteditor/bloctdeselectioninterface.cpp
index 6d562a43e..0a7068dba 100644
--- a/interfaces/tdetexteditor/bloctdeselectioninterface.cpp
+++ b/interfaces/tdetexteditor/bloctdeselectioninterface.cpp
@@ -18,8 +18,8 @@
 
 // $Id$
 
-#include "blockselectioninterface.h"
-#include "blockselectiondcopinterface.h"
+#include "bloctdeselectioninterface.h"
+#include "bloctdeselectiondcopinterface.h"
 #include "document.h"
 
 namespace KTextEditor
diff --git a/interfaces/tdetexteditor/bloctdeselectioninterface.h b/interfaces/tdetexteditor/bloctdeselectioninterface.h
index b2cd785eb..34ab553f9 100644
--- a/interfaces/tdetexteditor/bloctdeselectioninterface.h
+++ b/interfaces/tdetexteditor/bloctdeselectioninterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __tdetexteditor_blockselectioninterface_h__
-#define __tdetexteditor_blockselectioninterface_h__
+#ifndef __tdetexteditor_bloctdeselectioninterface_h__
+#define __tdetexteditor_bloctdeselectioninterface_h__
 
 #include <tdelibs_export.h>
 
@@ -51,7 +51,7 @@ class KTEXTEDITOR_EXPORT BlockSelectionInterface
     /**
     * Returns the status of the selection mode - true indicates block selection mode is on.
     * If this is true, selections applied via the SelectionInterface are handled as
-    * blockselections and the paste functions of the ClipboardInterface works on
+    * bloctdeselections and the paste functions of the ClipboardInterface works on
     * rectangular blocks of text rather than normal. (copy too, but thats clear I hope ;)
     */
     virtual bool blockSelectionMode () = 0;
diff --git a/interfaces/tdetexteditor/tdetexteditor.cpp b/interfaces/tdetexteditor/tdetexteditor.cpp
index 354361ed2..25726577b 100644
--- a/interfaces/tdetexteditor/tdetexteditor.cpp
+++ b/interfaces/tdetexteditor/tdetexteditor.cpp
@@ -24,7 +24,7 @@
 #include "plugin.h"
 #include "editor.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeparts/factory.h>
 #include <tdeparts/componentfactory.h>
 
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc
index 399b6451c..19b820056 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cc
@@ -2,7 +2,7 @@
 #include <tdeparts/part.h>
 #include <ktrader.h>
 #include <klibloader.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <kapplication.h>
diff --git a/kab/kabapi.cc b/kab/kabapi.cc
index 245f07c5d..05cffe946 100644
--- a/kab/kabapi.cc
+++ b/kab/kabapi.cc
@@ -17,7 +17,7 @@
 */
 
 #include "kabapi.h"
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kabc/addresseedialog.h b/kabc/addresseedialog.h
index 83166b50b..74470d1b4 100644
--- a/kabc/addresseedialog.h
+++ b/kabc/addresseedialog.h
@@ -25,7 +25,7 @@
 
 #include <kdialogbase.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "addressbook.h"
 
diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp
index 1affd0997..88703094b 100644
--- a/kabc/addresslineedit.cpp
+++ b/kabc/addresslineedit.cpp
@@ -37,7 +37,7 @@
 #include <kcursor.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kurldrag.h>
 
 #include <kabc/stdaddressbook.h>
diff --git a/kabc/ldapconfigwidget.cpp b/kabc/ldapconfigwidget.cpp
index eff79a73a..5996477a0 100644
--- a/kabc/ldapconfigwidget.cpp
+++ b/kabc/ldapconfigwidget.cpp
@@ -30,7 +30,7 @@
 #include <tqradiobutton.h>
 
 #include <kmessagebox.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <klineedit.h>
diff --git a/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp b/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
index 15efa5ba6..f53ee7d30 100644
--- a/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
+++ b/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
@@ -29,7 +29,7 @@
 #include <tqhbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/kabc/resourceselectdialog.cpp b/kabc/resourceselectdialog.cpp
index e840e027e..3b6e25752 100644
--- a/kabc/resourceselectdialog.cpp
+++ b/kabc/resourceselectdialog.cpp
@@ -20,7 +20,7 @@
 
 #include <klocale.h>
 #include <kbuttonbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kstdguiitem.h>
 
 #include <tqgroupbox.h>
diff --git a/kate/data/idconsole.xml b/kate/data/idconsole.xml
index fa2a5cffd..9275cd944 100644
--- a/kate/data/idconsole.xml
+++ b/kate/data/idconsole.xml
@@ -197,7 +197,7 @@
 <item> host_speeds </item>
 <item> hostname </item>
 <item> hpkextract </item>
-<item> hpklist </item>
+<item> hptdelist </item>
 <item> hpkremove </item>
 <item> hpkval </item>
 <item> hud_centerid </item>
diff --git a/kate/interfaces/document.h b/kate/interfaces/document.h
index 4d596fb01..aaf241eee 100644
--- a/kate/interfaces/document.h
+++ b/kate/interfaces/document.h
@@ -27,7 +27,7 @@
 #include <tdetexteditor/documentinfo.h>
 #include <tdetexteditor/selectioninterface.h>
 #include <tdetexteditor/selectioninterfaceext.h>
-#include <tdetexteditor/blockselectioninterface.h>
+#include <tdetexteditor/bloctdeselectioninterface.h>
 #include <tdetexteditor/searchinterface.h>
 #include <tdetexteditor/highlightinginterface.h>
 #include <tdetexteditor/configinterface.h>
@@ -38,7 +38,7 @@
 #include <tdetexteditor/printinterface.h>
 #include <tdetexteditor/variableinterface.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KCompletion;
 
diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp
index 792c53385..d904e16ce 100644
--- a/kate/part/kateautoindent.cpp
+++ b/kate/part/kateautoindent.cpp
@@ -29,7 +29,7 @@
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <cctype>
 
diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp
index d3fb52a72..5a1a085c2 100644
--- a/kate/part/katebookmarks.cpp
+++ b/kate/part/katebookmarks.cpp
@@ -24,8 +24,8 @@
 #include "kateview.h"
 
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kstringhandler.h>
 #include <kxmlguiclient.h>
 #include <kxmlguifactory.h>
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index 099dad99d..0bf1d7ea7 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -42,7 +42,7 @@
 #include <tdeio/jobclasses.h>
 #include <tdeio/netaccess.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kapplication.h>
 #include <kbuttonbox.h>
 #include <kcharsets.h>
@@ -52,20 +52,20 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kkeybutton.h>
 #include <kkeydialog.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimetypechooser.h>
 #include <knuminput.h>
 #include <tdeparts/componentfactory.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kprocio.h>
 #include <kregexpeditorinterface.h>
diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h
index c97f45d9a..0f865fcea 100644
--- a/kate/part/katedialogs.h
+++ b/kate/part/katedialogs.h
@@ -29,7 +29,7 @@
 
 #include "../interfaces/document.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialogbase.h>
 #include <kmimetype.h>
 
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 74e5c3225..cb1844489 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -52,7 +52,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
@@ -3976,7 +3976,7 @@ void KateDocument::transform( KateView *v, const KateTextCursor &c,
         {
           // If bol or the character before is not in a word, up this one:
           // 1. if both start and p is 0, upper char.
-          // 2. if blockselect or first line, and p == 0 and start-1 is not in a word, upper
+          // 2. if bloctdeselect or first line, and p == 0 and start-1 is not in a word, upper
           // 3. if p-1 is not in a word, upper.
           if ( ( ! start && ! p ) ||
                    ( ( ln == selstart.line() || v->blockSelectionMode() ) &&
diff --git a/kate/part/katedocumenthelpers.cpp b/kate/part/katedocumenthelpers.cpp
index 370be7684..e50906b0d 100644
--- a/kate/part/katedocumenthelpers.cpp
+++ b/kate/part/katedocumenthelpers.cpp
@@ -24,7 +24,7 @@
 #include "katedocument.h"
 #include "kateview.h"
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 
 KateBrowserExtension::KateBrowserExtension( KateDocument* doc )
diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp
index 15dd7c9f6..f0b01ef2d 100644
--- a/kate/part/katefiletype.cpp
+++ b/kate/part/katefiletype.cpp
@@ -33,7 +33,7 @@
 #include <kiconloader.h>
 #include <knuminput.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqregexp.h>
 #include <tqcheckbox.h>
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index f06518649..3c84007eb 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -38,7 +38,7 @@
 #include <kmimetype.h>
 #include <klocale.h>
 #include <kregexp.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
diff --git a/kate/part/katekeyinterceptorfunctor.h b/kate/part/katekeyinterceptorfunctor.h
index 0126ff814..2a973026a 100644
--- a/kate/part/katekeyinterceptorfunctor.h
+++ b/kate/part/katekeyinterceptorfunctor.h
@@ -17,7 +17,7 @@
 */
 #ifndef _KATE_KEY_INTERCEPTOR_FUNCTOR_H
 #define _KATE_KEY_INTERCEPTOR_FUNCTOR_H
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 class KateKeyInterceptorFunctor {
   public:
   virtual bool operator()(KKey key)=0;
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index 1b264a602..77ed4dcca 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -34,7 +34,7 @@
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <kdialog.h> // for spacingHint()
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <klocale.h>
 #include <kprinter.h>
 #include <kurl.h>
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index 9a7e4e1ab..8f4f03a10 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -32,11 +32,11 @@
 #include <kcolorbutton.h>
 #include <kcombobox.h>
 #include <kinputdialog.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kcolordialog.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h
index 6675a6bc8..77cc112a1 100644
--- a/kate/part/kateschema.h
+++ b/kate/part/kateschema.h
@@ -30,7 +30,7 @@
 #include <tqfont.h>
 
 #include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KateView;
 class KateStyleListItem;
diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp
index 9d0dc896b..b66be04c6 100644
--- a/kate/part/katesearch.cpp
+++ b/kate/part/katesearch.cpp
@@ -696,7 +696,7 @@ bool KateSearch::doSearch( const TQString& text )
     col = foundCol+1;
   }
   while (s.flags.selected && m_view->blockSelectionMode() && found);
-  // in the case we want to search in selection + blockselection we need to loop
+  // in the case we want to search in selection + bloctdeselection we need to loop
 
   if( !found ) return false;
 
diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp
index 53767d672..fc7e943cf 100644
--- a/kate/part/katespell.cpp
+++ b/kate/part/katespell.cpp
@@ -26,7 +26,7 @@
 
 #include "kateview.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdespell.h>
 #include <ksconfig.h>
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index 03b1fa5d3..dc82922a3 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -61,10 +61,10 @@
 #include <kglobal.h>
 #include <kcharsets.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kxmlguifactory.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <klibloader.h>
 #include <kencodingfiledialog.h>
 #include <tdemultipledrag.h>
diff --git a/kate/part/kateview.h b/kate/part/kateview.h
index 0a00ab1fc..9d04a524f 100644
--- a/kate/part/kateview.h
+++ b/kate/part/kateview.h
@@ -222,7 +222,7 @@ class KateView : public Kate::View,
      */
     inline const KateSuperCursor &selEnd () const { return selectEnd; }
 
-    // should cursor be wrapped ? take config + blockselection state in account
+    // should cursor be wrapped ? take config + bloctdeselection state in account
     bool wrapCursor ();
 
     // some internal functions to get selection state of a line/col
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index fc0072982..72b7be0f5 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -38,7 +38,7 @@
 #include <knotifyclient.h>
 #include <kglobal.h>
 #include <kcharsets.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqcursor.h>
 #include <tqpainter.h>
diff --git a/kate/part/kateviewhelpers.h b/kate/part/kateviewhelpers.h
index 0faa90309..0ff59352e 100644
--- a/kate/part/kateviewhelpers.h
+++ b/kate/part/kateviewhelpers.h
@@ -21,7 +21,7 @@
 #ifndef __KATE_VIEW_HELPERS_H__
 #define __KATE_VIEW_HELPERS_H__
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klineedit.h>
 
 #include <tqwidget.h>
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index 1a7b73bf3..8dabeb2f6 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -39,11 +39,11 @@
 #include <unistd.h>
 #include <stdio.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcmdlineargs.h>
 #include "katefactory.h"
 #include <tdeio/job.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <ksimpleconfig.h>
 #include <kglobalsettings.h>
 
diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp
index 449675f6c..4e0d70b86 100644
--- a/kate/plugins/autobookmarker/autobookmarker.cpp
+++ b/kate/plugins/autobookmarker/autobookmarker.cpp
@@ -28,12 +28,12 @@
 #include <tdetexteditor/documentinfo.h>
 #include <tdetexteditor/document.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmimetype.h>
 #include <kmimetypechooser.h>
diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp
index 2f0d01ed4..567262a64 100644
--- a/kate/plugins/insertfile/insertfileplugin.cpp
+++ b/kate/plugins/insertfile/insertfileplugin.cpp
@@ -25,7 +25,7 @@
 
 #include <assert.h>
 #include <tdeio/job.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdefiledialog.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp
index 758449fbe..a36c9dc60 100644
--- a/kate/plugins/isearch/ISearchPlugin.cpp
+++ b/kate/plugins/isearch/ISearchPlugin.cpp
@@ -22,7 +22,7 @@
 #include <tqpopupmenu.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp
index 829a0f31f..d3b762b8e 100644
--- a/kate/plugins/kdatatool/kate_kdatatool.cpp
+++ b/kate/plugins/kdatatool/kate_kdatatool.cpp
@@ -20,13 +20,13 @@
 #include "kate_kdatatool.h"
 #include "kate_kdatatool.moc"
 #include <kgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdetexteditor/view.h>
 #include <kdebug.h>
 #include <kdatatool.h>
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/selectioninterface.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/editinterface.h>
 #include <kmessagebox.h>
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index 4c38b1287..5041cc8ad 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -38,7 +38,7 @@
 #include <kdialog.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <knotifyclient.h>
 #include <tdeparts/part.h>
 #include <kiconloader.h>
diff --git a/kate/tests/highlight.xsl b/kate/tests/highlight.xsl
index f6e0efb12..d5699f31b 100644
--- a/kate/tests/highlight.xsl
+++ b/kate/tests/highlight.xsl
@@ -3,7 +3,7 @@
 <!--
 	This file is freely distributable, created by Wilbert Berendsen (wbsoft@xs4all.nl)
 
-	This is just a simple XSLT file that converts some HTML pages to a XBEL bookmarklist.
+	This is just a simple XSLT file that converts some HTML pages to a XBEL bookmartdelist.
 	It is included here to test the new XSLT highlighting by Peter Lammich.
 	
 	TODO: add better test file.
diff --git a/kded/kded.cpp b/kded/kded.cpp
index ed002b530..1cd64b3e7 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -65,7 +65,7 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0)
    if(checkStamps)
       args.append("--checkstamps");
    if(delayedCheck)
-      args.append("--nochectdefiles");
+      args.append("--nocheckfiles");
    else
       checkStamps = false; // useful only during kded startup
    if (callBackObj)
diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp
index f9b0238c7..81bff9613 100644
--- a/kded/tdebuildsycoca.cpp
+++ b/kded/tdebuildsycoca.cpp
@@ -695,7 +695,7 @@ static KCmdLineOptions options[] = {
    { "nosignal", I18N_NOOP("Do not signal applications to update"), 0 },
    { "noincremental", I18N_NOOP("Disable incremental update, re-read everything"), 0 },
    { "checkstamps", I18N_NOOP("Check file timestamps"), 0 },
-   { "nochectdefiles", I18N_NOOP("Disable checking files (dangerous)"), 0 },
+   { "nocheckfiles", I18N_NOOP("Disable checking files (dangerous)"), 0 },
    { "global", I18N_NOOP("Create global database"), 0 },
    { "menutest", I18N_NOOP("Perform menu generation test run only"), 0 },
    { "track <menu-id>", I18N_NOOP("Track menu id for debug purposes"), 0 },
@@ -798,10 +798,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
    }
    fprintf(stderr, "[tdebuildsycoca] %s running...\n", appName);
 
-   bool chectdefiles = bGlobalDatabase || args->isSet("chectdefiles");
+   bool checkfiles = bGlobalDatabase || args->isSet("checkfiles");
 
-   bool incremental = !bGlobalDatabase && args->isSet("incremental") && chectdefiles;
-   if (incremental || !chectdefiles)
+   bool incremental = !bGlobalDatabase && args->isSet("incremental") && checkfiles;
+   if (incremental || !checkfiles)
    {
      KSycoca::self()->disableAutoRebuild(); // Prevent deadlock
      TQString current_language = TDEGlobal::locale()->language();
@@ -814,14 +814,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
          (KSycoca::self()->timeStamp() == 0))
      {
         incremental = false;
-        chectdefiles = true;
+        checkfiles = true;
         delete KSycoca::self();
      }
    }
 
    g_changeList = new TQStringList;
 
-   bool checkstamps = incremental && args->isSet("checkstamps") && chectdefiles;
+   bool checkstamps = incremental && args->isSet("checkstamps") && checkfiles;
    TQ_UINT32 filestamp = 0;
    TQStringList oldresourcedirs;
    if( checkstamps && incremental )
@@ -861,7 +861,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 
    newTimestamp = (TQ_UINT32) time(0);
 
-   if( chectdefiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs )))
+   if( checkfiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs )))
    {
       TQCString qSycocaPath = TQFile::encodeName(sycocaPath());
       cSycocaPath = qSycocaPath.data();
diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets
index 6de9e90dc..2ea458449 100644
--- a/kdewidgets/kde.widgets
+++ b/kdewidgets/kde.widgets
@@ -61,20 +61,20 @@ WhatsThis=A TQCombo Box showing the installed system fonts (with preview)
 Group=Input (KDE)
 
 [TDEFontChooser]
-IncludeFile=kfontdialog.h
-IconSet=kfontcombo.png
+IncludeFile=tdefontdialog.h
+IconSet=tdefontcombo.png
 ToolTip=Font Chooser (KDE)
 WhatsThis=A font type, size and style selection widget complete with preview
 Group=Input (KDE)
 
 [TDEFontRequester]
-IncludeFile=kfontrequester.h
+IncludeFile=tdefontrequester.h
 ToolTip=Font Requester (KDE)
 WhatsThis=A compact font selection and preview widget
 Group=Input (KDE)
 
 [KGradientSelector]
-IncludeFile=kselect.h
+IncludeFile=tdeselect.h
 WhatsThis=A widget that allows the user to select two colors to form a gradient
 Group=Graphics (KDE)
 
@@ -115,7 +115,7 @@ ConstructorArgs=(parent, 0, name)
 
 [TDEListViewSearchLineWidget]
 ToolTip=ListView Search Line Widget (KDE)
-IncludeFile=klistviewsearchline.h
+IncludeFile=tdelistviewsearchline.h
 Group=Input (KDE)
 ConstructorArgs=(0, parent, name)
 
@@ -244,7 +244,7 @@ Group=Display (KDE)
 ConstructorArgs=(parent)
 
 [TDEActionSelector]
-IncludeFile=kactionselector.h
+IncludeFile=tdeactionselector.h
 ToolTip=A widget for selecting and arranging actions/objects
 Group=Views (KDE)
 
diff --git a/kdewidgets/pics/CMakeLists.txt b/kdewidgets/pics/CMakeLists.txt
index b122c8b28..f398f174d 100644
--- a/kdewidgets/pics/CMakeLists.txt
+++ b/kdewidgets/pics/CMakeLists.txt
@@ -13,15 +13,15 @@
 
 install( FILES
     klineedit.png ktextbrowser.png kpasswordedit.png kdatewidget.png
-    kfontrequester.png kurlrequester.png kcombobox.png kiconview.png
+    tdefontrequester.png kurlrequester.png kcombobox.png kiconview.png
     kintspinbox.png kled.png ksqueezedtextlabel.png  kprogress.png
     kurllabel.png kruler.png tdecmodule.png kdoublespinbox.png
-    kdoublenuminput.png klistbox.png klistview.png kactivelabel.png
+    kdoublenuminput.png tdelistbox.png tdelistview.png kactivelabel.png
     kiconbutton.png kcolorcombo.png khsselector.png kcolorbutton.png
     kgradientselector.png kdualcolorbutton.png ktimewidget.png
     kpushbutton.png kcharselect.png kdatepicker.png
-    kdialog.png keditlistbox.png kfontcombo.png khistorycombo.png
+    kdialog.png keditlistbox.png tdefontcombo.png khistorycombo.png
     kintnuminput.png krestrictedline.png ktextedit.png
     kurlcomborequester.png kkeybutton.png kpalettetable.png
-    kactionselector.png kdatetable.png kdatetimewidget.png
+    tdeactionselector.png kdatetable.png kdatetimewidget.png
   DESTINATION ${DATA_INSTALL_DIR}/kdewidgets/pics )
diff --git a/kdewidgets/pics/Makefile.am b/kdewidgets/pics/Makefile.am
index aeda8e4cb..0d4ee1e61 100644
--- a/kdewidgets/pics/Makefile.am
+++ b/kdewidgets/pics/Makefile.am
@@ -1,15 +1,15 @@
 kdewidgetsdata_DATA =  klineedit.png ktextbrowser.png kpasswordedit.png kdatewidget.png \
-             kfontrequester.png kurlrequester.png kcombobox.png kiconview.png kintspinbox.png \
+             tdefontrequester.png kurlrequester.png kcombobox.png kiconview.png kintspinbox.png \
              kled.png ksqueezedtextlabel.png  kprogress.png kurllabel.png \
              kruler.png tdecmodule.png kdoublespinbox.png kdoublenuminput.png \
-             klistbox.png klistview.png kactivelabel.png kiconbutton.png \
+             tdelistbox.png tdelistview.png kactivelabel.png kiconbutton.png \
              kcolorcombo.png khsselector.png kcolorbutton.png \
              kgradientselector.png kdualcolorbutton.png ktimewidget.png \
              kpushbutton.png kcharselect.png kdatepicker.png \
-             kdialog.png keditlistbox.png kfontcombo.png khistorycombo.png \
+             kdialog.png keditlistbox.png tdefontcombo.png khistorycombo.png \
              kintnuminput.png krestrictedline.png ktextedit.png \
              kurlcomborequester.png kkeybutton.png kpalettetable.png \
-	     kactionselector.png kdatetable.png kdatetimewidget.png 
+	     tdeactionselector.png kdatetable.png kdatetimewidget.png 
 
 
 kdewidgetsdatadir = $(kde_datadir)/kdewidgets/pics
diff --git a/kdewidgets/tests/test.widgets b/kdewidgets/tests/test.widgets
index 92874ec30..d223f8995 100644
--- a/kdewidgets/tests/test.widgets
+++ b/kdewidgets/tests/test.widgets
@@ -61,20 +61,20 @@ WhatsThis=A QCombo Box showing the installed system fonts (with preview)
 Group=Input (KDE)
 
 [TDEFontChooser]
-IncludeFile=kfontdialog.h
-IconSet=kfontcombo.png
+IncludeFile=tdefontdialog.h
+IconSet=tdefontcombo.png
 ToolTip=Font Chooser (KDE)
 WhatsThis=A font type, size and style selection widget complete with preview
 Group=Input (KDE)
 
 [TDEFontRequester]
-IncludeFile=kfontrequester.h
+IncludeFile=tdefontrequester.h
 ToolTip=Font Requester (KDE)
 WhatsThis=A compact font selection and preview widget
 Group=Input (KDE)
 
 [KGradientSelector]
-IncludeFile=kselect.h
+IncludeFile=tdeselect.h
 WhatsThis=A widget that allows the user to select two colors to form a gradient
 Group=Graphics (KDE)
 
@@ -233,7 +233,7 @@ Group=Display (KDE)
 ConstructorArgs=(parent)
 
 [TDEActionSelector]
-IncludeFile=kactionselector.h
+IncludeFile=tdeactionselector.h
 ToolTip=A widget for selecting and arranging actions/objects
 Group=Views (KDE)
 
diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp
index 4bfe13f30..af5b2c7c3 100644
--- a/knewstuff/downloaddialog.cpp
+++ b/knewstuff/downloaddialog.cpp
@@ -22,7 +22,7 @@
 #include "downloaddialog.moc"
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
diff --git a/knewstuff/knewstuff.cpp b/knewstuff/knewstuff.cpp
index d36a1ef19..7727783bb 100644
--- a/knewstuff/knewstuff.cpp
+++ b/knewstuff/knewstuff.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/knewstuff/providerdialog.cpp b/knewstuff/providerdialog.cpp
index 23aa94388..ddc0b2ef3 100644
--- a/knewstuff/providerdialog.cpp
+++ b/knewstuff/providerdialog.cpp
@@ -22,7 +22,7 @@
 #include <tqstring.h>
 #include <tqlabel.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/knewstuff/uploaddialog.cpp b/knewstuff/uploaddialog.cpp
index 69c823fd0..72ba4a2c4 100644
--- a/knewstuff/uploaddialog.cpp
+++ b/knewstuff/uploaddialog.cpp
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include <ktextedit.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
diff --git a/mimetypes/application/x-linguist.desktop b/mimetypes/application/x-linguist.desktop
index d2cdb6855..2405f4633 100644
--- a/mimetypes/application/x-linguist.desktop
+++ b/mimetypes/application/x-linguist.desktop
@@ -18,7 +18,7 @@ Comment[cy]=Ffeil Tarddiad Cyfieithiad Qt
 Comment[da]=Qt oversættelseskildefil
 Comment[de]=Qt-Übersetzungsquelle
 Comment[el]=Πηγαίο αρχείο μετάφρασης Qt
-Comment[eo]=Qta tradukfontdosiero
+Comment[eo]=Qta tradutdefontdosiero
 Comment[es]=Archivo fuente de traducción de Qt
 Comment[et]=Qt Translationi lähtetekst
 Comment[eu]=Qt itzulpenerako iturburuko fitxategia
diff --git a/mimetypes/application/x-xliff.desktop b/mimetypes/application/x-xliff.desktop
index 19c894b00..e12026b7e 100644
--- a/mimetypes/application/x-xliff.desktop
+++ b/mimetypes/application/x-xliff.desktop
@@ -15,7 +15,7 @@ Comment[csb]=Lopk dolmaczënkù XLIFF
 Comment[da]=XLIFF oversættelsesfil
 Comment[de]=XLIFF-Übersetzungsdatei
 Comment[el]=Αρχείο μεταφράσεων XLIFF
-Comment[eo]=XLIFF tradukfontdosiero
+Comment[eo]=XLIFF tradutdefontdosiero
 Comment[es]=Archivo de traducción XLIFF
 Comment[et]=XLIFF tõlkefail
 Comment[eu]=XLIFF itzulpen fitxategia
diff --git a/tdecert/tdecertpart.cc b/tdecert/tdecertpart.cc
index f91c545d2..b02981e44 100644
--- a/tdecert/tdecertpart.cc
+++ b/tdecert/tdecertpart.cc
@@ -40,7 +40,7 @@
 #include <kprocess.h>
 #include <tqtabwidget.h>
 #include <kseparator.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeio/kmimemagic.h>
 #include <tqmultilineedit.h>
 #include <tqregexp.h>
diff --git a/tdecert/tdecertpart.h b/tdecert/tdecertpart.h
index bb4ca958e..032ff3001 100644
--- a/tdecert/tdecertpart.h
+++ b/tdecert/tdecertpart.h
@@ -27,7 +27,7 @@
 #include <tdeparts/part.h>
 #include <tqptrlist.h>
 #include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KSSLCertBox;
 class TQFrame;
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index dbc2a7065..871190eac 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -75,14 +75,14 @@ install( FILES
     kapp.h kapplication.h kuniqueapp.h kuniqueapplication.h
     kcharsets.h tdeversion.h kpty.h kprocess.h kprocctrl.h
     klocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
-    twin.h krootprop.h kshortcut.h kkeynative.h kaccel.h
-    kglobalaccel.h kstdaccel.h kshortcutlist.h kcatalogue.h
+    twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h
+    kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h
     kregexp.h kcompletion.h kstringhandler.h kstddirs.h
     kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h
     kallocator.h kvmallocator.h kcrash.h krfcdate.h kinstance.h
     kpalette.h kipc.h klibloader.h ktempfile.h ksavefile.h
     krandomsequence.h knotifyclient.h kiconeffect.h kaudioplayer.h
-    kdcoppropertyproxy.h netwm.h kaccelmanager.h netwm_def.h
+    kdcoppropertyproxy.h netwm.h tdeaccelmanager.h netwm_def.h
     kpixmapprovider.h kunload.h kstaticdeleter.h kextsock.h
     kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h kbufferedio.h
     kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h tdesycoca.h
@@ -126,13 +126,13 @@ set( ${target}_SRCS
   ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp klocale.cpp
   krfcdate.cpp kiconeffect.cpp kicontheme.cpp kiconloader.cpp
   twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp
-  kckey.cpp kshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp
-  kaccelaction.cpp kshortcutmenu.cpp kaccelbase.cpp kaccel.cpp
-  kglobalaccel_x11.cpp kglobalaccel.cpp kstdaccel.cpp kshortcutlist.cpp
+  kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp
+  tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp
+  kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp
   kcrash.cpp kurl.cpp kregexp.cpp kglobal.cpp kglobalsettings.cpp
   kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp
   kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp
-  kuniqueapplication.cpp kaccelmanager.cpp ksavefile.cpp
+  kuniqueapplication.cpp tdeaccelmanager.cpp ksavefile.cpp
   krandomsequence.cpp kstringhandler.cpp kcompletion.cpp
   kcmdlineargs.cpp kaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp
   kaudioplayer.cpp kdcoppropertyproxy.cpp ksockaddr.cpp
diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS
index 6295c102d..2b171743c 100644
--- a/tdecore/MAINTAINERS
+++ b/tdecore/MAINTAINERS
@@ -7,9 +7,9 @@ more logical grouping.
 
 dmalloc.cpp
 kaboutdata.cpp		David Faure <faure@kde.org>
-kaccel.cpp		Ellis Whitehead <ellis@kde.org>
-kaccelaction.cpp	Ellis Whitehead <ellis@kde.org>
-kaccelbase.cpp		Ellis Whitehead <ellis@kde.org>
+tdeaccel.cpp		Ellis Whitehead <ellis@kde.org>
+tdeaccelaction.cpp	Ellis Whitehead <ellis@kde.org>
+tdeaccelbase.cpp		Ellis Whitehead <ellis@kde.org>
 kallocator.cpp		Waldo Bastian <bastian@kde.org>
 kappdcopiface.cpp
 kapplication.cpp	Waldo Bastian <bastian@kde.org>
@@ -56,13 +56,13 @@ kregexp.cpp
 krfcdate.cpp		Waldo Bastian <bastian@kde.org>
 krootprop.cpp   	Lubos Lunak <l.lunak@kde.org>
 ksavefile.cpp		Waldo Bastian <bastian@kde.org>
-kshortcut.cpp		Ellis Whitehead <ellis@kde.org>
+tdeshortcut.cpp		Ellis Whitehead <ellis@kde.org>
 ksimpleconfig.cpp	Waldo Bastian <bastian@kde.org>
 ksocks.cpp
 kstandarddirs.cpp	Waldo Bastian <bastian@kde.org>
 kstartupinfo.cpp	Lubos Lunak <l.lunak@kde.org>
 kstaticdeleter.cpp	Stephan Kulow <coolo@kde.org>
-kstdaccel.cpp		Ellis Whitehead <ellis@kde.org>
+tdestdaccel.cpp		Ellis Whitehead <ellis@kde.org>
 kstringhandler.cpp
 tdesycoca.cpp		Waldo Bastian <bastian@kde.org>
 tdesycocadict.cpp		Waldo Bastian <bastian@kde.org>
@@ -109,7 +109,7 @@ kprotocolinfofactory.cpp	Torben Weis <weis@kde.org> (copyright)
 kprotocolinfofactory.cpp	Waldo Bastian <bastian@kde.org> (copyright)
 kpty.cpp
 kshell.cpp		Oswald Buddenhagen <ossi@kde.org> (copyright)
-kshortcutmenu.cpp	Ellis Whitehead <ellis@kde.org> (copyright)
+tdeshortcutmenu.cpp	Ellis Whitehead <ellis@kde.org> (copyright)
 ktempdir.cpp		Joseph Wenninger <jowenn@kde.org> (copyright)
 kuser.cpp		Tim Jansen <tim@tjansen.de> (copyright)
 kvmallocator.cpp	Waldo Bastian (bastian@kde.org) (copyright)
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index 2204ab749..332e178ea 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -42,14 +42,14 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
 	kcmdlineargs.h tdeconfigbackend.h kapp.h kapplication.h kuniqueapp.h \
 	kuniqueapplication.h kcharsets.h tdeversion.h kpty.h kprocess.h \
 	kprocctrl.h klocale.h kicontheme.h kiconloader.h kdebug.h \
-	twinmodule.h twin.h krootprop.h kshortcut.h kkeynative.h kaccel.h \
-	kglobalaccel.h kstdaccel.h kshortcutlist.h kcatalogue.h \
+	twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h \
+	kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \
 	kregexp.h kcompletion.h kstringhandler.h \
 	kstddirs.h kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h \
 	kallocator.h kvmallocator.h kcrash.h krfcdate.h \
 	kinstance.h kpalette.h kipc.h klibloader.h ktempfile.h ksavefile.h \
 	krandomsequence.h knotifyclient.h kiconeffect.h \
-	kaudioplayer.h kdcoppropertyproxy.h netwm.h kaccelmanager.h \
+	kaudioplayer.h kdcoppropertyproxy.h netwm.h tdeaccelmanager.h \
 	netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h \
 	kextsock.h kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h \
 	kbufferedio.h kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h \
@@ -81,10 +81,10 @@ libtdefakes_pic.a: libtdefakes.la
 	ar cru libtdefakes_pic.a fakes_pic.o vsnprintf_pic.o
 	ranlib libtdefakes_pic.a
 
-noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \
+noinst_HEADERS = tdeaccelaction.h tdeaccelbase.h tdeaccelprivate.h kckey.h \
 	kcompletion_private.h netwm_p.h \
 	kglobalaccel_x11.h kglobalaccel_win.h kkeyserver_x11.h kkeyserver.h \
-	kregpriv.h kshortcutmenu.h tdesycocadict.h tdesycocafactory.h netsupp.h \
+	kregpriv.h tdeshortcutmenu.h tdesycocadict.h tdesycocafactory.h netsupp.h \
 	kcheckaccelerators.h kcalendarsystemgregorian.h \
 	kcalendarsystemhijri.h kcalendarsystemhebrew.h kcalendarsystemjalali.h \
 	kprotocolinfofactory.h kqiodevicegzip_p.h kiconloader_p.h
@@ -95,13 +95,13 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
 	kstandarddirs.cpp ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp \
 	klocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \
 	kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp \
-	kckey.cpp kshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \
-	kaccelaction.cpp kshortcutmenu.cpp kaccelbase.cpp kaccel.cpp \
-	kglobalaccel_x11.cpp kglobalaccel.cpp kstdaccel.cpp kshortcutlist.cpp \
+	kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \
+	tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp \
+	kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp \
 	kcrash.cpp kurl.cpp kregexp.cpp kglobal.cpp kglobalsettings.cpp \
 	kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp \
 	kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp \
-	kuniqueapplication.cpp kaccelmanager.cpp \
+	kuniqueapplication.cpp tdeaccelmanager.cpp \
 	ksavefile.cpp krandomsequence.cpp kstringhandler.cpp kcompletion.cpp \
 	kcmdlineargs.cpp kaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \
 	kaudioplayer.cpp kdcoppropertyproxy.cpp \
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index 705713a7e..35ece3c25 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -77,8 +77,8 @@
 #include <kdatastream.h>
 #include <klibloader.h>
 #include <kmimesourcefactory.h>
-#include <kstdaccel.h>
-#include <kaccel.h>
+#include <tdestdaccel.h>
+#include <tdeaccel.h>
 #include "kcheckaccelerators.h"
 #include <tqptrdict.h>
 #include <kmacroexpander.h>
diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp
index ec11f50a8..b7e113f4b 100644
--- a/tdecore/kcheckaccelerators.cpp
+++ b/tdecore/kcheckaccelerators.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include "kcheckaccelerators.h"
-#include "kaccelmanager.h"
+#include "tdeaccelmanager.h"
 #include <tqpopupmenu.h>
 #include <tqapplication.h>
 #include <tqdialog.h>
@@ -42,7 +42,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <klocale.h>
 
 /*
diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h
index 020512b43..d88a3d6fc 100644
--- a/tdecore/kcompletion.h
+++ b/tdecore/kcompletion.h
@@ -30,7 +30,7 @@
 #include "tdelibs_export.h"
 #include <kglobalsettings.h>
 #include <ksortablevaluelist.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class KCompTreeNode;
 class KCompletionPrivate;
diff --git a/tdecore/kglobalaccel.cpp b/tdecore/kglobalaccel.cpp
index eb1b56323..6af97065d 100644
--- a/tdecore/kglobalaccel.cpp
+++ b/tdecore/kglobalaccel.cpp
@@ -29,9 +29,9 @@
 #endif
 
 #include <tqstring.h>
-#include "kaccelbase.h"
+#include "tdeaccelbase.h"
 #include <kdebug.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <klocale.h>
 
 //----------------------------------------------------
diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h
index 9606b8af1..a8ed8a955 100644
--- a/tdecore/kglobalaccel.h
+++ b/tdecore/kglobalaccel.h
@@ -21,7 +21,7 @@
 #define _KGLOBALACCEL_H_
 
 #include <tqobject.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TQPopupMenu;
 class TQWidget;
diff --git a/tdecore/kglobalaccel_emb.h b/tdecore/kglobalaccel_emb.h
index e4feb601e..5e5145d66 100644
--- a/tdecore/kglobalaccel_emb.h
+++ b/tdecore/kglobalaccel_emb.h
@@ -1,8 +1,8 @@
 #ifndef _KGLOBALACCEL_EMB_H
 #define _KGLOBALACCEL_EMB_H
 
-#include "kaccelbase.h"
-#include "kshortcut.h"
+#include "tdeaccelbase.h"
+#include "tdeshortcut.h"
 
 class TDEGlobalAccelPrivate
 {
diff --git a/tdecore/kglobalaccel_mac.h b/tdecore/kglobalaccel_mac.h
index 82fe332b4..b2803b0c0 100644
--- a/tdecore/kglobalaccel_mac.h
+++ b/tdecore/kglobalaccel_mac.h
@@ -3,8 +3,8 @@
 
 #include <tqwidget.h>
 
-#include "kshortcut.h"
-#include "kaccelbase.h"
+#include "tdeshortcut.h"
+#include "tdeaccelbase.h"
 
 class TDEGlobalAccelPrivate: public TDEAccelBase
 {
diff --git a/tdecore/kglobalaccel_win.h b/tdecore/kglobalaccel_win.h
index 0a938cbfc..e60fed8ee 100644
--- a/tdecore/kglobalaccel_win.h
+++ b/tdecore/kglobalaccel_win.h
@@ -23,9 +23,9 @@
 #include <tqmap.h>
 #include <tqwidget.h>
 
-#include "kaccelbase.h"
+#include "tdeaccelbase.h"
 #include "kkeyserver.h"
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 
 /**
  * @internal
diff --git a/tdecore/kglobalaccel_x11.h b/tdecore/kglobalaccel_x11.h
index df1f54425..b22363926 100644
--- a/tdecore/kglobalaccel_x11.h
+++ b/tdecore/kglobalaccel_x11.h
@@ -23,9 +23,9 @@
 #include <tqmap.h>
 #include <tqwidget.h>
 
-#include "kaccelbase.h"
+#include "tdeaccelbase.h"
 #include "kkeyserver_x11.h"
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 
 /**
  * @internal
diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp
index f9774a886..27ba7743e 100644
--- a/tdecore/kglobalsettings.cpp
+++ b/tdecore/kglobalsettings.cpp
@@ -41,10 +41,10 @@ static QRgb qt_colorref2qrgb(COLORREF col)
 
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kstandarddirs.h>
 #include <kcharsets.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <klocale.h>
 #include <tqfontinfo.h>
 #include <stdlib.h>
diff --git a/tdecore/kkeynative.h b/tdecore/kkeynative.h
index cf29fcabc..e2774417d 100644
--- a/tdecore/kkeynative.h
+++ b/tdecore/kkeynative.h
@@ -23,7 +23,7 @@
 #ifndef __KKEYNATIVE_H
 #define __KKEYNATIVE_H
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 #ifdef Q_WS_X11
 typedef union _XEvent XEvent;
diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp
index 69acd0d5e..cd4abb6fb 100644
--- a/tdecore/kkeyserver_x11.cpp
+++ b/tdecore/kkeyserver_x11.cpp
@@ -29,7 +29,7 @@
 
 #include "kkeyserver_x11.h"
 #include "kkeynative.h"
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -1020,7 +1020,7 @@ void Variations::init( const KKey& key, bool bQt )
 
 } // end of namespace KKeyServer block
 
-// FIXME: This needs to be moved to kshortcut.cpp, and create a 
+// FIXME: This needs to be moved to tdeshortcut.cpp, and create a 
 //  KKeyServer::method which it will call.
 // Alt+SysReq => Alt+Print
 // Ctrl+Shift+Plus => Ctrl+Plus (en)
diff --git a/tdecore/kkeyserver_x11.h b/tdecore/kkeyserver_x11.h
index ce3fa2fed..90330911b 100644
--- a/tdecore/kkeyserver_x11.h
+++ b/tdecore/kkeyserver_x11.h
@@ -23,7 +23,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/tdecore/network/ipv6blactdelist b/tdecore/network/ipv6blacklist
similarity index 100%
rename from tdecore/network/ipv6blactdelist
rename to tdecore/network/ipv6blacklist
diff --git a/tdecore/tdeaccel.cpp b/tdecore/tdeaccel.cpp
index 9dde93e7a..be8fba51b 100644
--- a/tdecore/tdeaccel.cpp
+++ b/tdecore/tdeaccel.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kaccel.h"
+#include "tdeaccel.h"
 
 #include <tqaccel.h>
 #include <tqguardedptr.h>
@@ -26,13 +26,13 @@
 #include <tqstring.h>
 #include <tqtimer.h>
 
-#include "kaccelbase.h"
+#include "tdeaccelbase.h"
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
-#include "kaccelprivate.h"
+#include "tdeaccelprivate.h"
 
 #ifdef Q_WS_X11
 #	include <X11/Xlib.h>
@@ -43,7 +43,7 @@
 #	endif
 #endif
 
-// TODO: Put in kaccelbase.cpp
+// TODO: Put in tdeaccelbase.cpp
 //---------------------------------------------------------------------
 // TDEAccelEventHandler
 //---------------------------------------------------------------------
@@ -659,5 +659,5 @@ TQString TDEAccel::findKey( int key ) const
 void TDEAccel::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kaccel.moc"
-#include "kaccelprivate.moc"
+#include "tdeaccel.moc"
+#include "tdeaccelprivate.moc"
diff --git a/tdecore/tdeaccel.h b/tdecore/tdeaccel.h
index 8a3f2d499..8b61102f4 100644
--- a/tdecore/tdeaccel.h
+++ b/tdecore/tdeaccel.h
@@ -21,8 +21,8 @@
 #define _KACCEL_H
 
 #include <tqaccel.h>
-#include <kshortcut.h>
-#include <kstdaccel.h>
+#include <tdeshortcut.h>
+#include <tdestdaccel.h>
 #include "tdelibs_export.h"
 
 class TQPopupMenu; // for obsolete insertItem() methods below
diff --git a/tdecore/tdeaccelaction.cpp b/tdecore/tdeaccelaction.cpp
index d3ec59be3..93f17ae25 100644
--- a/tdecore/tdeaccelaction.cpp
+++ b/tdecore/tdeaccelaction.cpp
@@ -20,8 +20,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kaccelaction.h"
-#include "kaccelbase.h"   // for TDEAccelBase::slotRemoveAction() & emitSignal()
+#include "tdeaccelaction.h"
+#include "tdeaccelbase.h"   // for TDEAccelBase::slotRemoveAction() & emitSignal()
 
 #include <tqkeycode.h>
 
@@ -31,7 +31,7 @@
 #include <kglobal.h>
 #include <kkeynative.h>
 #include <klocale.h>
-#include <kshortcutlist.h>
+#include <tdeshortcutlist.h>
 
 //---------------------------------------------------------------------
 // TDEAccelAction
diff --git a/tdecore/tdeaccelaction.h b/tdecore/tdeaccelaction.h
index 809533ff8..e8232cc44 100644
--- a/tdecore/tdeaccelaction.h
+++ b/tdecore/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/tdecore/tdeaccelbase.cpp b/tdecore/tdeaccelbase.cpp
index 235803134..434801f61 100644
--- a/tdecore/tdeaccelbase.cpp
+++ b/tdecore/tdeaccelbase.cpp
@@ -20,7 +20,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kaccelbase.h"
+#include "tdeaccelbase.h"
 
 #include <tqkeycode.h>
 #include <tqlabel.h>
@@ -33,7 +33,7 @@
 #include <kkeynative.h>
 #include "kkeyserver.h"
 #include <klocale.h>
-#include "kshortcutmenu.h"
+#include "tdeshortcutmenu.h"
 
 //---------------------------------------------------------------------
 // class TDEAccelBase::ActionInfo
diff --git a/tdecore/tdeaccelbase.h b/tdecore/tdeaccelbase.h
index 3d7180c4f..377589718 100644
--- a/tdecore/tdeaccelbase.h
+++ b/tdecore/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver.h"
 
 class TQPopupMenu;
diff --git a/tdecore/tdeaccelmanager.cpp b/tdecore/tdeaccelmanager.cpp
index 9ac4dbdae..5fcfcc450 100644
--- a/tdecore/tdeaccelmanager.cpp
+++ b/tdecore/tdeaccelmanager.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kaccelmanager.h"
+#include "tdeaccelmanager.h"
 
 #include <tqapplication.h>
 #include <tqcheckbox.h>
@@ -45,7 +45,7 @@
 #include <kdebug.h>
 
 
-#include "kaccelmanager_private.h"
+#include "tdeaccelmanager_private.h"
 #include "../tdeui/kstdaction_p.h"
 #include "../tdeutils/tdemultitabbar.h"
 
@@ -869,4 +869,4 @@ void TDEAcceleratorManager::setNoAccel( TQWidget *widget )
     TDEAcceleratorManagerPrivate::ignored_widgets[widget] = 1;
 }
 
-#include "kaccelmanager_private.moc"
+#include "tdeaccelmanager_private.moc"
diff --git a/tdecore/tdeconfig_compiler/checkkcfg.pl b/tdecore/tdeconfig_compiler/checkkcfg.pl
index 26b12bad2..8d066b810 100755
--- a/tdecore/tdeconfig_compiler/checkkcfg.pl
+++ b/tdecore/tdeconfig_compiler/checkkcfg.pl
@@ -24,12 +24,12 @@ if ( system( $cmd ) != 0 ) {
   exit 1;
 }
 
-chectdefile( $file_h );
-chectdefile( $file_cpp );
+checkfile( $file_h );
+checkfile( $file_cpp );
 
 exit 0;
 
-sub chectdefile()
+sub checkfile()
 {
   my $file = shift;
 
diff --git a/tdecore/tdeshortcut.cpp b/tdecore/tdeshortcut.cpp
index ae568d5b7..33797b0bc 100644
--- a/tdecore/tdeshortcut.cpp
+++ b/tdecore/tdeshortcut.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 #include "kkeyserver.h"
 
diff --git a/tdecore/tdeshortcutlist.cpp b/tdecore/tdeshortcutlist.cpp
index d32df889d..645e69565 100644
--- a/tdecore/tdeshortcutlist.cpp
+++ b/tdecore/tdeshortcutlist.cpp
@@ -1,15 +1,15 @@
 #include <tqstring.h>
 #include <tqvariant.h>
 
-#include <kaccel.h>
-#include "kaccelaction.h"
+#include <tdeaccel.h>
+#include "tdeaccelaction.h"
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalaccel.h>
 #include <kinstance.h>
-#include <kshortcut.h>
-#include "kshortcutlist.h"
+#include <tdeshortcut.h>
+#include "tdeshortcutlist.h"
 
 //---------------------------------------------------------------------
 // TDEShortcutList
diff --git a/tdecore/tdeshortcutmenu.cpp b/tdecore/tdeshortcutmenu.cpp
index be485fb7e..91061a734 100644
--- a/tdecore/tdeshortcutmenu.cpp
+++ b/tdecore/tdeshortcutmenu.cpp
@@ -21,10 +21,10 @@
 #include <tqlabel.h>
 #include <tqpopupmenu.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include <kdebug.h>
 #include <kglobalsettings.h>
-#include "kshortcutmenu.h"
+#include "tdeshortcutmenu.h"
 //#include <kkeynative.h>
 
 TDEShortcutMenu::TDEShortcutMenu( TQWidget* pParent, TDEAccelActions* pActions, KKeySequence seq )
@@ -158,4 +158,4 @@ void TDEShortcutMenu::keepItemsMatching( KKey key )
 	updateShortcuts();
 }
 
-#include "kshortcutmenu.moc"
+#include "tdeshortcutmenu.moc"
diff --git a/tdecore/tdeshortcutmenu.h b/tdecore/tdeshortcutmenu.h
index 6e01cdd95..a62757316 100644
--- a/tdecore/tdeshortcutmenu.h
+++ b/tdecore/tdeshortcutmenu.h
@@ -23,7 +23,7 @@
 #include <tqmap.h>
 #include <tqpopupmenu.h>
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 
 class TQLabel;
 
diff --git a/tdecore/tdestdaccel.cpp b/tdecore/tdestdaccel.cpp
index ac1381c88..f91d2ee66 100644
--- a/tdecore/tdestdaccel.cpp
+++ b/tdecore/tdestdaccel.cpp
@@ -19,16 +19,16 @@
 */
 #define __KSTDACCEL_CPP_ 1
 
-#include "kstdaccel.h"
+#include "tdestdaccel.h"
 
-#include "kaccelaction.h"
-#include "kaccelbase.h"
+#include "tdeaccelaction.h"
+#include "tdeaccelbase.h"
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kshortcut.h>
-#include <kshortcutlist.h>
+#include <tdeshortcut.h>
+#include <tdeshortcutlist.h>
 
 namespace TDEStdAccel
 {
diff --git a/tdecore/tdestdaccel.h b/tdecore/tdestdaccel.h
index 580204673..3914794f6 100644
--- a/tdecore/tdestdaccel.h
+++ b/tdecore/tdestdaccel.h
@@ -21,7 +21,7 @@
 #define KSTDACCEL_H
 
 #include <tqstring.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include "tdelibs_export.h"
 
 class TQKeyEvent;
@@ -35,7 +35,7 @@ class TDEAccelActions;
  * so do not hardcode the default behavior.
  *
  * If you want real configurable keybindings in your applications,
- * please checkout the class TDEAccel in kaccel.h
+ * please checkout the class TDEAccel in tdeaccel.h
  * @see TDEAccelShortcutList
  */
 namespace TDEStdAccel
diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am
index 90ba46051..2911d3ab8 100644
--- a/tdecore/tests/Makefile.am
+++ b/tdecore/tests/Makefile.am
@@ -28,9 +28,9 @@ check_PROGRAMS = tdeconfigtestgui klocaletest kprocesstest ksimpleconfigtest \
 	cplusplustest kiconloadertest kresolvertest kmdcodectest knotifytest \
 	ksortablevaluelisttest krfcdatetest testqtargs kprociotest \
 	kcharsetstest kcalendartest kmacroexpandertest kshelltest \
-	kxerrorhandlertest startserviceby kstdacceltest kglobaltest ktimezonestest
+	kxerrorhandlertest startserviceby tdestdacceltest kglobaltest ktimezonestest
 
-TESTS = kurltest kstdacceltest
+TESTS = kurltest tdestdacceltest
 
 noinst_HEADERS = klocaletest.h kprocesstest.h KIDLTest.h \
 		kipctest.h kprociotest.h
@@ -75,7 +75,7 @@ kmacroexpandertest_SOURCES = kmacroexpandertest.cpp
 kshelltest_SOURCES = kshelltest.cpp
 kxerrorhandlertest_SOURCES = kxerrorhandlertest.cpp
 startserviceby_SOURCES = startserviceby.cpp
-kstdacceltest_SOURCES = kstdacceltest.cpp
+tdestdacceltest_SOURCES = tdestdacceltest.cpp
 kglobaltest_SOURCES = kglobaltest.cpp
 ktimezonestest_SOURCES = ktimezonestest.cpp
 
diff --git a/tdecore/tests/tdestdacceltest.cpp b/tdecore/tests/tdestdacceltest.cpp
index a3e2d2473..fbc5077a5 100644
--- a/tdecore/tests/tdestdacceltest.cpp
+++ b/tdecore/tests/tdestdacceltest.cpp
@@ -2,7 +2,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <stdlib.h> // for exit
 
 static bool check(TQString txt, TQString a, TQString b)
@@ -24,7 +24,7 @@ static bool check(TQString txt, TQString a, TQString b)
 int main(int argc, char *argv[])
 {
   TDEApplication::disableAutoDcopRegistration();
-  TDEApplication app(argc,argv,"kstdacceltest",false,false);
+  TDEApplication app(argc,argv,"tdestdacceltest",false,false);
 
   check( "shortcutDefault FullScreen", TDEStdAccel::shortcutDefault( TDEStdAccel::FullScreen ).toString(), "Ctrl+Shift+F" );
   check( "shortcutDefault BeginningOfLine", TDEStdAccel::shortcutDefault( TDEStdAccel::BeginningOfLine ).toString(), "Home" );
diff --git a/tdehtml/domtreeview.h b/tdehtml/domtreeview.h
index a0f5d942a..4156f083a 100644
--- a/tdehtml/domtreeview.h
+++ b/tdehtml/domtreeview.h
@@ -18,7 +18,7 @@
 #ifndef DOMTREEVIEW_H
 #define DOMTREEVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <tqlistview.h>
 #include <tqptrdict.h>
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index ac78526ae..c57b26c7b 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -47,12 +47,12 @@
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kguiitem.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmenubar.h>
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
 #include <kglobalsettings.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <tdeconfig.h>
 #include <tdeconfigbase.h>
 #include <kapplication.h>
diff --git a/tdehtml/ecma/kjs_debugwin.h b/tdehtml/ecma/kjs_debugwin.h
index af205d654..be6b31dda 100644
--- a/tdehtml/ecma/kjs_debugwin.h
+++ b/tdehtml/ecma/kjs_debugwin.h
@@ -34,7 +34,7 @@
 #include <tqptrstack.h>
 #include <tqcheckbox.h>
 #include <kdialogbase.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqscrollview.h>
 
 #include <kjs/debugger.h>
diff --git a/tdehtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp
index 3a0146547..0edcc34ea 100644
--- a/tdehtml/misc/knsplugininstaller.cpp
+++ b/tdehtml/misc/knsplugininstaller.cpp
@@ -25,7 +25,7 @@
 
 #include <kdebug.h>
 #include <kdiroperator.h> 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kstddirs.h>
 #include <ktempfile.h> 
diff --git a/tdehtml/rendering/render_form.h b/tdehtml/rendering/render_form.h
index 7543b9e90..d6124528d 100644
--- a/tdehtml/rendering/render_form.h
+++ b/tdehtml/rendering/render_form.h
@@ -41,7 +41,7 @@ class QListboxItem;
 #include <tqradiobutton.h>
 #include <tqpushbutton.h>
 #include <tqhbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kcombobox.h>
 #include "dom/dom_misc.h"
 
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 72576e91e..fe9763b0e 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -48,8 +48,8 @@
 #include <tdefiledialog.h>
 #include <tdeio/job.h>
 #include <kprocess.h>
-#include <ktoolbarbutton.h>
-#include <ktoolbar.h>
+#include <tdetoolbarbutton.h>
+#include <tdetoolbar.h>
 #include <ksavefile.h>
 #include <kurldrag.h>
 #include <kstringhandler.h>
diff --git a/tdehtml/tdehtml_ext.h b/tdehtml/tdehtml_ext.h
index 165cedb0e..7cea57956 100644
--- a/tdehtml/tdehtml_ext.h
+++ b/tdehtml/tdehtml_ext.h
@@ -31,7 +31,7 @@
 
 #include <tqguardedptr.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeio/global.h>
 
 /**
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index caa55ae61..9f771268e 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -115,7 +115,7 @@ using namespace DOM;
 
 #include "tdehtmlpart_p.h"
 #include "kpassivepopup.h"
-#include "kpopupmenu.h"
+#include "tdepopupmenu.h"
 #include "rendering/render_form.h"
 #include <twin.h>
 
diff --git a/tdehtml/tdehtmlpart_p.h b/tdehtml/tdehtmlpart_p.h
index 149483493..de99c9400 100644
--- a/tdehtml/tdehtmlpart_p.h
+++ b/tdehtml/tdehtmlpart_p.h
@@ -29,7 +29,7 @@
 #include <kcursor.h>
 #include <klibloader.h>
 #include <kxmlguifactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeparts/partmanager.h>
 #include <tdeparts/statusbarextension.h>
 #include <tdeparts/browserextension.h>
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index 049ac0073..6bd3ff8a5 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -72,7 +72,7 @@
 #include <kprinter.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstringhandler.h>
 #include <kurldrag.h>
 
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 88a662eb6..3e1e14d8c 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -59,11 +59,11 @@
 #define HTML_DEFAULT_VIEW_FANTASY_FONT "helvetica"
 
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcmdlineargs.h>
 #include "tdehtml_factory.h"
 #include <tdeio/job.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <ksimpleconfig.h>
 #include <kglobalsettings.h>
 
diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp
index e9d1cd4e1..78ae83203 100644
--- a/tdehtml/testtdehtml.cpp
+++ b/tdehtml/testtdehtml.cpp
@@ -26,9 +26,9 @@
 #include "css/cssstyleselector.h"
 #include "html/html_imageimpl.h"
 #include "rendering/render_style.h"
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kcmdlineargs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include "domtreeview.h"
 #include <tdefiledialog.h>
 
diff --git a/tdeio/bookmarks/kbookmarkbar.cc b/tdeio/bookmarks/kbookmarkbar.cc
index b1ebb94fa..5c5f64ecc 100644
--- a/tdeio/bookmarks/kbookmarkbar.cc
+++ b/tdeio/bookmarks/kbookmarkbar.cc
@@ -28,11 +28,11 @@
 #include <kbookmarkmenu.h>
 #include <kdebug.h>
 
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 
 #include <tdeconfig.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "kbookmarkdrag.h"
 #include "kbookmarkmenu_p.h"
diff --git a/tdeio/bookmarks/kbookmarkbar.h b/tdeio/bookmarks/kbookmarkbar.h
index 2f5495cda..93241cdaf 100644
--- a/tdeio/bookmarks/kbookmarkbar.h
+++ b/tdeio/bookmarks/kbookmarkbar.h
@@ -25,7 +25,7 @@
 #include <tqguardedptr.h>
 #include <tqptrlist.h>
 #include <kbookmark.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class TDEToolBar;
 class KBookmarkMenu;
diff --git a/tdeio/bookmarks/kbookmarkmanager.h b/tdeio/bookmarks/kbookmarkmanager.h
index 4a129704a..6931e9842 100644
--- a/tdeio/bookmarks/kbookmarkmanager.h
+++ b/tdeio/bookmarks/kbookmarkmanager.h
@@ -167,7 +167,7 @@ public:
 
     /**
      * @return true if the NS bookmarks should be dynamically shown
-     *         in the toplevel kactionmenu
+     *         in the toplevel tdeactionmenu
      * @deprecated
      */
     bool showNSBookmarks() const;
diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cc
index ff9f8d4ec..c99d02284 100644
--- a/tdeio/bookmarks/kbookmarkmenu.cc
+++ b/tdeio/bookmarks/kbookmarkmenu.cc
@@ -34,8 +34,8 @@
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
-#include <kstdaccel.h>
+#include <tdepopupmenu.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstringhandler.h>
 
diff --git a/tdeio/bookmarks/kbookmarkmenu.h b/tdeio/bookmarks/kbookmarkmenu.h
index 003077202..0c1ebb27c 100644
--- a/tdeio/bookmarks/kbookmarkmenu.h
+++ b/tdeio/bookmarks/kbookmarkmenu.h
@@ -31,7 +31,7 @@
 
 #include <kdialogbase.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "kbookmark.h"
 #include "kbookmarkmanager.h"
diff --git a/tdeio/bookmarks/kbookmarkmenu_p.h b/tdeio/bookmarks/kbookmarkmenu_p.h
index dff3e6f30..fc34e9029 100644
--- a/tdeio/bookmarks/kbookmarkmenu_p.h
+++ b/tdeio/bookmarks/kbookmarkmenu_p.h
@@ -31,7 +31,7 @@
 
 #include <kdialogbase.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "kbookmark.h"
 #include "kbookmarkimporter.h"
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index 4f4b720f5..abe918854 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -41,8 +41,8 @@
 #include <twin.h>
 #include <kdialog.h>
 #include <ksystemtray.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
diff --git a/tdeio/misc/uiserver.h b/tdeio/misc/uiserver.h
index c86886bac..05b15ba18 100644
--- a/tdeio/misc/uiserver.h
+++ b/tdeio/misc/uiserver.h
@@ -27,9 +27,9 @@
 #include <tdeio/global.h>
 #include <tdeio/authinfo.h>
 #include <kurl.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdatastream.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ksslcertdlg.h>
 
 class ListProgress;
diff --git a/tdeio/tdefile/CMakeLists.txt b/tdeio/tdefile/CMakeLists.txt
index 4fa7b3e82..a69cad536 100644
--- a/tdeio/tdefile/CMakeLists.txt
+++ b/tdeio/tdefile/CMakeLists.txt
@@ -33,7 +33,7 @@ install( FILES
     tdefiledialog.h kencodingfiledialog.h
     kdiroperator.h tdefileview.h tdefilefiltercombo.h
     tdefiledetailview.h kcombiview.h kdiskfreesp.h
-    tdefileiconview.h krecentdocument.h
+    tdefileiconview.h tderecentdocument.h
     kurlrequester.h tdefilepreview.h tdefile.h
     kurlcombobox.h kurlrequesterdlg.h kopenwith.h kpropsdlg.h
     kicondialog.h kdirsize.h kpreviewwidgetbase.h kimagefilepreview.h tdefilesharedlg.h
@@ -56,11 +56,11 @@ set( target tdefile )
 
 set( ${target}_SRCS
   tdefilefiltercombo.cpp tdefileview.cpp tdefileiconview.cpp
-  krecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp
+  tderecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp
   tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp
   tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp
   kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp
-  kdirsize.cpp krecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp
+  kdirsize.cpp tderecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp
   tdefilesharedlg.cpp kurlbar.cpp kmetaprops.cpp kpreviewprops.cpp
   tdefiletreeview.cpp tdefiletreeviewitem.cpp tdefiletreebranch.cpp
   kdirselectdialog.cpp tdefilebookmarkhandler.cpp tdefilemetainfowidget.cpp
diff --git a/tdeio/tdefile/Makefile.am b/tdeio/tdefile/Makefile.am
index ab8561e7c..4e6b76ce1 100644
--- a/tdeio/tdefile/Makefile.am
+++ b/tdeio/tdefile/Makefile.am
@@ -29,7 +29,7 @@ METASOURCES = AUTO
 include_HEADERS = tdefiledialog.h kencodingfiledialog.h\
 	kdiroperator.h tdefileview.h tdefilefiltercombo.h \
 	tdefiledetailview.h kcombiview.h kdiskfreesp.h \
-	tdefileiconview.h krecentdocument.h \
+	tdefileiconview.h tderecentdocument.h \
 	kurlrequester.h tdefilepreview.h tdefile.h \
 	kurlcombobox.h kurlrequesterdlg.h kopenwith.h kpropsdlg.h \
 	kicondialog.h kdirsize.h kpreviewwidgetbase.h kimagefilepreview.h tdefilesharedlg.h \
@@ -37,18 +37,18 @@ include_HEADERS = tdefiledialog.h kencodingfiledialog.h\
 	kdirselectdialog.h kurlbar.h kpropertiesdialog.h knotifydialog.h \
 	kcustommenueditor.h knotifywidgetbase.h
 
-noinst_HEADERS = config-tdefile.h krecentdirs.h kmetaprops.h \
+noinst_HEADERS = config-tdefile.h tderecentdirs.h kmetaprops.h \
 	tdefilebookmarkhandler.h tdefilemetainfowidget.h kopenwith_p.h \
 	tdefilespeedbar.h kpreviewprops.h kacleditwidget.h kacleditwidget_p.h images.h
 
 libtdefile_la_SOURCES = \
 	tdefilefiltercombo.cpp \
 	tdefileview.cpp tdefileiconview.cpp \
-	krecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp \
+	tderecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp \
 	tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp \
 	tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp \
 	kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp kdirsize.cpp \
-	krecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp tdefilesharedlg.cpp \
+	tderecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp tdefilesharedlg.cpp \
 	kurlbar.cpp kmetaprops.cpp kpreviewprops.cpp \
 	tdefiletreeview.cpp tdefiletreeviewitem.cpp tdefiletreebranch.cpp \
 	kdirselectdialog.cpp tdefilebookmarkhandler.cpp \
diff --git a/tdeio/tdefile/kacleditwidget.h b/tdeio/tdefile/kacleditwidget.h
index c51cb94fc..43f4b2fca 100644
--- a/tdeio/tdefile/kacleditwidget.h
+++ b/tdeio/tdefile/kacleditwidget.h
@@ -30,7 +30,7 @@
 
 #ifdef USE_POSIX_ACL
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kacl.h>
 #include <tdefileitem.h>
 
diff --git a/tdeio/tdefile/kacleditwidget_p.h b/tdeio/tdefile/kacleditwidget_p.h
index 9ea5e3203..41e265053 100644
--- a/tdeio/tdefile/kacleditwidget_p.h
+++ b/tdeio/tdefile/kacleditwidget_p.h
@@ -29,7 +29,7 @@
 #endif // Q_MOC_RUN
 
 #ifdef USE_POSIX_ACL
-#include <klistview.h>
+#include <tdelistview.h>
 #include <sys/acl.h>
 #include <kacl.h>
 #include <tdefileitem.h>
diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp
index 244e22e84..725048e37 100644
--- a/tdeio/tdefile/kcustommenueditor.cpp
+++ b/tdeio/tdefile/kcustommenueditor.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
 #include <tdeconfigbase.h>
diff --git a/tdeio/tdefile/kdiroperator.cpp b/tdeio/tdefile/kdiroperator.cpp
index dcb457662..706b63164 100644
--- a/tdeio/tdefile/kdiroperator.cpp
+++ b/tdeio/tdefile/kdiroperator.cpp
@@ -31,7 +31,7 @@
 #include <tqtimer.h>
 #include <tqvbox.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
@@ -40,7 +40,7 @@
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprogress.h>
 #include <kstdaction.h>
 #include <tdeio/job.h>
@@ -50,7 +50,7 @@
 #include <tdeio/renamedlg.h>
 #include <kpropertiesdialog.h>
 #include <kservicetypefactory.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kde_file.h>
 
 #include "config-tdefile.h"
diff --git a/tdeio/tdefile/kdiroperator.h b/tdeio/tdefile/kdiroperator.h
index 5d806eee2..ca850b733 100644
--- a/tdeio/tdefile/kdiroperator.h
+++ b/tdeio/tdefile/kdiroperator.h
@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 #include <tqptrstack.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcompletion.h>
 #include <kdirlister.h>
 #include <tdefileview.h>
diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp
index a540c57ef..e26c2cdf5 100644
--- a/tdeio/tdefile/kdirselectdialog.cpp
+++ b/tdeio/tdefile/kdirselectdialog.cpp
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 #include <tqvaluestack.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
@@ -33,7 +33,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kprotocolinfo.h>
-#include <krecentdirs.h>
+#include <tderecentdirs.h>
 #include <kshell.h>
 #include <kurl.h>
 #include <kurlcompletion.h>
diff --git a/tdeio/tdefile/kencodingfiledialog.cpp b/tdeio/tdefile/kencodingfiledialog.cpp
index 569217bee..a49210642 100644
--- a/tdeio/tdefile/kencodingfiledialog.cpp
+++ b/tdeio/tdefile/kencodingfiledialog.cpp
@@ -23,13 +23,13 @@
 
 #include "kencodingfiledialog.h"
 #include <kcombobox.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
 #include <kdiroperator.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 
 struct KEncodingFileDialogPrivate
 {
diff --git a/tdeio/tdefile/knotifydialog.h b/tdeio/tdefile/knotifydialog.h
index ede51d663..f31815e34 100644
--- a/tdeio/tdefile/knotifydialog.h
+++ b/tdeio/tdefile/knotifydialog.h
@@ -19,7 +19,7 @@
 #ifndef KNOTIFYDIALOG_H
 #define KNOTIFYDIALOG_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialogbase.h>
 #include <kinstance.h>
 #include <kglobal.h>
diff --git a/tdeio/tdefile/knotifywidgetbase.ui b/tdeio/tdefile/knotifywidgetbase.ui
index 023da77d8..89591b1b8 100644
--- a/tdeio/tdefile/knotifywidgetbase.ui
+++ b/tdeio/tdefile/knotifywidgetbase.ui
@@ -458,7 +458,7 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
-    <include location="global" impldecl="in implementation">klistview.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp
index 8582e31f0..16876e356 100644
--- a/tdeio/tdefile/kopenwith.cpp
+++ b/tdeio/tdefile/kopenwith.cpp
@@ -53,7 +53,7 @@
 #include <dcopclient.h>
 #include <kmimetype.h>
 #include <kservicegroup.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdesycoca.h>
 #include <kstdguiitem.h>
 
diff --git a/tdeio/tdefile/kopenwith_p.h b/tdeio/tdefile/kopenwith_p.h
index ca9317fb6..a0f7eb77c 100644
--- a/tdeio/tdefile/kopenwith_p.h
+++ b/tdeio/tdefile/kopenwith_p.h
@@ -21,7 +21,7 @@
 #define __open_with_p_h__
 
 #include <kurl.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KURLRequester;
 
diff --git a/tdeio/tdefile/kpropertiesdesktopbase.ui b/tdeio/tdefile/kpropertiesdesktopbase.ui
index 9c08eef93..28e1375c7 100644
--- a/tdeio/tdefile/kpropertiesdesktopbase.ui
+++ b/tdeio/tdefile/kpropertiesdesktopbase.ui
@@ -310,7 +310,7 @@ Following the command, you can have several place holders which will be replaced
 <includes>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">klistview.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index fdbef4fea..32644301a 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -122,7 +122,7 @@ extern "C" {
 #include <kpreviewprops.h>
 #include <kprocess.h>
 #include <krun.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kacl.h>
 #include "tdefilesharedlg.h"
 
diff --git a/tdeio/tdefile/kpropertiesmimetypebase.ui b/tdeio/tdefile/kpropertiesmimetypebase.ui
index 257eaa57c..1e1848206 100644
--- a/tdeio/tdefile/kpropertiesmimetypebase.ui
+++ b/tdeio/tdefile/kpropertiesmimetypebase.ui
@@ -64,7 +64,7 @@
     </vbox>
 </widget>
 <includes>
-    <include location="global" impldecl="in implementation">klistview.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/tdeio/tdefile/kurlbar.h b/tdeio/tdefile/kurlbar.h
index 7470ec82a..1219a6467 100644
--- a/tdeio/tdefile/kurlbar.h
+++ b/tdeio/tdefile/kurlbar.h
@@ -25,7 +25,7 @@
 
 #include <kdialogbase.h>
 #include <kicontheme.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kurl.h>
 
 class TDEConfig;
diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp
index 88b34ea6b..1d5bf009e 100644
--- a/tdeio/tdefile/kurlrequester.cpp
+++ b/tdeio/tdefile/kurlrequester.cpp
@@ -24,7 +24,7 @@
 #include <tqtooltip.h>
 #include <tqapplication.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/tdeio/tdefile/kurlrequesterdlg.cpp b/tdeio/tdefile/kurlrequesterdlg.cpp
index 2459f984f..d1e9ec109 100644
--- a/tdeio/tdefile/kurlrequesterdlg.cpp
+++ b/tdeio/tdefile/kurlrequesterdlg.cpp
@@ -26,13 +26,13 @@
 #include <tqstring.h>
 #include <tqtoolbutton.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 
diff --git a/tdeio/tdefile/tdefilebookmarkhandler.cpp b/tdeio/tdefile/tdefilebookmarkhandler.cpp
index ef1f2a37b..1518b48e5 100644
--- a/tdeio/tdefile/tdefilebookmarkhandler.cpp
+++ b/tdeio/tdefile/tdefilebookmarkhandler.cpp
@@ -21,7 +21,7 @@
 
 #include <kbookmarkimporter.h>
 #include <kbookmarkdombuilder.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 #include "tdefiledialog.h"
diff --git a/tdeio/tdefile/tdefiledetailview.h b/tdeio/tdefile/tdefiledetailview.h
index 1e2d19a6b..2def9bf27 100644
--- a/tdeio/tdefile/tdefiledetailview.h
+++ b/tdeio/tdefile/tdefiledetailview.h
@@ -25,7 +25,7 @@ class KFileItem;
 class TQWidget;
 class TQKeyEvent;
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmimetyperesolver.h>
 
 #include "tdefileview.h"
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index f60692c88..034265065 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -42,8 +42,8 @@
 #include <tqwhatsthis.h>
 #include <tqfiledialog.h>
 
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcharsets.h>
 #include <kcmdlineargs.h>
@@ -61,16 +61,16 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprotocolinfo.h>
 #include <kpushbutton.h>
-#include <krecentdirs.h>
+#include <tderecentdirs.h>
 #include <kshell.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
 #include <kstaticdeleter.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kurl.h>
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
@@ -81,7 +81,7 @@
 
 #include <kdirselectdialog.h>
 #include <tdefileview.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <tdefilefiltercombo.h>
 #include <kdiroperator.h>
 #include <kimagefilepreview.h>
diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp
index d42373893..ab4be248a 100644
--- a/tdeio/tdefile/tdefileiconview.cpp
+++ b/tdeio/tdefile/tdefileiconview.cpp
@@ -29,7 +29,7 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <tdefileitem.h>
diff --git a/tdeio/tdefile/tdefilepreview.cpp b/tdeio/tdefile/tdefilepreview.cpp
index 4b336afee..57543ea8c 100644
--- a/tdeio/tdefile/tdefilepreview.cpp
+++ b/tdeio/tdefile/tdefilepreview.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdefilepreview.h>
 #include <tdefilepreview.moc>
 #include <klocale.h>
diff --git a/tdeio/tdefile/tdefiletreeview.h b/tdeio/tdefile/tdefiletreeview.h
index 3d6e039f5..da72709cd 100644
--- a/tdeio/tdefile/tdefiletreeview.h
+++ b/tdeio/tdefile/tdefiletreeview.h
@@ -27,7 +27,7 @@
 #include <tqstrlist.h>
 #include <tqtooltip.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdirnotify.h>
 #include <tdeio/job.h>
 #include <tdefiletreeviewitem.h>
diff --git a/tdeio/tdefile/tdefiletreeviewitem.h b/tdeio/tdefile/tdefiletreeviewitem.h
index 4455bff78..5ee6e035a 100644
--- a/tdeio/tdefile/tdefiletreeviewitem.h
+++ b/tdeio/tdefile/tdefiletreeviewitem.h
@@ -21,7 +21,7 @@
 #define tdefile_tree_view_item_h
 
 #include <tqptrlist.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tdefileitem.h>
 #include <tdeio/global.h>
diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp
index 01bc5e6b0..fb3cb0e9f 100644
--- a/tdeio/tdefile/tdefileview.cpp
+++ b/tdeio/tdefile/tdefileview.cpp
@@ -22,7 +22,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/tdeio/tdefile/tderecentdirs.cpp b/tdeio/tdefile/tderecentdirs.cpp
index 0d8d008bd..12c2b6477 100644
--- a/tdeio/tdefile/tderecentdirs.cpp
+++ b/tdeio/tdefile/tderecentdirs.cpp
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  */
-#include <krecentdirs.h>
+#include <tderecentdirs.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
@@ -52,7 +52,7 @@ static TDEConfig *recentdirs_readList(TQString &key, TQStringList &result, bool
    if (key[1] == ':') 
    {
       key = key.mid(2);
-      config = new KSimpleConfig(TQString::fromLatin1("krecentdirsrc"), readOnly);
+      config = new KSimpleConfig(TQString::fromLatin1("tderecentdirsrc"), readOnly);
    }
    else
    {
diff --git a/tdeio/tdefile/tderecentdocument.cpp b/tdeio/tdefile/tderecentdocument.cpp
index 85af01c46..3d5ec44e7 100644
--- a/tdeio/tdefile/tderecentdocument.cpp
+++ b/tdeio/tdefile/tderecentdocument.cpp
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  */
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
index 008edb827..dfa59540d 100644
--- a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
@@ -21,7 +21,7 @@
 
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kapplication.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp
index a29ffc4d0..eba15be03 100644
--- a/tdeio/tdeio/job.cpp
+++ b/tdeio/tdeio/job.cpp
@@ -49,7 +49,7 @@ extern "C" {
 #include <kdialog.h>
 #include <kmessagebox.h>
 #include <kdatastream.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kde_file.h>
 
 #include <errno.h>
diff --git a/tdeio/tdeio/kdatatool.h b/tdeio/tdeio/kdatatool.h
index bd787dcd5..a77f8a9ea 100644
--- a/tdeio/tdeio/kdatatool.h
+++ b/tdeio/tdeio/kdatatool.h
@@ -24,7 +24,7 @@
 #include <tqobject.h>
 #include <tqvaluelist.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kservice.h>
 
 class KDataTool;
diff --git a/tdeio/tdeio/kmimetypechooser.cpp b/tdeio/tdeio/kmimetypechooser.cpp
index 7c74a9a41..95dfada9c 100644
--- a/tdeio/tdeio/kmimetypechooser.cpp
+++ b/tdeio/tdeio/kmimetypechooser.cpp
@@ -20,7 +20,7 @@
 
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmimetype.h>
 #include <kprocess.h>
diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp
index dd6de164c..69274ce24 100644
--- a/tdeio/tdeio/krun.cpp
+++ b/tdeio/tdeio/krun.cpp
@@ -37,7 +37,7 @@
 #include "tdeio/scheduler.h"
 #include "tdeio/netaccess.h"
 #include "tdefile/kopenwith.h"
-#include "tdefile/krecentdocument.h"
+#include "tdefile/tderecentdocument.h"
 
 #include <kdatastream.h>
 #include <kmessageboxwrapper.h>
diff --git a/tdeio/tdeio/kurifilter.h b/tdeio/tdeio/kurifilter.h
index fd7cb9b3c..cbd74d4e8 100644
--- a/tdeio/tdeio/kurifilter.h
+++ b/tdeio/tdeio/kurifilter.h
@@ -523,17 +523,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/tdeio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp
index 8e9785c24..414b5ebf1 100644
--- a/tdeio/tests/kurifiltertest.cpp
+++ b/tdeio/tests/kurifiltertest.cpp
@@ -182,13 +182,13 @@ int main(int argc, char **argv)
 
     // Enable verbosity for debugging
     {
-      KSimpleConfig cfg( "kshorturifilterrc" );
+      KSimpleConfig cfg( "tdeshorturifilterrc" );
       cfg.writeEntry( "Verbose", true );
       cfg.sync();
     }
 
     TQStringList minicliFilters;
-    minicliFilters << "kshorturifilter" << "kurisearchfilter" << "localdomainurifilter";
+    minicliFilters << "tdeshorturifilter" << "kurisearchfilter" << "localdomainurifilter";
 
     // URI that should require no filtering
     filter( "http://www.kde.org", "http://www.kde.org", KURIFilterData::NET_PROTOCOL );
@@ -213,8 +213,8 @@ int main(int argc, char **argv)
     filter( "ftp://username@ftp.kde.org:500", "ftp://username@ftp.kde.org:500", KURIFilterData::NET_PROTOCOL );
 
     // ShortURI/LocalDomain filter tests. NOTE: any of these tests can fail
-    // if you have specified your own patterns in kshorturifilterrc. For
-    // examples, see $TDEDIR/share/config/kshorturifilterrc .
+    // if you have specified your own patterns in tdeshorturifilterrc. For
+    // examples, see $TDEDIR/share/config/tdeshorturifilterrc .
     filter( "linuxtoday.com", "http://linuxtoday.com", KURIFilterData::NET_PROTOCOL );
     filter( "LINUXTODAY.COM", "http://linuxtoday.com", KURIFilterData::NET_PROTOCOL );
     filter( "kde.org", "http://kde.org", KURIFilterData::NET_PROTOCOL );
@@ -240,10 +240,10 @@ int main(int argc, char **argv)
     // filter( "localhost/~blah", "http://localhost.localdomain/~blah", KURIFilterData::NET_PROTOCOL );
 
     filter( "/", "/", KURIFilterData::LOCAL_DIR );
-    filter( "/", "/", KURIFilterData::LOCAL_DIR, "kshorturifilter" );
-    filter( "~/.bashrc", TQDir::homeDirPath().local8Bit()+"/.bashrc", KURIFilterData::LOCAL_FILE, "kshorturifilter" );
-    filter( "~", TQDir::homeDirPath().local8Bit(), KURIFilterData::LOCAL_DIR, "kshorturifilter", "/tmp" );
-    filter( "~foobar", 0, KURIFilterData::ERROR, "kshorturifilter" );
+    filter( "/", "/", KURIFilterData::LOCAL_DIR, "tdeshorturifilter" );
+    filter( "~/.bashrc", TQDir::homeDirPath().local8Bit()+"/.bashrc", KURIFilterData::LOCAL_FILE, "tdeshorturifilter" );
+    filter( "~", TQDir::homeDirPath().local8Bit(), KURIFilterData::LOCAL_DIR, "tdeshorturifilter", "/tmp" );
+    filter( "~foobar", 0, KURIFilterData::ERROR, "tdeshorturifilter" );
     filter( "user@host.domain", "mailto:user@host.domain", KURIFilterData::NET_PROTOCOL ); // new in KDE-3.2
 
     // Windows style SMB (UNC) URL. Should be converted into the valid smb format...
@@ -333,8 +333,8 @@ int main(int argc, char **argv)
     // the shortURI filter will return the string
     // itself if the requested environment variable
     // is not already set.
-    filter( "$QTDIR", 0, KURIFilterData::LOCAL_DIR, "kshorturifilter" ); //use specific filter.
-    filter( "$HOME", home, KURIFilterData::LOCAL_DIR, "kshorturifilter" ); //use specific filter.
+    filter( "$QTDIR", 0, KURIFilterData::LOCAL_DIR, "tdeshorturifilter" ); //use specific filter.
+    filter( "$HOME", home, KURIFilterData::LOCAL_DIR, "tdeshorturifilter" ); //use specific filter.
 
 
     TQCString sc;
@@ -348,10 +348,10 @@ int main(int argc, char **argv)
     filter( sc.sprintf("gg%cé", delimiter) /*eaccent in utf8*/, "http://www.google.com/search?q=%C3%A9&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL );
     filter( sc.sprintf("gg%cпрйвет", delimiter) /* greetings in russian utf-8*/, "http://www.google.com/search?q=%D0%BF%D1%80%D0%B9%D0%B2%D0%B5%D1%82&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL );
 
-    // Absolute Path tests for kshorturifilter
-    filter( "./", tdehome+"/share", KURIFilterData::LOCAL_DIR, "kshorturifilter", tdehome+"/share/" ); // cleanDirPath removes the trailing slash
-    filter( "../", tdehome, KURIFilterData::LOCAL_DIR, "kshorturifilter", tdehome+"/share" );
-    filter( "config", tdehome+"/share/config", KURIFilterData::LOCAL_DIR, "kshorturifilter", tdehome+"/share" );
+    // Absolute Path tests for tdeshorturifilter
+    filter( "./", tdehome+"/share", KURIFilterData::LOCAL_DIR, "tdeshorturifilter", tdehome+"/share/" ); // cleanDirPath removes the trailing slash
+    filter( "../", tdehome, KURIFilterData::LOCAL_DIR, "tdeshorturifilter", tdehome+"/share" );
+    filter( "config", tdehome+"/share/config", KURIFilterData::LOCAL_DIR, "tdeshorturifilter", tdehome+"/share" );
 
     // Clean up
     TDEIO::NetAccess::del( tdehome, 0 );
diff --git a/tdeio/tests/tdeioslavetest.h b/tdeio/tests/tdeioslavetest.h
index 667cb2856..04992f889 100644
--- a/tdeio/tests/tdeioslavetest.h
+++ b/tdeio/tests/tdeioslavetest.h
@@ -19,7 +19,7 @@
 #include <tqbuttongroup.h>
 #include <tqwidget.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "tdeio/job.h"
 #include "tdeio/global.h"
diff --git a/tdemdi/tdemdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp
index 536508992..d3e162e14 100644
--- a/tdemdi/tdemdi/guiclient.cpp
+++ b/tdemdi/tdemdi/guiclient.cpp
@@ -1,7 +1,7 @@
 /* This file is part of the KDE libraries
    Copyright (C) 2003 Joseph Wenninger <jowenn@kde.org>
    Copyright (C) 2004 Christoph Cullmann <cullmann@kde.org>
-   based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
+   based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -24,9 +24,9 @@
 #include <tqpopupmenu.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqstring.h>
 #include <kdebug.h>
 #include <kdockwidget.h>
@@ -73,7 +73,7 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
     setXML( completeDescription, false /*merge*/ );
   }
 
-  if (actionCollection()->kaccel()==0)
+  if (actionCollection()->tdeaccel()==0)
     actionCollection()->setWidget(mdiMainFrm);
 
   m_toolMenu=new TDEActionMenu(i18n("Tool &Views"),actionCollection(),"tdemdi_toolview_menu");
diff --git a/tdemdi/tdemdi/guiclient.h b/tdemdi/tdemdi/guiclient.h
index 5c8822a0a..4f12e4b30 100644
--- a/tdemdi/tdemdi/guiclient.h
+++ b/tdemdi/tdemdi/guiclient.h
@@ -1,7 +1,7 @@
 /* This file is part of the KDE libraries
    Copyright (C) 2003 Joseph Wenninger <jowenn@kde.org>
    Copyright (C) 2004 Christoph Cullmann <cullmann@kde.org>
-   based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
+   based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -24,7 +24,7 @@
 #include <tqobject.h>
 #include <tqguardedptr.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tdemdi/global.h>
 
diff --git a/tdemdi/tdemdi/mainwindow.h b/tdemdi/tdemdi/mainwindow.h
index 0916cb908..e8ae6e9fc 100644
--- a/tdemdi/tdemdi/mainwindow.h
+++ b/tdemdi/tdemdi/mainwindow.h
@@ -44,7 +44,7 @@
 
 #include <tdeparts/dockmainwindow.h>
 #include <kmenubar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqptrlist.h>
 #include <tqrect.h>
diff --git a/tdemdi/tdemdi/tabwidget.cpp b/tdemdi/tdemdi/tabwidget.cpp
index 2d9603bf5..261fb6d55 100644
--- a/tdemdi/tdemdi/tabwidget.cpp
+++ b/tdemdi/tdemdi/tabwidget.cpp
@@ -40,7 +40,7 @@
 */
 
 #include <ktabbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 
 #include <tqobjectlist.h>
diff --git a/tdemdi/tdemdi/toolviewaccessor_p.h b/tdemdi/tdemdi/toolviewaccessor_p.h
index db2eb9dc8..e5f2b9138 100644
--- a/tdemdi/tdemdi/toolviewaccessor_p.h
+++ b/tdemdi/tdemdi/toolviewaccessor_p.h
@@ -22,7 +22,7 @@
 
 #include <kdockwidget.h>
 #include <tqguardedptr.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 namespace KMDIPrivate
 {
diff --git a/tdemdi/tdemdidocumentviewtabwidget.cpp b/tdemdi/tdemdidocumentviewtabwidget.cpp
index dcfa60976..936125e7f 100644
--- a/tdemdi/tdemdidocumentviewtabwidget.cpp
+++ b/tdemdi/tdemdidocumentviewtabwidget.cpp
@@ -10,7 +10,7 @@
 #include <tqtimer.h>
 
 #include <ktabbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include "tdemdidocumentviewtabwidget.h"
 
 KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const char* name ) : KTabWidget( parent, name )
diff --git a/tdemdi/tdemdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp
index 449157b7a..c9b2f70f3 100644
--- a/tdemdi/tdemdiguiclient.cpp
+++ b/tdemdi/tdemdiguiclient.cpp
@@ -1,6 +1,6 @@
 /* This file is part of the KDE libraries
   Copyright (C) 2003 Joseph Wenninger <jowenn@kde.org>
-  based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
+  based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public
@@ -23,10 +23,10 @@
 #include <tqpopupmenu.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
-#include <ktoolbar.h>
-#include <kmainwindow.h>
+#include <tdetoolbar.h>
+#include <tdemainwindow.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqstring.h>
 #include <assert.h>
 #include <kdebug.h>
@@ -134,7 +134,7 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 		setXML( completeDescription, false /*merge*/ );
 	}
 
-	if ( actionCollection() ->kaccel() == 0 )
+	if ( actionCollection() ->tdeaccel() == 0 )
 		actionCollection() ->setWidget( mdiMainFrm );
 	m_toolMenu = new TDEActionMenu( i18n( "Tool &Views" ), actionCollection(), "tdemdi_toolview_menu" );
 	if ( showMDIModeAction )
diff --git a/tdemdi/tdemdiguiclient.h b/tdemdi/tdemdiguiclient.h
index 22f9e51f0..711cf9f0d 100644
--- a/tdemdi/tdemdiguiclient.h
+++ b/tdemdi/tdemdiguiclient.h
@@ -22,7 +22,7 @@
 #include <tqobject.h>
 #include <tqguardedptr.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include "tdemdidefines.h"
 
 class TDEMainWindow;
diff --git a/tdemdi/tdemdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp
index 6f14c09bd..771afb8de 100644
--- a/tdemdi/tdemdimainfrm.cpp
+++ b/tdemdi/tdemdimainfrm.cpp
@@ -49,7 +49,7 @@
 #include <tdeversion.h>
 #include <tqtabwidget.h>
 #include <klocale.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 
 #include <kiconloader.h>
 #include <tdemdidockcontainer.h>
diff --git a/tdemdi/tdemdimainfrm.h b/tdemdi/tdemdimainfrm.h
index 08dc83db9..720324ad5 100644
--- a/tdemdi/tdemdimainfrm.h
+++ b/tdemdi/tdemdimainfrm.h
@@ -33,7 +33,7 @@
 
 #include <tdeparts/dockmainwindow.h>
 #include <kmenubar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqptrlist.h>
 #include <tqrect.h>
diff --git a/tdemdi/tdemditaskbar.h b/tdemdi/tdemditaskbar.h
index 9c853e7cf..3f90fb346 100644
--- a/tdemdi/tdemditaskbar.h
+++ b/tdemdi/tdemditaskbar.h
@@ -28,7 +28,7 @@
 #ifndef _KMDITASKBAR_H_
 #define _KMDITASKBAR_H_
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tqptrlist.h>
 #include <tqpixmap.h>
 #include <tqlabel.h>
diff --git a/tdemdi/tdemditoolviewaccessor_p.h b/tdemdi/tdemditoolviewaccessor_p.h
index c3812792f..ec19b8629 100644
--- a/tdemdi/tdemditoolviewaccessor_p.h
+++ b/tdemdi/tdemditoolviewaccessor_p.h
@@ -27,7 +27,7 @@
 #include <tqwidget.h>
 #include <kdockwidget.h>
 #include <tqguardedptr.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KMDI_EXPORT KMdiToolViewAccessorPrivate {
 public:
diff --git a/tdeparts/doctdemainwindow.cpp b/tdeparts/dockmainwindow.cpp
similarity index 99%
rename from tdeparts/doctdemainwindow.cpp
rename to tdeparts/dockmainwindow.cpp
index ce462e691..9c8d72112 100644
--- a/tdeparts/doctdemainwindow.cpp
+++ b/tdeparts/dockmainwindow.cpp
@@ -22,7 +22,7 @@
 #include <tdeparts/dockmainwindow.h>
 #include <tdeparts/event.h>
 #include <tdeparts/part.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeparts/plugin.h>
 #include <kstatusbar.h>
 #include <kinstance.h>
diff --git a/tdeparts/doctdemainwindow.h b/tdeparts/dockmainwindow.h
similarity index 99%
rename from tdeparts/doctdemainwindow.h
rename to tdeparts/dockmainwindow.h
index 223bd3a42..5f9209092 100644
--- a/tdeparts/doctdemainwindow.h
+++ b/tdeparts/dockmainwindow.h
@@ -22,7 +22,7 @@
 #define __DOCKMAINWINDOW_H
 
 #include <tqptrlist.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <kdockwidget.h>
 
diff --git a/tdeparts/mainwindow.cpp b/tdeparts/mainwindow.cpp
index 5f0a31a91..b3245da9b 100644
--- a/tdeparts/mainwindow.cpp
+++ b/tdeparts/mainwindow.cpp
@@ -29,7 +29,7 @@
 #include <tqapplication.h>
 #include <kxmlguifactory.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kdebug.h>
 
 #include <assert.h>
diff --git a/tdeparts/mainwindow.h b/tdeparts/mainwindow.h
index 4619a72cc..5872ae9c2 100644
--- a/tdeparts/mainwindow.h
+++ b/tdeparts/mainwindow.h
@@ -21,9 +21,9 @@
 #define __MAINWINDOW_H
 
 #include <tqptrlist.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include <tdeparts/part.h>
 
diff --git a/tdeparts/plugin.h b/tdeparts/plugin.h
index df1200ee9..751ee9c99 100644
--- a/tdeparts/plugin.h
+++ b/tdeparts/plugin.h
@@ -21,7 +21,7 @@
 #define PLUGIN_H
 
 #include <tqobject.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kxmlguiclient.h>
 
 class TDEInstance;
diff --git a/tdeparts/statusbarextension.cpp b/tdeparts/statusbarextension.cpp
index f0c7204ae..3803efa95 100644
--- a/tdeparts/statusbarextension.cpp
+++ b/tdeparts/statusbarextension.cpp
@@ -24,7 +24,7 @@
 #include <tqobjectlist.h>
 
 #include <kstatusbar.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdebug.h>
 #include <tdelibs_export.h>
 #include <tdeparts/part.h>
diff --git a/tdeparts/tests/example.cpp b/tdeparts/tests/example.cpp
index 34a96a334..0571bf4ad 100644
--- a/tdeparts/tests/example.cpp
+++ b/tdeparts/tests/example.cpp
@@ -11,7 +11,7 @@
 #include <kstandarddirs.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 
 Shell::Shell()
diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp
index c365bcfcb..66d6f786a 100644
--- a/tdeparts/tests/ghostview.cpp
+++ b/tdeparts/tests/ghostview.cpp
@@ -1,7 +1,7 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
diff --git a/tdeparts/tests/normalktm.cpp b/tdeparts/tests/normalktm.cpp
index b3907402e..14efbef94 100644
--- a/tdeparts/tests/normalktm.cpp
+++ b/tdeparts/tests/normalktm.cpp
@@ -11,7 +11,7 @@
 #include <kstandarddirs.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 
 #include <kmenubar.h>
diff --git a/tdeparts/tests/normalktm.h b/tdeparts/tests/normalktm.h
index 7183690f0..f60d490a6 100644
--- a/tdeparts/tests/normalktm.h
+++ b/tdeparts/tests/normalktm.h
@@ -3,7 +3,7 @@
 #define __normalktm_h__
 
 #include <tdeparts/part.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TDEAction;
 class TQWidget;
diff --git a/tdeparts/tests/notepad.cpp b/tdeparts/tests/notepad.cpp
index f2b43ccda..547cab520 100644
--- a/tdeparts/tests/notepad.cpp
+++ b/tdeparts/tests/notepad.cpp
@@ -11,7 +11,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <kstandarddirs.h>
diff --git a/tdeparts/tests/parts.cpp b/tdeparts/tests/parts.cpp
index f41063ef9..e765f55e7 100644
--- a/tdeparts/tests/parts.cpp
+++ b/tdeparts/tests/parts.cpp
@@ -15,7 +15,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 
 Part1::Part1( TQObject *parent, TQWidget * parentWidget )
diff --git a/tdeparts/tests/plugin_spellcheck.cpp b/tdeparts/tests/plugin_spellcheck.cpp
index dcdf33312..73d5b7986 100644
--- a/tdeparts/tests/plugin_spellcheck.cpp
+++ b/tdeparts/tests/plugin_spellcheck.cpp
@@ -1,7 +1,7 @@
 #include "notepad.h" // this plugin applies to a notepad part
 #include <tqmultilineedit.h>
 #include "plugin_spellcheck.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/tdeprint/cups/cupsdconf2/editlist.cpp b/tdeprint/cups/cupsdconf2/editlist.cpp
index fbdafbdb9..3e3fa80e2 100644
--- a/tdeprint/cups/cupsdconf2/editlist.cpp
+++ b/tdeprint/cups/cupsdconf2/editlist.cpp
@@ -19,7 +19,7 @@
 
 #include "editlist.h"
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 #include <tqlayout.h>
 #include <klocale.h>
diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
index cec6f383b..628e8d40c 100644
--- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
+++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 #include <tqheader.h>
 #include <tqpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index fecac0169..99fff556a 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -48,7 +48,7 @@
 #include <tdesocketbase.h>
 #include <klibloader.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kextendedsocket.h>
 #include <kprocess.h>
diff --git a/tdeprint/cups/kmcupsuimanager.cpp b/tdeprint/cups/kmcupsuimanager.cpp
index d0dfe3cdc..60e683b84 100644
--- a/tdeprint/cups/kmcupsuimanager.cpp
+++ b/tdeprint/cups/kmcupsuimanager.cpp
@@ -57,7 +57,7 @@
 #include <tqwhatsthis.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 
 #include "config.h"
diff --git a/tdeprint/cups/kmwfax.cpp b/tdeprint/cups/kmwfax.cpp
index 610217da1..05b1b2cfa 100644
--- a/tdeprint/cups/kmwfax.cpp
+++ b/tdeprint/cups/kmwfax.cpp
@@ -25,7 +25,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kurl.h>
diff --git a/tdeprint/cups/kmwippprinter.cpp b/tdeprint/cups/kmwippprinter.cpp
index 1a4cf4d94..e80478f61 100644
--- a/tdeprint/cups/kmwippprinter.cpp
+++ b/tdeprint/cups/kmwippprinter.cpp
@@ -24,7 +24,7 @@
 #include "kmcupsmanager.h"
 #include "networkscanner.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqheader.h>
 #include <kpushbutton.h>
 #include <tqlineedit.h>
diff --git a/tdeprint/cups/kmwippselect.cpp b/tdeprint/cups/kmwippselect.cpp
index c889edbf9..c3f48ad27 100644
--- a/tdeprint/cups/kmwippselect.cpp
+++ b/tdeprint/cups/kmwippselect.cpp
@@ -23,7 +23,7 @@
 #include "cupsinfos.h"
 #include "ipprequest.h"
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tqlayout.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/tdeprint/cups/kmwother.cpp b/tdeprint/cups/kmwother.cpp
index 7e86cbfb6..4e640d536 100644
--- a/tdeprint/cups/kmwother.cpp
+++ b/tdeprint/cups/kmwother.cpp
@@ -30,7 +30,7 @@
 #include <tqdict.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/tdeprint/driverview.h b/tdeprint/driverview.h
index 96c225ee4..7e06648fa 100644
--- a/tdeprint/driverview.h
+++ b/tdeprint/driverview.h
@@ -22,7 +22,7 @@
 #define DRIVERVIEW_H
 
 #include <tqwidget.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqmap.h>
 
 #include <tdelibs_export.h>
diff --git a/tdeprint/droptionview.cpp b/tdeprint/droptionview.cpp
index a11ec7ee0..1ec954251 100644
--- a/tdeprint/droptionview.cpp
+++ b/tdeprint/droptionview.cpp
@@ -25,7 +25,7 @@
 #include <tqlineedit.h>
 #include <tqslider.h>
 #include <tqlabel.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqwidgetstack.h>
diff --git a/tdeprint/kmjobmanager.cpp b/tdeprint/kmjobmanager.cpp
index db1b7c9b0..de71d4dc7 100644
--- a/tdeprint/kmjobmanager.cpp
+++ b/tdeprint/kmjobmanager.cpp
@@ -22,7 +22,7 @@
 #include "kmthreadjob.h"
 #include "kmfactory.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 
diff --git a/tdeprint/kpfilterpage.cpp b/tdeprint/kpfilterpage.cpp
index 9fabfc6d4..7f3d18807 100644
--- a/tdeprint/kpfilterpage.cpp
+++ b/tdeprint/kpfilterpage.cpp
@@ -26,7 +26,7 @@
 #include <tqtooltip.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
diff --git a/tdeprint/kprintaction.cpp b/tdeprint/kprintaction.cpp
index 6ce7f3f79..cc94fe3c8 100644
--- a/tdeprint/kprintaction.cpp
+++ b/tdeprint/kprintaction.cpp
@@ -22,7 +22,7 @@
 #include <kprinter.h>
 #include <tdeprint/kmmanager.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 
 class KPrintAction::KPrintActionPrivate
diff --git a/tdeprint/kprintaction.h b/tdeprint/kprintaction.h
index 9916629ba..94549402f 100644
--- a/tdeprint/kprintaction.h
+++ b/tdeprint/kprintaction.h
@@ -20,7 +20,7 @@
 #ifndef KPRINTACTION_H
 #define KPRINTACTION_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KPrinter;
 
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index 6f763fe75..b1a2f50ac 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -26,8 +26,8 @@
 #include <tqvbox.h>
 
 #include <tdeparts/part.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 #include <klibloader.h>
 #include <ktrader.h>
 #include <kuserprofile.h>
@@ -38,7 +38,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kmimetype.h>
 
 KPreviewProc::KPreviewProc()
diff --git a/tdeprint/lpr/editentrydialog.cpp b/tdeprint/lpr/editentrydialog.cpp
index 5d9f52bea..3977f12f8 100644
--- a/tdeprint/lpr/editentrydialog.cpp
+++ b/tdeprint/lpr/editentrydialog.cpp
@@ -25,7 +25,7 @@
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqheader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqlayout.h>
 #include <tqwidgetstack.h>
 #include <klocale.h>
diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp
index a81a24a72..157105e60 100644
--- a/tdeprint/lpr/kmlprmanager.cpp
+++ b/tdeprint/lpr/kmlprmanager.cpp
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <kprinter.h>
 #include <kprocess.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 #include <klibloader.h>
 
diff --git a/tdeprint/management/cjanuswidget.cpp b/tdeprint/management/cjanuswidget.cpp
index 1642fb5c6..5bddffe02 100644
--- a/tdeprint/management/cjanuswidget.cpp
+++ b/tdeprint/management/cjanuswidget.cpp
@@ -22,7 +22,7 @@
 #include <tqwidgetstack.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tqlayout.h>
 #include <kseparator.h>
 
diff --git a/tdeprint/management/kiconselectaction.cpp b/tdeprint/management/kiconselectaction.cpp
index f5df42299..230119d27 100644
--- a/tdeprint/management/kiconselectaction.cpp
+++ b/tdeprint/management/kiconselectaction.cpp
@@ -22,8 +22,8 @@
 #include <tqpopupmenu.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 
 class KIconSelectActionPrivate
 {
diff --git a/tdeprint/management/kiconselectaction.h b/tdeprint/management/kiconselectaction.h
index 917dc742b..289e1cf20 100644
--- a/tdeprint/management/kiconselectaction.h
+++ b/tdeprint/management/kiconselectaction.h
@@ -20,7 +20,7 @@
 #ifndef KICONSELECTACTION_H
 #define KICONSELECTACTION_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KIconSelectActionPrivate;
 
diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp
index 637f06ecc..21cbc418e 100644
--- a/tdeprint/management/kmconfigfilter.cpp
+++ b/tdeprint/management/kmconfigfilter.cpp
@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kdialog.h>
 
 KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp
index cd681db3d..54ebdb87c 100644
--- a/tdeprint/management/kmconfigfonts.cpp
+++ b/tdeprint/management/kmconfigfonts.cpp
@@ -33,7 +33,7 @@
 #include <kiconloader.h>
 #include <kurlrequester.h>
 #include <tdefile.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialog.h>
 
 KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp
index ee442113a..42d573e71 100644
--- a/tdeprint/management/kmdriverdbwidget.cpp
+++ b/tdeprint/management/kmdriverdbwidget.cpp
@@ -23,7 +23,7 @@
 #include "kmmanager.h"
 #include "driver.h"
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 #include <tqcheckbox.h>
 #include <kcursor.h>
diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp
index 2d73c6ecd..8c263bb48 100644
--- a/tdeprint/management/kminstancepage.cpp
+++ b/tdeprint/management/kminstancepage.cpp
@@ -32,7 +32,7 @@
 #include <tqpushbutton.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index 0af246f80..9d5c498c0 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -30,13 +30,13 @@
 #include "kmconfigpage.h"
 #include "kprinter.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kstatusbar.h>
 #include <tqpopupmenu.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
 #include <kapplication.h>
diff --git a/tdeprint/management/kmjobviewer.h b/tdeprint/management/kmjobviewer.h
index 534958656..7a4530f3c 100644
--- a/tdeprint/management/kmjobviewer.h
+++ b/tdeprint/management/kmjobviewer.h
@@ -24,7 +24,7 @@
 #warning internal header, do not use except if you are a TDEPrint developer
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include "kmprinterpage.h"
 #include "kpreloadobject.h"
 
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index 9673d214f..fbff73671 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -43,13 +43,13 @@
 #include <tqlayout.h>
 #include <tqpopupmenu.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klibloader.h>
 #include <kdialogbase.h>
 #include <ksimpleconfig.h>
diff --git a/tdeprint/management/kmmainview.h b/tdeprint/management/kmmainview.h
index 54cdffbc2..132bba062 100644
--- a/tdeprint/management/kmmainview.h
+++ b/tdeprint/management/kmmainview.h
@@ -26,7 +26,7 @@
 
 #include <tqwidget.h>
 #include <tdeprint/kpreloadobject.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class KMManager;
 class KMPrinterView;
diff --git a/tdeprint/management/kmprinterview.cpp b/tdeprint/management/kmprinterview.cpp
index 59911ff34..6d7edb707 100644
--- a/tdeprint/management/kmprinterview.cpp
+++ b/tdeprint/management/kmprinterview.cpp
@@ -26,7 +26,7 @@
 
 #include <tqlayout.h>
 #include <tqpopupmenu.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 
 KMPrinterView::KMPrinterView(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwclass.cpp b/tdeprint/management/kmwclass.cpp
index cadddf5d0..aee060e5f 100644
--- a/tdeprint/management/kmwclass.cpp
+++ b/tdeprint/management/kmwclass.cpp
@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqtoolbutton.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kiconloader.h>
 
diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp
index 94bf7d02e..f60dcface 100644
--- a/tdeprint/management/kmwdriverselect.cpp
+++ b/tdeprint/management/kmwdriverselect.cpp
@@ -26,7 +26,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <kpushbutton.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/tdeprint/management/kmwlocal.cpp b/tdeprint/management/kmwlocal.cpp
index 624e87a44..ea79563ec 100644
--- a/tdeprint/management/kmwlocal.cpp
+++ b/tdeprint/management/kmwlocal.cpp
@@ -28,7 +28,7 @@
 #include <tqlineedit.h>
 #include <tqlabel.h>
 #include <tqheader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 
diff --git a/tdeprint/management/kmwsocket.cpp b/tdeprint/management/kmwsocket.cpp
index 71a70f2e9..6b8f4aae9 100644
--- a/tdeprint/management/kmwsocket.cpp
+++ b/tdeprint/management/kmwsocket.cpp
@@ -22,7 +22,7 @@
 #include "kmwizard.h"
 #include "kmprinter.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqheader.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp
index df256f082..5019b92b3 100644
--- a/tdeprint/management/kxmlcommanddlg.cpp
+++ b/tdeprint/management/kxmlcommanddlg.cpp
@@ -37,12 +37,12 @@
 #include <tqwhatsthis.h>
 #include <tqapplication.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
 #include <kseparator.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
diff --git a/tdeprint/management/pluginaction.h b/tdeprint/management/pluginaction.h
index 1d77b71b7..0f87460fd 100644
--- a/tdeprint/management/pluginaction.h
+++ b/tdeprint/management/pluginaction.h
@@ -20,7 +20,7 @@
 #ifndef PLUGINACTION_H
 #define PLUGINACTION_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 class TDEPRINT_EXPORT PluginAction : public TDEAction
 {
diff --git a/tdeprint/management/smbview.h b/tdeprint/management/smbview.h
index 2226fd705..51193254e 100644
--- a/tdeprint/management/smbview.h
+++ b/tdeprint/management/smbview.h
@@ -20,7 +20,7 @@
 #ifndef SMBVIEW_H
 #define SMBVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TDEProcess;
 class KTempFile;
diff --git a/tdeprint/rlpr/kmwrlpr.cpp b/tdeprint/rlpr/kmwrlpr.cpp
index dc12da040..79682b91a 100644
--- a/tdeprint/rlpr/kmwrlpr.cpp
+++ b/tdeprint/rlpr/kmwrlpr.cpp
@@ -28,7 +28,7 @@
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqheader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kiconloader.h>
 
diff --git a/tdeprint/tdefilelist.cpp b/tdeprint/tdefilelist.cpp
index b365c1fb6..8753d144d 100644
--- a/tdeprint/tdefilelist.cpp
+++ b/tdeprint/tdefilelist.cpp
@@ -31,7 +31,7 @@
 #include <tdefiledialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <krun.h>
 #include <kmimetype.h>
 
diff --git a/tdeprint/tests/helpwindow.cpp b/tdeprint/tests/helpwindow.cpp
index aedb9e2b8..11cf22fd2 100644
--- a/tdeprint/tests/helpwindow.cpp
+++ b/tdeprint/tests/helpwindow.cpp
@@ -14,7 +14,7 @@
 #include <tqpixmap.h>
 #include <tqpopupmenu.h>
 #include <kmenubar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kstatusbar.h>
 #include <tqtoolbutton.h>
 #include <tqiconset.h>
diff --git a/tdeprint/tests/helpwindow.h b/tdeprint/tests/helpwindow.h
index d32f2f773..2ff3d3649 100644
--- a/tdeprint/tests/helpwindow.h
+++ b/tdeprint/tests/helpwindow.h
@@ -11,7 +11,7 @@
 #ifndef HELPWINDOW_H
 #define HELPWINDOW_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqtextbrowser.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
diff --git a/tderesources/configpage.cpp b/tderesources/configpage.cpp
index 3465562fb..d0ba22df7 100644
--- a/tderesources/configpage.cpp
+++ b/tderesources/configpage.cpp
@@ -33,7 +33,7 @@
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kbuttonbox.h>
 #include <ktrader.h>
 #include <kinputdialog.h>
diff --git a/tderesources/selectdialog.cpp b/tderesources/selectdialog.cpp
index c9355a86c..c50bd36fd 100644
--- a/tderesources/selectdialog.cpp
+++ b/tderesources/selectdialog.cpp
@@ -22,7 +22,7 @@
 */
 
 #include <kbuttonbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/tdersync/rsyncconfigdialog.cpp b/tdersync/rsyncconfigdialog.cpp
index ac8d32fa3..8b22b84a2 100644
--- a/tdersync/rsyncconfigdialog.cpp
+++ b/tdersync/rsyncconfigdialog.cpp
@@ -75,19 +75,19 @@
 #include <kinstance.h>
 
 #include <twin.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kprogressbox.h>
 #include <kpassdlg.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kapplication.h>
 #include <tdeconfigdialog.h>
 
 #include <kdirlister.h>
 #include <kstandarddirs.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <kiconviewsearchline.h>
 #include <kstaticdeleter.h>
 #include <kgenericfactory.h>
diff --git a/tdersync/tdersync.h b/tdersync/tdersync.h
index 03d7c6190..ffb5cfd6f 100644
--- a/tdersync/tdersync.h
+++ b/tdersync/tdersync.h
@@ -54,19 +54,19 @@
 
 #include <twin.h>
 #include <kurl.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kprogressbox.h>
 #include <kpassdlg.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kapplication.h>
 #include <tdeconfigdialog.h>
 
 #include <kdirlister.h>
 #include <kstandarddirs.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <kiconviewsearchline.h>
 #include <kstaticdeleter.h>
 #include <kgenericfactory.h>
diff --git a/tdeui/AUTHORS b/tdeui/AUTHORS
index 511733bba..670b7ce78 100644
--- a/tdeui/AUTHORS
+++ b/tdeui/AUTHORS
@@ -61,7 +61,7 @@ Michael Wiedmann <mw@miwie.in-berlin.de>
 KRestrictedLine, KIntegerLine
 
 Matthias Ettrich <ettrich@kde.org> 
-KWMModuleApplication, tearing/docking of ktoolbar and kmenubar, heavy
+KWMModuleApplication, tearing/docking of tdetoolbar and kmenubar, heavy
 modifications to kbutton
 
 Stephan Kulow <coolo@kde.org>
diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt
index a42f8e208..68edcc4e7 100644
--- a/tdeui/CMakeLists.txt
+++ b/tdeui/CMakeLists.txt
@@ -40,10 +40,10 @@ link_directories(
 
 install( FILES
     kprogressbox.h kprogress.h kcolordlg.h
-    kcolordialog.h kselect.h
-    kdatepik.h kdatepicker.h kdatetbl.h kfontdialog.h kpopupmenu.h
-    kfontrequester.h ktabctl.h kstatusbar.h
-    kmainwindow.h kmainwindowiface.h ktoolbar.h kmenubar.h
+    kcolordialog.h tdeselect.h
+    kdatepik.h kdatepicker.h kdatetbl.h tdefontdialog.h tdepopupmenu.h
+    tdefontrequester.h ktabctl.h kstatusbar.h
+    tdemainwindow.h tdemainwindowiface.h tdetoolbar.h kmenubar.h
     knuminput.h kseparator.h klineedit.h
     krestrictedline.h kcolorbutton.h kcolorbtn.h
     ksystemtray.h kdockwindow.h kbuttonbox.h
@@ -55,28 +55,28 @@ install( FILES
     knumvalidator.h kdialog.h kdialogbase.h
     kjanuswidget.h kaboutdialog.h
     kauthicon.h kmessagebox.h ksharedpixmap.h
-    kdualcolorbtn.h kdualcolorbutton.h ktoolbarbutton.h
-    ktoolbarradiogroup.h ktextbrowser.h
-    kaction.h kactioncollection.h kactionclasses.h khelpmenu.h kswitchlanguagedialog.h
+    kdualcolorbtn.h kdualcolorbutton.h tdetoolbarbutton.h
+    tdetoolbarradiogroup.h ktextbrowser.h
+    tdeaction.h tdeactioncollection.h tdeactionclasses.h khelpmenu.h kswitchlanguagedialog.h
     tdecmodule.h kcmenumngr.h kpanelmenu.h kpanelappmenu.h
-    kactionshortcutlist.h kstdaction.h kcombobox.h
-    kiconview.h klistview.h klistbox.h kbugreport.h kpassdlg.h
+    tdeactionshortcutlist.h kstdaction.h kcombobox.h
+    kiconview.h tdelistview.h tdelistbox.h kbugreport.h kpassdlg.h
     kxmlguiclient.h kxmlgui.h kxmlguibuilder.h kxmlguifactory.h
     kpixmapio.h kwordwrap.h
     kedittoolbar.h kdockwidget.h kanimwidget.h
     krootpixmap.h kaboutkde.h kaboutapplication.h
     kpanelapplet.h kpushbutton.h kdcopactionproxy.h kcolorcombo.h
     kpanelextension.h kcompletionbox.h ksqueezedtextlabel.h
-    kcommand.h twindowlistmenu.h kfontcombo.h kaccelgen.h ktip.h
+    kcommand.h twindowlistmenu.h tdefontcombo.h tdeaccelgen.h ktip.h
     kdatewidget.h karrowbutton.h kguiitem.h kstdguiitem.h
     kstringvalidator.h twindowinfo.h
     ktextedit.h kpassivepopup.h
     kdatetimewidget.h ktimewidget.h ktimezonewidget.h kscrollview.h
     tdespell.h ksconfig.h tdespelldlg.h ksyntaxhighlighter.h
     ktabbar.h ktabwidget.h ksplashscreen.h tdeconfigdialog.h
-    kactionselector.h klanguagebutton.h klistviewsearchline.h
+    tdeactionselector.h klanguagebutton.h tdelistviewsearchline.h
     kpixmapregionselectorwidget.h kpixmapregionselectordialog.h
-    kiconviewsearchline.h ktoolbarlabelaction.h kshortcutdialog.h
+    kiconviewsearchline.h tdetoolbarlabelaction.h tdeshortcutdialog.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
@@ -101,28 +101,28 @@ set( target tdeui )
 
 set( ${target}_SRCS
   qxembed.cpp ksharedpixmap.cpp kpixmapio.cpp
-  kpopupmenu.cpp ktoolbar.cpp kaction.cpp kstdaction.cpp
-  kactioncollection.cpp kactionclasses.cpp
+  tdepopupmenu.cpp tdetoolbar.cpp tdeaction.cpp kstdaction.cpp
+  tdeactioncollection.cpp tdeactionclasses.cpp
   kurllabel.cpp kmenubar.cpp kinputdialog.cpp
-  knuminput.cpp klineedit.cpp klistview.cpp kprogress.cpp
-  kprogressbox.cpp kcolordialog.cpp kselect.cpp kdatepicker.cpp
-  kdatetbl.cpp kfontrequester.cpp kfontdialog.cpp ktabctl.cpp
-  kstatusbar.cpp kmainwindow.cpp
+  knuminput.cpp klineedit.cpp tdelistview.cpp kprogress.cpp
+  kprogressbox.cpp kcolordialog.cpp tdeselect.cpp kdatepicker.cpp
+  kdatetbl.cpp tdefontrequester.cpp tdefontdialog.cpp ktabctl.cpp
+  kstatusbar.cpp tdemainwindow.cpp
   keditlistbox.cpp kscrollview.cpp
   kseparator.cpp krestrictedline.cpp
   kcolorbutton.cpp ksystemtray.cpp
   kbuttonbox.cpp keditcl1.cpp keditcl2.cpp kled.cpp
-  kshortcutdialog_simple.ui kshortcutdialog_advanced.ui
-  kshortcutdialog.cpp kkeybutton.cpp kkeydialog.cpp
+  tdeshortcutdialog_simple.ui tdeshortcutdialog_advanced.ui
+  tdeshortcutdialog.cpp kkeybutton.cpp kkeydialog.cpp
   kruler.cpp kcursor.cpp klineeditdlg.cpp
   kcharselect.cpp kcolordrag.cpp
   knumvalidator.cpp kdialog.cpp kdialogbase.cpp
   kjanuswidget.cpp kaboutdialog.cpp
   kauthicon.cpp kmessagebox.cpp kdualcolorbutton.cpp
-  ktoolbarradiogroup.cpp ktoolbarbutton.cpp
+  tdetoolbarradiogroup.cpp tdetoolbarbutton.cpp
   ktextbrowser.cpp khelpmenu.cpp kswitchlanguagedialog.cpp
   kcmenumngr.cpp kpanelmenu.cpp
-  kiconview.cpp klistbox.cpp kwordwrap.cpp kbugreport.cpp
+  kiconview.cpp tdelistbox.cpp kwordwrap.cpp kbugreport.cpp
   kcombobox.cpp kpassdlg.cpp kxmlguiclient.cpp kxmlguifactory.cpp
   kxmlguifactory_p.cpp kxmlguibuilder.cpp kedittoolbar.cpp
   kpanelappmenu.cpp kdockwidget.cpp kdockwidget_private.cpp
@@ -130,19 +130,19 @@ set( ${target}_SRCS
   kaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp
   kcolorcombo.cpp kpushbutton.cpp kpanelextension.cpp
   kcompletionbox.cpp ksqueezedtextlabel.cpp tdecmodule.cpp
-  kcommand.cpp twindowlistmenu.cpp kfontcombo.cpp ktip.cpp
-  kdatewidget.cpp karrowbutton.cpp kmainwindowiface.cpp
-  kmainwindowiface.skel kguiitem.cpp kstdguiitem.cpp
+  kcommand.cpp twindowlistmenu.cpp tdefontcombo.cpp ktip.cpp
+  kdatewidget.cpp karrowbutton.cpp tdemainwindowiface.cpp
+  tdemainwindowiface.skel kguiitem.cpp kstdguiitem.cpp
   kstringvalidator.cpp kactivelabel.cpp
   twindowinfo.cpp ktextedit.cpp kwizard.cpp kpassivepopup.cpp
-  ktoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp
+  tdetoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp
   ksconfig.cpp tdespelldlg.cpp
   tdespell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp
   ksplashscreen.cpp tdespellui.ui tdeconfigdialog.cpp
-  kactionselector.cpp klanguagebutton.cpp klistviewsearchline.cpp
+  tdeactionselector.cpp klanguagebutton.cpp tdelistviewsearchline.cpp
   kpixmapregionselectorwidget.cpp kpixmapregionselectordialog.cpp
   kwhatsthismanager.cpp kiconviewsearchline.cpp
-  ktoolbarlabelaction.cpp
+  tdetoolbarlabelaction.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/tdeui/MAINTAINERS b/tdeui/MAINTAINERS
index a5c4465b6..1b981e334 100644
--- a/tdeui/MAINTAINERS
+++ b/tdeui/MAINTAINERS
@@ -8,7 +8,7 @@ more logical grouping.
 kaboutapplication.cpp
 kaboutdialog.cpp
 kaboutkde.cpp
-kaction.cpp		Holger Freyther <freyther@kde.org>, Martijn Klingens <klingens@kde.org>
+tdeaction.cpp		Holger Freyther <freyther@kde.org>, Martijn Klingens <klingens@kde.org>
 kanimwidget.cpp		Waldo Bastian <bastian@kde.org>
 karrowbutton.cpp	Frerich Raabe <raabe@kde.org>
 kauthicon.cpp
@@ -39,8 +39,8 @@ keditcl1.cpp		Waldo Bastian <bastian@kde.org>
 keditcl2.cpp		Waldo Bastian <bastian@kde.org>
 keditlistbox.cpp
 kedittoolbar.cpp
-kfontcombo.cpp
-kfontdialog.cpp
+tdefontcombo.cpp
+tdefontdialog.cpp
 kguiitem.cpp		Holger Freyther <freyther@kde.org>, Martijn Klingens <klingens@kde.org>
 khelpmenu.cpp
 kiconview.cpp
@@ -50,10 +50,10 @@ kkeydialog.cpp		Ellis Whitehead <ellis@kde.org>
 kled.cpp
 klineedit.cpp   	Dawit Alemayehu <adawit@kde.org>, Carsten Pfeiffer <pfeiffer@kde.org>
 klineeditdlg.cpp
-klistbox.cpp
-klistview.cpp
-kmainwindow.cpp
-kmainwindowiface.cpp
+tdelistbox.cpp
+tdelistview.cpp
+tdemainwindow.cpp
+tdemainwindowiface.cpp
 kmenubar.cpp
 kmessagebox.cpp		Waldo Bastian <bastian@kde.org>
 knuminput.cpp           Dirk Mueller <mueller@kde.org>
@@ -64,16 +64,16 @@ kpanelextension.cpp
 kpanelmenu.cpp
 kpassdlg.cpp		Waldo Bastian <bastian@kde.org>
 kpixmapio.cpp
-kpopupmenu.cpp		Holger Freyther <freyther@kde.org>
+tdepopupmenu.cpp		Holger Freyther <freyther@kde.org>
 kprogress.cpp
 kpushbutton.cpp		Carsten Pfeiffer <pfeiffer@kde.org>, Martijn Klingens <klingens@kde.org>
 krestrictedline.cpp
 krootpixmap.cpp
 kruler.cpp
-kselect.cpp
+tdeselect.cpp
 kseparator.cpp		Waldo Bastian <bastian@kde.org>
 ksharedpixmap.cpp
-kshortcutdialog.cpp	Ellis Whitehead <ellis@kde.org>
+tdeshortcutdialog.cpp	Ellis Whitehead <ellis@kde.org>
 ksqueezedtextlabel.cpp
 kstatusbar.cpp
 kstdaction.cpp
@@ -84,9 +84,9 @@ ktabctl.cpp
 ktextbrowser.cpp
 ktimewidget             Hans Petter Bieker <bieker@kde.org>
 ktip.cpp
-ktoolbar.cpp		Waldo Bastian <bastian@kde.org>
-ktoolbarbutton.cpp	Waldo Bastian <bastian@kde.org>
-ktoolbarradiogroup.cpp
+tdetoolbar.cpp		Waldo Bastian <bastian@kde.org>
+tdetoolbarbutton.cpp	Waldo Bastian <bastian@kde.org>
+tdetoolbarradiogroup.cpp
 kurllabel.cpp
 twindowlistmenu.cpp
 kwizard.cpp
diff --git a/tdeui/Makefile.am b/tdeui/Makefile.am
index 13d5b3c4f..5da7403fc 100644
--- a/tdeui/Makefile.am
+++ b/tdeui/Makefile.am
@@ -37,10 +37,10 @@ picsdir = $(kde_datadir)/tdeui/pics
 pics_DATA = aboutkde.png ktip-bulb.png ktip-background.png
 
 include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
-		kcolordialog.h kselect.h \
-		kdatepik.h kdatepicker.h kdatetbl.h kfontdialog.h kpopupmenu.h \
-		kfontrequester.h ktabctl.h kstatusbar.h \
-		kmainwindow.h kmainwindowiface.h ktoolbar.h kmenubar.h \
+		kcolordialog.h tdeselect.h \
+		kdatepik.h kdatepicker.h kdatetbl.h tdefontdialog.h tdepopupmenu.h \
+		tdefontrequester.h ktabctl.h kstatusbar.h \
+		tdemainwindow.h tdemainwindowiface.h tdetoolbar.h kmenubar.h \
 		knuminput.h kseparator.h klineedit.h \
 		krestrictedline.h kcolorbutton.h kcolorbtn.h \
 		ksystemtray.h kdockwindow.h kbuttonbox.h \
@@ -52,28 +52,28 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 		knumvalidator.h kdialog.h kdialogbase.h \
 		kjanuswidget.h kaboutdialog.h \
 		kauthicon.h kmessagebox.h ksharedpixmap.h \
-		kdualcolorbtn.h kdualcolorbutton.h ktoolbarbutton.h \
-		ktoolbarradiogroup.h ktextbrowser.h \
-		kaction.h kactioncollection.h kactionclasses.h khelpmenu.h kswitchlanguagedialog.h \
+		kdualcolorbtn.h kdualcolorbutton.h tdetoolbarbutton.h \
+		tdetoolbarradiogroup.h ktextbrowser.h \
+		tdeaction.h tdeactioncollection.h tdeactionclasses.h khelpmenu.h kswitchlanguagedialog.h \
 		tdecmodule.h kcmenumngr.h kpanelmenu.h kpanelappmenu.h \
-		kactionshortcutlist.h kstdaction.h kcombobox.h \
-		kiconview.h klistview.h klistbox.h kbugreport.h kpassdlg.h \
+		tdeactionshortcutlist.h kstdaction.h kcombobox.h \
+		kiconview.h tdelistview.h tdelistbox.h kbugreport.h kpassdlg.h \
 		kxmlguiclient.h kxmlgui.h kxmlguibuilder.h kxmlguifactory.h \
 		kpixmapio.h kwordwrap.h \
 		kedittoolbar.h kdockwidget.h kanimwidget.h \
 		krootpixmap.h kaboutkde.h kaboutapplication.h \
 		kpanelapplet.h kpushbutton.h kdcopactionproxy.h kcolorcombo.h \
 		kpanelextension.h kcompletionbox.h ksqueezedtextlabel.h \
-		kcommand.h twindowlistmenu.h kfontcombo.h kaccelgen.h ktip.h \
+		kcommand.h twindowlistmenu.h tdefontcombo.h tdeaccelgen.h ktip.h \
 		kdatewidget.h karrowbutton.h kguiitem.h kstdguiitem.h \
 		kstringvalidator.h twindowinfo.h \
 		ktextedit.h kpassivepopup.h \
 		kdatetimewidget.h ktimewidget.h ktimezonewidget.h kscrollview.h \
 		tdespell.h ksconfig.h tdespelldlg.h ksyntaxhighlighter.h \
 		ktabbar.h ktabwidget.h ksplashscreen.h tdeconfigdialog.h \
-		kactionselector.h klanguagebutton.h klistviewsearchline.h \
+		tdeactionselector.h klanguagebutton.h tdelistviewsearchline.h \
 		kpixmapregionselectorwidget.h kpixmapregionselectordialog.h \
-		kiconviewsearchline.h ktoolbarlabelaction.h kshortcutdialog.h
+		kiconviewsearchline.h tdetoolbarlabelaction.h tdeshortcutdialog.h
 
 # the order of the sources isn't randomly (at least not completely).
 # the order is predictated by the use of X11 header files
@@ -82,28 +82,28 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 # in ksharedpixmap.cpp
 libtdeui_la_SOURCES = \
 		qxembed.cpp ksharedpixmap.cpp kpixmapio.cpp \
-		kpopupmenu.cpp ktoolbar.cpp kaction.cpp kstdaction.cpp \
-		kactioncollection.cpp kactionclasses.cpp \
+		tdepopupmenu.cpp tdetoolbar.cpp tdeaction.cpp kstdaction.cpp \
+		tdeactioncollection.cpp tdeactionclasses.cpp \
 		kurllabel.cpp kmenubar.cpp kinputdialog.cpp \
-		knuminput.cpp klineedit.cpp klistview.cpp kprogress.cpp \
-		kprogressbox.cpp kcolordialog.cpp kselect.cpp kdatepicker.cpp \
-		kdatetbl.cpp kfontrequester.cpp kfontdialog.cpp ktabctl.cpp \
-		kstatusbar.cpp kmainwindow.cpp \
+		knuminput.cpp klineedit.cpp tdelistview.cpp kprogress.cpp \
+		kprogressbox.cpp kcolordialog.cpp tdeselect.cpp kdatepicker.cpp \
+		kdatetbl.cpp tdefontrequester.cpp tdefontdialog.cpp ktabctl.cpp \
+		kstatusbar.cpp tdemainwindow.cpp \
 		keditlistbox.cpp kscrollview.cpp \
 		kseparator.cpp krestrictedline.cpp  \
 		kcolorbutton.cpp ksystemtray.cpp \
 		kbuttonbox.cpp keditcl1.cpp keditcl2.cpp kled.cpp \
-		kshortcutdialog_simple.ui kshortcutdialog_advanced.ui \
-		kshortcutdialog.cpp kkeybutton.cpp kkeydialog.cpp \
+		tdeshortcutdialog_simple.ui tdeshortcutdialog_advanced.ui \
+		tdeshortcutdialog.cpp kkeybutton.cpp kkeydialog.cpp \
 		kruler.cpp kcursor.cpp klineeditdlg.cpp  \
 		kcharselect.cpp kcolordrag.cpp  \
 		knumvalidator.cpp kdialog.cpp kdialogbase.cpp \
 		kjanuswidget.cpp kaboutdialog.cpp \
 		kauthicon.cpp kmessagebox.cpp kdualcolorbutton.cpp \
-		ktoolbarradiogroup.cpp ktoolbarbutton.cpp \
+		tdetoolbarradiogroup.cpp tdetoolbarbutton.cpp \
 		ktextbrowser.cpp khelpmenu.cpp kswitchlanguagedialog.cpp \
 		kcmenumngr.cpp kpanelmenu.cpp \
-		kiconview.cpp klistbox.cpp kwordwrap.cpp kbugreport.cpp \
+		kiconview.cpp tdelistbox.cpp kwordwrap.cpp kbugreport.cpp \
 		kcombobox.cpp kpassdlg.cpp kxmlguiclient.cpp kxmlguifactory.cpp \
 		kxmlguifactory_p.cpp kxmlguibuilder.cpp kedittoolbar.cpp \
 		kpanelappmenu.cpp kdockwidget.cpp kdockwidget_private.cpp \
@@ -111,21 +111,21 @@ libtdeui_la_SOURCES = \
 		kaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp \
 		kcolorcombo.cpp kpushbutton.cpp kpanelextension.cpp \
 		kcompletionbox.cpp ksqueezedtextlabel.cpp tdecmodule.cpp \
-		kcommand.cpp twindowlistmenu.cpp kfontcombo.cpp ktip.cpp \
-		kdatewidget.cpp karrowbutton.cpp kmainwindowiface.cpp \
-                kmainwindowiface.skel kguiitem.cpp kstdguiitem.cpp \
+		kcommand.cpp twindowlistmenu.cpp tdefontcombo.cpp ktip.cpp \
+		kdatewidget.cpp karrowbutton.cpp tdemainwindowiface.cpp \
+                tdemainwindowiface.skel kguiitem.cpp kstdguiitem.cpp \
 		kstringvalidator.cpp kactivelabel.cpp \
 		twindowinfo.cpp ktextedit.cpp kwizard.cpp kpassivepopup.cpp \
-		ktoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp \
+		tdetoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp \
 		ksconfig.cpp tdespelldlg.cpp \
 		tdespell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp \
 		ksplashscreen.cpp tdespellui.ui tdeconfigdialog.cpp \
-		kactionselector.cpp klanguagebutton.cpp klistviewsearchline.cpp \
+		tdeactionselector.cpp klanguagebutton.cpp tdelistviewsearchline.cpp \
 		kpixmapregionselectorwidget.cpp kpixmapregionselectordialog.cpp \
 		kwhatsthismanager.cpp kiconviewsearchline.cpp \
-		ktoolbarlabelaction.cpp
+		tdetoolbarlabelaction.cpp
 
-noinst_HEADERS = kdockwidget_private.h kdockwidget_p.h klistviewlineedit.h \
+noinst_HEADERS = kdockwidget_private.h kdockwidget_p.h tdelistviewlineedit.h \
 		kdialogbase_priv.h kaboutdialog_private.h kcursor_private.h \
 		kdepackages.h kxmlguifactory_p.h \
 		kstdaction_p.h kwhatsthismanager_p.h
diff --git a/tdeui/kanimwidget.cpp b/tdeui/kanimwidget.cpp
index 9f069a259..004127b9a 100644
--- a/tdeui/kanimwidget.cpp
+++ b/tdeui/kanimwidget.cpp
@@ -22,7 +22,7 @@
 #include <tqtimer.h>
 #include <tqpainter.h>
 #include <tqimage.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
diff --git a/tdeui/kcmenumngr.cpp b/tdeui/kcmenumngr.cpp
index cedaadde8..b0f261890 100644
--- a/tdeui/kcmenumngr.cpp
+++ b/tdeui/kcmenumngr.cpp
@@ -23,7 +23,7 @@
 #include "kcmenumngr.h"
 #include "kglobal.h"
 #include "tdeconfig.h"
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 
 #undef KeyPress
 #undef None
diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp
index 91e53ea62..993530497 100644
--- a/tdeui/kcolorbutton.cpp
+++ b/tdeui/kcolorbutton.cpp
@@ -26,7 +26,7 @@
 #include <tqclipboard.h>
 #include <tqstyle.h>
 #include <kglobalsettings.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include "kcolordialog.h"
 #include "kcolorbutton.h"
 #include "kcolordrag.h"
diff --git a/tdeui/kcolorcombo.cpp b/tdeui/kcolorcombo.cpp
index 52291f762..0449550fd 100644
--- a/tdeui/kcolorcombo.cpp
+++ b/tdeui/kcolorcombo.cpp
@@ -49,7 +49,7 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kseparator.h>
diff --git a/tdeui/kcolorcombo.h b/tdeui/kcolorcombo.h
index 07127a3f9..bade8efcb 100644
--- a/tdeui/kcolorcombo.h
+++ b/tdeui/kcolorcombo.h
@@ -28,7 +28,7 @@
 
 #include <tqcombobox.h>
 #include <kcolordialog.h>
-#include "kselect.h"
+#include "tdeselect.h"
 
 
 class KColorComboInternal;
diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index 874b63d9c..16f16d07e 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -51,7 +51,7 @@
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kseparator.h>
diff --git a/tdeui/kcolordialog.h b/tdeui/kcolordialog.h
index 7f04d6d17..e580ad582 100644
--- a/tdeui/kcolordialog.h
+++ b/tdeui/kcolordialog.h
@@ -35,7 +35,7 @@
 #include <tqpixmap.h>
 #include <tqgridview.h>
 
-#include "kselect.h"
+#include "tdeselect.h"
 
 class TQComboBox;
 class TQLineEdit;
diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp
index 6fe8d1946..bd3f566b7 100644
--- a/tdeui/kcombobox.cpp
+++ b/tdeui/kcombobox.cpp
@@ -29,12 +29,12 @@
 #include <kcursor.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <knotifyclient.h>
 #include <kpixmapprovider.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kurl.h>
 #include <kurldrag.h>
 
diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h
index edb090f06..5d849b190 100644
--- a/tdeui/kcombobox.h
+++ b/tdeui/kcombobox.h
@@ -32,7 +32,7 @@
 
 #include <kcompletion.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TQListBoxItem;
 class TQPopupMenu;
diff --git a/tdeui/kcommand.cpp b/tdeui/kcommand.cpp
index 9de26e062..e039a03ca 100644
--- a/tdeui/kcommand.cpp
+++ b/tdeui/kcommand.cpp
@@ -19,12 +19,12 @@
 */
 
 #include "kcommand.h"
-#include <kaction.h>
-#include <kstdaccel.h>
+#include <tdeaction.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 KCommand::~KCommand()
 {
diff --git a/tdeui/kcompletionbox.h b/tdeui/kcompletionbox.h
index da853a6c3..76f868dea 100644
--- a/tdeui/kcompletionbox.h
+++ b/tdeui/kcompletionbox.h
@@ -25,7 +25,7 @@
 
 class TQEvent;
 #include <tqstringlist.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 
 /**
  * @short A helper widget for "completion-widgets" (KLineEdit, KComboBox))
diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp
index a7d3cb303..91cafddbd 100644
--- a/tdeui/kdatepicker.cpp
+++ b/tdeui/kdatepicker.cpp
@@ -37,7 +37,7 @@
 #include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <klineedit.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp
index 529b7dac3..2fd593493 100644
--- a/tdeui/kdatetbl.cpp
+++ b/tdeui/kdatetbl.cpp
@@ -36,16 +36,16 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kapplication.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
 #include <kcalendarsystem.h>
-#include <kshortcut.h>
-#include <kstdaccel.h>
+#include <tdeshortcut.h>
+#include <tdestdaccel.h>
 #include "kdatepicker.h"
 #include "kdatetbl.h"
-#include "kpopupmenu.h"
+#include "tdepopupmenu.h"
 #include <tqdatetime.h>
 #include <tqguardedptr.h>
 #include <tqstring.h>
diff --git a/tdeui/kdcopactionproxy.cpp b/tdeui/kdcopactionproxy.cpp
index 730cdacb3..c8444cfdf 100644
--- a/tdeui/kdcopactionproxy.cpp
+++ b/tdeui/kdcopactionproxy.cpp
@@ -21,7 +21,7 @@
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kdcoppropertyproxy.h>
 
diff --git a/tdeui/kdepackages.h b/tdeui/kdepackages.h
index fa07e627d..c9465529c 100644
--- a/tdeui/kdepackages.h
+++ b/tdeui/kdepackages.h
@@ -693,7 +693,7 @@ const char * const packages[] = {
 "tdeio/zeroconf",
 "tdeio/zip",
 "kiosk",
-"kiosk/tdeiosktool",
+"kiosk/kiosktool",
 "kipiplugins",
 "kipiplugins/GPSSync",
 "kipiplugins/HTMLExport",
diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp
index fc668e6d4..a761f43c6 100644
--- a/tdeui/kdockwidget.cpp
+++ b/tdeui/kdockwidget.cpp
@@ -36,8 +36,8 @@
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <ktoolbar.h>
-#include <kpopupmenu.h>
+#include <tdetoolbar.h>
+#include <tdepopupmenu.h>
 #include <twin.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
diff --git a/tdeui/kdockwidget.h b/tdeui/kdockwidget.h
index 7d52d354c..df06ed8f1 100644
--- a/tdeui/kdockwidget.h
+++ b/tdeui/kdockwidget.h
@@ -55,13 +55,13 @@
 #include <tqtabwidget.h>
 
 #ifndef NO_KDE2
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <netwm_def.h>
 #else
 
 #include <tqmainwindow.h>
 #include "exportdockclass.h"
-#include "dummykmainwindow.h"
+#include "dummytdemainwindow.h"
 #endif
 
 class KDockSplitter;
diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp
index 69bdc8aab..baff8db25 100644
--- a/tdeui/keditcl1.cpp
+++ b/tdeui/keditcl1.cpp
@@ -28,10 +28,10 @@
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kcmenumngr.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kurldrag.h>
 
 #include "keditcl.h"
diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp
index 5b16e19df..cd6111a48 100644
--- a/tdeui/kedittoolbar.cpp
+++ b/tdeui/kedittoolbar.cpp
@@ -31,7 +31,7 @@
 #include <tqapplication.h>
 #include <tqtextstream.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kicontheme.h>
@@ -41,7 +41,7 @@
 #include <kxmlguifactory.h>
 #include <kseparator.h>
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <kprocio.h>
diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index 33e6210ff..ed329493c 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -30,7 +30,7 @@
 #include <kaboutapplication.h>
 #include <kaboutdata.h>
 #include <kaboutkde.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kbugreport.h>
 #include <kdialogbase.h>
@@ -38,8 +38,8 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
-#include <kstdaccel.h>
+#include <tdepopupmenu.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 
diff --git a/tdeui/kiconviewsearchline.cpp b/tdeui/kiconviewsearchline.cpp
index aa97dc923..a10e220a4 100644
--- a/tdeui/kiconviewsearchline.cpp
+++ b/tdeui/kiconviewsearchline.cpp
@@ -20,7 +20,7 @@
 /**
  * \todo
  *     Maybe we should have a common interface for SearchLines, this file
- * is so close (it's actually based on) klistviewsearchline! Only few methods
+ * is so close (it's actually based on) tdelistviewsearchline! Only few methods
  * would be reimplemented.
  */
 
diff --git a/tdeui/kinputdialog.cpp b/tdeui/kinputdialog.cpp
index 948cdd393..a5a338422 100644
--- a/tdeui/kinputdialog.cpp
+++ b/tdeui/kinputdialog.cpp
@@ -29,7 +29,7 @@
 #include <klineedit.h>
 #include <knuminput.h>
 #include <kcombobox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <ktextedit.h>
 
 #include "kinputdialog.h"
diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp
index fd413742d..d33a2f0b4 100644
--- a/tdeui/kjanuswidget.cpp
+++ b/tdeui/kjanuswidget.cpp
@@ -41,7 +41,7 @@
 #include <kseparator.h>
 #include <kdebug.h>
 #include "kjanuswidget.h"
-#include <klistview.h>
+#include <tdelistview.h>
 #include "kpushbutton.h"
 #include "kguiitem.h"
 
diff --git a/tdeui/kjanuswidget.h b/tdeui/kjanuswidget.h
index d5bec6142..604765029 100644
--- a/tdeui/kjanuswidget.h
+++ b/tdeui/kjanuswidget.h
@@ -24,7 +24,7 @@
 #include <tqpixmap.h>
 #include <tqsplitter.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
 
diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp
index 1568ea684..e0a41ce5d 100644
--- a/tdeui/kkeybutton.cpp
+++ b/tdeui/kkeybutton.cpp
@@ -19,7 +19,7 @@
 */
 
 #include "kkeybutton.h"
-#include "kshortcutdialog.h"
+#include "tdeshortcutdialog.h"
 
 #include <tqcursor.h>
 #include <tqdrawutil.h>
diff --git a/tdeui/kkeybutton.h b/tdeui/kkeybutton.h
index 9dd806095..889319884 100644
--- a/tdeui/kkeybutton.h
+++ b/tdeui/kkeybutton.h
@@ -21,7 +21,7 @@
 #define _KKEYBUTTON_H_
 
 #include <tqpushbutton.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 /**
  * @short A push button that looks like a keyboard key.
diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp
index d6375d039..b6db9bb71 100644
--- a/tdeui/kkeydialog.cpp
+++ b/tdeui/kkeydialog.cpp
@@ -35,21 +35,21 @@
 #include <tqtoolbutton.h>
 #include <tqwhatsthis.h>
 
-#include <kaccel.h>
-#include <kaction.h>
-#include <kaccelaction.h>
-#include <kactionshortcutlist.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
+#include <tdeaccelaction.h>
+#include <tdeactionshortcutlist.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalaccel.h>
 #include <kiconloader.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kshortcut.h>
-#include <kshortcutlist.h>
+#include <tdeshortcut.h>
+#include <tdeshortcutlist.h>
 #include <kxmlguifactory.h>
 #include <kaboutdata.h>
 #include <kstaticdeleter.h>
diff --git a/tdeui/kkeydialog.h b/tdeui/kkeydialog.h
index c6468e7c1..af395682e 100644
--- a/tdeui/kkeydialog.h
+++ b/tdeui/kkeydialog.h
@@ -23,7 +23,7 @@
 
 #include <tqdict.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TQButtonGroup;
 class TQCheckBox;
diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp
index 61d0daf26..fa7648dfc 100644
--- a/tdeui/klineedit.cpp
+++ b/tdeui/klineedit.cpp
@@ -33,8 +33,8 @@
 #include <tqtooltip.h>
 #include <kcursor.h>
 #include <klocale.h>
-#include <kstdaccel.h>
-#include <kpopupmenu.h>
+#include <tdestdaccel.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <kcompletionbox.h>
 #include <kurl.h>
diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp
index 69020eae7..11644b25c 100644
--- a/tdeui/kmessagebox.cpp
+++ b/tdeui/kmessagebox.cpp
@@ -36,7 +36,7 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kguiitem.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
diff --git a/tdeui/kpanelmenu.cpp b/tdeui/kpanelmenu.cpp
index c266079c7..184e83422 100644
--- a/tdeui/kpanelmenu.cpp
+++ b/tdeui/kpanelmenu.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "kpanelmenu.h"
 #include "kpanelmenu.moc"
-//#include "kaccelmanager.h"
+//#include "tdeaccelmanager.h"
 
 
 class KPanelMenuPrivate
diff --git a/tdeui/kpanelmenu.h b/tdeui/kpanelmenu.h
index 0c03d6fd4..03b700b82 100644
--- a/tdeui/kpanelmenu.h
+++ b/tdeui/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/tdeui/kpixmapregionselectorwidget.cpp b/tdeui/kpixmapregionselectorwidget.cpp
index 8f6568534..bd82cae72 100644
--- a/tdeui/kpixmapregionselectorwidget.cpp
+++ b/tdeui/kpixmapregionselectorwidget.cpp
@@ -31,8 +31,8 @@
 #include <kimageeffect.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <stdlib.h>
 #include <tqcursor.h>
 #include <tqapplication.h>
diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp
index 41c7e72ea..a0e840e5a 100644
--- a/tdeui/kstdaction.cpp
+++ b/tdeui/kstdaction.cpp
@@ -22,14 +22,14 @@
 #include <tqwhatsthis.h>
 
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kstdaccel.h>
-#include <kmainwindow.h>
+#include <tdestdaccel.h>
+#include <tdemainwindow.h>
 #include "kstdaction_p.h"
 
 namespace KStdAction
diff --git a/tdeui/kstdaction_p.h b/tdeui/kstdaction_p.h
index b99421d04..a5449d8e7 100644
--- a/tdeui/kstdaction_p.h
+++ b/tdeui/kstdaction_p.h
@@ -20,7 +20,7 @@
 #define _KSTDACTION_PRIVATE_H_
 
 #include <klocale.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 
 namespace KStdAction
 {
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index 83cb0e024..84b3f2a94 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -19,11 +19,11 @@
 */
 
 #include "config.h"
-#include "kaction.h"
+#include "tdeaction.h"
 #include "kmessagebox.h"
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "ksystemtray.h"
-#include "kpopupmenu.h"
+#include "tdepopupmenu.h"
 #include "kapplication.h"
 #include "klocale.h"
 #include "kaboutdata.h"
diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp
index c78658cfc..fb0e607fa 100644
--- a/tdeui/ktextedit.cpp
+++ b/tdeui/ktextedit.cpp
@@ -27,7 +27,7 @@
 #include <tdespell.h>
 #include <kcursor.h>
 #include <kglobalsettings.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kiconloader.h>
 #include <klocale.h>
 
diff --git a/tdeui/ktimezonewidget.cpp b/tdeui/ktimezonewidget.cpp
index 94c5d65ce..c7046231f 100644
--- a/tdeui/ktimezonewidget.cpp
+++ b/tdeui/ktimezonewidget.cpp
@@ -20,7 +20,7 @@
 #include <kdialog.h>
 #include <kdebug.h>
 #include <tdefile.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <ktimezones.h>
diff --git a/tdeui/ktimezonewidget.h b/tdeui/ktimezonewidget.h
index 6d708e6f1..70d63521e 100644
--- a/tdeui/ktimezonewidget.h
+++ b/tdeui/ktimezonewidget.h
@@ -21,7 +21,7 @@
 #define KTIMEZONEWIDGET_H
 
 #include <tdelibs_export.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstring.h>
 
 class KTimezone;
diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp
index 817a54514..3eb756678 100644
--- a/tdeui/kxmlguibuilder.cpp
+++ b/tdeui/kxmlguibuilder.cpp
@@ -21,11 +21,11 @@
 #include "kapplication.h"
 #include "kxmlguibuilder.h"
 #include "kmenubar.h"
-#include "kpopupmenu.h"
-#include "ktoolbar.h"
+#include "tdepopupmenu.h"
+#include "tdetoolbar.h"
 #include "kstatusbar.h"
-#include "kmainwindow.h"
-#include "kaction.h"
+#include "tdemainwindow.h"
+#include "tdeaction.h"
 #include "kglobalsettings.h"
 #include <klocale.h>
 #include <kiconloader.h>
@@ -139,7 +139,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
   if ( element.tagName().lower() == d->tagMenu )
   {
     // Look up to see if we are inside a mainwindow. If yes, then
-    // use it as parent widget (to get kaction to plug itself into the
+    // use it as parent widget (to get tdeaction to plug itself into the
     // mainwindow). Don't use a popupmenu as parent widget, otherwise
     // the popup won't be hidden if it is used as a standalone menu as well.
     // And we don't want to set the parent for a standalone popupmenu,
diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp
index 853a9ee52..a02718f0a 100644
--- a/tdeui/kxmlguiclient.cpp
+++ b/tdeui/kxmlguiclient.cpp
@@ -31,7 +31,7 @@
 #include <kinstance.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 
 #include <assert.h>
diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp
index d7d166f78..0a2aae41d 100644
--- a/tdeui/kxmlguifactory.cpp
+++ b/tdeui/kxmlguifactory.cpp
@@ -32,11 +32,11 @@
 #include <tqdatetime.h>
 #include <tqvariant.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kinstance.h>
 #include <kglobal.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kstandarddirs.h>
 #include <kkeydialog.h>
 
diff --git a/tdeui/kxmlguifactory_p.h b/tdeui/kxmlguifactory_p.h
index 769d674c8..e0ad02ac9 100644
--- a/tdeui/kxmlguifactory_p.h
+++ b/tdeui/kxmlguifactory_p.h
@@ -24,7 +24,7 @@
 #include <tqdom.h>
 #include <tqvaluestack.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 class TQWidget;
 class KXMLGUIClient;
diff --git a/tdeui/tdeaction.cpp b/tdeui/tdeaction.cpp
index 24a940c2f..167a9a239 100644
--- a/tdeui/tdeaction.cpp
+++ b/tdeui/tdeaction.cpp
@@ -23,24 +23,24 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kaction.h"
+#include "tdeaction.h"
 
 #include <assert.h>
 
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <kaccel.h>
-#include <kaccelbase.h>
-#include <kaccelprivate.h>
+#include <tdeaccel.h>
+#include <tdeaccelbase.h>
+#include <tdeaccelprivate.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kguiitem.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmenubar.h>
-#include <kpopupmenu.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdepopupmenu.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 
 #include <ft2build.h>
 #include <X11/Xdefs.h>
@@ -88,12 +88,12 @@ class TDEAction::TDEActionPrivate : public KGuiItem
 public:
   TDEActionPrivate() : KGuiItem()
   {
-    m_kaccel = 0;
+    m_tdeaccel = 0;
     m_configurable = true;
   }
 
-  TDEAccel *m_kaccel;
-  TQValueList<TDEAccel*> m_kaccelList;
+  TDEAccel *m_tdeaccel;
+  TQValueList<TDEAccel*> m_tdeaccelList;
 
   TQString m_groupText;
   TQString m_group;
@@ -223,7 +223,7 @@ TDEAction::~TDEAction()
 {
     kdDebug(129) << "TDEAction::~TDEAction( this = \"" << name() << "\" )" << endl; // -- ellis
 #ifndef KDE_NO_COMPAT
-     if (d->m_kaccel)
+     if (d->m_tdeaccel)
        unplugAccel();
 #endif
 
@@ -231,7 +231,7 @@ TDEAction::~TDEAction()
     if ( m_parentCollection ) {
         m_parentCollection->take( this );
 
-        const TQValueList<TDEAccel*> & accelList = d->m_kaccelList;
+        const TQValueList<TDEAccel*> & accelList = d->m_tdeaccelList;
         TQValueList<TDEAccel*>::const_iterator itr = accelList.constBegin();
         const TQValueList<TDEAccel*>::const_iterator itrEnd = accelList.constEnd();
 
@@ -272,7 +272,7 @@ void TDEAction::initPrivate( const TQString& text, const TDEShortcut& cut,
 
 bool TDEAction::isPlugged() const
 {
-  return (!d->m_containers.empty()) || d->m_kaccel;
+  return (!d->m_containers.empty()) || d->m_tdeaccel;
 }
 
 bool TDEAction::isPlugged( const TQWidget *container ) const
@@ -353,7 +353,7 @@ shortcut may be set:
 
 On Construction: [via initShortcut()]
 	insert into TDEAccel of m_parentCollection,
-		if kaccel() && isAutoConnectShortcuts() exists
+		if tdeaccel() && isAutoConnectShortcuts() exists
 
 On Plug: [via plug() -> plugShortcut()]
 	insert into TDEAccel of m_parentCollection, if exists and not already inserted into
@@ -363,12 +363,12 @@ On Read XML: [via setShortcut()]
 	insert into TDEAccel of m_parentCollection, if exists and not already inserted into
 */
 
-TDEAccel* TDEAction::kaccelCurrent()
+TDEAccel* TDEAction::tdeaccelCurrent()
 {
   if( m_parentCollection && m_parentCollection->builderTDEAccel() )
     return m_parentCollection->builderTDEAccel();
-  else if( m_parentCollection && m_parentCollection->kaccel() )
-    return m_parentCollection->kaccel();
+  else if( m_parentCollection && m_parentCollection->tdeaccel() )
+    return m_parentCollection->tdeaccel();
   else
     return 0L;
 }
@@ -382,9 +382,9 @@ bool TDEAction::initShortcut( const TDEShortcut& cut )
     if( qstrcmp( name(), "unnamed" ) &&
         m_parentCollection &&
         m_parentCollection->isAutoConnectShortcuts() &&
-        m_parentCollection->kaccel() )
+        m_parentCollection->tdeaccel() )
     {
-        insertTDEAccel( m_parentCollection->kaccel() );
+        insertTDEAccel( m_parentCollection->tdeaccel() );
         return true;
     }
     return false;
@@ -393,21 +393,21 @@ bool TDEAction::initShortcut( const TDEShortcut& cut )
 // Only to be called from plug()
 void TDEAction::plugShortcut()
 {
-  TDEAccel* const kaccel = kaccelCurrent();
+  TDEAccel* const tdeaccel = tdeaccelCurrent();
 
-  //kdDebug(129) << "TDEAction::plugShortcut(): this = " << this << " kaccel() = " << (m_parentCollection ? m_parentCollection->kaccel() : 0) << endl;
-  if( kaccel && qstrcmp( name(), "unnamed" ) ) {
+  //kdDebug(129) << "TDEAction::plugShortcut(): this = " << this << " tdeaccel() = " << (m_parentCollection ? m_parentCollection->tdeaccel() : 0) << endl;
+  if( tdeaccel && qstrcmp( name(), "unnamed" ) ) {
     // Check if already plugged into current TDEAccel object
-    const TQValueList<TDEAccel*> & accelList = d->m_kaccelList;
+    const TQValueList<TDEAccel*> & accelList = d->m_tdeaccelList;
     TQValueList<TDEAccel*>::const_iterator itr = accelList.constBegin();
     const TQValueList<TDEAccel*>::const_iterator itrEnd = accelList.constEnd();
 
     for( ; itr != itrEnd; ++itr) {
-      if( (*itr) == kaccel )
+      if( (*itr) == tdeaccel )
         return;
     }
 
-    insertTDEAccel( kaccel );
+    insertTDEAccel( tdeaccel );
   }
 }
 
@@ -416,31 +416,31 @@ bool TDEAction::setShortcut( const TDEShortcut& cut )
   bool bChanged = (d->m_cut != cut);
   d->m_cut = cut;
 
-  TDEAccel* const kaccel = kaccelCurrent();
+  TDEAccel* const tdeaccel = tdeaccelCurrent();
   bool bInsertRequired = true;
   // Apply new shortcut to all existing TDEAccel objects
 
-  const TQValueList<TDEAccel*> & accelList = d->m_kaccelList;
+  const TQValueList<TDEAccel*> & accelList = d->m_tdeaccelList;
   TQValueList<TDEAccel*>::const_iterator itr = accelList.constBegin();
   const TQValueList<TDEAccel*>::const_iterator itrEnd = accelList.constEnd();
 
   for( ; itr != itrEnd; ++itr) {
     // Check whether shortcut has already been plugged into
-    //  the current kaccel object.
-    if( (*itr) == kaccel )
+    //  the current tdeaccel object.
+    if( (*itr) == tdeaccel )
       bInsertRequired = false;
     if( bChanged )
       updateTDEAccelShortcut( *itr );
   }
 
   // Only insert action into TDEAccel if it has a valid name,
-  if( kaccel && bInsertRequired && qstrcmp( name(), "unnamed" ) )
-    insertTDEAccel( kaccel );
+  if( tdeaccel && bInsertRequired && qstrcmp( name(), "unnamed" ) )
+    insertTDEAccel( tdeaccel );
 
   if( bChanged ) {
 #ifndef KDE_NO_COMPAT    // KDE 4: remove
-    if ( d->m_kaccel )
-      d->m_kaccel->setShortcut( name(), cut );
+    if ( d->m_tdeaccel )
+      d->m_tdeaccel->setShortcut( name(), cut );
 #endif    // KDE 4: remove end
       int len = containerCount();
       for( int i = 0; i < len; ++i )
@@ -449,7 +449,7 @@ bool TDEAction::setShortcut( const TDEShortcut& cut )
   return true;
 }
 
-bool TDEAction::updateTDEAccelShortcut( TDEAccel* kaccel )
+bool TDEAction::updateTDEAccelShortcut( TDEAccel* tdeaccel )
 {
   // Check if action is permitted
   if (kapp && !kapp->authorizeTDEAction(name()))
@@ -457,46 +457,46 @@ bool TDEAction::updateTDEAccelShortcut( TDEAccel* kaccel )
 
   bool b = true;
 
-  if ( !kaccel->actions().actionPtr( name() ) ) {
+  if ( !tdeaccel->actions().actionPtr( name() ) ) {
     if(!d->m_cut.isNull() ) {
       kdDebug(129) << "Inserting " << name() << ", " << d->text() << ", " << d->plainText() << endl;
-      b = kaccel->insert( name(), d->plainText(), TQString::null,
+      b = tdeaccel->insert( name(), d->plainText(), TQString::null,
           d->m_cut,
           this, TQT_SLOT(slotActivated()),
           isShortcutConfigurable(), isEnabled() );
     }
   }
   else
-    b = kaccel->setShortcut( name(), d->m_cut );
+    b = tdeaccel->setShortcut( name(), d->m_cut );
 
   return b;
 }
 
-void TDEAction::insertTDEAccel( TDEAccel* kaccel )
+void TDEAction::insertTDEAccel( TDEAccel* tdeaccel )
 {
-  //kdDebug(129) << "TDEAction::insertTDEAccel( " << kaccel << " ): this = " << this << endl;
-  if ( !kaccel->actions().actionPtr( name() ) ) {
-    if( updateTDEAccelShortcut( kaccel ) ) {
-      d->m_kaccelList.append( kaccel );
-      connect( kaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
+  //kdDebug(129) << "TDEAction::insertTDEAccel( " << tdeaccel << " ): this = " << this << endl;
+  if ( !tdeaccel->actions().actionPtr( name() ) ) {
+    if( updateTDEAccelShortcut( tdeaccel ) ) {
+      d->m_tdeaccelList.append( tdeaccel );
+      connect( tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
     }
   }
   else
-    kdWarning(129) << "TDEAction::insertTDEAccel( kaccel = " << kaccel << " ): TDEAccel object already contains an action name \"" << name() << "\"" << endl; // -- ellis
+    kdWarning(129) << "TDEAction::insertTDEAccel( tdeaccel = " << tdeaccel << " ): TDEAccel object already contains an action name \"" << name() << "\"" << endl; // -- ellis
 }
 
-void TDEAction::removeTDEAccel( TDEAccel* kaccel )
+void TDEAction::removeTDEAccel( TDEAccel* tdeaccel )
 {
   //kdDebug(129) << "TDEAction::removeTDEAccel( " << i << " ): this = " << this << endl;
-  TQValueList<TDEAccel*> & accelList = d->m_kaccelList;
+  TQValueList<TDEAccel*> & accelList = d->m_tdeaccelList;
   TQValueList<TDEAccel*>::iterator itr = accelList.begin();
   const TQValueList<TDEAccel*>::iterator itrEnd = accelList.end();
 
   for( ; itr != itrEnd; ++itr) {
-    if( (*itr) == kaccel ) {
-      kaccel->remove( name() );
+    if( (*itr) == tdeaccel ) {
+      tdeaccel->remove( name() );
       accelList.remove( itr );
-      disconnect( kaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
+      disconnect( tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
       break;
     }
   }
@@ -525,10 +525,10 @@ void TDEAction::updateShortcut( int i )
 
 void TDEAction::updateShortcut( TQPopupMenu* menu, int id )
 {
-  //kdDebug(129) << "TDEAction::updateShortcut(): this = " << this << " d->m_kaccelList.count() = " << d->m_kaccelList.count() << endl;
+  //kdDebug(129) << "TDEAction::updateShortcut(): this = " << this << " d->m_tdeaccelList.count() = " << d->m_tdeaccelList.count() << endl;
   // If the action has a TDEAccel object,
   //  show the string representation of its shortcut.
-  if ( d->m_kaccel || d->m_kaccelList.count() ) {
+  if ( d->m_tdeaccel || d->m_tdeaccelList.count() ) {
     TQString s = menu->text( id );
     int i = s.find( '\t' );
     if ( i >= 0 )
@@ -637,8 +637,8 @@ int TDEAction::plug( TQWidget *w, int index )
   // David: Well, it doesn't matter much, things still work (e.g. Undo in koffice) via TQAccel.
   // We should probably re-enable the warning for things that only TDEAccel can do, though - e.g. WIN key (mapped to Meta).
 #if 0 //ndef NDEBUG
-  TDEAccel* kaccel = kaccelCurrent();
-  if( !d->m_cut.isNull() && !kaccel ) {
+  TDEAccel* tdeaccel = tdeaccelCurrent();
+  if( !d->m_cut.isNull() && !tdeaccel ) {
     kdDebug(129) << "TDEAction::plug(): has no TDEAccel object; this = " << this << " name = " << name() << " parentCollection = " << m_parentCollection << endl; // ellis
   }
 #endif
@@ -654,7 +654,7 @@ int TDEAction::plug( TQWidget *w, int index )
     TQPopupMenu* menu = static_cast<TQPopupMenu*>( w );
     int id;
     // Don't insert shortcut into menu if it's already in a TDEAccel object.
-    int keyQt = (d->m_kaccelList.count() || d->m_kaccel) ? 0 : d->m_cut.keyCodeQt();
+    int keyQt = (d->m_tdeaccelList.count() || d->m_tdeaccel) ? 0 : d->m_cut.keyCodeQt();
 
     if ( d->hasIcon() )
     {
@@ -674,7 +674,7 @@ int TDEAction::plug( TQWidget *w, int index )
 
     // If the shortcut is already in a TDEAccel object, then
     //  we need to set the menu item's shortcut text.
-    if ( d->m_kaccelList.count() || d->m_kaccel )
+    if ( d->m_tdeaccelList.count() || d->m_tdeaccel )
         updateShortcut( menu, id );
 
     // call setItemEnabled only if the item really should be disabled,
@@ -775,7 +775,7 @@ void TDEAction::plugAccel(TDEAccel *kacc, bool configurable)
   kdWarning(129) << "TDEAction::plugAccel(): call to deprecated action." << endl;
   kdDebug(129) << kdBacktrace() << endl;
   //kdDebug(129) << "TDEAction::plugAccel( kacc = " << kacc << " ): name \"" << name() << "\"" << endl;
-  if ( d->m_kaccel )
+  if ( d->m_tdeaccel )
     unplugAccel();
 
   // If the parent collection's accel ptr isn't set yet
@@ -786,13 +786,13 @@ void TDEAction::plugAccel(TDEAccel *kacc, bool configurable)
   //  if it does not already contain an action with the same name.
   if ( !kacc->actions().actionPtr(name()) )
   {
-    d->m_kaccel = kacc;
-    d->m_kaccel->insert(name(), d->plainText(), TQString::null,
+    d->m_tdeaccel = kacc;
+    d->m_tdeaccel->insert(name(), d->plainText(), TQString::null,
         TDEShortcut(d->m_cut),
         this, TQT_SLOT(slotActivated()),
         configurable, isEnabled());
-    connect(d->m_kaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()));
-    //connect(d->m_kaccel, TQT_SIGNAL(keycodeChanged()), this, TQT_SLOT(slotKeycodeChanged()));
+    connect(d->m_tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()));
+    //connect(d->m_tdeaccel, TQT_SIGNAL(keycodeChanged()), this, TQT_SLOT(slotKeycodeChanged()));
   }
   else
     kdWarning(129) << "TDEAction::plugAccel( kacc = " << kacc << " ): TDEAccel object already contains an action name \"" << name() << "\"" << endl; // -- ellis
@@ -801,10 +801,10 @@ void TDEAction::plugAccel(TDEAccel *kacc, bool configurable)
 void TDEAction::unplugAccel()
 {
   //kdDebug(129) << "TDEAction::unplugAccel() " << this << " " << name() << endl;
-  if ( d->m_kaccel )
+  if ( d->m_tdeaccel )
   {
-    d->m_kaccel->remove(name());
-    d->m_kaccel = 0;
+    d->m_tdeaccel->remove(name());
+    d->m_tdeaccel = 0;
   }
 }
 
@@ -816,7 +816,7 @@ void TDEAction::plugMainWindowAccel( TQWidget *w )
   while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store
     tl = n;
 
-  TDEMainWindow * mw = tqt_dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a kmainwindow
+  TDEMainWindow * mw = tqt_dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a tdemainwindow
   if (mw)
     plugAccel( mw->accel() );
   else
@@ -825,17 +825,17 @@ void TDEAction::plugMainWindowAccel( TQWidget *w )
 
 void TDEAction::setEnabled(bool enable)
 {
-  //kdDebug(129) << "TDEAction::setEnabled( " << enable << " ): this = " << this << " d->m_kaccelList.count() = " << d->m_kaccelList.count() << endl;
+  //kdDebug(129) << "TDEAction::setEnabled( " << enable << " ): this = " << this << " d->m_tdeaccelList.count() = " << d->m_tdeaccelList.count() << endl;
   if ( enable == d->isEnabled() )
     return;
 
 #ifndef KDE_NO_COMPAT
   // KDE 4: remove
-  if (d->m_kaccel)
-    d->m_kaccel->setEnabled(name(), enable);
+  if (d->m_tdeaccel)
+    d->m_tdeaccel->setEnabled(name(), enable);
 #endif  // KDE 4: remove end
 
-  const TQValueList<TDEAccel*> & accelList = d->m_kaccelList;
+  const TQValueList<TDEAccel*> & accelList = d->m_tdeaccelList;
   TQValueList<TDEAccel*>::const_iterator itr = accelList.constBegin();
   const TQValueList<TDEAccel*>::const_iterator itrEnd = accelList.constEnd();
 
@@ -874,13 +874,13 @@ void TDEAction::setText( const TQString& text )
 {
 #ifndef KDE_NO_COMPAT
   // KDE 4: remove
-  if (d->m_kaccel) {
-    TDEAccelAction* pAction = d->m_kaccel->actions().actionPtr(name());
+  if (d->m_tdeaccel) {
+    TDEAccelAction* pAction = d->m_tdeaccel->actions().actionPtr(name());
     if (pAction)
       pAction->setLabel( text );
   }
 #endif  // KDE 4: remove end
-  const TQValueList<TDEAccel*> & accelList = d->m_kaccelList;
+  const TQValueList<TDEAccel*> & accelList = d->m_tdeaccelList;
   TQValueList<TDEAccel*>::const_iterator itr = accelList.constBegin();
   const TQValueList<TDEAccel*>::const_iterator itrEnd = accelList.constEnd();
 
@@ -1074,9 +1074,9 @@ int TDEAction::containerCount() const
   return d->m_containers.count();
 }
 
-uint TDEAction::kaccelCount() const
+uint TDEAction::tdeaccelCount() const
 {
-  return d->m_kaccelList.count();
+  return d->m_tdeaccelList.count();
 }
 
 void TDEAction::addContainer( TQWidget* c, int id )
@@ -1164,13 +1164,13 @@ void TDEAction::slotDestroyed()
   const TQObject* const o = TQT_TQOBJECT_CONST(sender());
 
 #ifndef KDE_NO_COMPAT  // KDE 4: remove
-  if ( o == d->m_kaccel )
+  if ( o == d->m_tdeaccel )
   {
-    d->m_kaccel = 0;
+    d->m_tdeaccel = 0;
     return;
   }
 #endif  // KDE 4: remove end
-  TQValueList<TDEAccel*> & accelList = d->m_kaccelList;
+  TQValueList<TDEAccel*> & accelList = d->m_tdeaccelList;
   TQValueList<TDEAccel*>::iterator itr = accelList.begin();
   const TQValueList<TDEAccel*>::iterator itrEnd = accelList.end();
 
@@ -1258,7 +1258,7 @@ void TDEAction::removeContainer( int index )
 void TDEAction::slotKeycodeChanged()
 {
   kdDebug(129) << "TDEAction::slotKeycodeChanged()" << endl; // -- ellis
-  TDEAccelAction* pAction = d->m_kaccel->actions().actionPtr(name());
+  TDEAccelAction* pAction = d->m_tdeaccel->actions().actionPtr(name());
   if( pAction )
     setShortcut(pAction->shortcut());
 }
@@ -1285,4 +1285,4 @@ void TDEAction::virtual_hook( int, void* )
 /* vim: et sw=2 ts=2
  */
 
-#include "kaction.moc"
+#include "tdeaction.moc"
diff --git a/tdeui/tdeaction.h b/tdeui/tdeaction.h
index b68ded272..e8adcfff1 100644
--- a/tdeui/tdeaction.h
+++ b/tdeui/tdeaction.h
@@ -23,15 +23,15 @@
 */
 //$Id$
 
-#ifndef __kaction_h__
-#define __kaction_h__
+#ifndef __tdeaction_h__
+#define __tdeaction_h__
 
 #include <tqkeysequence.h>
 #include <tqobject.h>
 #include <tqvaluelist.h>
 #include <tqguardedptr.h>
 #include <kguiitem.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kstdaction.h>
 #include <kicontheme.h>
 
@@ -414,7 +414,7 @@ public:
     TQWidget* representative( int index ) const;
     int containerCount() const;
     /// @since 3.1
-    uint kaccelCount() const;
+    uint tdeaccelCount() const;
 
     virtual bool hasIcon() const;
 #ifndef KDE_NO_COMPAT
@@ -626,10 +626,10 @@ signals:
 private:
     void initPrivate( const TQString& text, const TDEShortcut& cut,
                   const TQObject* receiver, const char* slot );
-    TDEAccel* kaccelCurrent();
+    TDEAccel* tdeaccelCurrent();
     bool initShortcut( const TDEShortcut& );
     void plugShortcut();
-    bool updateTDEAccelShortcut( TDEAccel* kaccel );
+    bool updateTDEAccelShortcut( TDEAccel* tdeaccel );
     void insertTDEAccel( TDEAccel* );
     /** @internal To be used exclusively by TDEActionCollection::removeWidget(). */
     void removeTDEAccel( TDEAccel* );
@@ -670,7 +670,7 @@ private:
     TDEActionPrivate* const d;
 };
 
-#include <kactioncollection.h>
-#include <kactionclasses.h>
+#include <tdeactioncollection.h>
+#include <tdeactionclasses.h>
 
 #endif
diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp
index 87c9932a3..ccf0d278b 100644
--- a/tdeui/tdeactionclasses.cpp
+++ b/tdeui/tdeactionclasses.cpp
@@ -24,7 +24,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kactionclasses.h"
+#include "tdeactionclasses.h"
 
 #include <assert.h>
 #include <ft2build.h>
@@ -41,18 +41,18 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfontcombo.h>
-#include <kfontdialog.h>
+#include <tdefontcombo.h>
+#include <tdefontdialog.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmenubar.h>
-#include <kpopupmenu.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdepopupmenu.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
@@ -2027,7 +2027,7 @@ int TDEToggleToolBarAction::plug( TQWidget* w, int index )
     while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store
       tl = n;
 
-    TDEMainWindow * mw = tqt_dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a kmainwindow
+    TDEMainWindow * mw = tqt_dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a tdemainwindow
 
     if ( mw )
         m_toolBar = mw->toolBar( m_toolBarName );
@@ -2418,4 +2418,4 @@ void TDEPasteTextAction::virtual_hook( int id, void* data )
 /* vim: et sw=2 ts=2
  */
 
-#include "kactionclasses.moc"
+#include "tdeactionclasses.moc"
diff --git a/tdeui/tdeactionclasses.h b/tdeui/tdeactionclasses.h
index 07078a722..86594f179 100644
--- a/tdeui/tdeactionclasses.h
+++ b/tdeui/tdeactionclasses.h
@@ -24,17 +24,17 @@
 */
 //$Id$
 
-#ifndef __kactionclasses_h__
-#define __kactionclasses_h__
+#ifndef __tdeactionclasses_h__
+#define __tdeactionclasses_h__
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqkeysequence.h>
 #include <tqobject.h>
 #include <tqvaluelist.h>
 #include <tqguardedptr.h>
 #include <kguiitem.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kstdaction.h>
 #include <kicontheme.h>
 
diff --git a/tdeui/tdeactioncollection.cpp b/tdeui/tdeactioncollection.cpp
index 74f273994..9181fca89 100644
--- a/tdeui/tdeactioncollection.cpp
+++ b/tdeui/tdeactioncollection.cpp
@@ -23,14 +23,14 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kactioncollection.h"
-#include "kactionshortcutlist.h"
-#include "ktoolbar.h"
+#include "tdeactioncollection.h"
+#include "tdeactionshortcutlist.h"
+#include "tdetoolbar.h"
 #include "kxmlguifactory.h"
 #include "kxmlguiclient.h"
 
-#include <kaccel.h>
-#include <kaccelbase.h>
+#include <tdeaccel.h>
+#include <tdeaccelbase.h>
 #include <kapplication.h>
 #include <kdebug.h>
 
@@ -48,7 +48,7 @@ public:
     //m_iWidgetCurrent = 0;
     m_bAutoConnectShortcuts = true;
     m_widget = 0;
-    m_kaccel = m_builderTDEAccel = 0;
+    m_tdeaccel = m_builderTDEAccel = 0;
     m_dctHighlightContainers.setAutoDelete( true );
     m_highlight = false;
     m_currentHighlightAction = 0;
@@ -62,10 +62,10 @@ public:
   //bool m_bOneTDEAccelOnly;
   //int m_iWidgetCurrent;
   //TQValueList<TQWidget*> m_widgetList;
-  //TQValueList<TDEAccel*> m_kaccelList;
+  //TQValueList<TDEAccel*> m_tdeaccelList;
   TQValueList<TDEActionCollection*> m_docList;
   TQWidget *m_widget;
-  TDEAccel *m_kaccel;
+  TDEAccel *m_tdeaccel;
   TDEAccel *m_builderTDEAccel;
 
   TQAsciiDict<TDEAction> m_actionDict;
@@ -84,7 +84,7 @@ TDEActionCollection::TDEActionCollection( TQWidget *parent, const char *name,
   d = new TDEActionCollectionPrivate;
   if( parent )
     setWidget( parent );
-  //d->m_bOneTDEAccelOnly = (d->m_kaccelList.count() > 0);
+  //d->m_bOneTDEAccelOnly = (d->m_tdeaccelList.count() > 0);
   setInstance( instance );
 }
 
@@ -97,7 +97,7 @@ TDEActionCollection::TDEActionCollection( TQWidget *watch, TQObject* parent, con
   d = new TDEActionCollectionPrivate;
   if( watch )
     setWidget( watch );
-  //d->m_bOneTDEAccelOnly = (d->m_kaccelList.count() > 0);
+  //d->m_bOneTDEAccelOnly = (d->m_tdeaccelList.count() > 0);
   setInstance( instance );
 }
 
@@ -113,7 +113,7 @@ TDEActionCollection::TDEActionCollection( TQObject *parent, const char *name,
   TQWidget* w = tqt_dynamic_cast<TQWidget*>( parent );
   if( w )
     setWidget( w );
-  //d->m_bOneTDEAccelOnly = (d->m_kaccelList.count() > 0);
+  //d->m_bOneTDEAccelOnly = (d->m_tdeaccelList.count() > 0);
   setInstance( instance );
 }
 
@@ -144,7 +144,7 @@ TDEActionCollection::~TDEActionCollection()
       pAction->m_parentCollection = 0L;
   }
 
-  delete d->m_kaccel;
+  delete d->m_tdeaccel;
   delete d->m_builderTDEAccel;
   delete d; d = 0;
 }
@@ -158,7 +158,7 @@ void TDEActionCollection::setWidget( TQWidget* w )
   //else
   if ( !d->m_widget ) {
     d->m_widget = w;
-    d->m_kaccel = new TDEAccel( w, this, "TDEActionCollection-TDEAccel" );
+    d->m_tdeaccel = new TDEAccel( w, this, "TDEActionCollection-TDEAccel" );
   }
   else if ( d->m_widget != w )
     kdWarning(129) << "TDEActionCollection::setWidget(): tried to change widget from " << d->m_widget << " to " << w << endl;
@@ -192,13 +192,13 @@ void TDEActionCollection::beginXMLPlug( TQWidget *widget )
 void TDEActionCollection::endXMLPlug()
 {
 	kdDebug(129) << "TDEActionCollection::endXMLPlug(): this = " <<  this << endl;
-	//s_kaccelXML = 0;
+	//s_tdeaccelXML = 0;
 }
 
 void TDEActionCollection::prepareXMLUnplug()
 {
 	kdDebug(129) << "TDEActionCollection::prepareXMLUnplug(): this = " <<  this << endl;
-	unplugShortcuts( d->m_kaccel );
+	unplugShortcuts( d->m_tdeaccel );
 
 	if( d->m_builderTDEAccel ) {
 		unplugShortcuts( d->m_builderTDEAccel );
@@ -207,15 +207,15 @@ void TDEActionCollection::prepareXMLUnplug()
 	}
 }
 
-void TDEActionCollection::unplugShortcuts( TDEAccel* kaccel )
+void TDEActionCollection::unplugShortcuts( TDEAccel* tdeaccel )
 {
   for ( TQAsciiDictIterator<TDEAction> it( d->m_actionDict ); it.current(); ++it ) {
     TDEAction* pAction = it.current();
-    pAction->removeTDEAccel( kaccel );
+    pAction->removeTDEAccel( tdeaccel );
   }
 
   for( uint i = 0; i < d->m_docList.count(); i++ )
-    d->m_docList[i]->unplugShortcuts( kaccel );
+    d->m_docList[i]->unplugShortcuts( tdeaccel );
 }
 
 /*void TDEActionCollection::addWidget( TQWidget* w )
@@ -230,7 +230,7 @@ void TDEActionCollection::unplugShortcuts( TDEAccel* kaccel )
   }
     d->m_iWidgetCurrent = d->m_widgetList.count();
     d->m_widgetList.append( w );
-    d->m_kaccelList.append( new TDEAccel( w, this, "TDEActionCollection-TDEAccel" ) );
+    d->m_tdeaccelList.append( new TDEAccel( w, this, "TDEActionCollection-TDEAccel" ) );
   }
 }
 
@@ -241,7 +241,7 @@ void TDEActionCollection::removeWidget( TQWidget* w )
     for( uint i = 0; i < d->m_widgetList.count(); i++ ) {
       if( d->m_widgetList[i] == w ) {
         // Remove TDEAccel object from children.
-        TDEAccel* pTDEAccel = d->m_kaccelList[i];
+        TDEAccel* pTDEAccel = d->m_tdeaccelList[i];
         for ( TQAsciiDictIterator<TDEAction> it( d->m_actionDict ); it.current(); ++it ) {
           TDEAction* pAction = it.current();
           if ( pAction->m_parentCollection == this ) {
@@ -251,7 +251,7 @@ void TDEActionCollection::removeWidget( TQWidget* w )
         delete pTDEAccel;
 
         d->m_widgetList.remove( d->m_widgetList.at( i ) );
-        d->m_kaccelList.remove( d->m_kaccelList.at( i ) );
+        d->m_tdeaccelList.remove( d->m_tdeaccelList.at( i ) );
 
         if( d->m_iWidgetCurrent == (int)i )
           d->m_iWidgetCurrent = -1;
@@ -276,25 +276,25 @@ uint TDEActionCollection::widgetCount() const
 
 const TDEAccel* TDEActionCollection::widgetTDEAccel( uint i ) const
 {
-  return d->m_kaccelList[i];
+  return d->m_tdeaccelList[i];
 }*/
 
-TDEAccel* TDEActionCollection::kaccel()
+TDEAccel* TDEActionCollection::tdeaccel()
 {
-  //if( d->m_kaccelList.count() > 0 )
-  //  return d->m_kaccelList[d->m_iWidgetCurrent];
+  //if( d->m_tdeaccelList.count() > 0 )
+  //  return d->m_tdeaccelList[d->m_iWidgetCurrent];
   //else
   //  return 0;
-  return d->m_kaccel;
+  return d->m_tdeaccel;
 }
 
-const TDEAccel* TDEActionCollection::kaccel() const
+const TDEAccel* TDEActionCollection::tdeaccel() const
 {
-  //if( d->m_kaccelList.count() > 0 )
-  //  return d->m_kaccelList[d->m_iWidgetCurrent];
+  //if( d->m_tdeaccelList.count() > 0 )
+  //  return d->m_tdeaccelList[d->m_iWidgetCurrent];
   //else
   //  return 0;
-  return d->m_kaccel;
+  return d->m_tdeaccel;
 }
 
 // Return the key to use in d->m_actionDict for the given action.
@@ -334,7 +334,7 @@ void TDEActionCollection::_remove( TDEAction* action )
 
   emit removed( action );
   // note that we delete the action without its parent collection set to 0.
-  // This triggers kaccel::remove, to remove any shortcut.
+  // This triggers tdeaccel::remove, to remove any shortcut.
   delete a;
 }
 
@@ -366,8 +366,8 @@ void TDEActionCollection::insert( TDEAction* action )   { _insert( action ); }
 void TDEActionCollection::remove( TDEAction* action )   { _remove( action ); }
 TDEAction* TDEActionCollection::take( TDEAction* action ) { return _take( action ); }
 void TDEActionCollection::clear()                     { _clear(); }
-TDEAccel* TDEActionCollection::accel()                  { return kaccel(); }
-const TDEAccel* TDEActionCollection::accel() const      { return kaccel(); }
+TDEAccel* TDEActionCollection::accel()                  { return tdeaccel(); }
+const TDEAccel* TDEActionCollection::accel() const      { return tdeaccel(); }
 TDEAccel* TDEActionCollection::builderTDEAccel() const    { return d->m_builderTDEAccel; }
 
 TDEAction* TDEActionCollection::action( const char* name, const char* classname ) const
@@ -651,9 +651,9 @@ TDEActionCollection &TDEActionCollection::operator=( const TDEActionCollection &
   //d->m_bOneTDEAccelOnly = copy.d->m_bOneTDEAccelOnly;
   //d->m_iWidgetCurrent = copy.d->m_iWidgetCurrent;
   //d->m_widgetList = copy.d->m_widgetList;
-  //d->m_kaccelList = copy.d->m_kaccelList;
+  //d->m_tdeaccelList = copy.d->m_tdeaccelList;
   d->m_widget = copy.d->m_widget;
-  d->m_kaccel = copy.d->m_kaccel;
+  d->m_tdeaccel = copy.d->m_tdeaccel;
   d->m_actionDict = copy.d->m_actionDict;
   setInstance( copy.instance() );
   return *this;
@@ -799,4 +799,4 @@ void TDEActionCollection::virtual_hook( int, void* )
 /* vim: et sw=2 ts=2
  */
 
-#include "kactioncollection.moc"
+#include "tdeactioncollection.moc"
diff --git a/tdeui/tdeactioncollection.h b/tdeui/tdeactioncollection.h
index 9ef517579..ae6fd6575 100644
--- a/tdeui/tdeactioncollection.h
+++ b/tdeui/tdeactioncollection.h
@@ -22,17 +22,17 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kactioncollection_h__
-#define __kactioncollection_h__
+#ifndef __tdeactioncollection_h__
+#define __tdeactioncollection_h__
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqkeysequence.h>
 #include <tqobject.h>
 #include <tqvaluelist.h>
 #include <tqguardedptr.h>
 #include <kguiitem.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kstdaction.h>
 #include <kicontheme.h>
 
@@ -142,17 +142,17 @@ public:
    */
   //bool ownsTDEAccel() const;
 
-  /** @deprecated  Deprecated because of ambiguous name.  Use kaccel() */
+  /** @deprecated  Deprecated because of ambiguous name.  Use tdeaccel() */
   virtual TDEAccel* accel() KDE_DEPRECATED;
-  /** @deprecated  Deprecated because of ambiguous name.  Use kaccel() */
+  /** @deprecated  Deprecated because of ambiguous name.  Use tdeaccel() */
   virtual const TDEAccel* accel() const KDE_DEPRECATED;
 
   /** Returns the TDEAccel object of the most recently set widget. */
-  TDEAccel* kaccel();
+  TDEAccel* tdeaccel();
   /** Returns the TDEAccel object of the most recently set widget. Const version for convenience. */
-  const TDEAccel* kaccel() const;
+  const TDEAccel* tdeaccel() const;
 
-  /** @internal, for TDEAction::kaccelCurrent() */
+  /** @internal, for TDEAction::tdeaccelCurrent() */
   TDEAccel* builderTDEAccel() const;
   /** Returns the TDEAccel object associated with widget #. */
   //TDEAccel* widgetTDEAccel( uint i );
@@ -317,7 +317,7 @@ private:
   void endXMLPlug();
   /** @internal.  Only to be called by KXMLGUIFactory::removeClient() */
   void prepareXMLUnplug();
-  void unplugShortcuts( TDEAccel* kaccel );
+  void unplugShortcuts( TDEAccel* tdeaccel );
 
   void _clear();
   void _insert( TDEAction* );
diff --git a/tdeui/tdeactionselector.cpp b/tdeui/tdeactionselector.cpp
index e913f01f6..ac1974c77 100644
--- a/tdeui/tdeactionselector.cpp
+++ b/tdeui/tdeactionselector.cpp
@@ -17,7 +17,7 @@
 */
 
 
-#include "kactionselector.h"
+#include "tdeactionselector.h"
 
 #include <klocale.h>
 #include <kiconloader.h>
@@ -537,4 +537,4 @@ int TDEActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy )
 }
 
 //END Private Methods
-#include "kactionselector.moc"
+#include "tdeactionselector.moc"
diff --git a/tdeui/tdeactionshortcutlist.h b/tdeui/tdeactionshortcutlist.h
index ac8ac020d..affb6bf2a 100644
--- a/tdeui/tdeactionshortcutlist.h
+++ b/tdeui/tdeactionshortcutlist.h
@@ -1,8 +1,8 @@
 #ifndef _KACTIONSHORTCUTLIST_H
 #define _KACTIONSHORTCUTLIST_H
 
-#include <kshortcutlist.h>
-#include <kaction.h>
+#include <tdeshortcutlist.h>
+#include <tdeaction.h>
 
 //---------------------------------------------------------------------
 // class TDEActionShortcutList
diff --git a/tdeui/tdefontcombo.cpp b/tdeui/tdefontcombo.cpp
index 8ce088f8b..fc9ae830b 100644
--- a/tdeui/tdefontcombo.cpp
+++ b/tdeui/tdefontcombo.cpp
@@ -25,10 +25,10 @@
 #include <kcharsets.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 
-#include "kfontcombo.h"
-#include "kfontcombo.moc"
+#include "tdefontcombo.h"
+#include "tdefontcombo.moc"
 
 #include <ft2build.h>
 #include <fontconfig/fontconfig.h>
diff --git a/tdeui/tdefontdialog.cpp b/tdeui/tdefontdialog.cpp
index 107755e7f..2a8398419 100644
--- a/tdeui/tdefontdialog.cpp
+++ b/tdeui/tdefontdialog.cpp
@@ -48,13 +48,13 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <tqlineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <knuminput.h>
 
-#include "kfontdialog.moc"
+#include "tdefontdialog.moc"
 
 static int minimumListWidth( const TQListBox *list )
 {
diff --git a/tdeui/tdefontdialog.h b/tdeui/tdefontdialog.h
index cce427eba..02ffcbcd4 100644
--- a/tdeui/tdefontdialog.h
+++ b/tdeui/tdefontdialog.h
@@ -46,7 +46,7 @@ class KIntNumInput;
  * it is preferable to use the convenience functions in
  * TDEFontDialog.
  *
- * \image html kfontchooser.png "KDE Font Chooser"
+ * \image html tdefontchooser.png "KDE Font Chooser"
  *
  * @author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org>
  * @version $Id$
@@ -331,7 +331,7 @@ private:
  *            ...
  * \endcode
  *
- * \image html kfontdialog.png "KDE Font Dialog"
+ * \image html tdefontdialog.png "KDE Font Dialog"
  *
  * @author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org>
  * @version $Id$
diff --git a/tdeui/tdefontrequester.cpp b/tdeui/tdefontrequester.cpp
index 8ae0d705d..64eba5701 100644
--- a/tdeui/tdefontrequester.cpp
+++ b/tdeui/tdefontrequester.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kfontrequester.h"
+#include "tdefontrequester.h"
 
 #include <tqlabel.h>
 #include <tqpushbutton.h>
@@ -25,7 +25,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <klocale.h>
 
 TDEFontRequester::TDEFontRequester( TQWidget *parent, const char *name,
@@ -121,7 +121,7 @@ void TDEFontRequester::setToolTip()
   }
 }
 
-#include "kfontrequester.moc"
+#include "tdefontrequester.moc"
 
 /* vim: et sw=2 ts=2
 */
diff --git a/tdeui/tdefontrequester.h b/tdeui/tdefontrequester.h
index b686cf178..7117585ef 100644
--- a/tdeui/tdefontrequester.h
+++ b/tdeui/tdefontrequester.h
@@ -36,7 +36,7 @@ class TQPushButton;
  * The lineedit provides a preview of the selected font. The preview text can
  * be customized. You can also have the font dialog show only the fixed fonts.
  *
- * \image html kfontrequester.png "KDE Font Requester"
+ * \image html tdefontrequester.png "KDE Font Requester"
  *
  * @author Nadeem Hasan <nhasan@kde.org>
  *
diff --git a/tdeui/tdelistbox.cpp b/tdeui/tdelistbox.cpp
index bc31f020d..02ecf2fd1 100644
--- a/tdeui/tdelistbox.cpp
+++ b/tdeui/tdelistbox.cpp
@@ -25,7 +25,7 @@
 #include <kipc.h> 
 #include <kdebug.h>
 
-#include "klistbox.h"
+#include "tdelistbox.h"
 
 TDEListBox::TDEListBox( TQWidget *parent, const char *name, WFlags f )
     : TQListBox( parent, name, f ), d(0)
@@ -263,4 +263,4 @@ void TDEListBox::slotMouseButtonClicked( int btn, TQListBoxItem *item, const TQP
 void TDEListBox::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "klistbox.moc"
+#include "tdelistbox.moc"
diff --git a/tdeui/tdelistview.cpp b/tdeui/tdelistview.cpp
index b3eb2222c..158eac5ab 100644
--- a/tdeui/tdelistview.cpp
+++ b/tdeui/tdelistview.cpp
@@ -34,8 +34,8 @@
 #include <kipc.h>
 #include <kdebug.h>
 
-#include "klistview.h"
-#include "klistviewlineedit.h"
+#include "tdelistview.h"
+#include "tdelistviewlineedit.h"
 
 class TDEListView::Tooltip : public TQToolTip
 {
@@ -2405,7 +2405,7 @@ void TDEListView::selectAll( bool select )
 void TDEListView::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "klistview.moc"
-#include "klistviewlineedit.moc"
+#include "tdelistview.moc"
+#include "tdelistviewlineedit.moc"
 
 // vim: noet
diff --git a/tdeui/tdelistviewlineedit.h b/tdeui/tdelistviewlineedit.h
index d0019698e..0c19e90f5 100644
--- a/tdeui/tdelistviewlineedit.h
+++ b/tdeui/tdelistviewlineedit.h
@@ -19,7 +19,7 @@
 #define KLISTVIEWLINEEDIT_H
 
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 /**
  * the editor for a TDEListView.  please don't use this.
diff --git a/tdeui/tdelistviewsearchline.cpp b/tdeui/tdelistviewsearchline.cpp
index 96bf82370..20d78add2 100644
--- a/tdeui/tdelistviewsearchline.cpp
+++ b/tdeui/tdelistviewsearchline.cpp
@@ -16,12 +16,12 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "klistviewsearchline.h"
+#include "tdelistviewsearchline.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 
@@ -498,4 +498,4 @@ void TDEListViewSearchLineWidget::positionInToolBar()
         d->searchLine->show();
 }
 
-#include "klistviewsearchline.moc"
+#include "tdelistviewsearchline.moc"
diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp
index 743c273cc..b7596c262 100644
--- a/tdeui/tdemainwindow.cpp
+++ b/tdeui/tdemainwindow.cpp
@@ -23,9 +23,9 @@
  */
 #include "config.h"
 
-#include "kmainwindow.h"
-#include "kmainwindowiface.h"
-#include "ktoolbarhandler.h"
+#include "tdemainwindow.h"
+#include "tdemainwindowiface.h"
+#include "tdetoolbarhandler.h"
 #include "kwhatsthismanager_p.h"
 #include <tqsessionmanager.h>
 #include <tqobjectlist.h>
@@ -34,8 +34,8 @@
 #include <tqwidgetlist.h>
 #include <tqtimer.h>
 
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -44,7 +44,7 @@
 #include <kstatusbar.h>
 #include <twin.h>
 #include <kedittoolbar.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include <klocale.h>
 #include <kstandarddirs.h>
@@ -67,7 +67,7 @@ public:
     bool care_about_geometry:1;
     bool shuttingDown:1;
     TQString autoSaveGroup;
-    TDEAccel * kaccel;
+    TDEAccel * tdeaccel;
     TDEMainWindowInterface *m_interface;
     KDEPrivate::ToolBarHandler *toolBarHandler;
     TQTimer* settingsTimer;
@@ -238,7 +238,7 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags)
     d->settingsDirty = false;
     d->autoSaveSettings = false;
     d->autoSaveWindowSize = true; // for compatibility
-    d->kaccel = actionCollection()->kaccel();
+    d->tdeaccel = actionCollection()->tdeaccel();
     d->toolBarHandler = 0;
     d->settingsTimer = 0;
     d->showStatusBarAction = NULL;
@@ -1170,9 +1170,9 @@ TQPtrListIterator<TDEToolBar> TDEMainWindow::toolBarIterator()
 
 TDEAccel * TDEMainWindow::accel()
 {
-    if ( !d->kaccel )
-        d->kaccel = new TDEAccel( this, "kmw-kaccel" );
-    return d->kaccel;
+    if ( !d->tdeaccel )
+        d->tdeaccel = new TDEAccel( this, "kmw-tdeaccel" );
+    return d->tdeaccel;
 }
 
 void TDEMainWindow::paintEvent( TQPaintEvent * pe )
@@ -1245,5 +1245,5 @@ void TDEMainWindow::virtual_hook( int id, void* data )
 
 
 
-#include "kmainwindow.moc"
+#include "tdemainwindow.moc"
 
diff --git a/tdeui/tdemainwindow.h b/tdeui/tdemainwindow.h
index 9ad7dedc6..d5343f574 100644
--- a/tdeui/tdemainwindow.h
+++ b/tdeui/tdemainwindow.h
@@ -26,7 +26,7 @@
 #include "kxmlguibuilder.h"
 #include <tqmainwindow.h>
 #include <tqmetaobject.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 class TDEPopupMenu;
 class KXMLGUIFactory;
@@ -379,7 +379,7 @@ public:
      *
      * If there is no status bar yet, one will be created.
      *
-     * Note that tooltips for kactions in actionCollection() are not
+     * Note that tooltips for tdeactions in actionCollection() are not
      * automatically connected to this statusBar.
      * See the TDEActionCollection documentation for more details.
      *
@@ -541,7 +541,7 @@ public:
      * know when that status (hidden/shown) of the statusbar has changed.
      * For example:
      * connect(action, TQT_SIGNAL(activated()),
-     *         kmainwindow, TQT_SLOT(setSettingsDirty()));
+     *         tdemainwindow, TQT_SLOT(setSettingsDirty()));
      * Otherwise the status (hidden/show) of the statusbar might not be saved
      * by TDEMainWindow.
      * @since 3.2
diff --git a/tdeui/tdemainwindowiface.cpp b/tdeui/tdemainwindowiface.cpp
index ec8ee3630..fc864d9fa 100644
--- a/tdeui/tdemainwindowiface.cpp
+++ b/tdeui/tdemainwindowiface.cpp
@@ -17,14 +17,14 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kmainwindowiface.h"
+#include "tdemainwindowiface.h"
 
 #include <dcopclient.h>
 #include <kapplication.h>
 #include <kdcopactionproxy.h>
 #include <kdcoppropertyproxy.h>
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 #include <tqclipboard.h>
 
 
diff --git a/tdeui/tdemainwindowiface.h b/tdeui/tdemainwindowiface.h
index 9ba1c4da9..f469096ef 100644
--- a/tdeui/tdemainwindowiface.h
+++ b/tdeui/tdemainwindowiface.h
@@ -109,7 +109,7 @@ k_dcop:
 	Returns a dcop reference to the selected TDEAction
 	@param name The name of the action.  The names of valid
 	actions can be found by calling actions().
-	@return A DCOPRef for the kaction.
+	@return A DCOPRef for the tdeaction.
 	**/
 	DCOPRef action( const TQCString &name );
 
diff --git a/tdeui/tdepopupmenu.cpp b/tdeui/tdepopupmenu.cpp
index 5547d9316..62ac6f4ad 100644
--- a/tdeui/tdepopupmenu.cpp
+++ b/tdeui/tdepopupmenu.cpp
@@ -27,7 +27,7 @@
 
 #include <tqstyle.h>
 
-#include "kpopupmenu.h"
+#include "tdepopupmenu.h"
 
 #include <kdebug.h>
 #include <kapplication.h>
@@ -691,4 +691,4 @@ void TDEPopupTitle::virtual_hook( int, void* )
 void TDEPopupMenu::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kpopupmenu.moc"
+#include "tdepopupmenu.moc"
diff --git a/tdeui/tdeselect.cpp b/tdeui/tdeselect.cpp
index 19214ede3..272f7a144 100644
--- a/tdeui/tdeselect.cpp
+++ b/tdeui/tdeselect.cpp
@@ -22,7 +22,7 @@
 #include <tqdrawutil.h>
 #include <tqstyle.h>
 #include <kimageeffect.h>
-#include "kselect.h"
+#include "tdeselect.h"
 
 #define STORE_W 8
 #define STORE_W2 STORE_W * 2
@@ -530,5 +530,5 @@ void TDESelector::virtual_hook( int, void* )
 void KGradientSelector::virtual_hook( int id, void* data )
 { TDESelector::virtual_hook( id, data ); }
 
-#include "kselect.moc"
+#include "tdeselect.moc"
 
diff --git a/tdeui/tdeshortcutdialog.cpp b/tdeui/tdeshortcutdialog.cpp
index 14cdd9190..73f06581f 100644
--- a/tdeui/tdeshortcutdialog.cpp
+++ b/tdeui/tdeshortcutdialog.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kshortcutdialog.h"
+#include "tdeshortcutdialog.h"
 
 #include <tqvariant.h>
 
@@ -41,8 +41,8 @@
 # include <kkeyserver.h>
 #endif
 
-#include <kshortcutdialog_simple.h>
-#include <kshortcutdialog_advanced.h>
+#include <tdeshortcutdialog_simple.h>
+#include <tdeshortcutdialog_advanced.h>
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
@@ -526,4 +526,4 @@ void TDEShortcutDialog::keyPressed( KKey key )
 		TQTimer::singleShot(500, this, TQT_SLOT(accept()));
 }
 
-#include "kshortcutdialog.moc"
+#include "tdeshortcutdialog.moc"
diff --git a/tdeui/tdeshortcutdialog.h b/tdeui/tdeshortcutdialog.h
index 59a4bb565..f989e0191 100644
--- a/tdeui/tdeshortcutdialog.h
+++ b/tdeui/tdeshortcutdialog.h
@@ -21,7 +21,7 @@
 #define _KSHORTCUTDIALOG_H_
 
 #include "kdialogbase.h"
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 
 class TQVBox;
 class KPushButton;
diff --git a/tdeui/tdeshortcutdialog_advanced.ui b/tdeui/tdeshortcutdialog_advanced.ui
index 77c7fae14..b1cc70460 100644
--- a/tdeui/tdeshortcutdialog_advanced.ui
+++ b/tdeui/tdeshortcutdialog_advanced.ui
@@ -238,7 +238,7 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">kshortcut.h</include>
+    <include location="global" impldecl="in declaration">tdeshortcut.h</include>
     <include location="global" impldecl="in declaration">kdialog.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
diff --git a/tdeui/tdeshortcutdialog_simple.ui b/tdeui/tdeshortcutdialog_simple.ui
index e271e2bd6..c21b6f940 100644
--- a/tdeui/tdeshortcutdialog_simple.ui
+++ b/tdeui/tdeshortcutdialog_simple.ui
@@ -105,7 +105,7 @@
     </grid>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">kshortcut.h</include>
+    <include location="global" impldecl="in declaration">tdeshortcut.h</include>
     <include location="global" impldecl="in declaration">kdialog.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
diff --git a/tdeui/tdespell.cpp b/tdeui/tdespell.cpp
index 90919c1f3..8eac3bde2 100644
--- a/tdeui/tdespell.cpp
+++ b/tdeui/tdespell.cpp
@@ -813,7 +813,7 @@ void KSpell::checkList2 ()
   // send next word
   if (wlIt != wordlist->end())
   {
-    kdDebug(750) << "KS::cklist2 " << lastpos << ": " << *wlIt << endl;
+    kdDebug(750) << "KS::ctdelist2 " << lastpos << ": " << *wlIt << endl;
 
     d->endOfResponse = false;
     bool put;
@@ -937,7 +937,7 @@ void KSpell::checkList4 ()
   {
   case KS_REPLACE:
   case KS_REPLACEALL:
-    kdDebug(750) << "KS: cklist4: lastpos: " << lastpos << endl;
+    kdDebug(750) << "KS: ctdelist4: lastpos: " << lastpos << endl;
     old = *(--wlIt);
     ++wlIt;
     // replace word
diff --git a/tdeui/tdespelldlg.cpp b/tdeui/tdespelldlg.cpp
index b0752cfd1..ac0ccb984 100644
--- a/tdeui/tdespelldlg.cpp
+++ b/tdeui/tdespelldlg.cpp
@@ -26,9 +26,9 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kcombobox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kprogress.h>
diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp
index 71d182275..c6049e658 100644
--- a/tdeui/tdetoolbar.cpp
+++ b/tdeui/tdetoolbar.cpp
@@ -42,25 +42,25 @@
 #include <tqstyle.h>
 #include <tqlayout.h>
 
-#include <ktoolbar.h>
-#include <kmainwindow.h>
+#include <tdetoolbar.h>
+#include <tdemainwindow.h>
 #include <klineedit.h>
 #include <kseparator.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kanimwidget.h>
 #include <kedittoolbar.h>
 #include <kipc.h>
 #include <twin.h>
 #include <kdebug.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 
 enum {
     CONTEXT_TOP = 0,
@@ -2260,5 +2260,5 @@ void TDEToolBar::removeWidgetInternal( TQWidget * w )
 void TDEToolBar::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "ktoolbar.moc"
+#include "tdetoolbar.moc"
 
diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp
index 49ceb57fa..0320e963a 100644
--- a/tdeui/tdetoolbarbutton.cpp
+++ b/tdeui/tdetoolbarbutton.cpp
@@ -24,8 +24,8 @@
 #include <config.h>
 #include <string.h>
 
-#include "ktoolbarbutton.h"
-#include "ktoolbar.h"
+#include "tdetoolbarbutton.h"
+#include "tdetoolbar.h"
 
 #include <tqstyle.h>
 #include <tqimage.h>
@@ -46,7 +46,7 @@
 #include <kiconloader.h>
 
 // needed to get our instance
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 template class TQIntDict<TDEToolBarButton>;
 
@@ -778,4 +778,4 @@ TDEToolBarButtonList::TDEToolBarButtonList()
 void TDEToolBarButton::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "ktoolbarbutton.moc"
+#include "tdetoolbarbutton.moc"
diff --git a/tdeui/tdetoolbarhandler.cpp b/tdeui/tdetoolbarhandler.cpp
index 1d08565d7..e03880bad 100644
--- a/tdeui/tdetoolbarhandler.cpp
+++ b/tdeui/tdetoolbarhandler.cpp
@@ -16,14 +16,14 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "ktoolbarhandler.h"
+#include "tdetoolbarhandler.h"
 
 #include <tqpopupmenu.h>
 #include <kapplication.h>
-#include <ktoolbar.h>
-#include <kmainwindow.h>
+#include <tdetoolbar.h>
+#include <tdemainwindow.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <assert.h>
 
 namespace
@@ -240,7 +240,7 @@ void ToolBarHandler::connectToActionContainer( TQWidget *container )
              this, TQT_SLOT( setupActions() ) );
 }
 
-#include "ktoolbarhandler.moc"
+#include "tdetoolbarhandler.moc"
 
 /* vim: et sw=4 ts=4
  */
diff --git a/tdeui/tdetoolbarlabelaction.cpp b/tdeui/tdetoolbarlabelaction.cpp
index 1716a64e8..dcac8fc8b 100644
--- a/tdeui/tdetoolbarlabelaction.cpp
+++ b/tdeui/tdetoolbarlabelaction.cpp
@@ -16,7 +16,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "ktoolbarlabelaction.h"
+#include "tdetoolbarlabelaction.h"
 
 #include <tqlabel.h>
 #include <tqapplication.h>
diff --git a/tdeui/tdetoolbarlabelaction.h b/tdeui/tdetoolbarlabelaction.h
index 02b1cd28c..0bf893cc2 100644
--- a/tdeui/tdetoolbarlabelaction.h
+++ b/tdeui/tdetoolbarlabelaction.h
@@ -18,7 +18,7 @@
 #ifndef KTOOLBARLABELACTION_H
 #define KTOOLBARLABELACTION_H
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 class TQLabel;
 
diff --git a/tdeui/tdetoolbarradiogroup.cpp b/tdeui/tdetoolbarradiogroup.cpp
index 7526158b9..937354357 100644
--- a/tdeui/tdetoolbarradiogroup.cpp
+++ b/tdeui/tdetoolbarradiogroup.cpp
@@ -22,9 +22,9 @@
 
 #include <config.h>
 
-#include "ktoolbarradiogroup.h"
-#include "ktoolbar.h"
-#include "ktoolbarbutton.h"
+#include "tdetoolbarradiogroup.h"
+#include "tdetoolbar.h"
+#include "tdetoolbarbutton.h"
 
 /*************************************************************************
  *                          TDEToolBarRadioGroup                                  *
@@ -73,5 +73,5 @@ void TDEToolBarRadioGroup::slotToggled(int id)
   }
 }
 
-#include "ktoolbarradiogroup.moc"
+#include "tdetoolbarradiogroup.moc"
 
diff --git a/tdeui/tests/CMakeLists.txt b/tdeui/tests/CMakeLists.txt
index 3d53611c4..719902623 100644
--- a/tdeui/tests/CMakeLists.txt
+++ b/tdeui/tests/CMakeLists.txt
@@ -27,21 +27,21 @@ set( test_PROGS
   kcolortest kcolordlgtest kcomboboxtest kcompletiontest
   kdatepicktest kdatewidgettest kdialogbasetest
   kdockwidgetdemo kdockwidgettest
-  kdualcolortest keditlistboxtest kfontdialogtest
+  kdualcolortest keditlistboxtest tdefontdialogtest
   kgradienttest khashtest kdesattest
   kledtest klineedittest klineeditdlgtest
   kmessageboxtest knuminputtest
   kpalettetest
-  kpopuptest kprogresstest krulertest kseparatortest
+  tdepopuptest kprogresstest krulertest kseparatortest
   kstatusbartest ktabctltest
   kunbalancedgrdtest twindowtest kwizardtest
   itemcontainertest kpanelmenutest kedittest
-  kxmlguitest kaccelgentest ksystemtraytest klistviewtest
-  ktextedittest kmainwindowtest kmainwindowrestoretest
-  kactiontest kdatetimewidgettest ktimewidgettest
+  kxmlguitest tdeaccelgentest ksystemtraytest tdelistviewtest
+  ktextedittest tdemainwindowtest tdemainwindowrestoretest
+  tdeactiontest kdatetimewidgettest ktimewidgettest
   tdespelltest kinputdialogtest ktabwidgettest kwordwraptest
   kdocktest qxembedtest ksqueezedtextlabeltest
-  kpixmapregionselectordialogtest kjanuswidgettest ktoolbarlabelactiontest
+  kpixmapregionselectordialogtest kjanuswidgettest tdetoolbarlabelactiontest
 )
 
 foreach( PROG ${test_PROGS} )
diff --git a/tdeui/tests/Makefile.am b/tdeui/tests/Makefile.am
index 9af863946..361d437a9 100644
--- a/tdeui/tests/Makefile.am
+++ b/tdeui/tests/Makefile.am
@@ -26,21 +26,21 @@ check_PROGRAMS = kaboutdialogtest kblendtest kbuttonboxtest kcharselecttest \
 	kcolortest kcolordlgtest kcomboboxtest kcompletiontest \
 	kdatepicktest kdatewidgettest kdialogbasetest \
 	kdockwidgetdemo kdockwidgettest \
-	kdualcolortest keditlistboxtest kfontdialogtest \
+	kdualcolortest keditlistboxtest tdefontdialogtest \
 	kgradienttest khashtest kdesattest\
 	kledtest klineedittest klineeditdlgtest \
 	kmessageboxtest knuminputtest \
 	kpalettetest \
-	kpopuptest kprogresstest krulertest kseparatortest \
+	tdepopuptest kprogresstest krulertest kseparatortest \
 	kstatusbartest ktabctltest \
 	kunbalancedgrdtest twindowtest kwizardtest \
 	itemcontainertest kpanelmenutest kedittest \
-	kxmlguitest kaccelgentest ksystemtraytest klistviewtest \
-	ktextedittest kmainwindowtest kmainwindowrestoretest \
-	kactiontest kdatetimewidgettest ktimewidgettest \
+	kxmlguitest tdeaccelgentest ksystemtraytest tdelistviewtest \
+	ktextedittest tdemainwindowtest tdemainwindowrestoretest \
+	tdeactiontest kdatetimewidgettest ktimewidgettest \
 	tdespelltest kinputdialogtest ktabwidgettest kwordwraptest \
 	kdocktest qxembedtest ksqueezedtextlabeltest \
-	kpixmapregionselectordialogtest kjanuswidgettest ktoolbarlabelactiontest
+	kpixmapregionselectordialogtest kjanuswidgettest tdetoolbarlabelactiontest
 
 METASOURCES = AUTO
 
@@ -62,7 +62,7 @@ kdialogbasetest_SOURCES = kdialogbasetest.cpp
 kdualcolortest_SOURCES = kdualcolortest.cpp
 kedittest_SOURCES = kedittest.cpp
 keditlistboxtest_SOURCES = keditlistboxtest.cpp
-kfontdialogtest_SOURCES = kfontdialogtest.cpp
+tdefontdialogtest_SOURCES = tdefontdialogtest.cpp
 kgradienttest_SOURCES = kgradienttest.cpp
 khashtest_SOURCES = khashtest.cpp
 kledtest_SOURCES = kledtest.cpp
@@ -71,7 +71,7 @@ klineeditdlgtest_SOURCES = klineeditdlgtest.cpp
 kmessageboxtest_SOURCES = kmessageboxtest.cpp
 knuminputtest_SOURCES = knuminputtest.cpp
 kpalettetest_SOURCES = kpalettetest.cpp
-kpopuptest_SOURCES = kpopuptest.cpp
+tdepopuptest_SOURCES = tdepopuptest.cpp
 kprogresstest_SOURCES = kprogresstest.cpp
 krulertest_SOURCES = krulertest.cpp
 kseparatortest_SOURCES = kseparatortest.cpp
@@ -86,13 +86,13 @@ kpanelmenutest_SOURCES = kpanelmenutest.cpp
 kdockwidgetdemo_SOURCES = kdockwidgetdemo.cpp
 kdockwidgettest_SOURCES = kdockwidgettest.cpp
 kxmlguitest_SOURCES = kxmlguitest.cpp
-kaccelgentest_SOURCES = kaccelgentest.cpp
+tdeaccelgentest_SOURCES = tdeaccelgentest.cpp
 ksystemtraytest_SOURCES = ksystemtraytest.cpp
-klistviewtest_SOURCES = klistviewtest.cpp
+tdelistviewtest_SOURCES = tdelistviewtest.cpp
 ktextedittest_SOURCES = ktextedittest.cpp
-kmainwindowtest_SOURCES = kmainwindowtest.cpp
-kmainwindowrestoretest_SOURCES = kmainwindowrestoretest.cpp
-kactiontest_SOURCES = kactiontest.cpp
+tdemainwindowtest_SOURCES = tdemainwindowtest.cpp
+tdemainwindowrestoretest_SOURCES = tdemainwindowrestoretest.cpp
+tdeactiontest_SOURCES = tdeactiontest.cpp
 tdespelltest_SOURCES = tdespelltest.cpp
 kinputdialogtest_SOURCES = kinputdialogtest.cpp
 ktabwidgettest_SOURCES = ktabwidgettest.cpp
@@ -102,4 +102,4 @@ qxembedtest_SOURCES=qxembedtest.cpp
 ksqueezedtextlabeltest_SOURCES = ksqueezedtextlabeltest.cpp
 kjanuswidgettest_SOURCES = kjanuswidgettest.cpp
 kpixmapregionselectordialogtest_SOURCES = kpixmapregionselectordialogtest.cpp
-ktoolbarlabelactiontest_SOURCES = ktoolbarlabelactiontest.cpp
+tdetoolbarlabelactiontest_SOURCES = tdetoolbarlabelactiontest.cpp
diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp
index c3bfcbe95..76df739e8 100644
--- a/tdeui/tests/itemcontainertest.cpp
+++ b/tdeui/tests/itemcontainertest.cpp
@@ -20,8 +20,8 @@
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kiconview.h>
-#include <klistview.h>
-#include <klistbox.h>
+#include <tdelistview.h>
+#include <tdelistbox.h>
 
 #include "itemcontainertest.h"
 
diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp
index bfed1bdd2..144391f50 100644
--- a/tdeui/tests/kdockwidgettest.cpp
+++ b/tdeui/tests/kdockwidgettest.cpp
@@ -19,7 +19,7 @@
 #include <kiconloader.h>
 #include <kstatusbar.h>
 #include <kmenubar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tqvbox.h>
 
 static const char*folder[]={
diff --git a/tdeui/tests/krulertest.h b/tdeui/tests/krulertest.h
index 67a9ae7e0..cf1abc155 100644
--- a/tdeui/tests/krulertest.h
+++ b/tdeui/tests/krulertest.h
@@ -4,7 +4,7 @@
 #define krulertest_h
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqwidget.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp
index 507604480..c06f18b51 100644
--- a/tdeui/tests/kstatusbartest.cpp
+++ b/tdeui/tests/kstatusbartest.cpp
@@ -11,7 +11,7 @@
 
 #include "kstatusbar.h"
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmenubar.h>
 #include "kstatusbartest.h"
 
diff --git a/tdeui/tests/kstatusbartest.h b/tdeui/tests/kstatusbartest.h
index 809f3f643..34dd6df81 100644
--- a/tdeui/tests/kstatusbartest.h
+++ b/tdeui/tests/kstatusbartest.h
@@ -4,7 +4,7 @@
 #include <kmenubar.h>
 #include <tqpopupmenu.h>
 #include <kstatusbar.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TQMultiLineEdit;
 
diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp
index 17f7daac9..89c5caf30 100644
--- a/tdeui/tests/kxmlguitest.cpp
+++ b/tdeui/tests/kxmlguitest.cpp
@@ -1,10 +1,10 @@
 #include "kxmlguitest.h"
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kxmlguifactory.h>
 #include <kxmlguiclient.h>
 #include <kxmlguibuilder.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
diff --git a/tdeui/tests/tdeaccelgentest.cpp b/tdeui/tests/tdeaccelgentest.cpp
index 783a0f36f..bd456aefd 100644
--- a/tdeui/tests/tdeaccelgentest.cpp
+++ b/tdeui/tests/tdeaccelgentest.cpp
@@ -1,4 +1,4 @@
-#include "kaccelgen.h"
+#include "tdeaccelgen.h"
 
 #include <tqstringlist.h>
 
diff --git a/tdeui/tests/tdeactiontest.cpp b/tdeui/tests/tdeactiontest.cpp
index 73a108ab0..d62d9c3fc 100644
--- a/tdeui/tests/tdeactiontest.cpp
+++ b/tdeui/tests/tdeactiontest.cpp
@@ -2,13 +2,13 @@
 #include <tqguardedptr.h>
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <assert.h>
 
 int main( int argc, char **argv )
 {
-    TDEApplication app( argc, argv, "kactiontest" );
+    TDEApplication app( argc, argv, "tdeactiontest" );
 
     TDEActionCollection coll( static_cast<TQObject *>( 0 ) );
 
diff --git a/tdeui/tests/tdefontdialogtest.cpp b/tdeui/tests/tdefontdialogtest.cpp
index 66f0b3664..2d4e187b2 100644
--- a/tdeui/tests/tdefontdialogtest.cpp
+++ b/tdeui/tests/tdefontdialogtest.cpp
@@ -25,7 +25,7 @@
 
 
 #include <kapplication.h>
-#include "kfontdialog.h"
+#include "tdefontdialog.h"
 #include <tdeconfig.h>
 
 
diff --git a/tdeui/tests/tdelistviewtest.cpp b/tdeui/tests/tdelistviewtest.cpp
index 4be086af6..d73baf087 100644
--- a/tdeui/tests/tdelistviewtest.cpp
+++ b/tdeui/tests/tdelistviewtest.cpp
@@ -1,4 +1,4 @@
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kapplication.h>
 #include <kdialogbase.h>
 #include <tqvbox.h>
@@ -6,7 +6,7 @@
 
 int main( int argc, char **argv )
 {
-	TDEApplication app( argc, argv, "klistviewtest" );
+	TDEApplication app( argc, argv, "tdelistviewtest" );
 	KDialogBase dialog;
 	TDEListView *view = new TDEListView( dialog.makeVBoxMainWidget() );
 	view->setSelectionModeExt( TDEListView::FileManager );
diff --git a/tdeui/tests/tdemainwindowrestoretest.cpp b/tdeui/tests/tdemainwindowrestoretest.cpp
index 1ef265d92..7b477f8f7 100644
--- a/tdeui/tests/tdemainwindowrestoretest.cpp
+++ b/tdeui/tests/tdemainwindowrestoretest.cpp
@@ -1,5 +1,5 @@
 
-#include "kmainwindowrestoretest.h"
+#include "tdemainwindowrestoretest.h"
 
 #include <kapplication.h>
 
@@ -14,7 +14,7 @@
 
 int main( int argc, char * argv[] ) {
 
-  TDEApplication app( argc, argv, "kmainwindowrestoretest" );
+  TDEApplication app( argc, argv, "tdemainwindowrestoretest" );
 
   if ( kapp->isRestored() ) {
     kRestoreMainWindows< MainWin1, MainWin2, MainWin3 >();
@@ -38,4 +38,4 @@ int main( int argc, char * argv[] ) {
   return app.exec();
 }
 
-#include "kmainwindowrestoretest.moc"
+#include "tdemainwindowrestoretest.moc"
diff --git a/tdeui/tests/tdemainwindowrestoretest.h b/tdeui/tests/tdemainwindowrestoretest.h
index 938311461..7d02e4aca 100644
--- a/tdeui/tests/tdemainwindowrestoretest.h
+++ b/tdeui/tests/tdemainwindowrestoretest.h
@@ -1,7 +1,7 @@
 #ifndef _TDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
 #define _TDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class MainWin1 : public TDEMainWindow {
   Q_OBJECT
diff --git a/tdeui/tests/tdemainwindowtest.cpp b/tdeui/tests/tdemainwindowtest.cpp
index 6606680e9..b83123dde 100644
--- a/tdeui/tests/tdemainwindowtest.cpp
+++ b/tdeui/tests/tdemainwindowtest.cpp
@@ -5,7 +5,7 @@
 #include <kstatusbar.h>
 #include <kmenubar.h>
 
-#include "kmainwindowtest.h"
+#include "tdemainwindowtest.h"
 
 MainWindow::MainWindow()
 {
@@ -24,7 +24,7 @@ void MainWindow::showMessage()
 
 int main( int argc, char **argv )
 {
-    TDEApplication app( argc, argv, "kmainwindowtest" );
+    TDEApplication app( argc, argv, "tdemainwindowtest" );
 
     MainWindow* mw = new MainWindow; // deletes itself when closed
     mw->show();
@@ -32,7 +32,7 @@ int main( int argc, char **argv )
     return app.exec();
 }
 
-#include "kmainwindowtest.moc"
+#include "tdemainwindowtest.moc"
 
 /* vim: et sw=4 ts=4
  */
diff --git a/tdeui/tests/tdemainwindowtest.h b/tdeui/tests/tdemainwindowtest.h
index 21ca2fe7e..b7c5d9e3c 100644
--- a/tdeui/tests/tdemainwindowtest.h
+++ b/tdeui/tests/tdemainwindowtest.h
@@ -1,7 +1,7 @@
 #ifndef KMAINWINDOWTEST_H
 #define KMAINWINDOWTEST_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class MainWindow : public TDEMainWindow
 {
diff --git a/tdeui/tests/tdepopuptest.cpp b/tdeui/tests/tdepopuptest.cpp
index 89c932f46..c830525f1 100644
--- a/tdeui/tests/tdepopuptest.cpp
+++ b/tdeui/tests/tdepopuptest.cpp
@@ -1,7 +1,7 @@
 #include <kapplication.h>
 #include <tqwidget.h>
 #include <tqcursor.h>
-#include "kpopupmenu.h"
+#include "tdepopupmenu.h"
 
 class DemoWidget : public TQWidget {
 private:
@@ -30,7 +30,7 @@ public:
 
 int main(int argc, char **argv)
 {
-    TDEApplication app(argc, argv, "kpopupmenutest");
+    TDEApplication app(argc, argv, "tdepopupmenutest");
     DemoWidget w;
     app.setMainWidget(&w);
     w.setFont(TQFont("helvetica", 12, TQFont::Bold), true);
diff --git a/tdeui/tests/tdetoolbarlabelactiontest.cpp b/tdeui/tests/tdetoolbarlabelactiontest.cpp
index 9596e9d32..ae12e56d8 100644
--- a/tdeui/tests/tdetoolbarlabelactiontest.cpp
+++ b/tdeui/tests/tdetoolbarlabelactiontest.cpp
@@ -19,11 +19,11 @@
 #include <tqguardedptr.h>
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kstandarddirs.h>
-#include <ktoolbarlabelaction.h>
+#include <tdetoolbarlabelaction.h>
 #include <ksqueezedtextlabel.h> 
 #include <kdebug.h>
 #include <tqvbox.h>
@@ -78,13 +78,13 @@ public:
 
     // customLabel->setText("&test me again some time soon");
     
-    createGUI("ktoolbarlabelactiontestui.rc");
+    createGUI("tdetoolbarlabelactiontestui.rc");
   }
 };
 
 int main( int argc, char **argv )
 {
-  TDEApplication app( argc, argv, "ktoolbarlabelactiontest" );
+  TDEApplication app( argc, argv, "tdetoolbarlabelactiontest" );
 
   TDEGlobal::instance()->dirs()->addResourceDir("data", ".");
 
diff --git a/tdeui/tests/tdetoolbarlabelactiontestui.rc b/tdeui/tests/tdetoolbarlabelactiontestui.rc
index 75d02e54e..0a0e03091 100644
--- a/tdeui/tests/tdetoolbarlabelactiontestui.rc
+++ b/tdeui/tests/tdetoolbarlabelactiontestui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ktoolbarlabelactiontest" version="0.1">
+<kpartgui name="tdetoolbarlabelactiontest" version="0.1">
 <ToolBar>
 <Action name="label1"/>
 <Action name="label2"/>
diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp
index 0ad1b726b..d45bc2554 100644
--- a/tdeui/tests/twindowtest.cpp
+++ b/tdeui/tests/twindowtest.cpp
@@ -14,9 +14,9 @@
 #include <khelpmenu.h>
 #include <kcmdlineargs.h>
 #include <kmenubar.h>
-#include <ktoolbarradiogroup.h>
+#include <tdetoolbarradiogroup.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqmultilineedit.h>
 #include "twindowtest.h"
 
diff --git a/tdeui/tests/twindowtest.h b/tdeui/tests/twindowtest.h
index f0dad1537..83a0d75bf 100644
--- a/tdeui/tests/twindowtest.h
+++ b/tdeui/tests/twindowtest.h
@@ -6,8 +6,8 @@
 #include <tqprogressbar.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
-#include <ktoolbar.h>
-#include <kmainwindow.h>
+#include <tdetoolbar.h>
+#include <tdemainwindow.h>
 
 class TQMultiLineEdit;
 class TDEToolBarRadioGroup;
diff --git a/tdeui/twindowlistmenu.h b/tdeui/twindowlistmenu.h
index b0b3634f3..20da236f1 100644
--- a/tdeui/twindowlistmenu.h
+++ b/tdeui/twindowlistmenu.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __twindowlistmenu_h__
 #define __twindowlistmenu_h__
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqmap.h>
 
 #ifdef Q_MOC_RUN
diff --git a/tdeutils/kpluginselector.cpp b/tdeutils/kpluginselector.cpp
index a6390ec19..501a124a3 100644
--- a/tdeutils/kpluginselector.cpp
+++ b/tdeutils/kpluginselector.cpp
@@ -36,7 +36,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ksimpleconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
diff --git a/tdeutils/ksettings/componentsdialog.cpp b/tdeutils/ksettings/componentsdialog.cpp
index 97a0bad4f..9ee2d31df 100644
--- a/tdeutils/ksettings/componentsdialog.cpp
+++ b/tdeutils/ksettings/componentsdialog.cpp
@@ -20,7 +20,7 @@
 #include "ksettings/componentsdialog.h"
 #include <klocale.h>
 #include <tqlayout.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqlabel.h>
 #include <tqheader.h>
 #include <kplugininfo.h>
diff --git a/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro
index 421267305..edd6007fd 100644
--- a/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro
+++ b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro
@@ -21,7 +21,7 @@ SOURCES = \
     tdetexteditor.cpp \
     editinterface.cpp editinterfaceext.cpp \
     clipboardinterface.cpp  selectioninterface.cpp searchinterface.cpp \
-    codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \
+    codecompletioninterface.cpp wordwrapinterface.cpp bloctdeselectioninterface.cpp \
     configinterface.cpp cursorinterface.cpp  dynwordwrapinterface.cpp \
     printinterface.cpp highlightinginterface.cpp markinterface.cpp \
     popupmenuinterface.cpp undointerface.cpp viewcursorinterface.cpp \
@@ -30,7 +30,7 @@ SOURCES = \
     searchdcopinterface.cpp  markinterfaceextension.cpp \
     configinterfaceextension.cpp encodinginterface.cpp sessionconfiginterface.cpp \
     viewstatusmsginterface.cpp  editorchooser.cpp \
-    blockselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\
+    bloctdeselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\
     encodingdcopinterface.cpp \
     printdcopinterface.cpp  \
     undodcopinterface.cpp viewcursordcopinterface.cpp \
@@ -48,7 +48,7 @@ undodcopinterface_skel.cpp \
 printdcopinterface_skel.cpp \
 encodingdcopinterface_skel.cpp \
 documentdcopinfo_skel.cpp \
-blockselectiondcopinterface_skel.cpp \
+bloctdeselectiondcopinterface_skel.cpp \
 searchdcopinterface_skel.cpp \
 selectiondcopinterface_skel.cpp \
 clipboarddcopinterface_skel.cpp \
@@ -61,7 +61,7 @@ undodcopinterface_stub.cpp \
 printdcopinterface_stub.cpp \
 encodingdcopinterface_stub.cpp \
 documentdcopinfo_stub.cpp \
-blockselectiondcopinterface_stub.cpp \
+bloctdeselectiondcopinterface_stub.cpp \
 searchdcopinterface_stub.cpp \
 selectiondcopinterface_stub.cpp \
 clipboarddcopinterface_stub.cpp \
diff --git a/win/pro_files/kio/kio.pro b/win/pro_files/kio/kio.pro
index 15056d021..da790d7d1 100644
--- a/win/pro_files/kio/kio.pro
+++ b/win/pro_files/kio/kio.pro
@@ -145,8 +145,8 @@ tdefile/kopenwith.cpp \
 tdefile/kpreviewprops.cpp \
 tdefile/kpreviewwidgetbase.cpp \
 tdefile/kpropertiesdialog.cpp \
-tdefile/krecentdirs.cpp \
-tdefile/krecentdocument.cpp \
+tdefile/tderecentdirs.cpp \
+tdefile/tderecentdocument.cpp \
 tdefile/kurlbar.cpp \
 tdefile/kurlcombobox.cpp \
 tdefile/kurlrequester.cpp \
diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro
index 0e868d6f9..56db79c55 100644
--- a/win/pro_files/tdecore/tdecore.pro
+++ b/win/pro_files/tdecore/tdecore.pro
@@ -58,16 +58,16 @@ tdeconfigbackend.cpp \
 tdeconfigbase.cpp \
 tdeconfigskeleton.cpp \
 klockfile.cpp \
-kstdaccel.cpp \
+tdestdaccel.cpp \
 kcheckaccelerators.cpp \
 kkeyserver_x11.cpp \
 kkeynative_x11.cpp \
-kaccelbase.cpp \
-kaccel.cpp \
-kaccelmanager.cpp \
-kshortcut.cpp \
-kshortcutmenu.cpp \
-kshortcutlist.cpp \
+tdeaccelbase.cpp \
+tdeaccel.cpp \
+tdeaccelmanager.cpp \
+tdeshortcut.cpp \
+tdeshortcutmenu.cpp \
+tdeshortcutlist.cpp \
 kinstance.cpp \
 tdeversion.cpp \
 klocale.cpp \
@@ -78,7 +78,7 @@ kglobalsettings.cpp \
 kckey.cpp \
 kglobalaccel.cpp \
 kglobalaccel_win.cpp \
-kaccelaction.cpp \
+tdeaccelaction.cpp \
 kuniqueapplication.cpp \
 tdesycoca.cpp \
 tdesycocadict.cpp \
diff --git a/win/pro_files/tdeui/tdeui.pro b/win/pro_files/tdeui/tdeui.pro
index b6a0a44d2..f4bde24ec 100644
--- a/win/pro_files/tdeui/tdeui.pro
+++ b/win/pro_files/tdeui/tdeui.pro
@@ -18,10 +18,10 @@ SOURCES = \
 kaboutapplication.cpp \
 kaboutdialog.cpp \
 kaboutkde.cpp \
-kactionclasses.cpp \
-kactioncollection.cpp \
-kaction.cpp \
-kactionselector.cpp \
+tdeactionclasses.cpp \
+tdeactioncollection.cpp \
+tdeaction.cpp \
+tdeactionselector.cpp \
 kactivelabel.cpp \
 kanimwidget.cpp \
 karrowbutton.cpp \
@@ -52,9 +52,9 @@ keditcl1.cpp \
 keditcl2.cpp \
 keditlistbox.cpp \
 kedittoolbar.cpp \
-kfontcombo.cpp \
-kfontdialog.cpp \
-kfontrequester.cpp \
+tdefontcombo.cpp \
+tdefontdialog.cpp \
+tdefontrequester.cpp \
 kguiitem.cpp \
 khelpmenu.cpp \
 kiconview.cpp \
@@ -66,11 +66,11 @@ klanguagebutton.cpp \
 kled.cpp \
 klineedit.cpp \
 klineeditdlg.cpp \
-klistbox.cpp \
-klistview.cpp \
-klistviewsearchline.cpp \
-kmainwindowiface.cpp \
-kmainwindow.cpp \
+tdelistbox.cpp \
+tdelistview.cpp \
+tdelistviewsearchline.cpp \
+tdemainwindowiface.cpp \
+tdemainwindow.cpp \
 kmenubar.cpp \
 knuminput.cpp \
 knumvalidator.cpp \
@@ -83,16 +83,16 @@ kpassivepopup.cpp \
 kpixmapio.cpp \
 kpixmapregionselectordialog.cpp \
 kpixmapregionselectorwidget.cpp \
-kpopupmenu.cpp \
+tdepopupmenu.cpp \
 kprogress.cpp \
 kpushbutton.cpp \
 krestrictedline.cpp \
 krootpixmap.cpp \
 kruler.cpp \
 ksconfig.cpp \
-kselect.cpp \
+tdeselect.cpp \
 kseparator.cpp \
-kshortcutdialog.cpp \
+tdeshortcutdialog.cpp \
 tdespell.cpp \
 tdespelldlg.cpp \
 ksplashscreen.cpp \
@@ -107,10 +107,10 @@ ktabctl.cpp \
 ktextbrowser.cpp \
 ktextedit.cpp \
 ktip.cpp \
-ktoolbar.cpp \
-ktoolbarbutton.cpp \
-ktoolbarhandler.cpp \
-ktoolbarradiogroup.cpp \
+tdetoolbar.cpp \
+tdetoolbarbutton.cpp \
+tdetoolbarhandler.cpp \
+tdetoolbarradiogroup.cpp \
 kurllabel.cpp \
 kwhatsthismanager.cpp \
 twindowinfo.cpp \
@@ -137,12 +137,12 @@ exists( kmessagebox_win.cpp ) {
 
 # generated:
 SOURCES += \
-kmainwindowiface_stub.cpp \
-kmainwindowiface_skel.cpp
+tdemainwindowiface_stub.cpp \
+tdemainwindowiface_skel.cpp
 
 FORMS = \
-kshortcutdialog_advanced.ui \
-kshortcutdialog_simple.ui \
+tdeshortcutdialog_advanced.ui \
+tdeshortcutdialog_simple.ui \
 tdespellui.ui
 
 HEADERS =
diff --git a/win/tdelibs_global_win.h b/win/tdelibs_global_win.h
index d8b4da08a..8e7d39d99 100644
--- a/win/tdelibs_global_win.h
+++ b/win/tdelibs_global_win.h
@@ -162,7 +162,7 @@ declared but not defined. The compiler was unable to find any destructors for th
 # pragma warning(disable: 4250)
 
 # pragma warning(disable: 4006) /*libxxx : warning LNK4006: 
-         ".... already defined in kaction.obj; second definition ignored" */
+         ".... already defined in tdeaction.obj; second definition ignored" */
 
 /* disable C4100: unreferenced formal parameter */
 # pragma warning(disable: 4100)