Rename a number of libraries and executables to avoid conflicts with KDE4

72 files changed, 147 insertions, 147 deletions

diff --git a/kcontrol/arts/CMakeLists.txt b/kcontrol/arts/CMakeLists.txt
index 616b62070..aaf41edaa 100644
--- a/kcontrol/arts/CMakeLists.txt
+++ b/kcontrol/arts/CMakeLists.txt
@@ -29,6 +29,6 @@ install( FILES arts.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_arts AUTOMOC
   SOURCES arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp
-  LINK kio-shared kmid-shared
+  LINK kio-shared tdemid-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/arts/Makefile.am b/kcontrol/arts/Makefile.am
index f4b68cfa1..3959f3109 100644
--- a/kcontrol/arts/Makefile.am
+++ b/kcontrol/arts/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_arts.la
 kcm_arts_la_SOURCES = arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp
 
 kcm_arts_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
-kcm_arts_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS) -lkmid
+kcm_arts_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS) -ltdemid
 
 AM_CPPFLAGS = -I$(kde_includes)/arts  $(all_includes)
 
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index 86086cbd9..11002cb7f 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -48,7 +48,7 @@
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
-#include <libkmid/deviceman.h>
+#include <libtdemid/deviceman.h>
 
 #include "arts.h"
 
@@ -158,7 +158,7 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
 	general = new generalTab(tab);
 	hardware = new hardwareTab(tab);
 	//mixer = TDECModuleLoader::loadModule("kmixcfg", tab);
-	//midi = new KMidConfig(tab, "kmidconfig");
+	//midi = new KMidConfig(tab, "tdemidconfig");
 
 	general->layout()->setMargin( KDialog::marginHint() );
 	hardware->layout()->setMargin( KDialog::marginHint() );
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index 164616c14..3aed1a6fd 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -311,7 +311,7 @@ wp_load:
 	    goto wp_out;
 	}
 
-        // _Don't_ use KMimeType, as it relies on ksycoca which we really
+        // _Don't_ use KMimeType, as it relies on tdesycoca which we really
         // don't want in krootimage (tdm context).
         //if ( KMimeType::findByPath( file )->is( "image/svg+xml" ) ) {
         if (file.endsWith(".svg") || file.endsWith(".svgz")) {
@@ -399,7 +399,7 @@ wp_load:
 	}
 
 	// HACK: Use KFileMetaInfo only when we're attached to DCOP.
