Revert "Finish renaming tdevelop components"

This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.

376 files changed, 1844 insertions, 1857 deletions

diff --git a/parts/abbrev/CMakeLists.txt b/parts/abbrev/CMakeLists.txt
index 6a61f9d8..219ad73d 100644
--- a/parts/abbrev/CMakeLists.txt
+++ b/parts/abbrev/CMakeLists.txt
@@ -26,14 +26,14 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevabbrev.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES qt_classes cpp_keywords DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev/sources )
-install( FILES tdevabbrev.rc DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev )
+install( FILES kdevabbrev.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES qt_classes cpp_keywords DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev/sources )
+install( FILES kdevabbrev.rc DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev )
 
 
-##### libtdevabbrev (module) ####################
+##### libkdevabbrev (module) ####################
 
-tde_add_kpart( libtdevabbrev AUTOMOC
+tde_add_kpart( libkdevabbrev AUTOMOC
   SOURCES
     abbrevpart.cpp abbrevconfigwidget.cpp
     abbrevconfigwidgetbase.ui addtemplatedlg.cpp
diff --git a/parts/abbrev/Makefile.am b/parts/abbrev/Makefile.am
index 1c4f559c..f5c3ec2e 100644
--- a/parts/abbrev/Makefile.am
+++ b/parts/abbrev/Makefile.am
@@ -2,19 +2,19 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevabbrev.la
-libtdevabbrev_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevabbrev_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevabbrev.la
+libkdevabbrev_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevabbrev_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevabbrev_la_SOURCES = abbrevpart.cpp abbrevconfigwidget.cpp abbrevconfigwidgetbase.ui addtemplatedlg.cpp addtemplatedlgbase.ui
+libkdevabbrev_la_SOURCES = abbrevpart.cpp abbrevconfigwidget.cpp abbrevconfigwidgetbase.ui addtemplatedlg.cpp addtemplatedlgbase.ui
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevabbrev.desktop
+service_DATA = kdevabbrev.desktop
 
-sourcesdir = $(kde_datadir)/tdevabbrev/sources
+sourcesdir = $(kde_datadir)/kdevabbrev/sources
 sources_DATA = qt_classes cpp_keywords
 
-rcdir = $(kde_datadir)/tdevabbrev
-rc_DATA = tdevabbrev.rc
+rcdir = $(kde_datadir)/kdevabbrev
+rc_DATA = kdevabbrev.rc
diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp
index 87e44e23..80d26599 100644
--- a/parts/abbrev/abbrevpart.cpp
+++ b/parts/abbrev/abbrevpart.cpp
@@ -24,35 +24,35 @@
 #include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <kstandarddirs.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdeconfig.h>
 #include <tdeio/netaccess.h>
 #include <kiconloader.h>
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/codecompletioninterface.h>
 
-#include "tdevcore.h"
-#include "tdevpartcontroller.h"
+#include "kdevcore.h"
+#include "kdevpartcontroller.h"
 #include "abbrevconfigwidget.h"
-#include "tdeveditorutil.h"
+#include "kdeveditorutil.h"
 
-static const TDevPluginInfo data("tdevabbrev");
+static const KDevPluginInfo data("kdevabbrev");
 
-class AbbrevFactory : public TDevGenericFactory<AbbrevPart>
+class AbbrevFactory : public KDevGenericFactory<AbbrevPart>
 {
 public:
     AbbrevFactory()
-        : TDevGenericFactory<AbbrevPart>( data )
+        : KDevGenericFactory<AbbrevPart>( data )
     { }
 
     virtual TDEInstance *createInstance()
     {
-        TDEInstance *instance = TDevGenericFactory<AbbrevPart>::createInstance();
+        TDEInstance *instance = KDevGenericFactory<AbbrevPart>::createInstance();
         TDEStandardDirs *dirs = instance->dirs();
         dirs->addResourceType( "codetemplates",
                                TDEStandardDirs::kde_default( "data" ) + "kdevabbrev/templates/" );
@@ -63,13 +63,13 @@ public:
     }
 };
 
-K_EXPORT_COMPONENT_FACTORY( libtdevabbrev, AbbrevFactory )
+K_EXPORT_COMPONENT_FACTORY( libkdevabbrev, AbbrevFactory )
 
 AbbrevPart::AbbrevPart(TQObject *parent, const char *name, const TQStringList &)
-    : TDevPlugin(&data, parent, name ? name : "AbbrevPart")
+    : KDevPlugin(&data, parent, name ? name : "AbbrevPart")
 {
     setInstance(AbbrevFactory::instance());
-    setXMLFile("tdevabbrev.rc");
+    setXMLFile("kdevabbrev.rc");
 
     connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
     	this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) );
@@ -235,7 +235,7 @@ void AbbrevPart::save()
 
 TQString AbbrevPart::currentWord() const
 {
-    return TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+    return KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 }
 
 
diff --git a/parts/abbrev/abbrevpart.h b/parts/abbrev/abbrevpart.h
index cbb60e50..2b602088 100644
--- a/parts/abbrev/abbrevpart.h
+++ b/parts/abbrev/abbrevpart.h
@@ -18,7 +18,7 @@
 
 #include <tqmap.h>
 #include <tqptrlist.h>
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 
 #include <tdetexteditor/codecompletioninterface.h>
 
@@ -60,7 +60,7 @@ private:
     TQStringList m_suffixes;
 };
 
-class AbbrevPart : public TDevPlugin
+class AbbrevPart : public KDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/abbrev/tdevabbrev.desktop b/parts/abbrev/kdevabbrev.desktop
index f06bf2eb..5c230dd4 100644
--- a/parts/abbrev/tdevabbrev.desktop
+++ b/parts/abbrev/kdevabbrev.desktop
@@ -77,7 +77,7 @@ GenericName[zh_CN]=缩写扩展
 GenericName[zh_TW]=縮寫擴展
 ServiceTypes=TDevelop/Plugin
 Icon=fontsizeup
-X-TDE-Library=libtdevabbrev
+X-TDE-Library=libkdevabbrev
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=CodeEditing
diff --git a/parts/abbrev/tdevabbrev.rc b/parts/abbrev/kdevabbrev.rc
index e994ee76..e994ee76 100644
--- a/parts/abbrev/tdevabbrev.rc
+++ b/parts/abbrev/kdevabbrev.rc
diff --git a/parts/appwizard/CMakeLists.txt b/parts/appwizard/CMakeLists.txt
index 8a69f06e..bdeaf541 100644
--- a/parts/appwizard/CMakeLists.txt
+++ b/parts/appwizard/CMakeLists.txt
@@ -35,18 +35,18 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevappwizard.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevappwizard.rc DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+install( FILES kdevappwizard.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevappwizard.rc DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
-##### libtdevappwizard (module) #################
+##### libkdevappwizard (module) #################
 
-tde_add_kpart( libtdevappwizard AUTOMOC
+tde_add_kpart( libkdevappwizard AUTOMOC
   SOURCES
     appwizardfactory.cpp appwizardpart.cpp appwizarddlg.cpp
     importdlg.cpp filepropspagebase.ui filepropspage.cpp
     appwizarddlgbase.ui importdlgbase.ui misc.cpp vcs_form.ui
-    tdevfile.cpp tdevlicense.cpp profilesupport.cpp
+    kdevfile.cpp kdevlicense.cpp profilesupport.cpp
   LINK profileengine-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/appwizard/Makefile.am b/parts/appwizard/Makefile.am
index 012f6f29..34af3163 100644
--- a/parts/appwizard/Makefile.am
+++ b/parts/appwizard/Makefile.am
@@ -7,22 +7,22 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extras -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets \
 	-I$(top_srcdir)/src/profileengine/lib $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevappwizard.la
-libtdevappwizard_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevappwizard_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/interfaces/extras/libtdevextras.la $(top_builddir)/lib/util/libtdevutil.la \
-	$(top_builddir)/lib/widgets/propeditor/libtdevpropertyeditor.la $(top_builddir)/src/profileengine/lib/libprofileengine.la
+kde_module_LTLIBRARIES = libkdevappwizard.la
+libkdevappwizard_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevappwizard_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/interfaces/extras/libkdevextras.la $(top_builddir)/lib/util/libkdevutil.la \
+	$(top_builddir)/lib/widgets/propeditor/libkdevpropertyeditor.la $(top_builddir)/src/profileengine/lib/libprofileengine.la
 
-libtdevappwizard_la_SOURCES = appwizardfactory.cpp appwizardpart.cpp \
+libkdevappwizard_la_SOURCES = appwizardfactory.cpp appwizardpart.cpp \
 		appwizarddlg.cpp importdlg.cpp filepropspagebase.ui filepropspage.cpp \
 		appwizarddlgbase.ui importdlgbase.ui misc.cpp vcs_form.ui\
-		tdevfile.cpp tdevlicense.cpp profilesupport.cpp
+		kdevfile.cpp kdevlicense.cpp profilesupport.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevappwizard.desktop
+service_DATA = kdevappwizard.desktop
 
-rcdir = $(kde_datadir)/tdevappwizard
-rc_DATA = tdevappwizard.rc
+rcdir = $(kde_datadir)/kdevappwizard
+rc_DATA = kdevappwizard.rc
 noinst_HEADERS = profilesupport.h
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 4cbf716d..d5160075 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -64,14 +64,14 @@
 #include <tqlayout.h>
 
 #include "domutil.h"
-#include "tdevversioncontrol.h"
-#include "tdevmakefrontend.h"
-#include "tdevpartcontroller.h"
-#include "tdevplugincontroller.h"
-#include "tdevappfrontend.h"
-#include "tdevplugininfo.h"
-#include "tdevlicense.h"
-#include "tdevcore.h"
+#include "kdevversioncontrol.h"
+#include "kdevmakefrontend.h"
+#include "kdevpartcontroller.h"
+#include "kdevplugincontroller.h"
+#include "kdevappfrontend.h"
+#include "kdevplugininfo.h"
+#include "kdevlicense.h"
+#include "kdevcore.h"
 #include "appwizardfactory.h"
 #include "appwizardpart.h"
 #include "filepropspage.h"
@@ -309,8 +309,8 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
     appname_edit->setValidator(appname_edit_validator);
 
     // insert the licenses into the license_combo
-    TQDict< TDevLicense > lics( licenses() );
-    TQDictIterator< TDevLicense > dit(lics);
+    TQDict< KDevLicense > lics( licenses() );
+    TQDictIterator< KDevLicense > dit(lics);
     int idx=1;
     for( ; dit.current(); ++dit )
     {
@@ -356,8 +356,8 @@ void AppWizardDialog::loadVcs()
 		}
 		TQStringList args;
 		TQObject *obj = factory->create(0, service->name().latin1(),
-									"TDevVCSIntegrator", args);
-		TDevVCSIntegrator *integrator = (TDevVCSIntegrator*) obj;
+									"KDevVCSIntegrator", args);
+		KDevVCSIntegrator *integrator = (KDevVCSIntegrator*) obj;
 
 		if (!integrator)
 			kdDebug(9010) << "    failed to create vcs integrator " << service->name() << endl;
@@ -418,20 +418,20 @@ void AppWizardDialog::licenseChanged()
 			edit->setText( TQString() );
 		}
 	} else {
-		TDevLicense* lic = licenses()[ license_combo->currentText() ];
+		KDevLicense* lic = licenses()[ license_combo->currentText() ];
 		for (it = m_fileTemplates.begin(); it != m_fileTemplates.end(); ++it) {
 			TQString style = (*it).style;
 			TQMultiLineEdit *edit = (*it).edit;
 
-			TDevFile::CommentingStyle commentStyle = TDevFile::CPPStyle;
+			KDevFile::CommentingStyle commentStyle = KDevFile::CPPStyle;
 			if (style == "PStyle") {
-				commentStyle = TDevFile::PascalStyle;
+				commentStyle = KDevFile::PascalStyle;
 			} else if (style == "AdaStyle") {
-				commentStyle = TDevFile::AdaStyle;
+				commentStyle = KDevFile::AdaStyle;
 			} else if (style == "ShellStyle") {
-				commentStyle = TDevFile::BashStyle;
+				commentStyle = KDevFile::BashStyle;
 			} else if (style == "XMLStyle") {
-				commentStyle = TDevFile::XMLStyle;
+				commentStyle = KDevFile::XMLStyle;
 			}
 
 			TQString text;
@@ -577,7 +577,7 @@ void AppWizardDialog::accept()
     if( license_combo->currentItem() != 0 )
     {
         licenseName = license_combo->currentText();
-        TDevLicense* lic = licenses()[ licenseName ];
+        KDevLicense* lic = licenses()[ licenseName ];
         if( lic )
         {
             TQStringList files( lic->copyFiles() );
@@ -1273,7 +1273,7 @@ void AppWizardDialog::setPermissions(const installFile &file)
 	}
 }
 
-TQDict<TDevLicense> AppWizardDialog::licenses()
+TQDict<KDevLicense> AppWizardDialog::licenses()
 {
 	return m_licenses;
 }
@@ -1291,7 +1291,7 @@ void AppWizardDialog::loadLicenses()
 		TQString licPath( dirs->findResource( "licenses", *it ) );
 		kdDebug(9010) << "Loading license file: " << licPath << endl;
 		TQString licName = licPath.mid( licPath.findRev('/') + 1 );
-		TDevLicense* lic = new TDevLicense( licName, licPath );
+		KDevLicense* lic = new KDevLicense( licName, licPath );
 		m_licenses.insert( licName, lic );
 	}
 	// kdDebug(9010) << "======================== Done loadLicenses" << endl;
diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h
index 4a160bd2..392cd1b6 100644
--- a/parts/appwizard/appwizarddlg.h
+++ b/parts/appwizard/appwizarddlg.h
@@ -32,12 +32,12 @@ class ProfileSupport;
 #include <tqstringlist.h>
 #include <tdelistview.h>
 #include <kiconview.h>
-#include "tdevversioncontrol.h"
-#include "tdevvcsintegrator.h"
+#include "kdevversioncontrol.h"
+#include "kdevvcsintegrator.h"
 #include "appwizarddlgbase.h"
 #include "vcs_form.h"
 //#include "autoform.h"
-#include "tdevlicense.h"
+#include "kdevlicense.h"
 
 namespace PropertyLib {
 	class PropertyList;
@@ -132,7 +132,7 @@ public:
 protected:
     virtual void accept();
 
-	virtual TQDict<TDevLicense> licenses();
+	virtual TQDict<KDevLicense> licenses();
 	void loadLicenses();
 
 protected slots:
@@ -181,7 +181,7 @@ private: //data
     TQDict<TQListViewItem> m_categoryMap;
 	TQValueList<TQListViewItem*> m_categoryItems;
     //! A list of currently available version control systems
-//    TQDict<TDevVersionControl> m_availVcs;
+//    TQDict<KDevVersionControl> m_availVcs;
 
     TQHBoxLayout *m_custom_options_layout;
 	PropertyLib::PropertyEditor *m_customOptions;
@@ -195,8 +195,8 @@ private: //data
 	TDEPopupMenu* m_favouritesMenu;
 	TDEPopupMenu* m_templatesMenu;
 
-	TQDict<TDevLicense> m_licenses;
-	TQDict<TDevVCSIntegrator> m_integrators;
+	TQDict<KDevLicense> m_licenses;
+	TQDict<KDevVCSIntegrator> m_integrators;
 	TQMap<int, VCSDialog*> m_integratorDialogs;
 
 	ProfileSupport *m_profileSupport;
diff --git a/parts/appwizard/appwizardfactory.cpp b/parts/appwizard/appwizardfactory.cpp
index 6749add0..5288105d 100644
--- a/parts/appwizard/appwizardfactory.cpp
+++ b/parts/appwizard/appwizardfactory.cpp
@@ -11,30 +11,30 @@
 
 
 #include <kstandarddirs.h>
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 
 #include "appwizardfactory.h"
 
-static const TDevPluginInfo data("tdevappwizard");
-K_EXPORT_COMPONENT_FACTORY( libtdevappwizard, AppWizardFactory )
+static const KDevPluginInfo data("kdevappwizard");
+K_EXPORT_COMPONENT_FACTORY( libkdevappwizard, AppWizardFactory )
 
 AppWizardFactory::AppWizardFactory()
-    : TDevGenericFactory<AppWizardPart>( data )
+    : KDevGenericFactory<AppWizardPart>( data )
 {
 }
 
 TDEInstance *AppWizardFactory::createInstance()
 {
-    TDEInstance *instance = TDevGenericFactory<AppWizardPart>::createInstance();
+    TDEInstance *instance = KDevGenericFactory<AppWizardPart>::createInstance();
     TDEStandardDirs *dirs = instance->dirs();
-    dirs->addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "tdevappwizard/templates/");
-    dirs->addResourceType("appimports", TDEStandardDirs::kde_default("data") + "tdevappwizard/imports/");
-    dirs->addResourceType("appimportfiles", TDEStandardDirs::kde_default("data") + "tdevappwizard/importfiles/");
+    dirs->addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "kdevappwizard/templates/");
+    dirs->addResourceType("appimports", TDEStandardDirs::kde_default("data") + "kdevappwizard/imports/");
+    dirs->addResourceType("appimportfiles", TDEStandardDirs::kde_default("data") + "kdevappwizard/importfiles/");
 
     return instance;
 }
 
-const TDevPluginInfo *AppWizardFactory::info()
+const KDevPluginInfo *AppWizardFactory::info()
 {
     return &data;
 }
diff --git a/parts/appwizard/appwizardfactory.h b/parts/appwizard/appwizardfactory.h
index 3de35631..3bbc6e1e 100644
--- a/parts/appwizard/appwizardfactory.h
+++ b/parts/appwizard/appwizardfactory.h
@@ -12,18 +12,18 @@
 #ifndef _APPWIZARDFACTORY_H_
 #define _APPWIZARDFACTORY_H_
 
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 
 #include "appwizardpart.h"
 
-class TDevPluginInfo;
+class KDevPluginInfo;
 
-class AppWizardFactory : public TDevGenericFactory<AppWizardPart>
+class AppWizardFactory : public KDevGenericFactory<AppWizardPart>
 {
 public:
     AppWizardFactory();
     
-    static const TDevPluginInfo *info();
+    static const KDevPluginInfo *info();
 
 protected:
     virtual TDEInstance *createInstance();
diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp
index ada3b362..dd2fae65 100644
--- a/parts/appwizard/appwizardpart.cpp
+++ b/parts/appwizard/appwizardpart.cpp
@@ -19,7 +19,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kprocess.h>
-#include <tdevcore.h>
+#include <kdevcore.h>
 #include <kgenericfactory.h>
 #include <kstandarddirs.h>
 #include <tdeaction.h>
@@ -28,17 +28,17 @@
 #include "importdlg.h"
 #include "appwizarddlg.h"
 #include "appwizardfactory.h"
-#include <tdevmakefrontend.h>
-#include <tdevpartcontroller.h>
-#include <tdevlanguagesupport.h>
-#include <tdevcore.h>
+#include <kdevmakefrontend.h>
+#include <kdevpartcontroller.h>
+#include <kdevlanguagesupport.h>
+#include <kdevcore.h>
 #include <codemodel.h>
 
 AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringList &)
-    : TDevPlugin(AppWizardFactory::info(), parent, name ? name : "AppWizardPart")
+    : KDevPlugin(AppWizardFactory::info(), parent, name ? name : "AppWizardPart")
 {
     setInstance(AppWizardFactory::instance());
-    setXMLFile("tdevappwizard.rc");
+    setXMLFile("kdevappwizard.rc");
 
     TDEAction *action;
 
diff --git a/parts/appwizard/appwizardpart.h b/parts/appwizard/appwizardpart.h
index 901d51ad..59280631 100644
--- a/parts/appwizard/appwizardpart.h
+++ b/parts/appwizard/appwizardpart.h
@@ -13,7 +13,7 @@
 #define _APPWIZARDPART_H_
 
 #include <tqguardedptr.h>
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <kurl.h>
@@ -21,7 +21,7 @@
 class AppWizardDialog;
 
 
-class AppWizardPart : public TDevPlugin
+class AppWizardPart : public KDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/appwizard/common/CMakeLists.txt b/parts/appwizard/common/CMakeLists.txt
index 81ee38b4..62a5b97b 100644
--- a/parts/appwizard/common/CMakeLists.txt
+++ b/parts/appwizard/common/CMakeLists.txt
@@ -20,7 +20,7 @@ generate_tar( gnome2.tar.gz gnome2 macros )
 generate_tar( gnu.tar.gz gnu AUTHORS COPYING ChangeLog INSTALL NEWS README TODO )
 generate_tar( wxwidgets.tar.gz wx macros )
 generate_tar( incadmin.tar.gz incadmin config.guess config.sub depcomp install-sh ltmain.sh  missing  mkinstalldirs )
-generate_tar( scons.tar.gz scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/tde.py )
+generate_tar( scons.tar.gz scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/kde.py )
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/admin.tar.gz
@@ -29,18 +29,18 @@ install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/gnome.tar.gz
     ${CMAKE_CURRENT_BINARY_DIR}/gnome2.tar.gz
     ${CMAKE_CURRENT_BINARY_DIR}/wxwidgets.tar.gz
-    tde-app.lsm tde-Makefile.am tde-Makefile.cvs
+    kde-app.lsm kde-Makefile.am kde-Makefile.cvs
     tde-configure.in.in tde-index.docbook
-    tde-po-Makefile.am tde-doc-Makefile.am
-    tde-doc-en-Makefile.am hi16-app-app.png
+    kde-po-Makefile.am kde-doc-Makefile.am
+    kde-doc-en-Makefile.am hi16-app-app.png
     hi32-app-app.png tde-app.desktop
     tde-part.desktop gnome-app.lsm
     gnome-Makefile.am gnome-Makefile.cvs
     gnome-pixmaps-Makefile.am gnome-app.png
     wx-configure.in wx-Makefile.am wx-Makefile.cvs
     COPYING COPYING.LIB LICENSE.QPL LICENSE.BSD
-    Artistic admin.tdevtemplate gnu.tdevtemplate
-    dockbook.tdevtemplate incadmin.tdevtemplate
-    gnome2.tdevtemplate scons.tdevtemplate
+    Artistic admin.kdevtemplate gnu.kdevtemplate
+    dockbook.kdevtemplate incadmin.kdevtemplate
+    gnome2.kdevtemplate scons.kdevtemplate
     ${CMAKE_CURRENT_BINARY_DIR}/scons.tar.gz
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/template-common )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/template-common )
diff --git a/parts/appwizard/common/Makefile.am b/parts/appwizard/common/Makefile.am
index e068df5b..2d6e5278 100644
--- a/parts/appwizard/common/Makefile.am
+++ b/parts/appwizard/common/Makefile.am
@@ -28,19 +28,19 @@ incadmin.tar.gz:
 	gzip incadmin.tar
 
 scons.tar.gz:
-	$(TAR) -cf scons.tar --exclude=.svn -C $(srcdir)/scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/tde.py
+	$(TAR) -cf scons.tar --exclude=.svn -C $(srcdir)/scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/kde.py
 	gzip scons.tar
 
-appwizarddatadir = ${kde_datadir}/tdevappwizard
+appwizarddatadir = ${kde_datadir}/kdevappwizard
 commondatadir = ${appwizarddatadir}/template-common
 commondata_DATA = admin.tar.gz gnu.tar.gz incadmin.tar.gz gnome.tar.gz gnome2.tar.gz wxwidgets.tar.gz \
-	tde-app.lsm tde-Makefile.am tde-Makefile.cvs tde-configure.in.in \
-	tde-index.docbook tde-po-Makefile.am tde-doc-Makefile.am tde-doc-en-Makefile.am \
+	kde-app.lsm kde-Makefile.am kde-Makefile.cvs tde-configure.in.in \
+	tde-index.docbook kde-po-Makefile.am kde-doc-Makefile.am kde-doc-en-Makefile.am \
 	hi16-app-app.png hi32-app-app.png tde-app.desktop tde-part.desktop \
 	gnome-app.lsm gnome-Makefile.am gnome-Makefile.cvs \
 	gnome-pixmaps-Makefile.am gnome-app.png \
 	wx-configure.in wx-Makefile.am wx-Makefile.cvs \
 	COPYING COPYING.LIB LICENSE.QPL LICENSE.BSD Artistic \
-	admin.tdevtemplate gnu.tdevtemplate dockbook.tdevtemplate\
-	incadmin.tdevtemplate gnome2.tdevtemplate scons.tdevtemplate scons.tar.gz
+	admin.kdevtemplate gnu.kdevtemplate dockbook.kdevtemplate\
+	incadmin.kdevtemplate gnome2.kdevtemplate scons.kdevtemplate scons.tar.gz
 
diff --git a/parts/appwizard/common/admin.tdevtemplate b/parts/appwizard/common/admin.kdevtemplate
index 73573b47..73573b47 100644
--- a/parts/appwizard/common/admin.tdevtemplate
+++ b/parts/appwizard/common/admin.kdevtemplate
diff --git a/parts/appwizard/common/dockbook.tdevtemplate b/parts/appwizard/common/dockbook.kdevtemplate
index 41b65f62..41b65f62 100644
--- a/parts/appwizard/common/dockbook.tdevtemplate
+++ b/parts/appwizard/common/dockbook.kdevtemplate
diff --git a/parts/appwizard/common/gnome2.tdevtemplate b/parts/appwizard/common/gnome2.kdevtemplate
index ce4e3f3d..ce4e3f3d 100644
--- a/parts/appwizard/common/gnome2.tdevtemplate
+++ b/parts/appwizard/common/gnome2.kdevtemplate
diff --git a/parts/appwizard/common/gnu.tdevtemplate b/parts/appwizard/common/gnu.kdevtemplate
index e1876440..e1876440 100644
--- a/parts/appwizard/common/gnu.tdevtemplate
+++ b/parts/appwizard/common/gnu.kdevtemplate
diff --git a/parts/appwizard/common/incadmin.tdevtemplate b/parts/appwizard/common/incadmin.kdevtemplate
index d7fbfb61..d7fbfb61 100644
--- a/parts/appwizard/common/incadmin.tdevtemplate
+++ b/parts/appwizard/common/incadmin.kdevtemplate
diff --git a/parts/appwizard/common/tde-Makefile.am b/parts/appwizard/common/kde-Makefile.am
index 06057100..06057100 100644
--- a/parts/appwizard/common/tde-Makefile.am
+++ b/parts/appwizard/common/kde-Makefile.am
diff --git a/parts/appwizard/common/tde-Makefile.cvs b/parts/appwizard/common/kde-Makefile.cvs
index 4c0afd1a..4c0afd1a 100644
--- a/parts/appwizard/common/tde-Makefile.cvs
+++ b/parts/appwizard/common/kde-Makefile.cvs
diff --git a/parts/appwizard/common/tde-app.lsm b/parts/appwizard/common/kde-app.lsm
index 06055a96..06055a96 100644
--- a/parts/appwizard/common/tde-app.lsm
+++ b/parts/appwizard/common/kde-app.lsm
diff --git a/parts/appwizard/common/tde-doc-Makefile.am b/parts/appwizard/common/kde-doc-Makefile.am
index a1f777a1..a1f777a1 100644
--- a/parts/appwizard/common/tde-doc-Makefile.am
+++ b/parts/appwizard/common/kde-doc-Makefile.am
diff --git a/parts/appwizard/common/tde-doc-en-Makefile.am b/parts/appwizard/common/kde-doc-en-Makefile.am
index bdd63b79..bdd63b79 100644
--- a/parts/appwizard/common/tde-doc-en-Makefile.am
+++ b/parts/appwizard/common/kde-doc-en-Makefile.am
diff --git a/parts/appwizard/common/tde-po-Makefile.am b/parts/appwizard/common/kde-po-Makefile.am
index 0fa209cd..0fa209cd 100644
--- a/parts/appwizard/common/tde-po-Makefile.am
+++ b/parts/appwizard/common/kde-po-Makefile.am
diff --git a/parts/appwizard/common/scons.tdevtemplate b/parts/appwizard/common/scons.kdevtemplate
index 84ed350f..84ed350f 100644
--- a/parts/appwizard/common/scons.tdevtemplate
+++ b/parts/appwizard/common/scons.kdevtemplate
diff --git a/parts/appwizard/common/scons/admin/tde.py b/parts/appwizard/common/scons/admin/kde.py
index 2fe7a4c9..d194fd84 100644
--- a/parts/appwizard/common/scons/admin/tde.py
+++ b/parts/appwizard/common/scons/admin/kde.py
@@ -1,4 +1,4 @@
-# Made from scons qt.py and (heavily) modified into tde.py
+# Made from scons qt.py and (heavily) modified into kde.py
 # Thomas Nagy, 2004, 2005 <tnagy2^8@yahoo.fr>
 
 """
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 15f432b2..5f07f5b4 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -37,9 +37,9 @@
 #include <tdeparts/componentfactory.h>
 #include <kprocess.h>
 
-#include "tdevcore.h"
-#include "tdevversioncontrol.h"
-#include "tdevplugincontroller.h"
+#include "kdevcore.h"
+#include "kdevversioncontrol.h"
+#include "kdevplugincontroller.h"
 
 #include "domutil.h"
 #include "settings.h"
@@ -272,7 +272,7 @@ void ImportDialog::dirChanged()
     // KDevelop legacy project?
     TQStringList files = dir.entryList("*.kdevprj");
     if (!files.isEmpty()) {
-        scanLegacyTDevelopProject(dir.absFilePath(files.first()));
+        scanLegacyKDevelopProject(dir.absFilePath(files.first()));
         return;
     }
 
@@ -328,7 +328,7 @@ void ImportDialog::dirChanged()
 }
 
 
-void ImportDialog::scanLegacyTDevelopProject(const TQString &fileName)
+void ImportDialog::scanLegacyKDevelopProject(const TQString &fileName)
 {
     kdDebug(9010) << "Scanning legacy KDevelop project file " << fileName << endl;
 
@@ -524,7 +524,7 @@ void ImportDialog::slotFinishedCheckout( TQString destinationDir )
 void ImportDialog::slotFetchModulesFromRepository()
 {
 
-    TDevVersionControl *vcs = m_part->versionControlByName( vcsCombo->currentText() );
+    KDevVersionControl *vcs = m_part->versionControlByName( vcsCombo->currentText() );
     if (!vcs)
         return;
 
diff --git a/parts/appwizard/importdlg.h b/parts/appwizard/importdlg.h
index af4d3859..5b334668 100644
--- a/parts/appwizard/importdlg.h
+++ b/parts/appwizard/importdlg.h
@@ -48,7 +48,7 @@ private slots:
     void slotProjectNameChanged( const TQString &_text );
 private:
 //    void scanAvailableVCS();
-    void scanLegacyTDevelopProject(const TQString &fileName);
+    void scanLegacyKDevelopProject(const TQString &fileName);
     void scanLegacyStudioProject(const TQString &fileName);
     void scanAutomakeProject(const TQString &dirName);
     void setProjectType(const TQString &type);
diff --git a/parts/appwizard/imports/CMakeLists.txt b/parts/appwizard/imports/CMakeLists.txt
index d59750c4..e7b303c3 100644
--- a/parts/appwizard/imports/CMakeLists.txt
+++ b/parts/appwizard/imports/CMakeLists.txt
@@ -10,16 +10,16 @@
 #################################################
 
 install( FILES
-    c-auto cpp-auto fortran-auto java-auto tde gnome c cpp
+    c-auto cpp-auto fortran-auto java-auto kde gnome c cpp
     fortran python php perl java java-ant qttmake qtqmake
     qt4qmake ruby pascal ada
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/imports )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/imports )
 
 install( FILES
     c-auto.tdevelop cpp-auto.tdevelop fortran-auto.tdevelop
-    java-auto.tdevelop tde.tdevelop gnome.tdevelop
+    java-auto.tdevelop kde.tdevelop gnome.tdevelop
     c.tdevelop cpp.tdevelop fortran.tdevelop python.tdevelop
     php.tdevelop perl.tdevelop java.tdevelop java-ant.tdevelop
     qttmake.tdevelop qtqmake.tdevelop qt4qmake.tdevelop
     ruby.tdevelop pascal.tdevelop ada.tdevelop
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/importfiles )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/importfiles )
diff --git a/parts/appwizard/imports/Makefile.am b/parts/appwizard/imports/Makefile.am
index aaefd91f..c7f74dcd 100644
--- a/parts/appwizard/imports/Makefile.am
+++ b/parts/appwizard/imports/Makefile.am
@@ -1,7 +1,7 @@
-appwizarddatadir = ${kde_datadir}/tdevappwizard
+appwizarddatadir = ${kde_datadir}/kdevappwizard
 importsdir = ${appwizarddatadir}/imports
 importfilesdir = ${appwizarddatadir}/importfiles
 
-imports_DATA = c-auto cpp-auto fortran-auto java-auto tde gnome                    c cpp fortran python php perl java java-ant qttmake qtqmake qt4qmake ruby pascal ada
-importfiles_DATA = c-auto.tdevelop cpp-auto.tdevelop fortran-auto.tdevelop 		   java-auto.tdevelop tde.tdevelop gnome.tdevelop 		   c.tdevelop cpp.tdevelop fortran.tdevelop 		   python.tdevelop php.tdevelop perl.tdevelop 		   java.tdevelop java-ant.tdevelop qttmake.tdevelop qtqmake.tdevelop qt4qmake.tdevelop ruby.tdevelop 		   pascal.tdevelop ada.tdevelop
+imports_DATA = c-auto cpp-auto fortran-auto java-auto kde gnome                    c cpp fortran python php perl java java-ant qttmake qtqmake qt4qmake ruby pascal ada
+importfiles_DATA = c-auto.tdevelop cpp-auto.tdevelop fortran-auto.tdevelop 		   java-auto.tdevelop kde.tdevelop gnome.tdevelop 		   c.tdevelop cpp.tdevelop fortran.tdevelop 		   python.tdevelop php.tdevelop perl.tdevelop 		   java.tdevelop java-ant.tdevelop qttmake.tdevelop qtqmake.tdevelop qt4qmake.tdevelop ruby.tdevelop 		   pascal.tdevelop ada.tdevelop
 
diff --git a/parts/appwizard/imports/ada.tdevelop b/parts/appwizard/imports/ada.tdevelop
index 188fbea6..cdb35b40 100644
--- a/parts/appwizard/imports/ada.tdevelop
+++ b/parts/appwizard/imports/ada.tdevelop
@@ -11,12 +11,12 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <tdevadaproject>
+ <kdevadaproject>
   <run>
    <terminal>true</terminal>
   </run>
- </tdevadaproject>
- <tdevdoctreeview>
+ </kdevadaproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -63,11 +63,11 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevfilecreate>
+ </kdevdoctreeview>
+ <kdevfilecreate>
   <useglobaltypes>
    <type ext="adb"/>
    <type ext="ads"/>
   </useglobaltypes>
- </tdevfilecreate>
+ </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/c-auto.tdevelop b/parts/appwizard/imports/c-auto.tdevelop
index 002e6e1d..892dd88d 100644
--- a/parts/appwizard/imports/c-auto.tdevelop
+++ b/parts/appwizard/imports/c-auto.tdevelop
@@ -9,7 +9,7 @@
   <ignoreparts>
   </ignoreparts>
  </general>
- <tdevautoproject>
+ <kdevautoproject>
   <general>
    <useconfiguration>debug</useconfiguration>
   </general>
@@ -32,13 +32,13 @@
         <cflags>-O0 -g3</cflags>
       </debug>
     </configurations>
- </tdevautoproject>
- <tdevdebugger>
+ </kdevautoproject>
+ <kdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </tdevdebugger>
- <tdevdoctreeview>
+ </kdevdebugger>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -85,12 +85,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="c" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/c.tdevelop b/parts/appwizard/imports/c.tdevelop
index e578fba4..e0c06089 100644
--- a/parts/appwizard/imports/c.tdevelop
+++ b/parts/appwizard/imports/c.tdevelop
@@ -4,21 +4,21 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>TDevCustomProject</projectmanagement>
+  <projectmanagement>KDevCustomProject</projectmanagement>
   <primarylanguage>C</primarylanguage>
   <ignoreparts>
   </ignoreparts>
  </general>
- <tdevcustomproject>
+ <kdevcustomproject>
   <run>
   </run>
- </tdevcustomproject>
- <tdevdebugger>
+ </kdevcustomproject>
+ <kdevdebugger>
   <general>
    <dbgshell></dbgshell>
   </general>
- </tdevdebugger>
- <tdevdoctreeview>
+ </kdevdebugger>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -65,12 +65,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="c" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/cpp-auto.tdevelop b/parts/appwizard/imports/cpp-auto.tdevelop
index 0a1b05b1..74de8db0 100644
--- a/parts/appwizard/imports/cpp-auto.tdevelop
+++ b/parts/appwizard/imports/cpp-auto.tdevelop
@@ -9,7 +9,7 @@
   <ignoreparts>
   </ignoreparts>
  </general>
- <tdevautoproject>
+ <kdevautoproject>
   <general>
    <useconfiguration>debug</useconfiguration>
   </general>
@@ -30,13 +30,13 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </tdevautoproject>
- <tdevdebugger>
+ </kdevautoproject>
+ <kdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </tdevdebugger>
- <tdevdoctreeview>
+ </kdevdebugger>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -81,13 +81,13 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/cpp.tdevelop b/parts/appwizard/imports/cpp.tdevelop
index 3eade8de..b351de38 100644
--- a/parts/appwizard/imports/cpp.tdevelop
+++ b/parts/appwizard/imports/cpp.tdevelop
@@ -4,21 +4,21 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>TDevCustomProject</projectmanagement>
+  <projectmanagement>KDevCustomProject</projectmanagement>
   <primarylanguage>C++</primarylanguage>
   <ignoreparts>
   </ignoreparts>
  </general>
- <tdevcustomproject>
+ <kdevcustomproject>
   <run>
   </run>
- </tdevcustomproject>
- <tdevdebugger>
+ </kdevcustomproject>
+ <kdevdebugger>
   <general>
    <dbgshell></dbgshell>
   </general>
- </tdevdebugger>
- <tdevdoctreeview>
+ </kdevdebugger>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -63,13 +63,13 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/fortran-auto.tdevelop b/parts/appwizard/imports/fortran-auto.tdevelop
index 4be630a6..8fdd5f89 100644
--- a/parts/appwizard/imports/fortran-auto.tdevelop
+++ b/parts/appwizard/imports/fortran-auto.tdevelop
@@ -9,7 +9,7 @@
   <ignoreparts>
   </ignoreparts>
  </general>
- <tdevdoctreeview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -57,15 +57,15 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </tdevdebugger>
-  <tdevfilecreate>
+ </kdevdebugger>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="f"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/fortran.tdevelop b/parts/appwizard/imports/fortran.tdevelop
index e7141b4f..c852870e 100644
--- a/parts/appwizard/imports/fortran.tdevelop
+++ b/parts/appwizard/imports/fortran.tdevelop
@@ -4,16 +4,16 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>TDevCustomProject</projectmanagement>
+  <projectmanagement>KDevCustomProject</projectmanagement>
   <primarylanguage>Fortran77</primarylanguage>
   <ignoreparts>
   </ignoreparts>
  </general>
- <tdevautoproject>
+ <kdevautoproject>
   <general>
   </general>
- </tdevautoproject>
- <tdevdoctreeview>
+ </kdevautoproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -61,15 +61,15 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell></dbgshell>
   </general>
- </tdevdebugger>
-  <tdevfilecreate>
+ </kdevdebugger>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="f"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/gnome.tdevelop b/parts/appwizard/imports/gnome.tdevelop
index cad92fda..0b8c5c95 100644
--- a/parts/appwizard/imports/gnome.tdevelop
+++ b/parts/appwizard/imports/gnome.tdevelop
@@ -7,10 +7,10 @@
   <projectmanagement>KDevAutoProject</projectmanagement>
   <primarylanguage>C</primarylanguage>
   <ignoreparts>
-   <part>TDevJavaDebugger</part>
+   <part>KDevJavaDebugger</part>
   </ignoreparts>
  </general>
- <tdevautoproject>
+ <kdevautoproject>
   <general>
    <useconfiguration>debug</useconfiguration>
   </general>
@@ -31,8 +31,8 @@
         <cflags>-O0 -g3</cflags>
       </debug>
     </configurations>
- </tdevautoproject>
- <tdevfileview>
+ </kdevautoproject>
+ <kdevfileview>
   <groups>
    <group pattern="*.c;*.h" name="Sources" />
    <group pattern="*.glade" name="User Interface" />
@@ -40,8 +40,8 @@
    <group pattern="*.po" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </tdevfileview>
- <tdevdoctreeview>
+ </kdevfileview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -85,16 +85,16 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </tdevdebugger>
-  <tdevfilecreate>
+ </kdevdebugger>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="c"/>
       <type ext="h"/>      
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/java-ant.tdevelop b/parts/appwizard/imports/java-ant.tdevelop
index 1d64dc64..a4db806b 100644
--- a/parts/appwizard/imports/java-ant.tdevelop
+++ b/parts/appwizard/imports/java-ant.tdevelop
@@ -7,15 +7,15 @@
   <projectmanagement>KDevAntProject</projectmanagement>
   <primarylanguage>Java</primarylanguage>
   <ignoreparts>
-   <part>TDevDebugger</part>
+   <part>KDevDebugger</part>
   </ignoreparts>
  </general>
- <tdevcustomproject>
+ <kdevcustomproject>
   <build>
    <buildtool>ant</buildtool>
   </build>
- </tdevcustomproject>
- <tdevdoctreeview>
+ </kdevcustomproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -59,10 +59,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="java"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/java-auto.tdevelop b/parts/appwizard/imports/java-auto.tdevelop
index f5de6138..9a42ec82 100644
--- a/parts/appwizard/imports/java-auto.tdevelop
+++ b/parts/appwizard/imports/java-auto.tdevelop
@@ -7,10 +7,10 @@
   <projectmanagement>KDevAutoProject</projectmanagement>
   <primarylanguage>Java</primarylanguage>
   <ignoreparts>
-   <part>TDevDebugger</part>
+   <part>KDevDebugger</part>
   </ignoreparts>
  </general>
- <tdevdoctreeview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -54,10 +54,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="java"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/java.tdevelop b/parts/appwizard/imports/java.tdevelop
index f5de6138..9a42ec82 100644
--- a/parts/appwizard/imports/java.tdevelop
+++ b/parts/appwizard/imports/java.tdevelop
@@ -7,10 +7,10 @@
   <projectmanagement>KDevAutoProject</projectmanagement>
   <primarylanguage>Java</primarylanguage>
   <ignoreparts>
-   <part>TDevDebugger</part>
+   <part>KDevDebugger</part>
   </ignoreparts>
  </general>
- <tdevdoctreeview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -54,10 +54,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="java"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/tde b/parts/appwizard/imports/kde
index 13614802..13614802 100644
--- a/parts/appwizard/imports/tde
+++ b/parts/appwizard/imports/kde
diff --git a/parts/appwizard/imports/tde.tdevelop b/parts/appwizard/imports/kde.tdevelop
index fe54fadc..5bff727f 100644
--- a/parts/appwizard/imports/tde.tdevelop
+++ b/parts/appwizard/imports/kde.tdevelop
@@ -11,7 +11,7 @@
    <keyword>KDE</keyword>
   </keywords>
  </general>
- <tdevfileview>
+ <kdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -19,8 +19,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </tdevfileview>
- <tdevdoctreeview>
+ </kdevfileview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -57,17 +57,17 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </tdevdebugger>
-  <tdevfilecreate>
+ </kdevdebugger>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/pascal.tdevelop b/parts/appwizard/imports/pascal.tdevelop
index 7db5a9d8..551ac91e 100644
--- a/parts/appwizard/imports/pascal.tdevelop
+++ b/parts/appwizard/imports/pascal.tdevelop
@@ -11,12 +11,12 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <tdevpascalproject>
+ <kdevpascalproject>
   <run>
    <terminal>true</terminal>
   </run>
- </tdevpascalproject>
- <tdevdoctreeview>
+ </kdevpascalproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -64,12 +64,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevfilecreate>
+ </kdevdoctreeview>
+ <kdevfilecreate>
   <useglobaltypes>
    <type ext="pp"/>
    <type ext="pas"/>
    <type ext="dpr"/>
   </useglobaltypes>
- </tdevfilecreate>
+ </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/perl.tdevelop b/parts/appwizard/imports/perl.tdevelop
index 0b4f4fba..bbf18ee3 100644
--- a/parts/appwizard/imports/perl.tdevelop
+++ b/parts/appwizard/imports/perl.tdevelop
@@ -9,11 +9,11 @@
   <ignoreparts>
   </ignoreparts>
  </general>
- <tdevscriptproject>
+ <kdevscriptproject>
   <run>
   </run>
- </tdevscriptproject>
- <tdevdoctreeview>
+ </kdevscriptproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -60,10 +60,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="perl"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/php.tdevelop b/parts/appwizard/imports/php.tdevelop
index 4135828b..64651d3b 100644
--- a/parts/appwizard/imports/php.tdevelop
+++ b/parts/appwizard/imports/php.tdevelop
@@ -11,11 +11,11 @@
    <part>KDevdistpart</part>
   </ignoreparts>
  </general>
- <tdevscriptproject>
+ <kdevscriptproject>
   <general>
   </general>
- </tdevscriptproject>
- <tdevdoctreeview>
+ </kdevscriptproject>
+ <kdevdoctreeview>
   <ignoretocs>
    <toc>gtk</toc>
    <toc>kde</toc>
@@ -23,15 +23,15 @@
    <toc>python</toc>
    <toc>perl</toc>
   </ignoretocs>
- </tdevdoctreeview>
-<tdevphpsupport>
+ </kdevdoctreeview>
+<kdevphpsupport>
 	<codeHelp>
 	   <codeCompletion>true</codeCompletion>
 	   <codeHinting>true</codeHinting>
 	   <realtimeParsing>false</realtimeParsing>
 	  </codeHelp>
-</tdevphpsupport>
- <tdevdoctreeview>
+</kdevphpsupport>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -75,10 +75,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="php"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/python.tdevelop b/parts/appwizard/imports/python.tdevelop
index d85480b9..3c6ece1a 100644
--- a/parts/appwizard/imports/python.tdevelop
+++ b/parts/appwizard/imports/python.tdevelop
@@ -7,15 +7,15 @@
   <projectmanagement>KDevScriptProject</projectmanagement>
   <primarylanguage>Python</primarylanguage>
   <ignoreparts>
-   <part>TDevDebugger</part>
-   <part>TDevJavaDebugger</part>
+   <part>KDevDebugger</part>
+   <part>KDevJavaDebugger</part>
   </ignoreparts>
  </general>
- <tdevscriptproject>
+ <kdevscriptproject>
   <run>
   </run>
- </tdevscriptproject>
- <tdevdoctreeview>
+ </kdevscriptproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -60,10 +60,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="py"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/qt-auto.tdevelop b/parts/appwizard/imports/qt-auto.tdevelop
index a8ac37de..b4bba39e 100644
--- a/parts/appwizard/imports/qt-auto.tdevelop
+++ b/parts/appwizard/imports/qt-auto.tdevelop
@@ -10,7 +10,7 @@
    <keyword>Qt</keyword>
   </keywords>
  </general>
- <tdevfileview>
+ <kdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -18,8 +18,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </tdevfileview>
- <tdevdoctreeview>
+ </kdevfileview>
+ <kdevdoctreeview>
   <ignoretocs>
    <toc>gtk</toc>
    <toc>gnustep</toc>
@@ -27,17 +27,17 @@
    <toc>php</toc>
    <toc>perl</toc>
   </ignoretocs>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </tdevdebugger>
-  <tdevfilecreate>
+ </kdevdebugger>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/qt.tdevelop b/parts/appwizard/imports/qt.tdevelop
index 713510e0..6b716a7b 100644
--- a/parts/appwizard/imports/qt.tdevelop
+++ b/parts/appwizard/imports/qt.tdevelop
@@ -4,13 +4,13 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>TDevCustomProject</projectmanagement>
+  <projectmanagement>KDevCustomProject</projectmanagement>
   <primarylanguage>C++</primarylanguage>
   <keywords>
    <keyword>Qt</keyword>
   </keywords>
  </general>
- <tdevfileview>
+ <kdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -18,21 +18,21 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </tdevfileview>
- <tdevcustomproject>
+ </kdevfileview>
+ <kdevcustomproject>
   <run>
   </run>
- </tdevcustomproject>
- <tdevdebugger>
+ </kdevcustomproject>
+ <kdevdebugger>
   <general>
    <dbgshell></dbgshell>
   </general>
- </tdevdebugger>
-  <tdevfilecreate>
+ </kdevdebugger>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/qt4qmake.tdevelop b/parts/appwizard/imports/qt4qmake.tdevelop
index e211a470..3be6c94c 100644
--- a/parts/appwizard/imports/qt4qmake.tdevelop
+++ b/parts/appwizard/imports/qt4qmake.tdevelop
@@ -10,15 +10,15 @@
    <keyword>Qt</keyword>
   </keywords>
  </general>
- <tdevfileview>
+ <kdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
    <group pattern="*.png" name="Icons" />
    <group pattern="*" name="Others" />
   </groups>
- </tdevfileview>
- <tdevdoctreeview>
+ </kdevfileview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -55,26 +55,26 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell/>
   </general>
- </tdevdebugger>
- <tdevcppsupport>
+ </kdevdebugger>
+ <kdevcppsupport>
    <qt>
      <version>4</version>
      <used>true</used>
      <includestyle>4</includestyle>
      <designerintegration>ExternalDesigner</designerintegration>
    </qt>
- </tdevcppsupport>
-  <tdevfilecreate>
+ </kdevcppsupport>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
       <type ext="qrc" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/qtqmake.tdevelop b/parts/appwizard/imports/qtqmake.tdevelop
index 8a9d6b17..2e9b089a 100644
--- a/parts/appwizard/imports/qtqmake.tdevelop
+++ b/parts/appwizard/imports/qtqmake.tdevelop
@@ -10,15 +10,15 @@
    <keyword>Qt</keyword>
   </keywords>
  </general>
- <tdevfileview>
+ <kdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
    <group pattern="*.png" name="Icons" />
    <group pattern="*" name="Others" />
   </groups>
- </tdevfileview>
- <tdevdoctreeview>
+ </kdevfileview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -55,25 +55,25 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell/>
   </general>
- </tdevdebugger>
- <tdevcppsupport>
+ </kdevdebugger>
+ <kdevcppsupport>
    <qt>
      <version>3</version>
      <used>true</used>
      <includestyle>3</includestyle>
      <designerintegration>KDevEmbeddedDesigner</designerintegration>
    </qt>
- </tdevcppsupport>
-  <tdevfilecreate>
+ </kdevcppsupport>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/qttmake.tdevelop b/parts/appwizard/imports/qttmake.tdevelop
index 015f4278..713655b6 100644
--- a/parts/appwizard/imports/qttmake.tdevelop
+++ b/parts/appwizard/imports/qttmake.tdevelop
@@ -10,15 +10,15 @@
    <keyword>Qt</keyword>
   </keywords>
  </general>
- <tdevfileview>
+ <kdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
    <group pattern="*.png" name="Icons" />
    <group pattern="*" name="Others" />
   </groups>
- </tdevfileview>
- <tdevdoctreeview>
+ </kdevfileview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -58,17 +58,17 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell/>
   </general>
- </tdevdebugger>
-  <tdevfilecreate>
+ </kdevdebugger>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/ruby.tdevelop b/parts/appwizard/imports/ruby.tdevelop
index 0a29b0a7..90dbe34a 100644
--- a/parts/appwizard/imports/ruby.tdevelop
+++ b/parts/appwizard/imports/ruby.tdevelop
@@ -13,22 +13,22 @@
    <part>KDevDoxygen</part>
    <part>KDevdistpart</part>
    <part>KDevVisualBoyAdvance</part>
-   <part>TDevDebugger</part>
+   <part>KDevDebugger</part>
   </ignoreparts>
  </general>
- <tdevscriptproject>
+ <kdevscriptproject>
   <general>
 		<activedir>src</activedir>
 		<includepatterns>*.rb</includepatterns>
 		<excludepatterns>*~</excludepatterns>
   </general>
- </tdevscriptproject>
- <tdevfileview>
+ </kdevscriptproject>
+ <kdevfileview>
 	 <groups>
 	   <group pattern="*.rb" name="Scripts" />
 	 </groups>
- </tdevfileview>											 
- <tdevdoctreeview>
+ </kdevfileview>											 
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -73,10 +73,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <useglobaltypes>
 			<type ext="rb"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/tdevappwizard.desktop b/parts/appwizard/kdevappwizard.desktop
index bda84ba5..fa9dd541 100644
--- a/parts/appwizard/tdevappwizard.desktop
+++ b/parts/appwizard/kdevappwizard.desktop
@@ -36,7 +36,7 @@ Comment[tg]=Устои сохтани гузориш
 Comment[tr]=Uygulama Sihirbazı
 Comment[zh_CN]=应用程序向导
 Comment[zh_TW]=應用程式精靈
-Name=TDevAppWizard
+Name=KDevAppWizard
 Name[da]=TDevelop Programguide
 Name[de]=Anwendungs-Assistent (TDevelop)
 Name[hi]=के-डेव-एप-विज़ार्ड
@@ -81,7 +81,7 @@ GenericName[tr]=Uygulama Sihirbazı
 GenericName[zh_CN]=应用程序向导
 GenericName[zh_TW]=應用程式精靈
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevappwizard
+X-TDE-Library=libkdevappwizard
 X-TDevelop-Scope=Core
 X-TDevelop-Version=5
 X-TDevelop-Properties=ProjectCreation
diff --git a/parts/appwizard/tdevappwizard.rc b/parts/appwizard/kdevappwizard.rc
index 2705a29f..c86e0f44 100644
--- a/parts/appwizard/tdevappwizard.rc
+++ b/parts/appwizard/kdevappwizard.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="TDevAppWizard" version="1">
+<kpartgui name="KDevAppWizard" version="1">
 <MenuBar>
   <Menu name="project" >
     <Action name="project_new" group="project_new"/>
diff --git a/parts/appwizard/tdevfile.cpp b/parts/appwizard/kdevfile.cpp
index 4a748d47..4edb62c7 100644
--- a/parts/appwizard/tdevfile.cpp
+++ b/parts/appwizard/kdevfile.cpp
@@ -16,31 +16,31 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevfile.h"
+#include "kdevfile.h"
 
 static struct MimeTypeMapping
 {
 	const char* szMimeType;
-	TDevFile::CommentingStyle commentStyle;
+	KDevFile::CommentingStyle commentStyle;
 } mimeTypeMapping[] = {
-{	"text/x-c++hdr",            TDevFile::CPPStyle           },
-{	"text/x-c++src",            TDevFile::CPPStyle           },
-{	"text/x-chdr",              TDevFile::CStyle             },
-{	"text/x-csrc",              TDevFile::CStyle             },
-{	"text/adasrc",              TDevFile::AdaStyle           },
-{	"text/x-pascal",            TDevFile::PascalStyle        },
-{	"text/x-perl",              TDevFile::BashStyle          },
-{	"text/xml",                 TDevFile::XMLStyle           },
-{	"text/x-xslt",              TDevFile::XMLStyle           },
-{	"text/x-xslfo",             TDevFile::XMLStyle           },
-{	"text/html",                TDevFile::XMLStyle           },
-{	"text/docbook",             TDevFile::XMLStyle           },
-{	"application/x-php",        TDevFile::CPPStyle           },
-{	"application/x-shellscript",TDevFile::BashStyle          },
-{	NULL,                       TDevFile::NoCommenting       }
+{	"text/x-c++hdr",            KDevFile::CPPStyle           },
+{	"text/x-c++src",            KDevFile::CPPStyle           },
+{	"text/x-chdr",              KDevFile::CStyle             },
+{	"text/x-csrc",              KDevFile::CStyle             },
+{	"text/adasrc",              KDevFile::AdaStyle           },
+{	"text/x-pascal",            KDevFile::PascalStyle        },
+{	"text/x-perl",              KDevFile::BashStyle          },
+{	"text/xml",                 KDevFile::XMLStyle           },
+{	"text/x-xslt",              KDevFile::XMLStyle           },
+{	"text/x-xslfo",             KDevFile::XMLStyle           },
+{	"text/html",                KDevFile::XMLStyle           },
+{	"text/docbook",             KDevFile::XMLStyle           },
+{	"application/x-php",        KDevFile::CPPStyle           },
+{	"application/x-shellscript",KDevFile::BashStyle          },
+{	NULL,                       KDevFile::NoCommenting       }
 };
 
-TDevFile::CommentingStyle TDevFile::commentingStyleFromMimeType( const TQString& mimeType )
+KDevFile::CommentingStyle KDevFile::commentingStyleFromMimeType( const TQString& mimeType )
 {
 	int idx = 0;
 	while( mimeTypeMapping[idx].szMimeType )
@@ -49,10 +49,10 @@ TDevFile::CommentingStyle TDevFile::commentingStyleFromMimeType( const TQString&
 			return mimeTypeMapping[idx].commentStyle;
 		idx++;
 	}
-	return TDevFile::NoCommenting;
+	return KDevFile::NoCommenting;
 }
 
-TDevFile::CommentingStyle TDevFile::commentingStyleFromMimeType( KMimeType::Ptr mimeType )
+KDevFile::CommentingStyle KDevFile::commentingStyleFromMimeType( KMimeType::Ptr mimeType )
 {
 	return commentingStyleFromMimeType( mimeType->name() );
 }
diff --git a/parts/appwizard/tdevfile.h b/parts/appwizard/kdevfile.h
index b1280f54..6b2e2699 100644
--- a/parts/appwizard/tdevfile.h
+++ b/parts/appwizard/kdevfile.h
@@ -18,18 +18,18 @@
 */
 
 /**
-@file tdevfile.h
+@file kdevfile.h
 File abstraction layer.
 */
-#ifndef TDEVFILE_H
-#define TDEVFILE_H
+#ifndef KDEVFILE_H
+#define KDEVFILE_H
 
 #include <kmimetype.h>
 
 /**
 File abstraction.
 */
-class TDevFile
+class KDevFile
 {
 public:
     /**Styles of comment-formats a source file can have.*/
diff --git a/parts/appwizard/tdevlicense.cpp b/parts/appwizard/kdevlicense.cpp
index a720c6c3..5e189422 100644
--- a/parts/appwizard/tdevlicense.cpp
+++ b/parts/appwizard/kdevlicense.cpp
@@ -16,19 +16,19 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevlicense.h"
+#include "kdevlicense.h"
 
 #include <tqfile.h>
 #include <tqdatetime.h>
 #include <tqregexp.h>
 
-TDevLicense::TDevLicense( const TQString& name, const TQString& fileName )
+KDevLicense::KDevLicense( const TQString& name, const TQString& fileName )
 	: m_name( name )
 {
 	readFile( fileName );
 }
 
-void TDevLicense::readFile( const TQString& fileName )
+void KDevLicense::readFile( const TQString& fileName )
 {
 	TQFile f(fileName);
 	if (!f.open(IO_ReadOnly))
@@ -57,7 +57,7 @@ void TDevLicense::readFile( const TQString& fileName )
 
 }
 
-TQString TDevLicense::assemble( TDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces )
+TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces )
 {
 	// first, build a CPP Style license
 	
@@ -82,29 +82,29 @@ TQString TDevLicense::assemble( TDevFile::CommentingStyle commentingStyle, const
 
 	switch( commentingStyle )
 	{
-		case TDevFile::CPPStyle:
-		case TDevFile::CStyle:
+		case KDevFile::CPPStyle:
+		case KDevFile::CStyle:
 			return str;
 			
-		case TDevFile::PascalStyle:
+		case KDevFile::PascalStyle:
 			str.replace(TQRegExp("/\\**\n \\*"), "{\n  ");
 			str.replace(TQRegExp("\\*\n \\*"), " \n  ");
 			str.replace(TQRegExp(" *\\**/\n"), "}\n");
 			return str;
 			
-		case TDevFile::AdaStyle:
+		case KDevFile::AdaStyle:
 			str.replace(TQRegExp("/\\*"), "--");
 			str.replace(TQRegExp(" \\*"), "--");
 			str.replace(TQRegExp("\\*/"), "*");
 			return str;
 			
-		case TDevFile::BashStyle:
+		case KDevFile::BashStyle:
 			str.replace(TQRegExp("\\*|/"), "#");
 			str.replace(TQRegExp("\n ##"), "\n##");
 			str.replace(TQRegExp("\n #"), "\n# ");
 			return str;
 
-		case TDevFile::XMLStyle:
+		case KDevFile::XMLStyle:
 			str.replace(TQRegExp("/\\*"), "<!--");
 			str.replace(TQRegExp("\n \\*"), "\n<!--");
 			str.replace(TQRegExp("\\*/?\n"), "-->\n");
diff --git a/parts/appwizard/tdevlicense.h b/parts/appwizard/kdevlicense.h
index d61aebc3..2e81c9ec 100644
--- a/parts/appwizard/tdevlicense.h
+++ b/parts/appwizard/kdevlicense.h
@@ -16,30 +16,30 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVLICENSE_H
-#define TDEVLICENSE_H
+#ifndef KDEVLICENSE_H
+#define KDEVLICENSE_H
 
 /**
-@file tdevfile.h
+@file kdevfile.h
 The interface to installed licenses.
 */
 
 #include <tqstringlist.h>
 
-#include "tdevfile.h"
+#include "kdevfile.h"
 
 /*The interface to installed licenses.*/
-class TDevLicense
+class KDevLicense
 {
 public:
-    /**Constructs a TDevLicense and loads the given license template file.
+    /**Constructs a KDevLicense and loads the given license template file.
     @param name The name of this license.
     @param fileName The file name where license template text is kept.*/
-    TDevLicense(const TQString& name, const TQString& fileName);
+    KDevLicense(const TQString& name, const TQString& fileName);
 
 public:
     /**Assembles the license to a string suitable for replacement of a %{LICENSE} .*/
-    TQString assemble(TDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces );
+    TQString assemble(KDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces );
 
     /**
     * returns the name of this license.
diff --git a/parts/appwizard/profilesupport.cpp b/parts/appwizard/profilesupport.cpp
index 3c5a5a35..ac5da870 100644
--- a/parts/appwizard/profilesupport.cpp
+++ b/parts/appwizard/profilesupport.cpp
@@ -24,9 +24,9 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 
-#include <tdevplugincontroller.h>
+#include <kdevplugincontroller.h>
 
-ProfileSupport::ProfileSupport(TDevPlugin *parent)
+ProfileSupport::ProfileSupport(KDevPlugin *parent)
 {
     KURL::List resources = parent->pluginController()->profileResourcesRecursive("*.appwizard");
     
diff --git a/parts/appwizard/profilesupport.h b/parts/appwizard/profilesupport.h
index 11e9b201..b18a9620 100644
--- a/parts/appwizard/profilesupport.h
+++ b/parts/appwizard/profilesupport.h
@@ -20,11 +20,11 @@
 #ifndef PROFILESUPPORT_H
 #define PROFILESUPPORT_H
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 class ProfileSupport{
 public:
-    ProfileSupport(TDevPlugin *parent);
+    ProfileSupport(KDevPlugin *parent);
     bool isInTemplateList(const TQString &templateUrl);
     
 private:
diff --git a/parts/astyle/CMakeLists.txt b/parts/astyle/CMakeLists.txt
index aba6c00f..bac3e50a 100644
--- a/parts/astyle/CMakeLists.txt
+++ b/parts/astyle/CMakeLists.txt
@@ -28,13 +28,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevastyle.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpart_astyle.rc DESTINATION ${DATA_INSTALL_DIR}/tdevastyle )
+install( FILES kdevastyle.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpart_astyle.rc DESTINATION ${DATA_INSTALL_DIR}/kdevastyle )
 
 
-##### libtdevastyle (module) ####################
+##### libkdevastyle (module) ####################
 
-tde_add_kpart( libtdevastyle AUTOMOC
+tde_add_kpart( libkdevastyle AUTOMOC
   SOURCES
     astyle_part.cpp astyleconfig.ui astyle_widget.cpp
     astyle_adaptor.cpp
diff --git a/parts/astyle/Makefile.am b/parts/astyle/Makefile.am
index 4247625d..739ba2b8 100644
--- a/parts/astyle/Makefile.am
+++ b/parts/astyle/Makefile.am
@@ -1,16 +1,16 @@
 INCLUDES = -I$(top_srcdir)/lib/astyle -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevastyle.la
-libtdevastyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevastyle_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+kde_module_LTLIBRARIES = libkdevastyle.la
+libkdevastyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevastyle_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/lib/astyle/libastyle.la 
 
-libtdevastyle_la_SOURCES = astyle_part.cpp astyleconfig.ui astyle_widget.cpp astyle_adaptor.cpp
+libkdevastyle_la_SOURCES = astyle_part.cpp astyleconfig.ui astyle_widget.cpp astyle_adaptor.cpp
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevastyle.desktop
+service_DATA = kdevastyle.desktop
 
-rc_DATA = tdevpart_astyle.rc
-rcdir = $(kde_datadir)/tdevastyle
+rc_DATA = kdevpart_astyle.rc
+rcdir = $(kde_datadir)/kdevastyle
diff --git a/parts/astyle/astyle_adaptor.cpp b/parts/astyle/astyle_adaptor.cpp
index 6f6bed50..05fb0901 100644
--- a/parts/astyle/astyle_adaptor.cpp
+++ b/parts/astyle/astyle_adaptor.cpp
@@ -38,7 +38,7 @@ string ASStringIterator::nextLine()
 }
 
 
-TDevFormatter::TDevFormatter(const TQMap<TQString, TQVariant>& options)
+KDevFormatter::KDevFormatter(const TQMap<TQString, TQVariant>& options)
 {
 // 	for ( TQMap<TQString, TQVariant>::ConstIterator iter = options.begin();iter != options.end();iter++ )
 // 	{
@@ -116,7 +116,7 @@ TDevFormatter::TDevFormatter(const TQMap<TQString, TQVariant>& options)
   setSingleStatementsMode(!options["KeepStatements"].toBool());
 }
 
-TDevFormatter::TDevFormatter( AStyleWidget * widget )
+KDevFormatter::KDevFormatter( AStyleWidget * widget )
 {
 	setCStyle();
 
@@ -215,7 +215,7 @@ TDevFormatter::TDevFormatter( AStyleWidget * widget )
 	setSingleStatementsMode( !widget->Keep_Statements->isChecked() );
 }
 
-bool TDevFormatter::predefinedStyle( const TQString & style )
+bool KDevFormatter::predefinedStyle( const TQString & style )
 {
 	if (style == "ANSI")
 	{
diff --git a/parts/astyle/astyle_adaptor.h b/parts/astyle/astyle_adaptor.h
index df2ab818..21398fbb 100644
--- a/parts/astyle/astyle_adaptor.h
+++ b/parts/astyle/astyle_adaptor.h
@@ -33,12 +33,12 @@ private:
 
 class AStyleWidget;
 
-class TDevFormatter : public astyle::ASFormatter
+class KDevFormatter : public astyle::ASFormatter
 {
 public:
 
-  TDevFormatter(const TQMap<TQString, TQVariant>& options);
-  TDevFormatter( AStyleWidget * widget );
+  KDevFormatter(const TQMap<TQString, TQVariant>& options);
+  KDevFormatter( AStyleWidget * widget );
   TQString indentString() const
   {
 	  return m_indentString;
diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp
index 57d032c8..16d590ab 100644
--- a/parts/astyle/astyle_part.cpp
+++ b/parts/astyle/astyle_part.cpp
@@ -7,7 +7,7 @@
 #include <tdeversion.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdeparts/part.h>
@@ -17,10 +17,10 @@
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/selectioninterface.h>
 #include <kprogress.h>
-#include <tdevcore.h>
-#include <tdevapi.h>
-#include <tdevpartcontroller.h>
-#include <tdevplugininfo.h>
+#include <kdevcore.h>
+#include <kdevapi.h>
+#include <kdevpartcontroller.h>
+#include <kdevplugininfo.h>
 #include <configwidgetproxy.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
@@ -33,22 +33,22 @@
 #include "astyle_widget.h"
 #include "astyle_adaptor.h"
 
-static const TDevPluginInfo data("tdevastyle");
+static const KDevPluginInfo data("kdevastyle");
 
 namespace {
     const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm";
 }
 
 
-typedef TDevGenericFactory<AStylePart> AStyleFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevastyle, AStyleFactory( data ) )
+typedef KDevGenericFactory<AStylePart> AStyleFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) )
 
 AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &)
   : KDevSourceFormatter(&data, parent, name ? name : "AStylePart")
 {
   setInstance(AStyleFactory::instance());
 
-  setXMLFile("tdevpart_astyle.rc");
+  setXMLFile("kdevpart_astyle.rc");
 
   formatTextAction = new TDEAction(i18n("&Reformat Source"), 0, this, TQT_SLOT(beautifySource()), actionCollection(), "edit_astyle");
   formatTextAction->setEnabled(false);
@@ -161,7 +161,7 @@ void AStylePart::beautifySource()
 
   //if there is a selection, we only format it.
   ASStringIterator is(has_selection ? sel_iface->selection() : iface->text());
-  TDevFormatter formatter(m_project);
+  KDevFormatter formatter(m_project);
 
   formatter.init(&is);
 
@@ -346,7 +346,7 @@ void AStylePart::activePartChanged ( KParts::Part *part )
 TQString AStylePart::formatSource( const TQString text, AStyleWidget * widget, const TQMap<TQString, TQVariant>& options  )
 {
 	ASStringIterator is(text);
-	TDevFormatter * formatter = ( widget)? new TDevFormatter( widget ) : new TDevFormatter(options);
+	KDevFormatter * formatter = ( widget)? new KDevFormatter( widget ) : new KDevFormatter(options);
 
 	formatter->init(&is);
 
@@ -390,7 +390,7 @@ TQString AStylePart::formatSource( const TQString text )
 
 TQString AStylePart::indentString( ) const
 {
-  TDevFormatter formatter(m_project);
+  KDevFormatter formatter(m_project);
   return formatter.indentString();
 }
 
diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h
index 675bada5..61b5a382 100644
--- a/parts/astyle/astyle_part.h
+++ b/parts/astyle/astyle_part.h
@@ -3,14 +3,14 @@
  */
 
 
-#ifndef __TDEVPART_ASTYLE_H__
-#define __TDEVPART_ASTYLE_H__
+#ifndef __KDEVPART_ASTYLE_H__
+#define __KDEVPART_ASTYLE_H__
 
 class KDialogBase;
-#include <tdevsourceformatter.h>
+#include <kdevsourceformatter.h>
 #include <tdeaction.h>
 #include <tdeparts/part.h>
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 #include <kdebug.h>
 #include <tqmap.h>
 #include <tqvariant.h>
diff --git a/parts/astyle/astyle_widget.cpp b/parts/astyle/astyle_widget.cpp
index bcb810e5..a70c6771 100644
--- a/parts/astyle/astyle_widget.cpp
+++ b/parts/astyle/astyle_widget.cpp
@@ -10,7 +10,7 @@
 #include <tqspinbox.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <tdevcore.h>
+#include <kdevcore.h>
 
 
 AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *parent, const char *name)
diff --git a/parts/astyle/astyle_widget.h b/parts/astyle/astyle_widget.h
index 89b3f2cd..91963e54 100644
--- a/parts/astyle/astyle_widget.h
+++ b/parts/astyle/astyle_widget.h
@@ -4,7 +4,7 @@
 #include "astyleconfig.h"
 
 class AStylePart;
-class TDevPart;
+class KDevPart;
 
 
 class AStyleWidget : public AStyleConfig
diff --git a/parts/astyle/tdevastyle.desktop b/parts/astyle/kdevastyle.desktop
index b77c4745..ceeaabfc 100644
--- a/parts/astyle/tdevastyle.desktop
+++ b/parts/astyle/kdevastyle.desktop
@@ -76,7 +76,7 @@ GenericName[zh_CN]=源代码格式化
 GenericName[zh_TW]=程式源碼格式器
 Icon=tdevelop
 ServiceTypes=TDevelop/SourceFormatter
-X-TDE-Library=libtdevastyle
+X-TDE-Library=libkdevastyle
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 X-TDevelop-Properties=CDevelopment,CPPDevelopment,JavaDevelopment
diff --git a/parts/astyle/tdevpart_astyle.rc b/parts/astyle/kdevpart_astyle.rc
index 69037425..69037425 100644
--- a/parts/astyle/tdevpart_astyle.rc
+++ b/parts/astyle/kdevpart_astyle.rc
diff --git a/parts/bookmarks/CMakeLists.txt b/parts/bookmarks/CMakeLists.txt
index 98022378..0422965c 100644
--- a/parts/bookmarks/CMakeLists.txt
+++ b/parts/bookmarks/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevbookmarks.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevbookmarks.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevbookmarks (module) #################
+##### libkdevbookmarks (module) #################
 
-tde_add_kpart( libtdevbookmarks AUTOMOC
+tde_add_kpart( libkdevbookmarks AUTOMOC
   SOURCES
     bookmarks_part.cpp bookmarks_widget.cpp bookmarks_settings_base.ui
     bookmarks_settings.cpp bookmarks_config.cpp
diff --git a/parts/bookmarks/Makefile.am b/parts/bookmarks/Makefile.am
index 6f2e6b8d..2ac7b233 100644
--- a/parts/bookmarks/Makefile.am
+++ b/parts/bookmarks/Makefile.am
@@ -1,14 +1,14 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevbookmarks.la
-libtdevbookmarks_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevbookmarks_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevbookmarks.la
+libkdevbookmarks_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevbookmarks_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevbookmarks_la_SOURCES = bookmarks_part.cpp bookmarks_widget.cpp bookmarks_settings_base.ui bookmarks_settings.cpp bookmarks_config.cpp
+libkdevbookmarks_la_SOURCES = bookmarks_part.cpp bookmarks_widget.cpp bookmarks_settings_base.ui bookmarks_settings.cpp bookmarks_config.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevbookmarks.desktop
+service_DATA = kdevbookmarks.desktop
 
 noinst_HEADERS =  bookmarks_settings.h bookmarks_config.h
diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp
index 50672642..f7ac78cb 100644
--- a/parts/bookmarks/bookmarks_part.cpp
+++ b/parts/bookmarks/bookmarks_part.cpp
@@ -18,16 +18,16 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdetexteditor/markinterface.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/document.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 
-#include <tdevpartcontroller.h>
-#include <tdevcore.h>
-#include <tdevmainwindow.h>
+#include <kdevpartcontroller.h>
+#include <kdevcore.h>
+#include <kdevmainwindow.h>
 #include "domutil.h"
 
 #include "bookmarks_widget.h"
@@ -36,16 +36,16 @@
 #include "bookmarks_config.h"
 
 #include <configwidgetproxy.h>
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 
 #define BOOKMARKSETTINGSPAGE 1
 
-typedef TDevGenericFactory<BookmarksPart> BookmarksFactory;
-static const TDevPluginInfo data("tdevbookmarks");
-K_EXPORT_COMPONENT_FACTORY( libtdevbookmarks, BookmarksFactory( data ) )
+typedef KDevGenericFactory<BookmarksPart> BookmarksFactory;
+static const KDevPluginInfo data("kdevbookmarks");
+K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) )
 
 BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& )
-	: TDevPlugin(&data, parent, name ? name : "BookmarksPart" )
+	: KDevPlugin(&data, parent, name ? name : "BookmarksPart" )
 {
 	setInstance(BookmarksFactory::instance());
 
diff --git a/parts/bookmarks/bookmarks_part.h b/parts/bookmarks/bookmarks_part.h
index b8015f54..f51603d7 100644
--- a/parts/bookmarks/bookmarks_part.h
+++ b/parts/bookmarks/bookmarks_part.h
@@ -10,8 +10,8 @@
  ***************************************************************************/
 
 
-#ifndef __TDEVPART_BOOKMARKS_H__
-#define __TDEVPART_BOOKMARKS_H__
+#ifndef __KDEVPART_BOOKMARKS_H__
+#define __KDEVPART_BOOKMARKS_H__
 
 
 #include <tqguardedptr.h>
@@ -22,7 +22,7 @@
 #include <tdeparts/part.h>
 #include <kurl.h>
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 class TQTimer;
 class KDialogBase;
@@ -38,7 +38,7 @@ struct EditorData
 class BookmarksWidget;
 class TQDomElement;
 
-class BookmarksPart : public TDevPlugin
+class BookmarksPart : public KDevPlugin
 {
 	Q_OBJECT
   
@@ -48,7 +48,7 @@ public:
 	BookmarksPart(TQObject *parent, const char *name, const TQStringList &);
 	~BookmarksPart();
 
-	// reimplemented from TDevPlugin
+	// reimplemented from KDevPlugin
 	void restorePartialProjectSession( const TQDomElement * el );
 	void savePartialProjectSession( TQDomElement * el );
 	
diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp
index dbf892fe..cc7316c8 100644
--- a/parts/bookmarks/bookmarks_widget.cpp
+++ b/parts/bookmarks/bookmarks_widget.cpp
@@ -23,8 +23,8 @@
 #include <tdepopupmenu.h>
 #include <tdelocale.h>
 
-#include <tdevpartcontroller.h>
-#include <tdevcore.h>
+#include <kdevpartcontroller.h>
+#include <kdevcore.h>
 
 
 #include "bookmarks_part.h"
diff --git a/parts/bookmarks/tdevbookmarks.desktop b/parts/bookmarks/kdevbookmarks.desktop
index 0ec9ae11..3cbdb233 100644
--- a/parts/bookmarks/tdevbookmarks.desktop
+++ b/parts/bookmarks/kdevbookmarks.desktop
@@ -80,6 +80,6 @@ GenericName[zh_TW]=書籤
 Icon=bookmark
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Project
-X-TDE-Library=libtdevbookmarks
+X-TDE-Library=libkdevbookmarks
 X-TDevelop-Version=5
 X-TDevelop-Properties=CodeEditing
diff --git a/parts/classview/CMakeLists.txt b/parts/classview/CMakeLists.txt
index a5ec68dc..2d19388a 100644
--- a/parts/classview/CMakeLists.txt
+++ b/parts/classview/CMakeLists.txt
@@ -30,17 +30,17 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevclassview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevclassview.rc DESTINATION ${DATA_INSTALL_DIR}/tdevclassview )
+install( FILES kdevclassview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevclassview.rc DESTINATION ${DATA_INSTALL_DIR}/kdevclassview )
 
 
-##### libtdevclassview (module) #################
+##### libkdevclassview (module) #################
 
-tde_add_kpart( libtdevclassview AUTOMOC
+tde_add_kpart( libkdevclassview AUTOMOC
   SOURCES
     classviewpart.cpp classviewwidget.cpp digraphview.cpp
     hierarchydlg.cpp navigator.cpp viewcombos.cpp
   LINK
-    tdevextensions-static tdevelop-shared tdevwidgets-shared
+    kdevextensions-static tdevelop-shared kdevwidgets-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/classview/Makefile.am b/parts/classview/Makefile.am
index ccc02078..3041259e 100644
--- a/parts/classview/Makefile.am
+++ b/parts/classview/Makefile.am
@@ -3,20 +3,20 @@
 INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions \
 	-I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevclassview.la
-libtdevclassview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevclassview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la
+kde_module_LTLIBRARIES = libkdevclassview.la
+libkdevclassview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevclassview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
 
-libtdevclassview_la_SOURCES = classviewpart.cpp classviewwidget.cpp \
+libkdevclassview_la_SOURCES = classviewpart.cpp classviewwidget.cpp \
 	digraphview.cpp hierarchydlg.cpp navigator.cpp viewcombos.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevclassview.desktop
+service_DATA = kdevclassview.desktop
 
-rcdir = $(kde_datadir)/tdevclassview
-rc_DATA = tdevclassview.rc
+rcdir = $(kde_datadir)/kdevclassview
+rc_DATA = kdevclassview.rc
 
 
 QTDIR = /home/bernd/kdesrc/qt-copy
diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp
index f0c49d46..c0cc21a2 100644
--- a/parts/classview/classtooldlg.cpp
+++ b/parts/classview/classtooldlg.cpp
@@ -20,7 +20,7 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 
-#include "tdevlanguagesupport.h"
+#include "kdevlanguagesupport.h"
 #include "classstore.h"
 #include "parsedclass.h"
 #include "classviewpart.h"
@@ -119,8 +119,8 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
     connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods()));
     connect( attributes_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewAttributes()));
 
-    connect( part, TQT_SIGNAL(setLanguageSupport(TDevLanguageSupport*)),
-             this, TQT_SLOT(setLanguageSupport(TDevLanguageSupport*)) );
+    connect( part, TQT_SIGNAL(setLanguageSupport(KDevLanguageSupport*)),
+             this, TQT_SLOT(setLanguageSupport(KDevLanguageSupport*)) );
 
     m_part->registerClassToolDialog(this);
 }
@@ -132,7 +132,7 @@ ClassToolDialog::~ClassToolDialog()
 }
 
 
-void ClassToolDialog::setLanguageSupport(TDevLanguageSupport *ls)
+void ClassToolDialog::setLanguageSupport(KDevLanguageSupport *ls)
 {
     if (ls) {
         disconnect(ls, 0, this, 0);
diff --git a/parts/classview/classtooldlg.h b/parts/classview/classtooldlg.h
index c4b2e79a..d143e66e 100644
--- a/parts/classview/classtooldlg.h
+++ b/parts/classview/classtooldlg.h
@@ -59,7 +59,7 @@ public slots:
     void viewAttributes();
 
 private slots:
-    void setLanguageSupport(TDevLanguageSupport *ls);
+    void setLanguageSupport(KDevLanguageSupport *ls);
     void refresh();
 
     void delayedClose();
@@ -85,7 +85,7 @@ private:
     
     /** Store that holds all classes in the system. */
     ClassStore *m_store;
-    TDevLanguageSupport *m_ls;
+    KDevLanguageSupport *m_ls;
     ClassViewPart *m_part;
     
     /** The class we are currently viewing. */
diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp
index 66e23173..9e052418 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -22,10 +22,10 @@
 #include <tdelocale.h>
 #include <kiconloader.h>
 
-#include "tdevcore.h"
-#include "tdevlanguagesupport.h"
-#include "tdevmainwindow.h"
-#include "tdevpartcontroller.h"
+#include "kdevcore.h"
+#include "kdevlanguagesupport.h"
+#include "kdevmainwindow.h"
+#include "kdevpartcontroller.h"
 #include "classstore.h"
 
 #include "classviewpart.h"
@@ -36,10 +36,10 @@ TDEPopupMenu *ClassTreeItem::createPopup()
     if (!m_item || m_item->itemType() == PIT_SCOPE)
         return 0;
 
-    TDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features();
+    KDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features();
 
     TDEPopupMenu *popup = new TDEPopupMenu();
-    if (features & TDevLanguageSupport::Declarations)
+    if (features & KDevLanguageSupport::Declarations)
         popup->insertItem( i18n("Go to Declaration"), classTree(), TQT_SLOT(slotGotoDeclaration()) );
     if (m_item->itemType() == PIT_METHOD)
         popup->insertItem( i18n("Go to Definition"), classTree(), TQT_SLOT(slotGotoImplementation()) );
@@ -49,8 +49,8 @@ TDEPopupMenu *ClassTreeItem::createPopup()
     case PIT_CLASS:
         {
             title = i18n("Class");
-            bool hasAddMethod = features & TDevLanguageSupport::AddMethod;
-            bool hasAddAttribute = features & TDevLanguageSupport::AddAttribute;
+            bool hasAddMethod = features & KDevLanguageSupport::AddMethod;
+            bool hasAddAttribute = features & KDevLanguageSupport::AddAttribute;
             if (hasAddMethod)
                 popup->insertItem( i18n("Add Method..."), classTree(), TQT_SLOT(slotAddMethod()));
             if (hasAddAttribute)
@@ -168,7 +168,7 @@ void ClassTreeScopeItem::setOpen(bool o)
         ClassTreeItem *lastItem = 0;
 
         // Ok, this is a hack...
-        TDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features();
+        KDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features();
         
         // Add namespaces
         TQValueList<ParsedScopeContainer*> scopeList = pScope->getSortedScopeList();
@@ -176,7 +176,7 @@ void ClassTreeScopeItem::setOpen(bool o)
         for (it = scopeList.begin(); it != scopeList.end(); ++it)
             lastItem = new ClassTreeScopeItem(this, lastItem, *it);
 
-        if (features & TDevLanguageSupport::Classes) {
+        if (features & KDevLanguageSupport::Classes) {
             // Add classes
             TQValueList<ParsedClass*> classList = pScope->getSortedClassList();
             TQValueList<ParsedClass*>::ConstIterator it;
@@ -184,7 +184,7 @@ void ClassTreeScopeItem::setOpen(bool o)
                 lastItem = new ClassTreeClassItem(this, lastItem, *it);
         }
             
-        if (features & TDevLanguageSupport::Structs) {
+        if (features & KDevLanguageSupport::Structs) {
             // Add structs
             TQValueList<ParsedClass*> structList = pScope->getSortedStructList();
             TQValueList<ParsedClass*>::ConstIterator it;
@@ -192,7 +192,7 @@ void ClassTreeScopeItem::setOpen(bool o)
                 lastItem = new ClassTreeClassItem(this, lastItem, *it, true);
         }
 
-        if (features & TDevLanguageSupport::Functions) {
+        if (features & KDevLanguageSupport::Functions) {
             // Add functions
             TQValueList<ParsedMethod*> methodList = pScope->getSortedMethodList();
             TQValueList<ParsedMethod*>::ConstIterator it;
@@ -200,7 +200,7 @@ void ClassTreeScopeItem::setOpen(bool o)
                 lastItem = new ClassTreeMethodItem(this, lastItem, *it);
         }
 
-        if (features & TDevLanguageSupport::Variables) {
+        if (features & KDevLanguageSupport::Variables) {
             // Add attributes
             TQValueList<ParsedAttribute*> attrList = pScope->getSortedAttributeList();
             TQValueList<ParsedAttribute*>::ConstIterator it;
diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp
index 7cdf8cbd..92e26bd0 100644
--- a/parts/classview/classviewpart.cpp
+++ b/parts/classview/classviewpart.cpp
@@ -26,19 +26,19 @@
 
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <kmimetype.h>
 
-#include <tdevcore.h>
-#include <tdevmainwindow.h>
-#include <tdevlanguagesupport.h>
+#include <kdevcore.h>
+#include <kdevmainwindow.h>
+#include <kdevlanguagesupport.h>
 #include <kcomboview.h>
-#include <tdevpartcontroller.h>
-#include <tdevproject.h>
+#include <kdevpartcontroller.h>
+#include <kdevproject.h>
 #include <urlutil.h>
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 
 #include <codemodel.h>
 #include <codemodel_utils.h>
@@ -138,17 +138,17 @@ class FunctionCompletion : public CustomCompleter {
 };
 
 
-typedef TDevGenericFactory<ClassViewPart> ClassViewFactory;
-static const TDevPluginInfo data("tdevclassview");
-K_EXPORT_COMPONENT_FACTORY( libtdevclassview, ClassViewFactory( data ) )
+typedef KDevGenericFactory<ClassViewPart> ClassViewFactory;
+static const KDevPluginInfo data("kdevclassview");
+K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) )
 
 ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& )
-    :/// TDevPlugin( &data, parent, name ? name : "ClassViewPart" ),
-    TDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ),
+    :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ),
+    KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ),
     m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0)
 {
     setInstance(ClassViewFactory::instance());
-    setXMLFile("tdevclassview.rc");
+    setXMLFile("kdevclassview.rc");
     
     navigator = new Navigator(this);
 
@@ -207,7 +207,7 @@ void ClassViewPart::setupActions( )
 
     new TDEAction( i18n("Focus Navigator"), 0, this, TQT_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" );
 
-    if (langHasFeature(TDevLanguageSupport::Classes))
+    if (langHasFeature(KDevLanguageSupport::Classes))
     {
         TDEAction *ac = new TDEAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQT_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia");
         ac->setToolTip(i18n("Class inheritance diagram"));
@@ -216,7 +216,7 @@ void ClassViewPart::setupActions( )
     }
 }
 
-bool ClassViewPart::langHasFeature(TDevLanguageSupport::Features feature)
+bool ClassViewPart::langHasFeature(KDevLanguageSupport::Features feature)
 {
     bool result = false;
     if (languageSupport())
diff --git a/parts/classview/classviewpart.h b/parts/classview/classviewpart.h
index 70d00cc9..16e18def 100644
--- a/parts/classview/classviewpart.h
+++ b/parts/classview/classviewpart.h
@@ -18,16 +18,16 @@
  *
  */
 
-#ifndef __TDEVPART_CLASSVIEW_H__
-#define __TDEVPART_CLASSVIEW_H__
+#ifndef __KDEVPART_CLASSVIEW_H__
+#define __KDEVPART_CLASSVIEW_H__
 
-#include "tdevlanguagesupport.h"
+#include "kdevlanguagesupport.h"
 #include "viewcombos.h"
 
 #include <tqguardedptr.h>
 #include <tqmap.h>
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 #include <codemodel.h>
 #include <codebrowserfrontend.h>
@@ -52,7 +52,7 @@ class TDEToolBarPopupAction;
 class NamespaceItem;
 class Navigator;
 class HierarchyDialog;
-class ClassViewPart : public Extensions::TDevCodeBrowserFrontend
+class ClassViewPart : public Extensions::KDevCodeBrowserFrontend
 {
     Q_OBJECT
   
@@ -60,7 +60,7 @@ public:
     ClassViewPart(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ClassViewPart();
 
-    bool langHasFeature(TDevLanguageSupport::Features feature);
+    bool langHasFeature(KDevLanguageSupport::Features feature);
     
     TDEListViewAction *m_functionsnav;
     Navigator *navigator;
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index cede06f3..22b865ef 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -31,10 +31,10 @@
 #include <tdeconfig.h>
 
 #include <urlutil.h>
-#include <tdevcore.h>
-#include <tdevlanguagesupport.h>
-#include <tdevproject.h>
-#include <tdevpartcontroller.h>
+#include <kdevcore.h>
+#include <kdevlanguagesupport.h>
+#include <kdevproject.h>
+#include <kdevpartcontroller.h>
 #include <codemodel.h>
 #include <codemodel_utils.h>
 
@@ -252,7 +252,7 @@ void ClassViewWidget::insertFile( const TQString& fileName )
 	}
 	break;
 
-    case TDevelop2ViewMode:
+    case KDevelop2ViewMode:
 	{
 	}
 	break;
@@ -293,7 +293,7 @@ void ClassViewWidget::removeFile( const TQString& fileName )
 	}
 	break;
 
-    case TDevelop2ViewMode:
+    case KDevelop2ViewMode:
 	{
 	}
 	break;
@@ -332,19 +332,19 @@ void ClassViewWidget::contentsContextMenuEvent( TQContextMenuEvent * ev )
 
     bool sep = false;
     if( item && item->isClass() ){
-        if( m_part->langHasFeature(TDevLanguageSupport::AddMethod) ) {
+        if( m_part->langHasFeature(KDevLanguageSupport::AddMethod) ) {
             m_actionAddMethod->plug( &menu );
             sep = true;
         }
 	
-        if( m_part->langHasFeature(TDevLanguageSupport::AddAttribute) ) {
+        if( m_part->langHasFeature(KDevLanguageSupport::AddAttribute) ) {
 	    m_actionAddAttribute->plug( &menu );
             sep = true;
         }	
     }
 	
 	if (item && item->isVariable()){
-		if( m_part->langHasFeature(TDevLanguageSupport::CreateAccessMethods) ) 
+		if( m_part->langHasFeature(KDevLanguageSupport::CreateAccessMethods) ) 
 				m_actionCreateAccessMethods->plug( &menu );
 	}
 
@@ -1108,7 +1108,7 @@ TQString VariableDomBrowserItem::key( int , bool ) const
 
 void ClassViewWidget::slotNewClass( )
 {
-    if( m_part->languageSupport()->features() & TDevLanguageSupport::NewClass )
+    if( m_part->languageSupport()->features() & KDevLanguageSupport::NewClass )
 	m_part->languageSupport()->addClass();
 }
 
@@ -1116,7 +1116,7 @@ void ClassViewWidget::slotAddMethod( )
 {
     if ( !selectedItem() ) return;
 
-    if( m_part->languageSupport()->features() & TDevLanguageSupport::AddMethod )
+    if( m_part->languageSupport()->features() & KDevLanguageSupport::AddMethod )
         m_part->languageSupport()->addMethod( static_cast<ClassDomBrowserItem*>( selectedItem() )->dom() );
 }
 
@@ -1124,7 +1124,7 @@ void ClassViewWidget::slotAddAttribute( )
 {
     if ( !selectedItem() ) return;
     
-    if( m_part->languageSupport()->features() & TDevLanguageSupport::AddAttribute )
+    if( m_part->languageSupport()->features() & KDevLanguageSupport::AddAttribute )
         m_part->languageSupport()->addAttribute( static_cast<ClassDomBrowserItem*>( selectedItem() )->dom() );
 }
 
@@ -1271,7 +1271,7 @@ void ClassViewWidget::slotCreateAccessMethods( )
 {
 	if ( !selectedItem() ) return;
 
-    if( m_part->languageSupport()->features() & TDevLanguageSupport::CreateAccessMethods )
+    if( m_part->languageSupport()->features() & KDevLanguageSupport::CreateAccessMethods )
 	{
         VariableDomBrowserItem* item = dynamic_cast<VariableDomBrowserItem*>( selectedItem() );
 		if (item == 0)
diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h
index 1d17efec..d74448f5 100644
--- a/parts/classview/classviewwidget.h
+++ b/parts/classview/classviewwidget.h
@@ -31,7 +31,7 @@
 #include <fancylistviewitem.h>
 #include <navigator.h>
 
-class TDevProject;
+class KDevProject;
 class ClassViewPart;
 class ClassViewItem;
 class FolderBrowserItem;
@@ -51,7 +51,7 @@ public:
     enum ViewMode
     {
 	KDevelop3ViewMode = 0,
-	TDevelop2ViewMode,
+	KDevelop2ViewMode,
 	JavaLikeViewMode
     };
 
diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp
index 6901926b..c8761861 100644
--- a/parts/classview/hierarchydlg.cpp
+++ b/parts/classview/hierarchydlg.cpp
@@ -28,7 +28,7 @@
 #include <tqapplication.h>
 #include <tqsplitter.h>
 
-#include "tdevlanguagesupport.h"
+#include "kdevlanguagesupport.h"
 #include "kcomboview.h"
 
 #include "classviewpart.h"
@@ -105,7 +105,7 @@ void HierarchyDialog::save()
     {
 	TQFileInfo fi(dlg.selectedURL().pathOrURL());
         TQApplication::setOverrideCursor( TQt::waitCursor );
-        TDevLanguageSupport *ls = m_part->languageSupport();
+        KDevLanguageSupport *ls = m_part->languageSupport();
         for (TQMap<TQString, ClassDom>::const_iterator it = classes.begin(); it != classes.end(); ++it)
         {
             kdDebug(9003) << "Adding class to graph: " << it.key() << endl;
@@ -134,7 +134,7 @@ void HierarchyDialog::refresh()
     ViewCombosOp::refreshNamespaces(m_part, namespace_combo);
     processNamespace("", m_part->codeModel()->globalNamespace());
 
-    TDevLanguageSupport *ls = m_part->languageSupport();
+    KDevLanguageSupport *ls = m_part->languageSupport();
 
     for (TQMap<TQString, ClassDom>::const_iterator it = classes.begin(); it != classes.end(); ++it)
     {
@@ -154,7 +154,7 @@ void HierarchyDialog::refresh()
     digraph->process();
 }
 
-void HierarchyDialog::setLanguageSupport(TDevLanguageSupport *ls)
+void HierarchyDialog::setLanguageSupport(KDevLanguageSupport *ls)
 {
     if (ls)
         connect(ls, TQT_SIGNAL(updatedSourceInfo()), this, TQT_SLOT(refresh()));
@@ -169,7 +169,7 @@ void HierarchyDialog::slotClassComboChoice(TQListViewItem * item)
     if (!ci)
         return;
 
-    TDevLanguageSupport *ls = m_part->languageSupport();
+    KDevLanguageSupport *ls = m_part->languageSupport();
 
     TQString className = ls->formatClassName(uclasses[item->text(0)]);
     digraph->setSelected(className);
@@ -188,7 +188,7 @@ void HierarchyDialog::slotClassComboChoice( const TQString& itemText )
             if (!ci)
                 return;
         
-            TDevLanguageSupport *ls = m_part->languageSupport();
+            KDevLanguageSupport *ls = m_part->languageSupport();
         
             TQString className = ls->formatClassName(uclasses[item->text(0)]);
             digraph->setSelected(className);
@@ -205,10 +205,10 @@ void HierarchyDialog::classSelected(const TQString &/*className*/)
 /*    ParsedClass *currentClass = m_part->classStore()->getClassByName(className);
     member_tree->clear();
     if (currentClass) {
-        TDevLanguageSupport::Features features = m_part->languageSupport()->features();
-        if (features & TDevLanguageSupport::Functions)
+        KDevLanguageSupport::Features features = m_part->languageSupport()->features();
+        if (features & KDevLanguageSupport::Functions)
             member_tree->insertAllClassMethods(currentClass, (PIAccess)-1);
-        if (features & TDevLanguageSupport::Variables)
+        if (features & KDevLanguageSupport::Variables)
             member_tree->insertAllClassAttributes(currentClass, (PIAccess)-1);
     }*/
 }
diff --git a/parts/classview/hierarchydlg.h b/parts/classview/hierarchydlg.h
index 9d26ebd0..1c41a8f0 100644
--- a/parts/classview/hierarchydlg.h
+++ b/parts/classview/hierarchydlg.h
@@ -17,7 +17,7 @@
 #include "codemodel.h"
 
 class ClassViewPart;
-class TDevLanguageSupport;
+class KDevLanguageSupport;
 class DigraphView;
 class ClassToolWidget;
 class KComboView;
@@ -35,7 +35,7 @@ public slots:
     void refresh();
 
 private slots:
-    void setLanguageSupport(TDevLanguageSupport *ls);
+    void setLanguageSupport(KDevLanguageSupport *ls);
     void slotClassComboChoice(TQListViewItem *item);
     void slotNamespaceComboChoice(TQListViewItem *item);
     void slotClassComboChoice(const TQString&);
diff --git a/parts/classview/tdevclassview.desktop b/parts/classview/kdevclassview.desktop
index 10200b50..49bfa43c 100644
--- a/parts/classview/tdevclassview.desktop
+++ b/parts/classview/kdevclassview.desktop
@@ -76,7 +76,7 @@ GenericName[tr]=Sınıf Görünümü
 GenericName[zh_CN]=类查看器
 GenericName[zh_TW]=類別檢視
 ServiceTypes=TDevelop/CodeBrowserFrontend
-X-TDE-Library=libtdevclassview
+X-TDE-Library=libkdevclassview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 X-TDevelop-Properties=CodeNavigation
diff --git a/parts/classview/tdevclassview.rc b/parts/classview/kdevclassview.rc
index b5f7a9fb..b5f7a9fb 100644
--- a/parts/classview/tdevclassview.rc
+++ b/parts/classview/kdevclassview.rc
diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp
index a7e3ac85..694aa0d4 100644
--- a/parts/classview/navigator.cpp
+++ b/parts/classview/navigator.cpp
@@ -31,9 +31,9 @@
 
 #include <kcomboview.h>
 #include <tdelistviewaction.h>
-#include <tdevpartcontroller.h>
-#include <tdevlanguagesupport.h>
-#include <tdevmainwindow.h>
+#include <kdevpartcontroller.h>
+#include <kdevlanguagesupport.h>
+#include <kdevmainwindow.h>
 #include <codemodel_utils.h>
 #include "classviewpart.h"
 #include "classviewwidget.h"
diff --git a/parts/ctags2/CMakeLists.txt b/parts/ctags2/CMakeLists.txt
index a88415d6..a8f4b582 100644
--- a/parts/ctags2/CMakeLists.txt
+++ b/parts/ctags2/CMakeLists.txt
@@ -27,13 +27,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevctags2.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpart_ctags2.rc DESTINATION ${DATA_INSTALL_DIR}/tdevctags2 )
+install( FILES kdevctags2.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpart_ctags2.rc DESTINATION ${DATA_INSTALL_DIR}/kdevctags2 )
 
 
-##### libtdevctags2 (module) ####################
+##### libkdevctags2 (module) ####################
 
-tde_add_kpart( libtdevctags2 AUTOMOC
+tde_add_kpart( libkdevctags2 AUTOMOC
   SOURCES
     ctags2_part.cpp readtags.c ctags2_widgetbase.ui
     ctags2_widget.cpp tags.cpp ctagskinds.cpp
diff --git a/parts/ctags2/Makefile.am b/parts/ctags2/Makefile.am
index f12fdada..f92a819c 100644
--- a/parts/ctags2/Makefile.am
+++ b/parts/ctags2/Makefile.am
@@ -1,11 +1,11 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevctags2.la
-libtdevctags2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevctags2_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevctags2.la
+libkdevctags2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevctags2_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevctags2_la_SOURCES = ctags2_part.cpp readtags.c ctags2_widgetbase.ui \
+libkdevctags2_la_SOURCES = ctags2_part.cpp readtags.c ctags2_widgetbase.ui \
 	ctags2_widget.cpp tags.cpp ctagskinds.cpp ctags2_settingswidgetbase.ui \
 	ctags2_settingswidget.cpp ctags2_selecttagfilebase.ui ctags2_selecttagfile.cpp \
 	ctags2_createtagfilebase.ui ctags2_createtagfile.cpp
@@ -13,10 +13,10 @@ libtdevctags2_la_SOURCES = ctags2_part.cpp readtags.c ctags2_widgetbase.ui \
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevctags2.desktop
+service_DATA = kdevctags2.desktop
 
-rc_DATA = tdevpart_ctags2.rc
-rcdir = $(kde_datadir)/tdevctags2
+rc_DATA = kdevpart_ctags2.rc
+rcdir = $(kde_datadir)/kdevctags2
 
 noinst_HEADERS = ctags2_widget.h tags.h readtags.h ctagskinds.h \
 	ctags2_settingswidget.h
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index 371ff7e5..324ded8a 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -31,16 +31,16 @@
 #include <tdeconfig.h>
 #include <tdeaction.h>
 
-#include "tdevappfrontend.h"
-#include <tdevgenericfactory.h>
-#include <tdevcore.h>
-#include <tdevmainwindow.h>
-#include <tdevproject.h>
-#include <tdevpartcontroller.h>
-#include <tdevplugininfo.h>
+#include "kdevappfrontend.h"
+#include <kdevgenericfactory.h>
+#include <kdevcore.h>
+#include <kdevmainwindow.h>
+#include <kdevproject.h>
+#include <kdevpartcontroller.h>
+#include <kdevplugininfo.h>
 #include "configwidgetproxy.h"
 #include "domutil.h"
-#include "tdeveditorutil.h"
+#include "kdeveditorutil.h"
 
 #include "ctags2_settingswidget.h"
 #include "ctags2_widget.h"
@@ -54,15 +54,15 @@ namespace ctags
 #include "readtags.h"
 }
 
-typedef TDevGenericFactory<CTags2Part> CTags2Factory;
-static const TDevPluginInfo data("tdevctags2");
-K_EXPORT_COMPONENT_FACTORY( libtdevctags2, CTags2Factory( data ) )
+typedef KDevGenericFactory<CTags2Part> CTags2Factory;
+static const KDevPluginInfo data("kdevctags2");
+K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( data ) )
 
 CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& )
-  : TDevPlugin(&data, parent, name ? name : "ctags2Part" )
+  : KDevPlugin(&data, parent, name ? name : "ctags2Part" )
 {
 	setInstance(CTags2Factory::instance());
-	setXMLFile("tdevpart_ctags2.rc");
+	setXMLFile("kdevpart_ctags2.rc");
 
 	TQDomDocument & dom = *projectDom();
 	TQString customTagFile = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" );
@@ -164,7 +164,7 @@ bool CTags2Part::createTagsFile(const TQString& tagFile, const TQString& dir)
 	commandline += " ";
 	commandline += dir;
 
-	if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend"))
+	if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
 		appFrontend->startAppCommand(dir, commandline, false);
 
 	return true;
@@ -330,7 +330,7 @@ int CTags2Part::getFileLineFromPattern( KURL const & url, TQString const & patte
 
 void CTags2Part::slotLookupDeclaration( )
 {
- 	m_contextString = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+ 	m_contextString = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 	if ( !m_contextString.isEmpty() )
 	{
 		slotGotoDeclaration();
@@ -339,7 +339,7 @@ void CTags2Part::slotLookupDeclaration( )
 
 void CTags2Part::slotLookupDefinition( )
 {
- 	m_contextString = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+ 	m_contextString = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 	if ( !m_contextString.isEmpty() )
 	{
 		slotGotoDefinition();
@@ -348,7 +348,7 @@ void CTags2Part::slotLookupDefinition( )
 
 void CTags2Part::slotLookup( )
 {
- 	m_contextString = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+ 	m_contextString = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 	if ( !m_contextString.isEmpty() )
 	{
 		slotGotoTag();
diff --git a/parts/ctags2/ctags2_part.h b/parts/ctags2/ctags2_part.h
index ca33e801..93af5f7f 100644
--- a/parts/ctags2/ctags2_part.h
+++ b/parts/ctags2/ctags2_part.h
@@ -9,13 +9,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef __TDEVPART_CTAGS2_H__
-#define __TDEVPART_CTAGS2_H__
+#ifndef __KDEVPART_CTAGS2_H__
+#define __KDEVPART_CTAGS2_H__
 
 #include <tqguardedptr.h>
 #include <tqstring.h>
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 #include "tags.h"
 
 class TQPopupMenu;
@@ -26,7 +26,7 @@ class CTags2Widget;
 class ConfigWidgetProxy;
 class KDialogBase;
 
-class CTags2Part : public TDevPlugin
+class CTags2Part : public KDevPlugin
 {
   Q_OBJECT
   
diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp
index c44f91d6..b45a41be 100644
--- a/parts/ctags2/ctags2_settingswidget.cpp
+++ b/parts/ctags2/ctags2_settingswidget.cpp
@@ -15,13 +15,13 @@
 
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <tdevproject.h>
+#include <kdevproject.h>
 #include <tdeapplication.h>
 #include <kurlcompletion.h>
 #include <kurlrequester.h>
 #include <tdeconfig.h>
 #include <kurl.h>
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 #include <domutil.h>
 
 #include "ctags2_settingswidget.h"
diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp
index cb44937d..bd1b138d 100644
--- a/parts/ctags2/ctags2_widget.cpp
+++ b/parts/ctags2/ctags2_widget.cpp
@@ -22,8 +22,8 @@
 #include <kurl.h>
 #include <tdeapplication.h>
 
-#include <tdevproject.h>
-#include <tdevpartcontroller.h>
+#include <kdevproject.h>
+#include <kdevpartcontroller.h>
 
 #include "ctags2_widget.h"
 #include "tags.h"
diff --git a/parts/ctags2/tdevctags2.desktop b/parts/ctags2/kdevctags2.desktop
index 86720c8e..db79f503 100644
--- a/parts/ctags2/tdevctags2.desktop
+++ b/parts/ctags2/kdevctags2.desktop
@@ -77,6 +77,6 @@ GenericName[zh_CN]=CTags前端
 GenericName[zh_TW]=CTags 前端介面
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Project
-X-TDE-Library=libtdevctags2
+X-TDE-Library=libkdevctags2
 X-TDevelop-Version=5
 X-TDevelop-Properties=CodeNavigation
diff --git a/parts/ctags2/tdevpart_ctags2.rc b/parts/ctags2/kdevpart_ctags2.rc
index c217c256..e8745b3b 100644
--- a/parts/ctags2/tdevpart_ctags2.rc
+++ b/parts/ctags2/kdevpart_ctags2.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>

-<kpartplugin name="ctags" library="libtdevctags2" version="3">

+<kpartplugin name="ctags" library="libkdevctags2" version="3">

 	<MenuBar>

 	</MenuBar>

 	<Menu name="hidden">

diff --git a/parts/diff/CMakeLists.txt b/parts/diff/CMakeLists.txt
index a4135dc6..09987fd7 100644
--- a/parts/diff/CMakeLists.txt
+++ b/parts/diff/CMakeLists.txt
@@ -26,13 +26,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevdiff.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevdiff.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdiff )
+install( FILES kdevdiff.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevdiff.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdiff )
 
 
-##### libtdevdiff (module) ######################
+##### libkdevdiff (module) ######################
 
-tde_add_kpart( libtdevdiff AUTOMOC
+tde_add_kpart( libkdevdiff AUTOMOC
   SOURCES diffpart.cpp diffwidget.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/diff/Makefile.am b/parts/diff/Makefile.am
index 3d9396eb..ea521442 100644
--- a/parts/diff/Makefile.am
+++ b/parts/diff/Makefile.am
@@ -3,16 +3,16 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevdiff.la
-libtdevdiff_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevdiff_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevdiff.la
+libkdevdiff_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevdiff_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevdiff_la_SOURCES = diffpart.cpp diffwidget.cpp
+libkdevdiff_la_SOURCES = diffpart.cpp diffwidget.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevdiff.desktop
+service_DATA = kdevdiff.desktop
 
-rcdir = $(kde_datadir)/tdevdiff
-rc_DATA = tdevdiff.rc
+rcdir = $(kde_datadir)/kdevdiff
+rc_DATA = kdevdiff.rc
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index b48e8136..a0dbafdd 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -16,7 +16,7 @@
 #include <tqpopupmenu.h>
 
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdefiledialog.h>
 #include <kprocess.h>
@@ -28,24 +28,24 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
-#include "tdevpartcontroller.h"
-#include "tdevplugininfo.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
+#include "kdevpartcontroller.h"
+#include "kdevplugininfo.h"
 
 #include "diffdlg.h"
 #include "diffwidget.h"
 
-static const TDevPluginInfo data("tdevdiff");
+static const KDevPluginInfo data("kdevdiff");
 
-typedef TDevGenericFactory<DiffPart> DiffFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevdiff, DiffFactory( data ) )
+typedef KDevGenericFactory<DiffPart> DiffFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) )
 
 DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &)
-    : TDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0)
+    : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0)
 {
   setInstance(DiffFactory::instance());
-  setXMLFile("tdevdiff.rc");
+  setXMLFile("kdevdiff.rc");
 
   diffWidget = new DiffWidget(this, 0, "diffWidget");
   diffWidget->setIcon( SmallIcon("editcopy") );
@@ -83,7 +83,7 @@ static bool urlIsEqual(const KURL &a, const KURL &b)
   return a == b;
 }
 
-static KParts::ReadWritePart* partForURL(const KURL &url, TDevPartController* pc)
+static KParts::ReadWritePart* partForURL(const KURL &url, KDevPartController* pc)
 {
   if ( !pc )
     return 0;
diff --git a/parts/diff/diffpart.h b/parts/diff/diffpart.h
index 984c2c06..6fe89efe 100644
--- a/parts/diff/diffpart.h
+++ b/parts/diff/diffpart.h
@@ -15,8 +15,8 @@
 #include <tqguardedptr.h>
 #include <tqcstring.h>
 
-#include "tdevplugin.h"
-#include "tdevdifffrontend.h"
+#include "kdevplugin.h"
+#include "kdevdifffrontend.h"
 
 class TQPopupMenu;
 class Context;
@@ -24,7 +24,7 @@ class TDEProcess;
 class DiffWidget;
 class TQCString;
 
-class DiffPart : public TDevDiffFrontend
+class DiffPart : public KDevDiffFrontend
 {
     Q_OBJECT
   
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index 24435611..51dabcaf 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -31,7 +31,7 @@
 #include <tdeio/jobclasses.h>
 #include <tdeio/job.h>
 
-#include <tdevmainwindow.h>
+#include <kdevmainwindow.h>
 
 #include "diffpart.h"
 #include "diffwidget.h"
diff --git a/parts/diff/tdevdiff.desktop b/parts/diff/kdevdiff.desktop
index db2d0428..13b22e9f 100644
--- a/parts/diff/tdevdiff.desktop
+++ b/parts/diff/kdevdiff.desktop
@@ -35,7 +35,7 @@ Comment[tg]=Намоишгари фарқкунанда
 Comment[tr]=Fark Görüntüleyicisi
 Comment[zh_CN]=差别查看器
 Comment[zh_TW]=比較檢視器
-Name=TDevDiff
+Name=KDevDiff
 Name[da]=TDevelop diff-fremviser
 Name[de]=Abweichungsansicht (TDevelop)
 Name[hi]=के-डेव-डिफ़
@@ -78,7 +78,7 @@ GenericName[tr]=Fark Görüntüleyicisi
 GenericName[zh_CN]=差别查看器
 GenericName[zh_TW]=比較檢視器
 ServiceTypes=TDevelop/DiffFrontend
-X-TDE-Library=libtdevdiff
+X-TDE-Library=libkdevdiff
 X-TDevelop-Version=5
 X-TDevelop-Properties=CodeEditing
 X-TDevelop-Scope=Core
diff --git a/parts/diff/tdevdiff.rc b/parts/diff/kdevdiff.rc
index ca944508..37059573 100644
--- a/parts/diff/tdevdiff.rc
+++ b/parts/diff/kdevdiff.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="TDevDiff" version="1">
+<kpartgui name="KDevDiff" version="1">
 <MenuBar>
   <Menu name="tools" >
     <Action name="tools_diff" group="tools_file_operations"/>
diff --git a/parts/distpart/CMakeLists.txt b/parts/distpart/CMakeLists.txt
index 586b5346..15fcb85e 100644
--- a/parts/distpart/CMakeLists.txt
+++ b/parts/distpart/CMakeLists.txt
@@ -27,13 +27,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevdistpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpart_distpart.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdistpart )
+install( FILES kdevdistpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpart_distpart.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdistpart )
 
 
-##### libtdevdistpart (module) ##################
+##### libkdevdistpart (module) ##################
 
-tde_add_kpart( libtdevdistpart AUTOMOC
+tde_add_kpart( libkdevdistpart AUTOMOC
   SOURCES
     distpart_ui.ui distpart_part.cpp distpart_widget.cpp
     packagebase.cpp lsmsupport.cpp specsupport.cpp
diff --git a/parts/distpart/Makefile.am b/parts/distpart/Makefile.am
index 8b5e69db..52f4a5ba 100644
--- a/parts/distpart/Makefile.am
+++ b/parts/distpart/Makefile.am
@@ -1,16 +1,16 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevdistpart.la
-libtdevdistpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevdistpart_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevdistpart.la
+libkdevdistpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevdistpart_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevdistpart_la_SOURCES = distpart_ui.ui distpart_part.cpp distpart_widget.cpp packagebase.cpp lsmsupport.cpp specsupport.cpp
+libkdevdistpart_la_SOURCES = distpart_ui.ui distpart_part.cpp distpart_widget.cpp packagebase.cpp lsmsupport.cpp specsupport.cpp
 
 METASOURCES = AUTO
 KDEICON = AUTO
 servicedir = $(kde_servicesdir)
-service_DATA = tdevdistpart.desktop
+service_DATA = kdevdistpart.desktop
 
-rc_DATA = tdevpart_distpart.rc
-rcdir = $(kde_datadir)/tdevdistpart
+rc_DATA = kdevpart_distpart.rc
+rcdir = $(kde_datadir)/kdevdistpart
diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp
index 01ef30b0..e8a3e11a 100644
--- a/parts/distpart/distpart_part.cpp
+++ b/parts/distpart/distpart_part.cpp
@@ -23,27 +23,27 @@
 
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kdebug.h>
 
-#include "tdevcore.h"
-#include <tdevplugininfo.h>
+#include "kdevcore.h"
+#include <kdevplugininfo.h>
 
 #include "distpart_widget.h"
 
 #include <kdialogbase.h>
 
-typedef TDevGenericFactory<DistpartPart> DistpartFactory;
-static const TDevPluginInfo data("tdevdistpart");
-K_EXPORT_COMPONENT_FACTORY( libtdevdistpart, DistpartFactory( data ) )
+typedef KDevGenericFactory<DistpartPart> DistpartFactory;
+static const KDevPluginInfo data("kdevdistpart");
+K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( data ) )
 
 DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringList &)
-  : TDevPlugin(&data, parent, name ? name : "DistpartPart") {
+  : KDevPlugin(&data, parent, name ? name : "DistpartPart") {
 
     kdDebug(9007) << "DistpartPart::DistpartPart()" << endl;
     setInstance(DistpartFactory::instance());
 
-    setXMLFile("tdevpart_distpart.rc");
+    setXMLFile("kdevpart_distpart.rc");
 
     m_action =  new TDEAction( i18n("Distribution && Publishing"), "package", 0,
                              this, TQT_SLOT(show()),
diff --git a/parts/distpart/distpart_part.h b/parts/distpart/distpart_part.h
index d1d05a24..aa019c4d 100644
--- a/parts/distpart/distpart_part.h
+++ b/parts/distpart/distpart_part.h
@@ -19,12 +19,12 @@
  ***************************************************************************/
 
 
-#ifndef __TDEVPART_DISTPART_H__
-#define __TDEVPART_DISTPART_H__
+#ifndef __KDEVPART_DISTPART_H__
+#define __KDEVPART_DISTPART_H__
 
 
 #include <tqguardedptr.h>
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 #include <tdeaction.h>
 
 #include "packagebase.h"
@@ -32,7 +32,7 @@
 class DistpartDialog;
 class KDialogBase;
 
-class DistpartPart : public TDevPlugin {
+class DistpartPart : public KDevPlugin {
     Q_OBJECT
   
 
diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp
index 0999ca72..c628fe26 100644
--- a/parts/distpart/distpart_widget.cpp
+++ b/parts/distpart/distpart_widget.cpp
@@ -27,12 +27,12 @@
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
 #include <tdelocale.h>
-#include "tdevproject.h"
+#include "kdevproject.h"
 #include "domutil.h"
 #include <ktar.h>
 #include <tdemessagebox.h>
 
-#include <tdevcore.h>
+#include <kdevcore.h>
 #include <tqgroupbox.h>
 #include <tqlayout.h>
 #include <tqnetwork.h>
@@ -44,7 +44,7 @@
 #include <tqregexp.h>
 #include <tqstringlist.h>
 #include <tqtabwidget.h>
-#include "tdevmakefrontend.h"
+#include "kdevmakefrontend.h"
 #include <kprogress.h>
 
 #include <tqerrormessage.h>
diff --git a/parts/distpart/distpart_widget.h b/parts/distpart/distpart_widget.h
index 1e5bf68f..7a684a5a 100644
--- a/parts/distpart/distpart_widget.h
+++ b/parts/distpart/distpart_widget.h
@@ -32,7 +32,7 @@
 #include <tqcombobox.h>
 #include <tqprogressbar.h>
 
-class TDevProject;
+class KDevProject;
 class DistpartPart;
 class TQUrlOperator;
 class TDEProcess;
diff --git a/parts/distpart/tdevdistpart.desktop b/parts/distpart/kdevdistpart.desktop
index 290a0a8d..1b3d095d 100644
--- a/parts/distpart/tdevdistpart.desktop
+++ b/parts/distpart/kdevdistpart.desktop
@@ -64,7 +64,7 @@ GenericName[zh_CN]=最终打包支持
 GenericName[zh_TW]=最終包裝支援
 Icon=tdevelop
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevdistpart
+X-TDE-Library=libkdevdistpart
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 X-TDevelop-Properties=ProjectPackaging
diff --git a/parts/distpart/tdevpart_distpart.rc b/parts/distpart/kdevpart_distpart.rc
index 8b142d04..8b142d04 100644
--- a/parts/distpart/tdevpart_distpart.rc
+++ b/parts/distpart/kdevpart_distpart.rc
diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp
index 38f8f385..06a0bb67 100644
--- a/parts/distpart/specsupport.cpp
+++ b/parts/distpart/specsupport.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 
 #include "specsupport.h"
-#include "tdevproject.h"
-#include "tdevmakefrontend.h"
+#include "kdevproject.h"
+#include "kdevmakefrontend.h"
 #include "distpart_widget.h"
 
 #include <kdebug.h>
@@ -79,11 +79,11 @@ void SpecSupport::slotbuildAllPushButtonPressed() {
 	    return;
 	}
 	else
-            if (TDevMakeFrontend *makeFrontend = m_part->extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+            if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
                 makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote(dir) +
 		" && cp " + TDEProcess::quote(getAppSource()) + " " + TDEProcess::quote(*(map.find("_sourcedir"))));
     }
-    if (TDevMakeFrontend *makeFrontend = m_part->extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) +
 		 " && rpmbuild -ba " + m_part->project()->projectName() + ".spec");
 }
@@ -178,11 +178,11 @@ void SpecSupport::slotsrcPackagePushButtonPressed() {
 	    return;
 	}
 	else
-            if (TDevMakeFrontend *makeFrontend = m_part->extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+            if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
 	        makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote(dir) +
 		" && cp " + TDEProcess::quote(getAppSource()) + " " + TDEProcess::quote(*(map.find("_sourcedir"))));
     }
-    if (TDevMakeFrontend *makeFrontend = m_part->extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) +
 		 " && rpmbuild -bs " + m_part->project()->projectName() + ".spec");
 }
diff --git a/parts/documentation/CMakeLists.txt b/parts/documentation/CMakeLists.txt
index 4b13b342..accc3401 100644
--- a/parts/documentation/CMakeLists.txt
+++ b/parts/documentation/CMakeLists.txt
@@ -33,13 +33,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevdocumentation.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpart_documentation.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation )
+install( FILES kdevdocumentation.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpart_documentation.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation )
 
 
-##### libtdevdocumentation (module) #############
+##### libkdevdocumentation (module) #############
 
-tde_add_kpart( libtdevdocumentation AUTOMOC
+tde_add_kpart( libkdevdocumentation AUTOMOC
   SOURCES
     documentation_part.cpp documentation_widget.cpp
     contentsview.cpp indexview.cpp docglobalconfigwidgetbase.ui
@@ -50,8 +50,8 @@ tde_add_kpart( libtdevdocumentation AUTOMOC
     find_documentation.cpp find_documentation_optionsbase.ui
     find_documentation_options.cpp selecttopicbase.ui
     selecttopic.cpp docprojectconfigwidgetbase.ui
-    docprojectconfigwidget.cpp TDevDocumentationIface.cpp
-    TDevDocumentationIface.skel addcatalogdlgbase.ui
+    docprojectconfigwidget.cpp KDevDocumentationIface.cpp
+    KDevDocumentationIface.skel addcatalogdlgbase.ui
     addcatalogdlg.cpp
   LINK documentation_interfaces-shared tdevelop-shared tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/documentation/TDevDocumentationIface.cpp b/parts/documentation/KDevDocumentationIface.cpp
index 0441eb4a..329b8474 100644
--- a/parts/documentation/TDevDocumentationIface.cpp
+++ b/parts/documentation/KDevDocumentationIface.cpp
@@ -17,67 +17,67 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#include "TDevDocumentationIface.h"
+#include "KDevDocumentationIface.h"
 
 #include "documentation_part.h"
 
-TDevDocumentationIface::TDevDocumentationIface(DocumentationPart *part)
-    :TQObject(part), DCOPObject("TDevDocumentation"), m_part(part)
+KDevDocumentationIface::KDevDocumentationIface(DocumentationPart *part)
+    :TQObject(part), DCOPObject("KDevDocumentation"), m_part(part)
 {
 }
 
-TDevDocumentationIface::~TDevDocumentationIface()
+KDevDocumentationIface::~KDevDocumentationIface()
 {
 }
 
-void TDevDocumentationIface::lookupInIndex(TQString term)
+void KDevDocumentationIface::lookupInIndex(TQString term)
 {
     m_part->lookInDocumentationIndex(term);
 }
 
-void TDevDocumentationIface::findInFinder(TQString term)
+void KDevDocumentationIface::findInFinder(TQString term)
 {
     m_part->findInDocumentation(term);
 }
 
-void TDevDocumentationIface::searchInDocumentation(TQString term)
+void KDevDocumentationIface::searchInDocumentation(TQString term)
 {
     m_part->searchInDocumentation(term);
 }
 
-void TDevDocumentationIface::lookupInIndex()
+void KDevDocumentationIface::lookupInIndex()
 {
     m_part->lookInDocumentationIndex();
 }
 
-void TDevDocumentationIface::searchInDocumentation()
+void KDevDocumentationIface::searchInDocumentation()
 {
     m_part->searchInDocumentation();
 }
 
-void TDevDocumentationIface::manPage(TQString term)
+void KDevDocumentationIface::manPage(TQString term)
 {
     m_part->manPage(term);
 }
 
-void TDevDocumentationIface::infoPage(TQString term)
+void KDevDocumentationIface::infoPage(TQString term)
 {
     m_part->infoPage(term);
 }
 
-void TDevDocumentationIface::manPage()
+void KDevDocumentationIface::manPage()
 {
     m_part->manPage();
 }
 
-void TDevDocumentationIface::infoPage()
+void KDevDocumentationIface::infoPage()
 {
     m_part->infoPage();
 }
 
-void TDevDocumentationIface::findInFinder( )
+void KDevDocumentationIface::findInFinder( )
 {
     m_part->findInDocumentation();
 }
 
-#include "TDevDocumentationIface.moc"
+#include "KDevDocumentationIface.moc"
diff --git a/parts/documentation/TDevDocumentationIface.h b/parts/documentation/KDevDocumentationIface.h
index 565070f3..c55143e7 100644
--- a/parts/documentation/TDevDocumentationIface.h
+++ b/parts/documentation/KDevDocumentationIface.h
@@ -17,21 +17,21 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef TDEVDOCUMENTATIONIFACE_H
-#define TDEVDOCUMENTATIONIFACE_H
+#ifndef KDEVDOCUMENTATIONIFACE_H
+#define KDEVDOCUMENTATIONIFACE_H
 
 #include <tqobject.h>
 #include <dcopobject.h>
 
 class DocumentationPart;
 
-class TDevDocumentationIface : public TQObject, public DCOPObject {
+class KDevDocumentationIface : public TQObject, public DCOPObject {
     Q_OBJECT
 //    
     K_DCOP
 public:
-    TDevDocumentationIface(DocumentationPart *part);
-    ~TDevDocumentationIface();
+    KDevDocumentationIface(DocumentationPart *part);
+    ~KDevDocumentationIface();
 
 k_dcop:
     void lookupInIndex(TQString term);
diff --git a/parts/documentation/Makefile.am b/parts/documentation/Makefile.am
index 118c8041..13c4db3f 100644
--- a/parts/documentation/Makefile.am
+++ b/parts/documentation/Makefile.am
@@ -1,31 +1,31 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
 	-I$(top_srcdir)/parts/documentation/interfaces $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevdocumentation.la
-libtdevdocumentation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevdocumentation_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+kde_module_LTLIBRARIES = libkdevdocumentation.la
+libkdevdocumentation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevdocumentation_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/parts/documentation/interfaces/libdocumentation_interfaces.la $(LIB_TDEHTML)
 
-libtdevdocumentation_la_SOURCES = documentation_part.cpp \
+libkdevdocumentation_la_SOURCES = documentation_part.cpp \
 			documentation_widget.cpp contentsview.cpp indexview.cpp docglobalconfigwidgetbase.ui \
 			docglobalconfigwidget.cpp docconfiglistview.cpp editcatalogdlgbase.ui editcatalogdlg.cpp \
 			docutils.cpp searchview.cpp bookmarkview.cpp editbookmarkdlg.ui \
 			find_documentationbase.ui find_documentation.cpp find_documentation_optionsbase.ui \
 			find_documentation_options.cpp selecttopicbase.ui selecttopic.cpp docprojectconfigwidgetbase.ui \
-			docprojectconfigwidget.cpp TDevDocumentationIface.cpp TDevDocumentationIface.skel \
+			docprojectconfigwidget.cpp KDevDocumentationIface.cpp KDevDocumentationIface.skel \
 	addcatalogdlgbase.ui addcatalogdlg.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevdocumentation.desktop
+service_DATA = kdevdocumentation.desktop
 
-rcdir = $(kde_datadir)/tdevdocumentation
-rc_DATA = tdevpart_documentation.rc
+rcdir = $(kde_datadir)/kdevdocumentation
+rc_DATA = kdevpart_documentation.rc
 
 noinst_HEADERS = contentsview.h indexview.h docglobalconfigwidget.h \
 					docconfiglistview.h editcatalogdlg.h docutils.h searchview.h bookmarkview.h selecttopic.h \
-			docprojectconfigwidget.h TDevDocumentationIface.h addcatalogdlg.h
+			docprojectconfigwidget.h KDevDocumentationIface.h addcatalogdlg.h
 SUBDIRS = interfaces plugins tools data protocols
 
 DOXYGEN_EMPTY = YES
diff --git a/parts/documentation/addcatalogdlg.cpp b/parts/documentation/addcatalogdlg.cpp
index 51e6fe96..21913089 100644
--- a/parts/documentation/addcatalogdlg.cpp
+++ b/parts/documentation/addcatalogdlg.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 
 #include "docutils.h"
-#include "tdevdocumentationplugin.h"
+#include "kdevdocumentationplugin.h"
 
 AddCatalogDlg::AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, 
 	TQWidget* parent, const char* name, bool modal, WFlags fl)
diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp
index 9e6f85df..f626e246 100644
--- a/parts/documentation/bookmarkview.cpp
+++ b/parts/documentation/bookmarkview.cpp
@@ -34,8 +34,8 @@
 #include <tdehtml_part.h>
 #include <dom/html_document.h>
 
-#include <tdevpartcontroller.h>
-#include <tdevdocumentationplugin.h>
+#include <kdevpartcontroller.h>
+#include <kdevdocumentationplugin.h>
 
 #include "documentation_part.h"
 #include "documentation_widget.h"
@@ -44,7 +44,7 @@
 
 DocBookmarkManager::DocBookmarkManager(DocumentationPart */*part*/)
     :KBookmarkManager(locateLocal("data",
-    "tdevdocumentation/bookmarks/bookmarks.xml"), false)
+    "kdevdocumentation/bookmarks/bookmarks.xml"), false)
 {
     setEditorOptions(i18n("Documentation"), false);
 }
diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp
index ff3c9a31..532feefd 100644
--- a/parts/documentation/contentsview.cpp
+++ b/parts/documentation/contentsview.cpp
@@ -26,8 +26,8 @@
 #include <tdelistview.h>
 #include <tdelocale.h>
 
-#include <tdevpartcontroller.h>
-#include <tdevdocumentationplugin.h>
+#include <kdevpartcontroller.h>
+#include <kdevdocumentationplugin.h>
 
 #include "documentation_widget.h"
 #include "documentation_part.h"
diff --git a/parts/documentation/data/CMakeLists.txt b/parts/documentation/data/CMakeLists.txt
index 5bb6d766..77d380d4 100644
--- a/parts/documentation/data/CMakeLists.txt
+++ b/parts/documentation/data/CMakeLists.txt
@@ -11,8 +11,8 @@
 
 install( FILES
     long.html nomatch.html short.html syntax.html wrapper.html
-  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/en )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/en )
 
 install( FILES
     checked.xpm htdig.png star.png star_blank.png unchecked.xpm
-  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/pics )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/pics )
diff --git a/parts/documentation/data/Makefile.am b/parts/documentation/data/Makefile.am
index ae52bf11..920c492a 100644
--- a/parts/documentation/data/Makefile.am
+++ b/parts/documentation/data/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 METASOURCES = AUTO
-htmldir = $(kde_datadir)/tdevdocumentation/en
-picsdir = $(kde_datadir)/tdevdocumentation/pics
+htmldir = $(kde_datadir)/kdevdocumentation/en
+picsdir = $(kde_datadir)/kdevdocumentation/pics
 html_DATA =  long.html nomatch.html short.html syntax.html wrapper.html
 pics_DATA =  checked.xpm htdig.png star.png star_blank.png unchecked.xpm
diff --git a/parts/documentation/data/nomatch.html b/parts/documentation/data/nomatch.html
index 5cbd5c49..8951a604 100644
--- a/parts/documentation/data/nomatch.html
+++ b/parts/documentation/data/nomatch.html
@@ -1,6 +1,6 @@
 <html><head><title>No match for '$&(LOGICAL_WORDS)'</title></head>
 <body bgcolor="#ffffff" text="#000000" link="#aa0000">
-<h1><img src="$(PICDIR)tdevdocumentation/pics/htdig.png">
+<h1><img src="$(PICDIR)kdevdocumentation/pics/htdig.png">
 Search results</h1>
 <hr noshade size="4">
 <h2>No matches were found for '$&(LOGICAL_WORDS)'</h2>
@@ -17,5 +17,5 @@ word with "<b>All</b>," try using one or more of the same words
 with "<b>Any</b>."</p>
 <hr noshade size="4">
 <a href="http://www.htdig.org/">
-<img src="$(PICDIR)tdevdocumentation/pics/htdig.png" border="0">ht://Dig $(VERSION)</a>
+<img src="$(PICDIR)kdevdocumentation/pics/htdig.png" border="0">ht://Dig $(VERSION)</a>
 </body></html>
diff --git a/parts/documentation/data/syntax.html b/parts/documentation/data/syntax.html
index 21a2ab2a..9701c37f 100644
--- a/parts/documentation/data/syntax.html
+++ b/parts/documentation/data/syntax.html
@@ -1,6 +1,6 @@
 <html><head><title>Error in Boolean search for '$&(WORDS)'</title></head>
 <body bgcolor="#ffffff" text="#000000" link="#aa0000">
-<h1><img src="$(PICDIR)tdevdocumentation/pics/htdig.png">
+<h1><img src="$(PICDIR)kdevdocumentation/pics/htdig.png">
 Error in Boolean search for '$&(LOGICAL_WORDS)'</h1>
 <hr noshade size="4">
 Boolean expressions need to be 'correct' in order for the search
@@ -14,6 +14,6 @@ $(SYNTAXERROR)
 </b></blockquote>
 <hr noshade size="4">
 <a href="http://www.htdig.org/">
-<img src="$(PICDIR)tdevdocumentation/pics/htdig.png" border="0">ht://Dig $(VERSION)</a>
+<img src="$(PICDIR)kdevdocumentation/pics/htdig.png" border="0">ht://Dig $(VERSION)</a>
 </body></html>
 
diff --git a/parts/documentation/data/wrapper.html b/parts/documentation/data/wrapper.html
index 187ffd61..20c1bbf2 100644
--- a/parts/documentation/data/wrapper.html
+++ b/parts/documentation/data/wrapper.html
@@ -1,10 +1,10 @@
 <html><head><title>Search results for '$&(WORDS)'</title></head>
 <body bgcolor="#ffffff" text="#000000" link="#aa0000">
-<h2><img src=$(PICDIR)tdevdocumentation/pics/htdig.png>
+<h2><img src=$(PICDIR)kdevdocumentation/pics/htdig.png>
 Search results for '$&(LOGICAL_WORDS)'</h2>
 <hr noshade size="4">
 <b>
-More <img src=$(PICDIR)tdevdocumentation/pics/star.png alt="*">'s indicate a better match.
+More <img src=$(PICDIR)kdevdocumentation/pics/star.png alt="*">'s indicate a better match.
 </b>
 <hr noshade size="1">
 $(HTSEARCH_RESULTS)
@@ -12,5 +12,5 @@ $(PAGEHEADER)
 $(PREVPAGE) $(PAGELIST) $(NEXTPAGE)
 <hr noshade size="4">
 <a href="http://www.htdig.org/">
-<img src=$(PICDIR)tdevdocumentation/pics/htdig.png border="0">ht://Dig $(VERSION)</a>
+<img src=$(PICDIR)kdevdocumentation/pics/htdig.png border="0">ht://Dig $(VERSION)</a>
 </body></html>
diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp
index ba6f30fb..d2753653 100644
--- a/parts/documentation/docconfiglistview.cpp
+++ b/parts/documentation/docconfiglistview.cpp
@@ -21,7 +21,7 @@
 
 #include <tdelocale.h>
 
-#include "tdevdocumentationplugin.h"
+#include "kdevdocumentationplugin.h"
 
 DocConfigListView::DocConfigListView(TQWidget *parent, const char *name)
      :TDEListView(parent, name)
diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp
index 5f66ef4a..cb6c3776 100644
--- a/parts/documentation/docglobalconfigwidget.cpp
+++ b/parts/documentation/docglobalconfigwidget.cpp
@@ -38,8 +38,8 @@
 #include <tdehtml_part.h>
 #include <tdehtml_settings.h>
 
-#include "tdevdocumentationplugin.h"
-#include "tdevpartcontroller.h"
+#include "kdevdocumentationplugin.h"
+#include "kdevpartcontroller.h"
 
 #include "docconfiglistview.h"
 #include "documentation_part.h"
@@ -67,7 +67,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part,
     //read full text search settings
     config->setGroup("htdig");
     TQString databaseDir = kapp->dirs()->saveLocation("data",
-        "tdevdocumentation/search");
+        "kdevdocumentation/search");
     databaseDirEdit->setURL(config->readPathEntry("databaseDir", databaseDir));
     htdigbinEdit->setURL(config->readPathEntry("htdigbin", kapp->dirs()->findExe("htdig")));
     htmergebinEdit->setURL(config->readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge")));
@@ -99,8 +99,8 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part,
 
     useAssistant_box->setChecked(m_part->isAssistantUsed());
 
-    // Having app-specific settings isn't pretty, but this setting is nonsensical in tdevassistant
-    if ( kapp->instanceName().find("tdevassistant") != -1 )
+    // Having app-specific settings isn't pretty, but this setting is nonsensical in kdevassistant
+    if ( kapp->instanceName().find("kdevassistant") != -1 )
         useAssistant_box->hide();
 
     //font sizes and zoom levels
@@ -182,7 +182,7 @@ void DocGlobalConfigWidget::accept()
     config->writePathEntry("htsearchbin", DocUtils::envURL(htsearchbinEdit));
 
     //write full text search locations file
-    TQString ftsLocationsFile = locateLocal("data", "tdevdocumentation/search/locations.txt");
+    TQString ftsLocationsFile = locateLocal("data", "kdevdocumentation/search/locations.txt");
     TQFile f(ftsLocationsFile);
     TQStringList locs;
     if (f.open(IO_ReadWrite | IO_Truncate))
diff --git a/parts/documentation/docprojectconfigwidget.cpp b/parts/documentation/docprojectconfigwidget.cpp
index 1d6678d7..a37ad5cb 100644
--- a/parts/documentation/docprojectconfigwidget.cpp
+++ b/parts/documentation/docprojectconfigwidget.cpp
@@ -27,8 +27,8 @@
 
 #include "domutil.h"
 #include "urlutil.h"
-#include "tdevproject.h"
-#include "tdevdocumentationplugin.h"
+#include "kdevproject.h"
+#include "kdevdocumentationplugin.h"
 
 #include "documentation_part.h"
 #include "documentation_widget.h"
@@ -45,7 +45,7 @@ DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget
             m_plugins[(*it)->pluginName()] = *it;
         }
     }
-    TQString projectDocSystem = DomUtil::readEntry(*(m_part->projectDom()), "/tdevdocumentation/projectdoc/docsystem");
+    TQString projectDocSystem = DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/docsystem");
     
     bool hasProjectDoc = false;
     for (int i = 0; i < docSystemCombo->count(); ++i)
@@ -64,7 +64,7 @@ DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget
         changeDocSystem(docSystemCombo->currentText());
     }
 
-    manualURL->setURL(DomUtil::readEntry(*(m_part->projectDom()), "/tdevdocumentation/projectdoc/usermanualurl"));
+    manualURL->setURL(DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/usermanualurl"));
 }
 
 void DocProjectConfigWidget::changeDocSystem(const TQString &text)
@@ -79,7 +79,7 @@ void DocProjectConfigWidget::changeDocSystem(const TQString &text)
     catalogURL->setMode(plugin->catalogLocatorProps().first);
     catalogURL->setFilter(plugin->catalogLocatorProps().second);
     
-    TQString projectDocURL = DomUtil::readEntry(*(m_part->projectDom()), "/tdevdocumentation/projectdoc/docurl");
+    TQString projectDocURL = DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/docurl");
     if (!projectDocURL.isEmpty())
         projectDocURL = TQDir::cleanDirPath(m_part->project()->projectDirectory() + "/" + projectDocURL);
 
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 9515fad7..75bb7c13 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -48,17 +48,17 @@
 #include <twin.h>
 #include <tdetexteditor/document.h>
 
-#include "tdevplugininfo.h"
-#include "tdevcore.h"
-#include "tdevproject.h"
-#include "tdevmainwindow.h"
-#include "tdevgenericfactory.h"
-#include "tdevdocumentationplugin.h"
+#include "kdevplugininfo.h"
+#include "kdevcore.h"
+#include "kdevproject.h"
+#include "kdevmainwindow.h"
+#include "kdevgenericfactory.h"
+#include "kdevdocumentationplugin.h"
 #include "configwidgetproxy.h"
-#include "tdevpartcontroller.h"
+#include "kdevpartcontroller.h"
 #include "domutil.h"
 #include "urlutil.h"
-#include "tdeveditorutil.h"
+#include "kdeveditorutil.h"
 
 #include "documentation_widget.h"
 #include "docglobalconfigwidget.h"
@@ -66,22 +66,22 @@
 #include "contentsview.h"
 #include "find_documentation.h"
 
-#include "TDevDocumentationIface.h"
+#include "KDevDocumentationIface.h"
 
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
-static const TDevPluginInfo data("tdevdocumentation");
+static const KDevPluginInfo data("kdevdocumentation");
 
-typedef TDevGenericFactory<DocumentationPart> DocumentationFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevdocumentation, DocumentationFactory( data ) )
+typedef KDevGenericFactory<DocumentationPart> DocumentationFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) )
 
 DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& )
-    :TDevPlugin(&data, parent, name ? name : "DocumentationPart" ),
+    :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ),
     m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false)
 {
     setInstance(DocumentationFactory::instance());
-    setXMLFile("tdevpart_documentation.rc");
+    setXMLFile("kdevpart_documentation.rc");
 
     m_configProxy = new ConfigWidgetProxy(core());
 	m_configProxy->createGlobalConfigPage(i18n("Documentation"), GLOBALDOC_OPTIONS, info()->icon() );
@@ -109,7 +109,7 @@ DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const T
     
     TQTimer::singleShot(0, this, TQT_SLOT(init()));
     
-    new TDevDocumentationIface(this);
+    new KDevDocumentationIface(this);
 }
 
 DocumentationPart::~DocumentationPart()
@@ -250,12 +250,6 @@ void DocumentationPart::setupActions()
                                     "all possible sources of documentation like "
                                     "table of contents, index, man and info databases, "
                                     "Google, etc."));
-    action = new TDEAction(i18n("TDevelop Programming Handbook"), 0,
-                         this, TQT_SLOT(programmingHandbook()),
-                         actionCollection(), "help_programming_handbook" );
-    action->setToolTip(i18n("Open the TDevelop Programming Handbook"));
-    action->setWhatsThis(i18n("<b>Open the TDevelop Programming Handbook</b><p>Opens Open the TDevelop Programming Handbook."));
-
 }
 
 void DocumentationPart::emitBookmarkLocation(const TQString &title, const KURL &url)
@@ -265,12 +259,12 @@ void DocumentationPart::emitBookmarkLocation(const TQString &title, const KURL &
 
 void DocumentationPart::searchInDocumentation()
 {
-     TQString word = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+     TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 
     if ( word.isEmpty() )
     {
         if ( isAssistantUsed() )
-            callAssistant ( "TDevDocumentation", "searchInDocumentation()" );
+            callAssistant ( "KDevDocumentation", "searchInDocumentation()" );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -280,7 +274,7 @@ void DocumentationPart::searchInDocumentation()
     else
     {
         if ( isAssistantUsed() )
-            callAssistant ( "TDevDocumentation", "searchInDocumentation(TQString)", word );
+            callAssistant ( "KDevDocumentation", "searchInDocumentation(TQString)", word );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -298,29 +292,24 @@ void DocumentationPart::searchInDocumentation(const TQString &term)
 void DocumentationPart::contextSearchInDocumentation()
 {
     if (isAssistantUsed())
-        callAssistant("TDevDocumentation", "searchInDocumentation(TQString)", m_contextStr);
+        callAssistant("KDevDocumentation", "searchInDocumentation(TQString)", m_contextStr);
     else
         searchInDocumentation(m_contextStr);
 }
 
-void DocumentationPart::programmingHandbook()
-{
-  kapp->invokeHelp (TQString::null, "tde_app_devel");
-}
-
 void DocumentationPart::manPage()
 {
-     TQString word = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+     TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 
     if ( isAssistantUsed() )
     {
         if ( word.isEmpty() )
         {
-            callAssistant ( "TDevDocumentation", "manPage()" );
+            callAssistant ( "KDevDocumentation", "manPage()" );
         }
         else
         {
-            callAssistant ( "TDevDocumentation", "manPage(TQString)", word );
+            callAssistant ( "KDevDocumentation", "manPage(TQString)", word );
         }
     }
     else
@@ -334,17 +323,17 @@ void DocumentationPart::manPage()
 
 void DocumentationPart::infoPage()
 {
-     TQString word = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+     TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
  
     if ( isAssistantUsed() )
     {
         if ( word.isEmpty() )
         {
-            callAssistant ( "TDevDocumentation", "infoPage()" );
+            callAssistant ( "KDevDocumentation", "infoPage()" );
         }
         else
         {
-            callAssistant ( "TDevDocumentation", "infoPage(TQString)", word );
+            callAssistant ( "KDevDocumentation", "infoPage(TQString)", word );
         }
     }
     else
@@ -371,7 +360,7 @@ void DocumentationPart::infoPage(const TQString &term)
 void DocumentationPart::contextManPage()
 {
     if (isAssistantUsed())
-        callAssistant("TDevDocumentation", "manPage(TQString)", m_contextStr);
+        callAssistant("KDevDocumentation", "manPage(TQString)", m_contextStr);
     else
         manPage(m_contextStr);
 }
@@ -379,7 +368,7 @@ void DocumentationPart::contextManPage()
 void DocumentationPart::contextInfoPage()
 {
     if (isAssistantUsed())
-        callAssistant("TDevDocumentation", "infoPage(TQString)", m_contextStr);
+        callAssistant("KDevDocumentation", "infoPage(TQString)", m_contextStr);
     else
         infoPage(m_contextStr);
 }
@@ -387,19 +376,19 @@ void DocumentationPart::contextInfoPage()
 void DocumentationPart::contextFindDocumentation()
 {
     if (isAssistantUsed())
-        callAssistant("TDevDocumentation", "findInFinder(TQString)", m_contextStr);
+        callAssistant("KDevDocumentation", "findInFinder(TQString)", m_contextStr);
     else
         findInDocumentation(m_contextStr);
 }
 
 void DocumentationPart::findInDocumentation()
 {
-     TQString word = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+     TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
     
     if ( word.isEmpty() )
     {
         if ( isAssistantUsed() )
-            callAssistant ( "TDevDocumentation", "findInFinder()" );
+            callAssistant ( "KDevDocumentation", "findInFinder()" );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -409,7 +398,7 @@ void DocumentationPart::findInDocumentation()
     else
     {
         if ( isAssistantUsed() )
-            callAssistant ( "TDevDocumentation", "findInFinder(TQString)", word );
+            callAssistant ( "KDevDocumentation", "findInFinder(TQString)", word );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -426,12 +415,12 @@ void DocumentationPart::findInDocumentation(const TQString &term)
 
 void DocumentationPart::lookInDocumentationIndex()
 {
-     TQString word = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+     TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
     
     if ( word.isEmpty() )
     {
         if ( isAssistantUsed() )
-            callAssistant ( "TDevDocumentation", "lookupInIndex()" );
+            callAssistant ( "KDevDocumentation", "lookupInIndex()" );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -441,7 +430,7 @@ void DocumentationPart::lookInDocumentationIndex()
     else
     {
         if ( isAssistantUsed() )
-            callAssistant ( "TDevDocumentation", "lookupInIndex(TQString)", word );
+            callAssistant ( "KDevDocumentation", "lookupInIndex(TQString)", word );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -459,7 +448,7 @@ void DocumentationPart::lookInDocumentationIndex(const TQString &term)
 void DocumentationPart::contextLookInDocumentationIndex()
 {
     if (isAssistantUsed())
-        callAssistant("TDevDocumentation", "lookupInIndex(TQString)", m_contextStr);
+        callAssistant("KDevDocumentation", "lookupInIndex(TQString)", m_contextStr);
     else
         lookInDocumentationIndex(m_contextStr);
 }
@@ -575,11 +564,11 @@ void DocumentationPart::setContextFeature(ContextFeature feature, bool b)
 
 void DocumentationPart::projectOpened()
 {
-    TQString projectDocSystem = DomUtil::readEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docsystem");
-    TQString projectDocURL = DomUtil::readEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docurl");
+    TQString projectDocSystem = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem");
+    TQString projectDocURL = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl");
     if (!projectDocURL.isEmpty())
         projectDocURL = TQDir::cleanDirPath(project()->projectDirectory() + "/" + projectDocURL);
-    TQString userManualURL = DomUtil::readEntry(*(projectDom()), "/tdevdocumentation/projectdoc/usermanualurl");
+    TQString userManualURL = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl");
     
     for (TQValueList<DocumentationPlugin*>::const_iterator it = m_plugins.constBegin();
         it != m_plugins.constEnd(); ++it)
@@ -613,21 +602,21 @@ void DocumentationPart::saveProjectDocumentationInfo()
 {
     if (m_projectDocumentationPlugin)
     {
-        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docsystem", m_projectDocumentationPlugin->pluginName());
+        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem", m_projectDocumentationPlugin->pluginName());
 
         TQString relPath = URLUtil::extractPathNameRelative(project()->projectDirectory(),
             m_projectDocumentationPlugin->catalogURL());
-        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docurl", relPath);
+        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl", relPath);
     }
     else
     {
-        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docsystem", "");
-        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docurl", "");
+        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem", "");
+        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl", "");
     }
     if (m_userManualPlugin)
-        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/usermanualurl", m_userManualPlugin->catalogURL());
+        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl", m_userManualPlugin->catalogURL());
     else
-        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/usermanualurl", "");
+        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl", "");
 }
 
 TQCString DocumentationPart::startAssistant()
@@ -638,7 +627,7 @@ TQCString DocumentationPart::startAssistant()
         return lastAssistant;
     
     const char *function = 0;
-    TQString app = "tdevassistant";
+    TQString app = "kdevassistant";
     function = "start_service_by_desktop_name(TQString,TQStringList)";
     TQStringList URLs;
 
@@ -676,7 +665,7 @@ TQCString DocumentationPart::startAssistant()
             kdDebug() << dcopName.data() << endl;
             
             //@fixme: is there another way to wait for the remote object to be loaded
-            while (!TDEApplication::dcopClient()->remoteObjects(dcopName).contains("TDevDocumentation"))
+            while (!TDEApplication::dcopClient()->remoteObjects(dcopName).contains("KDevDocumentation"))
                 usleep(500);
         }
     }
@@ -685,8 +674,8 @@ TQCString DocumentationPart::startAssistant()
 
 bool DocumentationPart::isAssistantUsed() const
 {
-	// hack to solve BR #90334 - don't call tdevassistant via DCOP if we ARE tdevassistant
-	if ( kapp->instanceName().find("tdevassistant") != -1 )
+	// hack to solve BR #90334 - don't call kdevassistant via DCOP if we ARE kdevassistant
+	if ( kapp->instanceName().find("kdevassistant") != -1 )
 	{
 		return false;
 	}
@@ -697,7 +686,7 @@ bool DocumentationPart::isAssistantUsed() const
 void DocumentationPart::setAssistantUsed(bool b)
 {
     m_assistantUsed = b;
-    //use global config to store different settings for tdevassistant and tdevelop
+    //use global config to store different settings for kdevassistant and tdevelop
     TDEConfig *config = kapp->config();
     config->setGroup("Documentation");
     config->writeEntry("UseAssistant", isAssistantUsed());
@@ -750,7 +739,7 @@ void DocumentationPart::loadSettings()
     config->setGroup("Documentation");
     m_assistantUsed = config->readBoolEntry("UseAssistant", false);
     
-    if (TQString(TDEGlobal::instance()->aboutData()->appName()) == "tdevassistant")
+    if (TQString(TDEGlobal::instance()->aboutData()->appName()) == "kdevassistant")
     {
         int page = config->readNumEntry("LastPage", 0);
         switch (page)
diff --git a/parts/documentation/documentation_part.h b/parts/documentation/documentation_part.h
index aafe1669..722ad4bd 100644
--- a/parts/documentation/documentation_part.h
+++ b/parts/documentation/documentation_part.h
@@ -17,11 +17,11 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef __TDEVPART_DOCUMENTATION_H__
-#define __TDEVPART_DOCUMENTATION_H__
+#ifndef __KDEVPART_DOCUMENTATION_H__
+#define __KDEVPART_DOCUMENTATION_H__
 
 #include <tqguardedptr.h>
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 
 class FindDocumentation;
@@ -39,7 +39,7 @@ class TQPopupMenu;
 /*
  Please read the README.dox file for more info about this part
  */
-class DocumentationPart : public TDevPlugin
+class DocumentationPart : public KDevPlugin
 {
     Q_OBJECT
   
@@ -69,7 +69,6 @@ public slots:
     void searchInDocumentation();
     void searchInDocumentation(const TQString &term);
     void contextSearchInDocumentation();
-    void programmingHandbook();
     void manPage();
     void manPage(const TQString &term);
     void contextManPage();
diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp
index b69e80a5..b1ab69ca 100644
--- a/parts/documentation/documentation_widget.cpp
+++ b/parts/documentation/documentation_widget.cpp
@@ -31,8 +31,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 
-#include <tdevcore.h>
-#include <tdevdocumentationplugin.h>
+#include <kdevcore.h>
+#include <kdevdocumentationplugin.h>
 
 #include "documentation_part.h"
 #include "contentsview.h"
diff --git a/parts/documentation/documentation_widget.h b/parts/documentation/documentation_widget.h
index fccd03b9..a813b393 100644
--- a/parts/documentation/documentation_widget.h
+++ b/parts/documentation/documentation_widget.h
@@ -23,7 +23,7 @@
 #include <tqwidget.h>
 
 class FindDocumentation;
-class TDevProject;
+class KDevProject;
 class DocumentationPart;
 class ContentsView;
 class IndexView;
diff --git a/parts/documentation/docutils.cpp b/parts/documentation/docutils.cpp
index ba00ea83..5360a73f 100644
--- a/parts/documentation/docutils.cpp
+++ b/parts/documentation/docutils.cpp
@@ -27,9 +27,9 @@
 #include <tdelocale.h>
 #include <kstringhandler.h>
 
-#include <tdevpartcontroller.h>
+#include <kdevpartcontroller.h>
 
-#include "tdevdocumentationplugin.h"
+#include "kdevdocumentationplugin.h"
 #include "documentation_part.h"
 
 TQString DocUtils::noEnvURL(const TQString &url)
diff --git a/parts/documentation/editcatalogdlg.cpp b/parts/documentation/editcatalogdlg.cpp
index 2fb81fec..8bdc19d5 100644
--- a/parts/documentation/editcatalogdlg.cpp
+++ b/parts/documentation/editcatalogdlg.cpp
@@ -26,7 +26,7 @@
 #include <kurlcompletion.h>
 
 #include "docutils.h"
-#include "tdevdocumentationplugin.h"
+#include "kdevdocumentationplugin.h"
 
 EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, TQWidget* parent,
     const char* name, bool modal, WFlags fl)
diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp
index 2f730b81..ebddcd4c 100644
--- a/parts/documentation/find_documentation.cpp
+++ b/parts/documentation/find_documentation.cpp
@@ -29,8 +29,8 @@
 #include <kprocess.h>
 #include <tdelistbox.h>
 
-#include <tdevpartcontroller.h>
-#include <tdevdocumentationplugin.h>
+#include <kdevpartcontroller.h>
+#include <kdevdocumentationplugin.h>
 
 #include "documentation_widget.h"
 #include "documentation_part.h"
diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp
index 25762451..cae33db5 100644
--- a/parts/documentation/indexview.cpp
+++ b/parts/documentation/indexview.cpp
@@ -30,8 +30,8 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-#include <tdevpartcontroller.h>
-#include <tdevdocumentationplugin.h>
+#include <kdevpartcontroller.h>
+#include <kdevdocumentationplugin.h>
 
 #include "docutils.h"
 #include "selecttopic.h"
diff --git a/parts/documentation/interfaces/CMakeLists.txt b/parts/documentation/interfaces/CMakeLists.txt
index 2e1f0ae3..f4a2ff08 100644
--- a/parts/documentation/interfaces/CMakeLists.txt
+++ b/parts/documentation/interfaces/CMakeLists.txt
@@ -23,7 +23,7 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    tdevdocumentationplugin.h
+    kdevdocumentationplugin.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/parts/documentation )
 
 
@@ -37,7 +37,7 @@ install( FILES
 ##### documentation_interfaces (shared) #########
 
 tde_add_library( documentation_interfaces SHARED AUTOMOC
-  SOURCES tdevdocumentationplugin.cpp
+  SOURCES kdevdocumentationplugin.cpp
   VERSION 0.0.0
   LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
diff --git a/parts/documentation/interfaces/Makefile.am b/parts/documentation/interfaces/Makefile.am
index b0feb598..f128dabc 100644
--- a/parts/documentation/interfaces/Makefile.am
+++ b/parts/documentation/interfaces/Makefile.am
@@ -5,12 +5,12 @@ partincludedirdir = $(includedir)/tdevelop/parts/documentation
 lib_LTLIBRARIES = libdocumentation_interfaces.la
 libdocumentation_interfaces_la_LDFLAGS = $(all_libraries)
 libdocumentation_interfaces_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
-libdocumentation_interfaces_la_SOURCES = tdevdocumentationplugin.cpp
-partincludedir_HEADERS = tdevdocumentationplugin.h
+libdocumentation_interfaces_la_SOURCES = kdevdocumentationplugin.cpp
+partincludedir_HEADERS = kdevdocumentationplugin.h
 servicetypedir = $(kde_servicetypesdir)
 servicetype_DATA = tdevelopdocumentationplugins.desktop
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces
-DOXYGEN_PROJECTNAME = TDevelop Documentation Part Interfaces Library
-DOXYGEN_DOCDIRPREFIX = tdevdoc
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces
+DOXYGEN_PROJECTNAME = KDevelop Documentation Part Interfaces Library
+DOXYGEN_DOCDIRPREFIX = kdevdoc
 include ../../../Doxyfile.am
diff --git a/parts/documentation/interfaces/tdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
index f3c20841..afc9abad 100644
--- a/parts/documentation/interfaces/tdevdocumentationplugin.cpp
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
@@ -16,7 +16,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevdocumentationplugin.h"
+#include "kdevdocumentationplugin.h"
 
 #include <tqfile.h>
 #include <tqpainter.h>
@@ -334,7 +334,7 @@ void DocumentationPlugin::cacheIndex(DocumentationCatalogItem *item)
 {
     kdDebug() << "Creating index cache for " << item->text(0) << endl;
     
-    TQString cacheName = locateLocal("data", TQString("tdevdocumentation/index/cache_") + item->text(0));
+    TQString cacheName = locateLocal("data", TQString("kdevdocumentation/index/cache_") + item->text(0));
     TQFile cacheFile(cacheName);
     if (!cacheFile.open(IO_WriteOnly))
         return;
@@ -357,7 +357,7 @@ void DocumentationPlugin::cacheIndex(DocumentationCatalogItem *item)
 
 bool DocumentationPlugin::loadCachedIndex(IndexBox *index, DocumentationCatalogItem *item)
 {
-    TQString cacheName = locateLocal("data", TQString("tdevdocumentation/index/cache_") + item->cacheVersion() + item->text(0));
+    TQString cacheName = locateLocal("data", TQString("kdevdocumentation/index/cache_") + item->cacheVersion() + item->text(0));
     TQFile cacheFile(cacheName);
     if (!cacheFile.open(IO_ReadOnly))
         return false;
@@ -718,4 +718,4 @@ TQString ProjectDocumentationPlugin::catalogURL() const
     return m_url;
 }
 
-#include "tdevdocumentationplugin.moc"
+#include "kdevdocumentationplugin.moc"
diff --git a/parts/documentation/interfaces/tdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h
index ed18a86a..a5dbe458 100644
--- a/parts/documentation/interfaces/tdevdocumentationplugin.h
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.h
@@ -16,8 +16,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEV_DOC_PLUGIN_H
-#define TDEV_DOC_PLUGIN_H
+#ifndef KDEV_DOC_PLUGIN_H
+#define KDEV_DOC_PLUGIN_H
 
 #include <tqmap.h>
 #include <tqvaluelist.h>
diff --git a/parts/documentation/tdevdocumentation.desktop b/parts/documentation/kdevdocumentation.desktop
index 721970e7..674812f4 100644
--- a/parts/documentation/tdevdocumentation.desktop
+++ b/parts/documentation/kdevdocumentation.desktop
@@ -29,10 +29,10 @@ Comment[sv]=Dokumentationsinsticksprogrammet erbjuder bläddring och sökning i
 Comment[tr]=Belgelendirme eklentisi, çoklu belgelendirme sistemlerine destek ile, yerel ve çevrimiçi belgelere gözatma ve bu belgelerde arama yapılmasına izin verir.
 Comment[zh_CN]=文档插件提供了本地和在线文档中提供浏览和搜索功能，支持多种文档系统
 Comment[zh_TW]=文件外掛程式提供對本地與線上文件的瀏覽與搜尋功能，並支援多重文件系統。
-Name=TDevDocumentation
+Name=KDevDocumentation
 Name[da]=TDevelop dokumentation
 Name[nds]=TDevelop-Dokmentatschoon
-Name[pt_BR]=TDevDocumentação
+Name[pt_BR]=KDevDocumentação
 Name[sk]=KDev dokumentácia
 Name[sv]=TDevelop dokumentation
 Name[ta]=KDev ஆவணமாக்கல்
@@ -76,7 +76,7 @@ GenericName[zh_TW]=文件
 Icon=khelpcenter
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Global
-X-TDE-Library=libtdevdocumentation
+X-TDE-Library=libkdevdocumentation
 X-TDevelop-Version=5
 X-TDevelop-Mode=AssistantMode
 X-TDevelop-Properties=Documentation
diff --git a/parts/documentation/tdevpart_documentation.rc b/parts/documentation/kdevpart_documentation.rc
index 6fd8b488..f8dac85a 100644
--- a/parts/documentation/tdevpart_documentation.rc
+++ b/parts/documentation/kdevpart_documentation.rc
@@ -6,7 +6,6 @@
   <Action name="plugin_action"/>
  </Menu> -->
  <Menu name="help">
-  <Action name="help_programming_handbook"/>
   <Action name="help_look_in_index"/>
   <Action name="help_search_in_doc"/>
   <Action name="help_manpage"/>
diff --git a/parts/documentation/plugins/CMakeLists.txt b/parts/documentation/plugins/CMakeLists.txt
index 116e7674..281c40f8 100644
--- a/parts/documentation/plugins/CMakeLists.txt
+++ b/parts/documentation/plugins/CMakeLists.txt
@@ -12,6 +12,6 @@
 add_subdirectory( qt )
 add_subdirectory( doxygen )
 add_subdirectory( devhelp )
-add_subdirectory( tdevtoc )
+add_subdirectory( kdevtoc )
 add_subdirectory( chm )
 add_subdirectory( custom )
diff --git a/parts/documentation/plugins/Makefile.am b/parts/documentation/plugins/Makefile.am
index 253a0193..c2002f78 100644
--- a/parts/documentation/plugins/Makefile.am
+++ b/parts/documentation/plugins/Makefile.am
@@ -1,3 +1,3 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 METASOURCES = AUTO
-SUBDIRS = qt doxygen devhelp tdevtoc chm custom
+SUBDIRS = qt doxygen devhelp kdevtoc chm custom
diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp
index f3287540..5acecce3 100644
--- a/parts/documentation/plugins/chm/docchmplugin.cpp
+++ b/parts/documentation/plugins/chm/docchmplugin.cpp
@@ -28,14 +28,14 @@
 #include <iostream>
 #include <fstream>
 #include <tqvaluevector.h>
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 #include <tqregexp.h>
 
 #include "../../../../config.h"
 
-static const TDevPluginInfo data("docchmplugin");
-typedef TDevGenericFactory<DocCHMPlugin> DocCHMPluginFactory;
+static const KDevPluginInfo data("docchmplugin");
+typedef KDevGenericFactory<DocCHMPlugin> DocCHMPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocchmplugin, DocCHMPluginFactory(data) )
 
 DocCHMPlugin::DocCHMPlugin(TQObject* parent, const char* name, TQStringList // args
diff --git a/parts/documentation/plugins/chm/docchmplugin.h b/parts/documentation/plugins/chm/docchmplugin.h
index e814248f..452e1c09 100644
--- a/parts/documentation/plugins/chm/docchmplugin.h
+++ b/parts/documentation/plugins/chm/docchmplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCCHMPLUGIN_H
 #define DOCCHMPLUGIN_H
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 
 class DocCHMPlugin :public DocumentationPlugin
 {
diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp
index 55d6c9c6..dd141eba 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.cpp
+++ b/parts/documentation/plugins/custom/doccustomplugin.cpp
@@ -25,11 +25,11 @@
 #include <tdelocale.h>
 #include <tdelistview.h>
 
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
-static const TDevPluginInfo data("doccustomplugin");
-typedef TDevGenericFactory<DocCustomPlugin> DocCustomPluginFactory;
+static const KDevPluginInfo data("doccustomplugin");
+typedef KDevGenericFactory<DocCustomPlugin> DocCustomPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdoccustomplugin, DocCustomPluginFactory(data) )
 
 DocCustomPlugin::DocCustomPlugin(TQObject* parent, const char* name, const TQStringList // args
diff --git a/parts/documentation/plugins/custom/doccustomplugin.h b/parts/documentation/plugins/custom/doccustomplugin.h
index 315e0864..f83daf1a 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.h
+++ b/parts/documentation/plugins/custom/doccustomplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCCUSTOMPLUGIN_H
 #define DOCCUSTOMPLUGIN_H
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 
 class DocCustomPlugin : public DocumentationPlugin {
 public:
diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
index d644df4f..4f2d50d6 100644
--- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
+++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
@@ -32,8 +32,8 @@
 #include <tdelocale.h>
 #include <kstandarddirs.h>
 
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
 #include "../../../../config.h"
 
@@ -69,8 +69,8 @@ private:
 };
 
 
-static const TDevPluginInfo data("docdevhelpplugin");
-typedef TDevGenericFactory<DocDevHelpPlugin> DocDevHelpPluginFactory;
+static const KDevPluginInfo data("docdevhelpplugin");
+typedef KDevGenericFactory<DocDevHelpPlugin> DocDevHelpPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocdevhelpplugin, DocDevHelpPluginFactory(data) )
 
 DocDevHelpPlugin::DocDevHelpPlugin(TQObject* parent, const char* name,
diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.h b/parts/documentation/plugins/devhelp/docdevhelpplugin.h
index 11339098..6436a1d8 100644
--- a/parts/documentation/plugins/devhelp/docdevhelpplugin.h
+++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.h
@@ -23,7 +23,7 @@
 #include <tqvaluestack.h>
 #include <tqdom.h>
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 
 class DocDevHelpPlugin: public DocumentationPlugin
 {
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
index dafdfa1f..7851a516 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
@@ -25,10 +25,10 @@
 #include <tdelocale.h>
 #include <tdelistview.h>
 
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 
 static const TDEAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plugin"), "1.0");
-typedef TDevGenericFactory<DocDjvuPlugin> DocDjvuPluginFactory;
+typedef KDevGenericFactory<DocDjvuPlugin> DocDjvuPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) )
 
 DocDjvuPlugin::DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args)
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.h b/parts/documentation/plugins/djvu/docdjvuplugin.h
index 15415c65..6bff409c 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.h
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCDJVUPLUGIN_H
 #define DOCDVJUPLUGIN_H
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 
 class DocDjvuPlugin : public DocumentationPlugin {
 public:
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
index e5a7da93..9a5a6912 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
@@ -35,8 +35,8 @@
 #include <kstandarddirs.h>
 
 #include <urlutil.h>
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
 #include "../../../../config.h"
 
@@ -60,8 +60,8 @@ private:
 };
 
 
-static const TDevPluginInfo data("docdoxygenplugin");
-typedef TDevGenericFactory<DocDoxygenPlugin> DocDoxygenPluginFactory;
+static const KDevPluginInfo data("docdoxygenplugin");
+typedef KDevGenericFactory<DocDoxygenPlugin> DocDoxygenPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocdoxygenplugin, DocDoxygenPluginFactory(data) )
 
 DocDoxygenPlugin::DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList)
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.h b/parts/documentation/plugins/doxygen/docdoxygenplugin.h
index 8382f98e..ebd4a540 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.h
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCDOXYGENPLUGIN_H
 #define DOCDOXYGENPLUGIN_H
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 
 class TQDomDocument;
 class TQDomElement;
diff --git a/parts/documentation/plugins/tdevtoc/CMakeLists.txt b/parts/documentation/plugins/kdevtoc/CMakeLists.txt
index f3d1efc2..c12c26e3 100644
--- a/parts/documentation/plugins/tdevtoc/CMakeLists.txt
+++ b/parts/documentation/plugins/kdevtoc/CMakeLists.txt
@@ -27,13 +27,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES doctdevtocplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES dockdevtocplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libdoctdevtocplugin (module) ##############
+##### libdockdevtocplugin (module) ##############
 
-tde_add_kpart( libdoctdevtocplugin AUTOMOC
-  SOURCES doctdevtocplugin.cpp
+tde_add_kpart( libdockdevtocplugin AUTOMOC
+  SOURCES dockdevtocplugin.cpp
   LINK documentation_interfaces-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/documentation/plugins/kdevtoc/Makefile.am b/parts/documentation/plugins/kdevtoc/Makefile.am
new file mode 100644
index 00000000..22dab380
--- /dev/null
+++ b/parts/documentation/plugins/kdevtoc/Makefile.am
@@ -0,0 +1,10 @@
+INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
+	-I$(top_srcdir)/parts/documentation/interfaces $(all_includes)
+METASOURCES = AUTO
+kde_module_LTLIBRARIES =  libdockdevtocplugin.la
+libdockdevtocplugin_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
+kde_services_DATA =  dockdevtocplugin.desktop
+noinst_HEADERS =  dockdevtocplugin.h
+libdockdevtocplugin_la_SOURCES =  dockdevtocplugin.cpp
+libdockdevtocplugin_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/parts/documentation/interfaces/libdocumentation_interfaces.la
diff --git a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
index aa603fbd..fa17549b 100644
--- a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.cpp
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#include "doctdevtocplugin.h"
+#include "dockdevtocplugin.h"
 
 #include <unistd.h>
 
@@ -34,8 +34,8 @@
 #include <kstandarddirs.h>
 
 #include <urlutil.h>
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
 #include "../../../../config.h"
 
@@ -59,38 +59,38 @@ private:
 };
 
 
-static const TDevPluginInfo data("doctdevtocplugin");
-typedef TDevGenericFactory<DocTDevTOCPlugin> DocTDevTOCPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libdoctdevtocplugin, DocTDevTOCPluginFactory(data) )
+static const KDevPluginInfo data("dockdevtocplugin");
+typedef KDevGenericFactory<DocKDevTOCPlugin> DocKDevTOCPluginFactory;
+K_EXPORT_COMPONENT_FACTORY( libdockdevtocplugin, DocKDevTOCPluginFactory(data) )
 
-DocTDevTOCPlugin::DocTDevTOCPlugin(TQObject* parent, const char* name,
+DocKDevTOCPlugin::DocKDevTOCPlugin(TQObject* parent, const char* name,
     const TQStringList /*args*/)
-    :DocumentationPlugin(DocTDevTOCPluginFactory::instance()->config(), parent, name)
+    :DocumentationPlugin(DocKDevTOCPluginFactory::instance()->config(), parent, name)
 {
     setCapabilities(Index);
     autoSetup();
 }
 
-DocTDevTOCPlugin::~DocTDevTOCPlugin()
+DocKDevTOCPlugin::~DocKDevTOCPlugin()
 {
 }
 
-TQString DocTDevTOCPlugin::pluginName() const
+TQString DocKDevTOCPlugin::pluginName() const
 {
     return i18n("TDevelopTOC Documentation Collection");
 }
 
-DocumentationCatalogItem* DocTDevTOCPlugin::createCatalog(TDEListView* contents, const TQString& title, const TQString& url)
+DocumentationCatalogItem* DocKDevTOCPlugin::createCatalog(TDEListView* contents, const TQString& title, const TQString& url)
 {
     return new TOCDocumentationCatalogItem(url, this, contents, title);
 }
 
-TQPair<KFile::Mode, TQString> DocTDevTOCPlugin::catalogLocatorProps()
+TQPair<KFile::Mode, TQString> DocKDevTOCPlugin::catalogLocatorProps()
 {
     return TQPair<KFile::Mode, TQString>(KFile::File, "*.toc");
 }
 
-TQString DocTDevTOCPlugin::catalogTitle(const TQString& url)
+TQString DocKDevTOCPlugin::catalogTitle(const TQString& url)
 {
     TQFileInfo fi(url);
     if (!fi.exists())
@@ -111,19 +111,19 @@ TQString DocTDevTOCPlugin::catalogTitle(const TQString& url)
 }
 
 
-TQStringList DocTDevTOCPlugin::fullTextSearchLocations()
+TQStringList DocKDevTOCPlugin::fullTextSearchLocations()
 {
     return TQStringList();
 }
 
-bool DocTDevTOCPlugin::needRefreshIndex(DocumentationCatalogItem* /*item*/)
+bool DocKDevTOCPlugin::needRefreshIndex(DocumentationCatalogItem* /*item*/)
 {
     return false;
 }
 
-void DocTDevTOCPlugin::autoSetupPlugin()
+void DocKDevTOCPlugin::autoSetupPlugin()
 {
-    TQStringList tocsDir = DocTDevTOCPluginFactory::instance()->dirs()->findAllResources("data", "tdevdocumentation/tocs/*.toc");
+    TQStringList tocsDir = DocKDevTOCPluginFactory::instance()->dirs()->findAllResources("data", "kdevdocumentation/tocs/*.toc");
     
     for (TQStringList::const_iterator it = tocsDir.begin(); it != tocsDir.end(); ++it)
     {
@@ -132,7 +132,7 @@ void DocTDevTOCPlugin::autoSetupPlugin()
     }
 }
 
-void DocTDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* item)
+void DocKDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* item)
 {
     TOCDocumentationCatalogItem *tocItem = dynamic_cast<TOCDocumentationCatalogItem *>(item);
     if (!tocItem)
@@ -177,7 +177,7 @@ void DocTDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it
     }
 }
 
-void DocTDevTOCPlugin::createTOC(DocumentationCatalogItem* item)
+void DocKDevTOCPlugin::createTOC(DocumentationCatalogItem* item)
 {
     TOCDocumentationCatalogItem *tocItem = dynamic_cast<TOCDocumentationCatalogItem *>(item);
     if (!tocItem)
@@ -210,7 +210,7 @@ void DocTDevTOCPlugin::createTOC(DocumentationCatalogItem* item)
     addTocSect(tocItem, childEl, base, 1);
 }
 
-void DocTDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level)
+void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level)
 {
     while (!childEl.isNull())
     {
@@ -229,7 +229,7 @@ void DocTDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childE
     }
 }
 
-void DocTDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item)
+void DocKDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item)
 {
     TOCDocumentationCatalogItem *tocItem = dynamic_cast<TOCDocumentationCatalogItem *>(item);
     if (!tocItem)
@@ -264,7 +264,7 @@ void DocTDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item)
     }
 }
 
-TQString DocTDevTOCPlugin::constructURL(const TQString &base, const TQString &url)
+TQString DocKDevTOCPlugin::constructURL(const TQString &base, const TQString &url)
 {
     if (base.isEmpty() && !url.isEmpty())
         return url;
@@ -274,4 +274,4 @@ TQString DocTDevTOCPlugin::constructURL(const TQString &base, const TQString &ur
         return base;
 }
 
-#include "doctdevtocplugin.moc"
+#include "dockdevtocplugin.moc"
diff --git a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.desktop b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop
index 5f89e8d7..1cae3582 100644
--- a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.desktop
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Service
-Name=DocTDevTOCPlugin
-Name[da]=DocTDevTOC-plugin
-Name[sk]=Doc TDevTOC modul
+Name=DocKDevTOCPlugin
+Name[da]=DocKDevTOC-plugin
+Name[sk]=Doc KDevTOC modul
 Name[sv]=TDevelop innehållsförteckning-dokumentationsinsticksmodul
-Name[ta]=DocTDevTOC  சொருகு
+Name[ta]=DocKDevTOC  சொருகு
 Name[zh_TW]=TDevelop 目錄文件外掛程式
 Exec=blubb
 Comment=Documentation plugin for TDevelopTOC documentation
@@ -40,4 +40,4 @@ Comment[zh_CN]=TDevelopTOC 文档的文档插件
 Comment[zh_TW]=TDevelop 目錄文件外掛程式
 ServiceTypes=TDevelop/DocumentationPlugins
 X-TDevelop-Version=5
-X-TDE-Library=libdoctdevtocplugin
+X-TDE-Library=libdockdevtocplugin
diff --git a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.h b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h
index 266efb94..7205cc4c 100644
--- a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.h
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h
@@ -17,20 +17,20 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef DOCTDEVTOCPLUGIN_H
-#define DOCTDEVTOCPLUGIN_H
+#ifndef DOCKDEVTOCPLUGIN_H
+#define DOCKDEVTOCPLUGIN_H
 
 #include <tqdom.h>
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 
-class DocTDevTOCPlugin : public DocumentationPlugin
+class DocKDevTOCPlugin : public DocumentationPlugin
 {
     Q_OBJECT
   
 public:
-    DocTDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
-    ~DocTDevTOCPlugin();
+    DocKDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    ~DocKDevTOCPlugin();
 
     virtual TQString pluginName() const;
     
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp
index b0ebd29d..fc647d34 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.cpp
+++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp
@@ -25,10 +25,10 @@
 #include <tdelocale.h>
 #include <tdelistview.h>
 
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 
 static const TDEAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation plugin"), "1.0");
-typedef TDevGenericFactory<DocPDBPlugin> DocPDBPluginFactory;
+typedef KDevGenericFactory<DocPDBPlugin> DocPDBPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocpdbplugin, DocPDBPluginFactory(&data) )
 
 DocPDBPlugin::DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args)
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.h b/parts/documentation/plugins/pdb/docpdbplugin.h
index d1319012..40dd3a15 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.h
+++ b/parts/documentation/plugins/pdb/docpdbplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCPDBPLUGIN_H
 #define DOCPDBPLUGIN_H
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 
 class DocPDBPlugin : public DocumentationPlugin {
 public:
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp
index 322a33d3..65bddd1b 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.cpp
+++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp
@@ -25,10 +25,10 @@
 #include <tdelocale.h>
 #include <tdelistview.h>
 
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 
 static const TDEAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin"), "1.0");
-typedef TDevGenericFactory<DocPDFPlugin> DocPDFPluginFactory;
+typedef KDevGenericFactory<DocPDFPlugin> DocPDFPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocpdfplugin, DocPDFPluginFactory(&data) )
 
 DocPDFPlugin::DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args)
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.h b/parts/documentation/plugins/pdf/docpdfplugin.h
index a5410196..d5ecc7eb 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.h
+++ b/parts/documentation/plugins/pdf/docpdfplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCPDFPLUGIN_H
 #define DOCPDFPLUGIN_H
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 
 class DocPDFPlugin : public DocumentationPlugin {
 public:
diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp
index 301859ca..10271524 100644
--- a/parts/documentation/plugins/qt/docqtplugin.cpp
+++ b/parts/documentation/plugins/qt/docqtplugin.cpp
@@ -32,8 +32,8 @@
 #include <tdelistview.h>
 
 #include <urlutil.h>
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
 #include "../../../../config.h"
 
@@ -56,8 +56,8 @@ private:
     TQString m_dcfFile;
 };
 
-static const TDevPluginInfo data("docqtplugin");
-typedef TDevGenericFactory<DocQtPlugin> DocQtPluginFactory;
+static const KDevPluginInfo data("docqtplugin");
+typedef KDevGenericFactory<DocQtPlugin> DocQtPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocQtPluginFactory(data) )
 
 DocQtPlugin::DocQtPlugin(TQObject* parent, const char* name, const TQStringList)
diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h
index 964ef844..8eac8456 100644
--- a/parts/documentation/plugins/qt/docqtplugin.h
+++ b/parts/documentation/plugins/qt/docqtplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCTQTPLUGIN_H
 #define DOCTQTPLUGIN_H
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 #include <tqdom.h>
 
 class TDEConfig;
diff --git a/parts/documentation/plugins/tdevtoc/Makefile.am b/parts/documentation/plugins/tdevtoc/Makefile.am
deleted file mode 100644
index 4baaaa86..00000000
--- a/parts/documentation/plugins/tdevtoc/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
-	-I$(top_srcdir)/parts/documentation/interfaces $(all_includes)
-METASOURCES = AUTO
-kde_module_LTLIBRARIES =  libdoctdevtocplugin.la
-libdoctdevtocplugin_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
-kde_services_DATA =  doctdevtocplugin.desktop
-noinst_HEADERS =  doctdevtocplugin.h
-libdoctdevtocplugin_la_SOURCES =  doctdevtocplugin.cpp
-libdoctdevtocplugin_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/parts/documentation/interfaces/libdocumentation_interfaces.la
diff --git a/parts/documentation/protocols/chm/CMakeLists.txt b/parts/documentation/protocols/chm/CMakeLists.txt
index 8d97053e..c444c226 100644
--- a/parts/documentation/protocols/chm/CMakeLists.txt
+++ b/parts/documentation/protocols/chm/CMakeLists.txt
@@ -43,6 +43,6 @@ tde_add_kpart( tdeio_chm
 
 tde_add_kpart( libkchmpart AUTOMOC
   SOURCES kchmpart.cpp
-  LINK tdevwidgets-shared
+  LINK kdevwidgets-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/documentation/protocols/chm/Makefile.am b/parts/documentation/protocols/chm/Makefile.am
index de7e0929..5a1092a2 100644
--- a/parts/documentation/protocols/chm/Makefile.am
+++ b/parts/documentation/protocols/chm/Makefile.am
@@ -9,7 +9,7 @@ tdeio_chm_la_LIBADD = $(LIB_TDEIO)
 tdeio_chm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 libkchmpart_la_SOURCES = kchmpart.cpp
-libkchmpart_la_LIBADD = -ltdehtml $(LIB_TDEPARTS) $(top_builddir)/lib/widgets/libtdevwidgets.la
+libkchmpart_la_LIBADD = -ltdehtml $(LIB_TDEPARTS) $(top_builddir)/lib/widgets/libkdevwidgets.la
 libkchmpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
 noinst_HEADERS = chm.h chmfile.h decompress.h kchmpart.h
diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp
index ab688ff7..952228c4 100644
--- a/parts/documentation/protocols/chm/kchmpart.cpp
+++ b/parts/documentation/protocols/chm/kchmpart.cpp
@@ -67,7 +67,7 @@ TDEInstance* KChmPartFactory::instance()
 
 
 KChmPart::KChmPart( TQWidget * parent, const char * name )
-	: TDevHTMLPart(  ), m_job(0)
+	: KDevHTMLPart(  ), m_job(0)
 {
    TDEInstance * instance = new TDEInstance( "kchmpart" );
    setInstance( instance );
@@ -80,7 +80,7 @@ bool KChmPart::openURL( const KURL &url )
    KURL chmURL = url;
    chmURL.setProtocol("ms-its");
    chmURL.addPath("/");
-   return TDevHTMLPart::openURL(chmURL);
+   return KDevHTMLPart::openURL(chmURL);
 }
 
 void KChmPart::slotDuplicate()
diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h
index a3c8d9ec..9d1812b1 100644
--- a/parts/documentation/protocols/chm/kchmpart.h
+++ b/parts/documentation/protocols/chm/kchmpart.h
@@ -23,7 +23,7 @@
 #include <tdehtml_part.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
-#include <tdevhtmlpart.h>
+#include <kdevhtmlpart.h>
 
 #include <tqcstring.h>
 
@@ -52,7 +52,7 @@ class KChmPartFactory: public KParts::Factory
 };
 
 
-class KChmPart : public TDevHTMLPart
+class KChmPart : public KDevHTMLPart
 {
    Q_OBJECT
   
diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp
index 2893d574..67dca0ed 100644
--- a/parts/documentation/searchview.cpp
+++ b/parts/documentation/searchview.cpp
@@ -43,8 +43,8 @@
 #include <tdemessagebox.h>
 #include <kdebug.h>
 
-#include <tdevpartcontroller.h>
-#include <tdevdocumentationplugin.h>
+#include <kdevpartcontroller.h>
+#include <kdevdocumentationplugin.h>
 
 #include "documentation_part.h"
 #include "docutils.h"
@@ -160,7 +160,7 @@ void SearchView::search()
         return;
     }
 
-    TQString indexdir = kapp->dirs()->saveLocation("data", "tdevdocumentation/search");
+    TQString indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search");
     TQDir d;
     if (indexdir.isEmpty() || !TQFile::exists(indexdir + "/htdig.conf"))
     {
@@ -177,7 +177,7 @@ void SearchView::search()
         }
     }
 
-    TQString savedir = kapp->dirs()->saveLocation("data", "tdevdocumentation/search");
+    TQString savedir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search");
     if (!d.exists(savedir))
         d.mkdir(savedir);
 
@@ -191,7 +191,7 @@ void SearchView::search()
     kdDebug(9002) << "starting kprocess" << endl;
     kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query <<  endl;
     TDEProcess *proc = new TDEProcess;
-    TQString picdir = kapp->dirs()->findResourceDir("data", "tdevdocumentation/pics/htdig.png");
+    TQString picdir = kapp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png");
     proc->setEnvironment("PICDIR", picdir);
     *proc << exe << "-c" << (indexdir + "/htdig.conf") << query;
 
diff --git a/parts/documentation/selecttopic.h b/parts/documentation/selecttopic.h
index e7e850bf..6ca5ad8b 100644
--- a/parts/documentation/selecttopic.h
+++ b/parts/documentation/selecttopic.h
@@ -22,7 +22,7 @@
 
 #include "selecttopicbase.h"
 
-#include "tdevdocumentationplugin.h"
+#include "kdevdocumentationplugin.h"
 
 class SelectTopic: public SelectTopicBase{
 Q_OBJECT
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index d422826c..c99c4a2c 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -45,10 +45,10 @@ ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name)
 {
     proc = 0;
 
-    indexdir = kapp->dirs()->saveLocation("data", "tdevdocumentation/search");
+    indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search");
     TQDir d; d.mkdir(indexdir);
 
-    TDEConfig config("tdevdocumentation", true);
+    TDEConfig config("kdevdocumentation", true);
     config.setGroup("htdig");
     databaseDir = config.readPathEntry("databaseDir", indexdir);
 
@@ -137,8 +137,8 @@ void ProgressDialog::setFilesDigged(int n)
 
 void ProgressDialog::setState(int n)
 {
-    TQPixmap unchecked = TQPixmap(locate("data", "tdevdocumentation/pics/unchecked.xpm"));
-    TQPixmap checked = TQPixmap(locate("data", "tdevdocumentation/pics/checked.xpm"));
+    TQPixmap unchecked = TQPixmap(locate("data", "kdevdocumentation/pics/unchecked.xpm"));
+    TQPixmap checked = TQPixmap(locate("data", "kdevdocumentation/pics/checked.xpm"));
 
     check1->setPixmap( n > 0 ? checked : unchecked);
     check2->setPixmap( n > 1 ? checked : unchecked);
@@ -182,7 +182,7 @@ void ProgressDialog::addDir(const TQString &dir)
 
 void ProgressDialog::scanDirectories()
 {
-    TQString ftsLocationsFile = locateLocal("data", "tdevdocumentation/search/locations.txt");
+    TQString ftsLocationsFile = locateLocal("data", "kdevdocumentation/search/locations.txt");
 
     TQFile f(ftsLocationsFile);
     if (!f.open(IO_ReadOnly))
@@ -214,15 +214,15 @@ bool ProgressDialog::createConfig()
     if (language == "C")
         language = "en";
 
-    TQString wrapper = locate("data", TQString("tdevdocumentation/%1/wrapper.html").arg(language));
+    TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").arg(language));
     if (wrapper.isEmpty())
-        wrapper = locate("data", TQString("tdevdocumentation/en/wrapper.html"));
+        wrapper = locate("data", TQString("kdevdocumentation/en/wrapper.html"));
     if (wrapper.isEmpty())
         return false;
     wrapper = wrapper.left(wrapper.length()-12);
 
     // locate the image dir
-    TQString images = locate("data", "tdevdocumentation/pics/star.png");
+    TQString images = locate("data", "kdevdocumentation/pics/star.png");
     if (images.isEmpty())
         return false;
     images = images.left(images.length()-8);
@@ -300,7 +300,7 @@ bool ProgressDialog::generateIndex()
     setState(1);
     procdone = false;
     // run htdig
-    TDEConfig config("tdevdocumentation", true);
+    TDEConfig config("kdevdocumentation", true);
     config.setGroup("htdig");
     exe = config.readPathEntry("htdigbin", kapp->dirs()->findExe("htdig"));
     if (exe.isEmpty())
@@ -365,7 +365,7 @@ void ProgressDialog::htdigExited(TDEProcess *proc)
         setFilesDigged(filesToDig);
         setState(2);
 
-        TDEConfig config("tdevdocumentation", true);
+        TDEConfig config("kdevdocumentation", true);
         config.setGroup("htdig");
         // run htmerge -----------------------------------------------------
         exe = config.readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge"));
diff --git a/parts/doxygen/CMakeLists.txt b/parts/doxygen/CMakeLists.txt
index ed4bfeb9..00a18675 100644
--- a/parts/doxygen/CMakeLists.txt
+++ b/parts/doxygen/CMakeLists.txt
@@ -28,13 +28,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevdoxygen.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevdoxygen.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdoxygen )
+install( FILES kdevdoxygen.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevdoxygen.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdoxygen )
 
 
-##### libtdevdoxygen (module) ###################
+##### libkdevdoxygen (module) ###################
 
-tde_add_kpart( libtdevdoxygen AUTOMOC
+tde_add_kpart( libkdevdoxygen AUTOMOC
   SOURCES
     doxygenpart.cpp doxygenconfigwidget.cpp input.cpp
     config.cpp version.cpp messages.cpp
diff --git a/parts/doxygen/Makefile.am b/parts/doxygen/Makefile.am
index e01fa6eb..703760cb 100644
--- a/parts/doxygen/Makefile.am
+++ b/parts/doxygen/Makefile.am
@@ -4,16 +4,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/src -DDOXYWIZARD \
 	$(all_includes)
 
-kde_module_LTLIBRARIES = libtdevdoxygen.la
-libtdevdoxygen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevdoxygen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevdoxygen.la
+libkdevdoxygen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevdoxygen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevdoxygen_la_SOURCES = doxygenpart.cpp doxygenconfigwidget.cpp input.cpp config.cpp version.cpp messages.cpp
+libkdevdoxygen_la_SOURCES = doxygenpart.cpp doxygenconfigwidget.cpp input.cpp config.cpp version.cpp messages.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevdoxygen.desktop
+service_DATA = kdevdoxygen.desktop
 
-rcdir = $(kde_datadir)/tdevdoxygen
-rc_DATA = tdevdoxygen.rc
+rcdir = $(kde_datadir)/kdevdoxygen
+rc_DATA = kdevdoxygen.rc
diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp
index 960eef41..d965d98b 100644
--- a/parts/doxygen/doxygenpart.cpp
+++ b/parts/doxygen/doxygenpart.cpp
@@ -15,19 +15,19 @@
 #include "doxygenconfigwidget.h"
 #include "configwidgetproxy.h"
 #include "config.h"
-#include "tdevappfrontend.h"
+#include "kdevappfrontend.h"
 
-#include <tdevmainwindow.h>
-#include <tdevproject.h>
-#include <tdevmakefrontend.h>
-#include <tdevcore.h>
+#include <kdevmainwindow.h>
+#include <kdevproject.h>
+#include <kdevmakefrontend.h>
+#include <kdevcore.h>
 #include <codemodel.h>
 #include <codemodel_utils.h>
 #include <domutil.h>
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdemessagebox.h>
 #include <tdemainwindow.h>
@@ -37,7 +37,7 @@
 #include <tdetexteditor/editinterface.h>
 #include <partcontroller.h>
 #include <kdialogbase.h>
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 
 #include <tqvbox.h>
 #include <tqfile.h>
@@ -47,15 +47,15 @@
 
 #define PROJECTOPTIONS 1
 
-typedef TDevGenericFactory<DoxygenPart> DoxygenFactory;
-static const TDevPluginInfo data("tdevdoxygen");
-K_EXPORT_COMPONENT_FACTORY( libtdevdoxygen, DoxygenFactory( data ) )
+typedef KDevGenericFactory<DoxygenPart> DoxygenFactory;
+static const KDevPluginInfo data("kdevdoxygen");
+K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( data ) )
 
 DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList &)
-    : TDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0)
+    : KDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0)
 {
     setInstance(DoxygenFactory::instance());
-    setXMLFile("tdevdoxygen.rc");
+    setXMLFile("kdevdoxygen.rc");
 
     TDEAction *action;
     action = new TDEAction( i18n("Build API Documentation"), 0,
@@ -272,7 +272,7 @@ void DoxygenPart::slotDoxygen()
 
     kdDebug(9026) << "Doxygen command line: " << cmdline << endl;
 
-    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, cmdline);
 }
 
@@ -340,7 +340,7 @@ void DoxygenPart::slotDoxClean()
 
     if (could_be_dirty) {
         kdDebug(9026) << "Cleaning Doxygen generated API documentation using: " << cmdline << endl;
-        if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+        if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
             makeFrontend->queueCommand(KShellProcess::quote(project()->projectDirectory()), cmdline);
     }
     else
@@ -350,7 +350,7 @@ void DoxygenPart::slotDoxClean()
 
 void DoxygenPart::slotPreviewProcessExited( )
 {
-    TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend");
+    KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend");
     if ( appFrontend != 0 )
         disconnect(appFrontend, 0, this, 0);
     partController()->showDocument(KURL(m_tmpDir.name()+"html/index.html"));
@@ -361,7 +361,7 @@ void DoxygenPart::slotRunPreview( )
     if (m_file.isNull())
         return;
 
-    TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend");
+    KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend");
     if ( appFrontend == 0 )
         return;
 
diff --git a/parts/doxygen/doxygenpart.h b/parts/doxygen/doxygenpart.h
index 77bafe46..aaa438de 100644
--- a/parts/doxygen/doxygenpart.h
+++ b/parts/doxygen/doxygenpart.h
@@ -20,7 +20,7 @@
 #include <ktempdir.h>
 #include <tqstring.h>
 
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 
 class DoxygenDialog;
 class TQPopupMenu;
@@ -37,7 +37,7 @@ namespace KTextEditor{
     class EditInterface;
 }
 
-class DoxygenPart : public TDevPlugin
+class DoxygenPart : public KDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/doxygen/tdevdoxygen.desktop b/parts/doxygen/kdevdoxygen.desktop
index a69635ab..7d50f15b 100644
--- a/parts/doxygen/tdevdoxygen.desktop
+++ b/parts/doxygen/kdevdoxygen.desktop
@@ -75,7 +75,7 @@ GenericName[zh_CN]=Doxygen 支持
 GenericName[zh_TW]=Doxygen 支援
 ServiceTypes=TDevelop/Plugin
 Icon=tdevelop
-X-TDE-Library=libtdevdoxygen
+X-TDE-Library=libkdevdoxygen
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 X-TDevelop-Properties=CProjectDocumentation,CPPProjectDocumentation,JavaProjectDocumentation,PHPProjectDocumentation
diff --git a/parts/doxygen/tdevdoxygen.rc b/parts/doxygen/kdevdoxygen.rc
index 9faa6cd5..9faa6cd5 100644
--- a/parts/doxygen/tdevdoxygen.rc
+++ b/parts/doxygen/kdevdoxygen.rc
diff --git a/parts/filecreate/CMakeLists.txt b/parts/filecreate/CMakeLists.txt
index 5655e7b9..a562f8e1 100644
--- a/parts/filecreate/CMakeLists.txt
+++ b/parts/filecreate/CMakeLists.txt
@@ -31,13 +31,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevfilecreate.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpart_filecreate.rc template-info.xml DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate )
+install( FILES kdevfilecreate.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpart_filecreate.rc template-info.xml DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate )
 
 
-##### libtdevfilecreate (module) ################
+##### libkdevfilecreate (module) ################
 
-tde_add_kpart( libtdevfilecreate AUTOMOC
+tde_add_kpart( libkdevfilecreate AUTOMOC
   SOURCES
     filecreate_part.cpp filecreate_listitem.cpp
     filecreate_filetype.cpp filecreate_filedialog.cpp
diff --git a/parts/filecreate/Makefile.am b/parts/filecreate/Makefile.am
index ca0f1790..efe204d9 100644
--- a/parts/filecreate/Makefile.am
+++ b/parts/filecreate/Makefile.am
@@ -5,11 +5,11 @@ SUBDIRS = file-templates
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevfilecreate.la
-libtdevfilecreate_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevfilecreate_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevfilecreate.la
+libkdevfilecreate_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevfilecreate_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevfilecreate_la_SOURCES = filecreate_part.cpp filecreate_listitem.cpp \
+libkdevfilecreate_la_SOURCES = filecreate_part.cpp filecreate_listitem.cpp \
 	filecreate_filetype.cpp filecreate_filedialog.cpp fcconfigwidgetbase.ui fcconfigwidget.cpp \
 	fctypeeditbase.ui fctypeedit.cpp fctemplateeditbase.ui fctemplateedit.cpp \
 	filecreate_newfile.cpp
@@ -17,7 +17,7 @@ libtdevfilecreate_la_SOURCES = filecreate_part.cpp filecreate_listitem.cpp \
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevfilecreate.desktop
+service_DATA = kdevfilecreate.desktop
 
-rcdir = $(kde_datadir)/tdevfilecreate
-rc_DATA = tdevpart_filecreate.rc template-info.xml
+rcdir = $(kde_datadir)/kdevfilecreate
+rc_DATA = kdevpart_filecreate.rc template-info.xml
diff --git a/parts/filecreate/README.dox b/parts/filecreate/README.dox
index fc0fbc76..34a7882d 100644
--- a/parts/filecreate/README.dox
+++ b/parts/filecreate/README.dox
@@ -20,7 +20,7 @@ Example XML:
 
 <code>
 \verbatim
-  <tdevfilecreate>
+  <kdevfilecreate>
     <filetypes>
       <type ext="py" name="Python" create="template"/>
       <type ext="ui" name="QT Designer" create="template">
@@ -28,7 +28,7 @@ Example XML:
          <subtype ref="mainwin" name="Main window"/>
       </type>
     </filetypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 \endverbatim
 </code>
 
@@ -36,14 +36,14 @@ You can also use global template definitions supplied with the FileCreate part:
 
 <code>
 \verbatim
-  <tdevfilecreate>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
     </useglobaltypes>
     <filetypes>
       <type ext="py" name="Python" create="template"/>
     </filetypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 \endverbatim
 </code>
 
diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp
index 14066c11..7c6fabc4 100644
--- a/parts/filecreate/fcconfigwidget.cpp
+++ b/parts/filecreate/fcconfigwidget.cpp
@@ -35,8 +35,8 @@
 #include "fcconfigwidget.h"
 #include "filecreate_part.h"
 #include "filecreate_filetype.h"
-#include "tdevproject.h"
-#include "tdevpartcontroller.h"
+#include "kdevproject.h"
+#include "kdevpartcontroller.h"
 
 
 FCConfigWidget::FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name):
@@ -90,7 +90,7 @@ void FCConfigWidget::accept()
 
 void FCConfigWidget::loadGlobalConfig(TQListView *view, bool checkmarks)
 {
-    TQString globalXMLFile = ::locate("data", "tdevfilecreate/template-info.xml");
+    TQString globalXMLFile = ::locate("data", "kdevfilecreate/template-info.xml");
     TQDomDocument globalDom;
     if (!globalXMLFile.isNull() &&
         DomUtil::openDOMFile(globalDom,globalXMLFile)) {
@@ -103,7 +103,7 @@ void FCConfigWidget::loadGlobalConfig(TQListView *view, bool checkmarks)
     if (checkmarks)
     {
         TQDomElement useGlobalTypes =
-            DomUtil::elementByPath(*(m_part->projectDom()),"/tdevfilecreate/useglobaltypes");
+            DomUtil::elementByPath(*(m_part->projectDom()),"/kdevfilecreate/useglobaltypes");
         for(TQDomNode node = useGlobalTypes.firstChild(); !node.isNull();node=node.nextSibling())
         {
             if (node.isElement() && node.nodeName()=="type")
@@ -171,14 +171,14 @@ void FCConfigWidget::saveGlobalConfig()
     TQDomDocument globalDom;
     TQDomElement  element = globalDom.createElement("tdevelop" );
     globalDom.appendChild(element);
-    TQDomElement  apPart  = globalDom.createElement("tdevfilecreate");
+    TQDomElement  apPart  = globalDom.createElement("kdevfilecreate");
     element.appendChild(apPart);
     TQDomElement fileTypes = globalDom.createElement( "filetypes" );
     apPart.appendChild( fileTypes );
 
     saveConfiguration(globalDom, fileTypes, true);
 
-    TQFile config( TDEGlobal::dirs()->saveLocation("data", "tdevfilecreate/", true) + "template-info.xml" );
+    TQFile config( TDEGlobal::dirs()->saveLocation("data", "kdevfilecreate/", true) + "template-info.xml" );
     config.open(IO_WriteOnly | IO_Truncate);
     TQTextStream stream(&config);
     stream << "<?xml version = '1.0'?>";
@@ -190,10 +190,10 @@ void FCConfigWidget::saveProjectConfig()
 {
     TQDomDocument dom     = *m_part->projectDom( );
     TQDomElement  element = dom.documentElement( );
-    TQDomElement  apPart  = element.namedItem( "tdevfilecreate" ).toElement( );
+    TQDomElement  apPart  = element.namedItem( "kdevfilecreate" ).toElement( );
     if( apPart.isNull( ) )
     {
-        apPart = dom.createElement( "tdevfilecreate" );
+        apPart = dom.createElement( "kdevfilecreate" );
         element.appendChild( apPart );
     }
 
@@ -291,7 +291,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element
             {
                 TQString dest;
                 if (global)
-                    dest = TDEGlobal::dirs()->saveLocation("data", "/tdevfilecreate/file-templates/", true);
+                    dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
                 else
                     dest = m_part->project()->projectDirectory() + "/templates/";
                 if (it.current()->text(4) == "create")
@@ -318,7 +318,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element
                 {
                     TQString dest;
                     if (global)
-                        dest = TDEGlobal::dirs()->saveLocation("data", "/tdevfilecreate/file-templates/", true);
+                        dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
                     else
                         dest = m_part->project()->projectDirectory() + "/templates/";
                     if (lastChild->text(4) == "create")
@@ -440,7 +440,7 @@ void FCConfigWidget::copyToProject_button_clicked()
                 it->parent()->text(1),
                 it->parent()->text(2),
                 it->parent()->text(3),
-                locate("data", "tdevfilecreate/file-templates/"+ it->parent()->text(0)));
+                locate("data", "kdevfilecreate/file-templates/"+ it->parent()->text(0)));
             destParent += it->parent()->text(0) + "-";
             TQCheckListItem *chk = dynamic_cast<TQCheckListItem*>(it->parent());
             if (chk)
@@ -452,13 +452,13 @@ void FCConfigWidget::copyToProject_button_clicked()
                 it->text(1),
                 it->text(2),
                 it->text(3),
-                locate("data", "tdevfilecreate/file-templates/"+destParent + it->text(0)));
+                locate("data", "kdevfilecreate/file-templates/"+destParent + it->text(0)));
         else
             it_copy = new TQListViewItem(fc_view, it->text(0),
                 it->text(1),
                 it->text(2),
                 it->text(3),
-                locate("data", "tdevfilecreate/file-templates/" +destParent+ it->text(0)));
+                locate("data", "kdevfilecreate/file-templates/" +destParent+ it->text(0)));
         TQCheckListItem *chk = dynamic_cast<TQCheckListItem*>(it);
         if (chk)
             chk->setOn(false);
@@ -470,7 +470,7 @@ void FCConfigWidget::copyToProject_button_clicked()
                 it_child->text(1),
                 it_child->text(2),
                 it_child->text(3),
-                locate("data", "tdevfilecreate/file-templates/"+ it_copy->text(0) + "-" + it_child->text(0)));
+                locate("data", "kdevfilecreate/file-templates/"+ it_copy->text(0) + "-" + it_child->text(0)));
             TQCheckListItem *chk_child = dynamic_cast<TQCheckListItem*>(it_child);
             if (chk_child)
                 chk_child->setOn(false);
@@ -683,7 +683,7 @@ void FCConfigWidget::edit_type_content_button_clicked( )
     }
     else
     {
-        TQString dest = TDEGlobal::dirs()->saveLocation("data", "/tdevfilecreate/file-templates/", true);
+        TQString dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
         TQString typePath = dest + type_name;
         KURL content;
         content.setPath(typePath);
@@ -691,7 +691,7 @@ void FCConfigWidget::edit_type_content_button_clicked( )
         {
             TQFileInfo fi(dest+type_name);
             if (!fi.exists())
-                copyTemplate(locate("data", "tdevfilecreate/file-templates/" + type_name), dest, type_name);
+                copyTemplate(locate("data", "kdevfilecreate/file-templates/" + type_name), dest, type_name);
             m_part->partController()->editDocument(content);
         }
         else
diff --git a/parts/filecreate/file-templates/CMakeLists.txt b/parts/filecreate/file-templates/CMakeLists.txt
index 37b9a309..04405e1a 100644
--- a/parts/filecreate/file-templates/CMakeLists.txt
+++ b/parts/filecreate/file-templates/CMakeLists.txt
@@ -14,4 +14,4 @@ install( FILES
     ui-dialogr ui-tabdialog ui-wizard dox ts ui-mainwin-qt4
     ui-widget-qt4 ui-dialogb-qt4 ui-dialogr-qt4 ui-dialog-qt4
     qrc
-  DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates )
diff --git a/parts/filecreate/file-templates/Makefile.am b/parts/filecreate/file-templates/Makefile.am
index 631e3554..672a1cfa 100644
--- a/parts/filecreate/file-templates/Makefile.am
+++ b/parts/filecreate/file-templates/Makefile.am
@@ -1,2 +1,2 @@
-rcdir = $(kde_datadir)/tdevfilecreate/file-templates
+rcdir = $(kde_datadir)/kdevfilecreate/file-templates
 rc_DATA = ui ui-dialog ui-mainwin ui-confdialog ui-dialogb ui-widget ui-dialogr ui-tabdialog ui-wizard dox ts ui-mainwin-qt4 ui-widget-qt4 ui-dialogb-qt4 ui-dialogr-qt4 ui-dialog-qt4 qrc
diff --git a/parts/filecreate/filecreate_filedialog.h b/parts/filecreate/filecreate_filedialog.h
index 616e9c2d..54365717 100644
--- a/parts/filecreate/filecreate_filedialog.h
+++ b/parts/filecreate/filecreate_filedialog.h
@@ -10,8 +10,8 @@
 
 
 
-#ifndef __TDEVPART_FILECREATE_FILEDIALOG_H__
-#define __TDEVPART_FILECREATE_FILEDIALOG_H__
+#ifndef __KDEVPART_FILECREATE_FILEDIALOG_H__
+#define __KDEVPART_FILECREATE_FILEDIALOG_H__
 
 #include <tdefiledialog.h>
 
diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
index 11fcfa6c..19deeb66 100644
--- a/parts/filecreate/filecreate_part.cpp
+++ b/parts/filecreate/filecreate_part.cpp
@@ -19,7 +19,7 @@
 #include <tdeversion.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
@@ -30,10 +30,10 @@
 #include <tdepopupmenu.h>
 #include <tdemessagebox.h>
 
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
-#include "tdevproject.h"
-#include "tdevpartcontroller.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
+#include "kdevproject.h"
+#include "kdevpartcontroller.h"
 #include "configwidgetproxy.h"
 
 #include "filetemplate.h"
@@ -50,23 +50,23 @@
 #define PROJECTSETTINGSPAGE 1
 #define GLOBALSETTINGSPAGE 2
 
-#include "tdevplugininfo.h"
+#include "kdevplugininfo.h"
 
 #include "config.h"
 
-static const TDevPluginInfo data("tdevfilecreate");
+static const KDevPluginInfo data("kdevfilecreate");
 
-typedef TDevGenericFactory<FileCreatePart> FileCreateFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevfilecreate, FileCreateFactory( data ) )
+typedef KDevGenericFactory<FileCreatePart> FileCreateFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) )
 
 using namespace FileCreate;
 
 FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStringList & )
-//    : TDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0)
-    : TDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0)
+//    : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0)
+    : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0)
 {
   setInstance(FileCreateFactory::instance());
-  setXMLFile("tdevpart_filecreate.rc");
+  setXMLFile("kdevpart_filecreate.rc");
 
   connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
   connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) );
@@ -179,10 +179,10 @@ void FileCreatePart::slotNewFilePopup( int pFileType )
 }
 
 void FileCreatePart::slotNewFile() {
-  TDevCreateFile::CreatedFile createdFile = createNewFile();
-  if (createdFile.status == TDevCreateFile::CreatedFile::STATUS_NOTCREATED)
+  KDevCreateFile::CreatedFile createdFile = createNewFile();
+  if (createdFile.status == KDevCreateFile::CreatedFile::STATUS_NOTCREATED)
     KMessageBox::error(0, i18n("Cannot create file. Check whether the directory and filename are valid."));
-  else if (createdFile.status != TDevCreateFile::CreatedFile::STATUS_CANCELED)
+  else if (createdFile.status != KDevCreateFile::CreatedFile::STATUS_CANCELED)
     openCreatedFile(createdFile);
 }
 
@@ -209,7 +209,7 @@ void FileCreatePart::slotProjectClosed() {
 
 void FileCreatePart::slotFiletypeSelected(const FileType * filetype) {
 
-  TDevCreateFile::CreatedFile createdFile = createNewFile(filetype->ext(),
+  KDevCreateFile::CreatedFile createdFile = createNewFile(filetype->ext(),
                                                           TQString(),
                                                           TQString(),
                                                           filetype->subtypeRef());
@@ -217,9 +217,9 @@ void FileCreatePart::slotFiletypeSelected(const FileType * filetype) {
   openCreatedFile(createdFile);
 }
 
-void FileCreatePart::openCreatedFile(const TDevCreateFile::CreatedFile & createdFile)
+void FileCreatePart::openCreatedFile(const KDevCreateFile::CreatedFile & createdFile)
 {
-  if ( createdFile.status == TDevCreateFile::CreatedFile::STATUS_OK )
+  if ( createdFile.status == KDevCreateFile::CreatedFile::STATUS_OK )
   {
     KURL uu( createdFile.dir + "/" + createdFile.filename );
     partController()->editDocument ( uu );
@@ -228,7 +228,7 @@ void FileCreatePart::openCreatedFile(const TDevCreateFile::CreatedFile & created
 
 int FileCreatePart::readTypes(const TQDomDocument & dom, TQPtrList<FileType> &m_filetypes, bool enable) {
   int numRead = 0;
-  TQDomElement fileTypes = DomUtil::elementByPath(dom,"/tdevfilecreate/filetypes");
+  TQDomElement fileTypes = DomUtil::elementByPath(dom,"/kdevfilecreate/filetypes");
   if (!fileTypes.isNull()) {
     for(TQDomNode node = fileTypes.firstChild();!node.isNull();node=node.nextSibling()) {
 
@@ -324,16 +324,16 @@ FileType * FileCreatePart::getEnabledType(const TQString & ex, const TQString su
   return NULL;
 }
 
-// TDevFileCreate interface
+// KDevFileCreate interface
 
-TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString dir, TQString name, TQString subtype)
+KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString dir, TQString name, TQString subtype)
 {
-  TDevCreateFile::CreatedFile result;
+  KDevCreateFile::CreatedFile result;
 
   KURL projectURL;
   if ( !project() )
   {
-    //result.status = TDevCreateFile::CreatedFile::STATUS_NOTCREATED;
+    //result.status = KDevCreateFile::CreatedFile::STATUS_NOTCREATED;
     //return result;
   }
   else
@@ -373,7 +373,7 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
   int dialogResult = dialog.exec();
 
   if (dialogResult == KDialogBase::Rejected) {
-    result.status = TDevCreateFile::CreatedFile::STATUS_CANCELED;
+    result.status = KDevCreateFile::CreatedFile::STATUS_CANCELED;
     return result;
   }
 
@@ -383,8 +383,8 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
   selectedURL = dialog.url();
   const FileType *selectedFileType = dialog.selectedType();
 
-  if (dialog.addToProject() && !projectURL.isParentOf(selectedURL) && !(project()->options() & TDevProject::UsesTQMakeBuildSystem) ) {
-    result.status = TDevCreateFile::CreatedFile::STATUS_NOTWITHINPROJECT;
+  if (dialog.addToProject() && !projectURL.isParentOf(selectedURL) && !(project()->options() & KDevProject::UsesTQMakeBuildSystem) ) {
+    result.status = KDevCreateFile::CreatedFile::STATUS_NOTWITHINPROJECT;
     return result;
   }
 
@@ -416,7 +416,7 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
   }
   if (!created)
   {
-      result.status = TDevCreateFile::CreatedFile::STATUS_NOTCREATED;
+      result.status = KDevCreateFile::CreatedFile::STATUS_NOTCREATED;
       return result;
   }
 
@@ -425,7 +425,7 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
     // work out the path relative to the project directory
 //    TQString relToProj = URLUtil::relativePath(projectURL, selectedURL, URLUtil::SLASH_PREFIX );
 	  TQString relToProj;
-	  if( project()->options() & TDevProject::UsesTQMakeBuildSystem )
+	  if( project()->options() & KDevProject::UsesTQMakeBuildSystem )
 	  {
 		relToProj = URLUtil::relativePathToFile( project()->projectDirectory(), fullPath );
 		  project()->addFile(relToProj);
@@ -445,7 +445,7 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
 
   result.filename = fileName;
   result.dir = URLUtil::directory(fullPath);
-  result.status = TDevCreateFile::CreatedFile::STATUS_OK;
+  result.status = KDevCreateFile::CreatedFile::STATUS_OK;
 
   return result;
 }
@@ -464,7 +464,7 @@ void FileCreatePart::slotInitialize( )
 
   // read in which global templates are to be used for this project
   TQDomElement useGlobalTypes =
-    DomUtil::elementByPath(*projectDom(),"/tdevfilecreate/useglobaltypes");
+    DomUtil::elementByPath(*projectDom(),"/kdevfilecreate/useglobaltypes");
   for(TQDomNode node = useGlobalTypes.firstChild();
       !node.isNull();node=node.nextSibling()) {
 
@@ -524,7 +524,7 @@ TQString FileCreatePart::findGlobalXMLFile() const
 {
   int version = 0;
   TQString filename;
-  TQStringList filenames = TDEGlobal::instance()->dirs()->findAllResources("data", "tdevfilecreate/template-info.xml");
+  TQStringList filenames = TDEGlobal::instance()->dirs()->findAllResources("data", "kdevfilecreate/template-info.xml");
   for( TQStringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it )
   {
     TQDomDocument globalDom;
diff --git a/parts/filecreate/filecreate_part.h b/parts/filecreate/filecreate_part.h
index 0b6e5a01..9d090493 100644
--- a/parts/filecreate/filecreate_part.h
+++ b/parts/filecreate/filecreate_part.h
@@ -10,16 +10,16 @@
 
 
 
-#ifndef __TDEVPART_FILECREATE_H__
-#define __TDEVPART_FILECREATE_H__
+#ifndef __KDEVPART_FILECREATE_H__
+#define __KDEVPART_FILECREATE_H__
 
 
 #include <tqguardedptr.h>
 #include <tqptrlist.h>
 
 #include <tqwidget.h>
-#include <tdevplugin.h>
-#include <tdevcreatefile.h>
+#include <kdevplugin.h>
+#include <kdevcreatefile.h>
 
 #include "filecreate_typechooser.h"
 
@@ -36,7 +36,7 @@ class ConfigWidgetProxy;
 
 using namespace FileCreate;
 
-class FileCreatePart : public TDevCreateFile
+class FileCreatePart : public KDevCreateFile
 {
   Q_OBJECT
   
@@ -57,7 +57,7 @@ public:
    * The user will be prompted as necessary for the missing information, and the
    * file created, and added to the project as necessary.
    */
-  virtual TDevCreateFile::CreatedFile createNewFile(TQString ext = TQString(),
+  virtual KDevCreateFile::CreatedFile createNewFile(TQString ext = TQString(),
                      TQString dir = TQString(),
                      TQString name = TQString(),
                      TQString subtype = TQString());
@@ -106,7 +106,7 @@ private:
   /**
    * If a file has been successfully created, open it
    */
-  void openCreatedFile(const TDevCreateFile::CreatedFile & createdFile);
+  void openCreatedFile(const KDevCreateFile::CreatedFile & createdFile);
 
   /**
    * Reads in file type definitions from a config DOM and adds them
diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp
index d57fbf48..4638725c 100644
--- a/parts/filecreate/filecreate_widget2.cpp
+++ b/parts/filecreate/filecreate_widget2.cpp
@@ -19,9 +19,9 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 
-#include <tdevcore.h>
+#include <kdevcore.h>
 
-#include "tdevproject.h"
+#include "kdevproject.h"
 #include "filecreate_part.h"
 #include "filecreate_widget2.h"
 #include "filecreate_filetype.h"
diff --git a/parts/filecreate/filecreate_widget2.h b/parts/filecreate/filecreate_widget2.h
index 3e4df801..217d37ce 100644
--- a/parts/filecreate/filecreate_widget2.h
+++ b/parts/filecreate/filecreate_widget2.h
@@ -21,7 +21,7 @@
 #include "filecreate_typechooser.h"
 
 class TDEIconLoader;
-class TDevProject;
+class KDevProject;
 class FileCreatePart;
 
 namespace FileCreate {
diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp
index e541038c..caf1ac74 100644
--- a/parts/filecreate/filecreate_widget3.cpp
+++ b/parts/filecreate/filecreate_widget3.cpp
@@ -18,11 +18,11 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <tdevcore.h>
+#include <kdevcore.h>
 
 #include "filecreate_widget3.h"
 
-#include "tdevproject.h"
+#include "kdevproject.h"
 #include "filecreate_part.h"
 #include "filecreate_filetype.h"
 #include "filecreate_listitem.h"
@@ -30,7 +30,7 @@
 namespace FileCreate {
 
   ListWidget::ListWidget(FileCreatePart *part)
-    : TDEListView(0, "TDevFileCreate"), TypeChooser(part)
+    : TDEListView(0, "KDevFileCreate"), TypeChooser(part)
   {
     setIcon( SmallIcon("filenew2") );
     setCaption(i18n("File Create"));
diff --git a/parts/filecreate/filecreate_widget3.h b/parts/filecreate/filecreate_widget3.h
index 244bf78d..ac8b866e 100644
--- a/parts/filecreate/filecreate_widget3.h
+++ b/parts/filecreate/filecreate_widget3.h
@@ -19,7 +19,7 @@
 
 #include "filecreate_typechooser.h"
 
-class TDevProject;
+class KDevProject;
 class FileCreatePart;
 class TQResizeEvent;
 
diff --git a/parts/filecreate/tdevfilecreate.desktop b/parts/filecreate/kdevfilecreate.desktop
index d9accc3c..1861090d 100644
--- a/parts/filecreate/tdevfilecreate.desktop
+++ b/parts/filecreate/kdevfilecreate.desktop
@@ -30,7 +30,7 @@ Comment[ta]= கோப்பு உருவாக்கப்பட்டது
 Comment[tg]=Устои бунёд кардани файлҳо
 Comment[zh_CN]=文件创建
 Comment[zh_TW]=檔案建立
-Name=TDevFileCreate
+Name=KDevFileCreate
 Name[da]=TDevelop filoprettelse
 Name[de]=Dateierstellungs-Komponente (TDevelop)
 Name[hi]=के-डेव-फ़ाइल-क्रिएट
@@ -71,7 +71,7 @@ GenericName[zh_CN]=文件创建
 GenericName[zh_TW]=檔案建立
 Icon=wizard
 ServiceTypes=TDevelop/CreateFile
-X-TDE-Library=libtdevfilecreate
+X-TDE-Library=libkdevfilecreate
 X-TDevelop-Version=5
 X-TDevelop-Properties=FileCreation
 X-TDevelop-Scope=Core
diff --git a/parts/filecreate/tdevpart_filecreate.rc b/parts/filecreate/kdevpart_filecreate.rc
index 09a293ee..401a1378 100644
--- a/parts/filecreate/tdevpart_filecreate.rc
+++ b/parts/filecreate/kdevpart_filecreate.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="TDevFileCreate" library="libfilecreateplugin" version="3">
+<kpartplugin name="KDevFileCreate" library="libfilecreateplugin" version="3">
 <MenuBar>
  <Menu name="file">
     <Action name="file_new" group="new_merge" />
diff --git a/parts/filecreate/template-info.xml b/parts/filecreate/template-info.xml
index 9afd9825..664fa376 100644
--- a/parts/filecreate/template-info.xml
+++ b/parts/filecreate/template-info.xml
@@ -1,6 +1,6 @@
 <?xml version = '1.0'?>
 <tdevelop version="1">
-  <tdevfilecreate>
+  <kdevfilecreate>
     <sidetab active="no">
     </sidetab>
     <filetypes>
@@ -177,5 +177,5 @@
         <descr>A new empty Qt Linguist translation source file.</descr>
       </type>
     </filetypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/filelist/CMakeLists.txt b/parts/filelist/CMakeLists.txt
index 7feb3ae1..ac227b5e 100644
--- a/parts/filelist/CMakeLists.txt
+++ b/parts/filelist/CMakeLists.txt
@@ -26,13 +26,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevfilelist.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevfilelist.rc DESTINATION ${DATA_INSTALL_DIR}/tdevfilelist )
+install( FILES kdevfilelist.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevfilelist.rc DESTINATION ${DATA_INSTALL_DIR}/kdevfilelist )
 
 
-##### libtdevfilelist (module) ##################
+##### libkdevfilelist (module) ##################
 
-tde_add_kpart( libtdevfilelist AUTOMOC
+tde_add_kpart( libkdevfilelist AUTOMOC
   SOURCES
     filelist_widget.cpp filelist_item.cpp
     projectviewprojectconfigbase.ui
diff --git a/parts/filelist/Makefile.am b/parts/filelist/Makefile.am
index 8652a240..83e36d19 100644
--- a/parts/filelist/Makefile.am
+++ b/parts/filelist/Makefile.am
@@ -1,20 +1,20 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevfilelist.la
-libtdevfilelist_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevfilelist_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevfilelist.la
+libkdevfilelist_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevfilelist_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevfilelist_la_SOURCES = filelist_widget.cpp filelist_item.cpp \
+libkdevfilelist_la_SOURCES = filelist_widget.cpp filelist_item.cpp \
 			projectviewprojectconfigbase.ui projectviewprojectconfig.cpp projectviewpart.cpp toolbarguibuilder.cpp \
 	projectviewconfigbase.ui projectviewconfig.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevfilelist.desktop
+service_DATA = kdevfilelist.desktop
 
-rcdir = $(kde_datadir)/tdevfilelist
+rcdir = $(kde_datadir)/kdevfilelist
 
 noinst_HEADERS = filelist_item.h filelist_widget.h projectviewprojectconfig.h \
 				projectviewpart.h toolbarguibuilder.h projectviewconfig.h fileinfo.h
-rc_DATA = tdevfilelist.rc
+rc_DATA = kdevfilelist.rc
diff --git a/parts/filelist/filelist_item.h b/parts/filelist/filelist_item.h
index 2d9322c9..6b88b09e 100644
--- a/parts/filelist/filelist_item.h
+++ b/parts/filelist/filelist_item.h
@@ -18,7 +18,7 @@
 
 #include <kurl.h>
 
-#include <tdevpartcontroller.h>
+#include <kdevpartcontroller.h>
 
 class FileListItem : public TQListViewItem
 {
diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp
index 4b0b2b48..2e415dcd 100644
--- a/parts/filelist/filelist_widget.cpp
+++ b/parts/filelist/filelist_widget.cpp
@@ -21,8 +21,8 @@
 #include <tdelocale.h>
 #include <tdepopupmenu.h>
 
-#include <tdevcore.h>
-#include <tdevpartcontroller.h>
+#include <kdevcore.h>
+#include <kdevpartcontroller.h>
 
 #include "projectviewpart.h"
 #include "filelist_widget.h"
diff --git a/parts/filelist/filelist_widget.h b/parts/filelist/filelist_widget.h
index f1b4de97..b582a309 100644
--- a/parts/filelist/filelist_widget.h
+++ b/parts/filelist/filelist_widget.h
@@ -17,7 +17,7 @@
 
 #include <tdelistview.h>
 #include <kurl.h>
-#include <tdevpartcontroller.h> // for DocumentState
+#include <kdevpartcontroller.h> // for DocumentState
 
 #include <tqstring.h>
 #include <tqtooltip.h>
@@ -25,7 +25,7 @@
 
 #include "projectviewpart.h"
 		 
-class TDevProject;
+class KDevProject;
 class FileListItem;
 
 namespace KParts { class Part; }
diff --git a/parts/filelist/tdevfilelist.desktop b/parts/filelist/kdevfilelist.desktop
index 17a20ad6..da37f14b 100644
--- a/parts/filelist/tdevfilelist.desktop
+++ b/parts/filelist/kdevfilelist.desktop
@@ -71,6 +71,6 @@ GenericName[zh_TW]=檔案列表
 Icon=tdevelop
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Global
-X-TDE-Library=libtdevfilelist
+X-TDE-Library=libkdevfilelist
 X-TDevelop-Version=5
 X-TDevelop-Properties=OpenFileNavigation
diff --git a/parts/filelist/tdevfilelist.rc b/parts/filelist/kdevfilelist.rc
index 5ab5de7c..5ab5de7c 100644
--- a/parts/filelist/tdevfilelist.rc
+++ b/parts/filelist/kdevfilelist.rc
diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp
index 76f0c102..517d2f98 100644
--- a/parts/filelist/projectviewpart.cpp
+++ b/parts/filelist/projectviewpart.cpp
@@ -51,28 +51,28 @@
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 
-#include <tdevplugininfo.h>
-#include <tdevgenericfactory.h>
-#include <tdevpartcontroller.h>
-#include <tdevproject.h>
-#include <tdevcore.h>
-#include <tdevmainwindow.h>
+#include <kdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevpartcontroller.h>
+#include <kdevproject.h>
+#include <kdevcore.h>
+#include <kdevmainwindow.h>
 #include <configwidgetproxy.h>
 
 
 
-typedef TDevGenericFactory<ProjectviewPart> projectviewFactory;
-TDevPluginInfo data("tdevfilelist");
-K_EXPORT_COMPONENT_FACTORY(libtdevfilelist, projectviewFactory(data))
+typedef KDevGenericFactory<ProjectviewPart> projectviewFactory;
+KDevPluginInfo data("kdevfilelist");
+K_EXPORT_COMPONENT_FACTORY(libkdevfilelist, projectviewFactory(data))
 
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
 ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-    : TDevPlugin(&data, parent, name ? name : "FileListPart")
+    : KDevPlugin(&data, parent, name ? name : "FileListPart")
 {
     setInstance(projectviewFactory::instance());
-    setXMLFile("tdevfilelist.rc");
+    setXMLFile("kdevfilelist.rc");
     setupActions();
     
     m_configProxy = new ConfigWidgetProxy(core());
diff --git a/parts/filelist/projectviewpart.h b/parts/filelist/projectviewpart.h
index 72c6efcd..392a9cdf 100644
--- a/parts/filelist/projectviewpart.h
+++ b/parts/filelist/projectviewpart.h
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#ifndef TDEVPROJECTVIEW_H
-#define TDEVPROJECTVIEW_H
+#ifndef KDEVPROJECTVIEW_H
+#define KDEVPROJECTVIEW_H
 
 #include "fileinfo.h" 
 
@@ -27,7 +27,7 @@
 #include <tqmap.h>
 #include <tqguardedptr.h>
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 #include <kurl.h>
 
 
@@ -53,7 +53,7 @@ this is a reimplementation of the project views in Quanta
 @TODO save html parts too
 FIXME at project open I get the default view and the open files at last close
 */
-class ProjectviewPart: public TDevPlugin
+class ProjectviewPart: public KDevPlugin
 {
   Q_OBJECT
   
@@ -66,7 +66,7 @@ public:
   ProjectviewPart(TQObject *parent, const char *name, const TQStringList &args);
   ~ProjectviewPart();
   
-  // reimplemented from TDevPlugin
+  // reimplemented from KDevPlugin
   void restorePartialProjectSession(const TQDomElement * el);
   void savePartialProjectSession(TQDomElement * el);
   
diff --git a/parts/fileselector/CMakeLists.txt b/parts/fileselector/CMakeLists.txt
index b310f791..8f18792e 100644
--- a/parts/fileselector/CMakeLists.txt
+++ b/parts/fileselector/CMakeLists.txt
@@ -27,12 +27,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevfileselector.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevfileselector.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevfileselector (module) ##############
+##### libkdevfileselector (module) ##############
 
-tde_add_kpart( libtdevfileselector AUTOMOC
+tde_add_kpart( libkdevfileselector AUTOMOC
   SOURCES
     fileselector_part.cpp fileselector_widget.cpp
     tdeactionselector.cpp kbookmarkhandler.cpp
diff --git a/parts/fileselector/Makefile.am b/parts/fileselector/Makefile.am
index 43ee404b..f0c2fc35 100644
--- a/parts/fileselector/Makefile.am
+++ b/parts/fileselector/Makefile.am
@@ -2,17 +2,17 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/sourceinfo $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevfileselector.la
-libtdevfileselector_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevfileselector_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevfileselector.la
+libkdevfileselector_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevfileselector_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevfileselector_la_SOURCES = fileselector_part.cpp fileselector_widget.cpp tdeactionselector.cpp kbookmarkhandler.cpp
+libkdevfileselector_la_SOURCES = fileselector_part.cpp fileselector_widget.cpp tdeactionselector.cpp kbookmarkhandler.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevfileselector.desktop
+service_DATA = kdevfileselector.desktop
 
 # not used currently
-#rcdir = $(kde_datadir)/tdevfileselector
-#rc_DATA = tdevfileselector.rc
+#rcdir = $(kde_datadir)/kdevfileselector
+#rc_DATA = kdevfileselector.rc
diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp
index 331bb639..a6b4a6bb 100644
--- a/parts/fileselector/fileselector_part.cpp
+++ b/parts/fileselector/fileselector_part.cpp
@@ -13,33 +13,33 @@
 #include <ktextbrowser.h>
 #include <tdeconfig.h>
 #include <tdefileitem.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdediroperator.h>
 #include <kdialogbase.h>
 #include <tdemessagebox.h>
 
-#include <tdevapi.h>
-#include <tdevcore.h>
-#include <tdevproject.h>
-#include <tdevmainwindow.h>
-#include <tdevpartcontroller.h>
-#include <tdevplugininfo.h>
-#include <tdevcreatefile.h>
+#include <kdevapi.h>
+#include <kdevcore.h>
+#include <kdevproject.h>
+#include <kdevmainwindow.h>
+#include <kdevpartcontroller.h>
+#include <kdevplugininfo.h>
+#include <kdevcreatefile.h>
 
 #include <ktip.h>
 
 #include "fileselector_widget.h"
 
-typedef TDevGenericFactory<FileSelectorPart> FileSelectorFactory;
-static const TDevPluginInfo data("tdevfileselector");
-K_EXPORT_COMPONENT_FACTORY( libtdevfileselector, FileSelectorFactory( data ) )
+typedef KDevGenericFactory<FileSelectorPart> FileSelectorFactory;
+static const KDevPluginInfo data("kdevfileselector");
+K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( data ) )
 
 FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQStringList &)
-    : TDevPlugin(&data, parent, name ? name : "FileSelectorPart")
+    : KDevPlugin(&data, parent, name ? name : "FileSelectorPart")
 {
     setInstance(FileSelectorFactory::instance());
 
-    m_filetree = new TDevFileSelector( this, mainWindow(), partController(), 0, "fileselectorwidget" );
+    m_filetree = new KDevFileSelector( this, mainWindow(), partController(), 0, "fileselectorwidget" );
 
     connect( m_filetree->dirOperator(), TQT_SIGNAL(fileSelected(const KFileItem*)),
 	     this, TQT_SLOT(fileSelected(const KFileItem*)));
@@ -63,7 +63,7 @@ FileSelectorPart::~FileSelectorPart()
 	mainWindow()->removeView( m_filetree );
     }
 
-    delete (TDevFileSelector*) m_filetree;
+    delete (KDevFileSelector*) m_filetree;
 }
 
 void FileSelectorPart::fileSelected( const KFileItem * file )
@@ -90,14 +90,14 @@ void FileSelectorPart::slotConfigWidget( KDialogBase * dlg )
 
 void FileSelectorPart::newFile()
 {
-    TDevCreateFile *creator = extension<TDevCreateFile>("TDevelop/CreateFile");
+    KDevCreateFile *creator = extension<KDevCreateFile>("TDevelop/CreateFile");
     if (creator)
     {
-        TDevCreateFile::CreatedFile file = creator->createNewFile("",
+        KDevCreateFile::CreatedFile file = creator->createNewFile("",
             m_filetree->dirOperator()->url().path());
-        if (file.status == TDevCreateFile::CreatedFile::STATUS_NOTCREATED)
+        if (file.status == KDevCreateFile::CreatedFile::STATUS_NOTCREATED)
             KMessageBox::error(0, i18n("Cannot create file. Check whether the directory and filename are valid."));
-        else if (file.status != TDevCreateFile::CreatedFile::STATUS_CANCELED)
+        else if (file.status != KDevCreateFile::CreatedFile::STATUS_CANCELED)
         {
             partController()->editDocument(KURL::fromPathOrURL(
                 file.dir + "/" + file.filename));
diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h
index 80841deb..f415444d 100644
--- a/parts/fileselector/fileselector_part.h
+++ b/parts/fileselector/fileselector_part.h
@@ -1,17 +1,17 @@
-#ifndef __TDEVPART_FILESELECTOR_H__
-#define __TDEVPART_FILESELECTOR_H__
+#ifndef __KDEVPART_FILESELECTOR_H__
+#define __KDEVPART_FILESELECTOR_H__
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 #include <kdialogbase.h>
 #include <tdefileitem.h>
 
 #include <tqguardedptr.h>
 
-class TDevFileSelector;
+class KDevFileSelector;
 class KDialogBase;
 
-class FileSelectorPart : public TDevPlugin
+class FileSelectorPart : public KDevPlugin
 {
     Q_OBJECT
   
@@ -33,7 +33,7 @@ private slots:
     void slotConfigWidget( KDialogBase * );
 
 private:
-    TQGuardedPtr<TDevFileSelector> m_filetree;
+    TQGuardedPtr<KDevFileSelector> m_filetree;
     TDEAction *m_newFileAction;
 };
 
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index 1d6fb154..894bf185 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -26,9 +26,9 @@
 #include "tdeactionselector.h"
 #include "kbookmarkhandler.h"
 
-#include <tdevcore.h>
-#include <tdevmainwindow.h>
-#include <tdevpartcontroller.h>
+#include <kdevcore.h>
+#include <kdevmainwindow.h>
+#include <kdevpartcontroller.h>
 
 #include <tqlayout.h>
 #include <tqtoolbutton.h>
@@ -76,32 +76,32 @@ static void silenceTQToolBar(TQtMsgType, const char *)
 {}
 
 
-TDevFileSelectorToolBar::TDevFileSelectorToolBar(TQWidget *parent)
+KDevFileSelectorToolBar::KDevFileSelectorToolBar(TQWidget *parent)
         : TDEToolBar( parent, "KDev FileSelector Toolbar", true )
 {
     setMinimumWidth(10);
 }
 
-TDevFileSelectorToolBar::~TDevFileSelectorToolBar()
+KDevFileSelectorToolBar::~KDevFileSelectorToolBar()
 {}
 
-void TDevFileSelectorToolBar::setMovingEnabled( bool)
+void KDevFileSelectorToolBar::setMovingEnabled( bool)
 {
     TDEToolBar::setMovingEnabled(false);
 }
 
 
-TDevFileSelectorToolBarParent::TDevFileSelectorToolBarParent(TQWidget *parent)
+KDevFileSelectorToolBarParent::KDevFileSelectorToolBarParent(TQWidget *parent)
         :TQFrame(parent),m_tb(0)
 {}
-TDevFileSelectorToolBarParent::~TDevFileSelectorToolBarParent()
+KDevFileSelectorToolBarParent::~KDevFileSelectorToolBarParent()
 {}
-void TDevFileSelectorToolBarParent::setToolBar(TDevFileSelectorToolBar *tb)
+void KDevFileSelectorToolBarParent::setToolBar(KDevFileSelectorToolBar *tb)
 {
     m_tb=tb;
 }
 
-void TDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
+void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
 {
     if (m_tb)
     {
@@ -113,8 +113,8 @@ void TDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
 
 //BEGIN Constructor/destructor
 
-TDevFileSelector::TDevFileSelector( FileSelectorPart *part, TDevMainWindow *mainWindow,
-                                    TDevPartController *partController,
+KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow,
+                                    KDevPartController *partController,
                                     TQWidget * parent, const char * name )
         : TQWidget(parent, name),
         m_part(part),
@@ -127,8 +127,8 @@ TDevFileSelector::TDevFileSelector( FileSelectorPart *part, TDevMainWindow *main
 
     TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar );
 
-    TDevFileSelectorToolBarParent *tbp=new TDevFileSelectorToolBarParent(this);
-    toolbar = new TDevFileSelectorToolBar(tbp);
+    KDevFileSelectorToolBarParent *tbp=new KDevFileSelectorToolBarParent(this);
+    toolbar = new KDevFileSelectorToolBar(tbp);
     tbp->setToolBar(toolbar);
     lo->addWidget(tbp);
     toolbar->setMovingEnabled(false);
@@ -142,7 +142,7 @@ TDevFileSelector::TDevFileSelector( FileSelectorPart *part, TDevMainWindow *main
     lo->addWidget(cmbPath);
     cmbPath->listBox()->installEventFilter( this );
 
-    dir = new TDevDirOperator(m_part, KURL(), this, "operator");
+    dir = new KDevDirOperator(m_part, KURL(), this, "operator");
     dir->setView(KFile::/*Simple*/Detail);
 
     TDEActionCollection *coll = dir->actionCollection();
@@ -229,7 +229,7 @@ TDevFileSelector::TDevFileSelector( FileSelectorPart *part, TDevMainWindow *main
                      "reapplies the last filter used when toggled on.") );
 }
 
-TDevFileSelector::~TDevFileSelector()
+KDevFileSelector::~KDevFileSelector()
 {
 	writeConfig( m_part->instance()->config(), "fileselector" );
 }
@@ -237,7 +237,7 @@ TDevFileSelector::~TDevFileSelector()
 
 //BEGIN Public Methods
 
-void TDevFileSelector::readConfig(TDEConfig *config, const TQString & name)
+void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name)
 {
     dir->readConfig(config, name + ":dir");
     dir->setView( KFile::Default );
@@ -283,12 +283,12 @@ void TDevFileSelector::readConfig(TDEConfig *config, const TQString & name)
 
 }
 
-void TDevFileSelector::initialDirChangeHack()
+void KDevFileSelector::initialDirChangeHack()
 {
     setDir( waitingDir );
 }
 
-void TDevFileSelector::setupToolbar( TDEConfig *config )
+void KDevFileSelector::setupToolbar( TDEConfig *config )
 {
     toolbar->clear();
     TQStringList tbactions = config->readListEntry( "toolbar actions", ',' );
@@ -311,7 +311,7 @@ void TDevFileSelector::setupToolbar( TDEConfig *config )
     }
 }
 
-void TDevFileSelector::writeConfig(TDEConfig *config, const TQString & name)
+void KDevFileSelector::writeConfig(TDEConfig *config, const TQString & name)
 {
     dir->writeConfig(config,name + ":dir");
 
@@ -332,7 +332,7 @@ void TDevFileSelector::writeConfig(TDEConfig *config, const TQString & name)
     config->writeEntry( "AutoSyncEvents", autoSyncEvents );
 }
 
-void TDevFileSelector::setView(KFile::FileView view)
+void KDevFileSelector::setView(KFile::FileView view)
 {
     dir->setView(view);
 }
@@ -341,7 +341,7 @@ void TDevFileSelector::setView(KFile::FileView view)
 
 //BEGIN Public Slots
 
-void TDevFileSelector::slotFilterChange( const TQString & nf )
+void KDevFileSelector::slotFilterChange( const TQString & nf )
 {
     TQToolTip::remove( btnFilter );
     TQString f = nf.stripWhiteSpace();
@@ -371,7 +371,7 @@ void TDevFileSelector::slotFilterChange( const TQString & nf )
     btnFilter->setEnabled( !( empty && lastFilter.isEmpty() ) );
 
 }
-void TDevFileSelector::setDir( KURL u )
+void KDevFileSelector::setDir( KURL u )
 {
     dir->setURL(u, true);
 }
@@ -380,12 +380,12 @@ void TDevFileSelector::setDir( KURL u )
 
 //BEGIN Private Slots
 
-void TDevFileSelector::cmbPathActivated( const KURL& u )
+void KDevFileSelector::cmbPathActivated( const KURL& u )
 {
     cmbPathReturnPressed( u.url() );
 }
 
-void TDevFileSelector::cmbPathReturnPressed( const TQString& u )
+void KDevFileSelector::cmbPathReturnPressed( const TQString& u )
 {
     TQStringList urls = cmbPath->urls();
     urls.remove( u );
@@ -395,12 +395,12 @@ void TDevFileSelector::cmbPathReturnPressed( const TQString& u )
     dir->setURL( KURL(u), true );
 }
 
-void TDevFileSelector::dirUrlEntered( const KURL& u )
+void KDevFileSelector::dirUrlEntered( const KURL& u )
 {
     cmbPath->setURL( u );
 }
 
-void TDevFileSelector::dirFinishedLoading()
+void KDevFileSelector::dirFinishedLoading()
 {}
 
 
@@ -411,7 +411,7 @@ void TDevFileSelector::dirFinishedLoading()
    If on:
    Set last filter.
 */
-void TDevFileSelector::btnFilterClick()
+void KDevFileSelector::btnFilterClick()
 {
     if ( !btnFilter->isOn() )
     {
@@ -425,9 +425,9 @@ void TDevFileSelector::btnFilterClick()
 }
 
 
-void TDevFileSelector::autoSync()
+void KDevFileSelector::autoSync()
 {
-    kdDebug()<<"TDevFileSelector::autoSync()"<<endl;
+    kdDebug()<<"KDevFileSelector::autoSync()"<<endl;
     // if visible, sync
     if ( isVisible() )
     {
@@ -443,14 +443,14 @@ void TDevFileSelector::autoSync()
     }
 }
 
-void TDevFileSelector::autoSync( KParts::Part *part )
+void KDevFileSelector::autoSync( KParts::Part *part )
 {
     KTextEditor::Document* doc = dynamic_cast<KTextEditor::Document*>( part );
     if( !doc )
 	return;
 
     // as above, but using document url.
-    kdDebug()<<"TDevFileSelector::autoSync( KTextEditor::Document )"<<endl;
+    kdDebug()<<"KDevFileSelector::autoSync( KTextEditor::Document )"<<endl;
     KURL u ( doc->url() );
     if ( u.isEmpty() )
     {
@@ -468,15 +468,15 @@ void TDevFileSelector::autoSync( KParts::Part *part )
     }
 }
 /// \FIXME crash on shutdown
-void TDevFileSelector::setActiveDocumentDir()
+void KDevFileSelector::setActiveDocumentDir()
 {
-    //kdDebug()<<"TDevFileSelector::setActiveDocumentDir()"<<endl;
+    //kdDebug()<<"KDevFileSelector::setActiveDocumentDir()"<<endl;
     KURL u = activeDocumentUrl();
     if (!u.isEmpty())
         setDir( u.upURL() );
 }
 
-void TDevFileSelector::viewChanged()
+void KDevFileSelector::viewChanged()
 {
     /// @todo make sure the button is disabled if the directory is unreadable, eg
     ///       the document URL has protocol http
@@ -487,12 +487,12 @@ void TDevFileSelector::viewChanged()
 
 //BEGIN Protected
 
-void TDevFileSelector::focusInEvent( TQFocusEvent * )
+void KDevFileSelector::focusInEvent( TQFocusEvent * )
 {
     dir->setFocus();
 }
 
-void TDevFileSelector::showEvent( TQShowEvent * )
+void KDevFileSelector::showEvent( TQShowEvent * )
 {
     // sync if we should
     if ( autoSyncEvents & GotVisible )
@@ -509,7 +509,7 @@ void TDevFileSelector::showEvent( TQShowEvent * )
     }
 }
 
-bool TDevFileSelector::eventFilter( TQObject* o, TQEvent *e )
+bool KDevFileSelector::eventFilter( TQObject* o, TQEvent *e )
 {
     /*
         This is rather unfortunate, but:
@@ -559,7 +559,7 @@ private:
     TQString _str;
 };
 
-KURL TDevFileSelector::activeDocumentUrl( )
+KURL KDevFileSelector::activeDocumentUrl( )
 {
 	KParts::ReadOnlyPart * part = dynamic_cast<KParts::ReadOnlyPart*>( partController->activePart() );
 	if ( part )
@@ -575,7 +575,7 @@ KURL TDevFileSelector::activeDocumentUrl( )
 ////////////////////////////////////////////////////////////////////////////////
 // KFSConfigPage implementation
 ////////////////////////////////////////////////////////////////////////////////
-KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, TDevFileSelector *kfs )
+KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelector *kfs )
         : TQWidget( parent, name ),
         fileSelector( kfs ),
         bDirty( false )
@@ -706,20 +706,20 @@ void KFSConfigPage::apply()
     // sync
     int s = 0;
     if ( cbSyncActive->isChecked() )
-        s |= TDevFileSelector::DocumentChanged;
+        s |= KDevFileSelector::DocumentChanged;
     if ( cbSyncOpen->isChecked() )
-        s |= TDevFileSelector::DocumentOpened;
+        s |= KDevFileSelector::DocumentOpened;
     if ( cbSyncShow->isChecked() )
-        s |= TDevFileSelector::GotVisible;
+        s |= KDevFileSelector::GotVisible;
     fileSelector->autoSyncEvents = s;
     // reset connections
     disconnect( fileSelector->partController, 0, fileSelector, TQT_SLOT( autoSync() ) );
     disconnect( fileSelector->partController, 0,
                 fileSelector, TQT_SLOT( autoSync( KParts::Part *) ) );
-    if ( s & TDevFileSelector::DocumentChanged )
+    if ( s & KDevFileSelector::DocumentChanged )
         connect( fileSelector->partController, TQT_SIGNAL( viewChanged() ),
                  fileSelector, TQT_SLOT( autoSync() ) );
-    if ( s & TDevFileSelector::DocumentOpened )
+    if ( s & KDevFileSelector::DocumentOpened )
         connect( fileSelector->partController,
                  TQT_SIGNAL( partAdded(KParts::Part *) ),
                  fileSelector, TQT_SLOT( autoSync(KParts::Part *) ) );
@@ -773,9 +773,9 @@ void KFSConfigPage::init()
 
     // sync
     int s = fileSelector->autoSyncEvents;
-    cbSyncActive->setChecked( s & TDevFileSelector::DocumentChanged );
-    cbSyncOpen->setChecked( s & TDevFileSelector::DocumentOpened );
-    cbSyncShow->setChecked( s & TDevFileSelector::GotVisible );
+    cbSyncActive->setChecked( s & KDevFileSelector::DocumentChanged );
+    cbSyncOpen->setChecked( s & KDevFileSelector::DocumentOpened );
+    cbSyncShow->setChecked( s & KDevFileSelector::GotVisible );
     // histories
     sbPathHistLength->setValue( fileSelector->cmbPath->maxItems() );
     sbFilterHistLength->setValue( fileSelector->filter->maxCount() );
@@ -791,9 +791,9 @@ void KFSConfigPage::slotChanged()
 //END KFSConfigPage
 
 
-//BEGIN TDevDirOperator
+//BEGIN KDevDirOperator
 
-void TDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos )
+void KDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos )
 {
     setupMenu();
     updateSelectionDependentActions();
@@ -816,6 +816,6 @@ void TDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos )
     popup->popup(pos);
 }
 
-//END TDevDirOperator
+//END KDevDirOperator
 
 #include "fileselector_widget.moc"
diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h
index 1c30eadd..ef64f88c 100644
--- a/parts/fileselector/fileselector_widget.h
+++ b/parts/fileselector/fileselector_widget.h
@@ -29,8 +29,8 @@
 #include <tqframe.h>
 #include <tdediroperator.h>
 
-class TDevMainWindow;
-class TDevPartController;
+class KDevMainWindow;
+class KDevPartController;
 class FileSelectorPart;
 class TDEActionCollection;
 class TDEActionSelector;
@@ -57,39 +57,39 @@ namespace KTextEditor
 */
 
 /* I think this fix for not moving toolbars is better */
-class TDevFileSelectorToolBar: public TDEToolBar
+class KDevFileSelectorToolBar: public TDEToolBar
 {
     Q_OBJECT
   
 public:
-    TDevFileSelectorToolBar(TQWidget *parent);
-    virtual ~TDevFileSelectorToolBar();
+    KDevFileSelectorToolBar(TQWidget *parent);
+    virtual ~KDevFileSelectorToolBar();
 
     virtual void setMovingEnabled( bool b );
 };
 
-class TDevFileSelectorToolBarParent: public TQFrame
+class KDevFileSelectorToolBarParent: public TQFrame
 {
     Q_OBJECT
   
 public:
-    TDevFileSelectorToolBarParent(TQWidget *parent);
-    ~TDevFileSelectorToolBarParent();
-    void setToolBar(TDevFileSelectorToolBar *tb);
+    KDevFileSelectorToolBarParent(TQWidget *parent);
+    ~KDevFileSelectorToolBarParent();
+    void setToolBar(KDevFileSelectorToolBar *tb);
 
 private:
-    TDevFileSelectorToolBar *m_tb;
+    KDevFileSelectorToolBar *m_tb;
 
 protected:
     virtual void resizeEvent ( TQResizeEvent * );
 };
 
-class TDevDirOperator: public KDirOperator
+class KDevDirOperator: public KDirOperator
 {
     Q_OBJECT
   
 public:
-    TDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0)
+    KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0)
         :KDirOperator(urlName, parent, name), m_part(part)
     {
     }
@@ -101,7 +101,7 @@ private:
     FileSelectorPart *m_part;
 };
 
-class TDevFileSelector : public TQWidget
+class KDevFileSelector : public TQWidget
 {
     Q_OBJECT
   
@@ -112,15 +112,15 @@ public:
     /* When to sync to current document directory */
     enum AutoSyncEvent { DocumentChanged=1, DocumentOpened=2, GotVisible=4 };
 
-    TDevFileSelector( FileSelectorPart *part, TDevMainWindow *mainWindow=0, TDevPartController *partController=0,
+    KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow=0, KDevPartController *partController=0,
                       TQWidget * parent = 0, const char * name = 0 );
-    ~TDevFileSelector();
+    ~KDevFileSelector();
 
     void readConfig( TDEConfig *, const TQString & );
     void writeConfig( TDEConfig *, const TQString & );
     void setupToolbar( TDEConfig * );
     void setView( KFile::FileView );
-    TDevDirOperator *dirOperator(){ return dir; }
+    KDevDirOperator *dirOperator(){ return dir; }
     TDEActionCollection *actionCollection() { return mActionCollection; };
 
 public slots:
@@ -146,18 +146,18 @@ protected:
     KURL activeDocumentUrl();
 
 private:
-    class TDevFileSelectorToolBar *toolbar;
+    class KDevFileSelectorToolBar *toolbar;
     TDEActionCollection *mActionCollection;
     class KBookmarkHandler *bookmarkHandler;
     KURLComboBox *cmbPath;
-    TDevDirOperator * dir;
+    KDevDirOperator * dir;
     class TDEAction *acSyncDir;
     KHistoryCombo * filter;
     class TQToolButton *btnFilter;
 
     FileSelectorPart *m_part;
-    TDevMainWindow *mainwin;
-    TDevPartController *partController;
+    KDevMainWindow *mainwin;
+    KDevPartController *partController;
 
     TQString lastFilter;
     int autoSyncEvents; // enabled autosync events
@@ -183,7 +183,7 @@ class KFSConfigPage : public TQWidget
     Q_OBJECT
   
 public:
-    KFSConfigPage( TQWidget* parent=0, const char *name=0, TDevFileSelector *kfs=0);
+    KFSConfigPage( TQWidget* parent=0, const char *name=0, KDevFileSelector *kfs=0);
     virtual ~KFSConfigPage() {};
 
 public slots:
@@ -194,7 +194,7 @@ public slots:
 private:
     void init();
 
-    TDevFileSelector *fileSelector;
+    KDevFileSelector *fileSelector;
     bool bDirty;
     //class TQListBox *lbAvailableActions, *lbUsedActions;
     TDEActionSelector *acSel;
diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp
index 059f0d78..935b9d86 100644
--- a/parts/fileselector/kbookmarkhandler.cpp
+++ b/parts/fileselector/kbookmarkhandler.cpp
@@ -35,7 +35,7 @@
 #include "kbookmarkhandler.moc"
 
 
-KBookmarkHandler::KBookmarkHandler( TDevFileSelector *parent, TDEPopupMenu* tdepopupmenu )
+KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu* tdepopupmenu )
     : TQObject( parent, "KBookmarkHandler" ),
       KBookmarkOwner(),
       mParent( parent ),
@@ -45,9 +45,9 @@ KBookmarkHandler::KBookmarkHandler( TDevFileSelector *parent, TDEPopupMenu* tdep
     if (!m_menu)
       m_menu = new TDEPopupMenu( parent, "bookmark menu" );
 
-    TQString file = locate( "data", "tdevfileselector/fsbookmarks.xml" );
+    TQString file = locate( "data", "kdevfileselector/fsbookmarks.xml" );
     if ( file.isEmpty() )
-        file = locateLocal( "data", "tdevfileselector/fsbookmarks.xml" );
+        file = locateLocal( "data", "kdevfileselector/fsbookmarks.xml" );
 
     KBookmarkManager *manager = KBookmarkManager::managerForFile( file, false);
     manager->setUpdate( true );
diff --git a/parts/fileselector/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h
index 7d232107..4ec065aa 100644
--- a/parts/fileselector/kbookmarkhandler.h
+++ b/parts/fileselector/kbookmarkhandler.h
@@ -34,7 +34,7 @@ class KBookmarkHandler : public TQObject, public KBookmarkOwner
   
 
 public:
-    KBookmarkHandler( TDevFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 );
+    KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 );
     ~KBookmarkHandler();
 
     // KBookmarkOwner interface:
@@ -58,7 +58,7 @@ protected:
     virtual void virtual_hook( int id, void* data );
 
 private:
-    TDevFileSelector *mParent;
+    KDevFileSelector *mParent;
     TDEPopupMenu *m_menu;
     KBookmarkMenu *m_bookmarkMenu;
 
diff --git a/parts/fileselector/tdevfileselector.desktop b/parts/fileselector/kdevfileselector.desktop
index a1d13627..785db621 100644
--- a/parts/fileselector/tdevfileselector.desktop
+++ b/parts/fileselector/kdevfileselector.desktop
@@ -33,7 +33,7 @@ Comment[tg]=Воситаи намоиши файлҳо бо тарафдории
 Comment[tr]=Güçlü, ağdan saydam, dosya gözatma yardımcı programı
 Comment[zh_CN]=强有力的网络文件浏览工具。
 Comment[zh_TW]=強大的網路檔案瀏覽工具。
-Name=TDevFileSelector
+Name=KDevFileSelector
 Name[da]=TDevelop filvælger
 Name[de]=Datei-Selektor (TDevelop)
 Name[hi]=के-डेव-फ़ाइल-चयनक
@@ -82,7 +82,7 @@ GenericName[zh_CN]=文件选择器
 GenericName[zh_TW]=檔案選擇器
 Icon=fileopen
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevfileselector
+X-TDE-Library=libkdevfileselector
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Mode=AssistantMode
diff --git a/parts/fileselector/tdevpart_fileselector.rc b/parts/fileselector/kdevpart_fileselector.rc
index 940e2ab2..940e2ab2 100644
--- a/parts/fileselector/tdevpart_fileselector.rc
+++ b/parts/fileselector/kdevpart_fileselector.rc
diff --git a/parts/fileview/CMakeLists.txt b/parts/fileview/CMakeLists.txt
index 49539df2..4f5f87dc 100644
--- a/parts/fileview/CMakeLists.txt
+++ b/parts/fileview/CMakeLists.txt
@@ -28,13 +28,13 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    tdevfileview.desktop tdevfilegroups.desktop
+    kdevfileview.desktop kdevfilegroups.desktop
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevfileview (module) ##################
+##### libkdevfileview (module) ##################
 
-tde_add_kpart( libtdevfileview AUTOMOC
+tde_add_kpart( libkdevfileview AUTOMOC
   SOURCES
     fileviewpart.cpp filetreewidget.cpp partwidget.cpp
     vcscolorsconfigwidgetbase.ui vcscolorsconfigwidget.cpp
@@ -45,9 +45,9 @@ tde_add_kpart( libtdevfileview AUTOMOC
 )
 
 
-##### libtdevfilegroups (module) ################
+##### libkdevfilegroups (module) ################
 
-tde_add_kpart( libtdevfilegroups AUTOMOC
+tde_add_kpart( libkdevfilegroups AUTOMOC
   SOURCES
     filegroupswidget.cpp addfilegroupdlg.cpp
     filegroupsconfigwidget.cpp filegroupsconfigwidgetbase.ui
diff --git a/parts/fileview/Makefile.am b/parts/fileview/Makefile.am
index 76f1460b..3211d736 100644
--- a/parts/fileview/Makefile.am
+++ b/parts/fileview/Makefile.am
@@ -3,24 +3,24 @@
 INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevfileview.la libtdevfilegroups.la
+kde_module_LTLIBRARIES = libkdevfileview.la libkdevfilegroups.la
 
-libtdevfileview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevfileview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+libkdevfileview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevfileview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevfilegroups_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevfilegroups_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+libkdevfilegroups_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevfilegroups_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevfileview_la_SOURCES = fileviewpart.cpp filetreewidget.cpp partwidget.cpp vcscolorsconfigwidgetbase.ui vcscolorsconfigwidget.cpp stdfiletreewidgetimpl.cpp filetreeviewwidgetimpl.cpp vcsfiletreewidgetimpl.cpp fileitemfactory.cpp
+libkdevfileview_la_SOURCES = fileviewpart.cpp filetreewidget.cpp partwidget.cpp vcscolorsconfigwidgetbase.ui vcscolorsconfigwidget.cpp stdfiletreewidgetimpl.cpp filetreeviewwidgetimpl.cpp vcsfiletreewidgetimpl.cpp fileitemfactory.cpp
                              
-libtdevfilegroups_la_SOURCES = filegroupswidget.cpp addfilegroupdlg.cpp filegroupsconfigwidget.cpp filegroupsconfigwidgetbase.ui filegroupspart.cpp
+libkdevfilegroups_la_SOURCES = filegroupswidget.cpp addfilegroupdlg.cpp filegroupsconfigwidget.cpp filegroupsconfigwidgetbase.ui filegroupspart.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevfileview.desktop tdevfilegroups.desktop
+service_DATA = kdevfileview.desktop kdevfilegroups.desktop
 
 # not used currently
-#rcdir = $(kde_datadir)/tdevfileview
-#rc_DATA = tdevfileview.rc
+#rcdir = $(kde_datadir)/kdevfileview
+#rc_DATA = kdevfileview.rc
 noinst_HEADERS = vcscolorsconfigwidget.h stdfiletreewidgetimpl.h filetreeviewwidgetimpl.h vcsfiletreewidgetimpl.h fileitemfactory.h
diff --git a/parts/fileview/filegroupsconfigwidget.cpp b/parts/fileview/filegroupsconfigwidget.cpp
index bf8d39a6..4f8fe422 100644
--- a/parts/fileview/filegroupsconfigwidget.cpp
+++ b/parts/fileview/filegroupsconfigwidget.cpp
@@ -39,7 +39,7 @@ FileGroupsConfigWidget::~FileGroupsConfigWidget()
 void FileGroupsConfigWidget::readConfig()
 {
     TQDomDocument &dom = *m_part->projectDom();
-    DomUtil::PairList list = DomUtil::readPairListEntry(dom, "/tdevfileview/groups",
+    DomUtil::PairList list = DomUtil::readPairListEntry(dom, "/kdevfileview/groups",
                                                         "group", "name", "pattern");
 
     TQListViewItem *lastItem = 0;
@@ -64,7 +64,7 @@ void FileGroupsConfigWidget::storeConfig()
         item = item->nextSibling();
     }
 
-    DomUtil::writePairListEntry(*m_part->projectDom(), "/tdevfileview/groups",
+    DomUtil::writePairListEntry(*m_part->projectDom(), "/kdevfileview/groups",
                                 "group", "name", "pattern", list);
 }
 
diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp
index 7b83b8ef..77fc9646 100644
--- a/parts/fileview/filegroupspart.cpp
+++ b/parts/fileview/filegroupspart.cpp
@@ -19,25 +19,25 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kdialogbase.h>
 
-#include "tdevcore.h"
-#include "tdevproject.h"
-#include "tdevmainwindow.h"
-#include "tdevplugininfo.h"
+#include "kdevcore.h"
+#include "kdevproject.h"
+#include "kdevmainwindow.h"
+#include "kdevplugininfo.h"
 
 #include "filegroupswidget.h"
 #include "filegroupsconfigwidget.h"
 
 #define FILEGROUPS_OPTIONS 1
 
-typedef TDevGenericFactory<FileGroupsPart> FileGroupsFactory;
-static const TDevPluginInfo data("tdevfilegroups");
-K_EXPORT_COMPONENT_FACTORY( libtdevfilegroups, FileGroupsFactory( data ) )
+typedef KDevGenericFactory<FileGroupsPart> FileGroupsFactory;
+static const KDevPluginInfo data("kdevfilegroups");
+K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) )
 
 FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &)
-    : TDevPlugin(&data, parent, name ? name : "FileGroupsPart")
+    : KDevPlugin(&data, parent, name ? name : "FileGroupsPart")
 {
     deleteRequested = false;
     setInstance(FileGroupsFactory::instance());
diff --git a/parts/fileview/filegroupspart.h b/parts/fileview/filegroupspart.h
index 88bed704..314f1663 100644
--- a/parts/fileview/filegroupspart.h
+++ b/parts/fileview/filegroupspart.h
@@ -15,12 +15,12 @@
 #include <tqguardedptr.h>
 //#include <kdialogbase.h>
 #include <configwidgetproxy.h>
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 
 class FileGroupsWidget;
 class KDialogBase;
 
-class FileGroupsPart : public TDevPlugin
+class FileGroupsPart : public KDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp
index 3c1c348f..8a3e19b4 100644
--- a/parts/fileview/filegroupswidget.cpp
+++ b/parts/fileview/filegroupswidget.cpp
@@ -27,10 +27,10 @@
 #include <tdeaction.h>
 #include <tdeversion.h>
 
-#include "tdevcore.h"
-#include "tdevproject.h"
-#include "tdevmainwindow.h"
-#include "tdevpartcontroller.h"
+#include "kdevcore.h"
+#include "kdevproject.h"
+#include "kdevmainwindow.h"
+#include "kdevpartcontroller.h"
 #include "domutil.h"
 
 #include "filegroupspart.h"
@@ -191,16 +191,16 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part)
     (void) translations; // supress compiler warning
 
     TQDomDocument &dom = *m_part->projectDom();
-    m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/tdevfileview/groups/hidenonprojectfiles") );
-    m_actionToggleDisplayLocation->setChecked( !DomUtil::readBoolEntry(dom, "/tdevfileview/groups/hidenonlocation") );
+    m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/groups/hidenonprojectfiles") );
+    m_actionToggleDisplayLocation->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/groups/hidenonlocation") );
 }
 
 
 FileGroupsWidget::~FileGroupsWidget()
 {
     TQDomDocument &dom = *m_part->projectDom();
-    DomUtil::writeBoolEntry( dom, "/tdevfileview/groups/hidenonprojectfiles", !m_actionToggleShowNonProjectFiles->isChecked() );
-    DomUtil::writeBoolEntry( dom, "/tdevfileview/groups/hidenonlocation", !m_actionToggleDisplayLocation->isChecked() );
+    DomUtil::writeBoolEntry( dom, "/kdevfileview/groups/hidenonprojectfiles", !m_actionToggleShowNonProjectFiles->isChecked() );
+    DomUtil::writeBoolEntry( dom, "/kdevfileview/groups/hidenonlocation", !m_actionToggleDisplayLocation->isChecked() );
 }
 
 
@@ -319,7 +319,7 @@ void FileGroupsWidget::refresh()
     }
     TQDomDocument &dom = *m_part->projectDom();
     DomUtil::PairList list =
-        DomUtil::readPairListEntry(dom, "/tdevfileview/groups", "group", "name", "pattern");
+        DomUtil::readPairListEntry(dom, "/kdevfileview/groups", "group", "name", "pattern");
 
     FileViewFolderItem *lastGroup = 0;
 
diff --git a/parts/fileview/filegroupswidget.h b/parts/fileview/filegroupswidget.h
index 62ec5d6f..3294db32 100644
--- a/parts/fileview/filegroupswidget.h
+++ b/parts/fileview/filegroupswidget.h
@@ -15,7 +15,7 @@
 #include <tdelistview.h>
 
 class FileGroupsPart;
-class TDevProject;
+class KDevProject;
 
 
 class FileGroupsWidget : public TDEListView
diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp
index 3764a3f2..af6f9e1f 100644
--- a/parts/fileview/filetreeviewwidgetimpl.cpp
+++ b/parts/fileview/filetreeviewwidgetimpl.cpp
@@ -16,7 +16,7 @@
 #include <tdelocale.h>
 #include <tdeversion.h>
 
-#include <tdevproject.h>
+#include <kdevproject.h>
 
 #include "fileviewpart.h"
 #include "filetreewidget.h"
@@ -44,7 +44,7 @@ FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *parent, const ch
 
     // Reload good ol' settings
     TQDomDocument &dom = *m_part->projectDom();
-    m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/tdevfileview/tree/hidenonprojectfiles") );
+    m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/tree/hidenonprojectfiles") );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -56,7 +56,7 @@ FileTreeViewWidgetImpl::~FileTreeViewWidgetImpl()
     delete m_branchItemFactory;
 
     TQDomDocument &dom = *m_part->projectDom();
-    DomUtil::writeBoolEntry( dom, "/tdevfileview/tree/hidenonprojectfiles", !showNonProjectFiles() );
+    DomUtil::writeBoolEntry( dom, "/kdevfileview/tree/hidenonprojectfiles", !showNonProjectFiles() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp
index 0a1c5346..f89bf71d 100644
--- a/parts/fileview/filetreewidget.cpp
+++ b/parts/fileview/filetreewidget.cpp
@@ -26,11 +26,11 @@
 #include <kurl.h>
 #include <tdeaction.h>
 
-#include "tdevcore.h"
-#include "tdevproject.h"
-#include "tdevpartcontroller.h"
-#include "tdevmainwindow.h"
-#include "tdevversioncontrol.h"
+#include "kdevcore.h"
+#include "kdevproject.h"
+#include "kdevpartcontroller.h"
+#include "kdevmainwindow.h"
+#include "kdevversioncontrol.h"
 #include "domutil.h"
 #include "urlutil.h"
 
@@ -51,7 +51,7 @@ using namespace filetreeview;
 // class FileTreeWidget
 ///////////////////////////////////////////////////////////////////////////////
 
-FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, TDevVCSFileInfoProvider *infoProvider )
+FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider )
     : KFileTreeView( parent, "filetreewidget" ), m_part( part ), m_rootBranch( 0 )
 {
     kdDebug(9017) << "Requested FileTree for: " << projectDirectory() << endl;
@@ -87,7 +87,7 @@ FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, TDevVCSFil
     // Hide pattern for files
     TQDomDocument &dom = *m_part->projectDom();
     TQString defaultHidePattern = "*.o,*.lo,CVS";
-    TQString hidePattern = DomUtil::readEntry( dom, "/tdevfileview/tree/hidepatterns", defaultHidePattern );
+    TQString hidePattern = DomUtil::readEntry( dom, "/kdevfileview/tree/hidepatterns", defaultHidePattern );
     m_hidePatterns = TQStringList::split( ",", hidePattern );
 }
 
@@ -98,7 +98,7 @@ FileTreeWidget::~FileTreeWidget()
     kdDebug(9017) << "FileTreeWidget::~FileTreeWidget()" << endl;
 
     TQDomDocument &dom = *m_part->projectDom();
-    DomUtil::writeEntry( dom, "/tdevfileview/tree/hidepatterns", hidePatterns() );
+    DomUtil::writeEntry( dom, "/kdevfileview/tree/hidepatterns", hidePatterns() );
 
 //    delete m_impl;
 }
@@ -343,7 +343,7 @@ TQString FileTreeWidget::hidePatterns() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-TDevVersionControl *FileTreeWidget::versionControl() const
+KDevVersionControl *FileTreeWidget::versionControl() const
 {
     if (part() && part()->versionControl())
         return part()->versionControl();
diff --git a/parts/fileview/filetreewidget.h b/parts/fileview/filetreewidget.h
index a8d3e2bf..f6abb0c6 100644
--- a/parts/fileview/filetreewidget.h
+++ b/parts/fileview/filetreewidget.h
@@ -17,11 +17,11 @@
 #include <tqguardedptr.h>
 #include <tdefiletreeview.h>
 
-#include <tdevversioncontrol.h>
+#include <kdevversioncontrol.h>
 
 class FileViewPart;
 class FileTreeViewWidgetImpl;
-class TDevVersionControl;
+class KDevVersionControl;
 
 /**
 * This is FileTree widget for listing files belonging to the project. It does feature:
@@ -33,8 +33,8 @@ class TDevVersionControl;
 * Design notes
 * The class uses two different implementations (referred by m_impl data member):
 * - @see VCSFileTreeWidgetImpl for VCS support
-*   VCS support is detencted by the constructor looking for the @see TDevPlugin::versionControl() member:
-*   if the current VCS plug-in does offer a @see TDevVCSFileInfoProvider object than this will be used for
+*   VCS support is detencted by the constructor looking for the @see KDevPlugin::versionControl() member:
+*   if the current VCS plug-in does offer a @see KDevVCSFileInfoProvider object than this will be used for
 *   querying about files' data. If neither VCS plugin nor valid info provider is found then the filetreeview
 *   will fallback to the standard implementation
 * - @see StdFileTreeWidgetImpl for standard visualization, just like the KFileTreeView
@@ -49,7 +49,7 @@ class FileTreeWidget : public KFileTreeView
     Q_OBJECT
   
 public:
-    FileTreeWidget( FileViewPart *part, TQWidget *parent, TDevVCSFileInfoProvider *infoProvider );
+    FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider );
     virtual ~FileTreeWidget();
 
     void openDirectory(const TQString &dirName);
@@ -60,7 +60,7 @@ public:
 
     FileViewPart *part() const { return m_part; }
 
-    //TDevVCSFileInfoProvider *vcsFileInfoProvider() const;
+    //KDevVCSFileInfoProvider *vcsFileInfoProvider() const;
     void applyHidePatterns( const TQString &hidePatterns );
     TQString hidePatterns() const;
 
@@ -85,7 +85,7 @@ private slots:
 
 private:
     bool matchesHidePattern(const TQString &fileName);
-    TDevVersionControl *versionControl() const;
+    KDevVersionControl *versionControl() const;
 
     TQStringList m_hidePatterns;
     /**
diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp
index 7da44996..414cea52 100644
--- a/parts/fileview/fileviewpart.cpp
+++ b/parts/fileview/fileviewpart.cpp
@@ -23,19 +23,19 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kdialogbase.h>
 
-#include "tdevcore.h"
-#include "tdevproject.h"
-#include "tdevmainwindow.h"
+#include "kdevcore.h"
+#include "kdevproject.h"
+#include "kdevmainwindow.h"
 
 #include "partwidget.h"
 #include "domutil.h"
 #include "filetreewidget.h"
 #include "vcscolorsconfigwidget.h"
-#include "tdevversioncontrol.h"
-#include "tdevplugininfo.h"
+#include "kdevversioncontrol.h"
+#include "kdevplugininfo.h"
 
 #define FILETREE_OPTIONS 1
 
@@ -49,20 +49,20 @@ VCSColors FileViewPart::vcsColors;
 // class factory
 ///////////////////////////////////////////////////////////////////////////////
 
-typedef TDevGenericFactory<FileViewPart> FileViewFactory;
-static const TDevPluginInfo data("tdevfileview");
-K_EXPORT_COMPONENT_FACTORY( libtdevfileview, FileViewFactory( data ) )
+typedef KDevGenericFactory<FileViewPart> FileViewFactory;
+static const KDevPluginInfo data("kdevfileview");
+K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) )
 
 ///////////////////////////////////////////////////////////////////////////////
 // class FileTreeWidget
 ///////////////////////////////////////////////////////////////////////////////
 
 FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &)
-	: TDevPlugin(&data, parent, name ? name : "FileViewPart"),
+	: KDevPlugin(&data, parent, name ? name : "FileViewPart"),
     m_widget( 0 )
 {
     setInstance( FileViewFactory::instance() );
-    //    setXMLFile("tdevfileview.rc");
+    //    setXMLFile("kdevfileview.rc");
 
 	_configProxy = new ConfigWidgetProxy( core() );
 	_configProxy->createProjectConfigPage( i18n("File Tree"), FILETREE_OPTIONS, info()->icon() );
@@ -153,9 +153,9 @@ void FileViewPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * page,
 	}
 }
 
-TDevVersionControl *FileViewPart::versionControl()
+KDevVersionControl *FileViewPart::versionControl()
 {
-   return extension<TDevVersionControl>("TDevelop/VersionControl");
+   return extension<KDevVersionControl>("TDevelop/VersionControl");
 }
 
 #include "fileviewpart.moc"
diff --git a/parts/fileview/fileviewpart.h b/parts/fileview/fileviewpart.h
index c1c8c776..68eb6a56 100644
--- a/parts/fileview/fileviewpart.h
+++ b/parts/fileview/fileviewpart.h
@@ -14,14 +14,14 @@
 
 #include <tqguardedptr.h>
 #include <configwidgetproxy.h>
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 #include "vcscolorsconfigwidget.h"
 
 class PartWidget;
 class KDialogBase;
-class TDevVersionControl;
+class KDevVersionControl;
 
-class FileViewPart : public TDevPlugin
+class FileViewPart : public KDevPlugin
 {
     Q_OBJECT
   
@@ -33,7 +33,7 @@ public:
     //! Colors to use for VCS visual feed-back
     static VCSColors vcsColors;
     
-    TDevVersionControl *versionControl();
+    KDevVersionControl *versionControl();
 
 private slots:
 	void insertConfigWidget( const KDialogBase* dlg, TQWidget * page, unsigned int );
diff --git a/parts/fileview/tdevfilegroups.desktop b/parts/fileview/kdevfilegroups.desktop
index 4c04c274..bfa3e699 100644
--- a/parts/fileview/tdevfilegroups.desktop
+++ b/parts/fileview/kdevfilegroups.desktop
@@ -33,7 +33,7 @@ Comment[tg]=Барои файлҳои дар номҳои қолиб имкон
 Comment[tr]=Dosya adı desenlerine göre proje dosyalarının gruplanmasını sağlar.
 Comment[zh_CN]=允许你根据文件名模式规类工程文件。
 Comment[zh_TW]=允許專案檔案根據檔名樣式來分群組。
-Name=TDevFileGroups
+Name=KDevFileGroups
 Name[da]=TDevelop filgrupper
 Name[de]=Dateigruppen-Komponente (TDevelop)
 Name[hi]=के-डेव-फ़ाइल-ग्रुप्स
@@ -80,7 +80,7 @@ GenericName[zh_CN]=文件分组
 GenericName[zh_TW]=檔案群組
 ServiceTypes=TDevelop/Plugin
 Icon=attach
-X-TDE-Library=libtdevfilegroups
+X-TDE-Library=libkdevfilegroups
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 X-TDevelop-Properties=ProjectFileGroupsManagement
diff --git a/parts/fileview/tdevfileview.desktop b/parts/fileview/kdevfileview.desktop
index b589b5ef..6a702e1b 100644
--- a/parts/fileview/tdevfileview.desktop
+++ b/parts/fileview/kdevfileview.desktop
@@ -32,7 +32,7 @@ Comment[tg]=Тариқи навигатсияро ва ҳангоми ҳамко
 Comment[tr]=Geçerli projenin kaynak dosyalarında gezinme ve onlarla etkileşime geçme yolu sunar.
 Comment[zh_CN]=提供当前工程源文件的浏览和相互关系。
 Comment[zh_TW]=提供目前專案的程式源碼檔的導覽與互動。
-Name=TDevFileView
+Name=KDevFileView
 Name[da]=TDevelop filvisning
 Name[de]=Dateibaum (TDevelop)
 Name[hi]=के-डेव-फ़ाइल-व्यू
@@ -79,7 +79,7 @@ GenericName[zh_CN]=文件树
 GenericName[zh_TW]=檔案樹
 ServiceTypes=TDevelop/Plugin
 Icon=folder
-X-TDE-Library=libtdevfileview
+X-TDE-Library=libkdevfileview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 X-TDevelop-Properties=ProjectFileManagement
diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp
index 49cfe7d5..bf68de83 100644
--- a/parts/fileview/partwidget.cpp
+++ b/parts/fileview/partwidget.cpp
@@ -22,10 +22,10 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 
-#include "tdevversioncontrol.h"
-#include "tdevcore.h"
-#include "tdevproject.h"
-#include "tdevmainwindow.h"
+#include "kdevversioncontrol.h"
+#include "kdevcore.h"
+#include "kdevproject.h"
+#include "kdevmainwindow.h"
 
 #include "fileviewpart.h"
 #include "filetreewidget.h"
@@ -40,7 +40,7 @@ PartWidget::PartWidget( FileViewPart *part, TQWidget *parent )
 {
     Q_ASSERT( part && parent );
 
-    TDevVCSFileInfoProvider *infoProvider = 0;
+    KDevVCSFileInfoProvider *infoProvider = 0;
     if (part && part->versionControl() && part->versionControl()->fileInfoProvider())
         infoProvider = part->versionControl()->fileInfoProvider();
 
diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp
index e08068db..450a6a58 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.cpp
+++ b/parts/fileview/vcsfiletreewidgetimpl.cpp
@@ -18,7 +18,7 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 
-//#include <tdevproject.h>
+//#include <kdevproject.h>
 #include <urlutil.h>
 #include <domutil.h>
 
@@ -127,13 +127,13 @@ class VCSFileTreeBranchItem : public filetreeview::FileTreeBranchItem
 {
 public:
     VCSFileTreeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix,
-        TDevVCSFileInfoProvider *vcsInfoProvider )
+        KDevVCSFileInfoProvider *vcsInfoProvider )
         : FileTreeBranchItem( view, url, name, pix ), m_vcsInfoProvider( vcsInfoProvider ) {}
 //    virtual ~VCSFileTreeBranchItem() {}
     virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem );
 
 private:
-    TDevVCSFileInfoProvider *m_vcsInfoProvider;
+    KDevVCSFileInfoProvider *m_vcsInfoProvider;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -169,20 +169,20 @@ KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem*
 class VCSBranchItemFactory : public filetreeview::BranchItemFactory
 {
 public:
-    VCSBranchItemFactory( TDevVCSFileInfoProvider *vcsInfoProvider ) : m_vcsInfoProvider( vcsInfoProvider ) {}
+    VCSBranchItemFactory( KDevVCSFileInfoProvider *vcsInfoProvider ) : m_vcsInfoProvider( vcsInfoProvider ) {}
     virtual filetreeview::FileTreeBranchItem *makeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix )
     {
         return new VCSFileTreeBranchItem( view, url, name, pix, m_vcsInfoProvider );
     }
 private:
-    TDevVCSFileInfoProvider *m_vcsInfoProvider;
+    KDevVCSFileInfoProvider *m_vcsInfoProvider;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // class VCSFileTreeWidgetImpl
 ///////////////////////////////////////////////////////////////////////////////
 
-VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, TDevVCSFileInfoProvider *infoProvider )
+VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider )
     : FileTreeViewWidgetImpl( parent, "vcsfiletreewidgetimpl" ),
     m_actionToggleShowVCSFields( 0 ), m_actionSyncWithRepository( 0 ), m_vcsInfoProvider( infoProvider ),
     m_isSyncingWithRepository( false ), m_vcsStatusRequestedItem( 0 )
@@ -216,7 +216,7 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, TDevVCSFil
     m_actionSyncWithRepository->setWhatsThis( aboutAction );
 
     TQDomDocument &dom = projectDom();
-    m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/tdevfileview/tree/showvcsfields") );
+    m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/kdevfileview/tree/showvcsfields") );
     slotToggleShowVCSFields( showVCSFields() ); // show or hide fields depending on read settings
     connect( parent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*)));
 }
@@ -228,7 +228,7 @@ VCSFileTreeWidgetImpl::~VCSFileTreeWidgetImpl()
     kdDebug(9017) << "VCSFileTreeWidgetImpl::~VCSFileTreeWidgetImpl()" << endl;
 
     TQDomDocument &dom = projectDom();
-    DomUtil::writeBoolEntry( dom, "/tdevfileview/tree/showvcsfields", showVCSFields() );
+    DomUtil::writeBoolEntry( dom, "/kdevfileview/tree/showvcsfields", showVCSFields() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/parts/fileview/vcsfiletreewidgetimpl.h b/parts/fileview/vcsfiletreewidgetimpl.h
index 928fe544..00a38b32 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.h
+++ b/parts/fileview/vcsfiletreewidgetimpl.h
@@ -14,7 +14,7 @@
 
 #include "filetreeviewwidgetimpl.h"
 
-class TDevVCSFileInfoProvider;
+class KDevVCSFileInfoProvider;
 class TDEAction;
 class TDEToggleAction;
 
@@ -27,7 +27,7 @@ class VCSFileTreeWidgetImpl : public FileTreeViewWidgetImpl
     Q_OBJECT
   
 public:
-    VCSFileTreeWidgetImpl( FileTreeWidget *parent, TDevVCSFileInfoProvider *infoProvider );
+    VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider );
     virtual ~VCSFileTreeWidgetImpl();
 
     /*
@@ -44,7 +44,7 @@ private slots:
     //! show/hide the header and the additional fields (status and versions)
     void slotToggleShowVCSFields( bool checked );
     //! start a sync operation with the remote repository: this may take a while so we use
-    //! the async interface provided by the TDevVCSFileInfoProvider interface
+    //! the async interface provided by the KDevVCSFileInfoProvider interface
     void slotSyncWithRepository();
     //! when the requested info are ready the infoProvider object will be so kind the
     //! to give them to us in a ready-to-use format: we'll use that info to update all
@@ -58,7 +58,7 @@ private:
 
     TDEToggleAction *m_actionToggleShowVCSFields;
     TDEAction *m_actionSyncWithRepository;
-    TDevVCSFileInfoProvider *m_vcsInfoProvider;
+    KDevVCSFileInfoProvider *m_vcsInfoProvider;
     //! We use this guard to avoid enabling the "reload tree" action when performing
     //! syncing with remote repositories.
     bool m_isSyncingWithRepository;
diff --git a/parts/filter/CMakeLists.txt b/parts/filter/CMakeLists.txt
index 7665f6f1..095144d3 100644
--- a/parts/filter/CMakeLists.txt
+++ b/parts/filter/CMakeLists.txt
@@ -26,16 +26,16 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevfilter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevfilter.rc DESTINATION ${DATA_INSTALL_DIR}/tdevfilter )
+install( FILES kdevfilter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevfilter.rc DESTINATION ${DATA_INSTALL_DIR}/kdevfilter )
 
 
-##### libtdevfilter (module) ####################
+##### libkdevfilter (module) ####################
 
-tde_add_kpart( libtdevfilter AUTOMOC
+tde_add_kpart( libkdevfilter AUTOMOC
   SOURCES
     filterpart.cpp shellfilterdlg.cpp shellinsertdlg.cpp
-    tdevfilterIface.cpp tdevfilterIface.skel
+    kdevfilterIface.cpp kdevfilterIface.skel
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/filter/Makefile.am b/parts/filter/Makefile.am
index 4a3fe722..f68b0cf6 100644
--- a/parts/filter/Makefile.am
+++ b/parts/filter/Makefile.am
@@ -2,16 +2,16 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces 	   -I$(top_srcdir)/lib/util 	   $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevfilter.la
-libtdevfilter_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevfilter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevfilter.la
+libkdevfilter_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevfilter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevfilter_la_SOURCES = filterpart.cpp shellfilterdlg.cpp shellinsertdlg.cpp tdevfilterIface.cpp tdevfilterIface.skel
+libkdevfilter_la_SOURCES = filterpart.cpp shellfilterdlg.cpp shellinsertdlg.cpp kdevfilterIface.cpp kdevfilterIface.skel
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevfilter.desktop
+service_DATA = kdevfilter.desktop
 
-rcdir = $(kde_datadir)/tdevfilter
-rc_DATA = tdevfilter.rc
+rcdir = $(kde_datadir)/kdevfilter
+rc_DATA = kdevfilter.rc
diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp
index 3ee5029a..5ebd265e 100644
--- a/parts/filter/filterpart.cpp
+++ b/parts/filter/filterpart.cpp
@@ -19,21 +19,21 @@
 #include <tdetexteditor/selectioninterface.h>
 #include <tdetexteditor/viewcursorinterface.h>
 
-#include "tdevcore.h"
-#include "tdevpartcontroller.h"
-#include "tdevplugininfo.h"
+#include "kdevcore.h"
+#include "kdevpartcontroller.h"
+#include "kdevplugininfo.h"
 #include "shellfilterdlg.h"
 #include "shellinsertdlg.h"
-#include "tdevfilterIface.h"
+#include "kdevfilterIface.h"
 
-static const TDevPluginInfo data("tdevfilter");
-K_EXPORT_COMPONENT_FACTORY( libtdevfilter, FilterFactory( data ) )
+static const KDevPluginInfo data("kdevfilter");
+K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( data ) )
 
 FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &)
-    : TDevPlugin(&data, parent, name ? name : "FilterPart")
+    : KDevPlugin(&data, parent, name ? name : "FilterPart")
 {
     setInstance(FilterFactory::instance());
-    setXMLFile("tdevfilter.rc");
+    setXMLFile("kdevfilter.rc");
 
     TDEAction *action;
 
@@ -52,7 +52,7 @@ FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &)
     m_insertDialog = 0;
     m_filterDialog = 0;
 
-    new TDevFilterIface( this );
+    new KDevFilterIface( this );
     // (void) dcopClient();
 }
 
diff --git a/parts/filter/filterpart.h b/parts/filter/filterpart.h
index b1eac334..b8322425 100644
--- a/parts/filter/filterpart.h
+++ b/parts/filter/filterpart.h
@@ -12,14 +12,14 @@
 #ifndef _FILTERPART_H_
 #define _FILTERPART_H_
 
-#include <tdevgenericfactory.h>
-#include "tdevplugin.h"
+#include <kdevgenericfactory.h>
+#include "kdevplugin.h"
 
 class ShellInsertDialog;
 class ShellFilterDialog;
 
 
-class FilterPart : public TDevPlugin
+class FilterPart : public KDevPlugin
 {
     Q_OBJECT
   
@@ -37,6 +37,6 @@ private:
     ShellFilterDialog *m_filterDialog;
 };
 
-typedef TDevGenericFactory<FilterPart> FilterFactory;
+typedef KDevGenericFactory<FilterPart> FilterFactory;
 
 #endif
diff --git a/parts/filter/tdevfilter.desktop b/parts/filter/kdevfilter.desktop
index 36854737..1ce8122a 100644
--- a/parts/filter/tdevfilter.desktop
+++ b/parts/filter/kdevfilter.desktop
@@ -32,7 +32,7 @@ Comment[tg]=Вазифаи корҳо бо матнҳои дар муҳарри�
 Comment[tr]=Komut satırı araçlarını kullanarak düzenleyici metni işlemek için bir yol sunar. Araçlar menüsünde durur.
 Comment[zh_CN]=使用命令行工具操作编辑器文字。显示在工具菜单中。
 Comment[zh_TW]=提供使用命令列工具操作編輯器文字的方法。會出現在工具選單中。
-Name=TDevFilter
+Name=KDevFilter
 Name[da]=TDevelop filter
 Name[de]=Filter (TDevelop)
 Name[hi]=के-डेव-फ़िल्टर
@@ -76,7 +76,7 @@ GenericName[tr]=Kabuk filtreleme ve Ekleme
 GenericName[zh_CN]=Shell 过滤和插入
 GenericName[zh_TW]=Shell 過濾與插入
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevfilter
+X-TDE-Library=libkdevfilter
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=OptionalCodeEditing
diff --git a/parts/filter/tdevfilter.rc b/parts/filter/kdevfilter.rc
index 4f3d82d9..6f7f9053 100644
--- a/parts/filter/tdevfilter.rc
+++ b/parts/filter/kdevfilter.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="TDevFilter" version="1">
+<kpartgui name="KDevFilter" version="1">
 <MenuBar>
   <Menu name="tools" >
     <Action name="tools_insertshell" group="tools_file_operations"/>
diff --git a/parts/filter/tdevfilterIface.cpp b/parts/filter/kdevfilterIface.cpp
index e0c15687..3df749a4 100644
--- a/parts/filter/tdevfilterIface.cpp
+++ b/parts/filter/kdevfilterIface.cpp
@@ -10,26 +10,26 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#include "tdevfilterIface.h"
+#include "kdevfilterIface.h"
 #include "filterpart.h"
 
-TDevFilterIface::TDevFilterIface( FilterPart* part )
-    : TQObject( part ), DCOPObject( "TDevFilter" ), m_part( part )
+KDevFilterIface::KDevFilterIface( FilterPart* part )
+    : TQObject( part ), DCOPObject( "KDevFilter" ), m_part( part )
 {
 }
 
-TDevFilterIface::~TDevFilterIface()
+KDevFilterIface::~KDevFilterIface()
 {
 }
 
-void TDevFilterIface::shellInsert()
+void KDevFilterIface::shellInsert()
 {
     m_part->slotShellInsert();
 }
 
-void TDevFilterIface::shellFilter()
+void KDevFilterIface::shellFilter()
 {
     m_part->slotShellFilter();
 }
 
-#include "tdevfilterIface.moc"
+#include "kdevfilterIface.moc"
diff --git a/parts/filter/tdevfilterIface.h b/parts/filter/kdevfilterIface.h
index 56d2aebf..fae74022 100644
--- a/parts/filter/tdevfilterIface.h
+++ b/parts/filter/kdevfilterIface.h
@@ -1,20 +1,20 @@
 
-#ifndef TDEVFILTERIFACE_H
-#define TDEVFILTERIFACE_H
+#ifndef KDEVFILTERIFACE_H
+#define KDEVFILTERIFACE_H
 
 #include <tqobject.h>
 #include <dcopobject.h>
 
 class FilterPart;
 
-class TDevFilterIface : public TQObject, public DCOPObject
+class KDevFilterIface : public TQObject, public DCOPObject
 {
     Q_OBJECT
 //    
     K_DCOP
 public:
-    TDevFilterIface( FilterPart* part );
-    ~TDevFilterIface();
+    KDevFilterIface( FilterPart* part );
+    ~KDevFilterIface();
     
 k_dcop:
     void shellInsert();
diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp
index 7d3d0ff5..a5100d5b 100644
--- a/parts/filter/shellfilterdlg.cpp
+++ b/parts/filter/shellfilterdlg.cpp
@@ -23,7 +23,7 @@
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 #include "domutil.h"
 #include "filterpart.h"
 
diff --git a/parts/filter/shellfilterdlg.h b/parts/filter/shellfilterdlg.h
index cf9812ab..87657501 100644
--- a/parts/filter/shellfilterdlg.h
+++ b/parts/filter/shellfilterdlg.h
@@ -16,7 +16,7 @@
 
 class TQComboBox;
 class TQPushButton;
-class TDevPlugin;
+class KDevPlugin;
 class TDEProcess;
 
 
diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp
index f9d24c19..057e8121 100644
--- a/parts/filter/shellinsertdlg.cpp
+++ b/parts/filter/shellinsertdlg.cpp
@@ -24,7 +24,7 @@
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 #include "domutil.h"
 #include "filterpart.h"
 
diff --git a/parts/filter/shellinsertdlg.h b/parts/filter/shellinsertdlg.h
index df3085a1..fda59678 100644
--- a/parts/filter/shellinsertdlg.h
+++ b/parts/filter/shellinsertdlg.h
@@ -16,7 +16,7 @@
 
 class TQComboBox;
 class TQPushButton;
-class TDevPlugin;
+class KDevPlugin;
 class TDEProcess;
 
 
diff --git a/parts/fullscreen/CMakeLists.txt b/parts/fullscreen/CMakeLists.txt
index 548e4f40..84b45df9 100644
--- a/parts/fullscreen/CMakeLists.txt
+++ b/parts/fullscreen/CMakeLists.txt
@@ -26,13 +26,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevfullscreen.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpart_fullscreen.rc DESTINATION ${DATA_INSTALL_DIR}/tdevfullscreen )
+install( FILES kdevfullscreen.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpart_fullscreen.rc DESTINATION ${DATA_INSTALL_DIR}/kdevfullscreen )
 
 
-##### libtdevfullscreen (module) ################
+##### libkdevfullscreen (module) ################
 
-tde_add_kpart( libtdevfullscreen AUTOMOC
+tde_add_kpart( libkdevfullscreen AUTOMOC
   SOURCES fullscreen_part.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/fullscreen/Makefile.am b/parts/fullscreen/Makefile.am
index a05b0bd1..3f039ef6 100644
--- a/parts/fullscreen/Makefile.am
+++ b/parts/fullscreen/Makefile.am
@@ -1,15 +1,15 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevfullscreen.la
-libtdevfullscreen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevfullscreen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevfullscreen.la
+libkdevfullscreen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevfullscreen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevfullscreen_la_SOURCES = fullscreen_part.cpp
+libkdevfullscreen_la_SOURCES = fullscreen_part.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevfullscreen.desktop
+service_DATA = kdevfullscreen.desktop
 
-rcdir = $(kde_datadir)/tdevfullscreen
-rc_DATA = tdevpart_fullscreen.rc
+rcdir = $(kde_datadir)/kdevfullscreen
+rc_DATA = kdevpart_fullscreen.rc
diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp
index a73f33f1..22cecb42 100644
--- a/parts/fullscreen/fullscreen_part.cpp
+++ b/parts/fullscreen/fullscreen_part.cpp
@@ -11,32 +11,32 @@
 
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kstdaction.h>
 #include <tdemainwindow.h>
 #include <tdemenubar.h>
 
-#include <tdevcore.h>
-#include <tdevmainwindow.h>
-#include <tdevplugininfo.h>
+#include <kdevcore.h>
+#include <kdevmainwindow.h>
+#include <kdevplugininfo.h>
 
 #include "fullscreen_part.h"
 
-static const TDevPluginInfo data("tdevfullscreen");
+static const KDevPluginInfo data("kdevfullscreen");
 
-typedef TDevGenericFactory<FullScreenPart> FullScreenFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevfullscreen, FullScreenFactory( data ) )
+typedef KDevGenericFactory<FullScreenPart> FullScreenFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( data ) )
 
 FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStringList& )
-  : TDevPlugin(&data, parent, name ? name : "FullScreenPart" )
+  : KDevPlugin(&data, parent, name ? name : "FullScreenPart" )
 {
   setInstance(FullScreenFactory::instance());
 //  const TDEAboutData &abdata1 = *(info());
 //  kdDebug() << abdata1.appName() << endl;
-  const TDevPluginInfo &_info = *info();
+  const KDevPluginInfo &_info = *info();
   const TDEAboutData *abdata = _info;
   kdDebug() << abdata->appName() << endl;
-  setXMLFile("tdevpart_fullscreen.rc");
+  setXMLFile("kdevpart_fullscreen.rc");
 
   m_bFullScreen = false;
 
diff --git a/parts/fullscreen/fullscreen_part.h b/parts/fullscreen/fullscreen_part.h
index 2964b5d9..fcb566e8 100644
--- a/parts/fullscreen/fullscreen_part.h
+++ b/parts/fullscreen/fullscreen_part.h
@@ -9,15 +9,15 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef __TDEVPART_FULLSCREEN_H__
-#define __TDEVPART_FULLSCREEN_H__
+#ifndef __KDEVPART_FULLSCREEN_H__
+#define __KDEVPART_FULLSCREEN_H__
 
 #include <tqguardedptr.h>
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 class TDEAction;
 
-class FullScreenPart : public TDevPlugin
+class FullScreenPart : public KDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/fullscreen/tdevfullscreen.desktop b/parts/fullscreen/kdevfullscreen.desktop
index 4974af20..6f935c85 100644
--- a/parts/fullscreen/tdevfullscreen.desktop
+++ b/parts/fullscreen/kdevfullscreen.desktop
@@ -81,6 +81,6 @@ GenericName[zh_TW]=全螢幕
 Icon=tdevelop
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Core
-X-TDE-Library=libtdevfullscreen
+X-TDE-Library=libkdevfullscreen
 X-TDevelop-Version=5
 X-TDevelop-Properties=ViewManagement
diff --git a/parts/fullscreen/tdevpart_fullscreen.rc b/parts/fullscreen/kdevpart_fullscreen.rc
index 3bd67c9d..3bd67c9d 100644
--- a/parts/fullscreen/tdevpart_fullscreen.rc
+++ b/parts/fullscreen/kdevpart_fullscreen.rc
diff --git a/parts/grepview/CMakeLists.txt b/parts/grepview/CMakeLists.txt
index 96d4042b..5ad23e4f 100644
--- a/parts/grepview/CMakeLists.txt
+++ b/parts/grepview/CMakeLists.txt
@@ -27,16 +27,16 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevgrepview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevgrepview.rc DESTINATION ${DATA_INSTALL_DIR}/tdevgrepview )
+install( FILES kdevgrepview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevgrepview.rc DESTINATION ${DATA_INSTALL_DIR}/kdevgrepview )
 
 
-##### libtdevgrepview (module) ##################
+##### libkdevgrepview (module) ##################
 
-tde_add_kpart( libtdevgrepview AUTOMOC
+tde_add_kpart( libkdevgrepview AUTOMOC
   SOURCES
     grepviewpart.cpp grepviewwidget.cpp grepdlg.cpp
   LINK
-    tdevwidgets-shared tdevelop-shared
+    kdevwidgets-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/grepview/Makefile.am b/parts/grepview/Makefile.am
index 8ae4725c..dc5f5fed 100644
--- a/parts/grepview/Makefile.am
+++ b/parts/grepview/Makefile.am
@@ -3,17 +3,17 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
 	-I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevgrepview.la
-libtdevgrepview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevgrepview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML)
+kde_module_LTLIBRARIES = libkdevgrepview.la
+libkdevgrepview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevgrepview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML)
 
-libtdevgrepview_la_SOURCES = grepviewpart.cpp grepviewwidget.cpp grepdlg.cpp
+libkdevgrepview_la_SOURCES = grepviewpart.cpp grepviewwidget.cpp grepdlg.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevgrepview.desktop
+service_DATA = kdevgrepview.desktop
 
-rcdir = $(kde_datadir)/tdevgrepview
-rc_DATA = tdevgrepview.rc
+rcdir = $(kde_datadir)/kdevgrepview
+rc_DATA = kdevgrepview.rc
diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp
index 8e8b0eb3..6333805f 100644
--- a/parts/grepview/grepdlg.cpp
+++ b/parts/grepview/grepdlg.cpp
@@ -34,7 +34,7 @@
 #include <kurlrequester.h>
 #include <kstdguiitem.h>
 #include <tdeparts/part.h>
-#include <tdevpartcontroller.h>
+#include <kdevpartcontroller.h>
 #include <klineedit.h>
 
 #include "grepviewpart.h"
diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp
index 9d6b08c5..92f4ebb6 100644
--- a/parts/grepview/grepviewpart.cpp
+++ b/parts/grepview/grepviewpart.cpp
@@ -23,26 +23,26 @@
 #include <kstringhandler.h>
 #include <tdetexteditor/document.h>
 
-#include "tdevcore.h"
-#include "tdevpartcontroller.h"
-#include "tdevmainwindow.h"
-#include "tdevplugininfo.h"
-#include "tdeveditorutil.h"
+#include "kdevcore.h"
+#include "kdevpartcontroller.h"
+#include "kdevmainwindow.h"
+#include "kdevplugininfo.h"
+#include "kdeveditorutil.h"
 #include "grepviewwidget.h"
 
-static const TDevPluginInfo data("tdevgrepview");
+static const KDevPluginInfo data("kdevgrepview");
 
-K_EXPORT_COMPONENT_FACTORY(libtdevgrepview, GrepViewFactory(data))
+K_EXPORT_COMPONENT_FACTORY(libkdevgrepview, GrepViewFactory(data))
 
 GrepViewPart::GrepViewPart( TQObject *parent, const char *name, const TQStringList & )
-    : TDevPlugin( &data, parent, name ? name : "GrepViewPart" )
+    : KDevPlugin( &data, parent, name ? name : "GrepViewPart" )
 {
     setInstance(GrepViewFactory::instance());
 
-    setXMLFile("tdevgrepview.rc");
+    setXMLFile("kdevgrepview.rc");
 
-    connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)),
-             this, TQT_SLOT(stopButtonClicked(TDevPlugin*)) );
+    connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
+             this, TQT_SLOT(stopButtonClicked(KDevPlugin*)) );
     connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) );
     connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) );
     connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
@@ -83,7 +83,7 @@ GrepViewPart::~GrepViewPart()
 }
 
 
-void GrepViewPart::stopButtonClicked(TDevPlugin* which)
+void GrepViewPart::stopButtonClicked(KDevPlugin* which)
 {
     if ( which != 0 && which != this )
         return;
@@ -129,10 +129,10 @@ void GrepViewPart::slotGrep()
 {
 	if ( !m_widget->isRunning() )
 	{
-		TQString contextString = TDevEditorUtil::currentSelection( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+		TQString contextString = KDevEditorUtil::currentSelection( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 		if ( contextString.isEmpty() )
 		{
-			contextString = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+			contextString = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 		}
 		m_widget->showDialogWithPattern( contextString );
 	}
diff --git a/parts/grepview/grepviewpart.h b/parts/grepview/grepviewpart.h
index 68c4a574..4ebd7638 100644
--- a/parts/grepview/grepviewpart.h
+++ b/parts/grepview/grepviewpart.h
@@ -13,8 +13,8 @@
 #define _GREPVIEWPART_H_
 
 #include <tqguardedptr.h>
-#include <tdevgenericfactory.h>
-#include "tdevplugin.h"
+#include <kdevgenericfactory.h>
+#include "kdevplugin.h"
 
 class KDialogBase;
 class TQPopupMenu;
@@ -22,7 +22,7 @@ class Context;
 class GrepViewWidget;
 
 
-class GrepViewPart : public TDevPlugin
+class GrepViewPart : public KDevPlugin
 {
     Q_OBJECT
   
@@ -32,7 +32,7 @@ public:
     ~GrepViewPart();
 
 private slots:
-    void stopButtonClicked(TDevPlugin *which);
+    void stopButtonClicked(KDevPlugin *which);
     void projectOpened();
     void projectClosed();
     void contextMenu(TQPopupMenu *popup, const Context *context);
@@ -46,6 +46,6 @@ private:
     friend class GrepViewWidget;
 };
 
-typedef TDevGenericFactory<GrepViewPart> GrepViewFactory;
+typedef KDevGenericFactory<GrepViewPart> GrepViewFactory;
 
 #endif
diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp
index edcdaa7c..1d709dff 100644
--- a/parts/grepview/grepviewwidget.cpp
+++ b/parts/grepview/grepviewwidget.cpp
@@ -27,10 +27,10 @@
 #include <tdemessagebox.h>
 using namespace KTextEditor;
 
-#include "tdevcore.h"
-#include "tdevproject.h"
-#include "tdevmainwindow.h"
-#include "tdevpartcontroller.h"
+#include "kdevcore.h"
+#include "kdevproject.h"
+#include "kdevmainwindow.h"
+#include "kdevpartcontroller.h"
 
 #include "grepdlg.h"
 #include "grepviewpart.h"
@@ -181,7 +181,7 @@ void GrepViewWidget::showDialog()
 		}
 	}
 	// Determine if we have a list of project files
-	TDevProject *openProject = m_part->project();
+	KDevProject *openProject = m_part->project();
 	if (openProject)
 	{
 		grepdlg->setEnableProjectBox(!openProject->allFiles().isEmpty());
@@ -225,7 +225,7 @@ void GrepViewWidget::showDialogWithPattern(TQString pattern)
 	grepdlg->setPattern( pattern );
 
 	// Determine if we have a list of project files
-	TDevProject *openProject = m_part->project();
+	KDevProject *openProject = m_part->project();
 	if (openProject)
 	{
 		grepdlg->setEnableProjectBox(!openProject->allFiles().isEmpty());
@@ -255,7 +255,7 @@ void GrepViewWidget::searchActivated()
 
 	if (grepdlg->useProjectFilesFlag())
 	{
-		TDevProject *openProject = m_part->project();
+		KDevProject *openProject = m_part->project();
 		if (openProject)
 		{
 			TQString tmpFilePath;
@@ -430,7 +430,7 @@ void GrepViewProcessWidget::insertStdoutLine(const TQCString &line)
 }
 
 
-void GrepViewWidget::projectChanged(TDevProject *project)
+void GrepViewWidget::projectChanged(KDevProject *project)
 {
 	TQString dir = project? project->projectDirectory() : TQDir::homeDirPath();
 	grepdlg->setDirectory(dir);
diff --git a/parts/grepview/grepviewwidget.h b/parts/grepview/grepviewwidget.h
index 0f05c136..3bf803b5 100644
--- a/parts/grepview/grepviewwidget.h
+++ b/parts/grepview/grepviewwidget.h
@@ -18,7 +18,7 @@
 
 class GrepDialog;
 class GrepViewPart;
-class TDevProject;
+class KDevProject;
 class KTabWidget;
 class TQHBoxLayout;
 class TQToolButton;
@@ -66,7 +66,7 @@ public:
 	GrepViewWidget(GrepViewPart *part);
 	~GrepViewWidget();
 
-	void projectChanged(TDevProject *project);
+	void projectChanged(KDevProject *project);
 	void killJob( int signo = SIGTERM );
 	bool isRunning() const;
 
diff --git a/parts/grepview/tdevgrepview.desktop b/parts/grepview/kdevgrepview.desktop
index c7b98916..0521c804 100644
--- a/parts/grepview/tdevgrepview.desktop
+++ b/parts/grepview/kdevgrepview.desktop
@@ -80,7 +80,7 @@ GenericName[zh_CN]=Grep 前端
 GenericName[zh_TW]=Grep 前端介面
 Icon=find
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevgrepview
+X-TDE-Library=libkdevgrepview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=FileSearch
diff --git a/parts/grepview/tdevgrepview.rc b/parts/grepview/kdevgrepview.rc
index 80b20389..80b20389 100644
--- a/parts/grepview/tdevgrepview.rc
+++ b/parts/grepview/kdevgrepview.rc
diff --git a/parts/konsole/CMakeLists.txt b/parts/konsole/CMakeLists.txt
index 37cd0687..e6b51296 100644
--- a/parts/konsole/CMakeLists.txt
+++ b/parts/konsole/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevkonsoleview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevkonsoleview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevkonsoleview (module) ###############
+##### libkdevkonsoleview (module) ###############
 
-tde_add_kpart( libtdevkonsoleview AUTOMOC
+tde_add_kpart( libkdevkonsoleview AUTOMOC
   SOURCES konsoleviewpart.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/konsole/Makefile.am b/parts/konsole/Makefile.am
index 1cc781d4..085f8e7a 100644
--- a/parts/konsole/Makefile.am
+++ b/parts/konsole/Makefile.am
@@ -2,15 +2,15 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevkonsoleview.la
-libtdevkonsoleview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevkonsoleview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/util/libtdevutil.la
+kde_module_LTLIBRARIES = libkdevkonsoleview.la
+libkdevkonsoleview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevkonsoleview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/util/libkdevutil.la
 
-libtdevkonsoleview_la_SOURCES = konsoleviewpart.cpp
+libkdevkonsoleview_la_SOURCES = konsoleviewpart.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevkonsoleview.desktop
+service_DATA = kdevkonsoleview.desktop
 
diff --git a/parts/konsole/tdevkonsoleview.desktop b/parts/konsole/kdevkonsoleview.desktop
index edc9018f..4a9fa14e 100644
--- a/parts/konsole/tdevkonsoleview.desktop
+++ b/parts/konsole/kdevkonsoleview.desktop
@@ -80,7 +80,7 @@ GenericName[zh_CN]=嵌入的 Konsole
 GenericName[zh_TW]=嵌入式主控台
 Icon=konsole
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevkonsoleview
+X-TDE-Library=libkdevkonsoleview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=Console
diff --git a/parts/konsole/konsoleviewpart.cpp b/parts/konsole/konsoleviewpart.cpp
index 63f720d9..873ab790 100644
--- a/parts/konsole/konsoleviewpart.cpp
+++ b/parts/konsole/konsoleviewpart.cpp
@@ -13,27 +13,27 @@
 
 #include <tqwhatsthis.h>
 
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 
-#include "tdevcore.h"
-#include "tdevproject.h"
-#include "tdevmainwindow.h"
-#include "tdevplugininfo.h"
-#include "tdevshellwidget.h"
+#include "kdevcore.h"
+#include "kdevproject.h"
+#include "kdevmainwindow.h"
+#include "kdevplugininfo.h"
+#include "kdevshellwidget.h"
 
 
-typedef TDevGenericFactory<KonsoleViewPart> KonsoleViewFactory;
-static const TDevPluginInfo data("tdevkonsoleview");
-K_EXPORT_COMPONENT_FACTORY(libtdevkonsoleview, KonsoleViewFactory(data))
+typedef KDevGenericFactory<KonsoleViewPart> KonsoleViewFactory;
+static const KDevPluginInfo data("kdevkonsoleview");
+K_EXPORT_COMPONENT_FACTORY(libkdevkonsoleview, KonsoleViewFactory(data))
 
 KonsoleViewPart::KonsoleViewPart(TQObject *parent, const char *name, const TQStringList &)
-  : TDevPlugin(&data, parent, name ? name : "KonsoleViewPart")
+  : KDevPlugin(&data, parent, name ? name : "KonsoleViewPart")
 {
     setInstance( KonsoleViewFactory::instance() );
 
-    m_widget = new TDevShellWidget( 0, "konsole widget" );
+    m_widget = new KDevShellWidget( 0, "konsole widget" );
 
     TQWhatsThis::add(m_widget, i18n("<b>Konsole</b><p>"
         "This window contains an embedded konsole window. It will try to follow you when "
diff --git a/parts/konsole/konsoleviewpart.h b/parts/konsole/konsoleviewpart.h
index 912e00b4..9bcecb38 100644
--- a/parts/konsole/konsoleviewpart.h
+++ b/parts/konsole/konsoleviewpart.h
@@ -14,12 +14,12 @@
 
 
 #include <tqguardedptr.h>
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 
 
-class TDevShellWidget;
+class KDevShellWidget;
 
-class KonsoleViewPart : public TDevPlugin
+class KonsoleViewPart : public KDevPlugin
 {
     Q_OBJECT
   
@@ -31,7 +31,7 @@ private slots:
     void projectOpened();
 
 private:
-    TQGuardedPtr<TDevShellWidget> m_widget;
+    TQGuardedPtr<KDevShellWidget> m_widget;
 };
 
 #endif
diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp
index 26ac9e29..7c21cab2 100644
--- a/parts/konsole/konsoleviewwidget.cpp
+++ b/parts/konsole/konsoleviewwidget.cpp
@@ -20,10 +20,10 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 
-#include "tdevcore.h"
-#include "tdevproject.h"
+#include "kdevcore.h"
+#include "kdevproject.h"
 #include "konsoleviewpart.h"
-#include "tdevpartcontroller.h"
+#include "kdevpartcontroller.h"
 
 #include "konsoleviewwidget.h"
 
diff --git a/parts/konsole/konsoleviewwidget.h b/parts/konsole/konsoleviewwidget.h
index 6a7f6a9f..2bf3160a 100644
--- a/parts/konsole/konsoleviewwidget.h
+++ b/parts/konsole/konsoleviewwidget.h
@@ -17,7 +17,7 @@
 #include <tqstring.h>
 
 
-class TDevProject;
+class KDevProject;
 class KonsoleWidgetPrivate;
 class KonsoleViewPart;
 namespace KParts {
diff --git a/parts/openwith/CMakeLists.txt b/parts/openwith/CMakeLists.txt
index d870a3e0..8384bdaa 100644
--- a/parts/openwith/CMakeLists.txt
+++ b/parts/openwith/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevopenwith.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevopenwith.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevopenwith (module) ##################
+##### libkdevopenwith (module) ##################
 
-tde_add_kpart( libtdevopenwith AUTOMOC
+tde_add_kpart( libkdevopenwith AUTOMOC
   SOURCES openwithpart.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/openwith/Makefile.am b/parts/openwith/Makefile.am
index 316572ef..57503a0e 100644
--- a/parts/openwith/Makefile.am
+++ b/parts/openwith/Makefile.am
@@ -2,14 +2,14 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevopenwith.la
-libtdevopenwith_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevopenwith_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevopenwith.la
+libkdevopenwith_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevopenwith_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevopenwith_la_SOURCES = openwithpart.cpp
+libkdevopenwith_la_SOURCES = openwithpart.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevopenwith.desktop
+service_DATA = kdevopenwith.desktop
 
diff --git a/parts/openwith/tdevopenwith.desktop b/parts/openwith/kdevopenwith.desktop
index fa1be30d..0108daaa 100644
--- a/parts/openwith/tdevopenwith.desktop
+++ b/parts/openwith/kdevopenwith.desktop
@@ -76,7 +76,7 @@ GenericName[zh_CN]=“打开方式”菜单项
 GenericName[zh_TW]="開啟方式"選單
 Icon=tdevelop
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevopenwith
+X-TDE-Library=libkdevopenwith
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=GlobalFileManagement,FileOpenWith
diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp
index a223f193..63fcc6d9 100644
--- a/parts/openwith/openwithpart.cpp
+++ b/parts/openwith/openwithpart.cpp
@@ -3,7 +3,7 @@
 #include <tqfile.h>
 
 #include <tdepopupmenu.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <kmimetype.h>
 #include <ktrader.h>
@@ -11,18 +11,18 @@
 #include <tdeaction.h>
 #include <kcharsets.h>
 
-#include "tdevpartcontroller.h"
-#include "tdevcore.h"
-#include "tdevplugininfo.h"
+#include "kdevpartcontroller.h"
+#include "kdevcore.h"
+#include "kdevplugininfo.h"
 #include "urlutil.h"
 
-typedef TDevGenericFactory<OpenWithPart> OpenWithFactory;
+typedef KDevGenericFactory<OpenWithPart> OpenWithFactory;
 
-static const TDevPluginInfo data("tdevopenwith");
-K_EXPORT_COMPONENT_FACTORY(libtdevopenwith, OpenWithFactory(data))
+static const KDevPluginInfo data("kdevopenwith");
+K_EXPORT_COMPONENT_FACTORY(libkdevopenwith, OpenWithFactory(data))
 
 OpenWithPart::OpenWithPart(TQObject *parent, const char *name, const TQStringList &)
-  : TDevPlugin(&data, parent, name ? name : "OpenWithPart")
+  : KDevPlugin(&data, parent, name ? name : "OpenWithPart")
 {
   setInstance( OpenWithFactory::instance() );
 
diff --git a/parts/openwith/openwithpart.h b/parts/openwith/openwithpart.h
index 0c9a20ac..bd338a3f 100644
--- a/parts/openwith/openwithpart.h
+++ b/parts/openwith/openwithpart.h
@@ -3,13 +3,13 @@
 
 #include <kurl.h>
 
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 
 class TQPopupMenu;
 class Context;
 
 
-class OpenWithPart : public TDevPlugin
+class OpenWithPart : public KDevPlugin
 {
 	Q_OBJECT
   
diff --git a/parts/outputviews/CMakeLists.txt b/parts/outputviews/CMakeLists.txt
index 18effab8..48cf38ec 100644
--- a/parts/outputviews/CMakeLists.txt
+++ b/parts/outputviews/CMakeLists.txt
@@ -30,40 +30,40 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    tdevappoutputview.desktop tdevmakeview.desktop
+    kdevappoutputview.desktop kdevmakeview.desktop
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 install( FILES
-    tdevmakeview.rc
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappoutputview )
+    kdevmakeview.rc
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappoutputview )
 
 install( FILES
-    tdevmakeview.rc
-  DESTINATION ${DATA_INSTALL_DIR}/tdevmakeview )
+    kdevmakeview.rc
+  DESTINATION ${DATA_INSTALL_DIR}/kdevmakeview )
 
 
-##### libtdevmakeview (module) ##################
+##### libkdevmakeview (module) ##################
 
-tde_add_kpart( libtdevmakeview AUTOMOC
+tde_add_kpart( libkdevmakeview AUTOMOC
   SOURCES
     makeviewpart.cpp makewidget.cpp
     directorystatusmessagefilter.cpp outputfilter.cpp
     compileerrorfilter.cpp commandcontinuationfilter.cpp
     makeitem.cpp makeactionfilter.cpp otherfilter.cpp
   LINK
-    tdevdcopextensions-static tdevextensions-static
-    tdevwidgets-shared tdevelop-shared
+    kdevdcopextensions-static kdevextensions-static
+    kdevwidgets-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
 
-##### libtdevappview (module) ###################
+##### libkdevappview (module) ###################
 
-tde_add_kpart( libtdevappview AUTOMOC
+tde_add_kpart( libkdevappview AUTOMOC
   SOURCES
     appoutputviewpart.cpp appoutputwidget.cpp filterdlg.ui
   LINK
-    tdevdcopextensions-static tdevextensions-static
-    tdevwidgets-shared tdevelop-shared
+    kdevdcopextensions-static kdevextensions-static
+    kdevwidgets-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/outputviews/Makefile.am b/parts/outputviews/Makefile.am
index 6536d0f2..6a890586 100644
--- a/parts/outputviews/Makefile.am
+++ b/parts/outputviews/Makefile.am
@@ -4,32 +4,32 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/extensions/dcop -I$(top_srcdir)/lib/util \
 	-I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevmakeview.la libtdevappview.la
+kde_module_LTLIBRARIES = libkdevmakeview.la libkdevappview.la
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevappoutputview.desktop tdevmakeview.desktop
+service_DATA = kdevappoutputview.desktop kdevmakeview.desktop
 
-rc1dir = $(kde_datadir)/tdevappoutputview
-rc1_DATA = tdevmakeview.rc
+rc1dir = $(kde_datadir)/kdevappoutputview
+rc1_DATA = kdevmakeview.rc
 
-rc2dir = $(kde_datadir)/tdevmakeview
-rc2_DATA = tdevmakeview.rc
+rc2dir = $(kde_datadir)/kdevmakeview
+rc2_DATA = kdevmakeview.rc
 
 noinst_HEADERS = filterdlg.h
 
-libtdevmakeview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevmakeview_la_LIBADD = $(top_builddir)/lib/widgets/libtdevwidgets.la \
-	$(top_builddir)/lib/interfaces/extensions/dcop/libtdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \
-	$(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la
-libtdevmakeview_la_SOURCES = makeviewpart.cpp makewidget.cpp \
+libkdevmakeview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevmakeview_la_LIBADD = $(top_builddir)/lib/widgets/libkdevwidgets.la \
+	$(top_builddir)/lib/interfaces/extensions/dcop/libkdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \
+	$(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
+libkdevmakeview_la_SOURCES = makeviewpart.cpp makewidget.cpp \
 	directorystatusmessagefilter.cpp outputfilter.cpp compileerrorfilter.cpp commandcontinuationfilter.cpp \
 	makeitem.cpp makeactionfilter.cpp otherfilter.cpp
 
-libtdevappview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevappview_la_LIBADD = $(top_builddir)/lib/widgets/libtdevwidgets.la \
-	$(top_builddir)/lib/interfaces/extensions/dcop/libtdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \
-	$(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la
-libtdevappview_la_SOURCES = appoutputviewpart.cpp appoutputwidget.cpp \
+libkdevappview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevappview_la_LIBADD = $(top_builddir)/lib/widgets/libkdevwidgets.la \
+	$(top_builddir)/lib/interfaces/extensions/dcop/libkdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \
+	$(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
+libkdevappview_la_SOURCES = appoutputviewpart.cpp appoutputwidget.cpp \
 	filterdlg.ui
diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
index 223d3855..3a0e0e7d 100644
--- a/parts/outputviews/appoutputviewpart.cpp
+++ b/parts/outputviews/appoutputviewpart.cpp
@@ -18,27 +18,27 @@
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <tdeparts/part.h>
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 #include <tdeapplication.h>
 
-#include "tdevproject.h"
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
+#include "kdevproject.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
 #include "appoutputwidget.h"
-#include "tdevpartcontroller.h"
+#include "kdevpartcontroller.h"
 #include "settings.h"
 
-static const TDevPluginInfo data("tdevappoutputview");
-typedef TDevGenericFactory< AppOutputViewPart > AppViewFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevappview, AppViewFactory( data ) )
+static const KDevPluginInfo data("kdevappoutputview");
+typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) )
 
 AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &)
-    : TDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart")
+    : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart")
 {
     setInstance(AppViewFactory::instance());
 
-    m_dcop = new TDevAppFrontendIface(this);
+    m_dcop = new KDevAppFrontendIface(this);
 
     m_widget = new AppOutputWidget(this);
     m_widget->setIcon( SmallIcon("openterm") );
@@ -51,8 +51,8 @@ AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const T
     mainWindow()->embedOutputView(m_widget, i18n("Application"), i18n("Output of the executed user program"));
     hideView();
 
-    connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)),
-             this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) );
+    connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
+             this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
     connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited()));
     connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SIGNAL(processExited()));
 }
@@ -66,7 +66,7 @@ AppOutputViewPart::~AppOutputViewPart()
     delete m_dcop;
 }
 
-void AppOutputViewPart::slotStopButtonClicked( TDevPlugin* which )
+void AppOutputViewPart::slotStopButtonClicked( KDevPlugin* which )
 {
     if ( which != 0 && which != this )
         return;
diff --git a/parts/outputviews/appoutputviewpart.h b/parts/outputviews/appoutputviewpart.h
index 306108cd..1067af97 100644
--- a/parts/outputviews/appoutputviewpart.h
+++ b/parts/outputviews/appoutputviewpart.h
@@ -14,13 +14,13 @@
 
 #include <tqguardedptr.h>
 
-#include "tdevappfrontend.h"
-#include "TDevAppFrontendIface.h"
+#include "kdevappfrontend.h"
+#include "KDevAppFrontendIface.h"
 
 
 class AppOutputWidget;
 
-class AppOutputViewPart : public TDevAppFrontend
+class AppOutputViewPart : public KDevAppFrontend
 {
     Q_OBJECT
   
@@ -45,12 +45,12 @@ signals:
     void processExited();
 
 private slots:
-    void slotStopButtonClicked(TDevPlugin*);
+    void slotStopButtonClicked(KDevPlugin*);
     void slotProcessExited();
 
 private:
     TQGuardedPtr<AppOutputWidget> m_widget;
-    TDevAppFrontendIface *m_dcop;
+    KDevAppFrontendIface *m_dcop;
     bool m_viewIsVisible;
 };
 
diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp
index 0201ce5c..50060339 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -33,9 +33,9 @@
 
 #include "appoutputviewpart.h"
 #include "filterdlg.h"
-#include "tdevpartcontroller.h"
-#include "tdevmainwindow.h"
-#include "tdevproject.h"
+#include "kdevpartcontroller.h"
+#include "kdevmainwindow.h"
+#include "kdevproject.h"
 
 AppOutputWidget::AppOutputWidget(AppOutputViewPart* part)
     : ProcessWidget(0, "app output widget"), m_part(part)
diff --git a/parts/outputviews/tdevappoutputview.desktop b/parts/outputviews/kdevappoutputview.desktop
index 7791162d..bca43d54 100644
--- a/parts/outputviews/tdevappoutputview.desktop
+++ b/parts/outputviews/kdevappoutputview.desktop
@@ -34,15 +34,15 @@ Comment[tg]=Тирезаи хориҷ кардани гузориш
 Comment[tr]=Uygulama Çıktı Görünümü
 Comment[zh_CN]=应用程序输出查看器
 Comment[zh_TW]=應用程式輸出檢視
-Name=TDevAppOutputView
+Name=KDevAppOutputView
 Name[da]=TDevelop Program-uddata fremvisning
 Name[de]=Anwendungsausgabe (TDevelop)
 Name[hi]=के-डेव-एप्प-आउटपुट-व्यू
 Name[nds]=Programmutgaav-Kieker (TDevelop)
-Name[pl]=TDevAppWidokWyjścia
+Name[pl]=KDevAppWidokWyjścia
 Name[sk]=KDev pohľad na výstup aplikácie
 Name[sv]=TDevelop programutmatningsvy
-Name[ta]=TDevApp வெளியீட்டுக் காட்சி
+Name[ta]=KDevApp வெளியீட்டுக் காட்சி
 Name[zh_TW]=TDevelop 應用程式輸出檢視
 GenericName=Application Output View
 GenericName[ca]=Visor de l'eixida de les aplicacions
@@ -78,7 +78,7 @@ GenericName[zh_CN]=应用程序输出查看器
 GenericName[zh_TW]=應用程式輸出檢視
 Icon=exec
 ServiceTypes=TDevelop/AppFrontend
-X-TDE-Library=libtdevappview
+X-TDE-Library=libkdevappview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Core
 X-TDevelop-Properties=OutputTool
diff --git a/parts/outputviews/tdevmakeview.desktop b/parts/outputviews/kdevmakeview.desktop
index 5651f031..bfea5cec 100644
--- a/parts/outputviews/tdevmakeview.desktop
+++ b/parts/outputviews/kdevmakeview.desktop
@@ -35,7 +35,7 @@ Comment[tg]=Интерфейс ба талфифгар
 Comment[tr]=Derleyici Önucu
 Comment[zh_CN]=编译器前端
 Comment[zh_TW]=編譯器前端介面
-Name=TDevMakeView
+Name=KDevMakeView
 Name[da]=TDevelop Make-visning
 Name[de]=Make-Ausgabe (TDevelop)
 Name[hi]=के-डेव-मेक-व्यू
@@ -81,7 +81,7 @@ GenericName[zh_CN]=编译器前端
 GenericName[zh_TW]=編譯器前端介面
 Icon=konsole
 ServiceTypes=TDevelop/MakeFrontend
-X-TDE-Library=libtdevmakeview
+X-TDE-Library=libkdevmakeview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Core
 X-TDevelop-Properties=OutputTool
diff --git a/parts/outputviews/tdevmakeview.rc b/parts/outputviews/kdevmakeview.rc
index 869191cb..fc8c82f6 100644
--- a/parts/outputviews/tdevmakeview.rc
+++ b/parts/outputviews/kdevmakeview.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="TDevMakeView" version="1">
+<kpartgui name="KDevMakeView" version="1">
 <MenuBar>
  <Menu name="view">
    <Action name="view_next_error" group="error_operations"/>
diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp
index 157a2c2e..ee38d144 100644
--- a/parts/outputviews/makeactionfilter.cpp
+++ b/parts/outputviews/makeactionfilter.cpp
@@ -184,11 +184,11 @@ void MakeActionFilter::test()
 		"-I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W "
 		"-Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion "
 		"-Wchar-subscripts -fno-builtin -g3 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new "
-		"-fno-common -MT tdevcore.lo -MD -MP -MF \".deps/tdevcore.Tpo\" -c -o tdevcore.lo `test -f "
-		"'/home/john/src/kde/tdevelop/lib/interfaces/tdevcore.cpp' || echo "
-		"'/home/john/src/kde/tdevelop/lib/interfaces/'`/home/john/src/kde/tdevelop/lib/interfaces/tdevcore.cpp; then mv "
-		"\".deps/tdevcore.Tpo\" \".deps/tdevcore.Plo\"; else rm -f \".deps/tdevcore.Tpo\"; exit 1; fi",
-		"compiling", "g++", "tdevcore.cpp" )
+		"-fno-common -MT kdevcore.lo -MD -MP -MF \".deps/kdevcore.Tpo\" -c -o kdevcore.lo `test -f "
+		"'/home/john/src/kde/tdevelop/lib/interfaces/kdevcore.cpp' || echo "
+		"'/home/john/src/kde/tdevelop/lib/interfaces/'`/home/john/src/kde/tdevelop/lib/interfaces/kdevcore.cpp; then mv "
+		"\".deps/kdevcore.Tpo\" \".deps/kdevcore.Plo\"; else rm -f \".deps/kdevcore.Tpo\"; exit 1; fi",
+		"compiling", "g++", "kdevcore.cpp" )
 	<< TestItem( // automake 1.7, srcdir != builddir
 		"if g++ -DHAVE_CONFIG_H -I. -I/home/john/src/kde/tdevelop/src -I.. -I/home/john/src/kde/tdevelop/lib/interfaces "
 		"-I/home/john/src/kde/tdevelop/lib/sourceinfo -I/home/john/src/kde/tdevelop/lib/util -I/home/john/src/kde/tdevelop/lib "
@@ -222,12 +222,12 @@ void MakeActionFilter::test()
 		"/bin/sh ../../libtool --silent --mode=link --tag=CXX g++ -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic "
 		"-W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align "
 		"-Wconversion -Wchar-subscripts -fno-builtin -g3 -Wformat-security -Wmissing-format-attribute -fno-exceptions "
-		"-fno-check-new -fno-common -o libtdevoutputviews.la.closure libtdevoutputviews_la_closure.lo -L/usr/X11R6/lib "
+		"-fno-check-new -fno-common -o libkdevoutputviews.la.closure libkdevoutputviews_la_closure.lo -L/usr/X11R6/lib "
 		"-L/home/john/src/kde/qt-copy/lib -L/usr/local/kde/lib -avoid-version -module -no-undefined -R /usr/local/kde/lib "
 		"-R /home/john/src/kde/qt-copy/lib -R /usr/X11R6/lib outputviewsfactory.lo makeviewpart.lo makewidget.lo "
 		"appoutputviewpart.lo appoutputwidget.lo directorystatusmessagefilter.lo outputfilter.lo compileerrorfilter.lo "
 		"commandcontinuationfilter.lo makeitem.lo makeactionfilter.lo otherfilter.lo ../../lib/libtdevelop.la",
-		"linking", "libtool", "libtdevoutputviews.la.closure" )
+		"linking", "libtool", "libkdevoutputviews.la.closure" )
 	<< TestItem( //libtool, linking 2
 		"/bin/sh ../libtool --silent --mode=link --tag=CXX g++  -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic "
 		"-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts "
@@ -254,12 +254,12 @@ void MakeActionFilter::test()
 		"echo '/home/andris/cvs-developement/head/quanta/quanta/project/'`/home/andris/cvs-developement/head/quanta/quanta/project/project.cpp	",
 		"compiling", "g++", "project.cpp")
 	<< TestItem(
-		"/usr/local/kde/bin/dcopidl /home/john/src/kde/tdevelop/lib/interfaces/TDevAppFrontendIface.h > TDevAppFrontendIface.kidl "
-		"|| ( rm -f TDevAppFrontendIface.kidl ; /bin/false )",
-		"generating", "dcopidl", "TDevAppFrontendIface.kidl" )
+		"/usr/local/kde/bin/dcopidl /home/john/src/kde/tdevelop/lib/interfaces/KDevAppFrontendIface.h > KDevAppFrontendIface.kidl "
+		"|| ( rm -f KDevAppFrontendIface.kidl ; /bin/false )",
+		"generating", "dcopidl", "KDevAppFrontendIface.kidl" )
 	<< TestItem(
-		"/usr/local/kde/bin/dcopidl2cpp --c++-suffix cpp --no-signals --no-stub TDevAppFrontendIface.kidl",
-		"compiling", "dcopidl2cpp", "TDevAppFrontendIface.kidl" )
+		"/usr/local/kde/bin/dcopidl2cpp --c++-suffix cpp --no-signals --no-stub KDevAppFrontendIface.kidl",
+		"compiling", "dcopidl2cpp", "KDevAppFrontendIface.kidl" )
 	<< TestItem( //install
 		"/usr/bin/install -c -p -m 644 /home/andris/development/quanta/quanta/kommander/editor/kmdr-editor.desktop "
 		"/opt/trinity/share/applnk/Editors/kmdr-editor.desktop", "installing", "", "/opt/trinity/share/applnk/Editors/kmdr-editor.desktop")
diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp
index e8eb6a75..9324bcb0 100644
--- a/parts/outputviews/makeviewpart.cpp
+++ b/parts/outputviews/makeviewpart.cpp
@@ -17,27 +17,27 @@
 #include <tdelocale.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
-#include "tdevproject.h"
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
+#include "kdevproject.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
 
 #include "makewidget.h"
 
-static const TDevPluginInfo data("tdevmakeview");
-typedef TDevGenericFactory< MakeViewPart > MakeViewFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevmakeview, MakeViewFactory( data ) )
+static const KDevPluginInfo data("kdevmakeview");
+typedef KDevGenericFactory< MakeViewPart > MakeViewFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) )
 
 MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &)
-    : TDevMakeFrontend(&data, parent, name)
+    : KDevMakeFrontend(&data, parent, name)
 {
     setInstance(MakeViewFactory::instance());
 
-    setXMLFile("tdevmakeview.rc");
+    setXMLFile("kdevmakeview.rc");
 
-    m_dcop = new TDevMakeFrontendIface(this);
+    m_dcop = new KDevMakeFrontendIface(this);
 
     m_widget = new MakeWidget(this);
     m_widget->setIcon( SmallIcon("exec") );
@@ -61,8 +61,8 @@ MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringLis
     action->setToolTip( i18n("Go to the previous error") );
     action->setWhatsThis(i18n("<b>Previous error</b><p>Switches to the file and line where the previous error was reported from."));
 
-    connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)),
-             this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) );
+    connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
+             this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
 }
 
 
@@ -74,7 +74,7 @@ MakeViewPart::~MakeViewPart()
     delete m_dcop;
 }
 
-void MakeViewPart::slotStopButtonClicked(TDevPlugin* which)
+void MakeViewPart::slotStopButtonClicked(KDevPlugin* which)
 {
     if ( which != 0 && which != this )
         return;
diff --git a/parts/outputviews/makeviewpart.h b/parts/outputviews/makeviewpart.h
index 420eebcb..89f2a8bd 100644
--- a/parts/outputviews/makeviewpart.h
+++ b/parts/outputviews/makeviewpart.h
@@ -14,13 +14,13 @@
 
 #include <tqguardedptr.h>
 
-#include "tdevmakefrontend.h"
-#include "TDevMakeFrontendIface.h"
+#include "kdevmakefrontend.h"
+#include "KDevMakeFrontendIface.h"
 
 
 class MakeWidget;
 
-class MakeViewPart : public TDevMakeFrontend
+class MakeViewPart : public KDevMakeFrontend
 {
     Q_OBJECT
   
@@ -32,7 +32,7 @@ public:
     virtual void updateSettingsFromConfig();
 
 private slots:
-    void slotStopButtonClicked(TDevPlugin*);
+    void slotStopButtonClicked(KDevPlugin*);
     
 protected:
     virtual void queueCommand(const TQString &dir, const TQString &command);
@@ -40,7 +40,7 @@ protected:
 
 private:
     TQGuardedPtr<MakeWidget> m_widget;
-    TDevMakeFrontendIface *m_dcop;
+    KDevMakeFrontendIface *m_dcop;
     friend class MakeWidget;
 };
 
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 0e2e6aef..029efdc6 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -10,10 +10,10 @@
  ***************************************************************************/
 
 #include "makewidget.h"
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
-#include "tdevproject.h"
-#include "tdevpartcontroller.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
+#include "kdevproject.h"
+#include "kdevpartcontroller.h"
 #include "processlinemaker.h"
 #include "makeviewpart.h"
 #include "makeitem.h"
diff --git a/parts/outputviews/outputviewsfactory.cpp b/parts/outputviews/outputviewsfactory.cpp
index d63621d6..55e5bf55 100644
--- a/parts/outputviews/outputviewsfactory.cpp
+++ b/parts/outputviews/outputviewsfactory.cpp
@@ -11,11 +11,11 @@
 
 #include "outputviewsfactory.h"
 
-static const TDevPluginInfo data("tdevoutputviews", I18N_NOOP("Messages Output"), "1.0");
+static const KDevPluginInfo data("kdevoutputviews", I18N_NOOP("Messages Output"), "1.0");
 
-K_EXPORT_COMPONENT_FACTORY( libtdevoutputviews, OutputViewsFactory( &data ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevoutputviews, OutputViewsFactory( &data ) )
 
-const TDevPluginInfo *outputViewsInfo()
+const KDevPluginInfo *outputViewsInfo()
 {
     return data;
 }
diff --git a/parts/outputviews/outputviewsfactory.h b/parts/outputviews/outputviewsfactory.h
index e79e60a2..4bcba666 100644
--- a/parts/outputviews/outputviewsfactory.h
+++ b/parts/outputviews/outputviewsfactory.h
@@ -12,16 +12,16 @@
 #ifndef _OUTPUTVIEWSFACTORY_H_
 #define _OUTPUTVIEWSFACTORY_H_
 
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 
 #include "appoutputviewpart.h"
 #include "makeviewpart.h"
 
-class TDevPluginInfo;
+class KDevPluginInfo;
 
 typedef K_TYPELIST_2( AppOutputViewPart, MakeViewPart ) OutputViews;
-typedef TDevGenericFactory< OutputViews > OutputViewsFactory;
+typedef KDevGenericFactory< OutputViews > OutputViewsFactory;
 
-const TDevPluginInfo *outputViewsInfo();
+const KDevPluginInfo *outputViewsInfo();
 
 #endif
diff --git a/parts/partexplorer/CMakeLists.txt b/parts/partexplorer/CMakeLists.txt
index 8b9b130f..7fe5080f 100644
--- a/parts/partexplorer/CMakeLists.txt
+++ b/parts/partexplorer/CMakeLists.txt
@@ -25,13 +25,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevpartexplorer.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpartexplorer.rc DESTINATION ${DATA_INSTALL_DIR}/tdevpartexplorer )
+install( FILES kdevpartexplorer.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpartexplorer.rc DESTINATION ${DATA_INSTALL_DIR}/kdevpartexplorer )
 
 
-##### libtdevpartexplorer (module) ##############
+##### libkdevpartexplorer (module) ##############
 
-tde_add_kpart( libtdevpartexplorer AUTOMOC
+tde_add_kpart( libkdevpartexplorer AUTOMOC
   SOURCES
     partexplorerformbase.ui partexplorerform.cpp
     partexplorer_plugin.cpp
diff --git a/parts/partexplorer/Makefile.am b/parts/partexplorer/Makefile.am
index b0d8dd8a..fcb6caff 100644
--- a/parts/partexplorer/Makefile.am
+++ b/parts/partexplorer/Makefile.am
@@ -2,16 +2,16 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevpartexplorer.la
-libtdevpartexplorer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevpartexplorer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevpartexplorer.la
+libkdevpartexplorer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevpartexplorer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevpartexplorer_la_SOURCES = partexplorerformbase.ui partexplorerform.cpp partexplorer_plugin.cpp
+libkdevpartexplorer_la_SOURCES = partexplorerformbase.ui partexplorerform.cpp partexplorer_plugin.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevpartexplorer.desktop
+service_DATA = kdevpartexplorer.desktop
 
-rcdir = $(kde_datadir)/tdevpartexplorer
-rc_DATA = tdevpartexplorer.rc
+rcdir = $(kde_datadir)/kdevpartexplorer
+rc_DATA = kdevpartexplorer.rc
diff --git a/parts/partexplorer/tdevpartexplorer.desktop b/parts/partexplorer/kdevpartexplorer.desktop
index 0e1242c4..ff432eeb 100644
--- a/parts/partexplorer/tdevpartexplorer.desktop
+++ b/parts/partexplorer/kdevpartexplorer.desktop
@@ -32,7 +32,7 @@ Comment[tg]=Воситаи графикӣ барои иҷро намудани �
 Comment[tr]=Kayıtlı servisler için TDETrader-benzeri sorgular yapmayı sağlayan bir grafiksel araç
 Comment[zh_CN]=调用TDETrader的图形工具－就像查询已经注册的服务。
 Comment[zh_TW]=執行類似 TDETrader 查詢註冊服務的圖形化工具
-Name=TDevPartExplorer
+Name=KDevPartExplorer
 Name[da]=TDevelop Part-søger
 Name[nds]=TDevelop-Komponentkieker
 Name[sk]=KDev Part prieskumník
@@ -70,7 +70,7 @@ GenericName[tr]=Bileşen Gezinti Aracı
 GenericName[zh_CN]=模块浏览器工具
 GenericName[zh_TW]=元件探索工具
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevpartexplorer
+X-TDE-Library=libkdevpartexplorer
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=KDEDevelopment
diff --git a/parts/partexplorer/tdevpartexplorer.rc b/parts/partexplorer/kdevpartexplorer.rc
index 1dff4ed6..9632115b 100644
--- a/parts/partexplorer/tdevpartexplorer.rc
+++ b/parts/partexplorer/kdevpartexplorer.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="TDevPartExplorer" version="4">
+<kpartgui name="KDevPartExplorer" version="4">
 <MenuBar>
   <Menu name="tools" >
     <Action name="show_partexplorerform"/>
diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp
index 43ab5717..d5240edb 100644
--- a/parts/partexplorer/partexplorer_plugin.cpp
+++ b/parts/partexplorer/partexplorer_plugin.cpp
@@ -13,28 +13,28 @@
 
 #include <kinstance.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdemainwindow.h>
 
-#include <tdevplugininfo.h>
-#include <tdevmainwindow.h>
+#include <kdevplugininfo.h>
+#include <kdevmainwindow.h>
 
 #include "partexplorerform.h"
 
-static const TDevPluginInfo data("tdevpartexplorer");
+static const KDevPluginInfo data("kdevpartexplorer");
 
-typedef TDevGenericFactory<PartExplorerPlugin> PartExplorerPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevpartexplorer, PartExplorerPluginFactory( data ) )
+typedef KDevGenericFactory<PartExplorerPlugin> PartExplorerPluginFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( data ) )
 
 PartExplorerPlugin::PartExplorerPlugin(  TQObject *parent, const char *name, const TQStringList & )
-    : TDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" )
+    : KDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" )
 {
     // we need an instance
     setInstance( PartExplorerPluginFactory::instance() );
 
-    setXMLFile( "tdevpartexplorer.rc" );
+    setXMLFile( "kdevpartexplorer.rc" );
 
     // this should be your custom internal widget
     m_widget = new PartExplorerForm( mainWindow()->main() );
diff --git a/parts/partexplorer/partexplorer_plugin.h b/parts/partexplorer/partexplorer_plugin.h
index 622ff002..eea44750 100644
--- a/parts/partexplorer/partexplorer_plugin.h
+++ b/parts/partexplorer/partexplorer_plugin.h
@@ -14,14 +14,14 @@
 
 #include <tqguardedptr.h>
 
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 
 class TQWidget;
 class TQPainter;
 class KURL;
 class PartExplorerForm;
 
-class PartExplorerPlugin : public TDevPlugin
+class PartExplorerPlugin : public KDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/quickopen/CMakeLists.txt b/parts/quickopen/CMakeLists.txt
index ad6fa926..cb82433f 100644
--- a/parts/quickopen/CMakeLists.txt
+++ b/parts/quickopen/CMakeLists.txt
@@ -28,13 +28,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevquickopen.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpart_quickopen.rc DESTINATION ${DATA_INSTALL_DIR}/tdevquickopen )
+install( FILES kdevquickopen.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpart_quickopen.rc DESTINATION ${DATA_INSTALL_DIR}/kdevquickopen )
 
 
-##### libtdevquickopen (module) #################
+##### libkdevquickopen (module) #################
 
-tde_add_kpart( libtdevquickopen AUTOMOC
+tde_add_kpart( libkdevquickopen AUTOMOC
   SOURCES
     quickopen_part.cpp quickopendialog.cpp
     quickopenclassdialog.cpp quickopenbase.ui
diff --git a/parts/quickopen/Makefile.am b/parts/quickopen/Makefile.am
index cce44ae3..ca7ed3dd 100644
--- a/parts/quickopen/Makefile.am
+++ b/parts/quickopen/Makefile.am
@@ -1,17 +1,17 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions \
 	-I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevquickopen.la
-libtdevquickopen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevquickopen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML)
+kde_module_LTLIBRARIES = libkdevquickopen.la
+libkdevquickopen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevquickopen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML)
 
-libtdevquickopen_la_SOURCES = quickopen_part.cpp quickopendialog.cpp quickopenclassdialog.cpp quickopenbase.ui quickopenfiledialog.cpp quickopenfunctiondialog.cpp quickopenfunctionchooseformbase.ui quickopenfunctionchooseform.cpp
+libkdevquickopen_la_SOURCES = quickopen_part.cpp quickopendialog.cpp quickopenclassdialog.cpp quickopenbase.ui quickopenfiledialog.cpp quickopenfunctiondialog.cpp quickopenfunctionchooseformbase.ui quickopenfunctionchooseform.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevquickopen.desktop
+service_DATA = kdevquickopen.desktop
 
-rcdir = $(kde_datadir)/tdevquickopen
-rc_DATA = tdevpart_quickopen.rc
+rcdir = $(kde_datadir)/kdevquickopen
+rc_DATA = kdevpart_quickopen.rc
 noinst_HEADERS = quickopendialog.h quickopenclassdialog.h quickopenfiledialog.h quickopenfunctiondialog.h quickopenfunctionchooseform.h
diff --git a/parts/quickopen/tdevpart_quickopen.rc b/parts/quickopen/kdevpart_quickopen.rc
index 6a50fc22..6a50fc22 100644
--- a/parts/quickopen/tdevpart_quickopen.rc
+++ b/parts/quickopen/kdevpart_quickopen.rc
diff --git a/parts/quickopen/tdevquickopen.desktop b/parts/quickopen/kdevquickopen.desktop
index ed500ad4..42a8e8ff 100644
--- a/parts/quickopen/tdevquickopen.desktop
+++ b/parts/quickopen/kdevquickopen.desktop
@@ -75,6 +75,6 @@ GenericName[zh_TW]=快速開啟
 Icon=tdevelop
 ServiceTypes=TDevelop/QuickOpen
 X-TDevelop-Scope=Project
-X-TDE-Library=libtdevquickopen
+X-TDE-Library=libkdevquickopen
 X-TDevelop-Version=5
 X-TDevelop-Properties=CodeNavigation
diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp
index 3a8a10c4..4d316e68 100644
--- a/parts/quickopen/quickopen_part.cpp
+++ b/parts/quickopen/quickopen_part.cpp
@@ -27,25 +27,25 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <klineedit.h>
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
 #include <tdemainwindow.h>
 
 #include <tdeparts/part.h>
 #include <tdetexteditor/document.h>
 
-#include <tdevmainwindow.h>
-#include <tdevcore.h>
-#include <tdevpartcontroller.h>
-#include <tdevproject.h>
+#include <kdevmainwindow.h>
+#include <kdevcore.h>
+#include <kdevpartcontroller.h>
+#include <kdevproject.h>
 #include <codebrowserfrontend.h>
 
-#include "tdeveditorutil.h"
+#include "kdeveditorutil.h"
 
-typedef TDevGenericFactory<QuickOpenPart> QuickOpenFactory;
-static const TDevPluginInfo data("tdevquickopen");
-K_EXPORT_COMPONENT_FACTORY( libtdevquickopen, QuickOpenFactory( data ) )
+typedef KDevGenericFactory<QuickOpenPart> QuickOpenFactory;
+static const KDevPluginInfo data("kdevquickopen");
+K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( data ) )
 
 using namespace KTextEditor;
 
@@ -53,7 +53,7 @@ QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringL
     : KDevQuickOpen(&data, parent, name ? name : "QuickOpenPart" )
 {
     setInstance(QuickOpenFactory::instance());
-    setXMLFile("tdevpart_quickopen.rc");
+    setXMLFile("kdevpart_quickopen.rc");
 
     m_actionQuickOpen = new TDEAction( i18n("Quick Open File..."), CTRL + ALT + Key_O,
 				       this, TQT_SLOT(slotQuickFileOpen()),
@@ -100,14 +100,14 @@ void QuickOpenPart::slotQuickFileOpen( )
 void QuickOpenPart::slotQuickOpenClass( )
 {
     QuickOpenClassDialog dlg( this, mainWindow()->main() );    
-    dlg.nameEdit->setText( TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) );
+    dlg.nameEdit->setText( KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) );
     dlg.exec();
 }
 
 void QuickOpenPart::slotQuickOpenFunction()
 {
     QuickOpenFunctionDialog dlg( this, mainWindow()->main() );
-    dlg.nameEdit->setText( TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) );
+    dlg.nameEdit->setText( KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) );
     dlg.exec();
 }
 
@@ -119,7 +119,7 @@ void QuickOpenPart::slotSwitchTo()
 
 void QuickOpenPart::selectItem( ItemDom item )
 {
-    Extensions::TDevCodeBrowserFrontend* f = extension< Extensions::TDevCodeBrowserFrontend > ( "KDevelop/CodeBrowserFrontend" );
+    Extensions::KDevCodeBrowserFrontend* f = extension< Extensions::KDevCodeBrowserFrontend > ( "KDevelop/CodeBrowserFrontend" );
     
     if(f != 0) {
         ItemDom itemDom( &(*item) );
diff --git a/parts/quickopen/quickopen_part.h b/parts/quickopen/quickopen_part.h
index aff0d4f6..fa1d85e3 100644
--- a/parts/quickopen/quickopen_part.h
+++ b/parts/quickopen/quickopen_part.h
@@ -18,11 +18,11 @@
  *
  */
 
-#ifndef __TDEVPART_QUICKOPEN_H__
-#define __TDEVPART_QUICKOPEN_H__
+#ifndef __KDEVPART_QUICKOPEN_H__
+#define __KDEVPART_QUICKOPEN_H__
 
 #include <tqguardedptr.h>
-#include <tdevquickopen.h>
+#include <kdevquickopen.h>
 #include <codemodel.h>
 
 class TDEAction;
diff --git a/parts/quickopen/quickopenclassdialog.cpp b/parts/quickopen/quickopenclassdialog.cpp
index 7dcfd48b..37987166 100644
--- a/parts/quickopen/quickopenclassdialog.cpp
+++ b/parts/quickopen/quickopenclassdialog.cpp
@@ -18,9 +18,9 @@
  *
  */
 
-#include <tdevproject.h>
-#include <tdevpartcontroller.h>
-#include <tdevlanguagesupport.h>
+#include <kdevproject.h>
+#include <kdevpartcontroller.h>
+#include <kdevlanguagesupport.h>
 
 #include <tdelistbox.h>
 #include <tdelocale.h>
diff --git a/parts/quickopen/quickopenfiledialog.cpp b/parts/quickopen/quickopenfiledialog.cpp
index fc8da49a..18f15974 100644
--- a/parts/quickopen/quickopenfiledialog.cpp
+++ b/parts/quickopen/quickopenfiledialog.cpp
@@ -18,8 +18,8 @@
  *
  */
 
-#include <tdevproject.h>
-#include <tdevpartcontroller.h>
+#include <kdevproject.h>
+#include <kdevpartcontroller.h>
 
 
 #include <tdelistbox.h>
diff --git a/parts/quickopen/quickopenfunctiondialog.cpp b/parts/quickopen/quickopenfunctiondialog.cpp
index 14f7a984..bbcab7e4 100644
--- a/parts/quickopen/quickopenfunctiondialog.cpp
+++ b/parts/quickopen/quickopenfunctiondialog.cpp
@@ -28,11 +28,11 @@
 #include <tdemessagebox.h>
 #include <klineedit.h>
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 #include <codemodel_utils.h>
-#include <tdevpartcontroller.h>
-#include <tdevproject.h>
-#include <tdevlanguagesupport.h>
+#include <kdevpartcontroller.h>
+#include <kdevproject.h>
+#include <kdevlanguagesupport.h>
 #include <tqregexp.h>
 
 
diff --git a/parts/regexptest/CMakeLists.txt b/parts/regexptest/CMakeLists.txt
index 3bc96414..608f053c 100644
--- a/parts/regexptest/CMakeLists.txt
+++ b/parts/regexptest/CMakeLists.txt
@@ -25,13 +25,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevregexptest.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevregexptest.rc DESTINATION ${DATA_INSTALL_DIR}/tdevregexptest )
+install( FILES kdevregexptest.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevregexptest.rc DESTINATION ${DATA_INSTALL_DIR}/kdevregexptest )
 
 
-##### libtdevregexptest (module) ################
+##### libkdevregexptest (module) ################
 
-tde_add_kpart( libtdevregexptest AUTOMOC
+tde_add_kpart( libkdevregexptest AUTOMOC
   SOURCES
     regexptestpart.cpp regexptestdlg.cpp regexptestdlgbase.ui
   LINK tdevelop-shared
diff --git a/parts/regexptest/Makefile.am b/parts/regexptest/Makefile.am
index 8e87ac79..df99989f 100644
--- a/parts/regexptest/Makefile.am
+++ b/parts/regexptest/Makefile.am
@@ -2,16 +2,16 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevregexptest.la
-libtdevregexptest_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevregexptest_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevregexptest.la
+libkdevregexptest_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevregexptest_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevregexptest_la_SOURCES = regexptestpart.cpp regexptestdlg.cpp regexptestdlgbase.ui
+libkdevregexptest_la_SOURCES = regexptestpart.cpp regexptestdlg.cpp regexptestdlgbase.ui
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevregexptest.desktop
+service_DATA = kdevregexptest.desktop
 
-rcdir = $(kde_datadir)/tdevregexptest
-rc_DATA = tdevregexptest.rc
+rcdir = $(kde_datadir)/kdevregexptest
+rc_DATA = kdevregexptest.rc
diff --git a/parts/regexptest/tdevregexptest.desktop b/parts/regexptest/kdevregexptest.desktop
index e0978750..57f93f73 100644
--- a/parts/regexptest/tdevregexptest.desktop
+++ b/parts/regexptest/kdevregexptest.desktop
@@ -76,7 +76,7 @@ GenericName[tr]=Düzenli İfade Test Edicisi
 GenericName[zh_CN]=正则表达式测试
 GenericName[zh_TW]=正規表示式測試器
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevregexptest
+X-TDE-Library=libkdevregexptest
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=ScriptDevelopment,CDevelopment,CPPDevelopment
diff --git a/parts/regexptest/tdevregexptest.rc b/parts/regexptest/kdevregexptest.rc
index 99893d7f..99893d7f 100644
--- a/parts/regexptest/tdevregexptest.rc
+++ b/parts/regexptest/kdevregexptest.rc
diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp
index 200bee12..bd426411 100644
--- a/parts/regexptest/regexptestdlg.cpp
+++ b/parts/regexptest/regexptestdlg.cpp
@@ -32,11 +32,11 @@
 #include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 
-#include "tdevplugin.h"
-#include "tdevpartcontroller.h"
+#include "kdevplugin.h"
+#include "kdevpartcontroller.h"
 
 
-RegexpTestDialog::RegexpTestDialog(TDevPlugin *part)
+RegexpTestDialog::RegexpTestDialog(KDevPlugin *part)
     : RegexpTestDialogBase(0, "regexp test dialog", false), _regexp_dialog(0)
 {
     pattern_edit->setFocus();
diff --git a/parts/regexptest/regexptestdlg.h b/parts/regexptest/regexptestdlg.h
index 09e656d2..4c7094a6 100644
--- a/parts/regexptest/regexptestdlg.h
+++ b/parts/regexptest/regexptestdlg.h
@@ -14,7 +14,7 @@
 
 #include "regexptestdlgbase.h"
 
-class TDevPlugin;
+class KDevPlugin;
 
 
 class RegexpTestDialog : public RegexpTestDialogBase
@@ -23,7 +23,7 @@ class RegexpTestDialog : public RegexpTestDialogBase
   
     
 public:
-    RegexpTestDialog( TDevPlugin *part );
+    RegexpTestDialog( KDevPlugin *part );
     ~RegexpTestDialog();
 
 protected:
@@ -39,7 +39,7 @@ private:
     virtual void checkKRegExp();
     virtual void insertQuoted();
 
-    TDevPlugin *m_part;
+    KDevPlugin *m_part;
 
     TQDialog * _regexp_dialog;
 };
diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp
index 0ca0b083..6c45a492 100644
--- a/parts/regexptest/regexptestpart.cpp
+++ b/parts/regexptest/regexptestpart.cpp
@@ -12,23 +12,23 @@
 #include "regexptestpart.h"
 
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 #include <tdeaction.h>
 
-#include "tdevcore.h"
+#include "kdevcore.h"
 #include "regexptestdlg.h"
 
-static const TDevPluginInfo data("tdevregexptest");
+static const KDevPluginInfo data("kdevregexptest");
 
-typedef TDevGenericFactory<RegexpTestPart> RegexpTestFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevregexptest, RegexpTestFactory( data ) )
+typedef KDevGenericFactory<RegexpTestPart> RegexpTestFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( data ) )
 
 RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStringList &)
-    : TDevPlugin(&data, parent, name ? name : "RegexpTestPart")
+    : KDevPlugin(&data, parent, name ? name : "RegexpTestPart")
 {
     setInstance(RegexpTestFactory::instance());
-    setXMLFile("tdevregexptest.rc");
+    setXMLFile("kdevregexptest.rc");
 
     TDEAction *action;
 
diff --git a/parts/regexptest/regexptestpart.h b/parts/regexptest/regexptestpart.h
index 3488e910..ec153d90 100644
--- a/parts/regexptest/regexptestpart.h
+++ b/parts/regexptest/regexptestpart.h
@@ -14,12 +14,12 @@
 
 #include <tqguardedptr.h>
 #include <kdialogbase.h>
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 
 class RegexpTestDialog;
 
 
-class RegexpTestPart : public TDevPlugin
+class RegexpTestPart : public KDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/replace/CMakeLists.txt b/parts/replace/CMakeLists.txt
index b32da714..4779e553 100644
--- a/parts/replace/CMakeLists.txt
+++ b/parts/replace/CMakeLists.txt
@@ -26,13 +26,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevreplace.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpart_replace.rc DESTINATION ${DATA_INSTALL_DIR}/tdevreplace )
+install( FILES kdevreplace.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpart_replace.rc DESTINATION ${DATA_INSTALL_DIR}/kdevreplace )
 
 
-##### libtdevreplace (module) ###################
+##### libkdevreplace (module) ###################
 
-tde_add_kpart( libtdevreplace AUTOMOC
+tde_add_kpart( libkdevreplace AUTOMOC
   SOURCES
     replace_part.cpp replace_widget.cpp replacedlg.ui
     replaceitem.cpp replaceview.cpp replacedlgimpl.cpp
diff --git a/parts/replace/Makefile.am b/parts/replace/Makefile.am
index 36d8e64f..8d75f0e8 100644
--- a/parts/replace/Makefile.am
+++ b/parts/replace/Makefile.am
@@ -2,15 +2,15 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevreplace.la
-libtdevreplace_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevreplace_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
-libtdevreplace_la_SOURCES = replace_part.cpp replace_widget.cpp replacedlg.ui replaceitem.cpp replaceview.cpp replacedlgimpl.cpp
+kde_module_LTLIBRARIES = libkdevreplace.la
+libkdevreplace_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevreplace_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+libkdevreplace_la_SOURCES = replace_part.cpp replace_widget.cpp replacedlg.ui replaceitem.cpp replaceview.cpp replacedlgimpl.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevreplace.desktop
+service_DATA = kdevreplace.desktop
 
-rcdir = $(kde_datadir)/tdevreplace
-rc_DATA = tdevpart_replace.rc
+rcdir = $(kde_datadir)/kdevreplace
+rc_DATA = kdevpart_replace.rc
diff --git a/parts/replace/tdevpart_replace.rc b/parts/replace/kdevpart_replace.rc
index e3818308..e3818308 100644
--- a/parts/replace/tdevpart_replace.rc
+++ b/parts/replace/kdevpart_replace.rc
diff --git a/parts/replace/tdevreplace.desktop b/parts/replace/kdevreplace.desktop
index cd05c65c..d2490c05 100644
--- a/parts/replace/tdevreplace.desktop
+++ b/parts/replace/kdevreplace.desktop
@@ -75,6 +75,6 @@ GenericName[zh_TW]=取代元件
 Icon=tdevelop
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Global
-X-TDE-Library=libtdevreplace
+X-TDE-Library=libkdevreplace
 X-TDevelop-Version=5
 X-TDevelop-Properties=FileReplace
diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp
index 40bfb1ea..447548ef 100644
--- a/parts/replace/replace_part.cpp
+++ b/parts/replace/replace_part.cpp
@@ -15,25 +15,25 @@
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 #include <kdebug.h>
 #include <kstringhandler.h>
-#include <tdevcore.h>
-#include <tdevmainwindow.h>
+#include <kdevcore.h>
+#include <kdevmainwindow.h>
 
 #include "replace_widget.h"
 
-static const TDevPluginInfo data("tdevreplace");
+static const KDevPluginInfo data("kdevreplace");
 
-typedef TDevGenericFactory<ReplacePart> ReplaceFactory;
-K_EXPORT_COMPONENT_FACTORY(libtdevreplace, ReplaceFactory(data))
+typedef KDevGenericFactory<ReplacePart> ReplaceFactory;
+K_EXPORT_COMPONENT_FACTORY(libkdevreplace, ReplaceFactory(data))
 
 ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList& )
-        : TDevPlugin( &data, parent, name ? name : "ReplacePart" )
+        : KDevPlugin( &data, parent, name ? name : "ReplacePart" )
 {
     setInstance(ReplaceFactory::instance());
-    setXMLFile("tdevpart_replace.rc");
+    setXMLFile("kdevpart_replace.rc");
 
     m_widget = new ReplaceWidget(this);
     m_widget->setIcon( SmallIcon("filefind") );
diff --git a/parts/replace/replace_part.h b/parts/replace/replace_part.h
index f0316eb0..fbd0f2f7 100644
--- a/parts/replace/replace_part.h
+++ b/parts/replace/replace_part.h
@@ -9,12 +9,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef __TDEVPART_REPLACE_H__
-#define __TDEVPART_REPLACE_H__
+#ifndef __KDEVPART_REPLACE_H__
+#define __KDEVPART_REPLACE_H__
 
 
 #include <tqguardedptr.h>
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 #include <tqpopupmenu.h>
 
 
@@ -22,7 +22,7 @@ class ReplaceWidget;
 class TDEAction;
 class Context;
 
-class ReplacePart : public TDevPlugin
+class ReplacePart : public KDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp
index 34dd3afd..6b1bcbda 100644
--- a/parts/replace/replace_widget.cpp
+++ b/parts/replace/replace_widget.cpp
@@ -26,11 +26,11 @@
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/selectioninterface.h>
-#include <tdevpartcontroller.h>
-#include <tdevcore.h>
-#include <tdevmainwindow.h>
-#include <tdevproject.h>
-#include <tdevpartcontroller.h>
+#include <kdevpartcontroller.h>
+#include <kdevcore.h>
+#include <kdevmainwindow.h>
+#include <kdevproject.h>
+#include <kdevpartcontroller.h>
 #include <kcombobox.h>
 #include <tdelocale.h>
 #include <kstdguiitem.h>
@@ -87,7 +87,7 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part)
     connect( _cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( clear() ) );
     connect( _listview, TQT_SIGNAL( editDocument( const TQString &, int ) ), TQT_SLOT( editDocument( const TQString &, int ) ) );
 
-    connect( m_part->core(), TQT_SIGNAL( stopButtonClicked( TDevPlugin * ) ), TQT_SLOT( stopButtonClicked( TDevPlugin * ) ) );
+    connect( m_part->core(), TQT_SIGNAL( stopButtonClicked( KDevPlugin * ) ), TQT_SLOT( stopButtonClicked( KDevPlugin * ) ) );
 }
 
 //BEGIN Slots
@@ -184,7 +184,7 @@ void ReplaceWidget::editDocument( TQString const & file, int line )
     m_part->partController()->editDocument( KURL( file ), line );
 }
 
-void ReplaceWidget::stopButtonClicked( TDevPlugin * which )
+void ReplaceWidget::stopButtonClicked( KDevPlugin * which )
 {
     if ( which != 0 && which != m_part )
         return;
diff --git a/parts/replace/replace_widget.h b/parts/replace/replace_widget.h
index 64ca50e2..c9063928 100644
--- a/parts/replace/replace_widget.h
+++ b/parts/replace/replace_widget.h
@@ -36,7 +36,7 @@ public:
 
 public slots:
     void showDialog();
-    void stopButtonClicked( TDevPlugin * );
+    void stopButtonClicked( KDevPlugin * );
 
 protected:
     virtual void focusInEvent(TQFocusEvent *e);
diff --git a/parts/scripting/CMakeLists.txt b/parts/scripting/CMakeLists.txt
index 371cf8f6..f906bd02 100644
--- a/parts/scripting/CMakeLists.txt
+++ b/parts/scripting/CMakeLists.txt
@@ -26,13 +26,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevscripting.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevscripting.rc DESTINATION ${DATA_INSTALL_DIR}/tdevscripting )
+install( FILES kdevscripting.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevscripting.rc DESTINATION ${DATA_INSTALL_DIR}/kdevscripting )
 
 
-##### libtdevscripting (module) #################
+##### libkdevscripting (module) #################
 
-tde_add_kpart( libtdevscripting AUTOMOC
+tde_add_kpart( libkdevscripting AUTOMOC
   SOURCES
     scriptingpart.cpp scriptingglobalconfigbase.ui
     scriptingglobalconfig.cpp
diff --git a/parts/scripting/Makefile.am b/parts/scripting/Makefile.am
index 9de6d889..7262dac9 100644
--- a/parts/scripting/Makefile.am
+++ b/parts/scripting/Makefile.am
@@ -1,20 +1,20 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevscripting.la
-libtdevscripting_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevscripting_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevscripting.la
+libkdevscripting_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevscripting_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevscripting_la_SOURCES = scriptingpart.cpp scriptingglobalconfigbase.ui \
+libkdevscripting_la_SOURCES = scriptingpart.cpp scriptingglobalconfigbase.ui \
 	scriptingglobalconfig.cpp
 
 METASOURCES = AUTO
 
-appsharedir = $(kde_datadir)/tdevscripting
+appsharedir = $(kde_datadir)/kdevscripting
 appshare_DATA = 
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevscripting.desktop
+service_DATA = kdevscripting.desktop
 
-rcdir = $(kde_datadir)/tdevscripting
-rc_DATA = tdevscripting.rc
+rcdir = $(kde_datadir)/kdevscripting
+rc_DATA = kdevscripting.rc
 noinst_HEADERS = scriptingglobalconfig.h  scriptingpart.h
diff --git a/parts/scripting/tdevscripting.desktop b/parts/scripting/kdevscripting.desktop
index afa0cc10..22ef15e8 100644
--- a/parts/scripting/tdevscripting.desktop
+++ b/parts/scripting/kdevscripting.desktop
@@ -72,6 +72,6 @@ X-TDevelop-Plugin-Copyright=(C) by ian reinhart geiser
 X-TDevelop-Args=
 
 X-TDevelop-Scope=Global
-X-TDE-Library=libtdevscripting
+X-TDE-Library=libkdevscripting
 X-TDevelop-Version=5
 X-TDevelop-Properties=CodeEditing
diff --git a/parts/scripting/tdevscripting.rc b/parts/scripting/kdevscripting.rc
index 217bece1..217bece1 100644
--- a/parts/scripting/tdevscripting.rc
+++ b/parts/scripting/kdevscripting.rc
diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
index 4ebee2b0..80a33c9e 100644
--- a/parts/scripting/scriptingpart.cpp
+++ b/parts/scripting/scriptingpart.cpp
@@ -29,29 +29,29 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <tdemessagebox.h>
-#include <tdevplugininfo.h>
-#include <tdevgenericfactory.h>
+#include <kdevplugininfo.h>
+#include <kdevgenericfactory.h>
 
-#include <tdevcore.h>
-#include <tdevmainwindow.h>
+#include <kdevcore.h>
+#include <kdevmainwindow.h>
 #include <configwidgetproxy.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include "scriptingglobalconfig.h"
 #include "tdescriptactionmanager.h"
 
-typedef TDevGenericFactory<scriptingPart> scriptingFactory;
-TDevPluginInfo data("tdevscripting");
-K_EXPORT_COMPONENT_FACTORY( libtdevscripting, scriptingFactory( data ) )
+typedef KDevGenericFactory<scriptingPart> scriptingFactory;
+KDevPluginInfo data("kdevscripting");
+K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( data ) )
 
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
 scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-    : TDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L)
+    : KDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L)
 {
     setInstance(scriptingFactory::instance());
-    setXMLFile("tdevscripting.rc");
+    setXMLFile("kdevscripting.rc");
 
     m_configProxy = new ConfigWidgetProxy(core());
     m_configProxy->createGlobalConfigPage(i18n("Scripting"), GLOBALDOC_OPTIONS, info()->icon());
diff --git a/parts/scripting/scriptingpart.h b/parts/scripting/scriptingpart.h
index ca6bafd9..832318b9 100644
--- a/parts/scripting/scriptingpart.h
+++ b/parts/scripting/scriptingpart.h
@@ -18,10 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#ifndef TDEVSCRIPTING_H
-#define TDEVSCRIPTING_H
+#ifndef KDEVSCRIPTING_H
+#define KDEVSCRIPTING_H
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 #include <tqguardedptr.h>
 
@@ -34,7 +34,7 @@ class KScriptActionManager;
 /**
 Please read the README.dox file for more info about this part
 */
-class scriptingPart: public TDevPlugin
+class scriptingPart: public KDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/snippet/CMakeLists.txt b/parts/snippet/CMakeLists.txt
index 43776bf0..704ec3e9 100644
--- a/parts/snippet/CMakeLists.txt
+++ b/parts/snippet/CMakeLists.txt
@@ -26,13 +26,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevsnippet.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpart_snippet.rc DESTINATION ${DATA_INSTALL_DIR}/tdevsnippet )
+install( FILES kdevsnippet.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpart_snippet.rc DESTINATION ${DATA_INSTALL_DIR}/kdevsnippet )
 
 
-##### libtdevsnippet (module) ###################
+##### libkdevsnippet (module) ###################
 
-tde_add_kpart( libtdevsnippet AUTOMOC
+tde_add_kpart( libkdevsnippet AUTOMOC
   SOURCES
     snippet_part.cpp snippet_widget.cpp snippetdlg.ui
     snippetitem.cpp snippetsettingsbase.ui snippetsettings.cpp
diff --git a/parts/snippet/Makefile.am b/parts/snippet/Makefile.am
index d2429963..e2c207a4 100644
--- a/parts/snippet/Makefile.am
+++ b/parts/snippet/Makefile.am
@@ -1,17 +1,17 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevsnippet.la
-libtdevsnippet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevsnippet_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevsnippet.la
+libkdevsnippet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevsnippet_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevsnippet_la_SOURCES = snippet_part.cpp snippet_widget.cpp snippetdlg.ui snippetitem.cpp snippetsettingsbase.ui snippetsettings.cpp snippetconfig.cpp
+libkdevsnippet_la_SOURCES = snippet_part.cpp snippet_widget.cpp snippetdlg.ui snippetitem.cpp snippetsettingsbase.ui snippetsettings.cpp snippetconfig.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevsnippet.desktop
+service_DATA = kdevsnippet.desktop
 
-rc_DATA = tdevpart_snippet.rc
-rcdir = $(kde_datadir)/tdevsnippet
+rc_DATA = kdevpart_snippet.rc
+rcdir = $(kde_datadir)/kdevsnippet
 
 noinst_HEADERS = snippetdlg.h snippetitem.h snippetsettingsbase.h snippetsettings.h snippetconfig.h
diff --git a/parts/snippet/tdevpart_snippet.rc b/parts/snippet/kdevpart_snippet.rc
index f4b9d2db..4f34ec50 100644
--- a/parts/snippet/tdevpart_snippet.rc
+++ b/parts/snippet/kdevpart_snippet.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="snippet" library="libtdevsnippet" version="3">
+<kpartplugin name="snippet" library="libkdevsnippet" version="3">
 	<MenuBar>
 	</MenuBar>
 	<Menu name="hidden">
diff --git a/parts/snippet/tdevsnippet.desktop b/parts/snippet/kdevsnippet.desktop
index b257280c..f9ba9652 100644
--- a/parts/snippet/tdevsnippet.desktop
+++ b/parts/snippet/kdevsnippet.desktop
@@ -97,6 +97,6 @@ GenericName[zh_TW]=程式碼片段
 Icon=editcut
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Global
-X-TDE-Library=libtdevsnippet
+X-TDE-Library=libkdevsnippet
 X-TDevelop-Version=5
 X-TDevelop-Properties=CodeEditing
diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp
index e31ebe7a..82969151 100644
--- a/parts/snippet/snippet_part.cpp
+++ b/parts/snippet/snippet_part.cpp
@@ -20,11 +20,11 @@
 #include <tqbuttongroup.h>
 #include <ktrader.h>
 
-#include "tdevcore.h"
-#include <tdevproject.h>
-#include "tdevmainwindow.h"
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include "kdevcore.h"
+#include <kdevproject.h>
+#include "kdevmainwindow.h"
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
 #include <kdebug.h>
 
@@ -33,15 +33,15 @@
 #include "snippetsettings.h"
 #include "snippetconfig.h"
 
-static const TDevPluginInfo data("tdevsnippet");
-typedef TDevGenericFactory<SnippetPart> snippetFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevsnippet, snippetFactory( data ) )
+static const KDevPluginInfo data("kdevsnippet");
+typedef KDevGenericFactory<SnippetPart> snippetFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( data ) )
 
 SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& )
-  : TDevPlugin(&data, parent, name ? name : "SnippetPart" )
+  : KDevPlugin(&data, parent, name ? name : "SnippetPart" )
 {
   setInstance(snippetFactory::instance());
-  setXMLFile("tdevpart_snippet.rc");
+  setXMLFile("kdevpart_snippet.rc");
 
   m_widget = new SnippetWidget(this);
   m_widget->setCaption(i18n("Code Snippets"));
diff --git a/parts/snippet/snippet_part.h b/parts/snippet/snippet_part.h
index 98a809cf..8ffd8fce 100644
--- a/parts/snippet/snippet_part.h
+++ b/parts/snippet/snippet_part.h
@@ -7,12 +7,12 @@
  */
 
 
-#ifndef __TDEVPART_SNIPPET_H__
-#define __TDEVPART_SNIPPET_H__
+#ifndef __KDEVPART_SNIPPET_H__
+#define __KDEVPART_SNIPPET_H__
 
 
 #include <tqguardedptr.h>
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 
 class SnippetWidget;
@@ -20,11 +20,11 @@ class TDEAboutData;
 class KDialogBase;
 
 /*
-This is the TDevPlugin for the CodeSnippet feature
+This is the KDevPlugin for the CodeSnippet feature
 For more info read the README.dox file
 @author Robert Gruber
 */
-class SnippetPart : public TDevPlugin
+class SnippetPart : public KDevPlugin
 {
   Q_OBJECT
   
diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index 6b59f16f..9cd4ae4b 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -36,9 +36,9 @@
 #include <kcombobox.h>
 #include <tdeversion.h>
 
-#include <tdevcore.h>
-#include <tdevproject.h>
-#include <tdevpartcontroller.h>
+#include <kdevcore.h>
+#include <kdevproject.h>
+#include <kdevpartcontroller.h>
 
 #include "snippetdlg.h"
 #include "snippetitem.h"
@@ -418,7 +418,7 @@ void SnippetWidget::initConfigOldVersion(TDEConfig *cfg)
 void SnippetWidget::initConfig()
 {
   if (_cfg == NULL)
-    _cfg = new TDEConfig("tdevsnippetrc", false, false);
+    _cfg = new TDEConfig("kdevsnippetrc", false, false);
 
   _cfg->setGroup("SnippetPart");
 
diff --git a/parts/snippet/snippet_widget.h b/parts/snippet/snippet_widget.h
index 4d534802..8b6c17a1 100644
--- a/parts/snippet/snippet_widget.h
+++ b/parts/snippet/snippet_widget.h
@@ -19,7 +19,7 @@
 #include <tdetexteditor/view.h>
 #include "snippetconfig.h"
 
-class TDevProject;
+class KDevProject;
 class SnippetPart;
 class TQPushButton;
 class TDEListView;
diff --git a/parts/texttools/CMakeLists.txt b/parts/texttools/CMakeLists.txt
index 4a893dd4..2ed4221c 100644
--- a/parts/texttools/CMakeLists.txt
+++ b/parts/texttools/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevtexttools.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevtexttools.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevtexttools (module) #################
+##### libkdevtexttools (module) #################
 
-tde_add_kpart( libtdevtexttools AUTOMOC
+tde_add_kpart( libkdevtexttools AUTOMOC
   SOURCES texttoolspart.cpp texttoolswidget.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/texttools/Makefile.am b/parts/texttools/Makefile.am
index 105eec32..725133be 100644
--- a/parts/texttools/Makefile.am
+++ b/parts/texttools/Makefile.am
@@ -2,17 +2,17 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces 	   -I$(top_srcdir)/lib/sourceinfo 	   -I$(top_srcdir)/lib/util 	   $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevtexttools.la
-libtdevtexttools_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevtexttools_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevtexttools.la
+libkdevtexttools_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevtexttools_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevtexttools_la_SOURCES = texttoolspart.cpp texttoolswidget.cpp
+libkdevtexttools_la_SOURCES = texttoolspart.cpp texttoolswidget.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevtexttools.desktop
+service_DATA = kdevtexttools.desktop
 
 # not used currently
-#rcdir = $(kde_datadir)/tdevtexttools
-#rc_DATA = tdevtexttools.rc
+#rcdir = $(kde_datadir)/kdevtexttools
+#rc_DATA = kdevtexttools.rc
diff --git a/parts/texttools/tdevtexttools.desktop b/parts/texttools/kdevtexttools.desktop
index c9caf618..fd5fc736 100644
--- a/parts/texttools/tdevtexttools.desktop
+++ b/parts/texttools/kdevtexttools.desktop
@@ -78,7 +78,7 @@ GenericName[tr]=Metin Yapısı
 GenericName[zh_CN]=文件结构
 GenericName[zh_TW]=文字結構
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevtexttools
+X-TDE-Library=libkdevtexttools
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=CodeNavigation
diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp
index 857e2bec..4453030a 100644
--- a/parts/texttools/texttoolspart.cpp
+++ b/parts/texttools/texttoolspart.cpp
@@ -14,25 +14,25 @@
 #include <tqwhatsthis.h>
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 #include <tdetexteditor/editinterface.h>
 
-#include "tdevpartcontroller.h"
-#include "tdevmainwindow.h"
+#include "kdevpartcontroller.h"
+#include "kdevmainwindow.h"
 
 #include "texttoolswidget.h"
 
 
-typedef TDevGenericFactory<TextToolsPart> TextToolsFactory;
-static const TDevPluginInfo data("tdevtexttools");
-K_EXPORT_COMPONENT_FACTORY( libtdevtexttools, TextToolsFactory( data ) )
+typedef KDevGenericFactory<TextToolsPart> TextToolsFactory;
+static const KDevPluginInfo data("kdevtexttools");
+K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( data ) )
 
 TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringList &)
-    : TDevPlugin(&data, parent, name ? name : "TextToolsPart")
+    : KDevPlugin(&data, parent, name ? name : "TextToolsPart")
 {
     setInstance(TextToolsFactory::instance());
-    //    setXMLFile("tdevfileview.rc");
+    //    setXMLFile("kdevfileview.rc");
 
     m_widget = 0;
     
diff --git a/parts/texttools/texttoolspart.h b/parts/texttools/texttoolspart.h
index fa911d98..0d822a65 100644
--- a/parts/texttools/texttoolspart.h
+++ b/parts/texttools/texttoolspart.h
@@ -14,12 +14,12 @@
 
 #include <tqguardedptr.h>
 #include <tdeparts/part.h>
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 
 class TextToolsWidget;
 
 
-class TextToolsPart : public TDevPlugin
+class TextToolsPart : public KDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp
index ebf0c56b..db2f0acc 100644
--- a/parts/texttools/texttoolswidget.cpp
+++ b/parts/texttools/texttoolswidget.cpp
@@ -22,8 +22,8 @@
 #include <tdetexteditor/selectioninterface.h>
 #include <tdetexteditor/editinterface.h>
 
-#include "tdevmainwindow.h"
-#include "tdevpartcontroller.h"
+#include "kdevmainwindow.h"
+#include "kdevpartcontroller.h"
 #include "texttoolspart.h"
 
 
diff --git a/parts/tipofday/CMakeLists.txt b/parts/tipofday/CMakeLists.txt
index c3990be1..753f65e1 100644
--- a/parts/tipofday/CMakeLists.txt
+++ b/parts/tipofday/CMakeLists.txt
@@ -27,14 +27,14 @@ link_directories(
 ##### other data ################################
 
 tde_install_icons( )
-install( FILES tdevtipofday.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tips DESTINATION ${DATA_INSTALL_DIR}/tdevtipofday )
-install( FILES tdevpart_tipofday.rc DESTINATION ${DATA_INSTALL_DIR}/tdevtipofday )
+install( FILES kdevtipofday.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tips DESTINATION ${DATA_INSTALL_DIR}/kdevtipofday )
+install( FILES kdevpart_tipofday.rc DESTINATION ${DATA_INSTALL_DIR}/kdevtipofday )
 
 
-##### libtdevtipofday (module) ##################
+##### libkdevtipofday (module) ##################
 
-tde_add_kpart( libtdevtipofday AUTOMOC
+tde_add_kpart( libkdevtipofday AUTOMOC
   SOURCES tipofday_part.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/tipofday/Makefile.am b/parts/tipofday/Makefile.am
index 22560851..4ec54292 100644
--- a/parts/tipofday/Makefile.am
+++ b/parts/tipofday/Makefile.am
@@ -1,24 +1,24 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevtipofday.la
-libtdevtipofday_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevtipofday_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevtipofday.la
+libkdevtipofday_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevtipofday_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevtipofday_la_SOURCES = tipofday_part.cpp
+libkdevtipofday_la_SOURCES = tipofday_part.cpp
 
 METASOURCES = AUTO
 KDE_ICON = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevtipofday.desktop
+service_DATA = kdevtipofday.desktop
 
 tip_DATA = tips
-tipdir = $(kde_datadir)/tdevtipofday
+tipdir = $(kde_datadir)/kdevtipofday
 
-rc_DATA = tdevpart_tipofday.rc
-rcdir = $(kde_datadir)/tdevtipofday
+rc_DATA = kdevpart_tipofday.rc
+rcdir = $(kde_datadir)/kdevtipofday
 
 messages: rc.cpp
 	$(PREPARETIPS) > tips.cc
-	$(XGETTEXT) *.cpp *.h tips.cc -o $(podir)/tdevtipofday.pot
+	$(XGETTEXT) *.cpp *.h tips.cc -o $(podir)/kdevtipofday.pot
 	rm -f tips.cc
diff --git a/parts/tipofday/tdevpart_tipofday.rc b/parts/tipofday/kdevpart_tipofday.rc
index 43f7d1dc..43f7d1dc 100644
--- a/parts/tipofday/tdevpart_tipofday.rc
+++ b/parts/tipofday/kdevpart_tipofday.rc
diff --git a/parts/tipofday/tdevtipofday.desktop b/parts/tipofday/kdevtipofday.desktop
index 53d6d9c9..7efdbd9f 100644
--- a/parts/tipofday/tdevtipofday.desktop
+++ b/parts/tipofday/kdevtipofday.desktop
@@ -88,7 +88,7 @@ GenericName[zh_CN]=日积月累
 GenericName[zh_TW]=本日小提示
 Icon=tdevelop
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevtipofday
+X-TDE-Library=libkdevtipofday
 X-TDevelop-Version=5
 X-TDevelop-Scope=Core
 X-TDevelop-Properties=Documentation
diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp
index f86ebf1f..6cd63deb 100644
--- a/parts/tipofday/tipofday_part.cpp
+++ b/parts/tipofday/tipofday_part.cpp
@@ -8,28 +8,28 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ktextbrowser.h>
 #include <ktip.h>
 
-#include "tdevapi.h"
-#include "tdevcore.h"
+#include "kdevapi.h"
+#include "kdevcore.h"
 
-static const TDevPluginInfo data("tdevtipofday");
+static const KDevPluginInfo data("kdevtipofday");
 
-typedef TDevGenericFactory<TipOfDayPart> TipOfDayFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevtipofday, TipOfDayFactory( data ) )
+typedef KDevGenericFactory<TipOfDayPart> TipOfDayFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( data ) )
 
 TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringList &)
-  : TDevPlugin(&data, parent, name ? name : "TipOfDayPart")
+  : KDevPlugin(&data, parent, name ? name : "TipOfDayPart")
 {
   setInstance(TipOfDayFactory::instance());
 
-  setXMLFile("tdevpart_tipofday.rc");
+  setXMLFile("kdevpart_tipofday.rc");
 
   TDEAction *action;
 
diff --git a/parts/tipofday/tipofday_part.h b/parts/tipofday/tipofday_part.h
index b5aafe50..4b982800 100644
--- a/parts/tipofday/tipofday_part.h
+++ b/parts/tipofday/tipofday_part.h
@@ -3,14 +3,14 @@
  */
  
 
-#ifndef __TDEVPART_TIPOFDAY_H__
-#define __TDEVPART_TIPOFDAY_H__
+#ifndef __KDEVPART_TIPOFDAY_H__
+#define __KDEVPART_TIPOFDAY_H__
 
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 
-class TipOfDayPart : public TDevPlugin
+class TipOfDayPart : public KDevPlugin
 {
   Q_OBJECT
   
diff --git a/parts/tools/CMakeLists.txt b/parts/tools/CMakeLists.txt
index aaa0d462..7bd64c81 100644
--- a/parts/tools/CMakeLists.txt
+++ b/parts/tools/CMakeLists.txt
@@ -28,13 +28,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevtools.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpart_tools.rc DESTINATION ${DATA_INSTALL_DIR}/tdevtools )
+install( FILES kdevtools.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpart_tools.rc DESTINATION ${DATA_INSTALL_DIR}/kdevtools )
 
 
-##### libtdevtools (module) #####################
+##### libkdevtools (module) #####################
 
-tde_add_kpart( libtdevtools AUTOMOC
+tde_add_kpart( libkdevtools AUTOMOC
   SOURCES
     tools_part.cpp toolsconfig.cpp toolsconfigwidgetbase.ui
     toolsconfigwidget.cpp kapplicationtree.cpp addtooldlg.ui
diff --git a/parts/tools/Makefile.am b/parts/tools/Makefile.am
index da4d9d0b..a61da964 100644
--- a/parts/tools/Makefile.am
+++ b/parts/tools/Makefile.am
@@ -1,16 +1,16 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevtools.la
-libtdevtools_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevtools_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevtools.la
+libkdevtools_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevtools_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevtools_la_SOURCES = tools_part.cpp toolsconfig.cpp toolsconfigwidgetbase.ui toolsconfigwidget.cpp kapplicationtree.cpp addtooldlg.ui
+libkdevtools_la_SOURCES = tools_part.cpp toolsconfig.cpp toolsconfigwidgetbase.ui toolsconfigwidget.cpp kapplicationtree.cpp addtooldlg.ui
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevtools.desktop
+service_DATA = kdevtools.desktop
 
-rc_DATA = tdevpart_tools.rc
-rcdir = $(kde_datadir)/tdevtools
+rc_DATA = kdevpart_tools.rc
+rcdir = $(kde_datadir)/kdevtools
diff --git a/parts/tools/addtooldlg.ui b/parts/tools/addtooldlg.ui
index 09fd5424..a1a6157e 100644
--- a/parts/tools/addtooldlg.ui
+++ b/parts/tools/addtooldlg.ui
@@ -159,7 +159,7 @@ executed.&lt;/p&gt;</string>
                 <string>The path and name of the application to execute</string>
             </property>
         </widget>
-        <widget class="TDevApplicationTree" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="KDevApplicationTree" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>tree</cstring>
             </property>
@@ -179,7 +179,7 @@ executed.&lt;/p&gt;</string>
 </widget>
 <customwidgets>
     <customwidget>
-        <class>TDevApplicationTree</class>
+        <class>KDevApplicationTree</class>
         <header location="local">kapplicationtree.h</header>
         <sizehint>
             <width>-1</width>
diff --git a/parts/tools/addtooldlg.ui.h b/parts/tools/addtooldlg.ui.h
index cabb91e7..fea69766 100644
--- a/parts/tools/addtooldlg.ui.h
+++ b/parts/tools/addtooldlg.ui.h
@@ -23,7 +23,7 @@ TQString AddToolDialog::getApp()
 
 void AddToolDialog::treeSelectionChanged( TQListViewItem * lvi )
 {
-    TDevAppTreeListItem* item = dynamic_cast<TDevAppTreeListItem*> ( lvi );
+    KDevAppTreeListItem* item = dynamic_cast<KDevAppTreeListItem*> ( lvi );
     if ( !item || item->isDirectory() )
 	return;
     execEdit->setURL( item->executable() );
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp
index 18e31265..8c13a4ea 100644
--- a/parts/tools/kapplicationtree.cpp
+++ b/parts/tools/kapplicationtree.cpp
@@ -1,5 +1,5 @@
 /*  This file is part of the KDE libraries
-    Nicked from KDElibs since TDevApplicationTree is not a public class..
+    Nicked from KDElibs since KDevApplicationTree is not a public class..
 
     Copyright (C) 1997 Torben Weis <weis@stud.uni-frankfurt.de>
     Copyright (C) 1999 Dirk A. Mueller <dmuell@gmx.net>
@@ -65,7 +65,7 @@ template class TQPtrList<TQString>;
 
 // ----------------------------------------------------------------------
 
-TDevAppTreeListItem::TDevAppTreeListItem( TDEListView* parent, const TQString & name,
+KDevAppTreeListItem::KDevAppTreeListItem( TDEListView* parent, const TQString & name,
                                     const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE )
     : TQListViewItem( parent, name )
 {
@@ -75,7 +75,7 @@ TDevAppTreeListItem::TDevAppTreeListItem( TDEListView* parent, const TQString &
 
 // ----------------------------------------------------------------------
 
-TDevAppTreeListItem::TDevAppTreeListItem( TQListViewItem* parent, const TQString & name,
+KDevAppTreeListItem::KDevAppTreeListItem( TQListViewItem* parent, const TQString & name,
                                     const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE )
     : TQListViewItem( parent, name )
 {
@@ -85,7 +85,7 @@ TDevAppTreeListItem::TDevAppTreeListItem( TQListViewItem* parent, const TQString
 
 // ----------------------------------------------------------------------
 
-void TDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry)
+void KDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry)
 {
     setPixmap(0, pixmap);
     parsed = parse;
@@ -101,7 +101,7 @@ void TDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, con
 // ----------------------------------------------------------------------
 // Ensure that dirs are sorted in front of files and case is ignored
 
-TQString TDevAppTreeListItem::key(int column, bool /*ascending*/) const
+TQString KDevAppTreeListItem::key(int column, bool /*ascending*/) const
 {
     if (directory)
         return TQString::fromLatin1(" ") + text(column).upper();
@@ -109,29 +109,29 @@ TQString TDevAppTreeListItem::key(int column, bool /*ascending*/) const
         return text(column).upper();
 }
 
-void TDevAppTreeListItem::activate()
+void KDevAppTreeListItem::activate()
 {
     if ( directory )
         setOpen(!isOpen());
 }
 
-void TDevAppTreeListItem::setOpen( bool o )
+void KDevAppTreeListItem::setOpen( bool o )
 {
     if( o && !parsed ) { // fill the children before opening
-        ((TDevApplicationTree *) parent())->addDesktopGroup( path, this );
+        ((KDevApplicationTree *) parent())->addDesktopGroup( path, this );
         parsed = true;
     }
     TQListViewItem::setOpen( o );
 }
 
-bool TDevAppTreeListItem::isDirectory()
+bool KDevAppTreeListItem::isDirectory()
 {
     return directory;
 }
 
 // ----------------------------------------------------------------------
 
-TDevApplicationTree::TDevApplicationTree( TQWidget *parent, const char* name )
+KDevApplicationTree::KDevApplicationTree( TQWidget *parent, const char* name )
     : TDEListView( parent, name ), currentitem(0)
 {
     addColumn( i18n("Known Applications") );
@@ -145,7 +145,7 @@ TDevApplicationTree::TDevApplicationTree( TQWidget *parent, const char* name )
 
 // ----------------------------------------------------------------------
 
-bool TDevApplicationTree::isDirSel()
+bool KDevApplicationTree::isDirSel()
 {
     if (!currentitem) return false; // if currentitem isn't set
     return currentitem->isDirectory();
@@ -153,12 +153,12 @@ bool TDevApplicationTree::isDirSel()
 
 // ----------------------------------------------------------------------
 
-void TDevApplicationTree::addDesktopGroup( TQString relPath, TDevAppTreeListItem *item)
+void KDevApplicationTree::addDesktopGroup( TQString relPath, KDevAppTreeListItem *item)
 {
    KServiceGroup::Ptr root = KServiceGroup::group(relPath);
    KServiceGroup::List list = root->entries();
 
-   TDevAppTreeListItem * newItem;
+   KDevAppTreeListItem * newItem;
    for( KServiceGroup::List::ConstIterator it = list.begin();
        it != list.end(); it++)
    {
@@ -200,10 +200,10 @@ void TDevApplicationTree::addDesktopGroup( TQString relPath, TDevAppTreeListItem
       TQPixmap pixmap = SmallIcon( icon );
 
       if (item)
-         newItem = new TDevAppTreeListItem( item, text, pixmap, false, isDir,
+         newItem = new KDevAppTreeListItem( item, text, pixmap, false, isDir,
                                          relPath, exec, dEntry );
       else
-         newItem = new TDevAppTreeListItem( this, text, pixmap, false, isDir,
+         newItem = new KDevAppTreeListItem( this, text, pixmap, false, isDir,
                                          relPath, exec, dEntry );
       if (isDir)
          newItem->setExpandable( true );
@@ -213,13 +213,13 @@ void TDevApplicationTree::addDesktopGroup( TQString relPath, TDevAppTreeListItem
 
 // ----------------------------------------------------------------------
 
-void TDevApplicationTree::slotItemHighlighted(TQListViewItem* i)
+void KDevApplicationTree::slotItemHighlighted(TQListViewItem* i)
 {
     // i may be 0 (see documentation)
     if(!i)
         return;
 
-    TDevAppTreeListItem *item = (TDevAppTreeListItem *) i;
+    KDevAppTreeListItem *item = (KDevAppTreeListItem *) i;
 
     currentitem = item;
 
@@ -230,13 +230,13 @@ void TDevApplicationTree::slotItemHighlighted(TQListViewItem* i)
 
 // ----------------------------------------------------------------------
 
-void TDevApplicationTree::slotSelectionChanged(TQListViewItem* i)
+void KDevApplicationTree::slotSelectionChanged(TQListViewItem* i)
 {
     // i may be 0 (see documentation)
     if(!i)
         return;
 
-    TDevAppTreeListItem *item = (TDevAppTreeListItem *) i;
+    KDevAppTreeListItem *item = (KDevAppTreeListItem *) i;
 
     currentitem = item;
 
@@ -246,7 +246,7 @@ void TDevApplicationTree::slotSelectionChanged(TQListViewItem* i)
 
 // ----------------------------------------------------------------------
 
-void TDevApplicationTree::resizeEvent( TQResizeEvent * e)
+void KDevApplicationTree::resizeEvent( TQResizeEvent * e)
 {
     setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent));
     TDEListView::resizeEvent(e);
diff --git a/parts/tools/kapplicationtree.h b/parts/tools/kapplicationtree.h
index b45bbeac..0ba2cc9f 100644
--- a/parts/tools/kapplicationtree.h
+++ b/parts/tools/kapplicationtree.h
@@ -16,8 +16,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef __TDevApplicationTree_h__
-#define __TDevApplicationTree_h__
+#ifndef __KDevApplicationTree_h__
+#define __KDevApplicationTree_h__
 
 #include <kurl.h>
 #include <tdelistview.h>
@@ -36,7 +36,7 @@ class TQStringList;
 /**
  * @internal
  */
-class TDevAppTreeListItem : public TQListViewItem
+class KDevAppTreeListItem : public TQListViewItem
 {
     bool parsed;
     bool directory;
@@ -50,9 +50,9 @@ protected:
     void init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry);
 
 public:
-    TDevAppTreeListItem( TDEListView* parent, const TQString & name, const TQPixmap& pixmap,
+    KDevAppTreeListItem( TDEListView* parent, const TQString & name, const TQPixmap& pixmap,
                       bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE );
-    TDevAppTreeListItem( TQListViewItem* parent, const TQString & name, const TQPixmap& pixmap,
+    KDevAppTreeListItem( TQListViewItem* parent, const TQString & name, const TQPixmap& pixmap,
                       bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE );
     bool isDirectory();
 
@@ -63,7 +63,7 @@ protected:
     virtual void activate();
     virtual void setOpen( bool o );
 
-    friend class TDevApplicationTree;
+    friend class KDevApplicationTree;
 };
 
 /* ------------------------------------------------------------------------- */
@@ -71,23 +71,23 @@ protected:
 /**
  * @internal
  */
-class TDevApplicationTree : public TDEListView
+class KDevApplicationTree : public TDEListView
 {
     Q_OBJECT
   
 public:
-    TDevApplicationTree( TQWidget *parent, const char* name = 0 );
+    KDevApplicationTree( TQWidget *parent, const char* name = 0 );
 
     /**
      * Add a group of .desktop/.kdelnk entries
      */
-    void addDesktopGroup( TQString relPath, TDevAppTreeListItem *item = 0 );
+    void addDesktopGroup( TQString relPath, KDevAppTreeListItem *item = 0 );
 
     bool isDirSel();
 
 protected:
     void resizeEvent( TQResizeEvent *_ev );
-    TDevAppTreeListItem* currentitem;
+    KDevAppTreeListItem* currentitem;
 
 public slots:
     void slotItemHighlighted(TQListViewItem* i);
diff --git a/parts/tools/tdevpart_tools.rc b/parts/tools/kdevpart_tools.rc
index ab8a6a98..ab8a6a98 100644
--- a/parts/tools/tdevpart_tools.rc
+++ b/parts/tools/kdevpart_tools.rc
diff --git a/parts/tools/tdevtools.desktop b/parts/tools/kdevtools.desktop
index 3b7e8272..225b4b5f 100644
--- a/parts/tools/tdevtools.desktop
+++ b/parts/tools/kdevtools.desktop
@@ -76,7 +76,7 @@ GenericName[zh_CN]=工具菜单附加
 GenericName[zh_TW]=新增工具選單
 Icon=configure
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevtools
+X-TDE-Library=libkdevtools
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=AdditionalTools
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index c6e4a242..8734eadc 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -19,14 +19,14 @@
 #include <kprocess.h>
 #include <tdetexteditor/document.h>
 
-#include "tdevcore.h"
-#include "tdevproject.h"
-#include "tdevpartcontroller.h"
-#include "tdevappfrontend.h"
-#include "tdevplugininfo.h"
+#include "kdevcore.h"
+#include "kdevproject.h"
+#include "kdevpartcontroller.h"
+#include "kdevappfrontend.h"
+#include "kdevplugininfo.h"
 #include "urlutil.h"
 #include "configwidgetproxy.h"
-#include "tdeveditorutil.h"
+#include "kdeveditorutil.h"
 
 #include "toolsconfig.h"
 #include "toolsconfigwidget.h"
@@ -34,17 +34,17 @@
 #define TOOLSSETTINGS 1
 #define EXTRATOOLSSETTINGS 2
 
-static const TDevPluginInfo data("tdevtools");
-K_EXPORT_COMPONENT_FACTORY( libtdevtools, ToolsFactory( data ) )
+static const KDevPluginInfo data("kdevtools");
+K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( data ) )
 
 TQMap<int, TQString> externalToolMenuEntries;
 
 ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &)
-	: TDevPlugin( &data, parent, name ? name : "ToolsPart")
+	: KDevPlugin( &data, parent, name ? name : "ToolsPart")
 {
   setInstance(ToolsFactory::instance());
 
-  setXMLFile("tdevpart_tools.rc");
+  setXMLFile("kdevpart_tools.rc");
 
 	m_configProxy = new ConfigWidgetProxy( core() );
 	m_configProxy->createGlobalConfigPage( i18n("Tools Menu"), TOOLSSETTINGS, info()->icon() );
@@ -128,11 +128,11 @@ void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName)
     if (project())
         projectDirectory = project()->projectDirectory();
     
-    TQString selection = TDevEditorUtil::currentSelection( doc );
+    TQString selection = KDevEditorUtil::currentSelection( doc );
     if ( !selection.isEmpty() )
         selection = KShellProcess::quote( selection );
 
-    TQString word = TDevEditorUtil::currentWord( doc );
+    TQString word = KDevEditorUtil::currentWord( doc );
     
     // This should really be checked before inserting into the popup
     if (cmdline.contains("%D") && projectDirectory.isNull())
@@ -153,7 +153,7 @@ void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName)
 
     if (captured)
     {
-       if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend"))
+       if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
             appFrontend->startAppCommand(TQString(), cmdline, false);
     }
     else 
diff --git a/parts/tools/tools_part.h b/parts/tools/tools_part.h
index 4eeaf0e1..20af2ea8 100644
--- a/parts/tools/tools_part.h
+++ b/parts/tools/tools_part.h
@@ -3,13 +3,13 @@
  */
 
 
-#ifndef __TDEVPART_TOOLS_H__
-#define __TDEVPART_TOOLS_H__
+#ifndef __KDEVPART_TOOLS_H__
+#define __KDEVPART_TOOLS_H__
 
 
 #include <tqguardedptr.h>
-#include <tdevplugin.h>
-#include <tdevgenericfactory.h>
+#include <kdevplugin.h>
+#include <kdevgenericfactory.h>
 
 
 class TQPopupMenu;
@@ -20,7 +20,7 @@ class ConfigWidgetProxy;
 class ToolsWidget;
 
 
-class ToolsPart : public TDevPlugin
+class ToolsPart : public KDevPlugin
   {
     Q_OBJECT
   
@@ -51,6 +51,6 @@ private:
 	ConfigWidgetProxy * m_configProxy;
   };
 
-typedef TDevGenericFactory<ToolsPart> ToolsFactory;
+typedef KDevGenericFactory<ToolsPart> ToolsFactory;
 
 #endif
diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp
index 8d689f40..f21713e9 100644
--- a/parts/tools/toolsconfig.cpp
+++ b/parts/tools/toolsconfig.cpp
@@ -35,7 +35,7 @@ void ToolsConfig::showEvent(TQShowEvent *e)
       TQHBoxLayout *hbox = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 
       TQVBoxLayout *vbox = new TQVBoxLayout(hbox);
-      _tree = new TDevApplicationTree(this);
+      _tree = new KDevApplicationTree(this);
       _tree->header()->hide();
       TQLabel *l = new TQLabel(_tree, i18n("&Applications:"), this);
       l->show();
@@ -121,7 +121,7 @@ void ToolsConfig::add(const TQString &desktopFile)
 
 void ToolsConfig::toList()
 {
-  TDevAppTreeListItem *item = dynamic_cast<TDevAppTreeListItem*>(_tree->selectedItem());
+  KDevAppTreeListItem *item = dynamic_cast<KDevAppTreeListItem*>(_tree->selectedItem());
   if (item && !item->desktopEntryPath().isEmpty())
     add(item->desktopEntryPath());
   checkButtons();
diff --git a/parts/tools/toolsconfig.h b/parts/tools/toolsconfig.h
index 23081676..074d5900 100644
--- a/parts/tools/toolsconfig.h
+++ b/parts/tools/toolsconfig.h
@@ -9,7 +9,7 @@
 
 class TQListBox;
 class TQPushButton;
-class TDevApplicationTree;
+class KDevApplicationTree;
 
 class Entry 
 {
@@ -60,7 +60,7 @@ private slots:
 
 private:
 
-    TDevApplicationTree *_tree;
+    KDevApplicationTree *_tree;
     TQListBox *_list;
     TQPushButton *_toList, *_toTree;
 
diff --git a/parts/uimode/CMakeLists.txt b/parts/uimode/CMakeLists.txt
index 0eaa5ff6..478a4103 100644
--- a/parts/uimode/CMakeLists.txt
+++ b/parts/uimode/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevuichooser.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevuichooser.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevuichooser (module) #################
+##### libkdevuichooser (module) #################
 
-tde_add_kpart( libtdevuichooser AUTOMOC
+tde_add_kpart( libkdevuichooser AUTOMOC
   SOURCES
     uichooser_part.cpp uichooser.ui uichooser_widget.cpp
   LINK tdevelop-shared
diff --git a/parts/uimode/Makefile.am b/parts/uimode/Makefile.am
index df7ddba9..00792790 100644
--- a/parts/uimode/Makefile.am
+++ b/parts/uimode/Makefile.am
@@ -1,13 +1,13 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevuichooser.la
-libtdevuichooser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevuichooser_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevuichooser.la
+libkdevuichooser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevuichooser_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevuichooser_la_SOURCES = uichooser_part.cpp uichooser.ui uichooser_widget.cpp
+libkdevuichooser_la_SOURCES = uichooser_part.cpp uichooser.ui uichooser_widget.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevuichooser.desktop
+service_DATA = kdevuichooser.desktop
 
diff --git a/parts/uimode/tdevuichooser.desktop b/parts/uimode/kdevuichooser.desktop
index 65faa5be..afb21a50 100644
--- a/parts/uimode/tdevuichooser.desktop
+++ b/parts/uimode/kdevuichooser.desktop
@@ -80,7 +80,7 @@ GenericName[zh_CN]=用户界面选择
 GenericName[zh_TW]=使用者介面選擇器
 Icon=view_choose
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevuichooser
+X-TDE-Library=libkdevuichooser
 X-TDevelop-Version=5
 X-TDevelop-Scope=Core
 X-TDevelop-Mode=AssistantMode
diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp
index 5795d829..fdc9fa6a 100644
--- a/parts/uimode/uichooser_part.cpp
+++ b/parts/uimode/uichooser_part.cpp
@@ -3,23 +3,23 @@
 #include <tqvbox.h>
 
 #include <kdialogbase.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <tdevcore.h>
+#include <kdevcore.h>
 #include <configwidgetproxy.h>
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 
 #include "uichooser_widget.h"
 
 #define UICHOOSERSETTINGSPAGE 1
 
-typedef TDevGenericFactory<UIChooserPart> UIChooserFactory;
-static const TDevPluginInfo data("tdevuichooser");
-K_EXPORT_COMPONENT_FACTORY( libtdevuichooser, UIChooserFactory( data ) )
+typedef KDevGenericFactory<UIChooserPart> UIChooserFactory;
+static const KDevPluginInfo data("kdevuichooser");
+K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( data ) )
 
 UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringList &)
-  : TDevPlugin( &data, parent, name ? name : "UIChooserPart")
+  : KDevPlugin( &data, parent, name ? name : "UIChooserPart")
 {
 	setInstance(UIChooserFactory::instance());
 
diff --git a/parts/uimode/uichooser_part.h b/parts/uimode/uichooser_part.h
index e86f9211..ff822e1d 100644
--- a/parts/uimode/uichooser_part.h
+++ b/parts/uimode/uichooser_part.h
@@ -3,16 +3,16 @@
  */
  
 
-#ifndef __TDEVPART_UICHOOSER_H__
-#define __TDEVPART_UICHOOSER_H__
+#ifndef __KDEVPART_UICHOOSER_H__
+#define __KDEVPART_UICHOOSER_H__
 
 
 class KDialogBase;
 class ConfigWidgetProxy;
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
-class UIChooserPart : public TDevPlugin
+class UIChooserPart : public KDevPlugin
 {
   Q_OBJECT
   
diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp
index d70d648d..cb75ec02 100644
--- a/parts/uimode/uichooser_widget.cpp
+++ b/parts/uimode/uichooser_widget.cpp
@@ -24,7 +24,7 @@
 #include <tdeversion.h>
 
 #include "uichooser_part.h"
-#include "tdevmainwindow.h"
+#include "kdevmainwindow.h"
 #include "uichooser_widget.h"
 
 UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *parent, const char *name)
diff --git a/parts/valgrind/CMakeLists.txt b/parts/valgrind/CMakeLists.txt
index 611aa4ec..9c32760f 100644
--- a/parts/valgrind/CMakeLists.txt
+++ b/parts/valgrind/CMakeLists.txt
@@ -26,13 +26,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevvalgrind.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpart_valgrind.rc DESTINATION ${DATA_INSTALL_DIR}/tdevvalgrind )
+install( FILES kdevvalgrind.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpart_valgrind.rc DESTINATION ${DATA_INSTALL_DIR}/kdevvalgrind )
 
 
-##### libtdevvalgrind (module) ##################
+##### libkdevvalgrind (module) ##################
 
-tde_add_kpart( libtdevvalgrind AUTOMOC
+tde_add_kpart( libkdevvalgrind AUTOMOC
   SOURCES
     dialog_widget.ui valgrind_part.cpp valgrind_widget.cpp
     valgrind_dialog.cpp valgrinditem.cpp
diff --git a/parts/valgrind/Makefile.am b/parts/valgrind/Makefile.am
index 6e9e89c0..e0cd6536 100644
--- a/parts/valgrind/Makefile.am
+++ b/parts/valgrind/Makefile.am
@@ -1,15 +1,15 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevvalgrind.la
-libtdevvalgrind_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevvalgrind_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevvalgrind.la
+libkdevvalgrind_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevvalgrind_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevvalgrind_la_SOURCES = dialog_widget.ui valgrind_part.cpp valgrind_widget.cpp valgrind_dialog.cpp valgrinditem.cpp
+libkdevvalgrind_la_SOURCES = dialog_widget.ui valgrind_part.cpp valgrind_widget.cpp valgrind_dialog.cpp valgrinditem.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevvalgrind.desktop
+service_DATA = kdevvalgrind.desktop
 
-rcdir = $(kde_datadir)/tdevvalgrind
-rc_DATA = tdevpart_valgrind.rc
+rcdir = $(kde_datadir)/kdevvalgrind
+rc_DATA = kdevpart_valgrind.rc
diff --git a/parts/valgrind/tdevpart_valgrind.rc b/parts/valgrind/kdevpart_valgrind.rc
index 440b62c2..440b62c2 100644
--- a/parts/valgrind/tdevpart_valgrind.rc
+++ b/parts/valgrind/kdevpart_valgrind.rc
diff --git a/parts/valgrind/tdevvalgrind.desktop b/parts/valgrind/kdevvalgrind.desktop
index 0c4fa769..e2142182 100644
--- a/parts/valgrind/tdevvalgrind.desktop
+++ b/parts/valgrind/kdevvalgrind.desktop
@@ -69,6 +69,6 @@ GenericName[zh_TW]=Valgrind 前端介面
 Icon=tdevelop
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Global
-X-TDE-Library=libtdevvalgrind
+X-TDE-Library=libkdevvalgrind
 X-TDevelop-Version=5
 X-TDevelop-Properties=CompiledDevelopment
diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp
index 88d9427c..1b262175 100644
--- a/parts/valgrind/valgrind_part.cpp
+++ b/parts/valgrind/valgrind_part.cpp
@@ -6,31 +6,31 @@
 
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <kprocess.h>
 #include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
 
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
-#include "tdevproject.h"
-#include "tdevplugininfo.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
+#include "kdevproject.h"
+#include "kdevplugininfo.h"
 
 #include "valgrind_widget.h"
 #include "valgrind_dialog.h"
 #include "valgrinditem.h"
 
-typedef TDevGenericFactory<ValgrindPart> ValgrindFactory;
-static const TDevPluginInfo data("tdevvalgrind");
-K_EXPORT_COMPONENT_FACTORY( libtdevvalgrind, ValgrindFactory( data ) )
+typedef KDevGenericFactory<ValgrindPart> ValgrindFactory;
+static const KDevPluginInfo data("kdevvalgrind");
+K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( data ) )
 
 ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringList& )
-  : TDevPlugin( &data, parent, name ? name : "ValgrindPart" )
+  : KDevPlugin( &data, parent, name ? name : "ValgrindPart" )
 {
   setInstance( ValgrindFactory::instance() );
-  setXMLFile( "tdevpart_valgrind.rc" );
+  setXMLFile( "kdevpart_valgrind.rc" );
 
   proc = new KShellProcess();
   connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )),
@@ -39,8 +39,8 @@ ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringLi
            this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) );
   connect( proc, TQT_SIGNAL(processExited( TDEProcess* )),
            this, TQT_SLOT(processExited( TDEProcess* )) );
-  connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)),
-           this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) );
+  connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
+           this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
   connect( core(), TQT_SIGNAL(projectOpened()),
            this, TQT_SLOT(projectOpened()) );
 
@@ -196,7 +196,7 @@ void ValgrindPart::slotKillValgrind()
     proc->kill();
 }
 
-void ValgrindPart::slotStopButtonClicked( TDevPlugin* which )
+void ValgrindPart::slotStopButtonClicked( KDevPlugin* which )
 {
   if ( which != 0 && which != this )
     return;
diff --git a/parts/valgrind/valgrind_part.h b/parts/valgrind/valgrind_part.h
index 1982ea33..6a05737b 100644
--- a/parts/valgrind/valgrind_part.h
+++ b/parts/valgrind/valgrind_part.h
@@ -2,18 +2,18 @@
  *  Copyright (C) 2002 Harald Fernengel <harry@kdevelop.org>   
  */
 
-#ifndef __TDEVPART_VALGRIND_H__
-#define __TDEVPART_VALGRIND_H__
+#ifndef __KDEVPART_VALGRIND_H__
+#define __KDEVPART_VALGRIND_H__
 
 #include <tqguardedptr.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 class ValgrindWidget;
 class TDEProcess;
 
-class ValgrindPart : public TDevPlugin
+class ValgrindPart : public KDevPlugin
 {
   Q_OBJECT
   
@@ -31,7 +31,7 @@ private slots:
   void slotExecValgrind();
   void slotExecCalltree();
   void slotKillValgrind();
-  void slotStopButtonClicked( TDevPlugin* which );
+  void slotStopButtonClicked( KDevPlugin* which );
   void receivedStdout( TDEProcess*, char*, int );
   void receivedStderr( TDEProcess*, char*, int );
   void processExited( TDEProcess* );
diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp
index f32ab9b7..70484704 100644
--- a/parts/valgrind/valgrind_widget.cpp
+++ b/parts/valgrind/valgrind_widget.cpp
@@ -10,10 +10,10 @@
 #include <tdelocale.h>
 #include <kstatusbar.h>
 
-#include <tdevcore.h>
-#include <tdevpartcontroller.h>
-#include <tdevmainwindow.h>
-#include <tdevproject.h>
+#include <kdevcore.h>
+#include <kdevpartcontroller.h>
+#include <kdevmainwindow.h>
+#include <kdevproject.h>
 
 #include "valgrind_part.h"
 #include "valgrind_widget.h"
diff --git a/parts/vcsmanager/CMakeLists.txt b/parts/vcsmanager/CMakeLists.txt
index a672b4ac..de236f81 100644
--- a/parts/vcsmanager/CMakeLists.txt
+++ b/parts/vcsmanager/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevvcsmanager.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevvcsmanager.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevvcsmanager (module) ################
+##### libkdevvcsmanager (module) ################
 
-tde_add_kpart( libtdevvcsmanager AUTOMOC
+tde_add_kpart( libkdevvcsmanager AUTOMOC
   SOURCES
     vcsmanagerpart.cpp vcsmanagerprojectconfigbase.ui
     vcsmanagerprojectconfig.cpp
diff --git a/parts/vcsmanager/Makefile.am b/parts/vcsmanager/Makefile.am
index 66897658..5f7534ee 100644
--- a/parts/vcsmanager/Makefile.am
+++ b/parts/vcsmanager/Makefile.am
@@ -1,19 +1,19 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevvcsmanager.la
-libtdevvcsmanager_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevvcsmanager_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevvcsmanager.la
+libkdevvcsmanager_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevvcsmanager_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevvcsmanager_la_SOURCES = vcsmanagerpart.cpp \
+libkdevvcsmanager_la_SOURCES = vcsmanagerpart.cpp \
 	vcsmanagerprojectconfigbase.ui vcsmanagerprojectconfig.cpp
 
 METASOURCES = AUTO
 
-appsharedir = $(kde_datadir)/tdevvcsmanager
+appsharedir = $(kde_datadir)/kdevvcsmanager
 appshare_DATA = 
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevvcsmanager.desktop
+service_DATA = kdevvcsmanager.desktop
 
-rcdir = $(kde_datadir)/tdevvcsmanager
+rcdir = $(kde_datadir)/kdevvcsmanager
 
diff --git a/parts/vcsmanager/tdevvcsmanager.desktop b/parts/vcsmanager/kdevvcsmanager.desktop
index 91fe7c98..35cdf2aa 100644
--- a/parts/vcsmanager/tdevvcsmanager.desktop
+++ b/parts/vcsmanager/kdevvcsmanager.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Service
 Exec=blubb
-Name=TDevVCSManager
+Name=KDevVCSManager
 Name[da]=TDevelop VCS-håndtering
 Name[nds]=TDevelop-VKS-Pleger
 Name[sk]=KDev VCS manažér
 Name[sv]=TDevelop VCS-hantering
-Name[tg]=РоҳбариTDevVCS
+Name[tg]=РоҳбариKDevVCS
 Name[zh_TW]=TDevelop VCS 管理器
 GenericName=VCSManager
 GenericName[da]=VCS-håndtering
@@ -60,6 +60,6 @@ X-TDevelop-Plugin-Copyright=(C) by Jens Dagerbo
 X-TDevelop-Args=
 
 X-TDevelop-Scope=Core
-X-TDE-Library=libtdevvcsmanager
+X-TDE-Library=libkdevvcsmanager
 X-TDevelop-Version=5
 X-TDevelop-Properties=VCS
diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp
index 5f5ad639..ec176c47 100644
--- a/parts/vcsmanager/vcsmanagerpart.cpp
+++ b/parts/vcsmanager/vcsmanagerpart.cpp
@@ -29,32 +29,32 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <tdemessagebox.h>
-#include <tdevplugininfo.h>
-#include <tdevgenericfactory.h>
+#include <kdevplugininfo.h>
+#include <kdevgenericfactory.h>
 #include <kdebug.h>
 
-#include <tdevcore.h>
-#include <tdevmainwindow.h>
+#include <kdevcore.h>
+#include <kdevmainwindow.h>
 #include <configwidgetproxy.h>
-#include <tdevplugincontroller.h>
+#include <kdevplugincontroller.h>
 #include "domutil.h"
 
 #include "vcsmanagerprojectconfig.h"
 
-typedef TDevGenericFactory<VCSManagerPart> VCSManagerFactory;
-TDevPluginInfo data("tdevvcsmanager");
-K_EXPORT_COMPONENT_FACTORY( libtdevvcsmanager, VCSManagerFactory( data ) )
+typedef KDevGenericFactory<VCSManagerPart> VCSManagerFactory;
+KDevPluginInfo data("kdevvcsmanager");
+K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( data ) )
 
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
 VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-	: TDevPlugin(&data, parent, name ? name : "VCSManagerPart")
+	: KDevPlugin(&data, parent, name ? name : "VCSManagerPart")
 {
 	kdDebug() << " ********** VCSManagerPart::VCSManagerPart() ************** " << endl;
 
 	setInstance(VCSManagerFactory::instance());
-//	setXMLFile("tdevvcsmanager.rc");
+//	setXMLFile("kdevvcsmanager.rc");
 
 	m_configProxy = new ConfigWidgetProxy(core());
 	m_configProxy->createProjectConfigPage(i18n("Version Control"), PROJECTDOC_OPTIONS, info()->icon());
diff --git a/parts/vcsmanager/vcsmanagerpart.h b/parts/vcsmanager/vcsmanagerpart.h
index aa52de94..1fbccbff 100644
--- a/parts/vcsmanager/vcsmanagerpart.h
+++ b/parts/vcsmanager/vcsmanagerpart.h
@@ -18,10 +18,10 @@
 *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
 ***************************************************************************/
 
-#ifndef TDEVVCSMANAGER_H
-#define TDEVVCSMANAGER_H
+#ifndef KDEVVCSMANAGER_H
+#define KDEVVCSMANAGER_H
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 #include <tqguardedptr.h>
 
@@ -35,7 +35,7 @@ class VCSManagerWidget;
 /**
 Please read the README.dox file for more info about this part
 */
-class VCSManagerPart: public TDevPlugin
+class VCSManagerPart: public KDevPlugin
 {
 	Q_OBJECT