diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
similarity index 100%
rename from kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
rename to kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.desktop b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.desktop
similarity index 100%
rename from kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.desktop
rename to kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.desktop
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
similarity index 100%
rename from kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
rename to kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilterrc b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilterrc
similarity index 100%
rename from kcontrol/ebrowsing/plugins/shorturi/kshorturifilterrc
rename to kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilterrc
diff --git a/kcontrol/keys/kaccel.upd b/kcontrol/keys/tdeaccel.upd
similarity index 100%
rename from kcontrol/keys/kaccel.upd
rename to kcontrol/keys/tdeaccel.upd
diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/tdeaccelaction.h
similarity index 100%
rename from kcontrol/keys/kaccelaction.h
rename to kcontrol/keys/tdeaccelaction.h
diff --git a/kcontrol/kfontinst/AUTHORS b/kcontrol/tdefontinst/AUTHORS
similarity index 100%
rename from kcontrol/kfontinst/AUTHORS
rename to kcontrol/tdefontinst/AUTHORS
diff --git a/kcontrol/kfontinst/CMakeLists.txt b/kcontrol/tdefontinst/CMakeLists.txt
similarity index 100%
rename from kcontrol/kfontinst/CMakeLists.txt
rename to kcontrol/tdefontinst/CMakeLists.txt
diff --git a/kcontrol/kfontinst/ChangeLog b/kcontrol/tdefontinst/ChangeLog
similarity index 100%
rename from kcontrol/kfontinst/ChangeLog
rename to kcontrol/tdefontinst/ChangeLog
diff --git a/kcontrol/kfontinst/Makefile.am b/kcontrol/tdefontinst/Makefile.am
similarity index 100%
rename from kcontrol/kfontinst/Makefile.am
rename to kcontrol/tdefontinst/Makefile.am
diff --git a/kcontrol/kfontinst/TODO b/kcontrol/tdefontinst/TODO
similarity index 100%
rename from kcontrol/kfontinst/TODO
rename to kcontrol/tdefontinst/TODO
diff --git a/kcontrol/kfontinst/configure.in.bot b/kcontrol/tdefontinst/configure.in.bot
similarity index 100%
rename from kcontrol/kfontinst/configure.in.bot
rename to kcontrol/tdefontinst/configure.in.bot
diff --git a/kcontrol/kfontinst/configure.in.in b/kcontrol/tdefontinst/configure.in.in
similarity index 100%
rename from kcontrol/kfontinst/configure.in.in
rename to kcontrol/tdefontinst/configure.in.in
diff --git a/kcontrol/kfontinst/installfont.desktop b/kcontrol/tdefontinst/installfont.desktop
similarity index 100%
rename from kcontrol/kfontinst/installfont.desktop
rename to kcontrol/tdefontinst/installfont.desktop
diff --git a/kcontrol/kfontinst/kcmfontinst/CMakeLists.txt b/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt
similarity index 100%
rename from kcontrol/kfontinst/kcmfontinst/CMakeLists.txt
rename to kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
similarity index 100%
rename from kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
rename to kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h
similarity index 100%
rename from kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
rename to kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp b/kcontrol/tdefontinst/kcmfontinst/KFileFontIconView.cpp
similarity index 100%
rename from kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp
rename to kcontrol/tdefontinst/kcmfontinst/KFileFontIconView.cpp
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h b/kcontrol/tdefontinst/kcmfontinst/KFileFontIconView.h
similarity index 100%
rename from kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h
rename to kcontrol/tdefontinst/kcmfontinst/KFileFontIconView.h
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
similarity index 100%
rename from kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
rename to kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
similarity index 100%
rename from kcontrol/kfontinst/kcmfontinst/KFileFontView.h
rename to kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
diff --git a/kcontrol/kfontinst/kcmfontinst/Makefile.am b/kcontrol/tdefontinst/kcmfontinst/Makefile.am
similarity index 100%
rename from kcontrol/kfontinst/kcmfontinst/Makefile.am
rename to kcontrol/tdefontinst/kcmfontinst/Makefile.am
diff --git a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp b/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp
similarity index 100%
rename from kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
rename to kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp
diff --git a/kcontrol/kfontinst/kcmfontinst/PrintDialog.h b/kcontrol/tdefontinst/kcmfontinst/PrintDialog.h
similarity index 100%
rename from kcontrol/kfontinst/kcmfontinst/PrintDialog.h
rename to kcontrol/tdefontinst/kcmfontinst/PrintDialog.h
diff --git a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp
similarity index 100%
rename from kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
rename to kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp
diff --git a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.h b/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.h
similarity index 100%
rename from kcontrol/kfontinst/kcmfontinst/SettingsDialog.h
rename to kcontrol/tdefontinst/kcmfontinst/SettingsDialog.h
diff --git a/kcontrol/kfontinst/kcmfontinst/cr16-action-newfont.png b/kcontrol/tdefontinst/kcmfontinst/cr16-action-newfont.png
similarity index 100%
rename from kcontrol/kfontinst/kcmfontinst/cr16-action-newfont.png
rename to kcontrol/tdefontinst/kcmfontinst/cr16-action-newfont.png
diff --git a/kcontrol/kfontinst/kcmfontinst/cr22-action-newfont.png b/kcontrol/tdefontinst/kcmfontinst/cr22-action-newfont.png
similarity index 100%
rename from kcontrol/kfontinst/kcmfontinst/cr22-action-newfont.png
rename to kcontrol/tdefontinst/kcmfontinst/cr22-action-newfont.png
diff --git a/kcontrol/kfontinst/kcmfontinst/cr32-action-newfont.png b/kcontrol/tdefontinst/kcmfontinst/cr32-action-newfont.png
similarity index 100%
rename from kcontrol/kfontinst/kcmfontinst/cr32-action-newfont.png
rename to kcontrol/tdefontinst/kcmfontinst/cr32-action-newfont.png
diff --git a/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop b/kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop
similarity index 100%
rename from kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop
rename to kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop
diff --git a/kcontrol/kfontinst/lib/CMakeLists.txt b/kcontrol/tdefontinst/lib/CMakeLists.txt
similarity index 100%
rename from kcontrol/kfontinst/lib/CMakeLists.txt
rename to kcontrol/tdefontinst/lib/CMakeLists.txt
diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp
similarity index 100%
rename from kcontrol/kfontinst/lib/FcEngine.cpp
rename to kcontrol/tdefontinst/lib/FcEngine.cpp
diff --git a/kcontrol/kfontinst/lib/FcEngine.h b/kcontrol/tdefontinst/lib/FcEngine.h
similarity index 100%
rename from kcontrol/kfontinst/lib/FcEngine.h
rename to kcontrol/tdefontinst/lib/FcEngine.h
diff --git a/kcontrol/kfontinst/lib/KfiConstants.h b/kcontrol/tdefontinst/lib/KfiConstants.h
similarity index 100%
rename from kcontrol/kfontinst/lib/KfiConstants.h
rename to kcontrol/tdefontinst/lib/KfiConstants.h
diff --git a/kcontrol/kfontinst/lib/Makefile.am b/kcontrol/tdefontinst/lib/Makefile.am
similarity index 100%
rename from kcontrol/kfontinst/lib/Makefile.am
rename to kcontrol/tdefontinst/lib/Makefile.am
diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/tdefontinst/lib/Misc.cpp
similarity index 100%
rename from kcontrol/kfontinst/lib/Misc.cpp
rename to kcontrol/tdefontinst/lib/Misc.cpp
diff --git a/kcontrol/kfontinst/lib/Misc.h b/kcontrol/tdefontinst/lib/Misc.h
similarity index 100%
rename from kcontrol/kfontinst/lib/Misc.h
rename to kcontrol/tdefontinst/lib/Misc.h
diff --git a/kcontrol/kfontinst/tdefile-plugin/CMakeLists.txt b/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt
similarity index 100%
rename from kcontrol/kfontinst/tdefile-plugin/CMakeLists.txt
rename to kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt
diff --git a/kcontrol/kfontinst/tdefile-plugin/KFileFont.cpp b/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp
similarity index 100%
rename from kcontrol/kfontinst/tdefile-plugin/KFileFont.cpp
rename to kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp
diff --git a/kcontrol/kfontinst/tdefile-plugin/KFileFont.h b/kcontrol/tdefontinst/tdefile-plugin/KFileFont.h
similarity index 100%
rename from kcontrol/kfontinst/tdefile-plugin/KFileFont.h
rename to kcontrol/tdefontinst/tdefile-plugin/KFileFont.h
diff --git a/kcontrol/kfontinst/tdefile-plugin/Makefile.am b/kcontrol/tdefontinst/tdefile-plugin/Makefile.am
similarity index 100%
rename from kcontrol/kfontinst/tdefile-plugin/Makefile.am
rename to kcontrol/tdefontinst/tdefile-plugin/Makefile.am
diff --git a/kcontrol/kfontinst/tdefile-plugin/tdefile_font.desktop b/kcontrol/tdefontinst/tdefile-plugin/tdefile_font.desktop
similarity index 100%
rename from kcontrol/kfontinst/tdefile-plugin/tdefile_font.desktop
rename to kcontrol/tdefontinst/tdefile-plugin/tdefile_font.desktop
diff --git a/kcontrol/kfontinst/kfontinst/CMakeLists.txt b/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt
similarity index 100%
rename from kcontrol/kfontinst/kfontinst/CMakeLists.txt
rename to kcontrol/tdefontinst/tdefontinst/CMakeLists.txt
diff --git a/kcontrol/kfontinst/kfontinst/FontEngine.cpp b/kcontrol/tdefontinst/tdefontinst/FontEngine.cpp
similarity index 100%
rename from kcontrol/kfontinst/kfontinst/FontEngine.cpp
rename to kcontrol/tdefontinst/tdefontinst/FontEngine.cpp
diff --git a/kcontrol/kfontinst/kfontinst/FontEngine.h b/kcontrol/tdefontinst/tdefontinst/FontEngine.h
similarity index 100%
rename from kcontrol/kfontinst/kfontinst/FontEngine.h
rename to kcontrol/tdefontinst/tdefontinst/FontEngine.h
diff --git a/kcontrol/kfontinst/kfontinst/Fontmap.cpp b/kcontrol/tdefontinst/tdefontinst/Fontmap.cpp
similarity index 100%
rename from kcontrol/kfontinst/kfontinst/Fontmap.cpp
rename to kcontrol/tdefontinst/tdefontinst/Fontmap.cpp
diff --git a/kcontrol/kfontinst/kfontinst/Fontmap.h b/kcontrol/tdefontinst/tdefontinst/Fontmap.h
similarity index 100%
rename from kcontrol/kfontinst/kfontinst/Fontmap.h
rename to kcontrol/tdefontinst/tdefontinst/Fontmap.h
diff --git a/kcontrol/kfontinst/kfontinst/GetPid.c b/kcontrol/tdefontinst/tdefontinst/GetPid.c
similarity index 100%
rename from kcontrol/kfontinst/kfontinst/GetPid.c
rename to kcontrol/tdefontinst/tdefontinst/GetPid.c
diff --git a/kcontrol/kfontinst/kfontinst/Main.cpp b/kcontrol/tdefontinst/tdefontinst/Main.cpp
similarity index 100%
rename from kcontrol/kfontinst/kfontinst/Main.cpp
rename to kcontrol/tdefontinst/tdefontinst/Main.cpp
diff --git a/kcontrol/kfontinst/kfontinst/Makefile.am b/kcontrol/tdefontinst/tdefontinst/Makefile.am
similarity index 100%
rename from kcontrol/kfontinst/kfontinst/Makefile.am
rename to kcontrol/tdefontinst/tdefontinst/Makefile.am
diff --git a/kcontrol/kfontinst/kfontinst/XConfig.cpp b/kcontrol/tdefontinst/tdefontinst/XConfig.cpp
similarity index 100%
rename from kcontrol/kfontinst/kfontinst/XConfig.cpp
rename to kcontrol/tdefontinst/tdefontinst/XConfig.cpp
diff --git a/kcontrol/kfontinst/kfontinst/XConfig.h b/kcontrol/tdefontinst/tdefontinst/XConfig.h
similarity index 100%
rename from kcontrol/kfontinst/kfontinst/XConfig.h
rename to kcontrol/tdefontinst/tdefontinst/XConfig.h
diff --git a/kcontrol/kfontinst/tdeio/CMakeLists.txt b/kcontrol/tdefontinst/tdeio/CMakeLists.txt
similarity index 100%
rename from kcontrol/kfontinst/tdeio/CMakeLists.txt
rename to kcontrol/tdefontinst/tdeio/CMakeLists.txt
diff --git a/kcontrol/kfontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
similarity index 100%
rename from kcontrol/kfontinst/tdeio/KioFonts.cpp
rename to kcontrol/tdefontinst/tdeio/KioFonts.cpp
diff --git a/kcontrol/kfontinst/tdeio/KioFonts.h b/kcontrol/tdefontinst/tdeio/KioFonts.h
similarity index 100%
rename from kcontrol/kfontinst/tdeio/KioFonts.h
rename to kcontrol/tdefontinst/tdeio/KioFonts.h
diff --git a/kcontrol/kfontinst/tdeio/Makefile.am b/kcontrol/tdefontinst/tdeio/Makefile.am
similarity index 100%
rename from kcontrol/kfontinst/tdeio/Makefile.am
rename to kcontrol/tdefontinst/tdeio/Makefile.am
diff --git a/kcontrol/kfontinst/tdeio/folder.desktop b/kcontrol/tdefontinst/tdeio/folder.desktop
similarity index 100%
rename from kcontrol/kfontinst/tdeio/folder.desktop
rename to kcontrol/tdefontinst/tdeio/folder.desktop
diff --git a/kcontrol/kfontinst/tdeio/fonts.desktop b/kcontrol/tdefontinst/tdeio/fonts.desktop
similarity index 100%
rename from kcontrol/kfontinst/tdeio/fonts.desktop
rename to kcontrol/tdefontinst/tdeio/fonts.desktop
diff --git a/kcontrol/kfontinst/tdeio/fonts.protocol b/kcontrol/tdefontinst/tdeio/fonts.protocol
similarity index 100%
rename from kcontrol/kfontinst/tdeio/fonts.protocol
rename to kcontrol/tdefontinst/tdeio/fonts.protocol
diff --git a/kcontrol/kfontinst/tdeio/package.desktop b/kcontrol/tdefontinst/tdeio/package.desktop
similarity index 100%
rename from kcontrol/kfontinst/tdeio/package.desktop
rename to kcontrol/tdefontinst/tdeio/package.desktop
diff --git a/kcontrol/kfontinst/tdeio/system-folder.desktop b/kcontrol/tdefontinst/tdeio/system-folder.desktop
similarity index 100%
rename from kcontrol/kfontinst/tdeio/system-folder.desktop
rename to kcontrol/tdefontinst/tdeio/system-folder.desktop
diff --git a/kcontrol/kfontinst/thumbnail/CMakeLists.txt b/kcontrol/tdefontinst/thumbnail/CMakeLists.txt
similarity index 100%
rename from kcontrol/kfontinst/thumbnail/CMakeLists.txt
rename to kcontrol/tdefontinst/thumbnail/CMakeLists.txt
diff --git a/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
similarity index 100%
rename from kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
rename to kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
diff --git a/kcontrol/kfontinst/thumbnail/FontThumbnail.h b/kcontrol/tdefontinst/thumbnail/FontThumbnail.h
similarity index 100%
rename from kcontrol/kfontinst/thumbnail/FontThumbnail.h
rename to kcontrol/tdefontinst/thumbnail/FontThumbnail.h
diff --git a/kcontrol/kfontinst/thumbnail/Makefile.am b/kcontrol/tdefontinst/thumbnail/Makefile.am
similarity index 100%
rename from kcontrol/kfontinst/thumbnail/Makefile.am
rename to kcontrol/tdefontinst/thumbnail/Makefile.am
diff --git a/kcontrol/kfontinst/thumbnail/fontthumbnail.desktop b/kcontrol/tdefontinst/thumbnail/fontthumbnail.desktop
similarity index 100%
rename from kcontrol/kfontinst/thumbnail/fontthumbnail.desktop
rename to kcontrol/tdefontinst/thumbnail/fontthumbnail.desktop
diff --git a/kcontrol/kfontinst/viewpart/CMakeLists.txt b/kcontrol/tdefontinst/viewpart/CMakeLists.txt
similarity index 100%
rename from kcontrol/kfontinst/viewpart/CMakeLists.txt
rename to kcontrol/tdefontinst/viewpart/CMakeLists.txt
diff --git a/kcontrol/kfontinst/viewpart/FontPreview.cpp b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
similarity index 100%
rename from kcontrol/kfontinst/viewpart/FontPreview.cpp
rename to kcontrol/tdefontinst/viewpart/FontPreview.cpp
diff --git a/kcontrol/kfontinst/viewpart/FontPreview.h b/kcontrol/tdefontinst/viewpart/FontPreview.h
similarity index 100%
rename from kcontrol/kfontinst/viewpart/FontPreview.h
rename to kcontrol/tdefontinst/viewpart/FontPreview.h
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
similarity index 100%
rename from kcontrol/kfontinst/viewpart/FontViewPart.cpp
rename to kcontrol/tdefontinst/viewpart/FontViewPart.cpp
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.h b/kcontrol/tdefontinst/viewpart/FontViewPart.h
similarity index 100%
rename from kcontrol/kfontinst/viewpart/FontViewPart.h
rename to kcontrol/tdefontinst/viewpart/FontViewPart.h
diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
similarity index 100%
rename from kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp
rename to kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.h b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
similarity index 100%
rename from kcontrol/kfontinst/viewpart/FontViewPartFactory.h
rename to kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
similarity index 100%
rename from kcontrol/kfontinst/viewpart/FontViewerApp.cpp
rename to kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.h b/kcontrol/tdefontinst/viewpart/FontViewerApp.h
similarity index 100%
rename from kcontrol/kfontinst/viewpart/FontViewerApp.h
rename to kcontrol/tdefontinst/viewpart/FontViewerApp.h
diff --git a/kcontrol/kfontinst/viewpart/KfiPrint.cpp b/kcontrol/tdefontinst/viewpart/KfiPrint.cpp
similarity index 100%
rename from kcontrol/kfontinst/viewpart/KfiPrint.cpp
rename to kcontrol/tdefontinst/viewpart/KfiPrint.cpp
diff --git a/kcontrol/kfontinst/viewpart/KfiPrint.h b/kcontrol/tdefontinst/viewpart/KfiPrint.h
similarity index 100%
rename from kcontrol/kfontinst/viewpart/KfiPrint.h
rename to kcontrol/tdefontinst/viewpart/KfiPrint.h
diff --git a/kcontrol/kfontinst/viewpart/Makefile.am b/kcontrol/tdefontinst/viewpart/Makefile.am
similarity index 100%
rename from kcontrol/kfontinst/viewpart/Makefile.am
rename to kcontrol/tdefontinst/viewpart/Makefile.am
diff --git a/kcontrol/kfontinst/viewpart/kfontview.desktop b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
similarity index 100%
rename from kcontrol/kfontinst/viewpart/kfontview.desktop
rename to kcontrol/tdefontinst/viewpart/tdefontview.desktop
diff --git a/kcontrol/kfontinst/viewpart/kfontviewpart.desktop b/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop
similarity index 100%
rename from kcontrol/kfontinst/viewpart/kfontviewpart.desktop
rename to kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop
diff --git a/kcontrol/kfontinst/viewpart/kfontviewpart.rc b/kcontrol/tdefontinst/viewpart/tdefontviewpart.rc
similarity index 100%
rename from kcontrol/kfontinst/viewpart/kfontviewpart.rc
rename to kcontrol/tdefontinst/viewpart/tdefontviewpart.rc
diff --git a/kcontrol/kfontinst/viewpart/kfontviewui.rc b/kcontrol/tdefontinst/viewpart/tdefontviewui.rc
similarity index 100%
rename from kcontrol/kfontinst/viewpart/kfontviewui.rc
rename to kcontrol/tdefontinst/viewpart/tdefontviewui.rc
diff --git a/kdebugdialog/klistdebugdialog.cpp b/kdebugdialog/tdelistdebugdialog.cpp
similarity index 100%
rename from kdebugdialog/klistdebugdialog.cpp
rename to kdebugdialog/tdelistdebugdialog.cpp
diff --git a/kdebugdialog/klistdebugdialog.h b/kdebugdialog/tdelistdebugdialog.h
similarity index 100%
rename from kdebugdialog/klistdebugdialog.h
rename to kdebugdialog/tdelistdebugdialog.h
diff --git a/kdesktop/klaunch.kcfg b/kdesktop/tdelaunch.kcfg
similarity index 100%
rename from kdesktop/klaunch.kcfg
rename to kdesktop/tdelaunch.kcfg
diff --git a/kdesktop/klaunchsettings.kcfgc b/kdesktop/tdelaunchsettings.kcfgc
similarity index 100%
rename from kdesktop/klaunchsettings.kcfgc
rename to kdesktop/tdelaunchsettings.kcfgc
diff --git a/kdialog/klistboxdialog.cpp b/kdialog/tdelistboxdialog.cpp
similarity index 100%
rename from kdialog/klistboxdialog.cpp
rename to kdialog/tdelistboxdialog.cpp
diff --git a/kdialog/klistboxdialog.h b/kdialog/tdelistboxdialog.h
similarity index 100%
rename from kdialog/klistboxdialog.h
rename to kdialog/tdelistboxdialog.h
diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastastdepopup.cpp
similarity index 100%
rename from kicker/extensions/kasbar/kastaskpopup.cpp
rename to kicker/extensions/kasbar/kastastdepopup.cpp
diff --git a/kicker/extensions/kasbar/kastaskpopup.h b/kicker/extensions/kasbar/kastastdepopup.h
similarity index 100%
rename from kicker/extensions/kasbar/kastaskpopup.h
rename to kicker/extensions/kasbar/kastastdepopup.h