Revert "Finish renaming tdevelop components"

This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.

82 files changed, 401 insertions, 401 deletions

diff --git a/buildtools/ada/CMakeLists.txt b/buildtools/ada/CMakeLists.txt
index 0cf08117..8d0fd4ae 100644
--- a/buildtools/ada/CMakeLists.txt
+++ b/buildtools/ada/CMakeLists.txt
@@ -28,17 +28,17 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevadaproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevadaproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevadaproject )
+install( FILES kdevadaproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevadaproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevadaproject )
 
 
-##### libtdevadaproject (module) ################
+##### libkdevadaproject (module) ################
 
-tde_add_kpart( libtdevadaproject AUTOMOC
+tde_add_kpart( libkdevadaproject AUTOMOC
   SOURCES
     adaproject_part.cpp adaproject_widget.cpp
     adaproject_optionsdlgbase.ui adaprojectoptionsdlg.cpp
     adaglobaloptionsdlg.cpp service.cpp
-  LINK tdevbuildbase-shared
+  LINK kdevbuildbase-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/buildtools/ada/Makefile.am b/buildtools/ada/Makefile.am
index 7997b18c..2b2614ec 100644
--- a/buildtools/ada/Makefile.am
+++ b/buildtools/ada/Makefile.am
@@ -2,17 +2,17 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external \
 	-I$(top_srcdir)/lib/interfaces/extras -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevadaproject.la
-libtdevadaproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevadaproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/buildtools/lib/base/libtdevbuildbase.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la
+kde_module_LTLIBRARIES = libkdevadaproject.la
+libkdevadaproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevadaproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/buildtools/lib/base/libkdevbuildbase.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la
 
-libtdevadaproject_la_SOURCES = adaproject_part.cpp adaproject_widget.cpp adaproject_optionsdlgbase.ui adaprojectoptionsdlg.cpp adaglobaloptionsdlg.cpp service.cpp
+libkdevadaproject_la_SOURCES = adaproject_part.cpp adaproject_widget.cpp adaproject_optionsdlgbase.ui adaprojectoptionsdlg.cpp adaglobaloptionsdlg.cpp service.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevadaproject.desktop
+service_DATA = kdevadaproject.desktop
 
-rcdir = $(kde_datadir)/tdevadaproject
-rc_DATA = tdevadaproject.rc
+rcdir = $(kde_datadir)/kdevadaproject
+rc_DATA = kdevadaproject.rc
diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp
index 791c23ae..cea68bdc 100644
--- a/buildtools/ada/adaglobaloptionsdlg.cpp
+++ b/buildtools/ada/adaglobaloptionsdlg.cpp
@@ -15,7 +15,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 
-#include "tdevcompileroptions.h"
+#include "kdevcompileroptions.h"
 
 #include "service.h"
 #include "adaproject_part.h"
@@ -61,7 +61,7 @@ AdaGlobalOptionsDlg::~AdaGlobalOptionsDlg()
 void AdaGlobalOptionsDlg::optionsButtonClicked()
 {
     TQString name = ServiceComboBox::currentText(compiler_box, service_names);
-    TDevCompilerOptions *plugin = m_part->createCompilerOptions(name);
+    KDevCompilerOptions *plugin = m_part->createCompilerOptions(name);
 
     if (plugin) {
         TQString flags = plugin->exec(this, options_edit->text());
diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
index 195e2889..32833dfd 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -28,29 +28,29 @@
 #include <tdeconfig.h>
 
 #include "domutil.h"
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
-#include "tdevmakefrontend.h"
-#include "tdevappfrontend.h"
-#include "tdevpartcontroller.h"
-#include "tdevlanguagesupport.h"
-#include "tdevcompileroptions.h"
-#include "tdevgenericfactory.h"
-#include <tdevplugininfo.h>
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
+#include "kdevmakefrontend.h"
+#include "kdevappfrontend.h"
+#include "kdevpartcontroller.h"
+#include "kdevlanguagesupport.h"
+#include "kdevcompileroptions.h"
+#include "kdevgenericfactory.h"
+#include <kdevplugininfo.h>
 
 #include "adaproject_widget.h"
 #include "adaprojectoptionsdlg.h"
 #include "adaglobaloptionsdlg.h"
 
-typedef TDevGenericFactory<AdaProjectPart> AdaProjectFactory;
-static const TDevPluginInfo data("tdevadaproject");
-K_EXPORT_COMPONENT_FACTORY( libtdevadaproject, AdaProjectFactory( data ) )
+typedef KDevGenericFactory<AdaProjectPart> AdaProjectFactory;
+static const KDevPluginInfo data("kdevadaproject");
+K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) )
 
 AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& )
-    :TDevBuildTool(&data, parent, name ? name : "AdaProjectPart" )
+    :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" )
 {
     setInstance(AdaProjectFactory::instance());
-    setXMLFile("tdevadaproject.rc");
+    setXMLFile("kdevadaproject.rc");
 
     TDEAction *action;
     action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8,
@@ -70,7 +70,7 @@ AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStrin
 
 //  TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?"));
 
-  // now you decide what should happen to the widget. Take a look at tdevcore.h
+  // now you decide what should happen to the widget. Take a look at kdevcore.h
   // or at other plugins how to embed it.
 
   // if you want to embed your widget as an outputview, simply uncomment
@@ -109,8 +109,8 @@ void AdaProjectPart::openProject(const TQString &dirName, const TQString &projec
 
     TQDomDocument &dom = *projectDom();
     // Set the default directory radio to "executable"
-    if (DomUtil::readEntry(dom, "/tdevadaproject/run/directoryradio") == "" ) {
-        DomUtil::writeEntry(dom, "/tdevadaproject/run/directoryradio", "executable");
+    if (DomUtil::readEntry(dom, "/kdevadaproject/run/directoryradio") == "" ) {
+        DomUtil::writeEntry(dom, "/kdevadaproject/run/directoryradio", "executable");
     }
 
     loadProjectConfig();
@@ -165,7 +165,7 @@ void AdaProjectPart::openProject(const TQString &dirName, const TQString &projec
         }
     } while (!s.isEmpty());
 
-    TDevProject::openProject( dirName, projectName );
+    KDevProject::openProject( dirName, projectName );
 }
 
 void AdaProjectPart::closeProject()
@@ -175,7 +175,7 @@ void AdaProjectPart::closeProject()
 /** Retuns a PairList with the run environment variables */
 DomUtil::PairList AdaProjectPart::runEnvironmentVars() const
 {
-    return DomUtil::readPairListEntry(*projectDom(), "/tdevadaproject/run/envvars", "envvar", "name", "value");
+    return DomUtil::readPairListEntry(*projectDom(), "/kdevadaproject/run/envvars", "envvar", "name", "value");
 }
 
 
@@ -190,7 +190,7 @@ DomUtil::PairList AdaProjectPart::runEnvironmentVars() const
   */
 TQString AdaProjectPart::runDirectory() const
 {
-    TQString cwd = defaultRunDirectory("tdevadaproject");
+    TQString cwd = defaultRunDirectory("kdevadaproject");
     if (cwd.isEmpty())
       cwd = buildDirectory();
     return cwd;
@@ -212,7 +212,7 @@ TQString AdaProjectPart::mainProgram() const
 
     if ( !dom ) return TQString();
 
-    TQString DomMainProgram = DomUtil::readEntry( *dom, "/tdevadaproject/run/mainprogram");
+    TQString DomMainProgram = DomUtil::readEntry( *dom, "/kdevadaproject/run/mainprogram");
 
     if ( DomMainProgram.isEmpty() ) return TQString();
 
@@ -231,14 +231,14 @@ TQString AdaProjectPart::mainProgram() const
 /** Retuns a TQString with the run command line arguments */
 TQString AdaProjectPart::debugArguments() const
 {
-    return DomUtil::readEntry(*projectDom(), "/tdevadaproject/run/globaldebugarguments");
+    return DomUtil::readEntry(*projectDom(), "/kdevadaproject/run/globaldebugarguments");
 }
 
 
 /** Retuns a TQString with the run command line arguments */
 TQString AdaProjectPart::runArguments() const
 {
-    return DomUtil::readEntry(*projectDom(), "/tdevadaproject/run/programargs");
+    return DomUtil::readEntry(*projectDom(), "/kdevadaproject/run/programargs");
 }
 
 TQString AdaProjectPart::mainSource() const
@@ -361,12 +361,12 @@ void AdaProjectPart::slotExecute()
 
 void AdaProjectPart::changedFiles( const TQStringList & fileList )
 {
-    TDevProject::changedFiles(fileList);
+    KDevProject::changedFiles(fileList);
 }
 
 void AdaProjectPart::changedFile( const TQString & fileName )
 {
-    TDevProject::changedFile(fileName);
+    KDevProject::changedFile(fileName);
 }
 
 void AdaProjectPart::projectConfigWidget( KDialogBase * dlg )
@@ -382,10 +382,10 @@ void AdaProjectPart::loadProjectConfig( )
 {
     TQDomDocument &dom = *(projectDom());
 
-    TQString config = DomUtil::readEntry(dom, "/tdevadaproject/general/useconfiguration", "default");
-    m_mainSource = DomUtil::readEntry(dom, TQString("/tdevadaproject/configurations/") + config + TQString("/mainsource") );
-    m_compilerOpts = DomUtil::readEntry(dom, TQString("/tdevadaproject/configurations/") + config + TQString("/compileroptions"));
-    m_compilerExec = DomUtil::readEntry(dom, TQString("/tdevadaproject/configurations/") + config + TQString("/compilerexec"));
+    TQString config = DomUtil::readEntry(dom, "/kdevadaproject/general/useconfiguration", "default");
+    m_mainSource = DomUtil::readEntry(dom, TQString("/kdevadaproject/configurations/") + config + TQString("/mainsource") );
+    m_compilerOpts = DomUtil::readEntry(dom, TQString("/kdevadaproject/configurations/") + config + TQString("/compileroptions"));
+    m_compilerExec = DomUtil::readEntry(dom, TQString("/kdevadaproject/configurations/") + config + TQString("/compilerexec"));
 
     if (m_compilerExec.isEmpty())
     {
@@ -408,7 +408,7 @@ void AdaProjectPart::configWidget( KDialogBase * dlg )
     connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
 }
 
-TDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
+KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
 {
     KService::Ptr service = KService::serviceByDesktopName(name);
     if (!service) {
@@ -430,13 +430,13 @@ TDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
         args = TQStringList::split(" ", prop.toString());
 
     TQObject *obj = factory->create(this, service->name().latin1(),
-                                   "TDevCompilerOptions", args);
+                                   "KDevCompilerOptions", args);
 
-    if (!obj->inherits("TDevCompilerOptions")) {
-        kdDebug() << "AdaProjectPart::createCompilerOptions: component does not inherit TDevCompilerOptions" << endl;
+    if (!obj->inherits("KDevCompilerOptions")) {
+        kdDebug() << "AdaProjectPart::createCompilerOptions: component does not inherit KDevCompilerOptions" << endl;
         return 0;
     }
-    TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj;
+    KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj;
 
     return dlg;
 }
diff --git a/buildtools/ada/adaproject_part.h b/buildtools/ada/adaproject_part.h
index 46b328c4..5511da78 100644
--- a/buildtools/ada/adaproject_part.h
+++ b/buildtools/ada/adaproject_part.h
@@ -6,18 +6,18 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  */
-#ifndef __TDEVPART_ADAPROJECT_H__
-#define __TDEVPART_ADAPROJECT_H__
+#ifndef __KDEVPART_ADAPROJECT_H__
+#define __KDEVPART_ADAPROJECT_H__
 
 #include <tqguardedptr.h>
 
-#include "tdevbuildtool.h"
+#include "kdevbuildtool.h"
 
 class AdaProjectWidget;
 class KDialogBase;
-class TDevCompilerOptions;
+class KDevCompilerOptions;
 
-class AdaProjectPart : public TDevBuildTool
+class AdaProjectPart : public KDevBuildTool
 {
     Q_OBJECT
   
@@ -59,7 +59,7 @@ public:
     virtual void changedFiles( const TQStringList & fileList );
     virtual void changedFile( const TQString & fileName );
 
-    TDevCompilerOptions *createCompilerOptions(const TQString &name);
+    KDevCompilerOptions *createCompilerOptions(const TQString &name);
 
     virtual TQString defaultOptions(const TQString compiler);
     TQStringList distFiles() const;
diff --git a/buildtools/ada/adaproject_widget.cpp b/buildtools/ada/adaproject_widget.cpp
index 3eaba244..f5016e8c 100644
--- a/buildtools/ada/adaproject_widget.cpp
+++ b/buildtools/ada/adaproject_widget.cpp
@@ -3,7 +3,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-#include <tdevcore.h>
+#include <kdevcore.h>
 
 #include "adaproject_part.h"
 #include "adaproject_widget.h"
diff --git a/buildtools/ada/adaproject_widget.h b/buildtools/ada/adaproject_widget.h
index c89fc511..6bbab369 100644
--- a/buildtools/ada/adaproject_widget.h
+++ b/buildtools/ada/adaproject_widget.h
@@ -4,7 +4,7 @@
 #include <tqwidget.h>
 #include <tqstring.h>
 
-class TDevProject;
+class KDevProject;
 class AdaProjectPart;
 
 class AdaProjectWidget : public TQWidget
diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp
index 6cced020..28549efc 100644
--- a/buildtools/ada/adaprojectoptionsdlg.cpp
+++ b/buildtools/ada/adaprojectoptionsdlg.cpp
@@ -18,7 +18,7 @@
 #include <tqvalidator.h>
 
 #include "domutil.h"
-#include "tdevcompileroptions.h"
+#include "kdevcompileroptions.h"
 
 #include "service.h"
 #include "adaproject_part.h"
@@ -43,7 +43,7 @@ AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* paren
 
     TQDomDocument &dom = *(m_part->projectDom());
     currentConfig = TQString();
-    configChanged(DomUtil::readEntry(dom, "/tdevadaproject/general/useconfiguration", "default"));
+    configChanged(DomUtil::readEntry(dom, "/kdevadaproject/general/useconfiguration", "default"));
 }
 
 AdaProjectOptionsDlg::~AdaProjectOptionsDlg()
@@ -57,7 +57,7 @@ TQStringList AdaProjectOptionsDlg::allBuildConfigs()
     TQStringList allConfigs;
     allConfigs.append("default");
 
-    TQDomNode node = dom.documentElement().namedItem("tdevadaproject").namedItem("configurations");
+    TQDomNode node = dom.documentElement().namedItem("kdevadaproject").namedItem("configurations");
     TQDomElement childEl = node.firstChild().toElement();
     while (!childEl.isNull()) {
         TQString config = childEl.tagName();
@@ -72,7 +72,7 @@ TQStringList AdaProjectOptionsDlg::allBuildConfigs()
 
 void AdaProjectOptionsDlg::accept()
 {
-    DomUtil::writeEntry(*m_part->projectDom(), "/tdevadaproject/general/useconfiguration", currentConfig);
+    DomUtil::writeEntry(*m_part->projectDom(), "/kdevadaproject/general/useconfiguration", currentConfig);
     if (dirty)
     {
         saveConfig(currentConfig);
@@ -88,7 +88,7 @@ void AdaProjectOptionsDlg::compiler_box_activated( const TQString& /*s*/ )
 void AdaProjectOptionsDlg::saveConfig( TQString config )
 {
     TQDomDocument dom = *m_part->projectDom();
-    TQString prefix = "/tdevadaproject/configurations/" + config + "/";
+    TQString prefix = "/kdevadaproject/configurations/" + config + "/";
 
     DomUtil::writeEntry(dom, prefix + "compiler",
                         ServiceComboBox::currentText(compiler_box, service_names));
@@ -100,7 +100,7 @@ void AdaProjectOptionsDlg::saveConfig( TQString config )
 void AdaProjectOptionsDlg::readConfig( TQString config )
 {
     TQDomDocument dom = *m_part->projectDom();
-    TQString prefix = "/tdevadaproject/configurations/" + config + "/";
+    TQString prefix = "/kdevadaproject/configurations/" + config + "/";
 
     TQString compiler = DomUtil::readEntry(dom, prefix + "compiler", "");
 
@@ -171,7 +171,7 @@ void AdaProjectOptionsDlg::configRemoved()
     TQString config = config_combo->currentText();
 
     TQDomDocument dom = *m_part->projectDom();
-    TQDomNode node = dom.documentElement().namedItem("tdevadaproject").namedItem("configurations");
+    TQDomNode node = dom.documentElement().namedItem("kdevadaproject").namedItem("configurations");
     node.removeChild(node.namedItem(config));
     allConfigs.remove(config);
 
@@ -185,7 +185,7 @@ void AdaProjectOptionsDlg::configRemoved()
 void AdaProjectOptionsDlg::optionsButtonClicked( )
 {
     TQString name = ServiceComboBox::currentText(compiler_box, service_names);
-    TDevCompilerOptions *plugin = m_part->createCompilerOptions(name);
+    KDevCompilerOptions *plugin = m_part->createCompilerOptions(name);
 
     if (plugin) {
         TQString flags = plugin->exec(this, options_edit->text());
diff --git a/buildtools/ada/adaprojectoptionsdlg.h b/buildtools/ada/adaprojectoptionsdlg.h
index 0f6c0262..569f06c9 100644
--- a/buildtools/ada/adaprojectoptionsdlg.h
+++ b/buildtools/ada/adaprojectoptionsdlg.h
@@ -14,7 +14,7 @@
 #include "adaproject_optionsdlgbase.h"
 
 class AdaProjectPart;
-class TDevCompilerOptions;
+class KDevCompilerOptions;
 
 class AdaProjectOptionsDlg : public AdaProjectOptionsDlgBase
 {
diff --git a/buildtools/ada/tdevadaproject.desktop b/buildtools/ada/kdevadaproject.desktop
index 91206fd4..882b0f64 100644
--- a/buildtools/ada/tdevadaproject.desktop
+++ b/buildtools/ada/kdevadaproject.desktop
@@ -95,6 +95,6 @@ GenericName[uz@cyrillic]=Ada лойиҳаси
 GenericName[zh_CN]=Ada 工程
 GenericName[zh_TW]=Ada 專案
 ServiceTypes=TDevelop/Project
-X-TDE-Library=libtdevadaproject
+X-TDE-Library=libkdevadaproject
 X-TDevelop-Version=5
 X-TDevelop-Language=Ada
diff --git a/buildtools/ada/tdevadaproject.rc b/buildtools/ada/kdevadaproject.rc
index d7f260e1..d7f260e1 100644
--- a/buildtools/ada/tdevadaproject.rc
+++ b/buildtools/ada/kdevadaproject.rc
diff --git a/buildtools/ant/CMakeLists.txt b/buildtools/ant/CMakeLists.txt
index 48858d7f..1b7cfd98 100644
--- a/buildtools/ant/CMakeLists.txt
+++ b/buildtools/ant/CMakeLists.txt
@@ -26,15 +26,15 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevantproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevantproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevantproject )
+install( FILES kdevantproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevantproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevantproject )
 
 
-##### libtdevantproject (module) ################
+##### libkdevantproject (module) ################
 
-tde_add_kpart( libtdevantproject AUTOMOC
+tde_add_kpart( libkdevantproject AUTOMOC
   SOURCES
     antprojectpart.cpp antoptionswidget.ui classpathwidget.ui
-  LINK tdevbuildbase-shared
+  LINK kdevbuildbase-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/buildtools/ant/Makefile.am b/buildtools/ant/Makefile.am
index 6f3e23e6..30f314b8 100644
--- a/buildtools/ant/Makefile.am
+++ b/buildtools/ant/Makefile.am
@@ -5,17 +5,17 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_builddir)/buildtools/lib/widgets \
 	$(all_includes)
 
-kde_module_LTLIBRARIES = libtdevantproject.la
-libtdevantproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevantproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la
+kde_module_LTLIBRARIES = libkdevantproject.la
+libkdevantproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevantproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la
 
-libtdevantproject_la_SOURCES = antprojectpart.cpp antoptionswidget.ui classpathwidget.ui
+libkdevantproject_la_SOURCES = antprojectpart.cpp antoptionswidget.ui classpathwidget.ui
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevantproject.desktop
+service_DATA = kdevantproject.desktop
 
-rcdir = $(kde_datadir)/tdevantproject
-rc_DATA = tdevantproject.rc
+rcdir = $(kde_datadir)/kdevantproject
+rc_DATA = kdevantproject.rc
diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp
index fcbdd630..902055ec 100644
--- a/buildtools/ant/antprojectpart.cpp
+++ b/buildtools/ant/antprojectpart.cpp
@@ -11,7 +11,7 @@
 #include <tqdir.h>
 
 
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
@@ -21,10 +21,10 @@
 #include <keditlistbox.h>
 #include <kurlrequester.h>
 
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 
-#include <tdevcore.h>
-#include <tdevmakefrontend.h>
+#include <kdevcore.h>
+#include <kdevmakefrontend.h>
 #include <urlutil.h>
 
 
@@ -34,9 +34,9 @@
 
 
 
-typedef TDevGenericFactory<AntProjectPart> AntProjectFactory;
-static const TDevPluginInfo data("tdevantproject");
-K_EXPORT_COMPONENT_FACTORY(libtdevantproject, AntProjectFactory( data ))
+typedef KDevGenericFactory<AntProjectPart> AntProjectFactory;
+static const KDevPluginInfo data("kdevantproject");
+K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( data ))
 
 
 AntOptions::AntOptions()
@@ -46,11 +46,11 @@ AntOptions::AntOptions()
 
 
 AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &)
-  : TDevBuildTool(&data, parent, name ? name : "AntProjectPart")
+  : KDevBuildTool(&data, parent, name ? name : "AntProjectPart")
 {
   setInstance(AntProjectFactory::instance());
 
-  setXMLFile("tdevantproject.rc");
+  setXMLFile("kdevantproject.rc");
 
   m_buildProjectAction = new TDEAction(i18n("&Build Project"), "make_tdevelop", Key_F8,
 		                     this, TQT_SLOT(slotBuild()),
@@ -111,7 +111,7 @@ void AntProjectPart::openProject(const TQString &dirName, const TQString &projec
   else
     populateProject();
 
-  TDevProject::openProject( dirName, projectName );
+  KDevProject::openProject( dirName, projectName );
 }
 
 
diff --git a/buildtools/ant/antprojectpart.h b/buildtools/ant/antprojectpart.h
index f6203c55..e3b325d2 100644
--- a/buildtools/ant/antprojectpart.h
+++ b/buildtools/ant/antprojectpart.h
@@ -16,7 +16,7 @@ class Context;
 class ClassPathWidget;
 
 
-#include "tdevbuildtool.h"
+#include "kdevbuildtool.h"
 
 
 class AntOptionsWidget;
@@ -40,7 +40,7 @@ public:
 };
 
 
-class AntProjectPart : public TDevBuildTool
+class AntProjectPart : public KDevBuildTool
 {
   Q_OBJECT
   
diff --git a/buildtools/ant/tdevantproject.desktop b/buildtools/ant/kdevantproject.desktop
index bbca6555..e2880101 100644
--- a/buildtools/ant/tdevantproject.desktop
+++ b/buildtools/ant/kdevantproject.desktop
@@ -91,6 +91,6 @@ GenericName[uz@cyrillic]=Ant лойиҳаси
 GenericName[zh_CN]=Ant 工程
 GenericName[zh_TW]=Ant 專案
 ServiceTypes=TDevelop/Project
-X-TDE-Library=libtdevantproject
+X-TDE-Library=libkdevantproject
 X-TDevelop-Version=5
 X-TDevelop-Args=
diff --git a/buildtools/ant/tdevantproject.rc b/buildtools/ant/kdevantproject.rc
index df892b3c..df892b3c 100644
--- a/buildtools/ant/tdevantproject.rc
+++ b/buildtools/ant/kdevantproject.rc
diff --git a/buildtools/autotools/CMakeLists.txt b/buildtools/autotools/CMakeLists.txt
index e33d897c..f7af5bc6 100644
--- a/buildtools/autotools/CMakeLists.txt
+++ b/buildtools/autotools/CMakeLists.txt
@@ -32,13 +32,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevautoproject.desktop tdevtdeautoproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevautoproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevautoproject )
+install( FILES kdevautoproject.desktop kdevtdeautoproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevautoproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevautoproject )
 
 
-##### libtdevautoproject (module) ###############
+##### libkdevautoproject (module) ###############
 
-tde_add_kpart( libtdevautoproject AUTOMOC
+tde_add_kpart( libkdevautoproject AUTOMOC
   SOURCES
     autoprojectpart.cpp autoprojectwidget.cpp
     configureoptionswidget.cpp configureoptionswidgetbase.ui
@@ -60,6 +60,6 @@ tde_add_kpart( libtdevautoproject AUTOMOC
     autolistviewitems.cpp managecustomcommandsbase.ui
     managecustomcommand.cpp autoprojectviewbase.ui
     autotoolsaction.cpp makefilehandler.cpp
-  LINK tdevautotoolsparser-static tdevbuildbase-shared tdevbuildtoolswidgets-shared
+  LINK kdevautotoolsparser-static kdevbuildbase-shared kdevbuildtoolswidgets-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/buildtools/autotools/Makefile.am b/buildtools/autotools/Makefile.am
index a704eb29..98f3ad51 100644
--- a/buildtools/autotools/Makefile.am
+++ b/buildtools/autotools/Makefile.am
@@ -7,14 +7,14 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib -I$(top_srcdir)/buildtools/lib/base \
 	-I$(top_builddir)/buildtools/lib/widgets
 	
 
-kde_module_LTLIBRARIES = libtdevautoproject.la
-libtdevautoproject_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(KDE_PLUGIN)
-libtdevautoproject_la_LIBADD = \
-	$(top_builddir)/buildtools/lib/base/libtdevbuildbase.la \
-	$(top_builddir)/buildtools/lib/parsers/autotools/libtdevautotoolsparser.la $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la \
-	$(top_builddir)/lib/interfaces/extras/libtdevextras.la $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevautoproject.la
+libkdevautoproject_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(KDE_PLUGIN)
+libkdevautoproject_la_LIBADD = \
+	$(top_builddir)/buildtools/lib/base/libkdevbuildbase.la \
+	$(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la \
+	$(top_builddir)/lib/interfaces/extras/libkdevextras.la $(top_builddir)/lib/libtdevelop.la
 
-libtdevautoproject_la_SOURCES = autoprojectpart.cpp autoprojectwidget.cpp \
+libkdevautoproject_la_SOURCES = autoprojectpart.cpp autoprojectwidget.cpp \
 			configureoptionswidget.cpp configureoptionswidgetbase.ui subprojectoptionsdlg.cpp \
 			subprojectoptionsdlgbase.ui targetoptionsdlg.cpp targetoptionsdlgbase.ui addservicedlg.cpp \
 			addservicedlgbase.ui addapplicationdlg.cpp addapplicationdlgbase.ui addtargetdlg.cpp \
@@ -30,9 +30,9 @@ libtdevautoproject_la_SOURCES = autoprojectpart.cpp autoprojectwidget.cpp \
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevautoproject.desktop tdevtdeautoproject.desktop
+service_DATA = kdevautoproject.desktop kdevtdeautoproject.desktop
 
-rcdir = $(kde_datadir)/tdevautoproject
-rc_DATA = tdevautoproject.rc
+rcdir = $(kde_datadir)/kdevautoproject
+rc_DATA = kdevautoproject.rc
 
 noinst_HEADERS = managecustomcommand.h autotoolsaction.h makefilehandler.h
diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp
index 18bf87a8..d3f71637 100644
--- a/buildtools/autotools/addfiledlg.cpp
+++ b/buildtools/autotools/addfiledlg.cpp
@@ -36,7 +36,7 @@
 #include "autoprojectpart.h"
 #include "autoprojectwidget.h"
 
-#include "tdevpartcontroller.h"
+#include "kdevpartcontroller.h"
 
 AddFileDialog::AddFileDialog(AutoProjectPart *part, AutoProjectWidget *widget,
 							SubprojectItem *spitem, TargetItem *item,
diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp
index fa64c506..59cebc53 100644
--- a/buildtools/autotools/addsubprojectdlg.cpp
+++ b/buildtools/autotools/addsubprojectdlg.cpp
@@ -25,7 +25,7 @@
 
 #include "autolistviewitems.h"
 
-#include "tdevmakefrontend.h"
+#include "kdevmakefrontend.h"
 #include "misc.h"
 #include "autoprojectpart.h"
 #include "autosubprojectview.h"
diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp
index 34060b61..91b6d75c 100644
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@@ -32,13 +32,13 @@
 #include <tdepopupmenu.h>
 
 /** KDevelop */
-#include "tdevappfrontend.h"
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
-#include "tdevpartcontroller.h"
-#include "tdevcreatefile.h"
-#include "tdevlanguagesupport.h"
-#include "tdevmakefrontend.h"
+#include "kdevappfrontend.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
+#include "kdevpartcontroller.h"
+#include "kdevcreatefile.h"
+#include "kdevlanguagesupport.h"
+#include "kdevmakefrontend.h"
 #include "urlutil.h"
 
 #include "domutil.h"
@@ -294,13 +294,13 @@ void AutoDetailsView::slotAddNewFile()
 	if ( !titem )
 		return;
 
-	TDevCreateFile * createFileSupport = m_part->extension<TDevCreateFile>("TDevelop/CreateFile");
+	KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>("TDevelop/CreateFile");
 	if (createFileSupport)
 	{
-		TDevCreateFile::CreatedFile crFile =
+		KDevCreateFile::CreatedFile crFile =
 			createFileSupport->createNewFile(TQString(),
 			                                 m_widget->selectedSubproject()->path);
-/*		if (crFile.status == TDevCreateFile::CreatedFile::STATUS_OK)
+/*		if (crFile.status == KDevCreateFile::CreatedFile::STATUS_OK)
         {
 			FileItem *fitem = m_widget->createFileItem(crFile.filename, m_widget->selectedSubproject());
 			titem->sources.append(fitem);
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index ae5453bc..6b408bd0 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -45,34 +45,34 @@
 #include <kprocess.h>
 
 #include <domutil.h>
-#include <tdevcore.h>
-#include <tdevmakefrontend.h>
-#include <tdevappfrontend.h>
-#include <tdevmainwindow.h>
-#include <tdevpartcontroller.h>
+#include <kdevcore.h>
+#include <kdevmakefrontend.h>
+#include <kdevappfrontend.h>
+#include <kdevmainwindow.h>
+#include <kdevpartcontroller.h>
 #include <makeoptionswidget.h>
 #include <runoptionswidget.h>
 #include <envvartools.h>
 
 #include <configwidgetproxy.h>
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 #include <urlutil.h>
 
 #define CONFIGURE_OPTIONS 1
 #define RUN_OPTIONS 2
 #define MAKE_OPTIONS 3
 
-static const TDevPluginInfo data("tdevautoproject");
+static const KDevPluginInfo data("kdevautoproject");
 
-K_EXPORT_COMPONENT_FACTORY( libtdevautoproject, AutoProjectFactory( data ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) )
 
 AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args)
-    : TDevBuildTool(&data, parent, name ? name : "AutoProjectPart")
+    : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart")
     , m_lastCompilationFailed(false)
 {
     setInstance(AutoProjectFactory::instance());
 
-    setXMLFile("tdevautoproject.rc");
+    setXMLFile("kdevautoproject.rc");
 
     m_executeAfterBuild = false;
     m_isKDE = (args[0] == "kde");
@@ -310,7 +310,7 @@ void AutoProjectPart::openProject(const TQString &dirName, const TQString &proje
                                    "Project -> Project Options -> Run Options"), i18n("No active target specified"),  "tdevelop_open_project_no_active_target");
     }
 
-    TDevProject::openProject( dirName, projectName );
+    KDevProject::openProject( dirName, projectName );
 }
 
 
@@ -358,7 +358,7 @@ TQString AutoProjectPart::runDirectory() const
     TQString cwd;
     if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/useglobalprogram", false) || !m_widget->activeTarget() )
     {
-        cwd = defaultRunDirectory("tdevautoproject");
+        cwd = defaultRunDirectory("kdevautoproject");
     }else
     {
         cwd = DomUtil::readEntry( dom, "/kdevautoproject/run/cwd/"+m_widget->activeTarget()->name );
@@ -585,7 +585,7 @@ TQStringList AutoProjectPart::allBuildConfigs() const
     TQStringList allConfigs;
     allConfigs.append("default");
 
-    TQDomNode node = dom.documentElement().namedItem("tdevautoproject").namedItem("configurations");
+    TQDomNode node = dom.documentElement().namedItem("kdevautoproject").namedItem("configurations");
     TQDomElement childEl = node.firstChild().toElement();
     while (!childEl.isNull())
     {
@@ -1075,7 +1075,7 @@ TQString AutoProjectPart::updateAdminDirectoryCommand() const
 
     // Find the admin tarball
     TDEStandardDirs dirs;
-    dirs.addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "tdevappwizard/template-common/");
+    dirs.addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "kdevappwizard/template-common/");
     source = dirs.findResource("apptemplates", "admin.tar.gz");
     if (source != "") {
         TQString cmdline = "rm -rf admin && tar -xzvf ";
@@ -1453,7 +1453,7 @@ bool AutoProjectPart::isKDE() const
     return m_isKDE;
 }
 
-TDevProject::Options AutoProjectPart::options() const
+KDevProject::Options AutoProjectPart::options() const
 {
     return UsesAutotoolsBuildSystem;
 }
diff --git a/buildtools/autotools/autoprojectpart.h b/buildtools/autotools/autoprojectpart.h
index 08d83719..83066c3c 100644
--- a/buildtools/autotools/autoprojectpart.h
+++ b/buildtools/autotools/autoprojectpart.h
@@ -20,8 +20,8 @@
 #include <tqmap.h>
 #include <tqdatetime.h>
 #include <tqdir.h>
-#include <tdevgenericfactory.h>
-#include "tdevbuildtool.h"
+#include <kdevgenericfactory.h>
+#include "kdevbuildtool.h"
 
 class TQDomElement;
 class TQStringList;
@@ -31,7 +31,7 @@ class TDESelectAction;
 class TargetItem;
 class ConfigWidgetProxy;
 
-class AutoProjectPart : public TDevBuildTool
+class AutoProjectPart : public KDevBuildTool
 {
 	Q_OBJECT
   
@@ -41,7 +41,7 @@ public:
 	virtual ~AutoProjectPart();
 
 	/**
-	 * Implementation of the TDevProject interface.
+	 * Implementation of the KDevProject interface.
 	 */
 	virtual TQString projectDirectory() const;
 	virtual TQString projectName() const;
@@ -61,7 +61,7 @@ public:
 	virtual Options options() const;
 
 	/**
-	 * Implementation of the TDevPlugin interface.
+	 * Implementation of the KDevPlugin interface.
 	 */
 	virtual void restorePartialProjectSession ( const TQDomElement* el );
 	virtual void savePartialProjectSession ( TQDomElement* el );
@@ -85,7 +85,7 @@ public:
 
 protected:
 	/**
-	 * Reimplemented from TDevProject. These methods are only
+	 * Reimplemented from KDevProject. These methods are only
 	 * for use by the application core.
 	 */
 	virtual void openProject( const TQString &dirName, const TQString &projectName );
@@ -151,7 +151,7 @@ private:
 	bool queueInternalLibDependenciesBuild( TargetItem* titem, TQStringList& list );
 };
 
-typedef TDevGenericFactory<AutoProjectPart> AutoProjectFactory;
+typedef KDevGenericFactory<AutoProjectPart> AutoProjectFactory;
 
 #endif
 // kate: indent-mode csands; tab-width 4;
diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp
index c41a60dc..a558a593 100644
--- a/buildtools/autotools/autoprojectwidget.cpp
+++ b/buildtools/autotools/autoprojectwidget.cpp
@@ -42,7 +42,7 @@
 #include <kxmlguiclient.h>
 #include <tdeaction.h>
 
-#include "tdevcore.h"
+#include "kdevcore.h"
 #include "domutil.h"
 #include "misc.h"
 #include "choosetargetdialog.h"
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index 0eecfe4b..8353e2ea 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -34,10 +34,10 @@
 #include <tdelistview.h>
 
 /** KDevelop */
-#include <tdevmainwindow.h>
-#include <tdevmakefrontend.h>
-#include <tdevappfrontend.h>
-#include <tdevcore.h>
+#include <kdevmainwindow.h>
+#include <kdevmakefrontend.h>
+#include <kdevappfrontend.h>
+#include <kdevcore.h>
 #include <urlutil.h>
 
 /** AutoProject */
diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp
index fad399f3..8b59545f 100644
--- a/buildtools/autotools/choosetargetdialog.cpp
+++ b/buildtools/autotools/choosetargetdialog.cpp
@@ -43,7 +43,7 @@
 #include "autoprojectwidget.h"
 #include "autoprojectpart.h"
 
-#include "tdevpartcontroller.h"
+#include "kdevpartcontroller.h"
 
 class ChooseTargetDialog::Private
 {
diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp
index c991d15d..cc39aa07 100644
--- a/buildtools/autotools/configureoptionswidget.cpp
+++ b/buildtools/autotools/configureoptionswidget.cpp
@@ -29,7 +29,7 @@
 #include <kservice.h>
 #include <ktrader.h>
 
-#include "tdevcompileroptions.h"
+#include "kdevcompileroptions.h"
 #include "autoprojectpart.h"
 #include "environmentvariableswidget.h"
 
@@ -310,7 +310,7 @@ void ConfigureOptionsWidget::configRemoved()
     TQString config = config_combo->currentText();
 
     TQDomDocument dom = *m_part->projectDom();
-    TQDomNode node = dom.documentElement().namedItem("tdevautoproject").namedItem("configurations");
+    TQDomNode node = dom.documentElement().namedItem("kdevautoproject").namedItem("configurations");
     node.removeChild(node.namedItem(config));
     allConfigs.remove(config);
 
@@ -348,7 +348,7 @@ void ConfigureOptionsWidget::f77serviceChanged()
 void ConfigureOptionsWidget::cflagsClicked()
 {
     TQString name = ServiceComboBox::currentText(cservice_combo, cservice_names);
-    TDevCompilerOptions *plugin = createCompilerOptions(name);
+    KDevCompilerOptions *plugin = createCompilerOptions(name);
 
     if (plugin) {
         TQString flags = plugin->exec(this, cflags_edit->text());
@@ -361,7 +361,7 @@ void ConfigureOptionsWidget::cflagsClicked()
 void ConfigureOptionsWidget::cxxflagsClicked()
 {
     TQString name = ServiceComboBox::currentText(cxxservice_combo, cxxservice_names);
-    TDevCompilerOptions *plugin = createCompilerOptions(name);
+    KDevCompilerOptions *plugin = createCompilerOptions(name);
 
     if (plugin) {
         TQString flags = plugin->exec(this, cxxflags_edit->text());
@@ -374,7 +374,7 @@ void ConfigureOptionsWidget::cxxflagsClicked()
 void ConfigureOptionsWidget::f77flagsClicked()
 {
     TQString name = ServiceComboBox::currentText(f77service_combo, f77service_names);
-    TDevCompilerOptions *plugin = createCompilerOptions(name);
+    KDevCompilerOptions *plugin = createCompilerOptions(name);
 
     if (plugin) {
         TQString flags = plugin->exec(this, f77flags_edit->text());
@@ -384,7 +384,7 @@ void ConfigureOptionsWidget::f77flagsClicked()
 }
 
 
-TDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQString &name)
+KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQString &name)
 {
     KService::Ptr service = KService::serviceByDesktopName(name);
     if (!service) {
@@ -406,13 +406,13 @@ TDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin
         args = TQStringList::split(" ", prop.toString());
 
     TQObject *obj = factory->create(TQT_TQOBJECT(this), service->name().latin1(),
-                                   "TDevCompilerOptions", args);
+                                   "KDevCompilerOptions", args);
 
-    if (!obj->inherits("TDevCompilerOptions")) {
-        kdDebug(9020) << "Component does not inherit TDevCompilerOptions" << endl;
+    if (!obj->inherits("KDevCompilerOptions")) {
+        kdDebug(9020) << "Component does not inherit KDevCompilerOptions" << endl;
         return 0;
     }
-    TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj;
+    KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj;
 
     return dlg;
 }
diff --git a/buildtools/autotools/configureoptionswidget.h b/buildtools/autotools/configureoptionswidget.h
index dfab95cc..e40874de 100644
--- a/buildtools/autotools/configureoptionswidget.h
+++ b/buildtools/autotools/configureoptionswidget.h
@@ -18,7 +18,7 @@
 #include "domutil.h"
 
 
-class TDevCompilerOptions;
+class KDevCompilerOptions;
 class AutoProjectPart;
 class EnvironmentVariablesWidget;
 
@@ -53,7 +53,7 @@ private:
 	void readSettings( const TQString &config );
 	void saveSettings( const TQString &config );
 
-	TDevCompilerOptions *createCompilerOptions( const TQString &lang );
+	KDevCompilerOptions *createCompilerOptions( const TQString &lang );
 	TDETrader::OfferList coffers, cxxoffers, f77offers;
 	TQStringList cservice_names, cservice_execs;
 	TQStringList cxxservice_names, cxxservice_execs;
diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp
index afd09d4b..c10db050 100644
--- a/buildtools/autotools/fileselectorwidget.cpp
+++ b/buildtools/autotools/fileselectorwidget.cpp
@@ -43,7 +43,7 @@
 
 #include "autoprojectwidget.h"
 #include "autoprojectpart.h"
-#include "tdevlanguagesupport.h"
+#include "kdevlanguagesupport.h"
 
 #include "tdefilednddetailview.h"
 #include "tdefiledndiconview.h"
@@ -140,7 +140,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode,
 
     /* read the file patterns from the project DOM */
     TQDomElement docEl = m_part->projectDom()->documentElement();
-    TQDomElement fileviewEl = docEl.namedItem("tdevfileview").toElement();
+    TQDomElement fileviewEl = docEl.namedItem("kdevfileview").toElement();
     TQDomElement groupsEl = fileviewEl.namedItem("groups").toElement();
     TQDomElement groupEl = groupsEl.firstChild().toElement();
 
diff --git a/buildtools/autotools/tdevautoproject.desktop b/buildtools/autotools/kdevautoproject.desktop
index ad164259..a149c870 100644
--- a/buildtools/autotools/tdevautoproject.desktop
+++ b/buildtools/autotools/kdevautoproject.desktop
@@ -92,6 +92,6 @@ GenericName[zh_CN]=Automake 工程
 GenericName[zh_TW]=Automake 專案
 ServiceTypes=TDevelop/Project
 Icon=make
-X-TDE-Library=libtdevautoproject
+X-TDE-Library=libkdevautoproject
 X-TDevelop-Version=5
 X-TDevelop-Args=
diff --git a/buildtools/autotools/tdevautoproject.rc b/buildtools/autotools/kdevautoproject.rc
index 5d213e3e..5d213e3e 100644
--- a/buildtools/autotools/tdevautoproject.rc
+++ b/buildtools/autotools/kdevautoproject.rc
diff --git a/buildtools/autotools/tdevtdeautoproject.desktop b/buildtools/autotools/kdevtdeautoproject.desktop
index 5ed348d1..b9b6abd8 100644
--- a/buildtools/autotools/tdevtdeautoproject.desktop
+++ b/buildtools/autotools/kdevtdeautoproject.desktop
@@ -87,6 +87,6 @@ GenericName[zh_CN]=TDE Automake 工程
 GenericName[zh_TW]=TDE Automake 專案
 ServiceTypes=TDevelop/Project
 Icon=make
-X-TDE-Library=libtdevautoproject
+X-TDE-Library=libkdevautoproject
 X-TDevelop-Version=5
 X-TDevelop-Args=kde
diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp
index f1174b21..ec58b54c 100644
--- a/buildtools/autotools/misc.cpp
+++ b/buildtools/autotools/misc.cpp
@@ -21,10 +21,10 @@
 
 #include "misc.h"
 
-#include "tdevcompileroptions.h"
+#include "kdevcompileroptions.h"
 
 
-static TDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent )
+static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent )
 {
 	KService::Ptr service = KService::serviceByDesktopName( name );
 	if ( !service )
@@ -48,13 +48,13 @@ static TDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
         args = TQStringList::split(" ", prop.toString());
 
     TQObject *obj = factory->create(parent, service->name().latin1(),
-                                   "TDevCompilerOptions", args);
+                                   "KDevCompilerOptions", args);
 
-    if (!obj->inherits("TDevCompilerOptions")) {
-        kdDebug(9020) << "Component does not inherit TDevCompilerOptions" << endl;
+    if (!obj->inherits("KDevCompilerOptions")) {
+        kdDebug(9020) << "Component does not inherit KDevCompilerOptions" << endl;
         return 0;
     }
-    TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj;
+    KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj;
 
     return dlg;
 
@@ -65,14 +65,14 @@ static TDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
 		args = TQStringList::split( " ", prop.toString() );
 
 	return KParts::ComponentFactory
-	       ::createInstanceFromService<TDevCompilerOptions>( service, parent,
+	       ::createInstanceFromService<KDevCompilerOptions>( service, parent,
 	                                                         service->name().latin1(), args );*/
 }
 
 
 TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent )
 {
-	TDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(parent) );
+	KDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(parent) );
 
 	if ( plugin )
 	{
diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp
index 6508d126..e265a969 100644
--- a/buildtools/autotools/removefiledlg.cpp
+++ b/buildtools/autotools/removefiledlg.cpp
@@ -155,7 +155,7 @@ void RemoveFileDialog::accept()
 	TQDomDocument &dom = *(m_part->projectDom());
 
 	TQDomElement el = dom.documentElement();
-	TQDomNode el2 = el.namedItem("tdevautoproject");
+	TQDomNode el2 = el.namedItem("kdevautoproject");
 	TQDomNode el3 = el2.namedItem("subclassing");
 
 	TQDomNode n = el3.firstChild();
diff --git a/buildtools/custommakefiles/CMakeLists.txt b/buildtools/custommakefiles/CMakeLists.txt
index 8327a38d..55036324 100644
--- a/buildtools/custommakefiles/CMakeLists.txt
+++ b/buildtools/custommakefiles/CMakeLists.txt
@@ -30,15 +30,15 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevcustomproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevcustomproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevcustomproject )
+install( FILES kdevcustomproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevcustomproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevcustomproject )
 
 
-##### libtdevcustomproject (module) #############
+##### libkdevcustomproject (module) #############
 
 
 
-tde_add_kpart( libtdevcustomproject AUTOMOC
+tde_add_kpart( libkdevcustomproject AUTOMOC
   SOURCES
     selectnewfilesdialog.cpp
     selectnewfilesdialogbase.ui custombuildoptionswidget.cpp
@@ -46,6 +46,6 @@ tde_add_kpart( libtdevcustomproject AUTOMOC
     custommakeconfigwidgetbase.ui custommanagerwidget.cpp
     custommanagerwidgetbase.ui customotherconfigwidget.cpp
     customotherconfigwidgetbase.ui customprojectpart.cpp
-  LINK tdevbuildbase-shared tdevbuildtoolswidgets-shared
+  LINK kdevbuildbase-shared kdevbuildtoolswidgets-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/buildtools/custommakefiles/Makefile.am b/buildtools/custommakefiles/Makefile.am
index 618f8794..087ab001 100644
--- a/buildtools/custommakefiles/Makefile.am
+++ b/buildtools/custommakefiles/Makefile.am
@@ -5,12 +5,12 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) \
 	-I$(top_builddir)/buildtools/lib/widgets
 
-kde_module_LTLIBRARIES = libtdevcustomproject.la
-libtdevcustomproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevcustomproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la
+kde_module_LTLIBRARIES = libkdevcustomproject.la
+libkdevcustomproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevcustomproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la
 
-libtdevcustomproject_la_SOURCES = selectnewfilesdialog.cpp selectnewfilesdialogbase.ui \
+libkdevcustomproject_la_SOURCES = selectnewfilesdialog.cpp selectnewfilesdialogbase.ui \
 	custombuildoptionswidget.cpp custombuildoptionswidgetbase.ui custommakeconfigwidget.cpp \
 	custommakeconfigwidgetbase.ui custommanagerwidget.cpp custommanagerwidgetbase.ui \
 	customotherconfigwidget.cpp customotherconfigwidgetbase.ui customprojectpart.cpp
@@ -18,9 +18,9 @@ libtdevcustomproject_la_SOURCES = selectnewfilesdialog.cpp selectnewfilesdialogb
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevcustomproject.desktop
+service_DATA = kdevcustomproject.desktop
 
-rcdir = $(kde_datadir)/tdevcustomproject
-rc_DATA = tdevcustomproject.rc
+rcdir = $(kde_datadir)/kdevcustomproject
+rc_DATA = kdevcustomproject.rc
 noinst_HEADERS = selectnewfilesdialog.h custommanagerwidget.h \
 	customotherconfigwidget.h
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index c9cc482d..5b41080e 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <keditlistbox.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdemainwindow.h>
@@ -42,11 +42,11 @@
 #include <kprocess.h>
 
 #include "domutil.h"
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
-#include "tdevmakefrontend.h"
-#include "tdevappfrontend.h"
-#include "tdevpartcontroller.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
+#include "kdevmakefrontend.h"
+#include "kdevappfrontend.h"
+#include "kdevpartcontroller.h"
 #include "runoptionswidget.h"
 #include "makeoptionswidget.h"
 #include "custombuildoptionswidget.h"
@@ -59,18 +59,18 @@
 
 #include "selectnewfilesdialog.h"
 
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 
-typedef TDevGenericFactory<CustomProjectPart> CustomProjectFactory;
-static const TDevPluginInfo data( "tdevcustomproject" );
-K_EXPORT_COMPONENT_FACTORY( libtdevcustomproject, CustomProjectFactory( data ) )
+typedef KDevGenericFactory<CustomProjectPart> CustomProjectFactory;
+static const KDevPluginInfo data( "kdevcustomproject" );
+K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) )
 
 CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & )
-        : TDevBuildTool( &data, parent, name ? name : "CustomProjectPart" )
+        : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" )
         , m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false )
 {
     setInstance( CustomProjectFactory::instance() );
-    setXMLFile( "tdevcustomproject.rc" );
+    setXMLFile( "kdevcustomproject.rc" );
 
     m_executeAfterBuild = false;
 
@@ -477,7 +477,7 @@ void CustomProjectPart::openProject( const TQString &dirName, const TQString &pr
         el.setTagName( "default" );
         envs.appendChild( el );
     }
-    TDevProject::openProject( dirName, projectName );
+    KDevProject::openProject( dirName, projectName );
 }
 
 
@@ -632,7 +632,7 @@ DomUtil::PairList CustomProjectPart::runEnvironmentVars() const
   */
 TQString CustomProjectPart::runDirectory() const
 {
-    TQString cwd = defaultRunDirectory( "tdevcustomproject" );
+    TQString cwd = defaultRunDirectory( "kdevcustomproject" );
     if ( cwd.isEmpty() )
         cwd = buildDirectory();
     return cwd;
diff --git a/buildtools/custommakefiles/customprojectpart.h b/buildtools/custommakefiles/customprojectpart.h
index db46d576..67223e92 100644
--- a/buildtools/custommakefiles/customprojectpart.h
+++ b/buildtools/custommakefiles/customprojectpart.h
@@ -20,7 +20,7 @@
 #include <tqdatetime.h>
 #include <tqvaluestack.h>
 
-#include <tdevbuildtool.h>
+#include <kdevbuildtool.h>
 
 class TQListViewItem;
 class TQPopupMenu;
@@ -30,7 +30,7 @@ class CustomProjectWidget;
 class Context;
 class TDESelectAction;
 
-class CustomProjectPart : public TDevBuildTool
+class CustomProjectPart : public KDevBuildTool
 {
     Q_OBJECT
   
diff --git a/buildtools/custommakefiles/tdevcustomproject.desktop b/buildtools/custommakefiles/kdevcustomproject.desktop
index 0ea2c3bc..9f81a3d6 100644
--- a/buildtools/custommakefiles/tdevcustomproject.desktop
+++ b/buildtools/custommakefiles/kdevcustomproject.desktop
@@ -38,7 +38,7 @@ Comment[tg]=Лоиҳаи оддӣ
 Comment[tr]=Özel Proje
 Comment[zh_CN]=自定义工程
 Comment[zh_TW]=自訂專案
-Name=TDevCustomProject
+Name=KDevCustomProject
 Name[da]=TDevelop brugerdefineret projekt
 Name[de]=Benutzerdefiniertes Projekt (TDevelop)
 Name[hi]=के-डेव-कस्टम-परियोजना
@@ -86,6 +86,6 @@ GenericName[tr]=Özel Proje
 GenericName[zh_CN]=自定义工程
 GenericName[zh_TW]=自訂專案
 ServiceTypes=TDevelop/Project
-X-TDE-Library=libtdevcustomproject
+X-TDE-Library=libkdevcustomproject
 X-TDevelop-Version=5
 X-TDevelop-Args=
diff --git a/buildtools/custommakefiles/tdevcustomproject.rc b/buildtools/custommakefiles/kdevcustomproject.rc
index 08079774..c744b4be 100644
--- a/buildtools/custommakefiles/tdevcustomproject.rc
+++ b/buildtools/custommakefiles/kdevcustomproject.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="TDevCustomProject" version="7">
+<kpartgui name="KDevCustomProject" version="7">
 <MenuBar>
   <Menu name="project" >
     <Action name="repopulate_project" />
diff --git a/buildtools/lib/base/CMakeLists.txt b/buildtools/lib/base/CMakeLists.txt
index a429be6c..f3585669 100644
--- a/buildtools/lib/base/CMakeLists.txt
+++ b/buildtools/lib/base/CMakeLists.txt
@@ -26,14 +26,14 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    tdevbuildtool.h
+    kdevbuildtool.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/buildtools/base )
 
 
-##### tdevbuildbase (shared) ####################
+##### kdevbuildbase (shared) ####################
 
-tde_add_library( tdevbuildbase SHARED AUTOMOC
-  SOURCES tdevbuildtool.cpp
+tde_add_library( kdevbuildbase SHARED AUTOMOC
+  SOURCES kdevbuildtool.cpp
   VERSION 0.0.0
   LINK tdevelop-shared
   DESTINATION ${LIB_INSTALL_DIR}
diff --git a/buildtools/lib/base/Mainpage.dox b/buildtools/lib/base/Mainpage.dox
index 8a85d338..3e16d2d8 100644
--- a/buildtools/lib/base/Mainpage.dox
+++ b/buildtools/lib/base/Mainpage.dox
@@ -8,8 +8,8 @@ This library contains base classes for KDevelop builtool support plugins.
 <b>Include path</b>: -I\$(kde_includes)/tdevelop/buildtools/base
 
 \section btbaseoverview Overview
-This library is created to provide TDevBuildTool compat class which can be used
-as drop-in replacement of TDevProject class for buildtool support plugins 
+This library is created to provide KDevBuildTool compat class which can be used
+as drop-in replacement of KDevProject class for buildtool support plugins 
 written for old KDevelop architecture (before version 3.2).
  
 Nevertheless, it can be useful for new buildtool plugins as well because it provides
diff --git a/buildtools/lib/base/Makefile.am b/buildtools/lib/base/Makefile.am
index 6532398d..7e1083ef 100644
--- a/buildtools/lib/base/Makefile.am
+++ b/buildtools/lib/base/Makefile.am
@@ -2,14 +2,14 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets/propeditor \
 	$(all_includes)
 METASOURCES = AUTO
-lib_LTLIBRARIES = libtdevbuildbase.la
-libtdevbuildbase_la_LDFLAGS = $(all_libraries)
-libtdevbuildbase_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la $(LIB_QT) $(LIB_TDEUI)
-libtdevbuildbase_la_SOURCES = tdevbuildtool.cpp
+lib_LTLIBRARIES = libkdevbuildbase.la
+libkdevbuildbase_la_LDFLAGS = $(all_libraries)
+libkdevbuildbase_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la $(LIB_QT) $(LIB_TDEUI)
+libkdevbuildbase_la_SOURCES = kdevbuildtool.cpp
 tdevelopbuildtoolsincludedir = $(includedir)/tdevelop/buildtools/base
-tdevelopbuildtoolsinclude_HEADERS = tdevbuildtool.h
+tdevelopbuildtoolsinclude_HEADERS = kdevbuildtool.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces tdevextensions
-DOXYGEN_PROJECTNAME = TDevelop Buildtool Base Library
-DOXYGEN_DOCDIRPREFIX = tdevbt
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions
+DOXYGEN_PROJECTNAME = KDevelop Buildtool Base Library
+DOXYGEN_DOCDIRPREFIX = kdevbt
 include ../../../Doxyfile.am
diff --git a/buildtools/lib/base/tdevbuildtool.cpp b/buildtools/lib/base/kdevbuildtool.cpp
index aa901bb7..618f02d9 100644
--- a/buildtools/lib/base/tdevbuildtool.cpp
+++ b/buildtools/lib/base/kdevbuildtool.cpp
@@ -16,23 +16,23 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevbuildtool.h"
+#include "kdevbuildtool.h"
 
-#include <tdevmakefrontend.h>
-#include <tdevappfrontend.h>
+#include <kdevmakefrontend.h>
+#include <kdevappfrontend.h>
 
-TDevBuildTool::TDevBuildTool(const TDevPluginInfo* info, TQObject* parent, const char* name)
-    :TDevProject(info, parent, name)
+KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name)
+    :KDevProject(info, parent, name)
 {
 }
 
-TDevMakeFrontend * TDevBuildTool::makeFrontend()
+KDevMakeFrontend * KDevBuildTool::makeFrontend()
 {
-    return extension<TDevMakeFrontend>("TDevelop/MakeFrontend");
+    return extension<KDevMakeFrontend>("TDevelop/MakeFrontend");
 }
 
-TDevAppFrontend * TDevBuildTool::appFrontend()
+KDevAppFrontend * KDevBuildTool::appFrontend()
 {
-    return extension<TDevAppFrontend>("TDevelop/AppFrontend");
+    return extension<KDevAppFrontend>("TDevelop/AppFrontend");
 }
 
diff --git a/buildtools/lib/base/tdevbuildtool.h b/buildtools/lib/base/kdevbuildtool.h
index b6899f9b..ff1abcc0 100644
--- a/buildtools/lib/base/tdevbuildtool.h
+++ b/buildtools/lib/base/kdevbuildtool.h
@@ -17,24 +17,24 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVBUILDTOOL_H
-#define TDEVBUILDTOOL_H
+#ifndef KDEVBUILDTOOL_H
+#define KDEVBUILDTOOL_H
 
-#include <tdevproject.h>
+#include <kdevproject.h>
 
-class TDevMakeFrontend;
-class TDevAppFrontend;
+class KDevMakeFrontend;
+class KDevAppFrontend;
 
 /**Base class for KDevelop build tool support plugins.*/
-class TDevBuildTool: public TDevProject
+class KDevBuildTool: public KDevProject
 {
 public:
-    TDevBuildTool(const TDevPluginInfo* info, TQObject* parent, const char* name);
+    KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name);
 
     /**@return The make frontend.*/
-    TDevMakeFrontend *makeFrontend();
+    KDevMakeFrontend *makeFrontend();
     /**@return The application frontend.*/
-    TDevAppFrontend *appFrontend();
+    KDevAppFrontend *appFrontend();
 
 };
 
diff --git a/buildtools/lib/parsers/autotools/CMakeLists.txt b/buildtools/lib/parsers/autotools/CMakeLists.txt
index 5bc97247..8226e963 100644
--- a/buildtools/lib/parsers/autotools/CMakeLists.txt
+++ b/buildtools/lib/parsers/autotools/CMakeLists.txt
@@ -16,9 +16,9 @@ include_directories(
 )
 
 
-##### tdevautotoolsparser (static) ##############
+##### kdevautotoolsparser (static) ##############
 
-tde_add_library( tdevautotoolsparser STATIC_PIC
+tde_add_library( kdevautotoolsparser STATIC_PIC
   SOURCES
     autotoolsast.cpp autotoolsdriver.cpp autotools_yacc.cpp
 )
diff --git a/buildtools/lib/parsers/autotools/Makefile.am b/buildtools/lib/parsers/autotools/Makefile.am
index 47234583..340d0e38 100644
--- a/buildtools/lib/parsers/autotools/Makefile.am
+++ b/buildtools/lib/parsers/autotools/Makefile.am
@@ -6,9 +6,9 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
         -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets/propeditor \
         $(all_includes)
 METASOURCES = AUTO
-noinst_LTLIBRARIES = libtdevautotoolsparser.la
-libtdevautotoolsparser_la_LDFLAGS = $(all_libraries) $(LIB_TDEIO)
-libtdevautotoolsparser_la_SOURCES = autotoolsast.cpp autotoolsdriver.cpp autotools_yacc.cpp
+noinst_LTLIBRARIES = libkdevautotoolsparser.la
+libkdevautotoolsparser_la_LDFLAGS = $(all_libraries) $(LIB_TDEIO)
+libkdevautotoolsparser_la_SOURCES = autotoolsast.cpp autotoolsdriver.cpp autotools_yacc.cpp
 
 parser:
 	cd $(srcdir) ; \
@@ -19,6 +19,6 @@ parser:
 EXTRA_DIST = autotools.yy autotools.ll
 
 DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils
-DOXYGEN_PROJECTNAME = TDevelop AutoTools Parser
-DOXYGEN_DOCDIRPREFIX = tdevparser
+DOXYGEN_PROJECTNAME = KDevelop AutoTools Parser
+DOXYGEN_DOCDIRPREFIX = kdevparser
 include ../../../../Doxyfile.am
diff --git a/buildtools/lib/parsers/autotools/tests/Makefile.am b/buildtools/lib/parsers/autotools/tests/Makefile.am
index 00c2baba..30c67288 100644
--- a/buildtools/lib/parsers/autotools/tests/Makefile.am
+++ b/buildtools/lib/parsers/autotools/tests/Makefile.am
@@ -13,9 +13,9 @@ METASOURCES = AUTO
 check_PROGRAMS = runner viewer
 
 runner_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH)
-runner_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libtdevautotoolsparser.la
+runner_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la
 runner_SOURCES = runner.cpp
 
 viewer_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH)
-viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libtdevautotoolsparser.la
+viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la
 viewer_SOURCES = viewer.cpp viewer_main.cpp viewerbase.ui
diff --git a/buildtools/lib/parsers/qmake/CMakeLists.txt b/buildtools/lib/parsers/qmake/CMakeLists.txt
index 6ffebfa6..b8328a84 100644
--- a/buildtools/lib/parsers/qmake/CMakeLists.txt
+++ b/buildtools/lib/parsers/qmake/CMakeLists.txt
@@ -27,9 +27,9 @@ install( FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/buildtools/parsers/qmake )
 
 
-##### tdevqmakeparser (shared) ##################
+##### kdevqmakeparser (shared) ##################
 
-tde_add_library( tdevqmakeparser SHARED
+tde_add_library( kdevqmakeparser SHARED
   SOURCES
     qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp
     qmakeastvisitor.cpp qmakedriver.cpp
diff --git a/buildtools/lib/parsers/qmake/Makefile.am b/buildtools/lib/parsers/qmake/Makefile.am
index 9e14382a..ff3f175b 100644
--- a/buildtools/lib/parsers/qmake/Makefile.am
+++ b/buildtools/lib/parsers/qmake/Makefile.am
@@ -8,9 +8,9 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
         -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets/propeditor \
         $(all_includes)
 METASOURCES = AUTO
-lib_LTLIBRARIES = libtdevqmakeparser.la
-libtdevqmakeparser_la_LDFLAGS = -no-undefined $(all_libraries) $(LIB_TDEIO)
-libtdevqmakeparser_la_SOURCES = qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp \
+lib_LTLIBRARIES = libkdevqmakeparser.la
+libkdevqmakeparser_la_LDFLAGS = -no-undefined $(all_libraries) $(LIB_TDEIO)
+libkdevqmakeparser_la_SOURCES = qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp \
 	qmakeastvisitor.cpp qmakedriver.cpp
 
 tdevelopbuildtoolsincludedir = $(includedir)/tdevelop/buildtools/parsers/qmake
@@ -24,8 +24,8 @@ parser:
 EXTRA_DIST = qmake.yy qmake.ll
 
 DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils
-DOXYGEN_PROJECTNAME = TDevelop QMake parser
-DOXYGEN_DOCDIRPREFIX = tdevparser
+DOXYGEN_PROJECTNAME = KDevelop QMake parser
+DOXYGEN_DOCDIRPREFIX = kdevparser
 include ../../../../Doxyfile.am
 
 noinst_HEADERS = qmake.ll qmake.yy qmake_lex.h
diff --git a/buildtools/lib/parsers/qmake/tests/Makefile.am b/buildtools/lib/parsers/qmake/tests/Makefile.am
index 74935269..e1932f7e 100644
--- a/buildtools/lib/parsers/qmake/tests/Makefile.am
+++ b/buildtools/lib/parsers/qmake/tests/Makefile.am
@@ -13,9 +13,9 @@ METASOURCES = AUTO
 noinst_PROGRAMS = runner viewer
 
 runner_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH)
-runner_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.la
+runner_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la
 runner_SOURCES = runner.cpp
 
 viewer_LDFLAGS = --no-undefined $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH)
-viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.la
+viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la
 viewer_SOURCES = viewer.cpp viewer_main.cpp viewerbase.ui
diff --git a/buildtools/lib/widgets/CMakeLists.txt b/buildtools/lib/widgets/CMakeLists.txt
index 0349f6d3..d86d0c66 100644
--- a/buildtools/lib/widgets/CMakeLists.txt
+++ b/buildtools/lib/widgets/CMakeLists.txt
@@ -36,9 +36,9 @@ install( FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/buildtools/widgets )
 
 
-##### tdevbuildtoolswidgets (shared) ############
+##### kdevbuildtoolswidgets (shared) ############
 
-tde_add_library( tdevbuildtoolswidgets SHARED AUTOMOC
+tde_add_library( kdevbuildtoolswidgets SHARED AUTOMOC
   SOURCES
     addenvvardlg.cpp addfilesdialog.cpp
     environmentdisplaydialog.cpp
diff --git a/buildtools/lib/widgets/Makefile.am b/buildtools/lib/widgets/Makefile.am
index 718bbb04..6042ea06 100644
--- a/buildtools/lib/widgets/Makefile.am
+++ b/buildtools/lib/widgets/Makefile.am
@@ -5,11 +5,11 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
 	-I$(top_srcdir)/lib/widgets/propeditor $(all_includes)
 
-lib_LTLIBRARIES = libtdevbuildtoolswidgets.la
-libtdevbuildtoolswidgets_la_LDFLAGS = $(all_libraries)
-libtdevbuildtoolswidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la \
+lib_LTLIBRARIES = libkdevbuildtoolswidgets.la
+libkdevbuildtoolswidgets_la_LDFLAGS = $(all_libraries)
+libkdevbuildtoolswidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \
 	$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdetexteditor
-libtdevbuildtoolswidgets_la_SOURCES = addenvvardlg.cpp addfilesdialog.cpp \
+libkdevbuildtoolswidgets_la_SOURCES = addenvvardlg.cpp addfilesdialog.cpp \
 	environmentdisplaydialog.cpp environmentdisplaydialogbase.ui environmentvariableswidget.cpp \
 	environmentvariableswidgetbase.ui envvartools.cpp makeoptionswidget.cpp makeoptionswidgetbase.ui \
 	removesubprojectdialog.cpp removesubprojectdlgbase.ui runoptionswidget.cpp runoptionswidgetbase.ui \
@@ -23,8 +23,8 @@ tdevelopbuildtoolsinclude_HEADERS = addenvvardlg.h addfilesdialog.h \
 	makeoptionswidgetbase.h removesubprojectdialog.h removesubprojectdlgbase.h runoptionswidget.h \
 	runoptionswidgetbase.h subclassesdlg.h subclassesdlgbase.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces tdevutil
-DOXYGEN_PROJECTNAME = TDevelop Buildtool Widgets Library
-DOXYGEN_DOCDIRPREFIX = tdevbt
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevutil
+DOXYGEN_PROJECTNAME = KDevelop Buildtool Widgets Library
+DOXYGEN_DOCDIRPREFIX = kdevbt
 include ../../../Doxyfile.am
 noinst_HEADERS = environmentdisplaydialog.h
diff --git a/buildtools/pascal/CMakeLists.txt b/buildtools/pascal/CMakeLists.txt
index f43f27b2..b10a6bec 100644
--- a/buildtools/pascal/CMakeLists.txt
+++ b/buildtools/pascal/CMakeLists.txt
@@ -30,17 +30,17 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevpascalproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpascalproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevpascalproject )
+install( FILES kdevpascalproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpascalproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevpascalproject )
 
 
-##### libtdevpascalproject (module) #############
+##### libkdevpascalproject (module) #############
 
-tde_add_kpart( libtdevpascalproject AUTOMOC
+tde_add_kpart( libkdevpascalproject AUTOMOC
   SOURCES
     pascalproject_part.cpp pascalproject_widget.cpp
     pascalproject_optionsdlgbase.ui pascalprojectoptionsdlg.cpp
     pascalglobaloptionsdlg.cpp service.cpp
-  LINK tdevbuildbase-shared tdevbuildtoolswidgets-shared
+  LINK kdevbuildbase-shared kdevbuildtoolswidgets-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/buildtools/pascal/Makefile.am b/buildtools/pascal/Makefile.am
index f822bd6d..9bf4fc90 100644
--- a/buildtools/pascal/Makefile.am
+++ b/buildtools/pascal/Makefile.am
@@ -4,20 +4,20 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \
 	-I$(top_srcdir)/lib/interfaces/extras -I$(top_srcdir)/lib/util -I$(top_builddir)/buildtools/lib/widgets \
 	$(all_includes)
 
-kde_module_LTLIBRARIES = libtdevpascalproject.la
-libtdevpascalproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevpascalproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la
+kde_module_LTLIBRARIES = libkdevpascalproject.la
+libkdevpascalproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevpascalproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la
 
-libtdevpascalproject_la_SOURCES = pascalproject_part.cpp pascalproject_widget.cpp pascalproject_optionsdlgbase.ui pascalprojectoptionsdlg.cpp pascalglobaloptionsdlg.cpp service.cpp
+libkdevpascalproject_la_SOURCES = pascalproject_part.cpp pascalproject_widget.cpp pascalproject_optionsdlgbase.ui pascalprojectoptionsdlg.cpp pascalglobaloptionsdlg.cpp service.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevpascalproject.desktop
+service_DATA = kdevpascalproject.desktop
 
-rcdir = $(kde_datadir)/tdevpascalproject
-rc_DATA = tdevpascalproject.rc
+rcdir = $(kde_datadir)/kdevpascalproject
+rc_DATA = kdevpascalproject.rc
 
 
 
diff --git a/buildtools/pascal/tdevpascalproject.desktop b/buildtools/pascal/kdevpascalproject.desktop
index 36143f24..cde3c21d 100644
--- a/buildtools/pascal/tdevpascalproject.desktop
+++ b/buildtools/pascal/kdevpascalproject.desktop
@@ -89,5 +89,5 @@ GenericName[uz@cyrillic]=Pascal лойиҳаси
 GenericName[zh_CN]=Pascal 工程
 GenericName[zh_TW]=Pascal 專案
 ServiceTypes=TDevelop/Project
-X-TDE-Library=libtdevpascalproject
+X-TDE-Library=libkdevpascalproject
 X-TDevelop-Version=5
diff --git a/buildtools/pascal/tdevpascalproject.rc b/buildtools/pascal/kdevpascalproject.rc
index 9e7f46fd..9e7f46fd 100644
--- a/buildtools/pascal/tdevpascalproject.rc
+++ b/buildtools/pascal/kdevpascalproject.rc
diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp
index b55ae62f..ccbf8dc1 100644
--- a/buildtools/pascal/pascalglobaloptionsdlg.cpp
+++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp
@@ -17,7 +17,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 
-#include "tdevcompileroptions.h"
+#include "kdevcompileroptions.h"
 
 #include "service.h"
 #include "pascalproject_part.h"
@@ -64,7 +64,7 @@ PascalGlobalOptionsDlg::~PascalGlobalOptionsDlg()
 void PascalGlobalOptionsDlg::optionsButtonClicked()
 {
     TQString name = ServiceComboBox::currentText(compiler_box, service_names);
-    TDevCompilerOptions *plugin = m_part->createCompilerOptions(name);
+    KDevCompilerOptions *plugin = m_part->createCompilerOptions(name);
 
     if (plugin) {
         TQString flags = plugin->exec(this, options_edit->text());
diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
index 42864e23..01b0734a 100644
--- a/buildtools/pascal/pascalproject_part.cpp
+++ b/buildtools/pascal/pascalproject_part.cpp
@@ -21,7 +21,7 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdeaction.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <tdemessagebox.h>
@@ -32,13 +32,13 @@
 #include <kprocess.h>
 
 #include "domutil.h"
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
-#include "tdevmakefrontend.h"
-#include "tdevappfrontend.h"
-#include "tdevpartcontroller.h"
-#include "tdevlanguagesupport.h"
-#include "tdevcompileroptions.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
+#include "kdevmakefrontend.h"
+#include "kdevappfrontend.h"
+#include "kdevpartcontroller.h"
+#include "kdevlanguagesupport.h"
+#include "kdevcompileroptions.h"
 #include "runoptionswidget.h"
 #include "envvartools.h"
 
@@ -46,17 +46,17 @@
 #include "pascalprojectoptionsdlg.h"
 #include "pascalglobaloptionsdlg.h"
 
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 
-typedef TDevGenericFactory<PascalProjectPart> PascalProjectFactory;
-static const TDevPluginInfo data("tdevpascalproject");
-K_EXPORT_COMPONENT_FACTORY( libtdevpascalproject, PascalProjectFactory( data ) )
+typedef KDevGenericFactory<PascalProjectPart> PascalProjectFactory;
+static const KDevPluginInfo data("kdevpascalproject");
+K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) )
 
 PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& )
-    :TDevBuildTool(&data, parent, name ? name : "PascalProjectPart" )
+    :KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" )
 {
     setInstance(PascalProjectFactory::instance());
-    setXMLFile("tdevpascalproject.rc");
+    setXMLFile("kdevpascalproject.rc");
 
     TDEAction *action;
     action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8,
@@ -82,7 +82,7 @@ PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const T
 
 //  TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?"));
 
-  // now you decide what should happen to the widget. Take a look at tdevcore.h
+  // now you decide what should happen to the widget. Take a look at kdevcore.h
   // or at other plugins how to embed it.
 
   // if you want to embed your widget as an outputview, simply uncomment
@@ -172,7 +172,7 @@ void PascalProjectPart::openProject(const TQString &dirName, const TQString &pro
         }
     } while (!s.isEmpty());
 
-    TDevProject::openProject( dirName, projectName );
+    KDevProject::openProject( dirName, projectName );
 }
 
 void PascalProjectPart::closeProject()
@@ -197,7 +197,7 @@ DomUtil::PairList PascalProjectPart::runEnvironmentVars() const
   */
 TQString PascalProjectPart::runDirectory() const
 {
-    TQString cwd = defaultRunDirectory("tdevpascalproject");
+    TQString cwd = defaultRunDirectory("kdevpascalproject");
     if (cwd.isEmpty())
       cwd = buildDirectory();
     return cwd;
@@ -384,12 +384,12 @@ void PascalProjectPart::slotExecute()
 
 void PascalProjectPart::changedFiles( const TQStringList & fileList )
 {
-    TDevProject::changedFiles(fileList);
+    KDevProject::changedFiles(fileList);
 }
 
 void PascalProjectPart::changedFile( const TQString & fileName )
 {
-    TDevProject::changedFile(fileName);
+    KDevProject::changedFile(fileName);
 }
 
 void PascalProjectPart::projectConfigWidget( KDialogBase * dlg )
@@ -436,7 +436,7 @@ void PascalProjectPart::configWidget( KDialogBase * dlg )
     connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
 }
 
-TDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &name)
+KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &name)
 {
     KService::Ptr service = KService::serviceByDesktopName(name);
     if (!service) {
@@ -458,13 +458,13 @@ TDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na
         args = TQStringList::split(" ", prop.toString());
 
     TQObject *obj = factory->create(this, service->name().latin1(),
-                                   "TDevCompilerOptions", args);
+                                   "KDevCompilerOptions", args);
 
-    if (!obj->inherits("TDevCompilerOptions")) {
-        kdDebug() << "Component does not inherit TDevCompilerOptions" << endl;
+    if (!obj->inherits("KDevCompilerOptions")) {
+        kdDebug() << "Component does not inherit KDevCompilerOptions" << endl;
         return 0;
     }
-    TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj;
+    KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj;
 
     return dlg;
 }
diff --git a/buildtools/pascal/pascalproject_part.h b/buildtools/pascal/pascalproject_part.h
index 8f46817b..54d09b2e 100644
--- a/buildtools/pascal/pascalproject_part.h
+++ b/buildtools/pascal/pascalproject_part.h
@@ -8,18 +8,18 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef __TDEVPART_PASCALPROJECT_H__
-#define __TDEVPART_PASCALPROJECT_H__
+#ifndef __KDEVPART_PASCALPROJECT_H__
+#define __KDEVPART_PASCALPROJECT_H__
 
 #include <tqguardedptr.h>
 
-#include "tdevbuildtool.h"
+#include "kdevbuildtool.h"
 
 class PascalProjectWidget;
 class KDialogBase;
-class TDevCompilerOptions;
+class KDevCompilerOptions;
 
-class PascalProjectPart : public TDevBuildTool
+class PascalProjectPart : public KDevBuildTool
 {
     Q_OBJECT
   
@@ -61,7 +61,7 @@ public:
     virtual void changedFiles( const TQStringList & fileList );
     virtual void changedFile( const TQString & fileName );
 
-    TDevCompilerOptions *createCompilerOptions(const TQString &name);
+    KDevCompilerOptions *createCompilerOptions(const TQString &name);
 
     virtual TQString defaultOptions(const TQString compiler) const;
     TQStringList distFiles() const;
diff --git a/buildtools/pascal/pascalproject_widget.cpp b/buildtools/pascal/pascalproject_widget.cpp
index 9ce95c47..a8671023 100644
--- a/buildtools/pascal/pascalproject_widget.cpp
+++ b/buildtools/pascal/pascalproject_widget.cpp
@@ -4,7 +4,7 @@
 #include <kdebug.h>
 
 
-#include <tdevcore.h>
+#include <kdevcore.h>
 
 
 #include "pascalproject_part.h"
diff --git a/buildtools/pascal/pascalproject_widget.h b/buildtools/pascal/pascalproject_widget.h
index 5e104856..252c7500 100644
--- a/buildtools/pascal/pascalproject_widget.h
+++ b/buildtools/pascal/pascalproject_widget.h
@@ -6,7 +6,7 @@
 #include <tqstring.h>
 
 
-class TDevProject;
+class KDevProject;
 class PascalProjectPart;
 
 
diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp
index 1593656a..9c7c2518 100644
--- a/buildtools/pascal/pascalprojectoptionsdlg.cpp
+++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp
@@ -20,7 +20,7 @@
 #include <tqvalidator.h>
 
 #include "domutil.h"
-#include "tdevcompileroptions.h"
+#include "kdevcompileroptions.h"
 
 #include "service.h"
 #include "pascalproject_part.h"
@@ -59,7 +59,7 @@ TQStringList PascalProjectOptionsDlg::allBuildConfigs()
     TQStringList allConfigs;
     allConfigs.append("default");
 
-    TQDomNode node = dom.documentElement().namedItem("tdevpascalproject").namedItem("configurations");
+    TQDomNode node = dom.documentElement().namedItem("kdevpascalproject").namedItem("configurations");
     TQDomElement childEl = node.firstChild().toElement();
     while (!childEl.isNull()) {
         TQString config = childEl.tagName();
@@ -173,7 +173,7 @@ void PascalProjectOptionsDlg::configRemoved()
     TQString config = config_combo->currentText();
 
     TQDomDocument dom = *m_part->projectDom();
-    TQDomNode node = dom.documentElement().namedItem("tdevpascalproject").namedItem("configurations");
+    TQDomNode node = dom.documentElement().namedItem("kdevpascalproject").namedItem("configurations");
     node.removeChild(node.namedItem(config));
     allConfigs.remove(config);
 
@@ -187,7 +187,7 @@ void PascalProjectOptionsDlg::configRemoved()
 void PascalProjectOptionsDlg::optionsButtonClicked( )
 {
     TQString name = ServiceComboBox::currentText(compiler_box, service_names);
-    TDevCompilerOptions *plugin = m_part->createCompilerOptions(name);
+    KDevCompilerOptions *plugin = m_part->createCompilerOptions(name);
 
     if (plugin) {
         TQString flags = plugin->exec(this, options_edit->text());
diff --git a/buildtools/pascal/pascalprojectoptionsdlg.h b/buildtools/pascal/pascalprojectoptionsdlg.h
index c641faf3..acedb14d 100644
--- a/buildtools/pascal/pascalprojectoptionsdlg.h
+++ b/buildtools/pascal/pascalprojectoptionsdlg.h
@@ -16,7 +16,7 @@
 #include "pascalproject_optionsdlgbase.h"
 
 class PascalProjectPart;
-class TDevCompilerOptions;
+class KDevCompilerOptions;
 
 class PascalProjectOptionsDlg : public PascalProjectOptionsDlgBase
 {
diff --git a/buildtools/qmake/CMakeLists.txt b/buildtools/qmake/CMakeLists.txt
index e2b877f5..fa281096 100644
--- a/buildtools/qmake/CMakeLists.txt
+++ b/buildtools/qmake/CMakeLists.txt
@@ -31,13 +31,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevtrollproject.desktop tdevtmakeproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevtrollproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevtrollproject )
+install( FILES kdevtrollproject.desktop kdevtmakeproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevtrollproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevtrollproject )
 
 
-##### libtdevtrollproject (module) ##############
+##### libkdevtrollproject (module) ##############
 
-tde_add_kpart( libtdevtrollproject AUTOMOC
+tde_add_kpart( libkdevtrollproject AUTOMOC
   SOURCES
     choosesubprojectdlg.cpp choosesubprojectdlgbase.ui
     createscopedlg.cpp createscopedlgbase.ui
@@ -48,6 +48,6 @@ tde_add_kpart( libtdevtrollproject AUTOMOC
     qmakeoptionswidgetbase.ui qmakescopeitem.cpp
     scope.cpp trolllistview.cpp trollprojectpart.cpp
     trollprojectwidget.cpp
-  LINK tdevqmakeparser-shared tdevbuildbase-shared tdevbuildtoolswidgets-shared
+  LINK kdevqmakeparser-shared kdevbuildbase-shared kdevbuildtoolswidgets-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/buildtools/qmake/Makefile.am b/buildtools/qmake/Makefile.am
index 68adba76..b50fc775 100644
--- a/buildtools/qmake/Makefile.am
+++ b/buildtools/qmake/Makefile.am
@@ -8,14 +8,14 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \
 	-I$(top_builddir)/buildtools/lib/widgets $(all_includes)
 
 
-kde_module_LTLIBRARIES = libtdevtrollproject.la
-libtdevtrollproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevtrollproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/util/libtdevutil.la $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la \
-	$(top_builddir)/buildtools/lib/base/libtdevbuildbase.la \
-	$(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.la
-
-libtdevtrollproject_la_SOURCES = choosesubprojectdlg.cpp \
+kde_module_LTLIBRARIES = libkdevtrollproject.la
+libkdevtrollproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevtrollproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/util/libkdevutil.la $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la \
+	$(top_builddir)/buildtools/lib/base/libkdevbuildbase.la \
+	$(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la
+
+libkdevtrollproject_la_SOURCES = choosesubprojectdlg.cpp \
 	choosesubprojectdlgbase.ui createscopedlg.cpp createscopedlgbase.ui disablesubprojectdlg.cpp \
 	disablesubprojectdlgbase.ui newwidgetdlg.cpp newwidgetdlgbase.ui \
 	projectconfigurationdlg.cpp projectconfigurationdlgbase.ui qmakedefaultopts.cpp \
@@ -26,9 +26,9 @@ libtdevtrollproject_la_SOURCES = choosesubprojectdlg.cpp \
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevtrollproject.desktop tdevtmakeproject.desktop
+service_DATA = kdevtrollproject.desktop kdevtmakeproject.desktop
 
-rcdir = $(kde_datadir)/tdevtrollproject
-rc_DATA = tdevtrollproject.rc
+rcdir = $(kde_datadir)/kdevtrollproject
+rc_DATA = kdevtrollproject.rc
 noinst_HEADERS = createscopedlg.h disablesubprojectdlg.h qmakedefaultopts.h \
 	qmakeoptionswidget.h qmakescopeitem.h trolllistview.h
diff --git a/buildtools/qmake/tdevtmakeproject.desktop b/buildtools/qmake/kdevtmakeproject.desktop
index a5b729d5..97b4b528 100644
--- a/buildtools/qmake/tdevtmakeproject.desktop
+++ b/buildtools/qmake/kdevtmakeproject.desktop
@@ -85,7 +85,7 @@ GenericName[tr]=TMake Projesi
 GenericName[zh_CN]=TMake 工程
 GenericName[zh_TW]=TMake 專案
 ServiceTypes=TDevelop/Project
-X-TDE-Library=libtdevtrollproject
+X-TDE-Library=libkdevtrollproject
 X-TDevelop-Version=5
 X-TDevelop-Args=TMake
 
diff --git a/buildtools/qmake/tdevtrollproject.desktop b/buildtools/qmake/kdevtrollproject.desktop
index 24ef620e..bf118c56 100644
--- a/buildtools/qmake/tdevtrollproject.desktop
+++ b/buildtools/qmake/kdevtrollproject.desktop
@@ -90,6 +90,6 @@ GenericName[uz@cyrillic]=QMake лойиҳаси
 GenericName[zh_CN]=QMake 工程
 GenericName[zh_TW]=QMake 專案
 ServiceTypes=TDevelop/Project
-X-TDE-Library=libtdevtrollproject
+X-TDE-Library=libkdevtrollproject
 X-TDevelop-Version=5
 X-TDevelop-Args=
diff --git a/buildtools/qmake/tdevtrollproject.rc b/buildtools/qmake/kdevtrollproject.rc
index 8f6e0048..8f6e0048 100644
--- a/buildtools/qmake/tdevtrollproject.rc
+++ b/buildtools/qmake/kdevtrollproject.rc
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index 738e2534..c71afc30 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -27,7 +27,7 @@
 #include <kdirwatch.h>
 #include <kstatusbar.h>
 #include <tqmessagebox.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdeparts/part.h>
 #include <kprocess.h>
@@ -41,11 +41,11 @@
 
 
 #include "domutil.h"
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
-#include "tdevmakefrontend.h"
-#include "tdevappfrontend.h"
-#include "tdevpartcontroller.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
+#include "kdevmakefrontend.h"
+#include "kdevappfrontend.h"
+#include "kdevpartcontroller.h"
 #include "trollprojectwidget.h"
 #include "runoptionswidget.h"
 #include "config.h"
@@ -53,15 +53,15 @@
 #include "qmakeoptionswidget.h"
 #include "scope.h"
 
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 #include <urlutil.h>
 
-typedef TDevGenericFactory<TrollProjectPart> TrollProjectFactory;
-static const TDevPluginInfo data("tdevtrollproject");
-K_EXPORT_COMPONENT_FACTORY( libtdevtrollproject, TrollProjectFactory( data ) )
+typedef KDevGenericFactory<TrollProjectPart> TrollProjectFactory;
+static const KDevPluginInfo data("kdevtrollproject");
+K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) )
 
 TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args )
-    : TDevBuildTool(&data, parent, name ? name : "TrollProjectPart")
+    : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart")
 {
     setInstance(TrollProjectFactory::instance());
 
@@ -70,7 +70,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS
     else
         m_tmakeProject = false;
 
-    setXMLFile("tdevtrollproject.rc");
+    setXMLFile("kdevtrollproject.rc");
 
     m_executeProjectAfterBuild = false;
     m_executeTargetAfterBuild = false;
@@ -405,7 +405,7 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj
         DomUtil::writeEntry(dom, "/kdevtrollproject/run/directoryradio", "executable");
     }
 
-    TDevProject::openProject( dirName, projectName );
+    KDevProject::openProject( dirName, projectName );
 }
 
 
@@ -475,7 +475,7 @@ TQString TrollProjectPart::runDirectory() const
     TQString cwd;
     if( DomUtil::readBoolEntry(dom, "/kdevtrollproject/run/useglobalprogram", true) )
     {
-        cwd = defaultRunDirectory("tdevtrollproject");
+        cwd = defaultRunDirectory("kdevtrollproject");
     }else
     {
         TQString name = m_widget->getCurrentOutputFilename();
@@ -788,7 +788,7 @@ bool TrollProjectPart::isDirty()
     return false;
 }
 
-TDevProject::Options TrollProjectPart::options( ) const
+KDevProject::Options TrollProjectPart::options( ) const
 {
     return UsesTQMakeBuildSystem;
 }
diff --git a/buildtools/qmake/trollprojectpart.h b/buildtools/qmake/trollprojectpart.h
index 2b673b59..e36ef202 100644
--- a/buildtools/qmake/trollprojectpart.h
+++ b/buildtools/qmake/trollprojectpart.h
@@ -21,14 +21,14 @@
 #include <tqmap.h>
 #include <tqdatetime.h>
 
-#include "tdevbuildtool.h"
+#include "kdevbuildtool.h"
 
 class KDialogBase;
 class TrollProjectWidget;
 class KDirWatch;
 class TQMakeDefaultOpts;
 
-class TrollProjectPart : public TDevBuildTool
+class TrollProjectPart : public KDevBuildTool
 {
     Q_OBJECT
   
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 12d814a5..68dfad8e 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -60,14 +60,14 @@
 #include <tdeio/netaccess.h>
 #include <kurlcompletion.h>
 
-#include "tdevcore.h"
-#include "tdevpartcontroller.h"
-#include "tdevmainwindow.h"
+#include "kdevcore.h"
+#include "kdevpartcontroller.h"
+#include "kdevmainwindow.h"
 #include "trollprojectpart.h"
-#include "tdevappfrontend.h"
-#include "tdevmakefrontend.h"
-#include "tdevlanguagesupport.h"
-#include "tdevcreatefile.h"
+#include "kdevappfrontend.h"
+#include "kdevmakefrontend.h"
+#include "kdevlanguagesupport.h"
+#include "kdevcreatefile.h"
 #include "subclassesdlg.h"
 #include "addfilesdialog.h"
 #include "urlutil.h"
@@ -1403,7 +1403,7 @@ void TrollProjectWidget::slotNewFile()
             return ;
         }
     }
-    TDevCreateFile * createFileSupport = m_part->extension<TDevCreateFile>( "TDevelop/CreateFile" );
+    KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>( "TDevelop/CreateFile" );
     TQString fcext;
     if( gitem )
     {
@@ -1437,7 +1437,7 @@ void TrollProjectWidget::slotNewFile()
                 fcext = TQString();
         }
     }
-    TDevCreateFile::CreatedFile crFile =
+    KDevCreateFile::CreatedFile crFile =
     createFileSupport->createNewFile( fcext, projectDirectory() + TQString(TQChar(TQDir::separator()))+ m_shownSubproject->relativePath() );
 }
 
@@ -1683,7 +1683,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem *
         }
         else if ( r == idInsNewFile )
         {
-            TDevCreateFile * createFileSupport = m_part->extension<TDevCreateFile>( "TDevelop/CreateFile" );
+            KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>( "TDevelop/CreateFile" );
             TQString fcext;
             switch ( titem->groupType )
             {
@@ -1714,7 +1714,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem *
                 default:
                     fcext = TQString();
             }
-            TDevCreateFile::CreatedFile crFile =
+            KDevCreateFile::CreatedFile crFile =
                 createFileSupport->createNewFile( fcext, cleanSubprojectPath );
 
         }
diff --git a/buildtools/script/CMakeLists.txt b/buildtools/script/CMakeLists.txt
index c30a403d..d3f97540 100644
--- a/buildtools/script/CMakeLists.txt
+++ b/buildtools/script/CMakeLists.txt
@@ -27,16 +27,16 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevscriptproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevscriptproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevscriptproject )
+install( FILES kdevscriptproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevscriptproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevscriptproject )
 
 
-##### libtdevscriptproject (module) #############
+##### libkdevscriptproject (module) #############
 
-tde_add_kpart( libtdevscriptproject AUTOMOC
+tde_add_kpart( libkdevscriptproject AUTOMOC
   SOURCES
     scriptprojectpart.cpp scriptoptionswidget.cpp
     scriptoptionswidgetbase.ui scriptnewfiledlg.cpp
-  LINK tdevbuildbase-shared
+  LINK kdevbuildbase-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/buildtools/script/Makefile.am b/buildtools/script/Makefile.am
index a3d7652a..542b1a69 100644
--- a/buildtools/script/Makefile.am
+++ b/buildtools/script/Makefile.am
@@ -10,17 +10,17 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \
 	-I$(top_srcdir)/lib/external_interfaces $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevscriptproject.la
-libtdevscriptproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevscriptproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la
+kde_module_LTLIBRARIES = libkdevscriptproject.la
+libkdevscriptproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevscriptproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la
 
-libtdevscriptproject_la_SOURCES = scriptprojectpart.cpp scriptoptionswidget.cpp scriptoptionswidgetbase.ui scriptnewfiledlg.cpp
+libkdevscriptproject_la_SOURCES = scriptprojectpart.cpp scriptoptionswidget.cpp scriptoptionswidgetbase.ui scriptnewfiledlg.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevscriptproject.desktop
+service_DATA = kdevscriptproject.desktop
 
-rcdir = $(kde_datadir)/tdevscriptproject
-rc_DATA = tdevscriptproject.rc
+rcdir = $(kde_datadir)/kdevscriptproject
+rc_DATA = kdevscriptproject.rc
diff --git a/buildtools/script/tdevscriptproject.desktop b/buildtools/script/kdevscriptproject.desktop
index 9ba87c9f..6e135c16 100644
--- a/buildtools/script/tdevscriptproject.desktop
+++ b/buildtools/script/kdevscriptproject.desktop
@@ -83,5 +83,5 @@ GenericName[zh_CN]=脚本语言工程
 GenericName[zh_TW]=文稿語言專案
 ServiceTypes=TDevelop/Project
 Icon=tdevelop
-X-TDE-Library=libtdevscriptproject
+X-TDE-Library=libkdevscriptproject
 X-TDevelop-Version=5
diff --git a/buildtools/script/tdevscriptproject.rc b/buildtools/script/kdevscriptproject.rc
index d15c3dc2..651b10b4 100644
--- a/buildtools/script/tdevscriptproject.rc
+++ b/buildtools/script/kdevscriptproject.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="TDevCustomProject" version="2">
+<kpartgui name="KDevCustomProject" version="2">
 <MenuBar>
   <Menu name="file" >
     <Action name="file_newfile" />
diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp
index f254680e..9308792a 100644
--- a/buildtools/script/scriptnewfiledlg.cpp
+++ b/buildtools/script/scriptnewfiledlg.cpp
@@ -81,7 +81,7 @@ void ScriptNewFileDialog::accept()
         return;
     }
 
-    TDevProject *project = m_part->project();
+    KDevProject *project = m_part->project();
     if (!project->activeDirectory().isEmpty())
         fileName.prepend(project->activeDirectory() + "/");
     TQString destpath = project->projectDirectory() + "/" + fileName;
diff --git a/buildtools/script/scriptoptionswidget.cpp b/buildtools/script/scriptoptionswidget.cpp
index 13049699..d80cd501 100644
--- a/buildtools/script/scriptoptionswidget.cpp
+++ b/buildtools/script/scriptoptionswidget.cpp
@@ -16,10 +16,10 @@
 #include <tqradiobutton.h>
 #include <tqtabwidget.h>
 #include "domutil.h"
-#include "tdevlanguagesupport.h"
+#include "kdevlanguagesupport.h"
 
 
-ScriptOptionsWidget::ScriptOptionsWidget(TDevPlugin *part,
+ScriptOptionsWidget::ScriptOptionsWidget(KDevPlugin *part,
                                          TQWidget *parent, const char *name)
     : ScriptOptionsWidgetBase(parent, name)
 {
diff --git a/buildtools/script/scriptoptionswidget.h b/buildtools/script/scriptoptionswidget.h
index 086186cc..8f136d75 100644
--- a/buildtools/script/scriptoptionswidget.h
+++ b/buildtools/script/scriptoptionswidget.h
@@ -14,7 +14,7 @@
 
 #include "scriptoptionswidgetbase.h"
 
-class TDevPlugin;
+class KDevPlugin;
 
 
 class ScriptOptionsWidget : public ScriptOptionsWidgetBase
@@ -23,14 +23,14 @@ class ScriptOptionsWidget : public ScriptOptionsWidgetBase
   
     
 public:
-    ScriptOptionsWidget( TDevPlugin *part, TQWidget *parent=0, const char *name=0 );
+    ScriptOptionsWidget( KDevPlugin *part, TQWidget *parent=0, const char *name=0 );
     ~ScriptOptionsWidget();
 
 public slots:
     void accept();
 
 private:
-    TDevPlugin *m_part;
+    KDevPlugin *m_part;
 };
 
 #endif
diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp
index ef4fb16f..8f6b5fb4 100644
--- a/buildtools/script/scriptprojectpart.cpp
+++ b/buildtools/script/scriptprojectpart.cpp
@@ -23,32 +23,32 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <tdevgenericfactory.h>
-#include <tdevcreatefile.h>
+#include <kdevgenericfactory.h>
+#include <kdevcreatefile.h>
 #include <kdirwatch.h>
 
 #include "domutil.h"
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
-#include "tdevpartcontroller.h"
-#include "tdevlanguagesupport.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
+#include "kdevpartcontroller.h"
+#include "kdevlanguagesupport.h"
 #include "scriptoptionswidget.h"
 #include "scriptnewfiledlg.h"
-#include "tdevplugininfo.h"
+#include "kdevplugininfo.h"
 
-typedef TDevGenericFactory<ScriptProjectPart> ScriptProjectFactory;
-static const TDevPluginInfo data("tdevscriptproject");
-K_EXPORT_COMPONENT_FACTORY( libtdevscriptproject, ScriptProjectFactory( data ) )
+typedef KDevGenericFactory<ScriptProjectPart> ScriptProjectFactory;
+static const KDevPluginInfo data("kdevscriptproject");
+K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) )
 
 ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &)
-    : TDevBuildTool(&data, parent, name ? name : "ScriptProjectPart")
+    : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart")
 {
     setInstance(ScriptProjectFactory::instance());
 
-    setXMLFile("tdevscriptproject.rc");
+    setXMLFile("kdevscriptproject.rc");
 
     // only create new file action if file creation part not available
-    if (!extension<TDevCreateFile>("TDevelop/CreateFile")) {
+    if (!extension<KDevCreateFile>("TDevelop/CreateFile")) {
       TDEAction *action;
       action = new TDEAction( i18n("New File..."), 0,
                             this, TQT_SLOT(slotNewFile()),
@@ -148,7 +148,7 @@ void ScriptProjectPart::openProject(const TQString &dirName, const TQString &pro
         }
     } while (!s.isEmpty());
 
-    TDevProject::openProject( dirName, projectName );
+    KDevProject::openProject( dirName, projectName );
 }
 
 
@@ -192,7 +192,7 @@ DomUtil::PairList ScriptProjectPart::runEnvironmentVars() const
   */
 TQString ScriptProjectPart::runDirectory() const
 {
-    TQString cwd = defaultRunDirectory("tdevscriptproject");
+    TQString cwd = defaultRunDirectory("kdevscriptproject");
     if (cwd.isEmpty())
       cwd = buildDirectory();
     return cwd;
diff --git a/buildtools/script/scriptprojectpart.h b/buildtools/script/scriptprojectpart.h
index 2c3023ad..92087991 100644
--- a/buildtools/script/scriptprojectpart.h
+++ b/buildtools/script/scriptprojectpart.h
@@ -15,14 +15,14 @@
 #include <tqdict.h>
 #include <tqguardedptr.h>
 
-#include "tdevbuildtool.h"
+#include "kdevbuildtool.h"
 
 class TQListViewItem;
 class TQStringList;
 class KDialogBase;
 class ScriptProjectWidget;
 
-class ScriptProjectPart : public TDevBuildTool
+class ScriptProjectPart : public KDevBuildTool
 {
     Q_OBJECT