Revert "Finish renaming tdevelop components"

This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.

64 files changed, 288 insertions, 288 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b58b6df5..558caeb4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,8 +52,8 @@ install( FILES
 ##### other data ################################
 
 install( FILES tdevelopui.rc eventsrc DESTINATION ${DATA_INSTALL_DIR}/tdevelop )
-install( FILES tdeveloprc tdevassistantrc DESTINATION ${CONFIG_INSTALL_DIR} )
-install( FILES tdevassistantui.rc DESTINATION ${DATA_INSTALL_DIR}/tdevassistant )
+install( FILES tdeveloprc kdevassistantrc DESTINATION ${CONFIG_INSTALL_DIR} )
+install( FILES kdevassistantui.rc DESTINATION ${DATA_INSTALL_DIR}/kdevassistant )
 install( FILES projectprofiles DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles )
 
 
@@ -61,25 +61,25 @@ install( FILES projectprofiles DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles
 
 tde_add_executable( tdevelop
   SOURCES
-    main.cpp tdevideextension.cpp settingswidget.ui
-  LINK tdevshell-shared
+    main.cpp kdevideextension.cpp settingswidget.ui
+  LINK kdevshell-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 
-##### tdevassistant (executable) ################
+##### kdevassistant (executable) ################
 
-tde_add_executable( tdevassistant
+tde_add_executable( kdevassistant
   SOURCES
-    main_assistant.cpp tdevassistantextension.cpp
-  LINK tdevshell-shared
+    main_assistant.cpp kdevassistantextension.cpp
+  LINK kdevshell-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 
-##### tdevshell (shared) ########################
+##### kdevshell (shared) ########################
 
-tde_add_library( tdevshell SHARED AUTOMOC
+tde_add_library( kdevshell SHARED AUTOMOC
   SOURCES
     api.cpp core.cpp documentationpart.cpp editorproxy.cpp
     generalinfowidget.cpp generalinfowidgetbase.ui
@@ -92,7 +92,7 @@ tde_add_library( tdevshell SHARED AUTOMOC
     toplevel.cpp
   VERSION 0.0.0
   LINK
-    tdevutil-static d-shared kinterfacedesigner-shared
-    profileengine-shared tdevelop-shared tdevwidgets-shared
+    kdevutil-static d-shared kinterfacedesigner-shared
+    profileengine-shared tdevelop-shared kdevwidgets-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/src/Mainpage.dox b/src/Mainpage.dox
index 7f2255d2..2f055d1b 100644
--- a/src/Mainpage.dox
+++ b/src/Mainpage.dox
@@ -3,7 +3,7 @@
 
 This library contains the Shell - a profile-based implementation of TDevelop plugin architecture.
 
-<b>Link with</b>: -ltdevshell
+<b>Link with</b>: -lkdevshell
 
 <b>Include path</b>: -I\$(kde_includes)/tdevelop/shell
 
@@ -109,7 +109,7 @@ Example:
         }
             
     protected:
-        TDevAssistantExtension();
+        KDevAssistantExtension();
     
     };
     @endcode
diff --git a/src/Makefile.am b/src/Makefile.am
index b0b8a04c..047e89a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,41 +6,41 @@ INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/lib/interfaces \
 
 KDE_OPTIONS=nofinal
 
-lib_LTLIBRARIES = libtdevshell.la
-libtdevshell_la_LDFLAGS = $(all_libraries) -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner
-libtdevshell_la_LIBADD = \
+lib_LTLIBRARIES = libkdevshell.la
+libkdevshell_la_LDFLAGS = $(all_libraries) -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner
+libkdevshell_la_LIBADD = \
 	$(top_builddir)/src/profileengine/lib/libprofileengine.la $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/widgets/libtdevwidgets.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la \
+	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la \
 	$(top_builddir)/src/newui/libd.la $(LIB_TDEHTML) -ltdetexteditor -L../lib/interfaces/external/.libs -lkinterfacedesigner
-libtdevshell_la_SOURCES = api.cpp core.cpp documentationpart.cpp \
+libkdevshell_la_SOURCES = api.cpp core.cpp documentationpart.cpp \
 	editorproxy.cpp generalinfowidget.cpp generalinfowidgetbase.ui languageselectwidget.cpp \
 	mainwindowshare.cpp mimewarningdialog.ui multibuffer.cpp partcontroller.cpp \
 	plugincontroller.cpp pluginselectdialog.cpp pluginselectdialog.h pluginselectdialogbase.ui \
 	projectmanager.cpp projectsession.cpp shellextension.cpp simplemainwindow.cpp \
 	splashscreen.cpp statusbar.cpp toplevel.cpp
 
-bin_PROGRAMS = tdevelop tdevassistant
+bin_PROGRAMS = tdevelop kdevassistant
 
-tdevelop_SOURCES = main.cpp tdevideextension.cpp settingswidget.ui
+tdevelop_SOURCES = main.cpp kdevideextension.cpp settingswidget.ui
 
 tdevelop_METASOURCES = AUTO
 tdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner
-tdevelop_LDADD = libtdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner
+tdevelop_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner
 
 rcdir = $(kde_datadir)/tdevelop
 rc_DATA = tdevelopui.rc eventsrc
 
-# default TDevelop configuration
+# default KDevelop configuration
 tdevelopdatadir = $(kde_confdir)
-tdevelopdata_DATA = tdeveloprc tdevassistantrc
+tdevelopdata_DATA = tdeveloprc kdevassistantrc
 
 SUBDIRS = profiles profileengine newui tdeconf_update
-tdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner
-tdevassistant_SOURCES = main_assistant.cpp tdevassistantextension.cpp
-tdevassistant_LDADD = libtdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner
+kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner
+kdevassistant_SOURCES = main_assistant.cpp kdevassistantextension.cpp
+kdevassistant_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner
 
-rc_assistantdir = $(kde_datadir)/tdevassistant
-rc_assistant_DATA =  tdevassistantui.rc
+rc_assistantdir = $(kde_datadir)/kdevassistant
+rc_assistant_DATA =  kdevassistantui.rc
 shellincludedir = $(includedir)/tdevelop/shell
 shellinclude_HEADERS = api.h core.h documentationpart.h editorproxy.h \
 	generalinfowidget.h languageselectwidget.h mainwindowshare.h partcontroller.h \
@@ -48,9 +48,9 @@ shellinclude_HEADERS = api.h core.h documentationpart.h editorproxy.h \
 	statusbar.h toplevel.h generalinfowidgetbase.h mimewarningdialog.h settingswidget.h \
 	simplemainwindow.h multibuffer.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces tdevextensions
-DOXYGEN_PROJECTNAME = TDevelop Generic Shell
-DOXYGEN_DOCDIRPREFIX = tdevshell
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions
+DOXYGEN_PROJECTNAME = KDevelop Generic Shell
+DOXYGEN_DOCDIRPREFIX = kdevshell
 include ../Doxyfile.am
 profilesdatadir = $(kde_datadir)/tdevelop/profiles
 profilesdata_DATA = projectprofiles
diff --git a/src/api.cpp b/src/api.cpp
index 4053f871..8e56da3d 100644
--- a/src/api.cpp
+++ b/src/api.cpp
@@ -9,18 +9,18 @@
 API *API::s_instance = 0;
 
 
-TDevMainWindow *API::mainWindow() const
+KDevMainWindow *API::mainWindow() const
 {
   return TopLevel::getInstance();
 }
 
-TDevPartController *API::partController() const
+KDevPartController *API::partController() const
 {
   return PartController::getInstance();
 }
 
 
-TDevCore *API::core() const
+KDevCore *API::core() const
 {
   return Core::getInstance();
 }
@@ -41,7 +41,7 @@ API *API::getInstance()
 
 
 API::API()
-  : TDevApi()
+  : KDevApi()
 {
   m_classStore = new CodeModel();
 }
@@ -53,7 +53,7 @@ API::~API()
   m_classStore = 0;
 }
 
-TDevPluginController * API::pluginController() const
+KDevPluginController * API::pluginController() const
 {
     return PluginController::getInstance();
 }
diff --git a/src/api.h b/src/api.h
index 2957b42a..fb20447a 100644
--- a/src/api.h
+++ b/src/api.h
@@ -2,7 +2,7 @@
 #define _API_H_
 
 
-#include "tdevapi.h"
+#include "kdevapi.h"
 
 
 class CodeModel;
@@ -10,14 +10,14 @@ class CodeModel;
 /**
 API implementation.
 */
-class API : public TDevApi
+class API : public KDevApi
 {
 public:
 
-  virtual TDevMainWindow *mainWindow() const;
-  virtual TDevPartController *partController() const;
-  virtual TDevPluginController *pluginController() const;
-  virtual TDevCore *core() const;
+  virtual KDevMainWindow *mainWindow() const;
+  virtual KDevPartController *partController() const;
+  virtual KDevPluginController *pluginController() const;
+  virtual KDevCore *core() const;
   virtual CodeModel *codeModel() const;
 
   static API *getInstance();
diff --git a/src/core.cpp b/src/core.cpp
index 64c3d0b9..ccdd0ace 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -59,7 +59,7 @@ void Core::setupShourtcutTips(KXMLGUIClient * client)
 }
 
 Core::Core()
-  : TDevCore()
+  : KDevCore()
 {
 }
 
@@ -88,7 +88,7 @@ bool Core::queryClose()
 }
 
 
-void Core::running(TDevPlugin * which, bool runs)
+void Core::running(KDevPlugin * which, bool runs)
 {
   emit activeProcessChanged( which, runs );
 }
diff --git a/src/core.h b/src/core.h
index 9973c7e0..c041eac0 100644
--- a/src/core.h
+++ b/src/core.h
@@ -7,7 +7,7 @@
 #include <tdeparts/partmanager.h>
 
 
-#include "tdevcore.h"
+#include "kdevcore.h"
 
 namespace MainWindowUtils{
 
@@ -17,7 +17,7 @@ TQString beautifyToolTip(const TQString& text);
 /**
 Core implementation.
 */
-class Core : public TDevCore
+class Core : public KDevCore
 {
   Q_OBJECT
   
@@ -41,7 +41,7 @@ public:
 
   ~Core();
 
-  virtual void running(TDevPlugin *which, bool runs);
+  virtual void running(KDevPlugin *which, bool runs);
   virtual void fillContextMenu(TQPopupMenu *popup, const Context *context);
   virtual void openProject(const TQString& projectFileName);
 
@@ -51,13 +51,13 @@ public:
   void doEmitCoreInitialized() { emit coreInitialized(); }
   void doEmitProjectConfigWidget(KDialogBase *base) { emit projectConfigWidget(base); }
   void doEmitConfigWidget(KDialogBase *base) { emit configWidget(base); }
-  void doEmitStopButtonPressed(TDevPlugin* which = 0) { emit stopButtonClicked( which ); }
+  void doEmitStopButtonPressed(KDevPlugin* which = 0) { emit stopButtonClicked( which ); }
 
   bool queryClose();
 
 signals:
 
-  void activeProcessChanged(TDevPlugin* which, bool runs);
+  void activeProcessChanged(KDevPlugin* which, bool runs);
 
 protected:
 
diff --git a/src/documentationpart.cpp b/src/documentationpart.cpp
index 43c9db67..b9ad78d0 100644
--- a/src/documentationpart.cpp
+++ b/src/documentationpart.cpp
@@ -3,7 +3,7 @@
 #include "documentationpart.h"
 
 HTMLDocumentationPart::HTMLDocumentationPart()
-  : TDevHTMLPart()
+  : KDevHTMLPart()
 {
     setOptions(CanDuplicate | CanOpenInNewWindow);
 }
diff --git a/src/documentationpart.h b/src/documentationpart.h
index 84f17023..dd86ce8a 100644
--- a/src/documentationpart.h
+++ b/src/documentationpart.h
@@ -1,14 +1,14 @@
 #ifndef __DOCUMENTATIONPART_H__
 #define __DOCUMENTATIONPART_H__
 
-#include <tdevhtmlpart.h>
+#include <kdevhtmlpart.h>
 
 /**
 HTML documentation part.
 
-Implements shell-dependent "duplicate" and "open in new window" actions of TDevHTMLPart.
+Implements shell-dependent "duplicate" and "open in new window" actions of KDevHTMLPart.
 */
-class HTMLDocumentationPart : public TDevHTMLPart
+class HTMLDocumentationPart : public KDevHTMLPart
 {
   Q_OBJECT
   
diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp
index fca4bfdf..73ff852b 100644
--- a/src/editorproxy.cpp
+++ b/src/editorproxy.cpp
@@ -27,7 +27,7 @@
 #include "partcontroller.h"
 #include "core.h"
 #include "multibuffer.h"
-#include "tdeveditorutil.h"
+#include "kdeveditorutil.h"
 
 #include "editorproxy.h"
 
@@ -178,20 +178,20 @@ void EditorProxy::popupAboutToShow()
 
 	unsigned int line;
 	unsigned int col;
-	if ( !TDevEditorUtil::currentPositionReal( &line, &col, doc ) ) return;
+	if ( !KDevEditorUtil::currentPositionReal( &line, &col, doc ) ) return;
 
 	TQString wordstr;
-	TQString selection = TDevEditorUtil::currentSelection( doc );
+	TQString selection = KDevEditorUtil::currentSelection( doc );
 	if ( !selection.isEmpty() && selection.contains('\n') != 0 )
 	{
 		wordstr = selection;
 	}
 	else
 	{
-		wordstr = TDevEditorUtil::currentWord( doc );
+		wordstr = KDevEditorUtil::currentWord( doc );
 	}
 
-	TQString linestr = TDevEditorUtil::currentLine( doc );
+	TQString linestr = KDevEditorUtil::currentLine( doc );
 	
 	EditorContext context( doc->url(), line, col, linestr, wordstr );
 	Core::getInstance()->fillContextMenu( popup, &context );
diff --git a/src/eventsrc b/src/eventsrc
index 4032da95..baa16c20 100644
--- a/src/eventsrc
+++ b/src/eventsrc
@@ -1,6 +1,6 @@
 [!Global!]
 IconName=tdevelop
-Comment=TDevelop
+Comment=KDevelop
 Comment[hi]=के-डेवलप
 
 [ProcessSuccess]
diff --git a/src/tdevassistantextension.cpp b/src/kdevassistantextension.cpp
index f53d2bc3..ddbfb6bf 100644
--- a/src/tdevassistantextension.cpp
+++ b/src/kdevassistantextension.cpp
@@ -17,24 +17,24 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#include "tdevassistantextension.h"
+#include "kdevassistantextension.h"
 
-TDevAssistantExtension::TDevAssistantExtension()
+KDevAssistantExtension::KDevAssistantExtension()
  : ShellExtension()
 {
 }
 
-void TDevAssistantExtension::init()
+void KDevAssistantExtension::init()
 {
-    s_instance = new TDevAssistantExtension();
+    s_instance = new KDevAssistantExtension();
 }
 
-TQString TDevAssistantExtension::xmlFile()
+TQString KDevAssistantExtension::xmlFile()
 {
-    return "tdevassistantui.rc";
+    return "kdevassistantui.rc";
 }
 
-TQString TDevAssistantExtension::defaultProfile()
+TQString KDevAssistantExtension::defaultProfile()
 {
-    return "TDevAssistant";
+    return "KDevAssistant";
 }
diff --git a/src/tdevassistantextension.h b/src/kdevassistantextension.h
index a53d9dbd..874cafbd 100644
--- a/src/tdevassistantextension.h
+++ b/src/kdevassistantextension.h
@@ -17,12 +17,12 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef TDEVASSISTANTEXTENSION_H
-#define TDEVASSISTANTEXTENSION_H
+#ifndef KDEVASSISTANTEXTENSION_H
+#define KDEVASSISTANTEXTENSION_H
 
 #include "shellextension.h"
 
-class TDevAssistantExtension : public ShellExtension {
+class KDevAssistantExtension : public ShellExtension {
 public:
     static void init();
 
@@ -34,7 +34,7 @@ public:
     virtual TQString defaultProfile();
         
 protected:
-    TDevAssistantExtension();
+    KDevAssistantExtension();
 
 };
 
diff --git a/src/tdevassistantrc b/src/kdevassistantrc
index eaab6fc6..eaab6fc6 100644
--- a/src/tdevassistantrc
+++ b/src/kdevassistantrc
diff --git a/src/tdevassistantui.rc b/src/kdevassistantui.rc
index 39171359..a5b202ce 100644
--- a/src/tdevassistantui.rc
+++ b/src/kdevassistantui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui version="9" name="tdevassistant" >
+<kpartgui version="9" name="kdevassistant" >
 <MenuBar>
   <Menu name="file" noMerge="1"><text>&amp;File</text>
     <DefineGroup name="new_merge"/>
diff --git a/src/tdevideextension.cpp b/src/kdevideextension.cpp
index a6b62e12..7bfbf29f 100644
--- a/src/tdevideextension.cpp
+++ b/src/kdevideextension.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#include "tdevideextension.h"
+#include "kdevideextension.h"
 
 #include <tqvbox.h>
 #include <tqcheckbox.h>
@@ -34,24 +34,24 @@
 #include <tdeapplication.h>
 #include <tdefontrequester.h>
 
-#include <tdevplugin.h>
-#include <tdevmakefrontend.h>
-#include <tdevplugincontroller.h>
+#include <kdevplugin.h>
+#include <kdevmakefrontend.h>
+#include <kdevplugincontroller.h>
 
 #include "api.h"
 #include "settingswidget.h"
 
-TDevIDEExtension::TDevIDEExtension()
+KDevIDEExtension::KDevIDEExtension()
  : ShellExtension()
 {
 }
 
-void TDevIDEExtension::init()
+void KDevIDEExtension::init()
 {
-    s_instance = new TDevIDEExtension();
+    s_instance = new KDevIDEExtension();
 }
 
-void TDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg)
+void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg)
 {
     TDEConfig* config = kapp->config();
     TQVBox *vbox = dlg->addVBoxPage(i18n("General"), i18n("General"), BarIcon("tdevelop", TDEIcon::SizeMedium) );
@@ -75,8 +75,8 @@ void TDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg)
 
     TQString DesignerSetting = config->readEntry( "DesignerSetting", "ExternalDesigner" );
     gsw->qtDesignerRadioButton->setChecked( DesignerSetting == "ExternalDesigner" );
-    gsw->seperateAppRadioButton->setChecked( DesignerSetting == "ExternalTDevDesigner" );
-    gsw->embeddedDesignerRadioButton->setChecked( DesignerSetting == "EmbeddedTDevDesigner" );
+    gsw->seperateAppRadioButton->setChecked( DesignerSetting == "ExternalKDevDesigner" );
+    gsw->embeddedDesignerRadioButton->setChecked( DesignerSetting == "EmbeddedKDevDesigner" );
 
     config->setGroup("TerminalEmulator");
     gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", TQString::fromLatin1("konsole") ) );
@@ -85,7 +85,7 @@ void TDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg)
     gsw->useOtherTerminal->setChecked( !useKDESetting );
 }
 
-void TDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg)
+void KDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg)
 {
     TDEConfig* config = kapp->config();
 
@@ -97,8 +97,8 @@ void TDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg)
 
     TQString DesignerSetting;
     if ( gsw->qtDesignerRadioButton->isChecked() ) DesignerSetting = "ExternalDesigner";
-    if ( gsw->seperateAppRadioButton->isChecked() ) DesignerSetting = "ExternalTDevDesigner";
-    if ( gsw->embeddedDesignerRadioButton->isChecked() ) DesignerSetting = "EmbeddedTDevDesigner";
+    if ( gsw->seperateAppRadioButton->isChecked() ) DesignerSetting = "ExternalKDevDesigner";
+    if ( gsw->embeddedDesignerRadioButton->isChecked() ) DesignerSetting = "EmbeddedKDevDesigner";
     config->writeEntry( "DesignerSetting", DesignerSetting );
 
     config->setGroup("MakeOutputView");
@@ -108,9 +108,9 @@ void TDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg)
     //current item id must be in sync with the enum!
     config->writeEntry("CompilerOutputLevel",gsw->compileOutputCombo->currentItem());
     config->sync();
-    if( TDevPlugin *makeExt = API::getInstance()->pluginController()->extension("TDevelop/MakeFrontend"))
+    if( KDevPlugin *makeExt = API::getInstance()->pluginController()->extension("TDevelop/MakeFrontend"))
     {
-        static_cast<TDevMakeFrontend*>(makeExt)->updateSettingsFromConfig();
+        static_cast<KDevMakeFrontend*>(makeExt)->updateSettingsFromConfig();
     }
 
     config->setGroup("TerminalEmulator");
@@ -118,12 +118,12 @@ void TDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg)
     config->writeEntry("TerminalApplication", gsw->terminalEdit->text().stripWhiteSpace() );
 }
 