-	// KFileMetaInfo needs ksycoca and so on, but this code is
+	// KFileMetaInfo needs tdesycoca and so on, but this code is
 	// used also in krootimage (which in turn is used by tdm).
 	if( kapp->dcopClient()->isAttached()) {
 	    KFileMetaInfo metaInfo(file);
diff --git a/kcontrol/componentchooser/componentservices/Makefile.am b/kcontrol/componentchooser/componentservices/Makefile.am
index eea682ff8..3ba55cc0c 100644
--- a/kcontrol/componentchooser/componentservices/Makefile.am
+++ b/kcontrol/componentchooser/componentservices/Makefile.am
@@ -1,3 +1,3 @@
-kcm_ktexteditor_DATA = kcm_kemail.desktop kcm_terminal.desktop kcm_browser.desktop
-kcm_ktexteditordir = $(kde_datadir)/kcm_componentchooser
+kcm_tdetexteditor_DATA = kcm_kemail.desktop kcm_terminal.desktop kcm_browser.desktop
+kcm_tdetexteditordir = $(kde_datadir)/kcm_componentchooser
 
diff --git a/kcontrol/display/CMakeLists.txt b/kcontrol/display/CMakeLists.txt
index cef021e03..84bcb2dfe 100644
--- a/kcontrol/display/CMakeLists.txt
+++ b/kcontrol/display/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES display.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_display AUTOMOC
   SOURCES display.cpp
-  LINK kutils-shared
+  LINK tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/display/display.desktop b/kcontrol/display/display.desktop
index 6c8d1c08b..a8d0bd5dc 100644
--- a/kcontrol/display/display.desktop
+++ b/kcontrol/display/display.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Exec=kcmshell display
 DocPath=kcontrol/kcmdisplay/index.html
diff --git a/kcontrol/displayconfig/CMakeLists.txt b/kcontrol/displayconfig/CMakeLists.txt
index 9f5192b9e..774743329 100644
--- a/kcontrol/displayconfig/CMakeLists.txt
+++ b/kcontrol/displayconfig/CMakeLists.txt
@@ -36,6 +36,6 @@ set_source_files_properties( displayconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CO
 tde_add_kpart( kcm_displayconfig AUTOMOC
   SOURCES
     monitorworkspace.cpp displayconfig.cpp displayconfigbase.ui displayconfig.skel
-  LINK kio-shared krandr-shared kutils-shared
+  LINK kio-shared tderandr-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/displayconfig/Makefile.am b/kcontrol/displayconfig/Makefile.am
index 55fabd507..a2c2607e4 100644
--- a/kcontrol/displayconfig/Makefile.am
+++ b/kcontrol/displayconfig/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_displayconfig.la
 
 kcm_displayconfig_la_SOURCES = displayconfig.cpp displayconfigbase.ui displayconfig.skel
 
-kcm_displayconfig_la_LDFLAGS  = $(all_libraries) -lkrandr -module -avoid-version -no-undefined
+kcm_displayconfig_la_LDFLAGS  = $(all_libraries) -ltderandr -module -avoid-version -no-undefined
 
 kcm_displayconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR)
 
diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h
index af3e971ee..3591bd93d 100644
--- a/kcontrol/displayconfig/displayconfig.h
+++ b/kcontrol/displayconfig/displayconfig.h
@@ -34,7 +34,7 @@
 
 #include <dcopobject.h>
 
-#include <libkrandr/libkrandr.h>
+#include <libtderandr/libtderandr.h>
 #include <tdehardwaredevices.h>
 
 #include "monitorworkspace.h"
diff --git a/kcontrol/dnssd/CMakeLists.txt b/kcontrol/dnssd/CMakeLists.txt
index bb9050274..e0036ba24 100644
--- a/kcontrol/dnssd/CMakeLists.txt
+++ b/kcontrol/dnssd/CMakeLists.txt
@@ -22,15 +22,15 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kcm_kdnssd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES kcm_tdednssd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 
-##### kcm_kdnssd (module) #######################
+##### kcm_tdednssd (module) #######################
 
 set_source_files_properties( kcmdnssd.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" )
 
-tde_add_kpart( kcm_kdnssd AUTOMOC
+tde_add_kpart( kcm_tdednssd AUTOMOC
   SOURCES configdialog.ui kcmdnssd.cpp
-  LINK kdnssd-shared tdeui-shared
+  LINK tdednssd-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/dnssd/Makefile.am b/kcontrol/dnssd/Makefile.am
index ef6292a94..da4ffdb5d 100644
--- a/kcontrol/dnssd/Makefile.am
+++ b/kcontrol/dnssd/Makefile.am
@@ -1,12 +1,12 @@
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
-kde_module_LTLIBRARIES =  kcm_kdnssd.la
-kcm_kdnssd_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
-kcm_kdnssd_la_SOURCES = configdialog.ui kcmdnssd.cpp kcmdnssd.h
+kde_module_LTLIBRARIES =  kcm_tdednssd.la
+kcm_tdednssd_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
+kcm_tdednssd_la_SOURCES = configdialog.ui kcmdnssd.cpp kcmdnssd.h
 
-xdg_apps_DATA = kcm_kdnssd.desktop
-kcm_kdnssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_TDEUI)
+xdg_apps_DATA = kcm_tdednssd.desktop
+kcm_tdednssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_TDEUI)
 
 messages: rc.cpp
 	$(EXTRACTRC) *.ui *.rc >> rc.cpp
-	$(XGETTEXT) $(kcm_kdnssd_la_SOURCES) rc.cpp -o $(podir)/kcmkdnssd.pot
+	$(XGETTEXT) $(kcm_tdednssd_la_SOURCES) rc.cpp -o $(podir)/kcmtdednssd.pot
diff --git a/kcontrol/dnssd/kcm_kdnssd.desktop b/kcontrol/dnssd/kcm_tdednssd.desktop
index e62c4ce01..ffa16d753 100644
--- a/kcontrol/dnssd/kcm_kdnssd.desktop
+++ b/kcontrol/dnssd/kcm_tdednssd.desktop
@@ -67,7 +67,7 @@ Comment[vi]=Cấu hình dịch vụ khám phá
 Comment[wa]=Apontiaedjes do discovraedje do siervice
 Comment[zh_CN]=配置探索服务
 Comment[zh_TW]=設定服務偵測
-Exec=kcmshell kcm_kdnssd
+Exec=kcmshell kcm_tdednssd
 GenericName=
 GenericName[ko]=일반
 Icon=network_local
@@ -146,7 +146,7 @@ Terminal=false
 Type=Application
 X-DCOP-ServiceType=
 X-TDE-HasReadOnlyMode=false
-X-TDE-Library=kdnssd
+X-TDE-Library=tdednssd
 X-TDE-ModuleType=Library
 X-TDE-ParentApp=kcontrol
 #root parts unused with Avahi
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index 37940be95..6ef87a6c0 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -34,7 +34,7 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 #include <kprocess.h>
 #include <klineedit.h>
 #include <kpassdlg.h>
@@ -51,12 +51,12 @@
 #define MDNSD_PID "/var/run/mdnsd.pid"
 
 typedef KGenericFactory<KCMDnssd, TQWidget> KCMDnssdFactory;
-K_EXPORT_COMPONENT_FACTORY( kcm_kdnssd, KCMDnssdFactory("kcmkdnssd"))
+K_EXPORT_COMPONENT_FACTORY( kcm_tdednssd, KCMDnssdFactory("kcmtdednssd"))
 
 KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
 		: ConfigDialog(parent, name), m_wdchanged(false)
 {
-	setAboutData(new TDEAboutData(I18N_NOOP("kcm_kdnssd"),
+	setAboutData(new TDEAboutData(I18N_NOOP("kcm_tdednssd"),
 	                            I18N_NOOP("ZeroConf configuration"),0,0,TDEAboutData::License_GPL,
 	                            I18N_NOOP("(C) 2004,2005 Jakub Stachowski")));
 	setQuickHelp(i18n("Setup services browsing with ZeroConf"));
@@ -65,7 +65,7 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
 		else if (getenv("TDESU_USER")!=0) tabs->removePage(tab); 
 	addConfig(DNSSD::Configuration::self(),this);
 	// it is host-wide setting so it has to be in global config file
-	domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdnssdrc" ));
+	domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdednssdrc" ));
 	domain->setGroup("publishing");
 	load();
 	connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));
diff --git a/kcontrol/filetypes/Makefile.am b/kcontrol/filetypes/Makefile.am
index 21752d05c..31a1d60a2 100644
--- a/kcontrol/filetypes/Makefile.am
+++ b/kcontrol/filetypes/Makefile.am
@@ -21,7 +21,7 @@ libfiletypes_la_SOURCES = filetypesview.cpp filetypedetails.cpp filegroupdetails
 
 keditfiletype_SOURCES = keditfiletype.cpp
 keditfiletype_LDADD = libfiletypes.la $(LIB_KIO)
-keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 messages:
 	$(XGETTEXT) *.cpp -o $(podir)/filetypes.pot
diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp
index a678e0eb2..abb973580 100644
--- a/kcontrol/filetypes/filetypedetails.cpp
+++ b/kcontrol/filetypes/filetypedetails.cpp
@@ -235,7 +235,7 @@ void FileTypeDetails::updateAskSave()
     // - images (reasoning: no need to save, most of the time, because fast to see)
     // e.g. postscript is different, because takes longer to read, so
     // it's more likely that the user might want to save it.
-    // - multipart/* ("server push", see kmultipart)
+    // - multipart/* ("server push", see tdemultipart)
     // - other strange 'internal' mimetypes like print/manager...
     if ( mime->is( "text/html" ) ||
          mime->is( "text/xml" ) ||
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index 07b023532..d641a18b0 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -22,7 +22,7 @@
 #include "filetypedetails.h"
 #include "filegroupdetails.h"
 #include "filetypesview.h"
-#include <ksycoca.h>
+#include <tdesycoca.h>
 
 FileTypesView::FileTypesView(TQWidget *p, const char *name)
   : TDECModule(p, name)
@@ -418,7 +418,7 @@ void FileTypesView::slotDatabaseChanged()
 {
   if ( KSycoca::self()->isChanged( "mime" ) )
   {
-    // ksycoca has new KMimeTypes objects for us, make sure to update
+    // tdesycoca has new KMimeTypes objects for us, make sure to update
     // our 'copies' to be in sync with it. Not important for OK, but
     // important for Apply (how to differentiate those 2?).
     // See BR 35071.
diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp
index 2750e8aab..d568a43fd 100644
--- a/kcontrol/filetypes/keditfiletype.cpp
+++ b/kcontrol/filetypes/keditfiletype.cpp
@@ -26,7 +26,7 @@
 #include <kaboutdata.h>
 #include <kdebug.h>
 #include <kcmdlineargs.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 #include <kstandarddirs.h>
 
 #ifdef Q_WS_X11
diff --git a/kcontrol/filetypes/typeslistitem.h b/kcontrol/filetypes/typeslistitem.h
index 671604961..baaff242e 100644
--- a/kcontrol/filetypes/typeslistitem.h
+++ b/kcontrol/filetypes/typeslistitem.h
@@ -89,7 +89,7 @@ public:
   bool isDirty() const;
   void sync();
   void setup();
-  void refresh(); // update m_mimetype from ksycoca when Apply is pressed
+  void refresh(); // update m_mimetype from tdesycoca when Apply is pressed
 
   static bool defaultEmbeddingSetting(  const TQString& major );
   static void reset();
diff --git a/kcontrol/iccconfig/CMakeLists.txt b/kcontrol/iccconfig/CMakeLists.txt
index 74f4c6c5c..de5a8905a 100644
--- a/kcontrol/iccconfig/CMakeLists.txt
+++ b/kcontrol/iccconfig/CMakeLists.txt
@@ -33,6 +33,6 @@ set_source_files_properties( iccconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDI
 tde_add_kpart( kcm_iccconfig AUTOMOC
   SOURCES
     iccconfig.cpp iccconfigbase.ui iccconfig.skel
-  LINK kio-shared krandr-shared
+  LINK kio-shared tderandr-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/iccconfig/Makefile.am b/kcontrol/iccconfig/Makefile.am
index 9d8aec569..098e5aae1 100644
--- a/kcontrol/iccconfig/Makefile.am
+++ b/kcontrol/iccconfig/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_iccconfig.la
 
 kcm_iccconfig_la_SOURCES = iccconfig.cpp iccconfigbase.ui iccconfig.skel
 
-kcm_iccconfig_la_LDFLAGS  = $(all_libraries) -lkrandr -module -avoid-version -no-undefined
+kcm_iccconfig_la_LDFLAGS  = $(all_libraries) -ltderandr -module -avoid-version -no-undefined
 
 kcm_iccconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR)
 
diff --git a/kcontrol/iccconfig/iccconfig.h b/kcontrol/iccconfig/iccconfig.h
index 74fe1b49d..1f8408e8f 100644
--- a/kcontrol/iccconfig/iccconfig.h
+++ b/kcontrol/iccconfig/iccconfig.h
@@ -27,7 +27,7 @@
 
 #include <dcopobject.h>
 
-#include <libkrandr/libkrandr.h>
+#include <libtderandr/libtderandr.h>
 
 #include "iccconfigbase.h"
 
diff --git a/kcontrol/kcontrol/CMakeLists.txt b/kcontrol/kcontrol/CMakeLists.txt
index 401d1d25c..b5eeb1ddd 100644
--- a/kcontrol/kcontrol/CMakeLists.txt
+++ b/kcontrol/kcontrol/CMakeLists.txt
@@ -44,7 +44,7 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK khtml-shared
+  LINK tdehtml-shared
 )
 
 tde_install_symlink( kcontrol ${BIN_INSTALL_DIR}/kinfocenter )
diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp
index 12db9e615..54db1588c 100644
--- a/kcontrol/kcontrol/aboutwidget.cpp
+++ b/kcontrol/kcontrol/aboutwidget.cpp
@@ -30,7 +30,7 @@
 #include <kpixmapeffect.h>
 #include <kcursor.h>
 #include <kglobalsettings.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kapplication.h>
 #include <kiconloader.h>
 
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
index 14cb8ee58..c3d64c7b0 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
@@ -39,7 +39,7 @@
 #include <kconfig.h>
 #include <kio/job.h>
 #ifdef HAVE_XFT
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #endif
 
 class KDirOperator;
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
index 03158eff7..0d05799d9 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
@@ -475,7 +475,7 @@ TQDragObject *CKFileFontView::dragObject()
         urls.append( (*it)->url() );
 
     if(urls.count()> 1)
-        pixmap = DesktopIcon("kmultiple", KIcon::SizeSmall);
+        pixmap = DesktopIcon("tdemultiple", KIcon::SizeSmall);
     if(pixmap.isNull())
         pixmap = currentFileItem()->pixmap(KIcon::SizeSmall);
 
diff --git a/kcontrol/kfontinst/viewpart/CMakeLists.txt b/kcontrol/kfontinst/viewpart/CMakeLists.txt
index 630d1aff4..7fb621fec 100644
--- a/kcontrol/kfontinst/viewpart/CMakeLists.txt
+++ b/kcontrol/kfontinst/viewpart/CMakeLists.txt
@@ -33,7 +33,7 @@ install( FILES kfontviewpart.rc kfontviewui.rc DESTINATION ${DATA_INSTALL_DIR}/k
 
 tde_add_kpart( libkfontviewpart AUTOMOC
   SOURCES FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp
-  LINK kfontinstprint-static kfontinst-shared kparts-shared
+  LINK kfontinstprint-static kfontinst-shared tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -42,7 +42,7 @@ tde_add_kpart( libkfontviewpart AUTOMOC
 
 tde_add_executable( kfontview AUTOMOC
   SOURCES FontViewerApp.cpp
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.h b/kcontrol/kfontinst/viewpart/FontViewPart.h
index 21de2e074..1e4500c5a 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.h
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.h
@@ -29,7 +29,7 @@
 // (C) Craig Drummond, 2002, 2003, 2004
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 class TQPushButton;
 class TQFrame;
diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.h b/kcontrol/kfontinst/viewpart/FontViewerApp.h
index 0364e0bbd..150c8ccab 100644
--- a/kcontrol/kfontinst/viewpart/FontViewerApp.h
+++ b/kcontrol/kfontinst/viewpart/FontViewerApp.h
@@ -30,8 +30,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <kapplication.h>
-#include <kparts/part.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/part.h>
+#include <tdeparts/mainwindow.h>
 
 namespace KFI
 {
diff --git a/kcontrol/kfontinst/viewpart/Makefile.am b/kcontrol/kfontinst/viewpart/Makefile.am
index 011f057ec..dc6bbd115 100644
--- a/kcontrol/kfontinst/viewpart/Makefile.am
+++ b/kcontrol/kfontinst/viewpart/Makefile.am
@@ -17,7 +17,7 @@ AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFR
 METASOURCES = AUTO
 
 kfontview_LDADD = $(LIB_KPARTS)
-kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 bin_PROGRAMS = kfontview
 xdg_apps_DATA = kfontview.desktop
diff --git a/kcontrol/kicker/CMakeLists.txt b/kcontrol/kicker/CMakeLists.txt
index e0746d5b4..648df7c2a 100644
--- a/kcontrol/kicker/CMakeLists.txt
+++ b/kcontrol/kicker/CMakeLists.txt
@@ -77,6 +77,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK bgnd-static kickermain-shared kutils-shared
+  LINK bgnd-static kickermain-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/kio/CMakeLists.txt b/kcontrol/kio/CMakeLists.txt
index 79be7a766..aa0d185e3 100644
--- a/kcontrol/kio/CMakeLists.txt
+++ b/kcontrol/kio/CMakeLists.txt
@@ -50,6 +50,6 @@ tde_add_kpart( kcm_kio AUTOMOC
       kproxydlg_ui.ui kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui
       policydlg_ui.ui useragentdlg_ui.ui uagentproviderdlg_ui.ui
       manualproxy_ui.ui envvarproxy_ui.ui cache_ui.ui
-  LINK kio-shared kutils-shared
+  LINK kio-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp
index bc9c63cc5..f8e97e573 100644
--- a/kcontrol/knotify/knotify.cpp
+++ b/kcontrol/knotify/knotify.cpp
@@ -31,7 +31,7 @@
 #include <kcombobox.h>
 #include <kconfig.h>
 #include <knotifydialog.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 #include <kstandarddirs.h>
 #include <kurlcompletion.h>
 #include <kurlrequester.h>
diff --git a/kcontrol/konq/CMakeLists.txt b/kcontrol/konq/CMakeLists.txt
index b77e3bf93..d7b12811f 100644
--- a/kcontrol/konq/CMakeLists.txt
+++ b/kcontrol/konq/CMakeLists.txt
@@ -45,6 +45,6 @@ tde_add_kpart( kcm_konq AUTOMOC
     behaviour.cpp desktop.cpp desktopbehavior_impl.cpp
     previews.cpp browser.cpp main.cpp rootopts.cpp
     fontopts.cpp  desktopbehavior.ui
-  LINK kio-shared kutils-shared
+  LINK kio-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/konqhtml/CMakeLists.txt b/kcontrol/konqhtml/CMakeLists.txt
index 77f295aae..097ba8221 100644
--- a/kcontrol/konqhtml/CMakeLists.txt
+++ b/kcontrol/konqhtml/CMakeLists.txt
@@ -24,8 +24,8 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    khtml_behavior.desktop khtml_java_js.desktop
-    khtml_fonts.desktop khtml_filter.desktop
+    tdehtml_behavior.desktop tdehtml_java_js.desktop
+    tdehtml_fonts.desktop tdehtml_filter.desktop
   DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 install(
@@ -36,7 +36,7 @@ install(
 install(
   FILES uninstall.desktop
   DESTINATION ${APPS_INSTALL_DIR}/Settings/WebBrowsing
-  RENAME khtml_appearance.desktop )
+  RENAME tdehtml_appearance.desktop )
 
 ##### kcm_konqhtml (module) #####################
 
@@ -48,6 +48,6 @@ tde_add_kpart( kcm_konqhtml AUTOMOC
     jspolicies.cpp nsconfigwidget.ui policies.cpp
     domainlistview.cpp advancedTabOptions.ui
     filteropts.cpp
-  LINK khtml-shared
+  LINK tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/konqhtml/Makefile.am b/kcontrol/konqhtml/Makefile.am
index a16c324e4..151e22aff 100644
--- a/kcontrol/konqhtml/Makefile.am
+++ b/kcontrol/konqhtml/Makefile.am
@@ -13,9 +13,9 @@ kcm_konqhtml_la_SOURCES = advancedTabDialog.cpp htmlopts.cpp jsopts.cpp \
 			     filteropts.cpp
 
 kcm_konqhtml_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
-kcm_konqhtml_la_LIBADD = -lkhtml -ltdeui
+kcm_konqhtml_la_LIBADD = -ltdehtml -ltdeui
 
-xdg_apps_DATA = khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop khtml_filter.desktop
+xdg_apps_DATA = tdehtml_behavior.desktop tdehtml_java_js.desktop tdehtml_fonts.desktop tdehtml_filter.desktop
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kcmkonqhtml.pot
@@ -23,4 +23,4 @@ messages: rc.cpp
 install-data-local: uninstall.desktop
 	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing
 	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/nsplugin.desktop
-	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/khtml_appearance.desktop
+	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/tdehtml_appearance.desktop
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index 78619d818..163bdd4f4 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -14,7 +14,7 @@
 #include <kdialog.h>
 #include <kfontcombo.h>
 #include <kglobal.h>
-#include <khtmldefaults.h>
+#include <tdehtmldefaults.h>
 #include <klocale.h>
 #include <knuminput.h>
 
@@ -320,15 +320,15 @@ void KAppearanceOptions::load()
 
 void KAppearanceOptions::load( bool useDefaults )
 {
-    TDEConfig khtmlrc("khtmlrc", true, false);
+    TDEConfig tdehtmlrc("tdehtmlrc", true, false);
 	 m_pConfig->setReadDefaults( useDefaults );
 
-	 khtmlrc.setReadDefaults( useDefaults );
+	 tdehtmlrc.setReadDefaults( useDefaults );
 
-#define SET_GROUP(x) m_pConfig->setGroup(x); khtmlrc.setGroup(x)
-#define READ_NUM(x,y) m_pConfig->readNumEntry(x, khtmlrc.readNumEntry(x, y))
-#define READ_ENTRY(x,y) m_pConfig->readEntry(x, khtmlrc.readEntry(x, y))
-#define READ_LIST(x) m_pConfig->readListEntry(x, khtmlrc.readListEntry(x))
+#define SET_GROUP(x) m_pConfig->setGroup(x); tdehtmlrc.setGroup(x)
+#define READ_NUM(x,y) m_pConfig->readNumEntry(x, tdehtmlrc.readNumEntry(x, y))
+#define READ_ENTRY(x,y) m_pConfig->readEntry(x, tdehtmlrc.readEntry(x, y))
+#define READ_LIST(x) m_pConfig->readListEntry(x, tdehtmlrc.readListEntry(x))
 
     SET_GROUP(m_groupname);
     fSize = READ_NUM( "MediumFontSize", 12 );
@@ -348,7 +348,7 @@ void KAppearanceOptions::load( bool useDefaults )
     if (m_pConfig->hasKey("Fonts"))
        fonts = m_pConfig->readListEntry( "Fonts" );
     else
-       fonts = khtmlrc.readListEntry( "Fonts" );
+       fonts = tdehtmlrc.readListEntry( "Fonts" );
     while (fonts.count() < 7)
        fonts.append(TQString::null);
 
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index 153692082..ada8f31a6 100644
--- a/kcontrol/konqhtml/htmlopts.cpp
+++ b/kcontrol/konqhtml/htmlopts.cpp
@@ -230,13 +230,13 @@ void KMiscHTMLOptions::load()
 
 void KMiscHTMLOptions::load( bool useDefaults )
 {
-    TDEConfig khtmlrc("khtmlrc", true, false);
-    khtmlrc.setReadDefaults( useDefaults );
+    TDEConfig tdehtmlrc("tdehtmlrc", true, false);
+    tdehtmlrc.setReadDefaults( useDefaults );
 	 m_pConfig->setReadDefaults( useDefaults );
 
-#define SET_GROUP(x) m_pConfig->setGroup(x); khtmlrc.setGroup(x)
-#define READ_BOOL(x,y) m_pConfig->readBoolEntry(x, khtmlrc.readBoolEntry(x, y))
-#define READ_ENTRY(x) m_pConfig->readEntry(x, khtmlrc.readEntry(x))
+#define SET_GROUP(x) m_pConfig->setGroup(x); tdehtmlrc.setGroup(x)
+#define READ_BOOL(x,y) m_pConfig->readBoolEntry(x, tdehtmlrc.readBoolEntry(x, y))
+#define READ_ENTRY(x) m_pConfig->readEntry(x, tdehtmlrc.readEntry(x))
 
 
     // *** load ***
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp
index 68b20fd2f..617f79f6f 100644
--- a/kcontrol/konqhtml/javaopts.cpp
+++ b/kcontrol/konqhtml/javaopts.cpp
@@ -17,7 +17,7 @@
 #include <kdebug.h>
 #include <klineedit.h>
 #include <klocale.h>
-#include <khtml_settings.h>
+#include <tdehtml_settings.h>
 #include <knuminput.h>
 
 #include <tqlayout.h>
diff --git a/kcontrol/konqhtml/jspolicies.h b/kcontrol/konqhtml/jspolicies.h
index 7f3e400fa..3f434e682 100644
--- a/kcontrol/konqhtml/jspolicies.h
+++ b/kcontrol/konqhtml/jspolicies.h
@@ -25,7 +25,7 @@
 #include <tqgroupbox.h>
 #include <tqstring.h>
 
-#include <khtml_settings.h>
+#include <tdehtml_settings.h>
 
 #include "policies.h"
 
diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp
index 35a958b46..45559809b 100644
--- a/kcontrol/konqhtml/main.cpp
+++ b/kcontrol/konqhtml/main.cpp
@@ -43,33 +43,33 @@
 
 extern "C"
 {
-	KDE_EXPORT TDECModule *create_khtml_behavior(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_tdehtml_behavior(TQWidget *parent, const char *name)
 	{
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KMiscHTMLOptions(c, "HTML Settings", parent, name);
 	}
 
-	KDE_EXPORT TDECModule *create_khtml_fonts(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_tdehtml_fonts(TQWidget *parent, const char *name)
 	{
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KAppearanceOptions(c, "HTML Settings", parent, name);
 	}
 
-	KDE_EXPORT TDECModule *create_khtml_java_js(TQWidget *parent, const char* /*name*/)
+	KDE_EXPORT TDECModule *create_tdehtml_java_js(TQWidget *parent, const char* /*name*/)
 	{
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KJSParts(c, parent, "kcmkonqhtml");
 	}
 
-	KDE_EXPORT TDECModule *create_khtml_plugins(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_tdehtml_plugins(TQWidget *parent, const char *name)
 	{
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KPluginOptions(c, "Java/JavaScript Settings", parent, name);
 	}
 
-        KDE_EXPORT TDECModule *create_khtml_filter(TQWidget *parent, const char *name )
+        KDE_EXPORT TDECModule *create_tdehtml_filter(TQWidget *parent, const char *name )
         {
-	    TDEConfig *c = new TDEConfig( "khtmlrc", false, false );
+	    TDEConfig *c = new TDEConfig( "tdehtmlrc", false, false );
             return new KCMFilter(c, "Filter Settings", parent, name);
         }
 }
diff --git a/kcontrol/konqhtml/khtml_behavior.desktop b/kcontrol/konqhtml/tdehtml_behavior.desktop
index a4cb670ba..01488fad4 100644
--- a/kcontrol/konqhtml/khtml_behavior.desktop
+++ b/kcontrol/konqhtml/tdehtml_behavior.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/khtml/index.html#kbrowse-html
+DocPath=kcontrol/tdehtml/index.html#kbrowse-html
 Icon=konqueror
-Exec=kcmshell khtml_behavior
+Exec=kcmshell tdehtml_behavior
 
 
 X-TDE-Library=konqhtml
-X-TDE-FactoryName=khtml_behavior
+X-TDE-FactoryName=tdehtml_behavior
 
 Name=Web Behavior
 Name[af]=Web Gedrag
diff --git a/kcontrol/konqhtml/khtml_filter.desktop b/kcontrol/konqhtml/tdehtml_filter.desktop
index ac56dcc15..e23404714 100644
--- a/kcontrol/konqhtml/khtml_filter.desktop
+++ b/kcontrol/konqhtml/tdehtml_filter.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/khtml/index.html#khtml-adblock
+DocPath=kcontrol/tdehtml/index.html#tdehtml-adblock
 Icon=filter
-Exec=kcmshell khtml_filter
+Exec=kcmshell tdehtml_filter
 
 X-TDE-Library=konqhtml
-X-TDE-FactoryName=khtml_filter
+X-TDE-FactoryName=tdehtml_filter
 
 Name=AdBlocK Filters
 Name[af]=Advertensie blok filters
diff --git a/kcontrol/konqhtml/khtml_fonts.desktop b/kcontrol/konqhtml/tdehtml_fonts.desktop
index 468899be9..341508848 100644
--- a/kcontrol/konqhtml/khtml_fonts.desktop
+++ b/kcontrol/konqhtml/tdehtml_fonts.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/khtml/index.html#kbrowse-appearance
+DocPath=kcontrol/tdehtml/index.html#kbrowse-appearance
 Icon=fonts
-Exec=kcmshell khtml_fonts
+Exec=kcmshell tdehtml_fonts
 
 
 X-TDE-Library=konqhtml
-X-TDE-FactoryName=khtml_fonts
+X-TDE-FactoryName=tdehtml_fonts
 
 Name=Fonts
 Name[af]=Skriftipes
diff --git a/kcontrol/konqhtml/khtml_java_js.desktop b/kcontrol/konqhtml/tdehtml_java_js.desktop
index 3a29299d6..e0477c0e6 100644
--- a/kcontrol/konqhtml/khtml_java_js.desktop
+++ b/kcontrol/konqhtml/tdehtml_java_js.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/khtml/index.html#kbrowse-java
+DocPath=kcontrol/tdehtml/index.html#kbrowse-java
 Icon=konqueror
-Exec=kcmshell khtml_java_js
+Exec=kcmshell tdehtml_java_js
 
 
 X-TDE-Library=konqhtml
-X-TDE-FactoryName=khtml_java_js
+X-TDE-FactoryName=tdehtml_java_js
 
 Name=Java & JavaScript
 Name[af]=Java & Javaskrip
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index f4b7835bb..4a4817041 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -398,7 +398,7 @@ void kthememanager::queryLNFModules()
     dlg->btnStyle->setIconSet( il->loadIconSet( "style", KIcon::Desktop, 32 ) );
     dlg->btnIcons->setIconSet( il->loadIconSet( "icons", KIcon::Desktop, 32 ) );
     dlg->btnFonts->setIconSet( il->loadIconSet( "fonts", KIcon::Desktop, 32 ) );
-    dlg->btnSaver->setIconSet( il->loadIconSet( "kscreensaver", KIcon::Desktop, 32 ) );
+    dlg->btnSaver->setIconSet( il->loadIconSet( "tdescreensaver", KIcon::Desktop, 32 ) );
 }
 
 void kthememanager::updatePreview( const TQString & pixFile )
diff --git a/kcontrol/pics/cr128-app-kscreensaver.png b/kcontrol/pics/cr128-app-tdescreensaver.png
index e8f036fe3..e8f036fe3 100644
--- a/kcontrol/pics/cr128-app-kscreensaver.png
+++ b/kcontrol/pics/cr128-app-tdescreensaver.png
diff --git a/kcontrol/pics/cr16-app-kscreensaver.png b/kcontrol/pics/cr16-app-tdescreensaver.png
index 200fe3dcc..200fe3dcc 100644
--- a/kcontrol/pics/cr16-app-kscreensaver.png
+++ b/kcontrol/pics/cr16-app-tdescreensaver.png
diff --git a/kcontrol/pics/cr22-app-kscreensaver.png b/kcontrol/pics/cr22-app-tdescreensaver.png
index 7448fe237..7448fe237 100644
--- a/kcontrol/pics/cr22-app-kscreensaver.png
+++ b/kcontrol/pics/cr22-app-tdescreensaver.png
diff --git a/kcontrol/pics/cr32-app-kscreensaver.png b/kcontrol/pics/cr32-app-tdescreensaver.png
index f527126bc..f527126bc 100644
--- a/kcontrol/pics/cr32-app-kscreensaver.png
+++ b/kcontrol/pics/cr32-app-tdescreensaver.png
diff --git a/kcontrol/pics/cr48-app-kscreensaver.png b/kcontrol/pics/cr48-app-tdescreensaver.png
index 749f42253..749f42253 100644
--- a/kcontrol/pics/cr48-app-kscreensaver.png
+++ b/kcontrol/pics/cr48-app-tdescreensaver.png
diff --git a/kcontrol/pics/cr64-app-kscreensaver.png b/kcontrol/pics/cr64-app-tdescreensaver.png
index 69c8214fb..69c8214fb 100644
--- a/kcontrol/pics/cr64-app-kscreensaver.png
+++ b/kcontrol/pics/cr64-app-tdescreensaver.png
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index 3367bbaa1..e4433ff8f 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -103,7 +103,7 @@ bool KPrivacyManager::clearSavedClipboardContents()
 
 bool KPrivacyManager::clearFormCompletion() const
 {
-  TQFile completionFile(locateLocal("data", "khtml/formcompletions"));
+  TQFile completionFile(locateLocal("data", "tdehtml/formcompletions"));
 
   return completionFile.remove();
 }
diff --git a/kcontrol/randr/CMakeLists.txt b/kcontrol/randr/CMakeLists.txt
index 3e816f2fb..d1f31af8c 100644
--- a/kcontrol/randr/CMakeLists.txt
+++ b/kcontrol/randr/CMakeLists.txt
@@ -22,26 +22,26 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES krandrtray.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES tderandrtray.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 install( FILES randr.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden )
-install( FILES krandrtray-autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
+install( FILES tderandrtray-autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
 
 
 ##### kcm_randr (module) ########################
 
 tde_add_kpart( kcm_randr AUTOMOC
-  SOURCES krandrmodule.cpp
-  LINK tdeui-shared krandr-shared
+  SOURCES tderandrmodule.cpp
+  LINK tdeui-shared tderandr-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
 
-##### krandrtray (executable) ###################
+##### tderandrtray (executable) ###################
 
-tde_add_executable( krandrtray AUTOMOC
+tde_add_executable( tderandrtray AUTOMOC
   SOURCES
-    main.cpp krandrtray.cpp krandrapp.cpp
-    krandrpassivepopup.cpp configdialog.cpp
-  LINK kutils-shared krandr-shared
+    main.cpp tderandrtray.cpp tderandrapp.cpp
+    tderandrpassivepopup.cpp configdialog.cpp
+  LINK tdeutils-shared tderandr-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kcontrol/randr/Makefile.am b/kcontrol/randr/Makefile.am
index fb55f8da7..d1f137140 100644
--- a/kcontrol/randr/Makefile.am
+++ b/kcontrol/randr/Makefile.am
@@ -5,32 +5,32 @@ kde_module_LTLIBRARIES = kcm_randr.la
 
 METASOURCES = AUTO
 
-kcm_randr_la_SOURCES = krandrmodule.cpp
+kcm_randr_la_SOURCES = tderandrmodule.cpp
 kcm_randr_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
 kcm_randr_la_LIBADD = $(LIB_TDEUI) $(LIB_XRANDR)
 
-noinst_HEADERS = krandrmodule.h krandrtray.h krandrapp.h \
-    krandrpassivepopup.h configdialog.h
+noinst_HEADERS = tderandrmodule.h tderandrtray.h tderandrapp.h \
+    tderandrpassivepopup.h configdialog.h
 
-xdg_apps_DATA = krandrtray.desktop
+xdg_apps_DATA = tderandrtray.desktop
 
-krandr_data_DATA = randr.desktop
-krandr_datadir = $(kde_appsdir)/.hidden
+tderandr_data_DATA = randr.desktop
+tderandr_datadir = $(kde_appsdir)/.hidden
 
 # Autostart
 autostartdir = $(prefix)/share/autostart
-autostart_DATA = krandrtray-autostart.desktop
+autostart_DATA = tderandrtray-autostart.desktop
 
 #install-data-local: uninstall.desktop
 #	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Settings/Desktop
 #	$(INSTALL_DATA) $(srcdir)/uninstall.desktop
-#	$(DESTDIR)$(kde_appsdir)/Settings/Desktop/krandrmodule.desktop
+#	$(DESTDIR)$(kde_appsdir)/Settings/Desktop/tderandrmodule.desktop
 
-bin_PROGRAMS = krandrtray
+bin_PROGRAMS = tderandrtray
 
-krandrtray_SOURCES = main.cpp krandrtray.cpp krandrapp.cpp krandrpassivepopup.cpp configdialog.cpp
-krandrtray_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lkrandr
-krandrtray_LDADD = $(LIB_KFILE) $(LIB_KUTILS) $(LIB_XRANDR)
+tderandrtray_SOURCES = main.cpp tderandrtray.cpp tderandrapp.cpp tderandrpassivepopup.cpp configdialog.cpp
+tderandrtray_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltderandr
+tderandrtray_LDADD = $(LIB_KFILE) $(LIB_KUTILS) $(LIB_XRANDR)
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/krandr.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tderandr.pot
diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp
index 708587527..f2344f1c0 100644
--- a/kcontrol/randr/configdialog.cpp
+++ b/kcontrol/randr/configdialog.cpp
@@ -31,7 +31,7 @@
 #include <kpopupmenu.h>
 #include <twinmodule.h>
 #include <kregexpeditorinterface.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include "configdialog.h"
 
@@ -42,7 +42,7 @@ ConfigDialog::ConfigDialog(TDEGlobalAccel *accel,
                     Ok, 0L, "config dialog" )
 {
     if ( isApplet )
-        setHelp( TQString::null, "krandrtray" );
+        setHelp( TQString::null, "tderandrtray" );
 
     TQFrame *w = 0L; // the parent for the widgets
 
diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp
index 1e8edc83e..d606940fc 100644
--- a/kcontrol/randr/main.cpp
+++ b/kcontrol/randr/main.cpp
@@ -24,9 +24,9 @@
 #include <kaboutdata.h>
 #include <kglobal.h>
 
-#include "krandrapp.h"
+#include "tderandrapp.h"
 
-static const char krandrtrayVersion[] = "0.5";
+static const char tderandrtrayVersion[] = "0.5";
 static const KCmdLineOptions options[] =
 {
 	{ "login", I18N_NOOP("Application is being auto-started at TDE session start"), 0L },
@@ -35,12 +35,12 @@ static const KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-	TDEAboutData aboutData("randr", I18N_NOOP("Resize and Rotate"), krandrtrayVersion, I18N_NOOP("Resize and Rotate System Tray App"), TDEAboutData::License_GPL, "(c) 2009,2010 Timothy Pearson", 0L, "");
+	TDEAboutData aboutData("randr", I18N_NOOP("Resize and Rotate"), tderandrtrayVersion, I18N_NOOP("Resize and Rotate System Tray App"), TDEAboutData::License_GPL, "(c) 2009,2010 Timothy Pearson", 0L, "");
 	aboutData.addAuthor("Timothy Pearson",I18N_NOOP("Developer and maintainer"), "[email protected]");
 	aboutData.addAuthor("Hamish Rodda",I18N_NOOP("Original developer and maintainer"), "[email protected]");
 	aboutData.addCredit("Lubos Lunak",I18N_NOOP("Many fixes"), "[email protected]");
-	aboutData.setProductName("krandr/krandrtray");
-	TDEGlobal::locale()->setMainCatalogue("krandr");
+	aboutData.setProductName("tderandr/tderandrtray");
+	TDEGlobal::locale()->setMainCatalogue("tderandr");
 
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions(options);
diff --git a/kcontrol/randr/krandrapp.cpp b/kcontrol/randr/tderandrapp.cpp
index f5cfbbde1..e2a4b46f2 100644
--- a/kcontrol/randr/krandrapp.cpp
+++ b/kcontrol/randr/tderandrapp.cpp
@@ -18,10 +18,10 @@
 
 #include <kdebug.h>
 
-#include "krandrapp.h"
-#include "krandrapp.moc"
+#include "tderandrapp.h"
+#include "tderandrapp.moc"
 
-#include "krandrtray.h"
+#include "tderandrtray.h"
 
 #include <X11/Xlib.h>
 
diff --git a/kcontrol/randr/krandrapp.h b/kcontrol/randr/tderandrapp.h
index 766b0056c..766b0056c 100644
--- a/kcontrol/randr/krandrapp.h
+++ b/kcontrol/randr/tderandrapp.h
diff --git a/kcontrol/randr/krandrbindings.cpp b/kcontrol/randr/tderandrbindings.cpp
index d71057748..b7df41602 100644
--- a/kcontrol/randr/krandrbindings.cpp
+++ b/kcontrol/randr/tderandrbindings.cpp
@@ -26,7 +26,7 @@
 #endif
 #define WIN KKey::QtWIN
 
-	keys->insert( "Program:krandrtray", i18n("Display Control") );
+	keys->insert( "Program:tderandrtray", i18n("Display Control") );
 
 	DEF( I18N_NOOP("Switch Displays"), KShortcut(TQString("XF86Display")), KShortcut(TQString("XF86Display")), slotCycleDisplays() );
 
diff --git a/kcontrol/randr/krandrinithack.cpp b/kcontrol/randr/tderandrinithack.cpp
index e69de29bb..e69de29bb 100644
--- a/kcontrol/randr/krandrinithack.cpp
+++ b/kcontrol/randr/tderandrinithack.cpp
diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/tderandrmodule.cpp
index 3eaf46f8b..9da8a569b 100644
--- a/kcontrol/randr/krandrmodule.cpp
+++ b/kcontrol/randr/tderandrmodule.cpp
@@ -36,15 +36,15 @@
 #include <kglobal.h>
 #include <klocale.h>
 
-#include "krandrmodule.h"
-#include "krandrmodule.moc"
+#include "tderandrmodule.h"
+#include "tderandrmodule.moc"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
 
 // DLL Interface for kcontrol
 typedef KGenericFactory<KRandRModule, TQWidget > KSSFactory;
-K_EXPORT_COMPONENT_FACTORY (kcm_randr, KSSFactory("krandr") )
+K_EXPORT_COMPONENT_FACTORY (kcm_randr, KSSFactory("tderandr") )
 extern "C"
 
 {
diff --git a/kcontrol/randr/krandrmodule.h b/kcontrol/randr/tderandrmodule.h
index 53d428fe1..188b4ea1d 100644
--- a/kcontrol/randr/krandrmodule.h
+++ b/kcontrol/randr/tderandrmodule.h
@@ -19,7 +19,7 @@
 #ifndef KRANDRMODULE_H
 #define KRANDRMODULE_H
 
-#include <libkrandr/libkrandr.h>
+#include <libtderandr/libtderandr.h>
 
 class TQButtonGroup;
 class KComboBox;
diff --git a/kcontrol/randr/krandrpassivepopup.cpp b/kcontrol/randr/tderandrpassivepopup.cpp
index 12d9f8a3f..16e3d75ba 100644
--- a/kcontrol/randr/krandrpassivepopup.cpp
+++ b/kcontrol/randr/tderandrpassivepopup.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "krandrpassivepopup.h"
+#include "tderandrpassivepopup.h"
 
 #include <kapplication.h>
 
@@ -115,4 +115,4 @@ void KRandrPassivePopup::slotPositionSelf()
     positionSelf();
     }
     
-#include "krandrpassivepopup.moc"
+#include "tderandrpassivepopup.moc"
diff --git a/kcontrol/randr/krandrpassivepopup.h b/kcontrol/randr/tderandrpassivepopup.h
index 3b1d4b4f6..3b1d4b4f6 100644
--- a/kcontrol/randr/krandrpassivepopup.h
+++ b/kcontrol/randr/tderandrpassivepopup.h
diff --git a/kcontrol/randr/krandrtray-autostart.desktop b/kcontrol/randr/tderandrtray-autostart.desktop
index 0273a80cc..1c3f20403 100644
--- a/kcontrol/randr/krandrtray-autostart.desktop
+++ b/kcontrol/randr/tderandrtray-autostart.desktop
@@ -134,11 +134,11 @@ Comment[vi]=Đổi cỡ và quay màn hình X.
 Comment[wa]=Candjî l' grandeu eyet tourner les waitroûles X.
 Comment[zh_CN]=更改 X 屏幕的大小和旋转。
 Comment[zh_TW]=調整大小及旋轉 X 螢幕。
-Exec=krandrtray
+Exec=tderandrtray
 Icon=randr
 X-TDE-autostart-after=panel
 X-TDE-StartupNotify=false
 X-TDE-UniqueApplet=true
-X-TDE-autostart-condition=krandrtrayrc:General:Autostart:true
+X-TDE-autostart-condition=tderandrtrayrc:General:Autostart:true
 Categories=System;Applet;
 
diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index f30e3102a..42151d87e 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -39,9 +39,9 @@
 
 #include "configdialog.h"
 
-#include "krandrtray.h"
-#include "krandrpassivepopup.h"
-#include "krandrtray.moc"
+#include "tderandrtray.h"
+#include "tderandrpassivepopup.h"
+#include "tderandrtray.moc"
 
 #define OUTPUT_CONNECTED		(1 << 0)
 #define OUTPUT_UNKNOWN			(1 << 1)
@@ -63,7 +63,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 	//printf("Reading configuration...\n\r");
 	globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
 	TDEGlobalAccel* keys = globalKeys;
-#include "krandrbindings.cpp"
+#include "tderandrbindings.cpp"
 	// the keys need to be read from kdeglobals, not kickerrc
 	globalKeys->readSettings();
 	globalKeys->setEnabled(true);
@@ -95,12 +95,12 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 }
 
 /*!
- * \b TQT_SLOT which called if krandrtray is exited by the user. In this case the user
+ * \b TQT_SLOT which called if tderandrtray is exited by the user. In this case the user
  * is asked through a yes/no box if "KRandRTray should start automatically on log in" and the
  * result is written to the KDE configfile.
  */
 void KRandRSystemTray::_quit (){
-	r_config = new KSimpleConfig("krandrtrayrc");
+	r_config = new KSimpleConfig("tderandrtrayrc");
 
 	TQString tmp1 = i18n ("Start KRandRTray automatically when you log in?");
 	int tmp2 = KMessageBox::questionYesNo ( 0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start"));
diff --git a/kcontrol/randr/krandrtray.desktop b/kcontrol/randr/tderandrtray.desktop
index a61f8c28c..5479287b4 100644
--- a/kcontrol/randr/krandrtray.desktop
+++ b/kcontrol/randr/tderandrtray.desktop
@@ -134,7 +134,7 @@ Comment[vi]=Đổi cỡ và quay màn hình X.
 Comment[wa]=Candjî l' grandeu eyet tourner les waitroûles X.
 Comment[zh_CN]=更改 X 屏幕的大小和旋转。
 Comment[zh_TW]=調整大小及旋轉 X 螢幕。
-Exec=krandrtray
+Exec=tderandrtray
 Icon=randr
 Type=Application
 OnlyShowIn=TDE;
diff --git a/kcontrol/randr/krandrtray.h b/kcontrol/randr/tderandrtray.h
index 8a910f373..320f0cb1c 100644
--- a/kcontrol/randr/krandrtray.h
+++ b/kcontrol/randr/tderandrtray.h
@@ -24,7 +24,7 @@
 #include <ksystemtray.h>
 #include <kglobalaccel.h>
 
-#include <libkrandr/libkrandr.h>
+#include <libtderandr/libtderandr.h>
 #include <tdehardwaredevices.h>
 
 class KHelpMenu;
diff --git a/kcontrol/screensaver/screensaver.desktop b/kcontrol/screensaver/screensaver.desktop
index f111fb676..566a8c506 100644
--- a/kcontrol/screensaver/screensaver.desktop
+++ b/kcontrol/screensaver/screensaver.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kcmshell screensaver
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 DocPath=kcontrol/screensaver/index.html
 
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index 4efb38e90..ba3c0eb66 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -506,7 +506,7 @@ void KScreenSaver::findSavers()
                 TQListViewItem *categoryItem = mSaverListView->findItem( s->category(), 0 );
                 if ( !categoryItem ) {
                     categoryItem = new TQListViewItem ( mSaverListView, s->category(), "1" + s->category() );
-                    categoryItem->setPixmap ( 0, SmallIcon ( "kscreensaver" ) );
+                    categoryItem->setPixmap ( 0, SmallIcon ( "tdescreensaver" ) );
                 }
                 item = new TQListViewItem ( categoryItem, s->name(), s->name() );
                 categoryCount++;
@@ -712,7 +712,7 @@ void KScreenSaver::slotSetup()
             (*mSetupProc) << word;
             word = "-icon";
             (*mSetupProc) << word;
-            word = "kscreensaver";
+            word = "tdescreensaver";
             (*mSetupProc) << word;
         }
 
diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp
index 68aa0cac8..26a2d1535 100644
--- a/kcontrol/spellchecking/spellchecking.cpp
+++ b/kcontrol/spellchecking/spellchecking.cpp
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
-#include <kspell.h>
+#include <tdespell.h>
 
 #include "spellchecking.h"