diff --git a/doc/api/kfontchooser.png b/doc/api/tdefontchooser.png
similarity index 100%
rename from doc/api/kfontchooser.png
rename to doc/api/tdefontchooser.png
diff --git a/doc/api/kfontdialog.png b/doc/api/tdefontdialog.png
similarity index 100%
rename from doc/api/kfontdialog.png
rename to doc/api/tdefontdialog.png
diff --git a/doc/api/kfontrequester.png b/doc/api/tdefontrequester.png
similarity index 100%
rename from doc/api/kfontrequester.png
rename to doc/api/tdefontrequester.png
diff --git a/interfaces/tdetexteditor/blockselectiondcopinterface.cpp b/interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp
similarity index 100%
rename from interfaces/tdetexteditor/blockselectiondcopinterface.cpp
rename to interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp
diff --git a/interfaces/tdetexteditor/blockselectiondcopinterface.h b/interfaces/tdetexteditor/bloctdeselectiondcopinterface.h
similarity index 100%
rename from interfaces/tdetexteditor/blockselectiondcopinterface.h
rename to interfaces/tdetexteditor/bloctdeselectiondcopinterface.h
diff --git a/interfaces/tdetexteditor/blockselectioninterface.cpp b/interfaces/tdetexteditor/bloctdeselectioninterface.cpp
similarity index 100%
rename from interfaces/tdetexteditor/blockselectioninterface.cpp
rename to interfaces/tdetexteditor/bloctdeselectioninterface.cpp
diff --git a/interfaces/tdetexteditor/blockselectioninterface.h b/interfaces/tdetexteditor/bloctdeselectioninterface.h
similarity index 100%
rename from interfaces/tdetexteditor/blockselectioninterface.h
rename to interfaces/tdetexteditor/bloctdeselectioninterface.h
diff --git a/kdewidgets/pics/kactionselector.png b/kdewidgets/pics/tdeactionselector.png
similarity index 100%
rename from kdewidgets/pics/kactionselector.png
rename to kdewidgets/pics/tdeactionselector.png
diff --git a/kdewidgets/pics/kfontcombo.png b/kdewidgets/pics/tdefontcombo.png
similarity index 100%
rename from kdewidgets/pics/kfontcombo.png
rename to kdewidgets/pics/tdefontcombo.png
diff --git a/kdewidgets/pics/kfontrequester.png b/kdewidgets/pics/tdefontrequester.png
similarity index 100%
rename from kdewidgets/pics/kfontrequester.png
rename to kdewidgets/pics/tdefontrequester.png
diff --git a/kdewidgets/pics/klistbox.png b/kdewidgets/pics/tdelistbox.png
similarity index 100%
rename from kdewidgets/pics/klistbox.png
rename to kdewidgets/pics/tdelistbox.png
diff --git a/kdewidgets/pics/klistview.png b/kdewidgets/pics/tdelistview.png
similarity index 100%
rename from kdewidgets/pics/klistview.png
rename to kdewidgets/pics/tdelistview.png
diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kchectdeaccelerators.cpp
similarity index 100%
rename from tdecore/kcheckaccelerators.cpp
rename to tdecore/kchectdeaccelerators.cpp
diff --git a/tdecore/kcheckaccelerators.h b/tdecore/kchectdeaccelerators.h
similarity index 100%
rename from tdecore/kcheckaccelerators.h
rename to tdecore/kchectdeaccelerators.h
diff --git a/tdecore/network/ipv6blacklist b/tdecore/network/ipv6blactdelist
similarity index 100%
rename from tdecore/network/ipv6blacklist
rename to tdecore/network/ipv6blactdelist
diff --git a/tdecore/kaccel.cpp b/tdecore/tdeaccel.cpp
similarity index 100%
rename from tdecore/kaccel.cpp
rename to tdecore/tdeaccel.cpp
diff --git a/tdecore/kaccel.h b/tdecore/tdeaccel.h
similarity index 100%
rename from tdecore/kaccel.h
rename to tdecore/tdeaccel.h
diff --git a/tdecore/kaccelaction.cpp b/tdecore/tdeaccelaction.cpp
similarity index 100%
rename from tdecore/kaccelaction.cpp
rename to tdecore/tdeaccelaction.cpp
diff --git a/tdecore/kaccelaction.h b/tdecore/tdeaccelaction.h
similarity index 100%
rename from tdecore/kaccelaction.h
rename to tdecore/tdeaccelaction.h
diff --git a/tdecore/kaccelbase.cpp b/tdecore/tdeaccelbase.cpp
similarity index 100%
rename from tdecore/kaccelbase.cpp
rename to tdecore/tdeaccelbase.cpp
diff --git a/tdecore/kaccelbase.h b/tdecore/tdeaccelbase.h
similarity index 100%
rename from tdecore/kaccelbase.h
rename to tdecore/tdeaccelbase.h
diff --git a/tdecore/kaccelmanager.cpp b/tdecore/tdeaccelmanager.cpp
similarity index 100%
rename from tdecore/kaccelmanager.cpp
rename to tdecore/tdeaccelmanager.cpp
diff --git a/tdecore/kaccelmanager.h b/tdecore/tdeaccelmanager.h
similarity index 100%
rename from tdecore/kaccelmanager.h
rename to tdecore/tdeaccelmanager.h
diff --git a/tdecore/kaccelmanager_private.h b/tdecore/tdeaccelmanager_private.h
similarity index 100%
rename from tdecore/kaccelmanager_private.h
rename to tdecore/tdeaccelmanager_private.h
diff --git a/tdecore/kaccelprivate.h b/tdecore/tdeaccelprivate.h
similarity index 100%
rename from tdecore/kaccelprivate.h
rename to tdecore/tdeaccelprivate.h
diff --git a/tdecore/kshortcut.cpp b/tdecore/tdeshortcut.cpp
similarity index 100%
rename from tdecore/kshortcut.cpp
rename to tdecore/tdeshortcut.cpp
diff --git a/tdecore/kshortcut.h b/tdecore/tdeshortcut.h
similarity index 100%
rename from tdecore/kshortcut.h
rename to tdecore/tdeshortcut.h
diff --git a/tdecore/kshortcutlist.cpp b/tdecore/tdeshortcutlist.cpp
similarity index 100%
rename from tdecore/kshortcutlist.cpp
rename to tdecore/tdeshortcutlist.cpp
diff --git a/tdecore/kshortcutlist.h b/tdecore/tdeshortcutlist.h
similarity index 100%
rename from tdecore/kshortcutlist.h
rename to tdecore/tdeshortcutlist.h
diff --git a/tdecore/kshortcutmenu.cpp b/tdecore/tdeshortcutmenu.cpp
similarity index 100%
rename from tdecore/kshortcutmenu.cpp
rename to tdecore/tdeshortcutmenu.cpp
diff --git a/tdecore/kshortcutmenu.h b/tdecore/tdeshortcutmenu.h
similarity index 100%
rename from tdecore/kshortcutmenu.h
rename to tdecore/tdeshortcutmenu.h
diff --git a/tdecore/kstdaccel.cpp b/tdecore/tdestdaccel.cpp
similarity index 100%
rename from tdecore/kstdaccel.cpp
rename to tdecore/tdestdaccel.cpp
diff --git a/tdecore/kstdaccel.h b/tdecore/tdestdaccel.h
similarity index 100%
rename from tdecore/kstdaccel.h
rename to tdecore/tdestdaccel.h
diff --git a/tdecore/tests/kstdacceltest.cpp b/tdecore/tests/tdestdacceltest.cpp
similarity index 100%
rename from tdecore/tests/kstdacceltest.cpp
rename to tdecore/tests/tdestdacceltest.cpp
diff --git a/tdeio/tdefile/krecentdirs.cpp b/tdeio/tdefile/tderecentdirs.cpp
similarity index 100%
rename from tdeio/tdefile/krecentdirs.cpp
rename to tdeio/tdefile/tderecentdirs.cpp
diff --git a/tdeio/tdefile/krecentdirs.h b/tdeio/tdefile/tderecentdirs.h
similarity index 100%
rename from tdeio/tdefile/krecentdirs.h
rename to tdeio/tdefile/tderecentdirs.h
diff --git a/tdeio/tdefile/krecentdocument.cpp b/tdeio/tdefile/tderecentdocument.cpp
similarity index 100%
rename from tdeio/tdefile/krecentdocument.cpp
rename to tdeio/tdefile/tderecentdocument.cpp
diff --git a/tdeio/tdefile/krecentdocument.h b/tdeio/tdefile/tderecentdocument.h
similarity index 100%
rename from tdeio/tdefile/krecentdocument.h
rename to tdeio/tdefile/tderecentdocument.h
diff --git a/tdeparts/dockmainwindow.cpp b/tdeparts/doctdemainwindow.cpp
similarity index 100%
rename from tdeparts/dockmainwindow.cpp
rename to tdeparts/doctdemainwindow.cpp
diff --git a/tdeparts/dockmainwindow.h b/tdeparts/doctdemainwindow.h
similarity index 100%
rename from tdeparts/dockmainwindow.h
rename to tdeparts/doctdemainwindow.h
diff --git a/tdeui/kaccelgen.h b/tdeui/tdeaccelgen.h
similarity index 100%
rename from tdeui/kaccelgen.h
rename to tdeui/tdeaccelgen.h
diff --git a/tdeui/kaction.cpp b/tdeui/tdeaction.cpp
similarity index 100%
rename from tdeui/kaction.cpp
rename to tdeui/tdeaction.cpp
diff --git a/tdeui/kaction.h b/tdeui/tdeaction.h
similarity index 100%
rename from tdeui/kaction.h
rename to tdeui/tdeaction.h
diff --git a/tdeui/kactionclasses.cpp b/tdeui/tdeactionclasses.cpp
similarity index 100%
rename from tdeui/kactionclasses.cpp
rename to tdeui/tdeactionclasses.cpp
diff --git a/tdeui/kactionclasses.h b/tdeui/tdeactionclasses.h
similarity index 100%
rename from tdeui/kactionclasses.h
rename to tdeui/tdeactionclasses.h
diff --git a/tdeui/kactioncollection.cpp b/tdeui/tdeactioncollection.cpp
similarity index 100%
rename from tdeui/kactioncollection.cpp
rename to tdeui/tdeactioncollection.cpp
diff --git a/tdeui/kactioncollection.h b/tdeui/tdeactioncollection.h
similarity index 100%
rename from tdeui/kactioncollection.h
rename to tdeui/tdeactioncollection.h
diff --git a/tdeui/kactionselector.cpp b/tdeui/tdeactionselector.cpp
similarity index 100%
rename from tdeui/kactionselector.cpp
rename to tdeui/tdeactionselector.cpp
diff --git a/tdeui/kactionselector.h b/tdeui/tdeactionselector.h
similarity index 100%
rename from tdeui/kactionselector.h
rename to tdeui/tdeactionselector.h
diff --git a/tdeui/kactionshortcutlist.h b/tdeui/tdeactionshortcutlist.h
similarity index 100%
rename from tdeui/kactionshortcutlist.h
rename to tdeui/tdeactionshortcutlist.h
diff --git a/tdeui/kfontcombo.cpp b/tdeui/tdefontcombo.cpp
similarity index 100%
rename from tdeui/kfontcombo.cpp
rename to tdeui/tdefontcombo.cpp
diff --git a/tdeui/kfontcombo.h b/tdeui/tdefontcombo.h
similarity index 100%
rename from tdeui/kfontcombo.h
rename to tdeui/tdefontcombo.h
diff --git a/tdeui/kfontdialog.cpp b/tdeui/tdefontdialog.cpp
similarity index 100%
rename from tdeui/kfontdialog.cpp
rename to tdeui/tdefontdialog.cpp
diff --git a/tdeui/kfontdialog.h b/tdeui/tdefontdialog.h
similarity index 100%
rename from tdeui/kfontdialog.h
rename to tdeui/tdefontdialog.h
diff --git a/tdeui/kfontrequester.cpp b/tdeui/tdefontrequester.cpp
similarity index 100%
rename from tdeui/kfontrequester.cpp
rename to tdeui/tdefontrequester.cpp
diff --git a/tdeui/kfontrequester.h b/tdeui/tdefontrequester.h
similarity index 100%
rename from tdeui/kfontrequester.h
rename to tdeui/tdefontrequester.h
diff --git a/tdeui/klistbox.cpp b/tdeui/tdelistbox.cpp
similarity index 100%
rename from tdeui/klistbox.cpp
rename to tdeui/tdelistbox.cpp
diff --git a/tdeui/klistbox.h b/tdeui/tdelistbox.h
similarity index 100%
rename from tdeui/klistbox.h
rename to tdeui/tdelistbox.h
diff --git a/tdeui/klistview.cpp b/tdeui/tdelistview.cpp
similarity index 100%
rename from tdeui/klistview.cpp
rename to tdeui/tdelistview.cpp
diff --git a/tdeui/klistview.h b/tdeui/tdelistview.h
similarity index 99%
rename from tdeui/klistview.h
rename to tdeui/tdelistview.h
index 750100b8c..7c01b6c29 100644
--- a/tdeui/klistview.h
+++ b/tdeui/tdelistview.h
@@ -20,6 +20,7 @@
 #ifndef KLISTVIEW_H
 #define KLISTVIEW_H
 
