Rename many classes and header files to avoid conflicts with KDE4

104 files changed, 427 insertions, 427 deletions

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