-TQString TDevIDEExtension::xmlFile()
+TQString KDevIDEExtension::xmlFile()
 {
     return "tdevelopui.rc";
 }
 
-TQString TDevIDEExtension::defaultProfile()
+TQString KDevIDEExtension::defaultProfile()
 {
     return "IDE";
 }
diff --git a/src/tdevideextension.h b/src/kdevideextension.h
index 64c1a8ca..1e25da7e 100644
--- a/src/tdevideextension.h
+++ b/src/kdevideextension.h
@@ -17,14 +17,14 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef TDEVIDEEXTENSION_H
-#define TDEVIDEEXTENSION_H
+#ifndef KDEVIDEEXTENSION_H
+#define KDEVIDEEXTENSION_H
 
 #include <shellextension.h>
 
 class SettingsWidget;
 
-class TDevIDEExtension : public ShellExtension {
+class KDevIDEExtension : public ShellExtension {
 public:
     static void init();
 
@@ -36,7 +36,7 @@ public:
     virtual TQString defaultProfile();
     
 protected:
-    TDevIDEExtension();
+    KDevIDEExtension();
     
 private:
     SettingsWidget *gsw;
diff --git a/src/tdevpluginprofilerc b/src/kdevpluginprofilerc
index b93ba2c1..1c2abb92 100644
--- a/src/tdevpluginprofilerc
+++ b/src/kdevpluginprofilerc
@@ -12,7 +12,7 @@ C++=Profile_CPP
 C++/Embedded=Profile_CPP
 C++/KDE=Profile_CPP
 C++/wxWidgets=
-C++/TDevelop
+C++/KDevelop
 C++/Generic
 C++/GTK+
 C++/QMake=
@@ -30,7 +30,7 @@ Haskell=
 Pascal/Free Pascal=
 
 [Profile_BASE]
-plugins=TDevFileView,KDevClassView,KDevBookmarks,KDevQuickOpen
+plugins=KDevFileView,KDevClassView,KDevBookmarks,KDevQuickOpen
 
 [Profile_COMPILED]
 inherits=Profile_BASE
@@ -38,7 +38,7 @@ plugins=
 
 [Profile_CPP]
 inherits=Profile_COMPILED
-plugins=TDevDebugger
+plugins=KDevDebugger
 
 [Profile_SCRIPT]
 inherits=Profile_BASE
diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp
index 67723b65..7a8695ff 100644
--- a/src/languageselectwidget.cpp
+++ b/src/languageselectwidget.cpp
@@ -26,7 +26,7 @@
 #include <kservice.h>
 #include <ktrader.h>
 #include <tdeapplication.h>
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 #include "domutil.h"
 
 #include "languageselectwidget.h"
diff --git a/src/main.cpp b/src/main.cpp
index 2df35f7e..6f27e415 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,7 @@
 #include "core.h"
 #include "projectmanager.h"
 
-#include "tdevideextension.h"
+#include "kdevideextension.h"
 
 static TDECmdLineOptions options[] =
 {
@@ -86,15 +86,15 @@ int main(int argc, char *argv[])
 
   TDEApplication app;
 
-  TDevIDEExtension::init();
+  KDevIDEExtension::init();
 
-  TDevSplashScreen *splash = 0;
+  KDevSplashScreen *splash = 0;
   TQString splashFile = locate("appdata", "pics/tdevelop-splash.png");
   if (!splashFile.isEmpty())
   {
     TQPixmap pm;
     pm.load(splashFile);
-    splash = new TDevSplashScreen( pm );
+    splash = new KDevSplashScreen( pm );
   }
 
   app.processEvents();
diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp
index 7cd9a98d..ba2c1886 100644
--- a/src/main_assistant.cpp
+++ b/src/main_assistant.cpp
@@ -18,7 +18,7 @@
 #include "core.h"
 #include "projectmanager.h"
 
-#include "tdevassistantextension.h"
+#include "kdevassistantextension.h"
 
 static TDECmdLineOptions options[] =
 {
@@ -30,7 +30,7 @@ static TDECmdLineOptions options[] =
 int main(int argc, char *argv[])
 {
   static const char description[] = I18N_NOOP("The TDevelop Integrated Development Environment:\nassistant and documentation viewer");
-  TDEAboutData aboutData("tdevassistant", I18N_NOOP("TDevelop Assistant"),
+  TDEAboutData aboutData("kdevassistant", I18N_NOOP("TDevelop Assistant"),
                        VERSION, description, TDEAboutData::License_GPL,
                        I18N_NOOP("(c) 1999-2007, The KDevelop developers"), "", "http://www.kdevelop.org");
   aboutData.addAuthor("Alexander Dymo", I18N_NOOP("Release coordinator, Overall improvements, Pascal support, C++ support, New File and Documentation parts"), "adymo@kdevelop.org");
@@ -80,15 +80,15 @@ int main(int argc, char *argv[])
 
   TDEApplication app;
 
-  TDevAssistantExtension::init();
+  KDevAssistantExtension::init();
 
-  TDevSplashScreen *splash = 0;
-  TQString splashFile = locate("data", "tdevelop/pics/tdevassistant-splash.png");
+  KDevSplashScreen *splash = 0;
+  TQString splashFile = locate("data", "tdevelop/pics/kdevassistant-splash.png");
   if (!splashFile.isEmpty())
   {
     TQPixmap pm;
     pm.load(splashFile);
-    splash = new TDevSplashScreen( pm );
+    splash = new KDevSplashScreen( pm );
   }
   if (splash) splash->show();
 
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
 
   if (splash) delete splash;
 
-  kapp->dcopClient()->registerAs("tdevassistant");
+  kapp->dcopClient()->registerAs("kdevassistant");
 
   return app.exec();
 }
diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp
index 8e44d7b7..a06dba14 100644
--- a/src/mainwindowshare.cpp
+++ b/src/mainwindowshare.cpp
@@ -55,11 +55,11 @@
 #include "projectmanager.h"
 #include "core.h"
 #include "api.h"
-#include "tdevmakefrontend.h"
+#include "kdevmakefrontend.h"
 #include "toplevel.h"
 #include "plugincontroller.h"
 
-#include "tdevplugininfo.h"
+#include "kdevplugininfo.h"
 
 #include "mainwindowshare.h"
 
@@ -120,8 +120,8 @@ void MainWindowShare::createActions()
   connect(m_stopProcesses->popupMenu(), TQT_SIGNAL(activated(int)),
          this, TQT_SLOT(slotStopPopupActivated(int)));
 
-  connect( Core::getInstance(), TQT_SIGNAL(activeProcessChanged(TDevPlugin*, bool)),
-           this, TQT_SLOT(slotActiveProcessChanged(TDevPlugin*, bool)) );
+  connect( Core::getInstance(), TQT_SIGNAL(activeProcessChanged(KDevPlugin*, bool)),
+           this, TQT_SLOT(slotActiveProcessChanged(KDevPlugin*, bool)) );
 
   action = KStdAction::showMenubar(
                 this, TQT_SLOT(slotShowMenuBar()),
@@ -180,7 +180,7 @@ void MainWindowShare::createActions()
   m_configureEditorAction->setWhatsThis(i18n("<b>Configure editor</b><p>Opens editor configuration dialog."));
   m_configureEditorAction->setEnabled( false );
 
-  TDevPartController * partController = API::getInstance()->partController();
+  KDevPartController * partController = API::getInstance()->partController();
   connect( partController, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part* )) );
 }
 
@@ -236,7 +236,7 @@ void MainWindowShare::slotStopButtonPressed()
   Core::getInstance()->doEmitStopButtonPressed();
 }
 
-void MainWindowShare::slotActiveProcessChanged( TDevPlugin* plugin, bool active )
+void MainWindowShare::slotActiveProcessChanged( KDevPlugin* plugin, bool active )
 {
   if ( !plugin )
     return;
@@ -251,7 +251,7 @@ void MainWindowShare::slotActiveProcessChanged( TDevPlugin* plugin, bool active
 
 void MainWindowShare::slotStopPopupActivated( int id )
 {
-  TDevPlugin* plugin = activeProcesses.at( id );
+  KDevPlugin* plugin = activeProcesses.at( id );
   if ( plugin && plugin->info()->genericName() == m_stopProcesses->popupMenu()->text( id ) ) {
     Core::getInstance()->doEmitStopButtonPressed( plugin );
     return;
@@ -273,7 +273,7 @@ void MainWindowShare::slotStopMenuAboutToShow()
   popup->clear();
 
   int i = 0;
-  for ( TDevPlugin* plugin = activeProcesses.first(); plugin; plugin = activeProcesses.next() ) {
+  for ( KDevPlugin* plugin = activeProcesses.first(); plugin; plugin = activeProcesses.next() ) {
     popup->insertItem( plugin->info()->genericName(), i++ );
   }
 }
@@ -325,7 +325,7 @@ void MainWindowShare::slotConfigureEditors()
 {
     kdDebug(9000) << " *** MainWindowShare::slotConfigureEditors()" << endl;
 
-    TDevPartController * partController = API::getInstance()->partController();
+    KDevPartController * partController = API::getInstance()->partController();
     KParts::Part * part = partController->activePart();
 
     KTextEditor::ConfigInterface * conf = dynamic_cast<KTextEditor::ConfigInterface*>( part );
diff --git a/src/mainwindowshare.h b/src/mainwindowshare.h
index 7ac08bdb..a9ec620a 100644
--- a/src/mainwindowshare.h
+++ b/src/mainwindowshare.h
@@ -54,7 +54,7 @@ private slots:
   void slotConfigureNotifications();
   void slotConfigureEditors();
   void slotSettings();
-  void slotActiveProcessChanged( TDevPlugin*, bool );
+  void slotActiveProcessChanged( KDevPlugin*, bool );
   void slotActivePartChanged( KParts::Part* part );
   void slotStopPopupActivated(int);
   void slotStopMenuAboutToShow();
@@ -83,7 +83,7 @@ private:
   TDEToolBarPopupAction*  m_stopProcesses;                 //!< Stops all running processes
 
   KParts::MainWindow*   m_pMainWnd;
-  TQPtrList<TDevPlugin>  activeProcesses;
+  TQPtrList<KDevPlugin>  activeProcesses;
 };
 
 #endif // __MAINWINDOWSHARE_H__
diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp
index 757eeab7..05a4d26f 100644
--- a/src/multibuffer.cpp
+++ b/src/multibuffer.cpp
@@ -32,7 +32,7 @@
 #include "toplevel.h"
 #include "editorproxy.h"
 #include "partcontroller.h"
-#include "tdevlanguagesupport.h"
+#include "kdevlanguagesupport.h"
 
 #include <kdebug.h>
 #include <kmimetype.h>
@@ -53,7 +53,7 @@ MultiBuffer::MultiBuffer( TQWidget *parent )
         m_activeBuffer( 0 )
 {
     EditorProxy::getInstance() ->registerEditor( this );
-    if ( TDevLanguageSupport *lang =
+    if ( KDevLanguageSupport *lang =
          API::getInstance() ->languageSupport() )
     {
         setOrientation( lang->splitOrientation() );
diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp
index 16bffcca..21b78a8c 100644
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@@ -54,14 +54,14 @@
 #include "documentationpart.h"
 #include "ksavealldialog.h"
 
-#include "tdevproject.h"
+#include "kdevproject.h"
 #include "urlutil.h"
 #include "mimewarningdialog.h"
 #include "domutil.h"
-#include "tdevjobtimer.h"
+#include "kdevjobtimer.h"
 
 #include "designer.h"
-#include "tdevlanguagesupport.h"
+#include "kdevlanguagesupport.h"
 
 #include "multibuffer.h"
 #include "partcontroller.h"
@@ -90,7 +90,7 @@ struct ModificationData
 
 
 PartController::PartController(TQWidget *parent)
-  : TDevPartController(parent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false)
+  : KDevPartController(parent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false)
 {
   connect(this, TQT_SIGNAL(partRemoved(KParts::Part*)), this, TQT_SLOT(slotPartRemoved(KParts::Part* )) );
   connect(this, TQT_SIGNAL(partAdded(KParts::Part*)), this, TQT_SLOT(slotPartAdded(KParts::Part* )) );
@@ -348,7 +348,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 
     if ( !addToCurrentBuffer )
     {
-        if ( TDevLanguageSupport *lang =
+        if ( KDevLanguageSupport *lang =
              API::getInstance()->languageSupport() )
         {
             // Let the language part override the addToCurrentBuffer flag
@@ -406,11 +406,11 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 			DesignerSetting = DomUtil::readEntry(*dom, "/kdevcppsupport/qt/designerintegration", DesignerSetting  );
 			designerExec = DomUtil::readEntry(*dom, "/kdevcppsupport/qt/designer", designerExec );
 		}
-		if ( DesignerSetting == "ExternalTDevDesigner" )
+		if ( DesignerSetting == "ExternalKDevDesigner" )
 		{
-			designerExec = "tdevdesigner";
+			designerExec = "kdevdesigner";
 		}
-		else if ( DesignerSetting == "EmbeddedTDevDesigner" )
+		else if ( DesignerSetting == "EmbeddedKDevDesigner" )
 		{
 			if ( KParts::ReadOnlyPart *designerPart = qtDesignerPart() )
 			{
@@ -419,12 +419,12 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 				designerPart->openURL(url);
 				return;
 			}
-			else if ( KParts::Factory * TDevDesignerFactory = static_cast<KParts::Factory*>( KLibLoader::self()->factory( TQFile::encodeName( "libtdevdesignerpart" ) ) ) )
+			else if ( KParts::Factory * KDevDesignerFactory = static_cast<KParts::Factory*>( KLibLoader::self()->factory( TQFile::encodeName( "libkdevdesignerpart" ) ) ) )
 			{
-				KParts::ReadWritePart * tdevpart = static_cast<KParts::ReadWritePart*>( TDevDesignerFactory->createPart( TopLevel::getInstance()->main(), 0, 0, 0, "KParts::ReadWritePart"  ) );
-				tdevpart->openURL( url );
+				KParts::ReadWritePart * kdevpart = static_cast<KParts::ReadWritePart*>( KDevDesignerFactory->createPart( TopLevel::getInstance()->main(), 0, 0, 0, "KParts::ReadWritePart"  ) );
+				kdevpart->openURL( url );
 				addHistoryEntry();
-				integratePart( tdevpart, url );
+				integratePart( kdevpart, url );
 				m_openRecentAction->addURL( url );
 				m_openRecentAction->saveEntries( kapp->config(), "RecentFiles" );
 				return;
@@ -1386,7 +1386,7 @@ void PartController::slotDocumentDirty( Kate::Document * d, bool isModified, uns
 		p->doc = doc;
 		p->isModified = isModified;
 		p->reason = reason;
-		TDevJobTimer::singleShot( 0, this, TQT_SLOT(slotDocumentDirtyStepTwo(void*)), p );
+		KDevJobTimer::singleShot( 0, this, TQT_SLOT(slotDocumentDirtyStepTwo(void*)), p );
 	}
 }
 
diff --git a/src/partcontroller.h b/src/partcontroller.h
index 064c6ef6..2e621c38 100644
--- a/src/partcontroller.h
+++ b/src/partcontroller.h
@@ -1,7 +1,7 @@
 #ifndef __PARTCONTROLLER_H__
 #define __PARTCONTROLLER_H__
 
-#include "tdevpartcontroller.h"
+#include "kdevpartcontroller.h"
 
 #include <tqwidget.h>
 #include <tqdatetime.h>
@@ -40,7 +40,7 @@ class KDirWatch;
 /**
 Part controler implementation.
 */
-class PartController : public TDevPartController
+class PartController : public KDevPartController
 {
   Q_OBJECT
   
@@ -51,7 +51,7 @@ public:
   static void createInstance(TQWidget *parent);
   static PartController *getInstance();
 
-  ///// TDevPartController interface
+  ///// KDevPartController interface
 
   void setEncoding(const TQString &encoding);
   void editDocument(const KURL &inputUrl, int lineNum=-1, int col=-1);
diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp
index 7b6410b7..30aa9171 100644
--- a/src/plugincontroller.cpp
+++ b/src/plugincontroller.cpp
@@ -19,14 +19,14 @@
 #include <kstatusbar.h>
 #include <kiconloader.h>
 
-#include <tdevapi.h>
-#include <tdevplugin.h>
-#include <tdevmakefrontend.h>
-#include <tdevappfrontend.h>
-#include <tdevdifffrontend.h>
-#include <tdevsourceformatter.h>
-#include <tdevcreatefile.h>
-#include <tdevplugininfo.h>
+#include <kdevapi.h>
+#include <kdevplugin.h>
+#include <kdevmakefrontend.h>
+#include <kdevappfrontend.h>
+#include <kdevdifffrontend.h>
+#include <kdevsourceformatter.h>
+#include <kdevcreatefile.h>
+#include <kdevplugininfo.h>
 #include <tdeaction.h>
 
 #include <profileengine.h>
@@ -77,7 +77,7 @@ PluginController *PluginController::getInstance()
 
 
 PluginController::PluginController()
-  : TDevPluginController()
+  : KDevPluginController()
 {
 /*  m_defaultProfile = TQString::fromLatin1( "FullIDE" );
   m_defaultProfilePath = kapp->dirs()->localtdedir() + "/" +
@@ -149,7 +149,7 @@ void PluginController::loadPlugins( TDETrader::OfferList offers, const TQStringL
 
     emit loadingPlugin(i18n("Loading: %1").arg((*it)->genericName()));
 
-    TDevPlugin *plugin = loadPlugin( *it );
+    KDevPlugin *plugin = loadPlugin( *it );
     if ( plugin )
     {
         m_parts.insert( name, plugin );
@@ -160,9 +160,9 @@ void PluginController::loadPlugins( TDETrader::OfferList offers, const TQStringL
 
 void PluginController::unloadPlugins()
 {
-  for( TQDictIterator<TDevPlugin> it( m_parts ); !it.isEmpty(); )
+  for( TQDictIterator<KDevPlugin> it( m_parts ); !it.isEmpty(); )
   {
-    TDevPlugin* part = it.current();
+    KDevPlugin* part = it.current();
     removePart( part );
     m_parts.remove( it.currentKey() );
     delete part;
@@ -180,7 +180,7 @@ void PluginController::unloadProjectPlugins( )
 	{
 		TQString name = (*it)->desktopEntryName();
 
-		if ( TDevPlugin * plugin = m_parts[ name ] )
+		if ( KDevPlugin * plugin = m_parts[ name ] )
 		{
 			kdDebug(9000) << " *** Removing: " << name << endl;
 			removeAndForgetPart( name, plugin );
@@ -194,7 +194,7 @@ void PluginController::unloadPlugins( TQStringList const & unloadParts )
 	TQStringList::ConstIterator it = unloadParts.begin();
 	while ( it != unloadParts.end() )
 	{
-		TDevPlugin* part = m_parts[ *it ];
+		KDevPlugin* part = m_parts[ *it ];
 		if( part )
 		{
 			kdDebug(9000) << " *** Removing: " << *it << endl;
@@ -206,11 +206,11 @@ void PluginController::unloadPlugins( TQStringList const & unloadParts )
 	}
 }
 
-TDevPlugin *PluginController::loadPlugin( const KService::Ptr &service )
+KDevPlugin *PluginController::loadPlugin( const KService::Ptr &service )
 {
     int err = 0;
-    TDevPlugin * pl = KParts::ComponentFactory
-        ::createInstanceFromService<TDevPlugin>( service, API::getInstance(), 0,
+    KDevPlugin * pl = KParts::ComponentFactory
+        ::createInstanceFromService<KDevPlugin>( service, API::getInstance(), 0,
                                                  argumentsFromService( service ), &err );
     if (!pl)
     {
@@ -248,7 +248,7 @@ void PluginController::integratePart(KXMLGUIClient *part)
         TopLevel::getInstance()->main()->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ) );
 }
 
-void PluginController::integrateAndRememberPart(const TQString &name, TDevPlugin *part)
+void PluginController::integrateAndRememberPart(const TQString &name, KDevPlugin *part)
 {
     m_parts.insert(name, part);
     integratePart(part);
@@ -260,17 +260,17 @@ void PluginController::removePart(KXMLGUIClient *part)
   TopLevel::getInstance()->main()->guiFactory()->removeClient(part);
 }
 
-void PluginController::removeAndForgetPart(const TQString &name, TDevPlugin *part)
+void PluginController::removeAndForgetPart(const TQString &name, KDevPlugin *part)
 {
     kdDebug() << "removing: " << name << endl;
     m_parts.remove(name);
     removePart(part);
 }
 
-const TQValueList<TDevPlugin*> PluginController::loadedPlugins()
+const TQValueList<KDevPlugin*> PluginController::loadedPlugins()
 {
-	TQValueList<TDevPlugin*> plugins;
-	TQDictIterator<TDevPlugin> itt(m_parts);
+	TQValueList<KDevPlugin*> plugins;
+	TQDictIterator<KDevPlugin> itt(m_parts);
 	while( itt.current() )
 	{
 		plugins.append( itt.current() );
@@ -279,26 +279,26 @@ const TQValueList<TDevPlugin*> PluginController::loadedPlugins()
 	return plugins;
 }
 
-TDevPlugin * PluginController::extension( const TQString & serviceType, const TQString & constraint )
+KDevPlugin * PluginController::extension( const TQString & serviceType, const TQString & constraint )
 {
-    TDETrader::OfferList offers = TDevPluginController::query(serviceType, constraint);
+    TDETrader::OfferList offers = KDevPluginController::query(serviceType, constraint);
     for (TDETrader::OfferList::const_iterator it = offers.constBegin(); it != offers.end(); ++it)
     {
-        TDevPlugin *ext = m_parts[(*it)->desktopEntryName()];
+        KDevPlugin *ext = m_parts[(*it)->desktopEntryName()];
         if (ext) return ext;
     }
     return 0;
 }
 
-TDevPlugin * PluginController::loadPlugin( const TQString & serviceType, const TQString & constraint )
+KDevPlugin * PluginController::loadPlugin( const TQString & serviceType, const TQString & constraint )
 {
-	TDETrader::OfferList offers = TDevPluginController::query( serviceType, constraint );
+	TDETrader::OfferList offers = KDevPluginController::query( serviceType, constraint );
 	if ( !offers.size() == 1 ) return 0;
 
 	TDETrader::OfferList::const_iterator it = offers.constBegin();
 	TQString name = (*it)->desktopEntryName();
 
-	TDevPlugin * plugin = 0;
+	KDevPlugin * plugin = 0;
 	if ( plugin = m_parts[ name ] )
 	{
 		return plugin;
@@ -372,12 +372,12 @@ void PluginController::selectPlugins( )
 }
 
 /*
-TDevPlugin * PluginController::getPlugin( const KService::Ptr & service )
+KDevPlugin * PluginController::getPlugin( const KService::Ptr & service )
 {
-	TDevPlugin * plugin = m_parts[ (*it)->name() ];
+	KDevPlugin * plugin = m_parts[ (*it)->name() ];
 	if ( !plugin )
 	{
-		TDevPlugin * plugin = loadPlugin( *it );
+		KDevPlugin * plugin = loadPlugin( *it );
 		if ( plugin )
 		{
 			integratePart( plugin );
diff --git a/src/plugincontroller.h b/src/plugincontroller.h
index eb635bb6..d5c3f423 100644
--- a/src/plugincontroller.h
+++ b/src/plugincontroller.h
@@ -6,13 +6,13 @@
 
 #include <kservice.h>
 
-#include <tdevplugincontroller.h>
+#include <kdevplugincontroller.h>
 
 #include <profileengine.h>
 
 class KXMLGUIClient;
 class KService;
-class TDevPlugin;
+class KDevPlugin;
 class KDialogBase;
 class ProjectInfo;
 
@@ -20,7 +20,7 @@ class ProjectInfo;
 Plugin controller implementation.
 Loads and unloads plugins.
 */
-class PluginController : public TDevPluginController
+class PluginController : public KDevPluginController
 {
   Q_OBJECT
   
@@ -33,7 +33,7 @@ public:
   static TQStringList argumentsFromService( const KService::Ptr &service );
 
 
-  virtual TDevPlugin * loadPlugin( const TQString & serviceType, const TQString & constraint );
+  virtual KDevPlugin * loadPlugin( const TQString & serviceType, const TQString & constraint );
   virtual void unloadPlugin( const TQString & plugin );
 
   TQString currentProfile() const { return m_profile; }
@@ -45,18 +45,18 @@ public:
 
   void loadGlobalPlugins( const TQStringList & ignorePlugins = TQStringList() );
 
-  //  TDevPlugin * getPlugin( const KService::Ptr &service );
+  //  KDevPlugin * getPlugin( const KService::Ptr &service );
 
-  virtual TDevPlugin *extension(const TQString &serviceType, const TQString &constraint = "");
+  virtual KDevPlugin *extension(const TQString &serviceType, const TQString &constraint = "");
 
   void unloadPlugins( TQStringList const & );
 
   void integratePart(KXMLGUIClient *part);
-  void integrateAndRememberPart(const TQString &name, TDevPlugin *part);
+  void integrateAndRememberPart(const TQString &name, KDevPlugin *part);
   void removePart(KXMLGUIClient* part);
-  void removeAndForgetPart(const TQString &name, TDevPlugin* part);
+  void removeAndForgetPart(const TQString &name, KDevPlugin* part);
 
-  const TQValueList<TDevPlugin*> loadedPlugins();
+  const TQValueList<KDevPlugin*> loadedPlugins();
 
   ProfileEngine &engine() { return m_engine; }
 
@@ -82,10 +82,10 @@ private slots:
   void unloadPlugins();
 
 private:
-	static TDevPlugin *loadPlugin( const KService::Ptr &service );
+	static KDevPlugin *loadPlugin( const KService::Ptr &service );
 
 
-  TQDict<TDevPlugin> m_parts;
+  TQDict<KDevPlugin> m_parts;
   TQString m_profile;
 
   static PluginController *s_instance;
diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp
index 4f32a37d..2f896b51 100644
--- a/src/pluginselectdialog.cpp
+++ b/src/pluginselectdialog.cpp
@@ -18,7 +18,7 @@
 #include <tdeapplication.h>
 #include <kurllabel.h>
 
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 #include "projectmanager.h"
 #include "plugincontroller.h"
 #include "pluginselectdialog.h"
@@ -109,9 +109,9 @@ void PluginSelectDialog::itemSelected( TQListViewItem * item )
 
 void PluginSelectDialog::init( )
 {
-	const TQValueList<TDevPlugin*> loadedPlugins = PluginController::getInstance()->loadedPlugins();
+	const TQValueList<KDevPlugin*> loadedPlugins = PluginController::getInstance()->loadedPlugins();
 	TQStringList loadedPluginDesktopNames;
-	TQValueList<TDevPlugin*>::ConstIterator it = loadedPlugins.begin();
+	TQValueList<KDevPlugin*>::ConstIterator it = loadedPlugins.begin();
 	while( it != loadedPlugins.end() )
 	{
 		loadedPluginDesktopNames << (*it)->instance()->instanceName();
diff --git a/src/profileengine/editor/CMakeLists.txt b/src/profileengine/editor/CMakeLists.txt
index 443da696..cfd7c59c 100644
--- a/src/profileengine/editor/CMakeLists.txt
+++ b/src/profileengine/editor/CMakeLists.txt
@@ -21,9 +21,9 @@ link_directories(
 )
 
 
-##### tdevprofileeditor (executable) ############
+##### kdevprofileeditor (executable) ############
 
-tde_add_executable( tdevprofileeditor
+tde_add_executable( kdevprofileeditor
   SOURCES main.cpp
   LINK profileeditor-static profileengine-shared tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
diff --git a/src/profileengine/editor/Makefile.am b/src/profileengine/editor/Makefile.am
index fae89b48..26f69be6 100644
--- a/src/profileengine/editor/Makefile.am
+++ b/src/profileengine/editor/Makefile.am
@@ -12,11 +12,11 @@ libprofileeditor_la_SOURCES = profileeditorbase.ui profileeditor.cpp \
 noinst_HEADERS = profileeditor.h
 
 
-bin_PROGRAMS = tdevprofileeditor
-tdevprofileeditor_LDFLAGS = $(all_libraries)
-tdevprofileeditor_LDADD = \
+bin_PROGRAMS = kdevprofileeditor
+kdevprofileeditor_LDFLAGS = $(all_libraries)
+kdevprofileeditor_LDADD = \
 	$(top_builddir)/src/profileengine/lib/libprofileengine.la libprofileeditor.la \
 	$(LIB_TDEUI) $(LIB_TDEIO)
-tdevprofileeditor_SOURCES = main.cpp
+kdevprofileeditor_SOURCES = main.cpp
 
 
diff --git a/src/profileengine/editor/main.cpp b/src/profileengine/editor/main.cpp
index 68e942d7..46d128f3 100644
--- a/src/profileengine/editor/main.cpp
+++ b/src/profileengine/editor/main.cpp
@@ -30,7 +30,7 @@ static TDECmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    TDEAboutData about("tdevprofileeditor", I18N_NOOP("TDevelop Profile Editor"), "1", "",
+    TDEAboutData about("kdevprofileeditor", I18N_NOOP("TDevelop Profile Editor"), "1", "",
                      TDEAboutData::License_GPL, I18N_NOOP("(c) 2004, The KDevelop Developers"), 0, 0, "");
     about.addAuthor("Alexander Dymo", 0, "adymo@kdevelop.org");
     TDECmdLineArgs::init(argc, argv, &about);
diff --git a/src/profileengine/lib/Makefile.am b/src/profileengine/lib/Makefile.am
index 66b1f159..08b6e7ad 100644
--- a/src/profileengine/lib/Makefile.am
+++ b/src/profileengine/lib/Makefile.am
@@ -10,7 +10,7 @@ libprofileengine_la_SOURCES = profileengine.cpp profile.cpp
 profileincludedir = $(includedir)/tdevelop/shell/profileengine
 profileinclude_HEADERS = profileengine.h profile.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces
-DOXYGEN_PROJECTNAME = TDevelop Shell Profiles Library
-DOXYGEN_DOCDIRPREFIX = tdevprofiles
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces
+DOXYGEN_PROJECTNAME = KDevelop Shell Profiles Library
+DOXYGEN_DOCDIRPREFIX = kdevprofiles
 include ../../../Doxyfile.am
diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp
index 8678732e..fd4d06fa 100644
--- a/src/profileengine/lib/profileengine.cpp
+++ b/src/profileengine/lib/profileengine.cpp
@@ -25,7 +25,7 @@
 #include <tdeglobal.h>
 #include <kstandarddirs.h>
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 ProfileEngine::ProfileEngine()
 {
diff --git a/src/profileengine/lib/profileengine.h b/src/profileengine/lib/profileengine.h
index d630f576..36d85697 100644
--- a/src/profileengine/lib/profileengine.h
+++ b/src/profileengine/lib/profileengine.h
@@ -61,27 +61,27 @@ public:
 /**
 Profile engine.
 
-- Uses TDevelop profiles to form lists of plugin offers;
+- Uses KDevelop profiles to form lists of plugin offers;
 - Provides means of managing profiles;
 - Provides means to access the resources provided by a profile.
 
-TDevelop profiles form a tree with a root profile named "TDevelop".
+KDevelop profiles form a tree with a root profile named "KDevelop".
 For example, such profiles tree can look as:
 @code
-TDevelop
+KDevelop
 - IDE
   - CompiledLanguageIDE
     - AdaIDE
     - CandCppIDE
       - CIDE
       - CppIDE
-        - TDECppIDE
+        - KDECppIDE
     - FortranIDE
     ...
   - DatabaseIDE
   - ScriptingLanguageIDE
   ..
-- TDevAssistant
+- KDevAssistant
 @endcode
 To manage a tree of profiles, use @ref ProfileEngine::walkProfiles methods.
 */
@@ -92,7 +92,7 @@ public:
 
     /**Type of the plugin offer. Engine will usually find profiles and return offers
     of selected type.
-    @sa TDevPlugin class documentation for more information of plugin types.*/
+    @sa KDevPlugin class documentation for more information of plugin types.*/
     enum OfferType { 
         Global    /**<Global plugins.*/,
         Project   /**<Project plugins.*/,
@@ -137,8 +137,8 @@ public:
     void diffProfiles(OfferType offerType, const TQString &profile1, const TQString &profile2, 
         TQStringList &unload, TDETrader::OfferList &load);
 
-    /**@return The root profile. Root profile is always named "TDevelop" and it
-    defines an empty list of plugins. Applications built on TDevelop platform
+    /**@return The root profile. Root profile is always named "KDevelop" and it
+    defines an empty list of plugins. Applications built on KDevelop platform
     will define nested profiles.*/
     Profile *rootProfile() const { return m_rootProfile; }
     /**Finds a profile with given name.
diff --git a/src/profiles/CMakeLists.txt b/src/profiles/CMakeLists.txt
index 396262a3..5d886c88 100644
--- a/src/profiles/CMakeLists.txt
+++ b/src/profiles/CMakeLists.txt
@@ -10,6 +10,6 @@
 #################################################
 
 add_subdirectory( IDE )
-add_subdirectory( TDevAssistant )
+add_subdirectory( KDevAssistant )
 
 install( FILES profile.config DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles )
diff --git a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/CMakeLists.txt b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/CMakeLists.txt
index 5023cfd9..20e256e4 100644
--- a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/CMakeLists.txt
+++ b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/CMakeLists.txt
@@ -9,7 +9,7 @@
 #
 #################################################
 
-add_subdirectory( TDECppIDE )
+add_subdirectory( KDECppIDE )
 
 install( FILES
     profile.config
diff --git a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE/CMakeLists.txt b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE/CMakeLists.txt
index a364b7a9..c87e4747 100644
--- a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE/CMakeLists.txt
+++ b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     profile.config
-  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE )
diff --git a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE/Makefile.am b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE/Makefile.am
index 9368caac..5e5e943e 100644
--- a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE/Makefile.am
+++ b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE/Makefile.am
@@ -1,3 +1,3 @@
-profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE
+profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE
 profiles_DATA = profile.config
 
diff --git a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE/profile.config b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE/profile.config
index b5b45c4c..b5b45c4c 100644
--- a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE/profile.config
+++ b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE/profile.config
diff --git a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/Makefile.am b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/Makefile.am
index fc781b15..79978385 100644
--- a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/Makefile.am
+++ b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/Makefile.am
@@ -1,3 +1,3 @@
 profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE
 profiles_DATA = profile.config
-SUBDIRS = TDECppIDE
+SUBDIRS = KDECppIDE
diff --git a/src/profiles/IDE/ScriptingLanguageIDE/RubyIDE/profile.config b/src/profiles/IDE/ScriptingLanguageIDE/RubyIDE/profile.config
index 99a52802..5e58c161 100644
--- a/src/profiles/IDE/ScriptingLanguageIDE/RubyIDE/profile.config
+++ b/src/profiles/IDE/ScriptingLanguageIDE/RubyIDE/profile.config
@@ -1,5 +1,5 @@
 [Disable]
-List=tdevfilelist,kdevsnippet,kdevvalgrind,kdevastyle,kdevctags2,kdevsecurity,kdevregexptest
+List=kdevfilelist,kdevsnippet,kdevvalgrind,kdevastyle,kdevctags2,kdevsecurity,kdevregexptest
 
 [Enable]
 List=
diff --git a/src/profiles/TDevAssistant/CMakeLists.txt b/src/profiles/KDevAssistant/CMakeLists.txt
index c6f5900f..1f22e2e7 100644
--- a/src/profiles/TDevAssistant/CMakeLists.txt
+++ b/src/profiles/KDevAssistant/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     profile.config
-  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/TDevAssistant )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/KDevAssistant )
diff --git a/src/profiles/KDevAssistant/Makefile.am b/src/profiles/KDevAssistant/Makefile.am
new file mode 100644
index 00000000..dda1dd47
--- /dev/null
+++ b/src/profiles/KDevAssistant/Makefile.am
@@ -0,0 +1,3 @@
+profilesdir = $(kde_datadir)/tdevelop/profiles/KDevAssistant
+profiles_DATA = profile.config
+
diff --git a/src/profiles/TDevAssistant/profile.config b/src/profiles/KDevAssistant/profile.config
index 46edc970..46edc970 100644
--- a/src/profiles/TDevAssistant/profile.config
+++ b/src/profiles/KDevAssistant/profile.config
diff --git a/src/profiles/Makefile.am b/src/profiles/Makefile.am
index 34789723..3e0a706a 100644
--- a/src/profiles/Makefile.am
+++ b/src/profiles/Makefile.am
@@ -1,3 +1,3 @@
 profilesdir = $(kde_datadir)/tdevelop/profiles
 profiles_DATA = profile.config
-SUBDIRS = IDE TDevAssistant
+SUBDIRS = IDE KDevAssistant
diff --git a/src/profiles/TDevAssistant/Makefile.am b/src/profiles/TDevAssistant/Makefile.am
deleted file mode 100644
index 39590a36..00000000
--- a/src/profiles/TDevAssistant/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-profilesdir = $(kde_datadir)/tdevelop/profiles/TDevAssistant
-profiles_DATA = profile.config
-
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index 3ced0d63..c0380ffb 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -30,11 +30,11 @@ class TQDomDocument;
 #include <kstatusbar.h>
 #include <kiconloader.h>
 
-#include "tdevproject.h"
-#include "tdevlanguagesupport.h"
-#include "tdevplugin.h"
-#include "tdevcreatefile.h"
-#include "tdevversioncontrol.h"
+#include "kdevproject.h"
+#include "kdevlanguagesupport.h"
+#include "kdevplugin.h"
+#include "kdevcreatefile.h"
+#include "kdevversioncontrol.h"
 
 
 #include "toplevel.h"
@@ -97,7 +97,7 @@ void ProjectManager::createActions( TDEActionCollection* ac )
                        this, TQT_SLOT(slotOpenProject()),
                        ac, "project_open");
   action->setToolTip( i18n("Open project"));
-  action->setWhatsThis(i18n("<b>Open project</b><p>Opens a KDevelop3 or TDevelop2 project."));
+  action->setWhatsThis(i18n("<b>Open project</b><p>Opens a KDevelop3 or KDevelop2 project."));
 
   m_openRecentProjectAction =
     new TDERecentFilesAction(i18n("Open &Recent Project"), 0,
@@ -137,8 +137,8 @@ void ProjectManager::slotOpenProject()
   if( url.isEmpty() )
       return;
 
-  if (url.path().endsWith("tdevprj"))
-      loadTDevelop2Project( url );
+  if (url.path().endsWith("kdevprj"))
+      loadKDevelop2Project( url );
   else
       loadProject( url );
 }
@@ -490,8 +490,8 @@ bool ProjectManager::loadProjectPart()
     return false;
   }
 
-  TDevProject *projectPart = KParts::ComponentFactory
-    ::createInstanceFromService< TDevProject >( projectService, API::getInstance(), 0,
+  KDevProject *projectPart = KParts::ComponentFactory
+    ::createInstanceFromService< KDevProject >( projectService, API::getInstance(), 0,
                                                   PluginController::argumentsFromService( projectService ) );
   if ( !projectPart ) {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
@@ -517,7 +517,7 @@ bool ProjectManager::loadProjectPart()
 
 void ProjectManager::unloadProjectPart()
 {
-  TDevProject *projectPart = API::getInstance()->project();
+  KDevProject *projectPart = API::getInstance()->project();
   if( !projectPart ) return;
   PluginController::getInstance()->removePart( projectPart );
   projectPart->closeProject();
@@ -547,8 +547,8 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang)
   }
 
   KService::Ptr languageSupportService = *languageSupportOffers.begin();
-  TDevLanguageSupport *langSupport = KParts::ComponentFactory
-      ::createInstanceFromService<TDevLanguageSupport>( languageSupportService,
+  KDevLanguageSupport *langSupport = KParts::ComponentFactory
+      ::createInstanceFromService<KDevLanguageSupport>( languageSupportService,
                                                         API::getInstance(),
                                                         0,
                                                         PluginController::argumentsFromService(  languageSupportService ) );
@@ -569,7 +569,7 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang)
 
 void ProjectManager::unloadLanguageSupport()
 {
-  TDevLanguageSupport *langSupport = API::getInstance()->languageSupport();
+  KDevLanguageSupport *langSupport = API::getInstance()->languageSupport();
   if( !langSupport ) return;
   kdDebug(9000) << "Language support for " << langSupport->name() << " unloading..." << endl;
   PluginController::getInstance()->removePart( langSupport );
@@ -611,14 +611,14 @@ ProjectSession* ProjectManager::projectSession() const
   return m_pProjectSession;
 }
 
-bool ProjectManager::loadTDevelop2Project( const KURL & url )
+bool ProjectManager::loadKDevelop2Project( const KURL & url )
 {
     if( !url.isValid() || !url.isLocalFile() ){
         KMessageBox::sorry(0, i18n("Invalid URL."));
         return false;
     }
 
-    TQString cmd = TDEGlobal::dirs()->findExe( "tdevprj2tdevelop" );
+    TQString cmd = TDEGlobal::dirs()->findExe( "kdevprj2tdevelop" );
     if (cmd.isEmpty()) {
         KMessageBox::sorry(0, i18n("You do not have 'kdevprj2tdevelop' installed."));
         return false;
diff --git a/src/projectmanager.h b/src/projectmanager.h
index 3c1b3599..3a92409e 100644
--- a/src/projectmanager.h
+++ b/src/projectmanager.h
@@ -17,7 +17,7 @@ class KService;
 class ProjectInfo;
 class ProjectSession;
 class TDERecentFilesAction;
-class TDevPlugin;
+class KDevPlugin;
 
 
 class ProjectInfo
@@ -65,7 +65,7 @@ public:
 
 public slots:
   bool loadProject( const KURL& url);
-  bool loadTDevelop2Project( const KURL& url);
+  bool loadKDevelop2Project( const KURL& url);
   bool closeProject( bool exiting = false );
 
 private slots:
@@ -102,7 +102,7 @@ private:
 
   ProjectSession* m_pProjectSession;
 
-  TDevPlugin *m_vcsPlugin;
+  KDevPlugin *m_vcsPlugin;
   TQString m_vcsName;
 
   TQString m_oldProfileName;
diff --git a/src/projectprofiles b/src/projectprofiles
index b86f9b25..d2224272 100644
--- a/src/projectprofiles
+++ b/src/projectprofiles
@@ -8,8 +8,8 @@ Profiles=ShellIDE
 Profiles=CIDE
 
 [C++]
-Keywords=Empty,TDE
-Profiles=CppIDE,TDECppIDE
+Keywords=Empty,KDE
+Profiles=CppIDE,KDECppIDE
 
 [Fortran77]
 Profiles=FortranIDE
diff --git a/src/projectsession.cpp b/src/projectsession.cpp
index 1b8173fc..afdaf0b5 100644
--- a/src/projectsession.cpp
+++ b/src/projectsession.cpp
@@ -34,7 +34,7 @@
 #include "domutil.h"
 #include "documentationpart.h"
 #include "toplevel.h"
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 
 #include "projectsession.h"
 #include "projectsession.moc"
@@ -68,7 +68,7 @@ void ProjectSession::initXMLTree()
 }
 
 //---------------------------------------------------------------------------
-bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQValueList< TDevPlugin * > plugins )
+bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQValueList< KDevPlugin * > plugins )
 {
   bool bFileOpenOK = true;
 
@@ -105,10 +105,10 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ
 
 	// now also let the plugins load their session stuff
 	TQDomElement pluginListEl = session.namedItem("pluginList").toElement();
-	TQValueList<TDevPlugin*>::ConstIterator it = plugins.begin();
+	TQValueList<KDevPlugin*>::ConstIterator it = plugins.begin();
 	while( it != plugins.end() )
 	{
-		TDevPlugin* pPlugin = (*it);
+		KDevPlugin* pPlugin = (*it);
 		TQString pluginName = pPlugin->instance()->instanceName();
 		TQDomElement pluginEl = pluginListEl.namedItem(pluginName).toElement();
 		if (!pluginEl.isNull()) {
@@ -230,7 +230,7 @@ void ProjectSession::recreateViews(KURL& url, TQDomElement docEl, bool activate)
 }
 
 //---------------------------------------------------------------------------
-bool ProjectSession::saveToFile( const TQString & sessionFileName, const TQValueList< TDevPlugin * > plugins )
+bool ProjectSession::saveToFile( const TQString & sessionFileName, const TQValueList< KDevPlugin * > plugins )
 {
   TQString section, keyword;
   TQDomElement session = domdoc.documentElement();
@@ -390,10 +390,10 @@ bool ProjectSession::saveToFile( const TQString & sessionFileName, const TQValue
     }
   }
 
-	TQValueList<TDevPlugin*>::ConstIterator itt = plugins.begin();
+	TQValueList<KDevPlugin*>::ConstIterator itt = plugins.begin();
 	while( itt != plugins.end() )
 	{
-		TDevPlugin* pPlugin = (*itt);
+		KDevPlugin* pPlugin = (*itt);
 		TQString pluginName = pPlugin->instance()->instanceName();
 		TQDomElement pluginEl = domdoc.createElement(pluginName);
 
diff --git a/src/projectsession.h b/src/projectsession.h
index 64101496..e386bdbc 100644
--- a/src/projectsession.h
+++ b/src/projectsession.h
@@ -24,7 +24,7 @@
 
 class TQWidget;
 class KURL;
-class TDevPlugin;
+class KDevPlugin;
 
 /**
  * This class stores and restores the last situation before the certain project
@@ -42,10 +42,10 @@ public:
   virtual ~ProjectSession();
 
   /** Opens the .kdevses file and saves the project session in XML format to it. */
-  bool saveToFile(const TQString& fileName, const TQValueList<TDevPlugin*> plugins );
+  bool saveToFile(const TQString& fileName, const TQValueList<KDevPlugin*> plugins );
 
   /** Opens the .kdevses file and loads the project session from it. */
-  bool restoreFromFile(const TQString& fileName, const TQValueList<TDevPlugin*> plugins );
+  bool restoreFromFile(const TQString& fileName, const TQValueList<KDevPlugin*> plugins );
 
 signals:
   void sig_restoreMainWindowProperties(const TQDomElement* el);
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index f82f4882..3c9db000 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -41,7 +41,7 @@
 #include <profile.h>
 #include <profileengine.h>
 #include <designer.h>
-#include <tdevproject.h>
+#include <kdevproject.h>
 #include <urlutil.h>
 
 #include "api.h"
@@ -81,7 +81,7 @@ void SimpleMainWindow::init()
 
     createFramework();
     createActions();
-    new TDevStatusBar(this);
+    new KDevStatusBar(this);
 
     setAcceptDrops(true);
 
@@ -466,7 +466,7 @@ void SimpleMainWindow::createActions()
 void SimpleMainWindow::raiseEditor()
 {
     kdDebug() << "SimpleMainWindow::raiseEditor" << endl;
-    TDevPartController *partcontroller = API::getInstance()->partController();
+    KDevPartController *partcontroller = API::getInstance()->partController();
     if (partcontroller->activePart() && partcontroller->activePart()->widget())
         partcontroller->activePart()->widget()->setFocus();
 }
@@ -983,7 +983,7 @@ void SimpleMainWindow::setCaption(const TQString &caption)
         modified = ( state == Modified || state == DirtyAndModified );
     }
 
-    TDevProject *project = API::getInstance()->project();
+    KDevProject *project = API::getInstance()->project();
     if (project)
     {
         TQString projectname = project->projectName();
diff --git a/src/simplemainwindow.h b/src/simplemainwindow.h
index 1f80119f..7dbf5695 100644
--- a/src/simplemainwindow.h
+++ b/src/simplemainwindow.h
@@ -21,9 +21,9 @@
 #define SIMPLEMAINWINDOW_H
 
 #include <dmainwindow.h>
-#include <tdevplugin.h>
-#include <tdevmainwindow.h>
-#include <tdevpartcontroller.h>
+#include <kdevplugin.h>
+#include <kdevmainwindow.h>
+#include <kdevpartcontroller.h>
 
 class TDEAction;
 class TQPopupMenu;
@@ -34,7 +34,7 @@ namespace KParts {
     class ReadOnlyPart;
 }
 
-class SimpleMainWindow: public DMainWindow, public TDevMainWindow {
+class SimpleMainWindow: public DMainWindow, public KDevMainWindow {
     Q_OBJECT
   
 public:
diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp
index 446705b8..205656bd 100644
--- a/src/splashscreen.cpp
+++ b/src/splashscreen.cpp
@@ -10,7 +10,7 @@
 #include <tdelocale.h>
 #include <tdeglobalsettings.h>
 
-TDevSplashScreen::TDevSplashScreen(const TQPixmap& pixmap, WFlags f) : TQSplashScreen(pixmap, f)
+KDevSplashScreen::KDevSplashScreen(const TQPixmap& pixmap, WFlags f) : TQSplashScreen(pixmap, f)
 {
 	TQTimer *timer = new TQTimer( this );
 	TQObject::connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate()));
@@ -21,19 +21,19 @@ TDevSplashScreen::TDevSplashScreen(const TQPixmap& pixmap, WFlags f) : TQSplashS
 }
 
 
-TDevSplashScreen::~TDevSplashScreen()
+KDevSplashScreen::~KDevSplashScreen()
 {
 }
 
 
-void TDevSplashScreen::animate()
+void KDevSplashScreen::animate()
 {
 	state = ((state + 1) % (2*progress_bar_size-1));
 	repaint();
 }
 
 
-void TDevSplashScreen::message( const TQString &str, int flags, const TQColor &color)
+void KDevSplashScreen::message( const TQString &str, int flags, const TQColor &color)
 {
 	TQSplashScreen::message(str,flags,color);
 	animate();
@@ -41,7 +41,7 @@ void TDevSplashScreen::message( const TQString &str, int flags, const TQColor &c
 }
 
 
-void TDevSplashScreen::drawContents (TQPainter* painter)
+void KDevSplashScreen::drawContents (TQPainter* painter)
 {
 	int position;
 	TQColor base_color (201,229,165); // Base green color
diff --git a/src/splashscreen.h b/src/splashscreen.h
index 11a329bc..b8d5563c 100644
--- a/src/splashscreen.h
+++ b/src/splashscreen.h
@@ -11,14 +11,14 @@ class TQPixmap;
 /**
 Splash screen.
 */
-class TDevSplashScreen : public TQSplashScreen
+class KDevSplashScreen : public TQSplashScreen
 {
 Q_OBJECT
   
 
 public:
-	TDevSplashScreen(const TQPixmap& pixmap, WFlags f = 0);
-	virtual ~TDevSplashScreen();
+	KDevSplashScreen(const TQPixmap& pixmap, WFlags f = 0);
+	virtual ~KDevSplashScreen();
 
 protected:
 	void drawContents (TQPainter * painter);
diff --git a/src/statusbar.cpp b/src/statusbar.cpp
index e1f8f3b5..b4e11769 100644
--- a/src/statusbar.cpp
+++ b/src/statusbar.cpp
@@ -27,7 +27,7 @@
 #include "statusbar.h"
 #include "partcontroller.h"
 
-TDevStatusBar::TDevStatusBar(TQWidget *parent, const char *name)
+KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name)
     : KStatusBar(parent, name), _cursorIface(0), _activePart(0)
 {
 	TQWidget * w = new TQWidget( this );
@@ -44,10 +44,10 @@ TDevStatusBar::TDevStatusBar(TQWidget *parent, const char *name)
 }
 
 
-TDevStatusBar::~TDevStatusBar()
+KDevStatusBar::~KDevStatusBar()
 {}
 
-void TDevStatusBar::activePartChanged(KParts::Part *part)
+void KDevStatusBar::activePartChanged(KParts::Part *part)
 {
 	if ( _activePart && _activePart->widget() )
 		disconnect( _activePart->widget(), 0, this, 0 );
@@ -80,7 +80,7 @@ void TDevStatusBar::activePartChanged(KParts::Part *part)
 	}
 }
 
-void TDevStatusBar::cursorPositionChanged()
+void KDevStatusBar::cursorPositionChanged()
 {
   if (_cursorIface)
   {
@@ -90,18 +90,18 @@ void TDevStatusBar::cursorPositionChanged()
   }
 }
 
-void TDevStatusBar::setStatus(const TQString &str)
+void KDevStatusBar::setStatus(const TQString &str)
 {
 	_status->setText(str);
 }
 
 
-void TDevStatusBar::setCursorPosition(int line, int col)
+void KDevStatusBar::setCursorPosition(int line, int col)
 {
 	_status->setText(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col));
 }
 
-void TDevStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent)
+void KDevStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent)
 {
 	KStatusBar::addWidget(widget,stretch,permanent);
 
diff --git a/src/statusbar.h b/src/statusbar.h
index 09f1af97..2f5370ef 100644
--- a/src/statusbar.h
+++ b/src/statusbar.h
@@ -24,14 +24,14 @@ namespace KParts { class Part; }
 /**
 Status bar.
 */
-class TDevStatusBar : public KStatusBar
+class KDevStatusBar : public KStatusBar
 {
     Q_OBJECT
   
 
 public:
-    TDevStatusBar( TQWidget *parent=0, const char *name=0 );
-    ~TDevStatusBar();
+    KDevStatusBar( TQWidget *parent=0, const char *name=0 );
+    ~KDevStatusBar();
     void addWidget ( TQWidget *widget, int stretch = 0, bool permanent = FALSE );
 
 private slots:
diff --git a/src/tdeconf_update/CMakeLists.txt b/src/tdeconf_update/CMakeLists.txt
index 8eb5c732..4b605615 100644
--- a/src/tdeconf_update/CMakeLists.txt
+++ b/src/tdeconf_update/CMakeLists.txt
@@ -20,13 +20,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdev-gen-settings.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+install( FILES kdev-gen-settings.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
 
-##### tdev-gen-settings-tdeconf_update (executable)
+##### kdev-gen-settings-tdeconf_update (executable)
 
-tde_add_executable( tdev-gen-settings-tdeconf_update
-  SOURCES tdev-gen-settings-tdeconf_update.cpp
+tde_add_executable( kdev-gen-settings-tdeconf_update
+  SOURCES kdev-gen-settings-tdeconf_update.cpp
   LINK ${TQT_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
 )
diff --git a/src/tdeconf_update/Makefile.am b/src/tdeconf_update/Makefile.am
index 4cf2dab5..f806baa2 100644
--- a/src/tdeconf_update/Makefile.am
+++ b/src/tdeconf_update/Makefile.am
@@ -1,18 +1,18 @@
 AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT $(all_includes)
 
-update_DATA = tdev-gen-settings.upd
+update_DATA = kdev-gen-settings.upd 
 updatedir = $(kde_datadir)/tdeconf_update
 
 # The Qt app cannot go into kde_datadir, that is not portable.
 # install to kde_bindir/tdeconf_update_bin instead.
 # KDE 3.2 will allow tdeconf_update scripts to run directly from there,
 # but for us that's too late. Use the .sh script as a workaround.
-tdeconf_PROGRAMS = tdev-gen-settings-tdeconf_update
+tdeconf_PROGRAMS = kdev-gen-settings-tdeconf_update
 tdeconfdir = $(libdir)/tdeconf_update_bin
 
-tdev_gen_settings_tdeconf_update_SOURCES = tdev-gen-settings-tdeconf_update.cpp
-tdev_gen_settings_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-tdev_gen_settings_tdeconf_update_LDADD   = $(LIB_QT)
+kdev_gen_settings_tdeconf_update_SOURCES = kdev-gen-settings-tdeconf_update.cpp
+kdev_gen_settings_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kdev_gen_settings_tdeconf_update_LDADD   = $(LIB_QT)
 
 # vim: set noet:
 
diff --git a/src/tdeconf_update/tdev-gen-settings-tdeconf_update.cpp b/src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp
index ae20ae57..63e4a834 100644
--- a/src/tdeconf_update/tdev-gen-settings-tdeconf_update.cpp
+++ b/src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp
@@ -33,7 +33,7 @@ void parseKey( const TQString &group, const TQString &key,
 {
 
     //qcerr << "*** group='" << group << "'" << endl;
-    if ( group == "General Options" && key == "Embed TDevDesigner")
+    if ( group == "General Options" && key == "Embed KDevDesigner")
     {
         newKeyValue = "Designer App";
         if ( value.lower() == "true" )
diff --git a/src/tdeconf_update/tdev-gen-settings.upd b/src/tdeconf_update/kdev-gen-settings.upd
index 1fd3803f..1fd3803f 100644
--- a/src/tdeconf_update/tdev-gen-settings.upd
+++ b/src/tdeconf_update/kdev-gen-settings.upd
diff --git a/src/toplevel.cpp b/src/toplevel.cpp
index 63416175..129d869c 100644
--- a/src/toplevel.cpp
+++ b/src/toplevel.cpp
@@ -8,14 +8,14 @@
 
 #include "simplemainwindow.h"
 
-TDevMainWindow *TopLevel::s_instance = 0;
+KDevMainWindow *TopLevel::s_instance = 0;
 
 bool TopLevel::mainWindowValid()
 {
   return s_instance != 0;
 }
 
-TDevMainWindow *TopLevel::getInstance()
+KDevMainWindow *TopLevel::getInstance()
 {
   if (!s_instance)
   {
@@ -28,7 +28,7 @@ TDevMainWindow *TopLevel::getInstance()
   return s_instance;
 }
 
-void TopLevel::invalidateInstance(TDevMainWindow *instance)
+void TopLevel::invalidateInstance(KDevMainWindow *instance)
 {
   if ( s_instance == instance )
     s_instance = 0;
diff --git a/src/toplevel.h b/src/toplevel.h
index 081ddcae..8eb0243a 100644
--- a/src/toplevel.h
+++ b/src/toplevel.h
@@ -2,10 +2,10 @@
 #define __TOPLEVEL_H__
 
 
-#include "tdevmainwindow.h"
+#include "kdevmainwindow.h"
 
 
-/**\brief This class handles the single object of type TDevMainWindow.
+/**\brief This class handles the single object of type KDevMainWindow.
 
 It is completely static (all methods and attributes).
 */
@@ -14,13 +14,13 @@ class TopLevel
 {
 public:
 
-  static TDevMainWindow *getInstance();                                 //!< Get a pointer to the single KDevTopLevel object
+  static KDevMainWindow *getInstance();                                 //!< Get a pointer to the single KDevTopLevel object
   static bool mainWindowValid();
-  static void invalidateInstance(TDevMainWindow *instance);             //!< Signal that the object has been (or is about to be) destroyed
+  static void invalidateInstance(KDevMainWindow *instance);             //!< Signal that the object has been (or is about to be) destroyed
 
 private:
 
-  static TDevMainWindow *s_instance;                                    //!< Pointer to the single KDevTopLevel object or 0L
+  static KDevMainWindow *s_instance;                                    //!< Pointer to the single KDevTopLevel object or 0L
   
 };