+#include <tqheader.h>
 #include <tqlistview.h>
 
 #include <tqptrlist.h>
diff --git a/tdeui/klistviewlineedit.h b/tdeui/tdelistviewlineedit.h
similarity index 100%
rename from tdeui/klistviewlineedit.h
rename to tdeui/tdelistviewlineedit.h
diff --git a/tdeui/klistviewsearchline.cpp b/tdeui/tdelistviewsearchline.cpp
similarity index 100%
rename from tdeui/klistviewsearchline.cpp
rename to tdeui/tdelistviewsearchline.cpp
diff --git a/tdeui/klistviewsearchline.h b/tdeui/tdelistviewsearchline.h
similarity index 100%
rename from tdeui/klistviewsearchline.h
rename to tdeui/tdelistviewsearchline.h
diff --git a/tdeui/kmainwindow.cpp b/tdeui/tdemainwindow.cpp
similarity index 100%
rename from tdeui/kmainwindow.cpp
rename to tdeui/tdemainwindow.cpp
diff --git a/tdeui/kmainwindow.h b/tdeui/tdemainwindow.h
similarity index 100%
rename from tdeui/kmainwindow.h
rename to tdeui/tdemainwindow.h
diff --git a/tdeui/kmainwindowiface.cpp b/tdeui/tdemainwindowiface.cpp
similarity index 100%
rename from tdeui/kmainwindowiface.cpp
rename to tdeui/tdemainwindowiface.cpp
diff --git a/tdeui/kmainwindowiface.h b/tdeui/tdemainwindowiface.h
similarity index 100%
rename from tdeui/kmainwindowiface.h
rename to tdeui/tdemainwindowiface.h
diff --git a/tdeui/kpopupmenu.cpp b/tdeui/tdepopupmenu.cpp
similarity index 100%
rename from tdeui/kpopupmenu.cpp
rename to tdeui/tdepopupmenu.cpp
diff --git a/tdeui/kpopupmenu.h b/tdeui/tdepopupmenu.h
similarity index 100%
rename from tdeui/kpopupmenu.h
rename to tdeui/tdepopupmenu.h
diff --git a/tdeui/kselect.cpp b/tdeui/tdeselect.cpp
similarity index 100%
rename from tdeui/kselect.cpp
rename to tdeui/tdeselect.cpp
diff --git a/tdeui/kselect.h b/tdeui/tdeselect.h
similarity index 100%
rename from tdeui/kselect.h
rename to tdeui/tdeselect.h
diff --git a/tdeui/kshortcutdialog.cpp b/tdeui/tdeshortcutdialog.cpp
similarity index 100%
rename from tdeui/kshortcutdialog.cpp
rename to tdeui/tdeshortcutdialog.cpp
diff --git a/tdeui/kshortcutdialog.h b/tdeui/tdeshortcutdialog.h
similarity index 100%
rename from tdeui/kshortcutdialog.h
rename to tdeui/tdeshortcutdialog.h
diff --git a/tdeui/kshortcutdialog_advanced.ui b/tdeui/tdeshortcutdialog_advanced.ui
similarity index 100%
rename from tdeui/kshortcutdialog_advanced.ui
rename to tdeui/tdeshortcutdialog_advanced.ui
diff --git a/tdeui/kshortcutdialog_simple.ui b/tdeui/tdeshortcutdialog_simple.ui
similarity index 100%
rename from tdeui/kshortcutdialog_simple.ui
rename to tdeui/tdeshortcutdialog_simple.ui
diff --git a/tdeui/ktoolbar.cpp b/tdeui/tdetoolbar.cpp
similarity index 100%
rename from tdeui/ktoolbar.cpp
rename to tdeui/tdetoolbar.cpp
diff --git a/tdeui/ktoolbar.h b/tdeui/tdetoolbar.h
similarity index 100%
rename from tdeui/ktoolbar.h
rename to tdeui/tdetoolbar.h
diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp
similarity index 100%
rename from tdeui/ktoolbarbutton.cpp
rename to tdeui/tdetoolbarbutton.cpp
diff --git a/tdeui/ktoolbarbutton.h b/tdeui/tdetoolbarbutton.h
similarity index 100%
rename from tdeui/ktoolbarbutton.h
rename to tdeui/tdetoolbarbutton.h
diff --git a/tdeui/ktoolbarhandler.cpp b/tdeui/tdetoolbarhandler.cpp
similarity index 100%
rename from tdeui/ktoolbarhandler.cpp
rename to tdeui/tdetoolbarhandler.cpp
diff --git a/tdeui/ktoolbarhandler.h b/tdeui/tdetoolbarhandler.h
similarity index 100%
rename from tdeui/ktoolbarhandler.h
rename to tdeui/tdetoolbarhandler.h
diff --git a/tdeui/ktoolbarlabelaction.cpp b/tdeui/tdetoolbarlabelaction.cpp
similarity index 100%
rename from tdeui/ktoolbarlabelaction.cpp
rename to tdeui/tdetoolbarlabelaction.cpp
diff --git a/tdeui/ktoolbarlabelaction.h b/tdeui/tdetoolbarlabelaction.h
similarity index 100%
rename from tdeui/ktoolbarlabelaction.h
rename to tdeui/tdetoolbarlabelaction.h
diff --git a/tdeui/ktoolbarradiogroup.cpp b/tdeui/tdetoolbarradiogroup.cpp
similarity index 100%
rename from tdeui/ktoolbarradiogroup.cpp
rename to tdeui/tdetoolbarradiogroup.cpp
diff --git a/tdeui/ktoolbarradiogroup.h b/tdeui/tdetoolbarradiogroup.h
similarity index 100%
rename from tdeui/ktoolbarradiogroup.h
rename to tdeui/tdetoolbarradiogroup.h
diff --git a/tdeui/tests/kaccelgentest.cpp b/tdeui/tests/tdeaccelgentest.cpp
similarity index 100%
rename from tdeui/tests/kaccelgentest.cpp
rename to tdeui/tests/tdeaccelgentest.cpp
diff --git a/tdeui/tests/kactiontest.cpp b/tdeui/tests/tdeactiontest.cpp
similarity index 100%
rename from tdeui/tests/kactiontest.cpp
rename to tdeui/tests/tdeactiontest.cpp
diff --git a/tdeui/tests/kfontdialogtest.cpp b/tdeui/tests/tdefontdialogtest.cpp
similarity index 100%
rename from tdeui/tests/kfontdialogtest.cpp
rename to tdeui/tests/tdefontdialogtest.cpp
diff --git a/tdeui/tests/klistviewtest.cpp b/tdeui/tests/tdelistviewtest.cpp
similarity index 100%
rename from tdeui/tests/klistviewtest.cpp
rename to tdeui/tests/tdelistviewtest.cpp
diff --git a/tdeui/tests/kmainwindowrestoretest.cpp b/tdeui/tests/tdemainwindowrestoretest.cpp
similarity index 100%
rename from tdeui/tests/kmainwindowrestoretest.cpp
rename to tdeui/tests/tdemainwindowrestoretest.cpp
diff --git a/tdeui/tests/kmainwindowrestoretest.h b/tdeui/tests/tdemainwindowrestoretest.h
similarity index 100%
rename from tdeui/tests/kmainwindowrestoretest.h
rename to tdeui/tests/tdemainwindowrestoretest.h
diff --git a/tdeui/tests/kmainwindowtest.cpp b/tdeui/tests/tdemainwindowtest.cpp
similarity index 100%
rename from tdeui/tests/kmainwindowtest.cpp
rename to tdeui/tests/tdemainwindowtest.cpp
diff --git a/tdeui/tests/kmainwindowtest.h b/tdeui/tests/tdemainwindowtest.h
similarity index 100%
rename from tdeui/tests/kmainwindowtest.h
rename to tdeui/tests/tdemainwindowtest.h
diff --git a/tdeui/tests/kpopuptest.cpp b/tdeui/tests/tdepopuptest.cpp
similarity index 100%
rename from tdeui/tests/kpopuptest.cpp
rename to tdeui/tests/tdepopuptest.cpp
diff --git a/tdeui/tests/ktoolbarlabelactiontest.cpp b/tdeui/tests/tdetoolbarlabelactiontest.cpp
similarity index 100%
rename from tdeui/tests/ktoolbarlabelactiontest.cpp
rename to tdeui/tests/tdetoolbarlabelactiontest.cpp
diff --git a/tdeui/tests/ktoolbarlabelactiontestui.rc b/tdeui/tests/tdetoolbarlabelactiontestui.rc
similarity index 100%
rename from tdeui/tests/ktoolbarlabelactiontestui.rc
rename to tdeui/tests/tdetoolbarlabelactiontestui.rc